fix(core): improve strong type src of Image (NativeScript#10265)

vallemar · web-flow · commit f54966707d97 · 2023-04-10T22:59:57.000-07:00
diff --git a/packages/core/ui/image/image-common.ts b/packages/core/ui/image/image-common.ts
@@ -14,7 +14,7 @@ import { Trace } from '../../trace';
 @CSSType('Image')
 export abstract class ImageBase extends View implements ImageDefinition {
 	public imageSource: ImageSource;
-	public src: string | ImageSource;
+	public src: string | ImageSource | ImageAsset;
 	public isLoading: boolean;
 	public stretch: CoreTypes.ImageStretchType;
 	public loadMode: 'sync' | 'async';
@@ -134,7 +134,7 @@ export const imageSourceProperty = new Property<ImageBase, ImageSource>({
 });
 imageSourceProperty.register(ImageBase);
 
-export const srcProperty = new Property<ImageBase, any>({ name: 'src' });
+export const srcProperty = new Property<ImageBase, string | ImageSource | ImageAsset>({ name: 'src' });
 srcProperty.register(ImageBase);
 
 export const loadModeProperty = new Property<ImageBase, 'sync' | 'async'>({
diff --git a/packages/core/ui/image/index.android.ts b/packages/core/ui/image/index.android.ts
@@ -186,7 +186,7 @@ export class Image extends ImageBase {
 	[srcProperty.getDefault](): any {
 		return undefined;
 	}
-	[srcProperty.setNative](value: any) {
+	[srcProperty.setNative](value: string | ImageSource | ImageAsset) {
 		this._createImageSourceFromSrc(value);
 	}
 }
diff --git a/packages/core/ui/image/index.d.ts b/packages/core/ui/image/index.d.ts
@@ -1,6 +1,7 @@
 ﻿import { View } from '../core/view';
 import { Style } from '../styling/style';
 import { ImageSource } from '../../image-source';
+import { ImageAsset } from '../../image-asset';
 import { Color } from '../../color';
 import { Property, InheritedCssProperty } from '../core/properties';
 import { CoreTypes } from '../../core-types';
@@ -27,7 +28,7 @@ export class Image extends View {
 	/**
 	 * Gets or sets the source of the Image. This can be either an URL string or a native image instance.
 	 */
-	src: any;
+	src: string | ImageSource | ImageAsset;
 
 	/**
 	 * Gets a value indicating if the image is currently loading.
@@ -66,7 +67,7 @@ export class Image extends View {
 }
 
 export const imageSourceProperty: Property<Image, ImageSource>;
-export const srcProperty: Property<Image, any>;
+export const srcProperty: Property<Image, string | ImageSource | ImageAsset>;
 export const isLoadingProperty: Property<Image, string>;
 export const loadMode: Property<Image, 'sync' | 'async'>;
 export const stretchProperty: Property<Image, CoreTypes.ImageStretchType>;
diff --git a/packages/core/ui/image/index.ios.ts b/packages/core/ui/image/index.ios.ts
@@ -1,5 +1,6 @@
 import { ImageBase, stretchProperty, imageSourceProperty, tintColorProperty, srcProperty } from './image-common';
 import { ImageSource } from '../../image-source';
+import { ImageAsset } from '../../image-asset';
 import { Color } from '../../color';
 import { Trace } from '../../trace';
 import { layout, queueGC } from '../../utils';
@@ -190,7 +191,7 @@ export class Image extends ImageBase {
 		this._setNativeImage(value ? value.ios : null);
 	}
 
-	[srcProperty.setNative](value: any) {
+	[srcProperty.setNative](value: string | ImageSource | ImageAsset) {
 		this._createImageSourceFromSrc(value);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ export class Image extends ImageBase {`
`186`	`186`	`[srcProperty.getDefault](): any {`
`187`	`187`	`return undefined;`
`188`	`188`	`}`
`189`		`- [srcProperty.setNative](value: any) {`
	`189`	`+ [srcProperty.setNative](value: string \| ImageSource \| ImageAsset) {`
`190`	`190`	`this._createImageSourceFromSrc(value);`
`191`	`191`	`}`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import { ImageBase, stretchProperty, imageSourceProperty, tintColorProperty, srcProperty } from './image-common';`
`2`	`2`	`import { ImageSource } from '../../image-source';`
	`3`	`+import { ImageAsset } from '../../image-asset';`
`3`	`4`	`import { Color } from '../../color';`
`4`	`5`	`import { Trace } from '../../trace';`
`5`	`6`	`import { layout, queueGC } from '../../utils';`
`@@ -190,7 +191,7 @@ export class Image extends ImageBase {`
`190`	`191`	`this._setNativeImage(value ? value.ios : null);`
`191`	`192`	`}`
`192`	`193`
`193`		`- [srcProperty.setNative](value: any) {`
	`194`	`+ [srcProperty.setNative](value: string \| ImageSource \| ImageAsset) {`
`194`	`195`	`this._createImageSourceFromSrc(value);`
`195`	`196`	`}`
`196`	`197`	`}`