fix(ios): handle gradient and pattern transform when null

software-mansion · Mar 4, 2020 · 715e9b8 · 715e9b8
1 parent 2f6222d
commit 715e9b8
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 32 deletions.
diff --git a/ios/Elements/RNSVGLinearGradient.m b/ios/Elements/RNSVGLinearGradient.m
@@ -11,13 +11,20 @@
 
 @implementation RNSVGLinearGradient
 
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _gradientTransform = CGAffineTransformIdentity;
+    }
+    return self;
+}
 
 - (void)setX1:(RNSVGLength *)x1
 {
     if ([x1 isEqualTo:_x1]) {
         return;
     }
-    
+
     _x1 = x1;
     [self invalidate];
 }
@@ -27,7 +34,7 @@ - (void)setY1:(RNSVGLength *)y1
     if ([y1 isEqualTo:_y1]) {
         return;
     }
-    
+
     _y1 = y1;
     [self invalidate];
 }
@@ -37,7 +44,7 @@ - (void)setX2:(RNSVGLength *)x2
     if ([x2 isEqualTo:_x2]) {
         return;
     }
-    
+
     _x2 = x2;
     [self invalidate];
 }
@@ -47,7 +54,7 @@ - (void)setY2:(RNSVGLength *)y2
     if ([y2 isEqualTo:_y2]) {
         return;
     }
-    
+
     _y2 = y2;
     [self invalidate];
 }
@@ -57,7 +64,7 @@ - (void)setGradient:(NSArray<NSNumber *> *)gradient
     if (gradient == _gradient) {
         return;
     }
-    
+
     _gradient = gradient;
     [self invalidate];
 }
@@ -67,7 +74,7 @@ - (void)setGradientUnits:(RNSVGUnits)gradientUnits
     if (gradientUnits == _gradientUnits) {
         return;
     }
-    
+
     _gradientUnits = gradientUnits;
     [self invalidate];
 }
@@ -91,11 +98,11 @@ - (void)parseReference
     [painter setUnits:self.gradientUnits];
     [painter setTransform:self.gradientTransform];
     [painter setLinearGradientColors:self.gradient];
-    
+
     if (self.gradientUnits == kRNSVGUnitsUserSpaceOnUse) {
         [painter setUserSpaceBoundingBox:[self.svgView getContextBounds]];
     }
-    
+
     [self.svgView definePainter:painter painterName:self.name];
 }
 @end

diff --git a/ios/Elements/RNSVGPattern.m b/ios/Elements/RNSVGPattern.m
@@ -12,6 +12,14 @@
 
 @implementation RNSVGPattern
 
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _patternTransform = CGAffineTransformIdentity;
+    }
+    return self;
+}
+
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
     return nil;
@@ -26,11 +34,11 @@ - (void)parseReference
     [painter setContentUnits:self.patternContentUnits];
     [painter setTransform:self.patternTransform];
     [painter setPattern:self];
-    
+
     if (self.patternUnits == kRNSVGUnitsUserSpaceOnUse || self.patternContentUnits == kRNSVGUnitsUserSpaceOnUse) {
         [painter setUserSpaceBoundingBox:[self.svgView getContextBounds]];
     }
-    
+
     [self.svgView definePainter:painter painterName:self.name];
 }
 
@@ -39,7 +47,7 @@ - (void)setX:(RNSVGLength *)x
     if ([x isEqualTo:_x]) {
         return;
     }
-    
+
     _x = x;
     [self invalidate];
 }
@@ -49,7 +57,7 @@ - (void)setY:(RNSVGLength *)y
     if ([y isEqualTo:_y]) {
         return;
     }
-    
+
     _y = y;
     [self invalidate];
 }
@@ -59,7 +67,7 @@ - (void)setPatternwidth:(RNSVGLength *)patternwidth
     if ([patternwidth isEqualTo:_patternwidth]) {
         return;
     }
-    
+
     _patternwidth = patternwidth;
     [self invalidate];
 }
@@ -69,7 +77,7 @@ - (void)setPatternheight:(RNSVGLength *)patternheight
     if ([patternheight isEqualTo:_patternheight]) {
         return;
     }
-    
+
     _patternheight = patternheight;
     [self invalidate];
 }
@@ -79,7 +87,7 @@ - (void)setPatternUnits:(RNSVGUnits)patternUnits
     if (patternUnits == _patternUnits) {
         return;
     }
