react-native-screens 3.18.2 → 3.20.0

package/README.md

@@ -18,31 +18,7 @@ To learn about how to use `react-native-screens` with Fabric architecture, head
 
 ### iOS
 
-On iOS obtaining current device orientation [requires asking the system to generate orientation notifications](https://developer.apple.com/documentation/uikit/uidevice/1620053-orientation?language=objc). Our library uses them to enforce correct interface orientation when navigating between screens. 
-To make sure that there are no issues with screen orientation you should put following code in your `AppDelegate.m`:
-
-```objective-c
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    ... 
-#if !TARGET_OS_TV
-    [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
-#endif // !TARGET_OS_TV
-    ...
-    return YES:
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-#if !TARGET_OS_TV
-    [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
-#endif // !TARGET_OS_TV
-}
-```
-
-You can see example of these changes being introduced in our [example applications](https://github.com/software-mansion/react-native-screens/blob/main/TestsExample/ios/TestsExample/AppDelegate.mm).
-
-Other aspects of installation should be completely handled with auto-linking, just ensure you installed pods after adding this module.
+Installation on iOS is completely handled with auto-linking, if you have ensured pods are installed after adding this module, no other actions are necessary.
 
 ### Android
 
@@ -51,13 +27,24 @@ On Android the View state is not persisted consistently across Activity restarts
 For most people using an app built from the react-native template, that means editing `MainActivity.java`, likely located in `android/app/src/main/java/<your package name>/MainActivity.java`
 
 You should add this code, which specifically discards any Activity state persisted during the Activity restart process, to avoid inconsistencies that lead to crashes.
+Please note that the override code should not be placed inside `MainActivityDelegate`, but rather directly in `MainActivity`.
 
 ```java
 import android.os.Bundle;
 
-@Override
-protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(null);
+public class MainActivity extends ReactActivity {
+
+    //...code
+
+    //react-native-screens override
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(null);
+    }
+
+    public static class MainActivityDelegate extends ReactActivityDelegate {
+        //...code
+    }
 }
 ```
 
@@ -81,6 +68,7 @@ buildscript {
 ```
 
 **Disclaimer**: `react-native-screens` requires Kotlin `1.3.50` or higher.
+
 </details>
 
 ### Windows
@@ -100,17 +88,17 @@ Screens are already integrated with the React Native's most popular navigation l
 | 2.0.0+  | 0.60.0+              |
 
 ### Support for Fabric
-[Fabric](https://reactnative.dev/architecture/fabric-renderer) is React Native's new rendering system. 
 
-* As of [version `3.18.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.18.0) of this project, Fabric is supported only for react-native 0.70+. Support for lower versions has been dropped.
-* As of [version `3.14.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.14.0) of this project, Fabric is supported only for react-native 0.69+. Support for lower versions has been dropped.
+[Fabric](https://reactnative.dev/architecture/fabric-renderer) is React Native's new rendering system.
+
+- As of [version `3.18.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.18.0) of this project, Fabric is supported only for react-native 0.70+. Support for lower versions has been dropped.
+- As of [version `3.14.0`](https://github.com/software-mansion/react-native-screens/releases/tag/3.14.0) of this project, Fabric is supported only for react-native 0.69+. Support for lower versions has been dropped.
 
 | version | react-native version |
 | ------- | -------------------- |
 | 3.18.0+ | 0.70.0+              |
 | 3.14.0+ | 0.69.0+              |
 
-
 ## Usage with [react-navigation](https://github.com/react-navigation/react-navigation)
 
 Screens support is built into [react-navigation](https://github.com/react-navigation/react-navigation) starting from version [2.14.0](https://github.com/react-navigation/react-navigation/releases/tag/2.14.0) for all the different navigator types (stack, tab, drawer, etc).
@@ -167,6 +155,10 @@ To take advantage of the native stack navigator primitive for React Navigation t
 - for React Navigation v5 to the [README in react-native-screens/native-stack](https://github.com/software-mansion/react-native-screens/tree/main/native-stack)
 - for older versions to the [README in react-native-screens/createNativeStackNavigator](https://github.com/software-mansion/react-native-screens/tree/main/createNativeStackNavigator)
 
+## `FullWindowOverlay`
+
+Native `iOS` component for rendering views straight under the `Window`. Based on `RCTPerfMonitor`. You should treat it as a wrapper, providing full-screen, transparent view which receives no props and should ideally render one child `View`, being the root of its view hierarchy. For the example usage, see https://github.com/software-mansion/react-native-screens/blob/main/TestsExample/src/Test1096.tsx
+
 ## Interop with [react-native-navigation](https://github.com/wix/react-native-navigation)
 
 React-native-navigation library already uses native containers for rendering navigation scenes so wrapping these scenes with `<ScreenContainer>` or `<Screen>` component does not provide any benefits. Yet if you would like to build a component that uses screens primitives under the hood (for example a view pager component) it is safe to use `<ScreenContainer>` and `<Screen>` components for that as these work out of the box when rendered on react-native-navigation scenes.
@@ -194,12 +186,12 @@ Use `ScrollView` with prop `contentInsetAdjustmentBehavior=“automatic”` as a
 
 ### Other problems
 
-| Problem                                                                                                                                      | Solution                                                                                                    |
-| -------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| [SVG component becomes transparent when goBack](https://github.com/software-mansion/react-native-screens/issues/773)                         | [related PRs](https://github.com/software-mansion/react-native-screens/issues/773#issuecomment-783469792)           |
-| [Memory leak while moving from one screen to another in the same stack](https://github.com/software-mansion/react-native-screens/issues/843) | [explanation](https://github.com/software-mansion/react-native-screens/issues/843#issuecomment-832034119)   |
-| [LargeHeader stays small after pop/goBack/swipe gesture on iOS 14+](https://github.com/software-mansion/react-native-screens/issues/649)     | [potential fix](https://github.com/software-mansion/react-native-screens/issues/649#issuecomment-712199895) |
-| [`onScroll` and `onMomentumScrollEnd` of previous screen triggered in bottom tabs](https://github.com/software-mansion/react-native-screens/issues/1183)     | [explanation](https://github.com/software-mansion/react-native-screens/issues/1183#issuecomment-949313111) |
+| Problem                                                                                                                                                  | Solution                                                                                                    |
+| -------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
+| [SVG component becomes transparent when goBack](https://github.com/software-mansion/react-native-screens/issues/773)                                     | [related PRs](https://github.com/software-mansion/react-native-screens/issues/773#issuecomment-783469792)   |
+| [Memory leak while moving from one screen to another in the same stack](https://github.com/software-mansion/react-native-screens/issues/843)             | [explanation](https://github.com/software-mansion/react-native-screens/issues/843#issuecomment-832034119)   |
+| [LargeHeader stays small after pop/goBack/swipe gesture on iOS 14+](https://github.com/software-mansion/react-native-screens/issues/649)                 | [potential fix](https://github.com/software-mansion/react-native-screens/issues/649#issuecomment-712199895) |
+| [`onScroll` and `onMomentumScrollEnd` of previous screen triggered in bottom tabs](https://github.com/software-mansion/react-native-screens/issues/1183) | [explanation](https://github.com/software-mansion/react-native-screens/issues/1183#issuecomment-949313111)  |
 
 ## Contributing
 

package/android/build.gradle

@@ -103,11 +103,7 @@ repositories {
 }
 
 dependencies {
-    if (isNewArchitectureEnabled()) {
-        implementation project(":ReactAndroid")
-    } else {
-        implementation 'com.facebook.react:react-native:+'
-    }
+    implementation 'com.facebook.react:react-native:+'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.fragment:fragment:1.2.1'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'

package/ios/RNSFullWindowOverlay.mm

@@ -25,6 +25,38 @@
   return NO;
 }
 
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
+{
+  BOOL canReceiveTouchEvents = ([self isUserInteractionEnabled] && ![self isHidden]);
+  if (!canReceiveTouchEvents) {
+    return nil;
+  }
+
+  // `hitSubview` is the topmost subview which was hit. The hit point can
+  // be outside the bounds of `view` (e.g., if -clipsToBounds is NO).
+  UIView *hitSubview = nil;
+  BOOL isPointInside = [self pointInside:point withEvent:event];
+  if (![self clipsToBounds] || isPointInside) {
+    // Take z-index into account when calculating the touch target.
+    NSArray<UIView *> *sortedSubviews = [self reactZIndexSortedSubviews];
+
+    // The default behaviour of UIKit is that if a view does not contain a point,
+    // then no subviews will be returned from hit testing, even if they contain
+    // the hit point. By doing hit testing directly on the subviews, we bypass
+    // the strict containment policy (i.e., UIKit guarantees that every ancestor
+    // of the hit view will return YES from -pointInside:withEvent:). See:
+    //  - https://developer.apple.com/library/ios/qa/qa2013/qa1812.html
+    for (UIView *subview in [sortedSubviews reverseObjectEnumerator]) {
+      CGPoint convertedPoint = [subview convertPoint:point fromView:self];
+      hitSubview = [subview hitTest:convertedPoint withEvent:event];
+      if (hitSubview != nil) {
+        break;
+      }
+    }
+  }
+  return hitSubview;
+}
+
 @end
 
 @implementation RNSFullWindowOverlay {

package/ios/RNSScreen.h

@@ -58,6 +58,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) RNSScreenStackPresentation stackPresentation;
 @property (nonatomic) RNSScreenSwipeDirection swipeDirection;
 @property (nonatomic) RNSScreenReplaceAnimation replaceAnimation;
+
 @property (nonatomic, retain) NSNumber *transitionDuration;
 @property (nonatomic, readonly) BOOL dismissed;
 @property (nonatomic) BOOL hideKeyboardOnSwipe;
@@ -74,7 +75,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) UIInterfaceOrientationMask screenOrientation;
 @property (nonatomic) BOOL statusBarHidden;
 @property (nonatomic) BOOL homeIndicatorHidden;
-#endif
+#endif // !TARGET_OS_TV
 
 #ifdef RN_FABRIC_ENABLED
 // we recreate the behavior of `reactSetFrame` on new architecture
@@ -89,7 +90,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) RCTDirectEventBlock onWillDisappear;
 @property (nonatomic, copy) RCTDirectEventBlock onNativeDismissCancelled;
 @property (nonatomic, copy) RCTDirectEventBlock onTransitionProgress;
-#endif
+#endif // RN_FABRIC_ENABLED
 
 - (void)notifyFinishTransitioning;
 

package/ios/RNSScreen.mm

@@ -57,7 +57,7 @@
 
   return self;
 }
-#endif
+#endif // RN_FABRIC_ENABLED
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
 {
@@ -146,6 +146,7 @@
       // ignored, we only need to keep in mind not to set presentation delegate
       break;
   }
+
   // There is a bug in UIKit which causes retain loop when presentationController is accessed for a
   // controller that is not going to be presented modally. We therefore need to avoid setting the
   // delegate for screens presented using push. This also means that when controller is updated from
@@ -612,7 +613,7 @@
   if (newScreenProps.homeIndicatorHidden != oldScreenProps.homeIndicatorHidden) {
     [self setHomeIndicatorHidden:newScreenProps.homeIndicatorHidden];
   }
-#endif
+#endif // !TARGET_OS_TV
 
   // Notice that we compare against _stackPresentation, not oldScreenProps.stackPresentation.
   // See comment in prepareForRecycle method for explanation.
@@ -1198,11 +1199,42 @@ RCT_EXPORT_VIEW_PROPERTY(statusBarStyle, RNSStatusBarStyle)
 RCT_EXPORT_VIEW_PROPERTY(homeIndicatorHidden, BOOL)
 #endif
 
+#if !TARGET_OS_TV
+// See:
+// 1. https://github.com/software-mansion/react-native-screens/pull/1543
+// 2. https://github.com/software-mansion/react-native-screens/pull/1596
+// This class is instatiated from React Native's internals during application startup
+- (instancetype)init
+{
+  if (self = [super init]) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
+    });
+  }
+  return self;
+}
+
+- (void)dealloc
+{
+  dispatch_sync(dispatch_get_main_queue(), ^{
+    [[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
+  });
+}
+#endif // !TARGET_OS_TV
+
 - (UIView *)view
 {
   return [[RNSScreenView alloc] initWithBridge:self.bridge];
 }
 
++ (BOOL)requiresMainQueueSetup
+{
+  // Returning NO here despite the fact some initialization in -init method dispatches tasks
+  // on main queue, because the comments in RN source code states that modules which return YES
+  // here will be constructed ahead-of-time -- and this is not required in our case.
+  return NO;
+}
+
 @end
 
 @implementation RCTConvert (RNSScreen)

package/ios/RNSScreenStackHeaderConfig.mm

@@ -460,7 +460,23 @@
   }
 
 #if !TARGET_OS_TV
-  if (config.backTitle != nil || config.backTitleFontFamily || config.backTitleFontSize ||
+  // Fix for github.com/react-navigation/react-navigation/issues/11015
+  // It allows to hide back button title and use back button menu as normal.
+  // Back button display mode and back button menu are available since iOS 14.
+  if (@available(iOS 14.0, *)) {
+    // Make sure to set display mode to default.
+    // This line resets back button display mode - especially needed on the Fabric architecture.
+    navitem.backButtonDisplayMode = UINavigationItemBackButtonDisplayModeDefault;
+
+    NSString *trimmedBackTitle =
+        [config.backTitle stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+    // When an whitespace only back title is passed set back button mode to minimal.
+    if (config.backTitle != nil && [trimmedBackTitle length] == 0) {
+      navitem.backButtonDisplayMode = UINavigationItemBackButtonDisplayModeMinimal;
+    }
+  } else if (
+      config.backTitle != nil || config.backTitleFontFamily || config.backTitleFontSize ||
       config.disableBackButtonMenu) {
     RNSUIBarButtonItem *backBarButtonItem = [[RNSUIBarButtonItem alloc] initWithTitle:config.backTitle ?: prevItem.title
                                                                                 style:UIBarButtonItemStylePlain

package/lib/commonjs/TransitionProgressContext.js

@@ -4,14 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var React = _interopRequireWildcard(require("react"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = /*#__PURE__*/React.createContext(undefined);
-
 exports.default = _default;
 //# sourceMappingURL=TransitionProgressContext.js.map

package/lib/commonjs/TransitionProgressContext.js.map

@@ -1 +1 @@
-{"version":3,"sources":["TransitionProgressContext.tsx"],"names":["React","createContext","undefined"],"mappings":";;;;;;;AAAA;;;;;;4BASeA,KAAK,CAACC,aAAN,CACbC,SADa,C","sourcesContent":["import * as React from 'react';\nimport { Animated } from 'react-native';\n\ntype TransitionProgressContextBody = {\n  progress: Animated.Value;\n  closing: Animated.Value;\n  goingForward: Animated.Value;\n};\n\nexport default React.createContext<TransitionProgressContextBody | undefined>(\n  undefined\n);\n"]}
+{"version":3,"names":["React","createContext","undefined"],"sources":["TransitionProgressContext.tsx"],"sourcesContent":["import * as React from 'react';\nimport { Animated } from 'react-native';\n\ntype TransitionProgressContextBody = {\n  progress: Animated.Value;\n  closing: Animated.Value;\n  goingForward: Animated.Value;\n};\n\nexport default React.createContext<TransitionProgressContextBody | undefined>(\n  undefined\n);\n"],"mappings":";;;;;;AAAA;AAA+B;AAAA;AAAA,4BAShBA,KAAK,CAACC,aAAa,CAChCC,SAAS,CACV;AAAA"}

package/lib/commonjs/createNativeStackNavigator.js

@@ -4,33 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _reactNative = require("react-native");
-
 var _reactNativeScreens = require("react-native-screens");
-
 var _reactNavigation = require("react-navigation");
-
 var _reactNavigationStack = require("react-navigation-stack");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const REMOVE_ACTION = 'NativeStackNavigator/REMOVE';
 const isAndroid = _reactNative.Platform.OS === 'android';
 let didWarn = isAndroid;
-
 function renderComponentOrThunk(componentOrThunk, props) {
   if (typeof componentOrThunk === 'function') {
     return componentOrThunk(props);
   }
-
   return componentOrThunk;
 }
-
 function removeScene(route, dismissCount, navigation) {
   navigation.dispatch({
     // @ts-ignore special navigation action for native stack
@@ -40,23 +29,19 @@ function removeScene(route, dismissCount, navigation) {
     dismissCount
   });
 }
-
 function onAppear(route, descriptor, navigation) {
   var _descriptor$options, _descriptor$options$o;
-
   (_descriptor$options = descriptor.options) === null || _descriptor$options === void 0 ? void 0 : (_descriptor$options$o = _descriptor$options.onAppear) === null || _descriptor$options$o === void 0 ? void 0 : _descriptor$options$o.call(_descriptor$options);
   navigation.dispatch(_reactNavigation.StackActions.completeTransition({
     toChildKey: route.key,
     key: navigation.state.key
   }));
 }
-
 function onFinishTransitioning(navigation) {
   const {
     routes
   } = navigation.state;
   const lastRoute = (routes === null || routes === void 0 ? void 0 : routes.length) && routes[routes.length - 1];
-
   if (lastRoute) {
     navigation.dispatch(_reactNavigation.StackActions.completeTransition({
       toChildKey: lastRoute.key,
@@ -64,7 +49,6 @@ function onFinishTransitioning(navigation) {
     }));
   }
 }
-
 function renderHeaderConfig(index, route, descriptor, navigationConfig) {
   const {
     options
@@ -130,31 +114,25 @@ function renderHeaderConfig(index, route, descriptor, navigationConfig) {
     translucent: headerTranslucent || translucent || false
   };
   const hasHeader = headerShown !== false && headerMode !== 'none' && options.header !== null;
-
   if (!hasHeader) {
     return /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStackHeaderConfig, _extends({}, headerOptions, {
       hidden: true
     }));
   }
-
   if (headerStyle !== undefined) {
     headerOptions.backgroundColor = headerStyle.backgroundColor;
     headerOptions.blurEffect = headerStyle.blurEffect;
   }
-
   const children = [];
-
   if (options.backButtonImage) {
     children.push( /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStackHeaderBackButtonImage, {
       key: "backImage",
       source: options.backButtonImage
     }));
   }
-
   if (_reactNative.Platform.OS === 'ios' && options.searchBar) {
     children.push( /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStackHeaderSearchBarView, null, /*#__PURE__*/_react.default.createElement(_reactNativeScreens.SearchBar, options.searchBar)));
   }
-
   if (options.headerLeft !== undefined) {
     children.push( /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStackHeaderLeftView, {
       key: "left"
@@ -168,7 +146,6 @@ function renderHeaderConfig(index, route, descriptor, navigationConfig) {
         descriptor.navigation.goBack(descriptor.key);
       });
     };
-
     children.push( /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStackHeaderLeftView, {
       key: "left"
     }, /*#__PURE__*/_react.default.createElement(_reactNavigationStack.HeaderBackButton, {
@@ -180,7 +157,8 @@ function renderHeaderConfig(index, route, descriptor, navigationConfig) {
       truncatedLabel: options.truncatedBackButtonTitle,
       labelVisible: options.backTitleVisible,
       labelStyle: options.headerBackTitleStyle,
-      titleLayout: options.layoutPreset // @ts-ignore old props kept for very old version of `react-navigation-stack`
+      titleLayout: options.layoutPreset
+      // @ts-ignore old props kept for very old version of `react-navigation-stack`
       ,
       title: options.backButtonTitle,
       truncatedTitle: options.truncatedBackButtonTitle,
@@ -190,7 +168,6 @@ function renderHeaderConfig(index, route, descriptor, navigationConfig) {
       scene: scene
     })));
   }
-
   if (options.headerTitle) {
     if (title === undefined && typeof options.headerTitle === 'string') {
       headerOptions.title = options.headerTitle;
@@ -202,7 +179,6 @@ function renderHeaderConfig(index, route, descriptor, navigationConfig) {
       })));
     }
   }
-
   if (options.headerRight) {
     children.push( /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStackHeaderRightView, {
       key: "right"
@@ -210,26 +186,23 @@ function renderHeaderConfig(index, route, descriptor, navigationConfig) {
       scene
     })));
   }
-
   if (children.length > 0) {
     headerOptions.children = children;
   }
-
   return /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStackHeaderConfig, headerOptions);
 }
-
-const MaybeNestedStack = ({
-  isHeaderInModal,
-  screenProps,
-  route,
-  navigation,
-  SceneComponent,
-  index,
-  descriptor,
-  navigationConfig
-}) => {
+const MaybeNestedStack = _ref => {
+  let {
+    isHeaderInModal,
+    screenProps,
+    route,
+    navigation,
+    SceneComponent,
+    index,
+    descriptor,
+    navigationConfig
+  } = _ref;
   const Screen = _react.default.useContext(_reactNativeScreens.ScreenContext);
-
   if (isHeaderInModal) {
     return /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStack, {
       style: styles.scenes
@@ -243,26 +216,23 @@ const MaybeNestedStack = ({
       component: SceneComponent
     })));
   }
-
   return /*#__PURE__*/_react.default.createElement(_reactNavigation.SceneView, {
     screenProps: screenProps,
     navigation: navigation,
     component: SceneComponent
   });
 };
-
-function StackView({
-  navigation,
-  descriptors,
-  navigationConfig,
-  screenProps
-}) {
+function StackView(_ref2) {
+  let {
+    navigation,
+    descriptors,
+    navigationConfig,
+    screenProps
+  } = _ref2;
   const {
     routes
   } = navigation.state;
-
   const Screen = _react.default.useContext(_reactNativeScreens.ScreenContext);
-
   return /*#__PURE__*/_react.default.createElement(_reactNativeScreens.ScreenStack, {
     style: styles.scenes,
     onFinishTransitioning: () => onFinishTransitioning(navigation)
@@ -279,33 +249,26 @@ function StackView({
     } = navigationConfig;
     const SceneComponent = getComponent();
     let stackPresentation = 'push';
-
     if (options.stackPresentation) {
       stackPresentation = options.stackPresentation;
     } else {
       // this shouldn't be used because we have a prop for that
       if (mode === 'modal' || mode === 'containedModal') {
         stackPresentation = mode;
-
         if (transparentCard || options.cardTransparent) {
           stackPresentation = mode === 'containedModal' ? 'containedTransparentModal' : 'transparentModal';
         }
       }
     }
-
     let stackAnimation = options.stackAnimation;
-
     if (options.animationEnabled === false) {
       stackAnimation = 'none';
     }
-
     const hasHeader = options.headerShown !== false && (navigationConfig === null || navigationConfig === void 0 ? void 0 : navigationConfig.headerMode) !== 'none' && options.header !== null;
-
     if (!didWarn && stackPresentation !== 'push' && options.headerShown !== undefined) {
       didWarn = true;
       console.warn('Be aware that changing the visibility of header in modal on iOS will result in resetting the state of the screen.');
     }
-
     const isHeaderInModal = isAndroid ? false : stackPresentation !== 'push' && hasHeader && options.headerShown === true;
     const isHeaderInPush = isAndroid ? hasHeader : stackPresentation === 'push' && hasHeader;
     return /*#__PURE__*/_react.default.createElement(Screen, {
@@ -330,17 +293,14 @@ function StackView({
       onAppear: () => onAppear(route, descriptor, routeNavigationProp),
       onWillAppear: () => {
         var _options$onWillAppear;
-
         return options === null || options === void 0 ? void 0 : (_options$onWillAppear = options.onWillAppear) === null || _options$onWillAppear === void 0 ? void 0 : _options$onWillAppear.call(options);
       },
       onWillDisappear: () => {
         var _options$onWillDisapp;
-
         return options === null || options === void 0 ? void 0 : (_options$onWillDisapp = options.onWillDisappear) === null || _options$onWillDisapp === void 0 ? void 0 : _options$onWillDisapp.call(options);
       },
       onDisappear: () => {
         var _options$onDisappear;
-
         return options === null || options === void 0 ? void 0 : (_options$onDisappear = options.onDisappear) === null || _options$onDisappear === void 0 ? void 0 : _options$onDisappear.call(options);
       },
       onHeaderBackButtonClicked: () => removeScene(route, 1, routeNavigationProp),
@@ -357,24 +317,23 @@ function StackView({
     }));
   }));
 }
-
 const styles = _reactNative.StyleSheet.create({
   scenes: {
     flex: 1
   }
 });
+function createStackNavigator(routeConfigMap) {
+  let stackConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const router = (0, _reactNavigation.StackRouter)(routeConfigMap, stackConfig);
 
-function createStackNavigator(routeConfigMap, stackConfig = {}) {
-  const router = (0, _reactNavigation.StackRouter)(routeConfigMap, stackConfig); // below we override getStateForAction method in order to add handling for
+  // below we override getStateForAction method in order to add handling for
   // a custom native stack navigation action. The action REMOVE that we want to
   // add works in a similar way to POP, but it does not remove all the routes
   // that sit on top of the removed route. For example if we have three routes
   // [a,b,c] and call POP on b, then both b and c will go away. In case we
   // call REMOVE on b, only b will be removed from the stack and the resulting
   // state will be [a, c]
-
   const superGetStateForAction = router.getStateForAction;
-
   router.getStateForAction = (action, state) => {
     if (action.type === REMOVE_ACTION) {
       const {
@@ -383,15 +342,12 @@ function createStackNavigator(routeConfigMap, stackConfig = {}) {
         dismissCount
       } = action;
       let backRouteIndex = state.index;
-
       if (key) {
         const backRoute = state.routes.find(route => route.key === key);
         backRouteIndex = state.routes.indexOf(backRoute);
       }
-
       if (backRouteIndex > 0) {
         const newRoutes = [...state.routes];
-
         if (dismissCount > 1) {
           // when dismissing with iOS 14 native header back button, we can pop more than 1 screen at a time
           // and the `backRouteIndex` is the index of the previous screen. Since we are starting already
@@ -400,22 +356,19 @@ function createStackNavigator(routeConfigMap, stackConfig = {}) {
         } else {
           newRoutes.splice(backRouteIndex, 1);
         }
-
-        return { ...state,
+        return {
+          ...state,
           routes: newRoutes,
           index: newRoutes.length - 1,
           isTransitioning: immediate !== true
         };
       }
     }
-
     return superGetStateForAction(action, state);
-  }; // Create a navigator with StackView as the view
-
-
+  };
+  // Create a navigator with StackView as the view
   return (0, _reactNavigation.createNavigator)(StackView, router, stackConfig);
 }
-
 var _default = createStackNavigator;
 exports.default = _default;
 //# sourceMappingURL=createNativeStackNavigator.js.map