zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-02 14:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Image ratio validation and check for iOS

Browse Source
This commit is contained in:
Minsuk Kang
2017-01-06 14:46:59 -08:00
parent 57c1fe5a96
commit 680e001070
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elements/Image.js
+1 -1
View File
@@ -20,7 +20,7 @@ class Image extends Shape {
PropTypes.number, PropTypes.number,
function(props, propName, componentName) { function(props, propName, componentName) {
if (Object.keys(props[propName]).length != 1 || if (Object.keys(props[propName]).length != 1 ||
!/^\s*data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i.test(props[propName].uri)) { !/^\s*data:\/\/data:([a-z]+\/[a-z]+(;[a-z\-]+\=[a-z\-]+)?)?(;base64)?,[a-z0-9\!\$\&\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i.test(props[propName].uri)) {
return new Error( return new Error(
'Invalid prop `' + propName + '` supplied to' + 'Invalid prop `' + propName + '` supplied to' +
' `' + componentName + '`. Validation failed.' ' `' + componentName + '`. Validation failed.'
ios/Elements/RNSVGImage.m
+9 -2
View File
@@ -26,7 +26,14 @@
_src = src; _src = src;
CGImageRelease(_image); CGImageRelease(_image);
RCTImageSource *source = [RCTConvert RCTImageSource:src]; RCTImageSource *source = [RCTConvert RCTImageSource:src];
_imageRatio = source.size.width / source.size.height; if (source.size.width != 0 && source.size.height != 0)
{
_imageRatio = source.size.width / source.size.height;
}
else
{
_imageRatio = 0.0
}
_image = CGImageRetain([RCTConvert CGImage:src]); _image = CGImageRetain([RCTConvert CGImage:src]);
[self invalidate]; [self invalidate];
} }
@@ -110,7 +117,7 @@
CGFloat rectRatio = rectWidth / rectHeight; CGFloat rectRatio = rectWidth / rectHeight;
CGRect renderRect; CGRect renderRect;
if (imageRatio == rectRatio) { if (imageRatio == 0.0 || imageRatio == rectRatio) {
renderRect = rect; renderRect = rect;
} else if (imageRatio < rectRatio) { } else if (imageRatio < rectRatio) {
renderRect = CGRectMake(0, 0, rectHeight * imageRatio, rectHeight); renderRect = CGRectMake(0, 0, rectHeight * imageRatio, rectHeight);