update: filter UITextView、UIScollViewIndicator

tigerAndBull · Nov 2, 2021 · c5fe7dc · c5fe7dc
1 parent 691a1e6
commit c5fe7dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/TABAnimatedDemo/TABAnimated/Product/TABAnimatedProductHelper.m b/TABAnimatedDemo/TABAnimated/Product/TABAnimatedProductHelper.m
@@ -139,14 +139,6 @@ + (void)resetData:(UIView *)view {
 
 + (BOOL)canProduct:(UIView *)view tabAnimated:(TABViewAnimated *)tabAnimated {
 
-    if ([view isKindOfClass:[UITextField class]] && tabAnimated.needToCreateTextFieldLayer) {
-        return YES;
-    }
-
-    if ([view.superview isKindOfClass:[UITextField class]]) {
-        return NO;
-    }
-
     if ([view isKindOfClass:[UICollectionView class]] || [view isKindOfClass:[UITableView class]]) {
         // 判断view为tableview/collectionview时，若有设置骨架动画，则返回NO；否则返回YES，允许设置绘制骨架图
         if (view.tabAnimated) {

diff --git a/TABAnimatedDemo/TABAnimated/Product/TABAnimatedProductImpl.m b/TABAnimatedDemo/TABAnimated/Product/TABAnimatedProductImpl.m
@@ -392,6 +392,8 @@ - (void)_recurseProductLayerWithView:(UIView *)view
         UIView *subV = subViews[i];
         if (subV.tabAnimated) continue;
 
+        if ([self _withoutSubViewsWithView:view tabAnimated:_controlView.tabAnimated]) continue;
+
         BOOL stopRes = NO;
         if (subV.class == _controlView.tabAnimated.withoutSubViewsClass) {
             stopRes = YES;
@@ -510,12 +512,23 @@ - (void)_buttonLayerSyncProperties:(UIButton *)button layer:(TABComponentLayer *
 
 #pragma mark -
 
+- (BOOL)_withoutSubViewsWithView:(UIView *)view tabAnimated:(TABViewAnimated *)tabAnimated {
+    if ([view isKindOfClass:[UITextField class]] && !tabAnimated.needToCreateTextFieldLayer) {
+        return YES;
+    }
+    if ([view isKindOfClass:[UITextView class]]) {
+        return YES;
+    }
+    return NO;
+}
+
 - (BOOL)_cannotBeCreated:(UIView *)view superView:(UIView *)superView rootView:(UIView *)rootView {
 
     if ([view isKindOfClass:[NSClassFromString(@"UITableViewCellContentView") class]] ||
         [view isKindOfClass:[NSClassFromString(@"UICollectionViewCellContentView") class]] ||
         [view isKindOfClass:[NSClassFromString(@"_UISystemBackgroundView") class]] ||
-        [view isKindOfClass:[NSClassFromString(@"_UITableViewHeaderFooterViewBackground") class]]) {
+        [view isKindOfClass:[NSClassFromString(@"_UITableViewHeaderFooterViewBackground") class]] ||
+        [view isKindOfClass:[NSClassFromString(@"_UIScrollViewScrollIndicator") class]]) {
         return YES;
     }