-    
+
     _patternUnits = patternUnits;
     [self invalidate];
 }
@@ -89,7 +97,7 @@ - (void)setPatternContentUnits:(RNSVGUnits)patternContentUnits
     if (patternContentUnits == _patternContentUnits) {
         return;
     }
-    
+
     _patternContentUnits = patternContentUnits;
     [self invalidate];
 }
@@ -105,7 +113,7 @@ - (void)setMinX:(CGFloat)minX
     if (minX == _minX) {
         return;
     }
-    
+
     [self invalidate];
     _minX = minX;
 }
@@ -115,7 +123,7 @@ - (void)setMinY:(CGFloat)minY
     if (minY == _minY) {
         return;
     }
-    
+
     [self invalidate];
     _minY = minY;
 }
@@ -125,7 +133,7 @@ - (void)setVbWidth:(CGFloat)vbWidth
     if (vbWidth == _vbWidth) {
         return;
     }
-    
+
     [self invalidate];
     _vbWidth = vbWidth;
 }
@@ -135,7 +143,7 @@ - (void)setVbHeight:(CGFloat)vbHeight
     if (_vbHeight == vbHeight) {
         return;
     }
-    
+
     [self invalidate];
     _vbHeight = vbHeight;
 }
@@ -145,7 +153,7 @@ - (void)setAlign:(NSString *)align
     if ([align isEqualToString:_align]) {
         return;
     }
-    
+
     [self invalidate];
     _align = align;
 }
@@ -155,7 +163,7 @@ - (void)setMeetOrSlice:(RNSVGVBMOS)meetOrSlice
     if (meetOrSlice == _meetOrSlice) {
         return;
     }
-    
+
     [self invalidate];
     _meetOrSlice = meetOrSlice;
 }

diff --git a/ios/Elements/RNSVGRadialGradient.m b/ios/Elements/RNSVGRadialGradient.m
@@ -9,12 +9,20 @@
 
 @implementation RNSVGRadialGradient
 
+- (instancetype)init
+{
+    if (self = [super init]) {
+        _gradientTransform = CGAffineTransformIdentity;
+    }
+    return self;
+}
+
 - (void)setFx:(RNSVGLength *)fx
 {
     if ([fx isEqualTo:_fx]) {
         return;
     }
-    
+
     _fx = fx;
     [self invalidate];
 }
@@ -24,7 +32,7 @@ - (void)setFy:(RNSVGLength *)fy
     if ([fy isEqualTo:_fy]) {
         return;
     }
-    
+
     _fy = fy;
     [self invalidate];
 }
@@ -34,7 +42,7 @@ - (void)setRx:(RNSVGLength *)rx
     if ([rx isEqualTo:_rx]) {
         return;
     }
-    
+
     _rx = rx;
     [self invalidate];
 }
@@ -44,7 +52,7 @@ - (void)setRy:(RNSVGLength *)ry
     if ([ry isEqualTo:_ry]) {
         return;
     }
-    
+
     _ry = ry;
     [self invalidate];
 }
@@ -54,7 +62,7 @@ - (void)setCx:(RNSVGLength *)cx
     if ([cx isEqualTo:_cx]) {
         return;
     }
-    
+
     _cx = cx;
     [self invalidate];
 }
@@ -64,7 +72,7 @@ - (void)setCy:(RNSVGLength *)cy
     if ([cy isEqualTo:_cy]) {
         return;
     }
-    
+
     _cy = cy;
     [self invalidate];
 }
@@ -74,7 +82,7 @@ - (void)setGradient:(NSArray<NSNumber *> *)gradient
     if (gradient == _gradient) {
         return;
     }
-    
+
     _gradient = gradient;
     [self invalidate];
 }
@@ -84,7 +92,7 @@ - (void)setGradientUnits:(RNSVGUnits)gradientUnits
     if (gradientUnits == _gradientUnits) {
         return;
     }
-    
+
     _gradientUnits = gradientUnits;
     [self invalidate];
 }
@@ -108,11 +116,11 @@ - (void)parseReference
     [painter setUnits:self.gradientUnits];
     [painter setTransform:self.gradientTransform];
     [painter setRadialGradientColors:self.gradient];
-    
+
     if (self.gradientUnits == kRNSVGUnitsUserSpaceOnUse) {
         [painter setUserSpaceBoundingBox:[self.svgView getContextBounds]];
     }
-    
+
     [self.svgView definePainter:painter painterName:self.name];
 }