From f07dd70051dae4a95de0a2f34f08e9320f09e906 Mon Sep 17 00:00:00 2001 From: Alex Kotliarskyi Date: Mon, 28 Sep 2015 12:22:26 -0700 Subject: [PATCH] Managed assets support for RCTConvert Reviewed By: @nicklockwood Differential Revision: D2443130 --- Examples/UIExplorer/TabBarIOSExample.js | 3 ++- Examples/UIExplorer/flux@3x.png | Bin 0 -> 1924 bytes .../Components/TabBarIOS/TabBarItemIOS.ios.js | 4 +++- .../Image/__tests__/resolveAssetSource-test.js | 6 ++++++ Libraries/Image/resolveAssetSource.js | 3 +++ React/Base/RCTConvert.m | 4 ++++ 6 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 Examples/UIExplorer/flux@3x.png diff --git a/Examples/UIExplorer/TabBarIOSExample.js b/Examples/UIExplorer/TabBarIOSExample.js index 5ba3f0099d7..eccc84cbed4 100644 --- a/Examples/UIExplorer/TabBarIOSExample.js +++ b/Examples/UIExplorer/TabBarIOSExample.js @@ -79,7 +79,8 @@ var TabBarExample = React.createClass({ {this._renderContent('#783E33', 'Red Tab', this.state.notifCount)} { this.setState({ diff --git a/Examples/UIExplorer/flux@3x.png b/Examples/UIExplorer/flux@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..7bdef3b1012f9887e1e5b0b41cc8d9a8bce147b0 GIT binary patch literal 1924 zcmah~`#%$k1LcaMnJc7A9+%;IG>?hG*Eh{D%d43?W+E(WBpV^DDD%kj&Y0_23qu)M z7k_%dzdR!G zQ?K)K-G7>FI1C+*48?^<`Vj*~u3x+2PmCZ1or{34i-;Ts!)Dw-EE`GlI5gZVY#Ox2>_^XQThd?K_;6 zX=^yNusokg!S!@!Gh*Y5qIHqhSq+^6JQSpTs*ttY2tv}w8vlIT-;<-YGHS3|f$Lom zbmw3TO1T9_cZ2luqaeBnA4JlDYzPtZKMW<>>=9rRp=ch*OW4HHSC2JxO{s!LPzAcy z6>bb_L8ajkU}&hVB+k}=ew;Ef$x%Wccy&-(i@s$u$Y&+%ph)!JEDkovg*~*6am{xy zZr6NreXiQGzA-(R4~LMXTKD>XRh%VTYmcZYF9d?Br{NK~y;*8@8glt_fx_1|>D0Zy zOuOj9d}TaT@hWb<-`3{;nw}Y+n{45h`J(5OQ3GhZ&I9_yFiWNBv2u`%n5s$U;lWFw zn)V{Tc<+sy7KQ^F+l;du_X?uw*Q^Kqrh_J*-(4-Px`iTKP-h#xZ5j=AV?;rJ9mZe~&pdi3R#%e}aHpF$w9ztKZy zHGc3T*W<9?ex-NhHTI5{)6p+Dbsly?0_k>yo+2~6QVa8=jX_$1?}cBhtzJr)>|anUdadmiEOaiEyorv zs!zmcF#oUwl*yGf0C^c%sh@&$Oll$*mhCHH~CCc*^ z#Y2TJG0hfh=3% z7iIGFQy0H04_acqqR92~QQjfhw`JU$(tckVGDW(5`F{J6WLEorCd_KFIRpPr!@D`d zn#Ot($;2di{~T7ooIkPh;(TDW^Lk}~Xcz){1ovfOZ0a1ZIR)OSU6;}A9Yg;@65YQ% z{tM|cRi(?crH}ue%b!Z|RYF&vkcpLh*VeStOXG8=g_5%-91D)D=a^6M%49wE(Ok#g^+_8Wh91^# zAL*+N#tT%_GYht@9Dc>c&EJ1MdE6K~j2glie!gENmIU&tq*+($C6|Mtdoa(Q3|>`sN!ckBp0d9V_SNMfq?C^8>Vky(aBcF`?7ONXXM|V zW=br4vA|W$&DEJPz4E!3J@X&nyOqS#`!)qa+mj?O%(i8nkpp2Ip5UH8^MxYxi@G}C z{~$71XQl~U!4MCYJ?Yy!)5@S>S@>{O=X*(11^%)@Z8)uCxVY}HMOBojW4pb{s-wq{ z;8kS}&x2UboL4}dc^J{9E4!nVP|EEFr$nE;`H_fX7Eu|r3TiZJlQZxveFQ|u%XBET zXFY8ojy~=m=5Ea-OZDheH3a$0QR0sQb>xy8;3S|!JskwQ$#OQ4eyVZcvSe#7IU&dY z97@;)!U8kxq5Y+)4=HHJ`7=8EK%%j-u4Wu~1x^OHys;oP$GzXn8K;axdb>wfJKWU5 zG&A#(OuA;}Z-}7+c#W$UubqSOiuPU??UZ=>77g+l$6dtN&I|-F1+*Tg=gyyOyLzQQ uJWuyyYX_Yxl#8EeGZz2vM-mY+)jANXzpPi_S@Pq~zj-*!*|zq)Z^A#)$eo-3 literal 0 HcmV?d00001 diff --git a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js index f44fb0493b9..94285e466ae 100644 --- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js +++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js @@ -15,6 +15,7 @@ var React = require('React'); var StaticContainer = require('StaticContainer.react'); var StyleSheet = require('StyleSheet'); var View = require('View'); +var resolveAssetSource = require('resolveAssetSource'); var requireNativeComponent = require('requireNativeComponent'); @@ -114,7 +115,8 @@ var TabBarItemIOS = React.createClass({ return ( {tabContents} diff --git a/Libraries/Image/__tests__/resolveAssetSource-test.js b/Libraries/Image/__tests__/resolveAssetSource-test.js index 9c81dcdc4c3..5d5bdc0e6f3 100644 --- a/Libraries/Image/__tests__/resolveAssetSource-test.js +++ b/Libraries/Image/__tests__/resolveAssetSource-test.js @@ -77,10 +77,12 @@ describe('resolveAssetSource', () => { name: 'logo', type: 'png', }, { + __packager_asset: true, isStatic: false, width: 100, height: 200, uri: 'http://10.0.0.1:8081/assets/module/a/logo.png?platform=ios&hash=5b6f00f', + scale: 1, }); }); @@ -96,10 +98,12 @@ describe('resolveAssetSource', () => { name: 'logo', type: 'png', }, { + __packager_asset: true, isStatic: false, width: 100, height: 200, uri: 'http://10.0.0.1:8081/assets/module/a/logo@2x.png?platform=ios&hash=5b6f00f', + scale: 2, }); }); @@ -125,6 +129,7 @@ describe('resolveAssetSource', () => { name: 'logo', type: 'png', }, { + __packager_asset: true, isStatic: true, width: 100, height: 200, @@ -153,6 +158,7 @@ describe('resolveAssetSource', () => { name: '!@Logo#1_€', // Invalid chars shouldn't get passed to native type: 'png', }, { + __packager_asset: true, isStatic: true, width: 100, height: 200, diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js index 00fb8c84d8f..29323afa65a 100644 --- a/Libraries/Image/resolveAssetSource.js +++ b/Libraries/Image/resolveAssetSource.js @@ -121,13 +121,16 @@ function assetToImageSource(asset) { var devServerURL = getDevServerURL(); if (devServerURL) { return { + __packager_asset: true, width: asset.width, height: asset.height, uri: getPathOnDevserver(devServerURL, asset), isStatic: false, + scale: pickScale(asset.scales, PixelRatio.get()), }; } else { return { + __packager_asset: true, width: asset.width, height: asset.height, uri: getPathInArchive(asset), diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m index 3a79abced83..aa99b3e44e5 100644 --- a/React/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -413,11 +413,13 @@ RCT_CGSTRUCT_CONVERTER(CGAffineTransform, (@[ UIImage *image; NSString *path; CGFloat scale = 0.0; + BOOL isPackagerAsset = NO; if ([json isKindOfClass:[NSString class]]) { path = json; } else if ([json isKindOfClass:[NSDictionary class]]) { path = [self NSString:json[@"uri"]]; scale = [self CGFloat:json[@"scale"]]; + isPackagerAsset = [self BOOL:json[@"__packager_asset"]]; } else { RCTLogConvertError(json, @"an image"); } @@ -459,6 +461,8 @@ RCT_CGSTRUCT_CONVERTER(CGAffineTransform, (@[ } else if ([scheme isEqualToString:@"data"]) { image = [UIImage imageWithData:[NSData dataWithContentsOfURL:URL]]; + } else if ([scheme isEqualToString:@"http"] && isPackagerAsset) { + image = [UIImage imageWithData:[NSData dataWithContentsOfURL:URL]]; } else { RCTLogConvertError(json, @"an image. Only local files or data URIs are supported"); }