status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-28 18:25:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix logic for loading images from asset catalogs in RCTConvert

Browse Source 
Reviewed By: @nicklockwood

Differential Revision: D2526264

fb-gh-sync-id: 039b0438fbce7c3e752271adc8d5aa5d4fe915e5
This commit is contained in:
Pieter De Baets 2015-10-09 07:44:00 -07:00 committed by facebook-github-bot-4
parent 26f5f1ffc8
commit 903eaa863c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
React/Base/RCTConvert.m
View File

@ -400,6 +400,7 @@ RCT_CGSTRUCT_CONVERTER(CGAffineTransform, (@[
return [self UIColor:json].CGColor; return [self UIColor:json].CGColor;
} }
/* This method is only used when loading images synchronously, e.g. for tabbar icons */
+ (UIImage *)UIImage:(id)json + (UIImage *)UIImage:(id)json
{ {
// TODO: we might as well cache the result of these checks (and possibly the // TODO: we might as well cache the result of these checks (and possibly the
@ -427,30 +428,33 @@ RCT_CGSTRUCT_CONVERTER(CGAffineTransform, (@[
NSURL *URL = [self NSURL:path]; NSURL *URL = [self NSURL:path];
NSString *scheme = URL.scheme.lowercaseString; NSString *scheme = URL.scheme.lowercaseString;
if (URL && [scheme isEqualToString:@"file"]) { if (URL && [scheme isEqualToString:@"file"]) {
if ([URL.path hasPrefix:[NSBundle mainBundle].resourcePath]) {
RCTAssertMainThread(); RCTAssertMainThread();
if ([URL.path hasPrefix:[NSBundle bundleForClass:[self class]].resourcePath]) {
// Image may reside inside a .car file, in which case we have no choice // Image may reside inside a .car file, in which case we have no choice
// but to use +[UIImage imageNamed] - but this method isn't thread safe // but to use +[UIImage imageNamed] - but this method isn't thread safe
static NSMutableDictionary *XCAssetMap = nil; static NSMutableDictionary *XCAssetMap = nil;
if (!XCAssetMap) { if (!XCAssetMap) {
XCAssetMap = [NSMutableDictionary new]; XCAssetMap = [NSMutableDictionary new];
} }
NSNumber *isAsset = XCAssetMap[URL.path]; NSNumber *isAsset = XCAssetMap[path];
if (!isAsset || isAsset.boolValue) { if (!isAsset || isAsset.boolValue) {
image = [UIImage imageNamed:URL.path]; image = [UIImage imageNamed:path];
} }
if (!isAsset) { if (!isAsset) {
// Avoid calling `+imageNamed` again in future if it's not needed. // Avoid calling `+imageNamed` again in future if it's not needed.
XCAssetMap[URL.path] = @(image != nil); XCAssetMap[path] = @(image != nil);
} }
} }
if (!image) { if (!image) {
NSString *filePath = URL.path;
// Attempt to load from the file system // Attempt to load from the file system
if (path.pathExtension.length == 0) { if (filePath.pathExtension.length == 0) {
path = [path stringByAppendingPathExtension:@"png"]; filePath = [filePath stringByAppendingPathExtension:@"png"];
} }
image = [UIImage imageWithContentsOfFile:path]; image = [UIImage imageWithContentsOfFile:filePath];
} }
} else if ([scheme isEqualToString:@"data"]) { } else if ([scheme isEqualToString:@"data"]) {