From bcbaa45645b851ad6553c1f679ced434039e5a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E9=98=B3?= <chenyang@shimo.im>
Date: Fri, 9 Apr 2021 15:21:00 +0800
Subject: [PATCH 1/2] Fix clipRule in Android #1409

---
 android/src/main/java/com/horcrux/svg/VirtualView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/com/horcrux/svg/VirtualView.java b/android/src/main/java/com/horcrux/svg/VirtualView.java
index 38bd0c21..edb719cf 100644
--- a/android/src/main/java/com/horcrux/svg/VirtualView.java
+++ b/android/src/main/java/com/horcrux/svg/VirtualView.java
@@ -342,11 +342,11 @@ abstract public class VirtualView extends ReactViewGroup {
             ClipPathView mClipNode = (ClipPathView) getSvgView().getDefinedClipPath(mClipPath);
 
             if (mClipNode != null) {
-                Path clipPath = mClipNode.mClipRule == CLIP_RULE_EVENODD ? mClipNode.getPath(canvas, paint) :
+                Path clipPath = mClipRule == CLIP_RULE_EVENODD ? mClipNode.getPath(canvas, paint) :
                         mClipNode.getPath(canvas, paint, Region.Op.UNION);
                 clipPath.transform(mClipNode.mMatrix);
                 clipPath.transform(mClipNode.mTransform);
-                switch (mClipNode.mClipRule) {
+                switch (mClipRule) {
                     case CLIP_RULE_EVENODD:
                         clipPath.setFillType(Path.FillType.EVEN_ODD);
                         break;

From 42babbb6dfaa7e4bf399976c5f1569f0e468d0b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E9=98=B3?= <chenyang@shimo.im>
Date: Fri, 9 Apr 2021 16:31:18 +0800
Subject: [PATCH 2/2] Fix clipRule in iOS

---
 .../java/com/horcrux/svg/ClipPathView.java    |  1 -
 apple/RNSVGNode.m                             | 38 ++-----------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/android/src/main/java/com/horcrux/svg/ClipPathView.java b/android/src/main/java/com/horcrux/svg/ClipPathView.java
index 1e9363d8..cba5fb20 100644
--- a/android/src/main/java/com/horcrux/svg/ClipPathView.java
+++ b/android/src/main/java/com/horcrux/svg/ClipPathView.java
@@ -22,7 +22,6 @@ class ClipPathView extends GroupView {
 
     public ClipPathView(ReactContext reactContext) {
         super(reactContext);
-        mClipRule = CLIP_RULE_NONZERO;
     }
 
     @Override
diff --git a/apple/RNSVGNode.m b/apple/RNSVGNode.m
index f5922d0d..2ec27dfd 100644
--- a/apple/RNSVGNode.m
+++ b/apple/RNSVGNode.m
@@ -23,7 +23,6 @@
     BOOL _transparent;
     RNSVGClipPath *_clipNode;
     CGPathRef _cachedClipPath;
-    CGImageRef _clipMask;
     CGFloat canvasWidth;
     CGFloat canvasHeight;
     CGFloat canvasDiagonal;
@@ -250,10 +249,8 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
         return;
     }
     CGPathRelease(_cachedClipPath);
-    CGImageRelease(_clipMask);
     _cachedClipPath = nil;
     _clipPath = clipPath;
-    _clipMask = nil;
     [self invalidate];
 }
 
@@ -263,10 +260,8 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
         return;
     }
     CGPathRelease(_cachedClipPath);
-    CGImageRelease(_clipMask);
     _cachedClipPath = nil;
     _clipRule = clipRule;
-    _clipMask = nil;
     [self invalidate];
 }
 
@@ -340,24 +335,6 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
         }
         CGAffineTransform transform = CGAffineTransformConcat(_clipNode.matrix, _clipNode.transforms);
         _cachedClipPath = CGPathCreateCopyByTransformingPath([_clipNode getPath:context], &transform);
-        if (_clipMask) {
-            CGImageRelease(_clipMask);
-        }
-        if ([_clipNode isSimpleClipPath] || _clipNode.clipRule == kRNSVGCGFCRuleEvenodd) {
-            _clipMask = nil;
-        } else {
-            CGRect bounds = CGContextGetClipBoundingBox(context);
-            CGSize size = bounds.size;
-
-            UIGraphicsBeginImageContextWithOptions(size, NO, 0.0);
-            CGContextRef newContext = UIGraphicsGetCurrentContext();
-            CGContextTranslateCTM(newContext, 0.0, size.height);
-            CGContextScaleCTM(newContext, 1.0, -1.0);
-
-            [_clipNode renderLayerTo:newContext rect:bounds];
-            _clipMask = CGBitmapContextCreateImage(newContext);
-            UIGraphicsEndImageContext();
-        }
     }
 
     return _cachedClipPath;
@@ -368,16 +345,11 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
     CGPathRef clipPath = [self getClipPath:context];
 
     if (clipPath) {
-        if (!_clipMask) {
-            CGContextAddPath(context, clipPath);
-            if (_clipNode.clipRule == kRNSVGCGFCRuleEvenodd) {
-                CGContextEOClip(context);
-            } else {
-                CGContextClip(context);
-            }
+        CGContextAddPath(context, clipPath);
+        if (_clipRule == kRNSVGCGFCRuleEvenodd) {
+            CGContextEOClip(context);
         } else {
-            CGRect bounds = CGContextGetClipBoundingBox(context);
-            CGContextClipToMask(context, bounds, _clipMask);
+            CGContextClip(context);
         }
     }
 }
@@ -604,9 +576,7 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12;
 {
     CGPathRelease(_cachedClipPath);
     CGPathRelease(_strokePath);
-    CGImageRelease(_clipMask);
     CGPathRelease(_path);
-    _clipMask = nil;
 }
 
 @end