From 8e758c3ead33c3730bd2e721aa5715d79fd0e911 Mon Sep 17 00:00:00 2001
From: Horcrux <master@horcrux.cn>
Date: Sat, 6 Aug 2016 10:01:11 +0800
Subject: [PATCH] fix #69

---
 ios/RNSVGNode.m          | 14 +-------------
 ios/RNSVGRenderable.m    | 21 ++++++++++-----------
 ios/Shapes/RNSVGCircle.m |  2 +-
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/ios/RNSVGNode.m b/ios/RNSVGNode.m
index 300b89c6..bea3f2f7 100644
--- a/ios/RNSVGNode.m
+++ b/ios/RNSVGNode.m
@@ -111,19 +111,7 @@
 
 - (void)renderTo:(CGContextRef)context
 {
-    float opacity = self.opacity;
-
-    // This needs to be painted on a layer before being composited.
-    CGContextSaveGState(context);
-    CGContextConcatCTM(context, self.transform);
-    CGContextSetAlpha(context, opacity);
-
-    [self beginTransparencyLayer:context];
-    [self renderClip:context];
-    [self renderLayerTo:context];
-    [self endTransparencyLayer:context];
-
-    CGContextRestoreGState(context);
+    // abstract
 }
 
 - (void)renderClip:(CGContextRef)context
diff --git a/ios/RNSVGRenderable.m b/ios/RNSVGRenderable.m
index b9d64e69..7be36a3e 100644
--- a/ios/RNSVGRenderable.m
+++ b/ios/RNSVGRenderable.m
@@ -35,6 +35,7 @@
     if (hitArea == _hitArea) {
         return;
     }
+
     [self invalidate];
     CGPathRelease(_hitArea);
     _hitArea = hitArea;
@@ -113,18 +114,16 @@
 
 - (void)renderTo:(CGContextRef)context
 {
-    if (self.opacity <= 0 || self.opacity >= 1 || (self.fill && self.stroke)) {
-        // If we have both fill and stroke, we will need to paint this using normal compositing
-        [super renderTo: context];
-        return;
-    }
-    // This is a terminal with only one painting. Therefore we don't need to paint this
-    // off-screen. We can just composite it straight onto the buffer.
+    // This needs to be painted on a layer before being composited.
     CGContextSaveGState(context);
     CGContextConcatCTM(context, self.transform);
     CGContextSetAlpha(context, self.opacity);
+    
+    [self beginTransparencyLayer:context];
     [self renderClip:context];
     [self renderLayerTo:context];
+    [self endTransparencyLayer:context];
+
     CGContextRestoreGState(context);
 }
 
@@ -183,7 +182,7 @@
 
 - (void)mergeProperties:(__kindof RNSVGNode *)target mergeList:(NSArray<NSString *> *)mergeList
 {
-    
+
     [self mergeProperties:target mergeList:mergeList inherited:NO];
 }
 
@@ -192,12 +191,12 @@
     if (mergeList.count == 0) {
         return;
     }
-    
+
     if (!inherited) {
         _originProperties = [[NSMutableDictionary alloc] init];
         _changedList = mergeList;
     }
-    
+
     for (NSString *key in mergeList) {
         if (inherited) {
             [self inheritProperty:target propName:key];
@@ -225,7 +224,7 @@
         NSMutableArray *copy = [self.propList mutableCopy];
         [copy addObject:propName];
         self.propList = [copy copy];
-        
+
         [self setValue:[parent valueForKey:propName] forKey:propName];
     }
 }
diff --git a/ios/Shapes/RNSVGCircle.m b/ios/Shapes/RNSVGCircle.m
index ba016e85..29774083 100644
--- a/ios/Shapes/RNSVGCircle.m
+++ b/ios/Shapes/RNSVGCircle.m
@@ -62,7 +62,7 @@
         r = [self.r floatValue];
     }
     
-    CGPathAddArc(path, nil, cx, cy, r, 0, 2*M_PI, YES);
+    CGPathAddArc(path, nil, cx, cy, r, 0, 2*M_PI, NO);
     return (CGPathRef)CFAutorelease(path);
 }