Merge branch 'main' into fix/duplicate-csschanged-event-handler

NathanWalker · web-flow · commit 2e3c8304f225 · 2025-10-29T11:18:46.000-07:00
diff --git a/packages/core/ui/animation/index.d.ts b/packages/core/ui/animation/index.d.ts
@@ -1,3 +1,16 @@
 &#65279;export type { Pair, Transformation, TransformationType, TransformationValue, TransformFunctionsInfo, Point3D, AnimationPromise, Cancelable } from './animation-types';
-export { Animation, _resolveAnimationCurve } from './animation';
 export { KeyframeAnimation, KeyframeAnimationInfo, KeyframeDeclaration, KeyframeInfo } from './keyframe-animation';
+import type { AnimationDefinition, AnimationPromise } from './animation-types';
+
+/**
+ * Defines a animation set.
+ */
+export class Animation {
+    constructor(animationDefinitions: Array<AnimationDefinition>, playSequentially?: boolean);
+    public play: (resetOnFinish?: boolean) => AnimationPromise;
+    public cancel: () => void;
+    public isPlaying: boolean;
+    public _resolveAnimationCurve(curve: any): any;
+}
+
+export function _resolveAnimationCurve(curve: any): any;
diff --git a/packages/core/ui/button/index.d.ts b/packages/core/ui/button/index.d.ts
@@ -10,7 +10,7 @@ export class Button extends TextBase {
 	/**
 	 * String value used when hooking to tap event.
 	 *
-	 * @nsEvent {EventData} string;
+	 * @nsEvent {EventData} tap
 	 */
 	public static tapEvent: string;
 
diff --git a/packages/core/ui/slider/index.d.ts b/packages/core/ui/slider/index.d.ts
@@ -18,7 +18,7 @@ export class Slider extends View {
 	/**
 	 * String value used when hooking to accessibilityDecrement event.
 	 *
-	 * @nsEvent {accessibilityDecrementEvent} accessibilityDecrement
+	 * @nsEvent {AccessibilityDecrementEventData} accessibilityDecrement
 	 */
 	static readonly accessibilityDecrementEvent = 'accessibilityDecrement';
 
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ImageView.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/ImageView.java
@@ -364,6 +364,17 @@ protected void onDraw(Canvas canvas) {
 			float uniformScale;
 			float pivotX, pivotY;
 			switch (this.getScaleType()) {
+				case CENTER:
+					uniformScale = 1;
+					matrix.postTranslate((innerWidth - bitmapWidth) / 2, (innerHeight - bitmapHeight) / 2);
+					matrix.postScale(uniformScale, uniformScale, innerWidth / 2, innerHeight / 2);
+					canvas.clipRect(
+						borderLeftWidth + (innerWidth - bitmapWidth * uniformScale) / 2,
+						borderTopWidth + (innerHeight - bitmapHeight * uniformScale) / 2,
+						borderLeftWidth + (innerWidth + bitmapWidth * uniformScale) / 2,
+						borderTopWidth + (innerHeight + bitmapHeight * uniformScale) / 2
+					);
+					break;
 				case FIT_CENTER: // aspectFit
 					uniformScale = Math.min(fittingScaleX, fittingScaleY);
 					matrix.postTranslate((innerWidth - bitmapWidth) / 2, (innerHeight - bitmapHeight) / 2);

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export class Button extends TextBase {`
`10`	`10`	`/**`
`11`	`11`	`* String value used when hooking to tap event.`
`12`	`12`	`*`
`13`		`- * @nsEvent {EventData} string;`
	`13`	`+ * @nsEvent {EventData} tap`
`14`	`14`	`*/`
`15`	`15`	`public static tapEvent: string;`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export class Slider extends View {`
`18`	`18`	`/**`
`19`	`19`	`* String value used when hooking to accessibilityDecrement event.`
`20`	`20`	`*`
`21`		`- * @nsEvent {accessibilityDecrementEvent} accessibilityDecrement`
	`21`	`+ * @nsEvent {AccessibilityDecrementEventData} accessibilityDecrement`
`22`	`22`	`*/`
`23`	`23`	`static readonly accessibilityDecrementEvent = 'accessibilityDecrement';`
`24`	`24`