fix: compatibility with reanimated color, fixes #1241

software-mansion · Jan 18, 2020 · 4983766 · 4983766
1 parent 61bc9bd
commit 4983766
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/android/src/main/java/com/horcrux/svg/RenderableView.java b/android/src/main/java/com/horcrux/svg/RenderableView.java
@@ -116,7 +116,9 @@ public void setFill(@Nullable Dynamic fill) {
             return;
         }
         ReadableType type = fill.getType();
-        if (type.equals(ReadableType.Array)) {
+        if (type.equals(ReadableType.Number)) {
+            this.fill = JavaOnlyArray.of(0, fill.asInt());
+        } else if (type.equals(ReadableType.Array)) {
             this.fill = fill.asArray();
         } else {
             JavaOnlyArray arr = new JavaOnlyArray();
@@ -162,7 +164,9 @@ public void setStroke(@Nullable Dynamic strokeColors) {
             return;
         }
         ReadableType type = strokeColors.getType();
-        if (type.equals(ReadableType.Array)) {
+        if (type.equals(ReadableType.Number)) {
+            stroke = JavaOnlyArray.of(0, strokeColors.asInt());
+        } else if (type.equals(ReadableType.Array)) {
             stroke = strokeColors.asArray();
         } else {
             JavaOnlyArray arr = new JavaOnlyArray();

diff --git a/ios/Brushes/RNSVGBrush.h b/ios/Brushes/RNSVGBrush.h
@@ -15,7 +15,7 @@
 @property (nonatomic, strong) NSString* brushRef;
 
 /* @abstract */
-- (instancetype)initWithArray:(NSArray *)data NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithArray:(NSArray *)data;
 
 /**
  * @abstract

diff --git a/ios/Brushes/RNSVGBrush.m b/ios/Brushes/RNSVGBrush.m
@@ -16,8 +16,6 @@ - (instancetype)initWithArray:(NSArray *)data
     return [super init];
 }
 
-RCT_NOT_IMPLEMENTED(- (instancetype)init)
-
 - (void)paint:(CGContextRef)context opacity:(CGFloat)opacity painter:(RNSVGPainter *)painter bounds:(CGRect)bounds
 {
 

diff --git a/ios/Brushes/RNSVGSolidColorBrush.h b/ios/Brushes/RNSVGSolidColorBrush.h
@@ -10,4 +10,6 @@
 
 @interface RNSVGSolidColorBrush : RNSVGBrush
 
+- (instancetype)initWithNumber:(NSNumber *)number;
+
 @end
diff --git a/ios/Brushes/RNSVGSolidColorBrush.m b/ios/Brushes/RNSVGSolidColorBrush.m
@@ -24,6 +24,14 @@ - (instancetype)initWithArray:(NSArray<RNSVGLength *> *)array
     return self;
 }
 
+- (instancetype)initWithNumber:(NSNumber *)number
+{
+    if ((self = [super init])) {
+        _color = CGColorRetain([RCTConvert CGColor:number]);
+    }
+    return self;
+}
+
 - (void)dealloc
 {
     CGColorRelease(_color);

diff --git a/ios/Utils/RCTConvert+RNSVG.m b/ios/Utils/RCTConvert+RNSVG.m
@@ -36,6 +36,9 @@ @implementation RCTConvert (RNSVG)
 
 + (RNSVGBrush *)RNSVGBrush:(id)json
 {
+    if ([json isKindOfClass:[NSNumber class]]) {
+        return [[RNSVGSolidColorBrush alloc] initWithNumber:json];
+    }
     if ([json isKindOfClass:[NSString class]]) {
         NSString *value = [self NSString:json];
         if (!RNSVGDigitRegEx) {