Fix memory issue with ClipPath

Fix memory issue with ClipPath.

ios/Elements/RNSVGClipPath.m

@@ -17,7 +17,7 @@
 
 - (void)saveDefinition
 {
-    [[self getSvgView] defineClipPath:self clipPathRef:self.name];
+    [[self getSvgView] defineClipPath:self clipPathName:self.name];
 }
 
 

ios/Elements/RNSVGGroup.m

@@ -46,7 +46,7 @@
 
 - (CGPathRef)getPath:(CGContextRef)context
 {
-    CGMutablePathRef path = CGPathCreateMutable();
+    CGMutablePathRef __block path = CGPathCreateMutable();
     [self traverseSubviews:^(RNSVGNode *node) {
         CGAffineTransform transform = node.matrix;
         CGPathAddPath(path, &transform, [node getPath:context]);
@@ -60,6 +60,11 @@
 {
     CGAffineTransform matrix = CGAffineTransformConcat(self.matrix, transform);
     
+    CGPathRef clip = [self getComputedClipPath];
+    if (clip && !CGPathContainsPoint(clip, nil, point, NO)) {
+        return nil;
+    }
+    
     for (RNSVGNode *node in [self.subviews reverseObjectEnumerator]) {
         if ([node isKindOfClass:[RNSVGNode class]]) {
             if (event) {
@@ -87,7 +92,7 @@
 {
     if (self.name) {
         RNSVGSvgView* svg = [self getSvgView];
-        [svg defineTemplate:self templateRef:self.name];
+        [svg defineTemplate:self templateName:self.name];
     }
     
     [self traverseSubviews:^(RNSVGNode *node) {

ios/Elements/RNSVGImage.m

@@ -94,7 +94,7 @@
 {
     CGRect rect = [self getRect:context];
     // add hit area
-    self.hitArea = CFAutorelease(CGPathCreateWithRect(rect, nil));
+    self.hitArea = CGPathCreateWithRect(rect, nil);
     [self clip:context];
     
     CGContextSaveGState(context);
@@ -152,7 +152,7 @@
 
 - (CGPathRef)getPath:(CGContextRef)context
 {
-    return CGPathCreateWithRect([self getRect:context], nil);
+    return (CGPathRef)CFAutorelease(CGPathCreateWithRect([self getRect:context], nil));
 }
 
 @end

ios/Elements/RNSVGLinearGradient.m

@@ -32,7 +32,7 @@
     converter.colors = self.gradient;
     converter.points = @[self.x1, self.y1, self.x2, self.y2];
     converter.type = kRNSVGLinearGradient;
-    [[self getSvgView] defineBrushConverter:converter brushConverterRef:self.name];
+    [[self getSvgView] defineBrushConverter:converter brushConverterName:self.name];
 }
 @end
 

ios/Elements/RNSVGPath.m

@@ -40,17 +40,17 @@
     
     if ([self getSvgView].responsible) {
         // Add path to hitArea
-        CGMutablePathRef hitArea = CGPathCreateMutableCopy(path);
+        CGMutablePathRef hitAreaPath = CGPathCreateMutableCopy(path);
         if (self.stroke) {
             // Add stroke to hitArea
-            CGPathRef strokePath = CGPathCreateCopyByStrokingPath(hitArea, nil, self.strokeWidth, self.strokeLinecap, self.strokeLinejoin, self.strokeMiterlimit);
+            CGPathRef strokePath = CGPathCreateCopyByStrokingPath(hitAreaPath, nil, self.strokeWidth, self.strokeLinecap, self.strokeLinejoin, self.strokeMiterlimit);
-            CGPathAddPath(hitArea, nil, strokePath);
+            CGPathAddPath(hitAreaPath, nil, strokePath);
             CGPathRelease(strokePath);
         }
         
         CGAffineTransform transform = self.matrix;
-        self.hitArea = CFAutorelease(CGPathCreateCopyByTransformingPath(hitArea, &transform));
+        self.hitArea = CGPathCreateCopyByTransformingPath(hitAreaPath, &transform);
-        CGPathRelease(hitArea);
+        CGPathRelease(hitAreaPath);
     }
     
     if (self.opacity == 0) {

ios/Elements/RNSVGRadialGradient.m

@@ -30,7 +30,7 @@
     converter.colors = self.gradient;
     converter.points = @[self.fx, self.fy, self.rx, self.ry, self.cx, self.cy];
     converter.type = kRNSVGRadialGradient;
-    [[self getSvgView] defineBrushConverter:converter brushConverterRef:self.name];
+    [[self getSvgView] defineBrushConverter:converter brushConverterName:self.name];
 }
 
 @end

ios/Elements/RNSVGSvgView.h

@@ -19,12 +19,12 @@
 /**
  * define <ClipPath></ClipPath> content as clipPath template.
  */
-- (void)defineClipPath:(__kindof RNSVGNode *)clipPath clipPathRef:(NSString *)clipPathRef;
+- (void)defineClipPath:(__kindof RNSVGNode *)clipPath clipPathName:(NSString *)clipPathName;
-- (RNSVGNode *)getDefinedClipPath:(NSString *)clipPathRef;
+- (RNSVGNode *)getDefinedClipPath:(NSString *)clipPathName;
-- (void)defineTemplate:(__kindof RNSVGNode *)template templateRef:(NSString *)templateRef;
+- (void)defineTemplate:(__kindof RNSVGNode *)template templateName:(NSString *)templateName;
-- (RNSVGNode *)getDefinedTemplate:(NSString *)tempalteRef;
+- (RNSVGNode *)getDefinedTemplate:(NSString *)templateName;
-- (void)defineBrushConverter:(RNSVGBrushConverter *)brushConverter brushConverterRef:(NSString *)brushConverterRef;
+- (void)defineBrushConverter:(RNSVGBrushConverter *)brushConverter brushConverterName:(NSString *)brushConverterName;
-- (RNSVGBrushConverter *)getDefinedBrushConverter:(NSString *)brushConverterRef;
+- (RNSVGBrushConverter *)getDefinedBrushConverter:(NSString *)brushConverterName;
 - (NSString *)getDataURL;
 
 @end

ios/Elements/RNSVGSvgView.m

@@ -83,44 +83,44 @@
     self.backgroundColor = inheritedBackgroundColor;
 }
 
-- (void)defineClipPath:(__kindof RNSVGNode *)clipPath clipPathRef:(NSString *)clipPathRef
+- (void)defineClipPath:(__kindof RNSVGNode *)clipPath clipPathName:(NSString *)clipPathName
 {
     if (!clipPaths) {
         clipPaths = [[NSMutableDictionary alloc] init];
     }
-    [clipPaths setObject:clipPath forKey:clipPathRef];
+    [clipPaths setObject:clipPath forKey:clipPathName];
 }
 
-- (RNSVGNode *)getDefinedClipPath:(NSString *)clipPathRef
+- (RNSVGNode *)getDefinedClipPath:(NSString *)clipPathName
 {
-    return clipPaths ? [clipPaths objectForKey:clipPathRef] : nil;
+    return clipPaths ? [clipPaths objectForKey:clipPathName] : nil;
 }
 
-- (void)defineTemplate:(RNSVGNode *)template templateRef:(NSString *)templateRef
+- (void)defineTemplate:(RNSVGNode *)template templateName:(NSString *)templateName
 {
     if (!templates) {
         templates = [[NSMutableDictionary alloc] init];
     }
-    [templates setObject:template forKey:templateRef];
+    [templates setObject:template forKey:templateName];
 }
 
-- (RNSVGNode *)getDefinedTemplate:(NSString *)tempalteRef
+- (RNSVGNode *)getDefinedTemplate:(NSString *)templateName
 {
-    return templates ? [templates objectForKey:tempalteRef] : nil;
+    return templates ? [templates objectForKey:templateName] : nil;
 }
 
 
-- (void)defineBrushConverter:(RNSVGBrushConverter *)brushConverter brushConverterRef:(NSString *)brushConverterRef
+- (void)defineBrushConverter:(RNSVGBrushConverter *)brushConverter brushConverterName:(NSString *)brushConverterName
 {
     if (!brushConverters) {
         brushConverters = [[NSMutableDictionary alloc] init];
     }
-    [brushConverters setObject:brushConverter forKey:brushConverterRef];
+    [brushConverters setObject:brushConverter forKey:brushConverterName];
 }
 
-- (RNSVGBrushConverter *)getDefinedBrushConverter:(NSString *)brushConverterRef
+- (RNSVGBrushConverter *)getDefinedBrushConverter:(NSString *)brushConverterName
 {
-    return brushConverters ? [brushConverters objectForKey:brushConverterRef] : nil;
+    return brushConverters ? [brushConverters objectForKey:brushConverterName] : nil;
 }
 
 @end

ios/RNSVGNode.h

@@ -20,8 +20,7 @@
 @property (nonatomic, strong) NSString *name;
 @property (nonatomic, assign) CGFloat opacity;
 @property (nonatomic, assign) RNSVGCGFCRule clipRule;
-@property (nonatomic, assign) CGPathRef clipPath; // convert clipPath="M0,0 L0,10 L10,10z" into path
+@property (nonatomic, assign) NSString *clipPath;
-@property (nonatomic, strong) NSString *clipPathRef; // use clipPath="url(#clip)" as ClipPath
 @property (nonatomic, assign) BOOL responsible;
 @property (nonatomic, assign) CGAffineTransform matrix;
 @property (nonatomic, assign) BOOL active;
@@ -37,10 +36,8 @@
  */
 - (void)renderLayerTo:(CGContextRef)context;
 
-- (void)renderClip:(CGContextRef)context;
-
 /**
- * clip node by clipPath or clipPathRef.
+ * clip node by clipPath
  */
 - (void)clip:(CGContextRef)context;
 
@@ -49,6 +46,10 @@
  */
 - (CGPathRef)getPath:(CGContextRef) context;
 
+/**
+ * getComputedClipPath will return the CGPathRef computed with clipPath
+ */
+- (CGPathRef)getComputedClipPath;
 
 /**
  * run hitTest

ios/RNSVGNode.m

@@ -13,6 +13,7 @@
 @implementation RNSVGNode
 {
     BOOL _transparent;
+    CGPathRef _computedClipPath;
 }
 
 - (instancetype)init
@@ -78,24 +79,14 @@
     _matrix = matrix;
 }
 
-- (void)setClipPath:(CGPathRef)clipPath
+- (void)setClipPath:(NSString *)clipPath
 {
     if (_clipPath == clipPath) {
         return;
     }
     [self invalidate];
-    CGPathRelease(_clipPath);
+    _clipPath = clipPath;
-    _clipPath = CGPathRetain(clipPath);
-}
     
-- (void)setClipPathRef:(NSString *)clipPathRef
-{
-    if (_clipPathRef == clipPathRef) {
-        return;
-    }
-    [self invalidate];
-    self.clipPath = nil;
-    _clipPathRef = clipPathRef;
 }
 
 - (void)beginTransparencyLayer:(CGContextRef)context
@@ -117,27 +108,38 @@
     // abstract
 }
 
-- (void)renderClip:(CGContextRef)context
-{
-    if (self.clipPathRef) {
-        self.clipPath = [[[self getSvgView] getDefinedClipPath:self.clipPathRef] getPath:context];
-    }
-}
-
 - (void)clip:(CGContextRef)context
 {
-    CGPathRef clipPath  = self.clipPath;
+    if (self.clipPath) {
+        CGPathRef clip = [[[self getSvgView] getDefinedClipPath:self.clipPath] getPath:context];
         
-    if (clipPath) {
+        if (!clip) {
-        CGContextAddPath(context, clipPath);
+            // TODO: WARNING ABOUT THIS
+            return;
+        }
+        
+        CGContextAddPath(context, clip);
         if (self.clipRule == kRNSVGCGFCRuleEvenodd) {
             CGContextEOClip(context);
         } else {
             CGContextClip(context);
         }
+
+        CGAffineTransform matrix = self.matrix;
+        [self computeClipPath:CGPathCreateCopyByTransformingPath(clip, &matrix)];
     }
 }
 
+- (CGPathRef)getComputedClipPath{
+    return _computedClipPath;
+}
+
+- (void)computeClipPath:(CGPathRef)computedClipPath
+{
+    CGPathRelease(_computedClipPath);
+    _computedClipPath = computedClipPath;
+}
+
 - (CGPathRef)getPath: (CGContextRef) context
 {
     // abstract
@@ -149,10 +151,8 @@
     // abstract
 }
 
-// hitTest delagate
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 {
-    
     // abstract
     return nil;
 }
@@ -177,7 +177,7 @@
 {
     if (self.name) {
         RNSVGSvgView* svg = [self getSvgView];
-        [svg defineTemplate:self templateRef:self.name];
+        [svg defineTemplate:self templateName:self.name];
     }
 }
 
@@ -198,7 +198,7 @@
 
 - (void)dealloc
 {
-    CGPathRelease(_clipPath);
+    CGPathRelease(_computedClipPath);
 }
 
 @end

ios/RNSVGRenderable.m

@@ -137,9 +137,8 @@
         return;
     }
     
-    [self invalidate];
     CGPathRelease(_hitArea);
-    _hitArea = CGPathRetain(hitArea);
+    _hitArea = CGPathRetain(CFAutorelease(hitArea));
 }
 
 - (void)setPropList:(NSArray<NSString *> *)propList
@@ -168,7 +167,6 @@
     CGContextSetAlpha(context, self.opacity);
     
     [self beginTransparencyLayer:context];
-    [self renderClip:context];
     [self renderLayerTo:context];
     [self endTransparencyLayer:context];
 
@@ -191,14 +189,14 @@
     }
 
     CGPathRef hitArea = CGPathCreateCopyByTransformingPath(self.hitArea, &transfrom);
-    CGPathRef clipPath = self.clipPath;
     BOOL contains = CGPathContainsPoint(hitArea, nil, point, NO);
     CGPathRelease(hitArea);
     if (contains) {
-        if (!clipPath) {
+        CGPathRef clipPath = [self getComputedClipPath];
-            return self;
+        if (clipPath) {
-        } else {
             return CGPathContainsPoint(clipPath, nil, point, NO) ? self : nil;
+        } else {
+            return self;
         }
     } else {
         return nil;

ios/Text/RNSVGText.m

@@ -35,7 +35,6 @@
     CGMutablePathRef shape = [self getTextGroupPath:context];
     CGAffineTransform translation = CGAffineTransformMakeTranslation([self getShift:context path:shape], 0);
     CGMutablePathRef path = CGPathCreateCopyByTransformingPath(shape, &translation);
-    CGPathRelease(shape);
     return (CGPathRef)CFAutorelease(path);
 }
 

ios/ViewManagers/RNSVGNodeManager.m

@@ -32,8 +32,7 @@ RCT_EXPORT_MODULE()
 RCT_EXPORT_VIEW_PROPERTY(name, NSString)
 RCT_EXPORT_VIEW_PROPERTY(opacity, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(matrix, CGAffineTransform)
-RCT_EXPORT_VIEW_PROPERTY(clipPathRef, NSString)
+RCT_EXPORT_VIEW_PROPERTY(clipPath, NSString)
-RCT_EXPORT_VIEW_PROPERTY(clipPath, CGPath)
 RCT_EXPORT_VIEW_PROPERTY(clipRule, RNSVGCGFCRule)
 RCT_EXPORT_VIEW_PROPERTY(responsible, BOOL)
 

lib/attributes.js

@@ -46,10 +46,7 @@ const NodeAttributes = {
     },
     opacity: true,
     clipRule: true,
-    clipPathRef: true,
+    clipPath: true,
-    clipPath: {
-        diff: arrayDiffer
-    },
     propList: {
         diff: arrayDiffer
     },

lib/extract/extractClipping.js

@@ -16,9 +16,7 @@ export default function (props) {
         let matched = clipPath.match(clipReg);
 
         if (matched) {
-            clippingProps.clipPathRef = matched[1];
+            clippingProps.clipPath = matched[1];
-        } else {
-            clippingProps.clipPath = new SerializablePath(clipPath).toJSON();
         }
     }