fix: 修复对Window弹窗的指令解析问题。

didi · May 27, 2022 · 6da7816 · 6da7816
1 parent 663e294
commit 6da7816
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/iOS/DiDiPrism/Src/Category/UIView+PrismExtends.h b/iOS/DiDiPrism/Src/Category/UIView+PrismExtends.h
@@ -10,6 +10,7 @@
 
 @interface UIView (PrismExtends)
 
+- (UIScrollView*)prism_UIScrollViewBelow;
 - (UITableView*)prism_UITableViewBelow;
 - (UICollectionView*)prism_UICollectionViewBelow;
 - (UIViewController *)prism_viewController;

diff --git a/iOS/DiDiPrism/Src/Category/UIView+PrismExtends.m b/iOS/DiDiPrism/Src/Category/UIView+PrismExtends.m
@@ -10,6 +10,17 @@
 
 @implementation UIView (PrismExtends)
 #pragma mark - public method
+- (UIScrollView*)prism_UIScrollViewBelow {
+    UIView *touchView = self;
+    do {
+        if ([touchView isKindOfClass:[UIScrollView class]]) {
+            return (UIScrollView*)touchView;
+        }
+        touchView = (UIView*)touchView.nextResponder;
+    } while (touchView && [touchView isKindOfClass:[UIView class]]);
+    return nil;
+}
+
 - (UITableView*)prism_UITableViewBelow {
     UIView *touchView = self;
     do {

diff --git a/iOS/DiDiPrism/Src/Core/Instruction/Parser/PrismBaseInstructionParser+Protected.m b/iOS/DiDiPrism/Src/Core/Instruction/Parser/PrismBaseInstructionParser+Protected.m
@@ -62,6 +62,10 @@ - (UIView*)searchScrollViewCellWithScrollViewClassName:(NSString*)scrollViewClas
                                   cellSectionOrOriginX:(CGFloat)cellSectionOrOriginX
                                       cellRowOrOriginY:(CGFloat)cellRowOrOriginY
                                          fromSuperView:(UIView*)superView {
+    // 类似于Window弹窗，此处的superView已经遍历到具体的cell了，需要回溯到父view。
+    if ([superView isKindOfClass:NSClassFromString(cellClassName)]) {
+        superView = [[superView prism_UIScrollViewBelow] superview] ?: superView;
+    }
     if (!superView.subviews.count) {
         return nil;
     }