Skip to content

Commit f27e305

Browse files
p-sunfacebook-github-bot
authored andcommitted
Fix prefetchImageWithMetadata redbox in AMA
Reviewed By: RSNara Differential Revision: D24837264 fbshipit-source-id: b2aeef2c051fa15c06cf2eb6350c152b722196c2
1 parent 8f5656b commit f27e305

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Libraries/Image/Image.ios.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ function prefetchWithMetadata(
6565
rootTag?: ?number,
6666
): any {
6767
if (NativeImageLoaderIOS.prefetchImageWithMetadata) {
68+
// number params like rootTag cannot be nullable before TurboModules is available
6869
return NativeImageLoaderIOS.prefetchImageWithMetadata(
6970
url,
7071
queryRootName,
71-
rootTag,
72+
rootTag ? rootTag : 0,
7273
);
7374
} else {
7475
return NativeImageLoaderIOS.prefetchImage(url);

Libraries/Image/NativeImageLoaderIOS.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export interface Spec extends TurboModule {
2929
+prefetchImageWithMetadata?: (
3030
uri: string,
3131
queryRootName: string,
32-
rootTag?: ?number,
32+
rootTag: number,
3333
) => Promise<boolean>;
3434
+queryCache: (uris: Array<string>) => Promise<Object>;
3535
}

Libraries/Image/RCTImageLoader.mm

+3-3
Original file line numberDiff line numberDiff line change
@@ -1197,12 +1197,12 @@ - (void)cancelRequest:(id)requestToken
11971197
resolve:(RCTPromiseResolveBlock)resolve
11981198
reject:(RCTPromiseRejectBlock)reject)
11991199
{
1200-
[self prefetchImageWithMetadata:uri queryRootName:nil rootTag:nil resolve:resolve reject:reject];
1200+
[self prefetchImageWithMetadata:uri queryRootName:nil rootTag:0 resolve:resolve reject:reject];
12011201
}
12021202

12031203
RCT_EXPORT_METHOD(prefetchImageWithMetadata:(NSString *)uri
12041204
queryRootName:(NSString *)queryRootName
1205-
rootTag:(NSNumber *)rootTag
1205+
rootTag:(double)rootTag
12061206
resolve:(RCTPromiseResolveBlock)resolve
12071207
reject:(RCTPromiseRejectBlock)reject)
12081208
{
@@ -1215,7 +1215,7 @@ - (void)cancelRequest:(id)requestToken
12151215
priority:RCTImageLoaderPriorityPrefetch
12161216
attribution:{
12171217
.queryRootName = queryRootName ? [queryRootName UTF8String] : "",
1218-
.surfaceId = [rootTag intValue],
1218+
.surfaceId = (int)rootTag,
12191219
}
12201220
progressBlock:nil
12211221
partialLoadBlock:nil

0 commit comments

Comments
 (0)