react-native-screens 3.13.0 → 3.14.1

package/ios/RNSFullWindowOverlay.m

@@ -1,105 +0,0 @@
-#import <UIKit/UIKit.h>
-
-#import "RNSFullWindowOverlay.h"
-
-#import <React/RCTTouchHandler.h>
-
-@implementation RNSFullWindowOverlayContainer
-
-- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
-{
-  for (UIView *view in [self subviews]) {
-    if (view.userInteractionEnabled && [view pointInside:[self convertPoint:point toView:view] withEvent:event]) {
-      return YES;
-    }
-  }
-  return NO;
-}
-
-@end
-
-@implementation RNSFullWindowOverlay {
-  __weak RCTBridge *_bridge;
-  RNSFullWindowOverlayContainer *_container;
-  CGRect _reactFrame;
-  RCTTouchHandler *_touchHandler;
-}
-
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-{
-  if (self = [super init]) {
-    _bridge = bridge;
-    _reactFrame = CGRectNull;
-    _container = self.container;
-    [self show];
-  }
-
-  return self;
-}
-
-- (void)reactSetFrame:(CGRect)frame
-{
-  _reactFrame = frame;
-  [_container setFrame:frame];
-}
-
-- (void)addSubview:(UIView *)view
-{
-  [_container addSubview:view];
-}
-
-- (RNSFullWindowOverlayContainer *)container
-{
-  if (_container == nil) {
-    _container = [[RNSFullWindowOverlayContainer alloc] initWithFrame:_reactFrame];
-  }
-
-  return _container;
-}
-
-- (void)show
-{
-  UIWindow *window = RCTSharedApplication().delegate.window;
-  [window addSubview:_container];
-}
-
-- (void)hide
-{
-  if (!_container) {
-    return;
-  }
-
-  [_container removeFromSuperview];
-}
-
-- (void)didMoveToWindow
-{
-  if (self.window == nil) {
-    [self hide];
-    [_touchHandler detachFromView:_container];
-  } else {
-    if (_touchHandler == nil) {
-      _touchHandler = [[RCTTouchHandler alloc] initWithBridge:_bridge];
-    }
-    [_touchHandler attachToView:_container];
-  }
-}
-
-- (void)invalidate
-{
-  [self hide];
-  _container = nil;
-}
-
-@end
-
-@implementation RNSFullWindowOverlayManager
-
-RCT_EXPORT_MODULE()
-
-- (UIView *)view
-{
-  return [[RNSFullWindowOverlay alloc] initWithBridge:self.bridge];
-}
-
-@end

package/ios/RNSScreenComponentView.h

@@ -1,23 +0,0 @@
-#import <UIKit/UIKit.h>
-
-#import <React/RCTViewComponentView.h>
-#import "RNSScreenController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RNSScreenComponentView : RCTViewComponentView
-
-@property (weak, nonatomic) UIView *reactSuperview;
-@property (weak, nonatomic) UIView *config;
-@property (nonatomic, retain) RNSScreenController *controller;
-
-- (void)notifyWillAppear;
-- (void)notifyWillDisappear;
-- (void)notifyAppear;
-- (void)notifyDisappear;
-- (void)updateBounds;
-- (void)notifyDismissedWithCount:(int)dismissCount;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/RNSScreenComponentView.mm

