fix(ios): error in move node operation of ViewPager

Tencent · May 22, 2024 · dad8fb0 · dad8fb0
1 parent 70c4626
commit dad8fb0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/renderer/native/ios/renderer/component/view/HippyShadowView.mm b/renderer/native/ios/renderer/component/view/HippyShadowView.mm
@@ -196,9 +196,11 @@ - (void)insertHippySubview:(HippyShadowView *)subview atIndex:(NSUInteger)atInde
 }
 
 - (void)moveHippySubview:(id<HippyComponent>)subview toIndex:(NSUInteger)atIndex {
-    if ([_objectSubviews containsObject:subview]) {
-        [_objectSubviews removeObject:subview];
+    if (!subview) {
+        HippyAssert(subview != nil, @"subview should not be nil!");
+        return;
     }
+    [self removeHippySubview:subview];
     [self insertHippySubview:subview atIndex:atIndex];
 }
 

diff --git a/renderer/native/ios/renderer/component/view/UIView+Hippy.mm b/renderer/native/ios/renderer/component/view/UIView+Hippy.mm
@@ -182,13 +182,7 @@ - (void)moveHippySubview:(UIView *)subview toIndex:(NSUInteger)atIndex {
     if (nil == subview) {
         return;
     }
-    NSMutableArray *subviews = objc_getAssociatedObject(self, @selector(subcomponents));
-    if (!subviews) {
-        return;
-    }
-    if ([subviews containsObject:subview]) {
-        [subviews removeObject:subview];
-    }
+    [self removeHippySubview:subview];
     [self insertHippySubview:subview atIndex:atIndex];
 }