[WEEX-616][iOS] scroller support borderRadius (#1533)

apache · Sep 19, 2018 · cc0f889 · cc0f889
1 parent 03d8db2
commit cc0f889
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -45,6 +45,7 @@ typedef id (^WXDataBindingBlock)(NSDictionary *data, BOOL *needUpdate);
      */
     UIColor *_backgroundColor;
     NSString *_backgroundImage;
+    NSString *_clipRadius;
     WXClipType _clipToBounds;
     UIView *_view;
     CGFloat _opacity;

diff --git a/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m b/ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
@@ -411,6 +411,15 @@ - (void)_drawBorderWithContext:(CGContextRef)context size:(CGSize)size
     }
 
     CGContextStrokePath(context);
+
+    //clipRadius is beta feature
+    //TO DO: remove _clipRadius property
+    if (_clipToBounds && _clipRadius) {
+        BOOL radiusEqual = _borderTopLeftRadius == _borderTopRightRadius && _borderTopRightRadius == _borderBottomRightRadius && _borderBottomRightRadius == _borderBottomLeftRadius;
+        if (!radiusEqual) {
+            self.layer.mask = [self drawBorderRadiusMaskLayer:rect];
+        }
+    }
 }
 
 - (BOOL)_needsDrawBorder

diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
@@ -146,6 +146,12 @@ - (instancetype)initWithRef:(NSString *)ref
             _testId = [WXConvert NSString:attributes[@"testId"]];
         }
 
+        //may be removed when this feature is stable
+        if (attributes[@"clipRadius"])
+        {
+            _clipRadius = [WXConvert NSString:attributes[@"clipRadius"]];
+        }
+
 #ifdef DEBUG
         WXLogDebug(@"flexLayout -> init component: ref : %@ , styles: %@",ref,styles);
         WXLogDebug(@"flexLayout -> init component: ref : %@ , attributes: %@",ref,attributes);