fix: handling of rounded rect

fixes software-mansion#1112
wordpress-mobile · Sep 27, 2019 · c12d66e · c12d66e
1 parent 70c54e6
commit c12d66e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/android/src/main/java/com/horcrux/svg/RectView.java b/android/src/main/java/com/horcrux/svg/RectView.java
@@ -76,14 +76,19 @@ Path getPath(Canvas canvas, Paint paint) {
         double y = relativeOnHeight(mY);
         double w = relativeOnWidth(mW);
         double h = relativeOnHeight(mH);
-        double rx = relativeOnWidth(mRx);
-        double ry = relativeOnHeight(mRy);
 
-        if (rx != 0 || ry != 0) {
-            if (rx == 0) {
+        if (mRx != null || mRy != null) {
+            double rx = 0d;
+            double ry = 0d;
+            if (mRx == null) {
+                ry = relativeOnHeight(mRy);
                 rx = ry;
-            } else if (ry == 0) {
+            } else if (mRy == null) {
+                rx = relativeOnWidth(mRx);
                 ry = rx;
+            } else {
+                rx = relativeOnWidth(mRx);
+                ry = relativeOnHeight(mRy);
             }
 
             if (rx > w / 2) {

diff --git a/ios/Shapes/RNSVGRect.m b/ios/Shapes/RNSVGRect.m
@@ -72,14 +72,19 @@ - (CGPathRef)getPath:(CGContextRef)context
     CGFloat y = [self relativeOnHeight:self.y];
     CGFloat width = [self relativeOnWidth:self.rectwidth];
     CGFloat height = [self relativeOnHeight:self.rectheight];
-    CGFloat rx = [self relativeOnWidth:self.rx];
-    CGFloat ry = [self relativeOnHeight:self.ry];
 
-    if (rx != 0 || ry != 0) {
-        if (rx == 0) {
+    if (self.rx != nil || self.ry != nil) {
+        CGFloat rx = 0;
+        CGFloat ry = 0;
+        if (self.rx == nil) {
+            ry = [self relativeOnHeight:self.ry];
             rx = ry;
-        } else if (ry == 0) {
+        } else if (self.ry == nil) {
+            rx = [self relativeOnWidth:self.rx];
             ry = rx;
+        } else {
+            rx = [self relativeOnWidth:self.rx];
+            ry = [self relativeOnHeight:self.ry];
         }
 
         if (rx > width / 2) {

diff --git a/src/elements/Rect.tsx b/src/elements/Rect.tsx
@@ -19,8 +19,6 @@ export default class Rect extends Shape<{
     y: 0,
     width: 0,
     height: 0,
-    rx: 0,
-    ry: 0,
   };
 
   render() {