@@ -1,159 +0,0 @@
-#import "RNSScreenComponentView.h"
-#import "RNSScreenStackHeaderConfigComponentView.h"
-
-#import <React/RCTConversions.h>
-#import <React/RCTMountingTransactionObserving.h>
-
-#import <react/renderer/components/rnscreens/EventEmitters.h>
-#import <react/renderer/components/rnscreens/Props.h>
-#import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import <rnscreens/RNSScreenComponentDescriptor.h>
-
-#import "RCTFabricComponentsPlugins.h"
-
-using namespace facebook::react;
-
-@interface RNSScreenComponentView () <RCTRNSScreenViewProtocol, RCTMountingTransactionObserving>
-@end
-
-@implementation RNSScreenComponentView {
-  RNSScreenController *_controller;
-  RNSScreenShadowNode::ConcreteState::Shared _state;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNSScreenProps>();
-    _props = defaultProps;
-    _controller = [[RNSScreenController alloc] initWithView:self];
-  }
-
-  return self;
-}
-
-- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
-{
-  [super mountChildComponentView:childComponentView index:index];
-  if ([childComponentView isKindOfClass:[RNSScreenStackHeaderConfigComponentView class]]) {
-    _config = childComponentView;
-    ((RNSScreenStackHeaderConfigComponentView *)childComponentView).screenView = self;
-  }
-}
-
-- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
-{
-  [self.controller setViewToSnapshot];
-  if ([childComponentView isKindOfClass:[RNSScreenStackHeaderConfigComponentView class]]) {
-    _config = nil;
-  }
-  [super unmountChildComponentView:childComponentView index:index];
-}
-
-- (void)updateBounds
-{
-  if (_state != nullptr) {
-    auto boundsSize = self.bounds.size;
-    auto newState = RNSScreenState{RCTSizeFromCGSize(boundsSize)};
-    _state->updateState(std::move(newState));
-    UINavigationController *navctr = _controller.navigationController;
-    [navctr.view setNeedsLayout];
-  }
-}
-
-- (UIView *)reactSuperview
-{
-  return _reactSuperview;
-}
-
-- (void)notifyWillAppear
-{
-  // If screen is already unmounted then there will be no event emitter
-  // it will be cleaned in prepareForRecycle
-  if (_eventEmitter != nullptr) {
-    std::dynamic_pointer_cast<const RNSScreenEventEmitter>(_eventEmitter)
-        ->onWillAppear(RNSScreenEventEmitter::OnWillAppear{});
-  }
-}
-
-- (void)notifyWillDisappear
-{
-  // If screen is already unmounted then there will be no event emitter
-  // it will be cleaned in prepareForRecycle
-  if (_eventEmitter != nullptr) {
-    std::dynamic_pointer_cast<const RNSScreenEventEmitter>(_eventEmitter)
-        ->onWillDisappear(RNSScreenEventEmitter::OnWillDisappear{});
-  }
-}
-
-- (void)notifyAppear
-{
-  // If screen is already unmounted then there will be no event emitter
-  // it will be cleaned in prepareForRecycle
-  if (_eventEmitter != nullptr) {
-    std::dynamic_pointer_cast<const RNSScreenEventEmitter>(_eventEmitter)->onAppear(RNSScreenEventEmitter::OnAppear{});
-  }
-}
-
-- (void)notifyDismissedWithCount:(int)dismissCount
-{
-  // If screen is already unmounted then there will be no event emitter
-  // it will be cleaned in prepareForRecycle
-  if (_eventEmitter != nullptr) {
-    std::dynamic_pointer_cast<const RNSScreenEventEmitter>(_eventEmitter)
-        ->onDismissed(RNSScreenEventEmitter::OnDismissed{dismissCount : dismissCount});
-  }
-}
-
-- (void)notifyDisappear
-{
-  // If screen is already unmounted then there will be no event emitter
-  // it will be cleaned in prepareForRecycle
-  if (_eventEmitter != nullptr) {
-    std::dynamic_pointer_cast<const RNSScreenEventEmitter>(_eventEmitter)
-        ->onDisappear(RNSScreenEventEmitter::OnDisappear{});
-  }
-}
-
-#pragma mark - RCTMountingTransactionObserving
-
-- (void)mountingTransactionWillMountWithMetadata:(MountingTransactionMetadata const &)metadata
-{
-  [self.controller takeSnapshot];
-}
-
-#pragma mark - RCTComponentViewProtocol
-
-- (void)prepareForRecycle
-{
-  [super prepareForRecycle];
-  // TODO: Make sure that there is no edge case when this should be uncommented
-  // _controller=nil;
-  _state.reset();
-}
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return concreteComponentDescriptorProvider<RNSScreenComponentDescriptor>();
-}
-
-- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
-{
-  const auto &oldScreenProps = *std::static_pointer_cast<const RNSScreenProps>(_props);
-  const auto &newScreenProps = *std::static_pointer_cast<const RNSScreenProps>(props);
-
-  [super updateProps:props oldProps:oldProps];
-}
-
-- (void)updateState:(facebook::react::State::Shared const &)state
-           oldState:(facebook::react::State::Shared const &)oldState
-{
-  _state = std::static_pointer_cast<const RNSScreenShadowNode::ConcreteState>(state);
-}
-
-@end
-
-Class<RCTComponentViewProtocol> RNSScreenCls(void)
-{
-  return RNSScreenComponentView.class;
-}

package/ios/RNSScreenController.h

@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface RNSScreenController : UIViewController
-
-- (instancetype)initWithView:(UIView *)view;
-- (void)takeSnapshot;
-- (void)setViewToSnapshot;
-- (void)resetViewToScreen;
-
-@end

