Fixes issue with RN 0.17-rc ignoring scale file suffix. Fixes #74

This commit is contained in:
Joel Arvidsson
2015-12-17 19:01:16 +01:00
parent 78177dafd4
commit 2e38d5ae25

View File

@@ -19,6 +19,7 @@ var {
requireNativeComponent,
NativeModules,
Platform,
PixelRatio,
processColor,
} = React;
@@ -171,12 +172,13 @@ function createIconSet(glyphMap : Object, fontFamily : string, fontFile : string
}
var cacheKey = glyph + ':' + size + ':' + color;
var scale = PixelRatio.get();
return new Promise((resolve, reject) => {
var cached = imageSourceCache[cacheKey];
if(typeof cached !== 'undefined') {
if(!cached || cached instanceof Error ) { reject(cached); }
return resolve({ uri: cached });
return resolve({ uri: cached, scale });
}
NativeIconAPI.getImageForFont(fontReference, glyph, size, color, function(err, image) {
if(typeof err === 'string') {
@@ -184,7 +186,7 @@ function createIconSet(glyphMap : Object, fontFamily : string, fontFile : string
}
imageSourceCache[cacheKey] = image || err || false;
if(!err && image) {
return resolve({ uri: image });
return resolve({ uri: image, scale });
}
reject(err);
});