fix: deleting multiple views on iOS (#148)

Author: krystiansliwa

ios/ReactNativePageView.m

@@ -231,13 +231,13 @@ - (void)layoutSubviews {
     if (_reactPageViewController) {
         [self shouldScroll:_scrollEnabled];
         //Below line fix bug, where the view does not update after orientation changed.
-        [self goTo:[NSNumber numberWithInteger:_currentIndex] animated:NO];
+        [self goTo:@(_currentIndex) animated:NO];
     } else {
         [self embed];
     }
 }
 
-- (void)didUpdateReactSubviews {
+- (void)didUpdateReactSubviews {    
     if (_childrenViewControllers.count == 0){
         return;
     }
@@ -258,7 +258,7 @@ - (void)addPages {
         }
         _childrenViewControllers = tempChildrenViewControllers;
         _reactPageIndicatorView.numberOfPages = _childrenViewControllers.count;
-        [self goTo:[NSNumber numberWithInteger:_currentIndex] animated:NO];
+        [self goTo:@(_currentIndex) animated:NO];
 
     } else {
         RCTLog(@"getParentViewController returns nil");
@@ -365,16 +365,16 @@ - (void)setReactViewControllers:(NSInteger)index
     __weak ReactNativePageView *weakSelf = self;
     uint16_t coalescingKey = _coalescingKey++;
     [_reactPageViewController
-     setViewControllers:[NSArray arrayWithObjects:pageViewController, nil]
+     setViewControllers:@[pageViewController]
      direction:direction
      animated:animated
      completion:^(BOOL finished) {
-         weakSelf.currentIndex = index;
-         if (weakSelf.eventDispatcher) {
-             [weakSelf.eventDispatcher sendEvent:[[RCTOnPageSelected alloc] initWithReactTag:weakSelf.reactTag position:[NSNumber numberWithInteger:index] coalescingKey:coalescingKey]];
-         }
-         
-     }];
+        weakSelf.currentIndex = index;
+        if (weakSelf.eventDispatcher) {
+            [weakSelf.eventDispatcher sendEvent:[[RCTOnPageSelected alloc] initWithReactTag:weakSelf.reactTag position:[NSNumber numberWithInteger:index] coalescingKey:coalescingKey]];
+        }
+        
+    }];
 }
 
 - (UIViewController *)createChildViewController:(UIView *)view {
@@ -384,22 +384,21 @@ - (UIViewController *)createChildViewController:(UIView *)view {
 }
 
 - (void)goTo:(NSNumber *)index animated:(BOOL)animated {
-    if (_currentIndex >= 0 &&
-        index.integerValue < _childrenViewControllers.count) {
-        
-        _reactPageIndicatorView.currentPage = index.integerValue;
+    if (_currentIndex >= 0) {
         UIPageViewControllerNavigationDirection direction =
         (index.integerValue > _currentIndex)
         ? UIPageViewControllerNavigationDirectionForward
         : UIPageViewControllerNavigationDirectionReverse;
 
-        UIViewController *viewController =
-        [_childrenViewControllers objectAtIndex:index.integerValue];
-        [self setReactViewControllers:index.integerValue
-                                 with:viewController
+        
+        NSInteger indexToDisplay = index.integerValue < _childrenViewControllers.count ? index.integerValue : _childrenViewControllers.count - 1;
+        UIViewController *controllerToDisplay = _childrenViewControllers[indexToDisplay];
+        _reactPageIndicatorView.currentPage = indexToDisplay;
+        
+        [self setReactViewControllers:indexToDisplay
+                                 with:controllerToDisplay
                             direction:direction
                              animated:animated];
-        
     }
 }
 
@@ -478,8 +477,6 @@ - (void)shouldShowPageIndicator:(BOOL)showPageIndicator {
 }
 
 - (UIPageControl *)createPageIndicator:(UIView *)parentView {
-    CGPoint parentOrigin = parentView.frame.origin;
-    CGSize parentSize = parentView.frame.size;
     UIPageControl *pageControl = [[UIPageControl alloc] init];
     pageControl.numberOfPages = _childrenViewControllers.count;
     pageControl.currentPage = _initialPage;
@@ -522,4 +519,3 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
 }
 
 @end
-