添加eventPenetrationEnabled属性，属性为true时，当响应者为自身时将事件穿透传递（子视图正常响应）

apache · Aug 9, 2019 · 5f586c3 · 5f586c3
1 parent b8ac8fa
commit 5f586c3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h b/ios/sdk/WeexSDK/Sources/Component/WXComponent_internal.h
@@ -71,7 +71,8 @@ typedef id (^WXDataBindingBlock)(NSDictionary *data, BOOL *needUpdate);
     NSString * _groupAccessibilityChildren; // voice-over navigation order
     NSString * _testId;// just for auto-test
 
-    BOOL  _userInteractionEnabled;
+    BOOL _userInteractionEnabled;
+    BOOL _eventPenetrationEnabled;
     BOOL _accessibilityMagicTapEvent;
 
     /**

diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
@@ -100,6 +100,7 @@ - (instancetype)initWithRef:(NSString *)ref
         _ariaHidden = nil;
         _accessible = nil;
         _userInteractionEnabled = YES;
+        _eventPenetrationEnabled = NO;
         _accessibilityHintContent = nil;
         _cancelsTouchesInView = YES;
 
@@ -124,6 +125,10 @@ - (instancetype)initWithRef:(NSString *)ref
             _userInteractionEnabled = [WXConvert BOOL:attributes[@"userInteractionEnabled"]];
         }
 
+        if (attributes[@"eventPenetrationEnabled"]) {
+            _eventPenetrationEnabled = [WXConvert BOOL:attributes[@"eventPenetrationEnabled"]];
+        }
+
         if (attributes[@"ariaHidden"]) {
 
             _ariaHidden = [WXConvert NSString:attributes[@"ariaHidden"]];
@@ -405,9 +410,9 @@ - (UIView *)view
         _view.wx_component = self;
         _view.wx_ref = self.ref;
         _layer.wx_component = self;
-
+        
         [_view setUserInteractionEnabled:_userInteractionEnabled];
-
+        
         if (_roles) {
             [_view setAccessibilityTraits:[self _parseAccessibilityTraitsWithTraits:self.view.accessibilityTraits roles:_roles]];
         }
@@ -891,6 +896,10 @@ - (void)_configWXComponentA11yWithAttributes:(NSDictionary *)attributes
         [self.view setUserInteractionEnabled:_userInteractionEnabled];
     }
 
+    if (attributes[@"eventPenetrationEnabled"]) {
+        _eventPenetrationEnabled = [WXConvert BOOL:attributes[@"eventPenetrationEnabled"]];
+    }
+
     if (attributes[@"testId"]) {
         [self.view setAccessibilityIdentifier:[WXConvert NSString:attributes[@"testId"]]];
     }

diff --git a/ios/sdk/WeexSDK/Sources/View/WXView.m b/ios/sdk/WeexSDK/Sources/View/WXView.m
@@ -40,6 +40,9 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
 
     UIView* result = [super hitTest:point withEvent:event];
     if (result) {
+        if (self.wx_component->_eventPenetrationEnabled && result == self) {
+            return nil;
+        }
         return result;
     }