fix: PlatformColor crashes on iOS and Android (#1703)

Follow-up PR to #1561 fixing the problems mentioned there. Also fixing the wrong releasing introduced in 027b8c1
software-mansion · Feb 24, 2022 · b007efe · b007efe
1 parent d35878b
commit b007efe
Show file tree

Hide file tree

Showing 10 changed files with 527 additions and 708 deletions.
diff --git a/TestsExample/src/SampleTest.tsx b/TestsExample/src/SampleTest.tsx
@@ -1,30 +1,49 @@
 import React from 'react';
+import { PlatformColor, Platform, Button } from 'react-native';
 import {
   Svg,
   Circle,
   Rect,
+  Text,
+  TSpan
 } from 'react-native-svg';
 
+const color = PlatformColor(Platform.select({
+  ios: 'label',
+  android: '@android:color/primary_text_light',
+  default: 'black',
+}))
+
 export default () => {
+  const [test, setTest] = React.useState(50);
+
   return (
-    <Svg height="100" width="100">
-      <Circle
-        cx="50"
-        cy="50"
-        r="45"
-        stroke="blue"
-        strokeWidth="2.5"
-        fill="green"
-      />
-      <Rect
-        x="15"
-        y="15"
-        width="70"
-        height="70"
-        stroke="red"
-        strokeWidth="2"
-        fill="yellow"
-      />
-    </Svg>
+    <>
+      <Svg height="100" width="100" color={color}>
+        <Circle
+          cx="50"
+          cy="50"
+          r={test}
+          strokeWidth="2.5"
+          fill={color}
+        />
+        <Rect
+          x="15"
+          y="15"
+          width="70"
+          height="70"
+          stroke="currentColor"
+          strokeWidth="5"
+        />
+      </Svg>
+      <Svg height="300" width="300" fill="red">
+        <Text x={0} y={0} fontSize={20}>
+          <TSpan dx={test} inlineSize={"100%"} fill="currentColor">
+          Testing word-wrap... Testing word-wrap... Testing word-wrap... Testing word-wrap...
+          </TSpan>
+        </Text>
+      </Svg>
+      <Button title="Click me" onPress={()=> setTest(test + 1)}/>
+    </>
   );
 }
diff --git a/android/src/main/java/com/horcrux/svg/SvgView.java b/android/src/main/java/com/horcrux/svg/SvgView.java
@@ -23,6 +23,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.facebook.react.bridge.ColorPropConverter;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
@@ -173,12 +174,17 @@ private void clearChildCache() {
     }
 
     @ReactProp(name = "tintColor")
-    public void setTintColor(@Nullable Integer tintColor) {
-        if (tintColor == null) {
-            mTintColor = 0;
-        } else {
-            mTintColor = tintColor;
-        }
+    public void setTintColor(@Nullable Dynamic tintColor) {
+      switch (tintColor.getType()) {
+        case Map:
+          mTintColor = ColorPropConverter.getColor(tintColor.asMap(), getContext());
+          break;
+        case Number:
+          mTintColor = tintColor.asInt();
+          break;
+        default:
+          mTintColor = 0;
+      }
         invalidate();
         clearChildCache();
     }

diff --git a/android/src/main/java/com/horcrux/svg/SvgViewManager.java b/android/src/main/java/com/horcrux/svg/SvgViewManager.java
@@ -78,12 +78,12 @@ public boolean needsCustomLayoutForChildren() {
     }
 
     @ReactProp(name = "tintColor")
-    public void setTintColor(SvgView node, @Nullable Integer tintColor) {
+    public void setTintColor(SvgView node, @Nullable Dynamic tintColor) {
         node.setTintColor(tintColor);
     }
 
     @ReactProp(name = "color")
-    public void setColor(SvgView node, @Nullable Integer color) {
+    public void setColor(SvgView node, @Nullable Dynamic color) {
         node.setTintColor(color);
     }
 

diff --git a/apple/Brushes/RNSVGSolidColorBrush.m b/apple/Brushes/RNSVGSolidColorBrush.m
@@ -7,27 +7,28 @@
  */
 
 #import "RNSVGSolidColorBrush.h"
+#import "RNSVGUIKit.h"
 
 #import "RCTConvert+RNSVG.h"
 #import <React/RCTLog.h>
 
 @implementation RNSVGSolidColorBrush
 {
-    UIColor *_color;
+    RNSVGColor *_color;
 }
 
 - (instancetype)initWithArray:(NSArray<RNSVGLength *> *)array
 {
     if ((self = [super initWithArray:array])) {
-        _color = [RCTConvert RNSVGUIColor:array offset:1];
+        _color = [RCTConvert RNSVGColor:array offset:1];
     }
     return self;
 }
 
 - (instancetype)initWithNumber:(NSNumber *)number
 {
     if ((self = [super init])) {
-        _color = [RCTConvert UIColor:number];
+        _color = [RCTConvert RNSVGColor:number];
     }
     return self;
 }
@@ -41,21 +42,22 @@ - (CGColorRef)getColorWithOpacity:(CGFloat)opacity
 {
     CGColorRef baseColor = _color.CGColor;
     CGColorRef color = CGColorCreateCopyWithAlpha(baseColor, opacity * CGColorGetAlpha(baseColor));
-    CGColorRelease(baseColor);
     return color;
 }
 
 - (BOOL)applyFillColor:(CGContextRef)context opacity:(CGFloat)opacity
 {
     CGColorRef color = [self getColorWithOpacity:opacity];
     CGContextSetFillColorWithColor(context, color);
+    CGColorRelease(color);
     return YES;
 }
 
 - (BOOL)applyStrokeColor:(CGContextRef)context opacity:(CGFloat)opacity
 {
     CGColorRef color = [self getColorWithOpacity:opacity];
     CGContextSetStrokeColorWithColor(context, color);
+    CGColorRelease(color);
     return YES;
 }
 

diff --git a/apple/Text/RNSVGTSpan.m b/apple/Text/RNSVGTSpan.m
@@ -65,31 +65,24 @@ - (void)renderLayerTo:(CGContextRef)context rect:(CGRect)rect
     if (self.content) {
         RNSVGGlyphContext* gc = [self.textRoot getGlyphContext];
         if (self.inlineSize != nil && self.inlineSize.value != 0) {
-            CGColorRef color;
             if (self.fill) {
                 if (self.fill.class == RNSVGBrush.class) {
-                    color = [self.tintColor CGColor];
+                    CGColorRef color = [self.tintColor CGColor];
                     [self drawWrappedText:context gc:gc rect:rect color:color];
                 } else {
-                    color = [self.fill getColorWithOpacity:self.fillOpacity];
+                    CGColorRef color = [self.fill getColorWithOpacity:self.fillOpacity];
                     [self drawWrappedText:context gc:gc rect:rect color:color];
-                }
-                if (color) {
                     CGColorRelease(color);
-                    color = nil;
                 }
             }
             if (self.stroke) {
                 if (self.stroke.class == RNSVGBrush.class) {
-                    color = [self.tintColor CGColor];
+                    CGColorRef color = [self.tintColor CGColor];
                     [self drawWrappedText:context gc:gc rect:rect color:color];
                 } else {
-                    color = [self.stroke getColorWithOpacity:self.strokeOpacity];
+                    CGColorRef color = [self.stroke getColorWithOpacity:self.strokeOpacity];
                     [self drawWrappedText:context gc:gc rect:rect color:color];
-                }
-                if (color) {
                     CGColorRelease(color);
-                    color = nil;
                 }
             }
         } else {

diff --git a/apple/Utils/RCTConvert+RNSVG.h b/apple/Utils/RCTConvert+RNSVG.h
@@ -28,7 +28,7 @@
 + (RNSVGBrush *)RNSVGBrush:(id)json;
 + (RNSVGPathParser *)RNSVGCGPath:(NSString *)d;
 + (CGRect)RNSVGCGRect:(id)json offset:(NSUInteger)offset;
-+ (UIColor *)RNSVGUIColor:(id)json offset:(NSUInteger)offset;
++ (RNSVGColor *)RNSVGColor:(id)json offset:(NSUInteger)offset;
 + (CGGradientRef)RNSVGCGGradient:(id)json;
 
 @end
diff --git a/apple/Utils/RCTConvert+RNSVG.m b/apple/Utils/RCTConvert+RNSVG.m
@@ -130,17 +130,17 @@ + (CGRect)RNSVGCGRect:(id)json offset:(NSUInteger)offset
     };
 }
 
-+ (UIColor *)RNSVGUIColor:(id)json offset:(NSUInteger)offset
++ (RNSVGColor *)RNSVGColor:(id)json offset:(NSUInteger)offset
 {
     NSArray *arr = [self NSArray:json];
     if (arr.count == offset + 1) {
-        return [self UIColor:[arr objectAtIndex:offset]];
+        return [self RNSVGColor:[arr objectAtIndex:offset]];
     }
     if (arr.count < offset + 4) {
         RCTLogError(@"Too few elements in array (expected at least %zd): %@", (ssize_t)(4 + offset), arr);
         return nil;
     }
-    return [self UIColor:[arr subarrayWithRange:(NSRange){offset, 4}]];
+    return [self RNSVGColor:[arr subarrayWithRange:(NSRange){offset, 4}]];
 }
 
 + (CGGradientRef)RNSVGCGGradient:(id)json