fix(iOS): fix component layout issue (#915)

callstack · Nov 19, 2024 · 06c8e8f · 06c8e8f
1 parent e6f63c2
commit 06c8e8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/example/src/HeadphonesCarouselExample.tsx b/example/src/HeadphonesCarouselExample.tsx
@@ -261,9 +261,10 @@ export default function HeadphonesCarouselExample() {
           }
         )}
       >
-        {data.map((item, index) => (
+        {data.map(({ key, ...item }, index) => (
           <View collapsable={false} key={index}>
             <Item
+              key={key}
               {...item}
               scrollOffsetAnimatedValue={scrollOffsetAnimatedValue}
               positionAnimatedValue={positionAnimatedValue}

diff --git a/ios/LEGACY/Fabric/LEGACY_RNCPagerViewComponentView.mm b/ios/LEGACY/Fabric/LEGACY_RNCPagerViewComponentView.mm
@@ -92,14 +92,13 @@ - (void)willMoveToSuperview:(UIView *)newSuperview {
 #pragma mark - React API
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
-    UIViewController *wrapper = [[UIViewController alloc] initWithView:childComponentView];
-    [_nativeChildrenViewControllers insertObject:wrapper atIndex:index];
-    [self goTo:_currentIndex animated:NO];
+    UIViewController *vc = [UIViewController new];
+    [vc.view addSubview:childComponentView];
+    [_nativeChildrenViewControllers insertObject:vc atIndex:index];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
-    [[_nativeChildrenViewControllers objectAtIndex:index].view removeFromSuperview];
-    [_nativeChildrenViewControllers objectAtIndex:index].view = nil;
+    [childComponentView removeFromSuperview];
     [_nativeChildrenViewControllers removeObjectAtIndex:index];
 
     NSInteger maxPage = _nativeChildrenViewControllers.count - 1;
@@ -119,11 +118,7 @@ -(void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
 
 -(void)prepareForRecycle {
     [super prepareForRecycle];
-
-    _nativeChildrenViewControllers = [[NSMutableArray alloc] init];
-    [_nativePageViewController.view removeFromSuperview];
     _nativePageViewController = nil;
-
     _currentIndex = -1;
 }