kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-03-06 22:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check for image in local assets also in sync image calls

Browse Source 
Reviewed By: PeteTheHeat

Differential Revision: D14660673

fbshipit-source-id: 7ed58331b5c61777dc084fa2cf9a460761d723c2
This commit is contained in:
Ram N
2019-04-23 19:04:31 -07:00
committed by Facebook Github Bot
parent e7a8b26f22
commit a6fb3d3a35
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
React/Base/RCTConvert.m
View File

@@ -768,6 +768,16 @@ RCT_ENUM_CONVERTER(RCTAnimationType, (@{
NSString *scheme = URL.scheme.lowercaseString;
if ([scheme isEqualToString:@"file"]) {
image = RCTImageFromLocalAssetURL(URL);
// There is a case where this may fail when the image is at the bundle location.
// RCTImageFromLocalAssetURL only checks for the image in the same location as the jsbundle
// Hence, if the bundle is CodePush-ed, it will not be able to find the image.
// This check is added here instead of being inside RCTImageFromLocalAssetURL, since
// we don't want breaking changes to RCTImageFromLocalAssetURL, which is called in a lot of places
// This is a deprecated method, and hence has the least impact on existing code. Basically,
// instead of crashing the app, it tries one more location for the image.
if (!image) {
image = RCTImageFromLocalBundleAssetURL(URL);
}
if (!image) {
RCTLogConvertError(json, @"an image. File not found.");
}

5
React/Base/RCTUtils.h
View File

@@ -133,6 +133,11 @@ RCT_EXTERN BOOL RCTIsLocalAssetURL(NSURL *__nullable imageURL);
// does not correspond to a local asset.
RCT_EXTERN UIImage *__nullable RCTImageFromLocalAssetURL(NSURL *imageURL);
// Only used in case when RCTImageFromLocalAssetURL fails to get an image
// This method basically checks for the image in the bundle location, instead
// of the CodePush location
RCT_EXTERN UIImage *__nullable RCTImageFromLocalBundleAssetURL(NSURL *imageURL);
// Creates a new, unique temporary file path with the specified extension
RCT_EXTERN NSString *__nullable RCTTempFilePath(NSString *__nullable extension, NSError **error);

13
React/Base/RCTUtils.m
View File

@@ -716,6 +716,19 @@ static NSBundle *bundleForPath(NSString *key)
return bundleCache[key];
}
UIImage *__nullable RCTImageFromLocalBundleAssetURL(NSURL *imageURL)
{
if (![imageURL.scheme isEqualToString:@"file"]) {
// We only want to check for local file assets
return nil;
}
// Get the bundle URL, and add the image URL
// Note that we have to add both host and path, since host is the first "assets" part
// while path is the rest of the URL
NSURL *bundleImageUrl = [[[NSBundle mainBundle] bundleURL] URLByAppendingPathComponent:[imageURL.host stringByAppendingString:imageURL.path]];
return RCTImageFromLocalAssetURL(bundleImageUrl);
}
UIImage *__nullable RCTImageFromLocalAssetURL(NSURL *imageURL)
{
NSString *imageName = RCTBundlePathForURL(imageURL);