package/ios/RNSScreenController.mm

@@ -1,79 +0,0 @@
-#import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-#import "RNSScreenComponentView.h"
-
-@implementation RNSScreenController {
-  CGRect _lastViewFrame;
-  RNSScreenComponentView *_initialView;
-  UIView *_snapshot;
-}
-
-- (instancetype)initWithView:(UIView *)view
-{
-  if (self = [super init]) {
-    self.view = view;
-    if ([view isKindOfClass:[RNSScreenComponentView class]]) {
-      _initialView = (RNSScreenComponentView *)view;
-    } else {
-      RCTLogError(@"ScreenController can only be initialized with ScreenComponentView");
-    }
-  }
-  return self;
-}
-
-- (void)takeSnapshot
-{
-  _snapshot = [self.view snapshotViewAfterScreenUpdates:NO];
-}
-
-- (void)setViewToSnapshot
-{
-  [self.view removeFromSuperview];
-  self.view = _snapshot;
-}
-
-- (void)resetViewToScreen
-{
-  [self.view removeFromSuperview];
-  self.view = _initialView;
-}
-
-// TODO: Find out why this is executed when screen is going out
-- (void)viewWillAppear:(BOOL)animated
-{
-  [super viewWillAppear:animated];
-  [_initialView notifyWillAppear];
-}
-
-- (void)viewWillDisappear:(BOOL)animated
-{
-  [super viewWillDisappear:animated];
-  [_initialView notifyWillDisappear];
-}
-
-- (void)viewDidAppear:(BOOL)animated
-{
-  [super viewDidAppear:animated];
-  [_initialView notifyAppear];
-}
-
-- (void)viewDidDisappear:(BOOL)animated
-{
-  [super viewDidDisappear:animated];
-  [_initialView notifyDisappear];
-  if (self.parentViewController == nil && self.presentingViewController == nil) {
-    // screen dismissed, send event
-    [_initialView notifyDismissedWithCount:1];
-  }
-}
-
-- (void)viewDidLayoutSubviews
-{
-  [super viewDidLayoutSubviews];
-  BOOL isDisplayedWithinUINavController = [self.parentViewController isKindOfClass:[UINavigationController class]];
-  if (isDisplayedWithinUINavController && !CGRectEqualToRect(_lastViewFrame, self.view.frame)) {
-    _lastViewFrame = self.view.frame;
-    [_initialView updateBounds];
-  }
-}
-
-@end

package/ios/RNSScreenStackComponentView.h

@@ -1,15 +0,0 @@
-#import <UIKit/UIKit.h>
-
-#import <React/RCTViewComponentView.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface RNSScreenStackComponentView : RCTViewComponentView
-
-@end
-
-@interface RNSScreenStackView : UIView
-- (instancetype)initWithComponentView:(RNSScreenStackComponentView *)component;
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/RNSScreenStackComponentView.mm

