Skip to content

fix(image-source): url loading under different conditions #10955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanWalker merged 1 commit into from
Nov 20, 2025
+8 −23
Merged

fix(image-source): url loading under different conditions #10955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/toolbox/src/pages/image-async.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export function navigatingTo(args: EventData) {
}

export class SampleData extends Observable {
src: string = 'https://source.unsplash.com/random';
src: string = 'https://i.pravatar.cc/300';
savedData: string = '';
resizedImage: ImageSource;
async save() {
Expand Down
18 changes: 2 additions & 16 deletions packages/core/http/http-shared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
// Shared types and interfaces for http and image-source modules.
// Only put platform-agnostic types/interfaces here.

// Example: (add more as needed)
// TODO: look at removing this after circulars are completely resolved.
// Note: Circular dep help between http and image-source.
// Interfaces can be moved around further in future to help avoid.
export interface ImageSourceLike {
toBase64String(format: string, quality?: number): string;
// ... add other shared methods/properties as needed
}

// Circular dependency resolution handling (http <--> image-source)
let _getImage: (arg: any) => Promise<ImageSourceLike>;
export function getImageRequest(arg: any): Promise<ImageSourceLike> {
if (_getImage) {
return _getImage(arg);
}
return Promise.reject(new Error('No getImage request handler set.'));
}
export function setGetImageRequest(fn: (arg: any) => Promise<ImageSourceLike>) {
_getImage = fn;
}
3 changes: 1 addition & 2 deletions packages/core/http/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { setGetImageRequest, type ImageSourceLike } from './http-shared';
import { type ImageSourceLike } from './http-shared';
import { request } from './http-request';
export { request } from './http-request';
export * from './http-interfaces';
Expand Down Expand Up @@ -51,7 +51,6 @@ export function getImage(arg: any): Promise<ImageSourceLike> {
);
});
}
setGetImageRequest(getImage);

export function getFile(arg: any, destinationFilePath?: string): Promise<any> {
return new Promise<any>((resolve, reject) => {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/image-source/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ImageSource as ImageSourceDefinition, iosSymbolScaleType } from '.';
import { ImageAsset } from '../image-asset';
import { getImageRequest } from '../http/http-shared';
import { getImage } from '../http';
import { path as fsPath, knownFolders } from '../file-system';
import { isFileOrResourcePath, RESOURCE_PREFIX, layout } from '../utils';
import { getNativeApp } from '../application/helpers-common';
Expand Down Expand Up @@ -63,7 +63,7 @@ export class ImageSource implements ImageSourceDefinition {
}

static fromUrl(url: string): Promise<ImageSource> {
return getImageRequest(url) as Promise<ImageSource>;
return getImage(url) as Promise<ImageSource>;
}

static fromResourceSync(name: string): ImageSource {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/image-source/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Trace } from '../trace';
import { path as fsPath, knownFolders } from '../file-system';
import { isFileOrResourcePath, RESOURCE_PREFIX, layout, releaseNativeObject, SYSTEM_PREFIX } from '../utils';
import { getScaledDimensions } from './image-source-common';
import { getImageRequest } from '../http/http-shared';
import { getImage } from '../http';

export { isFileOrResourcePath };

Expand Down Expand Up @@ -58,7 +58,7 @@ export class ImageSource implements ImageSourceDefinition {
}

static fromUrl(url: string): Promise<ImageSource> {
return getImageRequest(url) as Promise<ImageSource>;
return getImage(url) as Promise<ImageSource>;
}

static iosSystemScaleFor(scale: iosSymbolScaleType) {
Expand Down
Loading