Skip to content

Commit e5138f1

Browse files
committed
Image - resolveBlobUri should be used on the hidden image
`resolveBlobUri` causes difficulties for the logic that identifies resolved source changes It is not necessary to be applied there, but only on the hidden image
1 parent aef957a commit e5138f1

File tree

1 file changed

+3
-8
lines changed
  • packages/react-native-web/src/exports/Image

1 file changed

+3
-8
lines changed

packages/react-native-web/src/exports/Image/index.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@ function resolveSource(source: ?Source): ImageSource {
124124
const match = resolvedSource.uri.match(svgDataUriPattern);
125125
if (match) {
126126
resolvedSource = resolveSvgDataUriSource(resolvedSource, match);
127-
} else {
128-
resolvedSource = resolveBlobUri(resolvedSource);
129127
}
130128
}
131129

@@ -178,11 +176,8 @@ function resolveSvgDataUriSource(
178176
}
179177

180178
// resolve any URI that might have a local blob URL create by `createObjectURL`
181-
function resolveBlobUri(source: ImageSource): ImageSource {
182-
return {
183-
...source,
184-
uri: ImageLoader.resolveBlobUri(source.uri) || source.uri
185-
};
179+
function resolveBlobUri(source: ImageSource): string {
180+
return ImageLoader.resolveBlobUri(source.uri);
186181
}
187182

188183
function getSourceToDisplay(main, fallback) {
@@ -242,7 +237,7 @@ const Image: React.AbstractComponent<
242237
const fallbackSource = useSource(imageLoadingProps, defaultSource);
243238
const mainSource = useSource(imageLoadingProps, source);
244239
const availableSource = getSourceToDisplay(mainSource, fallbackSource);
245-
const displayImageUri = availableSource.uri;
240+
const displayImageUri = resolveBlobUri(availableSource);
246241
const imageSizeStyle = resolveAssetDimensions(availableSource);
247242

248243
const [layout, updateLayout] = React.useState({});

0 commit comments

Comments
 (0)