@@ -1,295 +0,0 @@
-#import "RNSScreenStackComponentView.h"
-#import "RNSScreenComponentView.h"
-#import "RNSScreenStackHeaderConfigComponentView.h"
-
-#import <React/UIView+React.h>
-#import <react/renderer/components/rnscreens/ComponentDescriptors.h>
-#import <react/renderer/components/rnscreens/EventEmitters.h>
-#import <react/renderer/components/rnscreens/Props.h>
-#import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
-
-#import "RCTFabricComponentsPlugins.h"
-
-using namespace facebook::react;
-
-@interface RNSScreenStackComponentView () <
-    UINavigationControllerDelegate,
-    UIAdaptivePresentationControllerDelegate,
-    UIGestureRecognizerDelegate,
-    UIViewControllerTransitioningDelegate>
-@end
-
-@implementation RNSScreenStackComponentView {
-  UINavigationController *_controller;
-  NSMutableArray<RNSScreenComponentView *> *_reactSubviews;
-  BOOL _invalidated;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNSScreenStackProps>();
-    _props = defaultProps;
-    _reactSubviews = [NSMutableArray new];
-    _controller = [[UINavigationController alloc] init];
-    _controller.delegate = self;
-    [_controller setViewControllers:@[ [UIViewController new] ]];
-    _invalidated = NO;
-  }
-
-  return self;
-}
-
-- (void)markChildUpdated
-{
-  // do nothing
-}
-
-- (void)didUpdateChildren
-{
-  // do nothing
-}
-
-- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
-{
-  if (![childComponentView isKindOfClass:[RNSScreenComponentView class]]) {
-    RCTLogError(@"ScreenStack only accepts children of type Screen");
-    return;
-  }
-
-  RCTAssert(
-      childComponentView.reactSuperview == nil,
-      @"Attempt to mount already mounted component view. (parent: %@, child: %@, index: %@, existing parent: %@)",
-      self,
-      childComponentView,
-      @(index),
-      @([childComponentView.superview tag]));
-
-  [_reactSubviews insertObject:(RNSScreenComponentView *)childComponentView atIndex:index];
-  ((RNSScreenComponentView *)childComponentView).reactSuperview = self;
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self maybeAddToParentAndUpdateContainer];
-  });
-}
-
-- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
-{
-  RNSScreenComponentView *screenChildComponent = (RNSScreenComponentView *)childComponentView;
-  RCTAssert(
-      screenChildComponent.reactSuperview == self,
-      @"Attempt to unmount a view which is mounted inside different view. (parent: %@, child: %@, index: %@)",
-      self,
-      screenChildComponent,
-      @(index));
-  RCTAssert(
-      (_reactSubviews.count > index) && [_reactSubviews objectAtIndex:index] == childComponentView,
-      @"Attempt to unmount a view which has a different index. (parent: %@, child: %@, index: %@, actual index: %@, tag at index: %@)",
-      self,
-      screenChildComponent,
-      @(index),
-      @([_reactSubviews indexOfObject:screenChildComponent]),
-      @([[_reactSubviews objectAtIndex:index] tag]));
-  screenChildComponent.reactSuperview = nil;
-  [_reactSubviews removeObject:screenChildComponent];
-  [screenChildComponent removeFromSuperview];
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self maybeAddToParentAndUpdateContainer];
-  });
-}
-
-- (NSArray<UIView *> *)reactSubviews
-{
-  return _reactSubviews;
-}
-
-- (void)didMoveToWindow
-{
-  [super didMoveToWindow];
-  if (!_invalidated) {
-    // We check whether the view has been invalidated before running side-effects in didMoveToWindow
-    // This is needed because when LayoutAnimations are used it is possible for view to be re-attached
-    // to a window despite the fact it has been removed from the React Native view hierarchy.
-    // See https://github.com/software-mansion/react-native-screens/pull/700
-    [self maybeAddToParentAndUpdateContainer];
-  }
-}
-
-- (void)navigationController:(UINavigationController *)navigationController
-      willShowViewController:(UIViewController *)viewController
-                    animated:(BOOL)animated
-{
-  UIView *view = viewController.view;
-  if ([view isKindOfClass:RNSScreenComponentView.class]) {
-    RNSScreenStackHeaderConfigComponentView *config =
-        (RNSScreenStackHeaderConfigComponentView *)((RNSScreenComponentView *)view).config;
-    [RNSScreenStackHeaderConfigComponentView willShowViewController:viewController animated:animated withConfig:config];
-  }
-}
-
-- (void)maybeAddToParentAndUpdateContainer
-{
-  BOOL wasScreenMounted = _controller.parentViewController != nil;
-  BOOL isScreenReadyForShowing = self.window;
-  if (!isScreenReadyForShowing && !wasScreenMounted) {
-    return;
-  }
-  [self updateContainer];
-  if (!wasScreenMounted) {
-    // when stack hasn't been added to parent VC yet we do two things:
-    // 1) we run updateContainer (the one above) – we do this because we want push view controllers to
-    // be installed before the VC is mounted. If we do that after it is added to parent the push
-    // updates operations are going to be blocked by UIKit.
-    // 2) we add navigation VS to parent – this is needed for the VC lifecycle events to be dispatched
-    // properly
-    // 3) we again call updateContainer – this time we do this to open modal controllers. Modals
-    // won't open in (1) because they require navigator to be added to parent. We handle that case
-    // gracefully in setModalViewControllers and can retry opening at any point.
-    [self reactAddControllerToClosestParent:_controller];
-    [self updateContainer];
-  }
-}
-
-- (void)reactAddControllerToClosestParent:(UIViewController *)controller
-{
-  if (!controller.parentViewController) {
-    UIView *parentView = (UIView *)self.reactSuperview;
-    while (parentView) {
-      if ([parentView reactViewController]) {
-        [parentView.reactViewController addChildViewController:controller];
-        [self addSubview:controller.view];
-#if !TARGET_OS_TV
-        _controller.interactivePopGestureRecognizer.delegate = self;
-#endif
-        [self navigationController:_controller willShowViewController:_controller.topViewController animated:NO];
-      }
-      parentView = (UIView *)parentView.reactSuperview;
-    }
-    return;
-  }
-}
-
-- (void)setPushViewControllers:(NSArray<UIViewController *> *)controllers
-{
-  // when there is no change we return immediately
-  if ([_controller.viewControllers isEqualToArray:controllers]) {
-    return;
-  }
-
-  // if view controller is not yet attached to window we skip updates now and run them when view
-  // is attached
-  if (self.window == nil) {
-    return;
-  }
-
-  UIViewController *top = controllers.lastObject;
-  UIViewController *lastTop = _controller.viewControllers.lastObject;
-
-  // at the start we set viewControllers to contain a single UIVIewController
-  // instance. This is a workaround for header height adjustment bug (see comment
-  // in the init function). Here, we need to detect if the initial empty
-  // controller is still there
-  BOOL firstTimePush = ![lastTop isKindOfClass:[RNSScreenController class]];
-
-  BOOL shouldAnimate = YES;
-
-  if (firstTimePush) {
-    // nothing pushed yet
-    [_controller setViewControllers:controllers animated:NO];
-  } else if (top != lastTop) {
-    if (![controllers containsObject:lastTop]) {
-      // if the previous top screen does not exist anymore and the new top was not on the stack before, probably replace
-      // was called, so we check the animation
-      if (![_controller.viewControllers containsObject:top]) {
-        // setting new controllers with animation does `push` animation by default
-        auto screenController = (RNSScreenController *)top;
-        [screenController resetViewToScreen];
-        [_controller setViewControllers:controllers animated:YES];
-      } else {
-        // last top controller is no longer on stack
-        // in this case we set the controllers stack to the new list with
-        // added the last top element to it and perform (animated) pop
-        NSMutableArray *newControllers = [NSMutableArray arrayWithArray:controllers];
-        [newControllers addObject:lastTop];
-        [_controller setViewControllers:newControllers animated:NO];
-        [_controller popViewControllerAnimated:shouldAnimate];
-      }
-    } else if (![_controller.viewControllers containsObject:top]) {
-      // new top controller is not on the stack
-      // in such case we update the stack except from the last element with
-      // no animation and do animated push of the last item
-      NSMutableArray *newControllers = [NSMutableArray arrayWithArray:controllers];
-      [newControllers removeLastObject];
-      [_controller setViewControllers:newControllers animated:NO];
-      auto screenController = (RNSScreenController *)top;
-      [screenController resetViewToScreen];
-      [_controller pushViewController:top animated:shouldAnimate];
-    } else {
-      // don't really know what this case could be, but may need to handle it
-      // somehow
-      [_controller setViewControllers:controllers animated:shouldAnimate];
-    }
-  } else {
-    // change wasn't on the top of the stack. We don't need animation.
-    [_controller setViewControllers:controllers animated:NO];
-  }
-}
-
-- (void)updateContainer
-{
-  NSMutableArray<UIViewController *> *pushControllers = [NSMutableArray new];
-  for (RNSScreenComponentView *screen in _reactSubviews) {
-    if (screen.controller != nil) {
-      if (pushControllers.count == 0) {
-        // first screen on the list needs to be places as "push controller"
-        [pushControllers addObject:screen.controller];
-      } else {
-        [pushControllers addObject:screen.controller];
-      }
-    }
-  }
-
-  [self setPushViewControllers:pushControllers];
-}
-
-- (void)layoutSubviews
-{
-  [super layoutSubviews];
-  _controller.view.frame = self.bounds;
-}
-
-- (void)dismissOnReload
-{
-  auto screenController = (RNSScreenController *)_controller.viewControllers.lastObject;
-  [screenController resetViewToScreen];
-}
-
-#pragma mark methods connected to transitioning
-
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-  return YES;
-}
-
-#pragma mark - RCTComponentViewProtocol
-
-- (void)prepareForRecycle
-{
-  [super prepareForRecycle];
-  _reactSubviews = [NSMutableArray new];
-  [self dismissOnReload];
-  _invalidated = YES;
-  [_controller willMoveToParentViewController:nil];
-  [_controller removeFromParentViewController];
-}
-
-+ (ComponentDescriptorProvider)componentDescriptorProvider
-{
-  return concreteComponentDescriptorProvider<RNSScreenStackComponentDescriptor>();
-}
-
-@end
-
-Class<RCTComponentViewProtocol> RNSScreenStackCls(void)
-{
-  return RNSScreenStackComponentView.class;
-}