diff --git a/ios/RNSVGRenderable.m b/ios/RNSVGRenderable.m index f17046f5..5b24b256 100644 --- a/ios/RNSVGRenderable.m +++ b/ios/RNSVGRenderable.m @@ -13,7 +13,6 @@ NSMutableDictionary *_originProperties; NSArray *_lastMergedList; NSArray *_attributeList; - BOOL _fillEvenodd; CGPathRef _hitArea; } @@ -23,6 +22,7 @@ _fillOpacity = 1; _strokeOpacity = 1; _strokeWidth = 1; + _fillRule = kRNSVGCGFCRuleNonzero; } return self; } @@ -51,7 +51,6 @@ return; } [self invalidate]; - _fillEvenodd = fillRule == kRNSVGCGFCRuleEvenodd; _fillRule = fillRule; } @@ -181,11 +180,13 @@ BOOL fillColor = NO; [self clip:context]; + BOOL evenodd = self.fillRule == kRNSVGCGFCRuleEvenodd; + if (self.fill) { fillColor = [self.fill applyFillColor:context opacity:self.fillOpacity]; if (fillColor) { - mode = _fillEvenodd ? kCGPathEOFill : kCGPathFill; + mode = evenodd ? kCGPathEOFill : kCGPathFill; } else { CGContextSaveGState(context); CGContextAddPath(context, path); @@ -221,7 +222,7 @@ BOOL strokeColor = [self.stroke applyStrokeColor:context opacity:self.strokeOpacity]; if (strokeColor && fillColor) { - mode = _fillEvenodd ? kCGPathEOFillStroke : kCGPathFillStroke; + mode = evenodd ? kCGPathEOFillStroke : kCGPathFillStroke; } else if (!strokeColor) { // draw fill if (fillColor) { diff --git a/ios/Utils/RCTConvert+RNSVG.m b/ios/Utils/RCTConvert+RNSVG.m index b9cb0d50..d205deea 100644 --- a/ios/Utils/RCTConvert+RNSVG.m +++ b/ios/Utils/RCTConvert+RNSVG.m @@ -12,8 +12,6 @@ #import "RNSVGPattern.h" #import "RNSVGSolidColorBrush.h" #import -#import "RNSVGCGFCRule.h" -#import "RNSVGVBMOS.h" #import @implementation RCTConvert (RNSVG)