Merge pull request #1854 from mahaiyannn/iOS-bugfix-active_pseudo

[iOS] [BugFix] Fix remove active pseudo class doesn't work.
apache · Dec 17, 2018 · 63c4f4d · 63c4f4d
2 parents eacde9e + 16c657b
commit 63c4f4d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXCycleSliderComponent.mm
@@ -376,7 +376,7 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView {
 
 @interface WXCycleSliderComponent () <WXRecycleSliderViewDelegate,WXIndicatorComponentDelegate>
 
-@property (nonatomic, strong) WXRecycleSliderView *recycleSliderView;
+@property (nonatomic, weak) WXRecycleSliderView *recycleSliderView;
 @property (nonatomic, strong) NSTimer *autoTimer;
 @property (nonatomic, assign) NSInteger currentIndex;
 @property (nonatomic, assign) BOOL  autoPlay;

diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
@@ -681,6 +681,7 @@ - (void)_updateStylesOnComponentThread:(NSDictionary *)styles resetStyles:(NSMut
         [_transition _handleTransitionWithStyles:[styles mutableCopy] resetStyles:resetStyles target:self];
     } else {
         styles = [self parseStyles:styles];
+        [self resetPseudoClassStyles:resetStyles];
         [self _updateCSSNodeStyles:styles];
         [self _resetCSSNodeStyles:resetStyles];
     }

diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+PseudoClassManagement.h b/ios/sdk/WeexSDK/Sources/View/WXComponent+PseudoClassManagement.h
@@ -27,6 +27,12 @@
  */
 -(NSMutableDictionary *)parseStyles:(NSDictionary *)styles;
 
+/**
+ *  @abstract reset pseudoClassStyles.
+ *
+ */
+- (void)resetPseudoClassStyles:(NSArray *)resetstyle;
+
 /**
  *  @abstract filter common styles and pseudoClassStyles.
  *

diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+PseudoClassManagement.m b/ios/sdk/WeexSDK/Sources/View/WXComponent+PseudoClassManagement.m
@@ -47,6 +47,17 @@ -(NSMutableDictionary *)parseStyles:(NSDictionary *)styles
     return newStyles;
 }
 
+- (void)resetPseudoClassStyles:(NSArray *)resetstyle {
+    for (NSString* key in resetstyle) {
+        if([key rangeOfString:@":"].location != NSNotFound){
+            [_pseudoClassStyles removeObjectForKey:key];
+        }
+    }
+    if([_pseudoClassStyles count] == 0) {
+        _isListenPseudoTouch = NO;
+    }
+}
+
 - (void)updatePseudoClassStyles:(NSDictionary *)pseudoClassStyles
 {
     WXAssertMainThread();