chore: publish

- react-navigation-stack@2.10.0

example/package.json

@@ -8,7 +8,7 @@
     "ios": "expo start --ios"
   },
   "dependencies": {
-    "@babel/runtime": "^7.11.0",
+    "@babel/runtime": "^7.12.1",
     "@expo/vector-icons": "^10.0.0",
     "@react-native-community/masked-view": "0.1.10",
     "expo": "^39.0.0",
@@ -20,17 +20,17 @@
     "react": "~16.13.1",
     "react-native": "~0.63.2",
     "react-native-gesture-handler": "~1.7.0",
-    "react-native-iphone-x-helper": "^1.2.1",
+    "react-native-iphone-x-helper": "^1.3.0",
     "react-native-maps": "0.27.1",
     "react-native-paper": "^4.0.1",
     "react-native-reanimated": "~1.13.0",
     "react-native-safe-area-context": "3.1.4",
     "react-native-screens": "~2.10.1",
     "react-native-webview": "10.7.0",
-    "react-navigation-header-buttons": "^3.0.5"
+    "react-navigation-header-buttons": "^6.0.0"
   },
   "devDependencies": {
     "babel-plugin-module-resolver": "^4.0.0",
-    "expo-cli": "^3.27.8"
+    "expo-cli": "^3.28.2"
   }
 }

package.json

@@ -25,21 +25,21 @@
     "example": "yarn --cwd example"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/preset-react": "^7.10.4",
-    "@babel/preset-typescript": "^7.10.4",
-    "@babel/runtime": "^7.11.0",
+    "@babel/plugin-proposal-class-properties": "^7.12.1",
+    "@babel/plugin-proposal-optional-chaining": "^7.12.1",
+    "@babel/preset-env": "^7.12.1",
+    "@babel/preset-react": "^7.12.1",
+    "@babel/preset-typescript": "^7.12.1",
+    "@babel/runtime": "^7.12.1",
     "@commitlint/config-conventional": "^11.0.0",
-    "@types/jest": "^26.0.8",
-    "babel-jest": "^26.2.2",
+    "@types/jest": "^26.0.15",
+    "babel-jest": "^26.6.1",
     "commitlint": "^11.0.0",
     "core-js": "^3.6.5",
-    "eslint": "^7.6.0",
+    "eslint": "^7.12.0",
     "eslint-config-satya164": "^3.1.8",
     "husky": "^4.2.5",
-    "jest": "^26.2.2",
+    "jest": "^26.6.1",
     "lerna": "^3.22.1",
     "prettier": "^2.1.2",
     "typescript": "^4.0.3"

packages/animated-switch/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.6.3](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.6.2...react-navigation-animated-switch@0.6.3) (2020-10-26)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
 ## [0.6.2](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.6.1...react-navigation-animated-switch@0.6.2) (2020-10-02)
 
 **Note:** Version bump only for package react-navigation-animated-switch

packages/animated-switch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-animated-switch",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Animated switch for React Navigation",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -22,13 +22,13 @@
   },
   "devDependencies": {
     "@react-native-community/bob": "0.16.2",
-    "@types/react": "16.9.49",
-    "@types/react-native": "0.63.20",
+    "@types/react": "16.9.53",
+    "@types/react-native": "0.63.30",
     "del-cli": "^3.0.1",
     "react": "~16.13.1",
     "react-native": "~0.63.2",
     "react-native-reanimated": "~1.13.0",
-    "react-navigation": "^4.4.2",
+    "react-navigation": "^4.4.3",
     "typescript": "^4.0.3"
   },
   "peerDependencies": {

packages/core/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.9](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.7.8...@react-navigation/core@3.7.9) (2020-10-26)
+
+**Note:** Version bump only for package @react-navigation/core
+
+
+
+
+
 ## [3.7.8](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.7.7...@react-navigation/core@3.7.8) (2020-10-02)
 
 

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-navigation/core",
-  "version": "3.7.8",
+  "version": "3.7.9",
   "description": "Core utilities for the react-navigation framework",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -37,7 +37,7 @@
   "dependencies": {
     "hoist-non-react-statics": "^3.3.2",
     "path-to-regexp": "^1.8.0",
-    "query-string": "^6.13.1",
+    "query-string": "^6.13.6",
     "react-is": "^16.13.0"
   },
   "devDependencies": {

packages/core/src/views/__tests__/NavigationFocusEvents.test.js

@@ -0,0 +1,307 @@
+import * as React from 'react';
+import renderer from 'react-test-renderer';
+import NavigationFocusEvents from '../NavigationFocusEvents';
+import getEventManager from '../../getEventManager';
+import { NavigationActions, StackActions } from '@react-navigation/core';
+
+const getNavigationMock = (mock = {}) => {
+  const { addListener, emit } = getEventManager('target');
+
+  return {
+    state: {
+      routes: [
+        { key: 'a', routeName: 'foo' },
+        { key: 'b', routeName: 'bar' },
+      ],
+      index: 0,
+    },
+    isFocused: () => true,
+    addListener: jest.fn(addListener),
+    emit: emit,
+    dangerouslyGetParent: () => null,
+    ...mock,
+  };
+};
+
+it('emits refocus event with current route key on refocus', () => {
+  const navigation = getNavigationMock();
+  const onEvent = jest.fn();
+
+  renderer.create(
+    <NavigationFocusEvents navigation={navigation} onEvent={onEvent} />
+  );
+
+  navigation.emit('refocus');
+
+  expect(onEvent).toHaveBeenCalledTimes(1);
+  const key = navigation.state.routes[navigation.state.index].key;
+  expect(onEvent).toHaveBeenCalledWith(key, 'refocus');
+});
+
+describe('on navigation action emitted', () => {
+  it('does not emit if navigation is not focused', () => {
+    const navigation = getNavigationMock({
+      isFocused: () => false,
+    });
+    const onEvent = jest.fn();
+
+    renderer.create(
+      <NavigationFocusEvents navigation={navigation} onEvent={onEvent} />
+    );
+
+    navigation.emit('action', {
+      state: navigation.state,
+      action: NavigationActions.init(),
+      type: 'action',
+    });
+
+    expect(onEvent).not.toHaveBeenCalled();
+  });
+
+  it('emits only willFocus and willBlur if state is transitioning', () => {
+    const state = {
+      routes: [
+        { key: 'First', routeName: 'First' },
+        { key: 'Second', routeName: 'Second' },
+      ],
+      index: 1,
+      routeKeyHistory: ['First', 'Second'],
+      isTransitioning: true,
+    };
+    const action = NavigationActions.init();
+
+    const navigation = getNavigationMock({
+      state: state,
+    });
+    const onEvent = jest.fn();
+
+    renderer.create(
+      <NavigationFocusEvents navigation={navigation} onEvent={onEvent} />
+    );
+
+    const lastState = {
+      routes: [
+        { key: 'First', routeName: 'First' },
+        { key: 'Second', routeName: 'Second' },
+      ],
+      index: 0,
+      routeKeyHistory: ['First'],
+    };
+    navigation.emit('action', {
+      state,
+      lastState,
+      action,
+      type: 'action',
+    });
+
+    const expectedPayload = {
+      action,
+      state: { key: 'Second', routeName: 'Second' },
+      lastState: { key: 'First', routeName: 'First' },
+      context: 'Second:Navigation/INIT_Root',
+      type: 'action',
+    };
+
+    expect(onEvent.mock.calls).toEqual([
+      ['Second', 'willFocus', expectedPayload],
+      ['First', 'willBlur', expectedPayload],
+      ['Second', 'action', expectedPayload],
+    ]);
+  });
+
+  it('emits didFocus after willFocus and didBlur after willBlur if no transitions', () => {
+    const state = {
+      routes: [
+        { key: 'First', routeName: 'First' },
+        { key: 'Second', routeName: 'Second' },
+      ],
+      index: 1,
+      routeKeyHistory: ['First', 'Second'],
+    };
+    const action = NavigationActions.navigate({
+      routeName: 'Second',
+    });
+
+    const navigation = getNavigationMock({
+      state: state,
+    });
+    const onEvent = jest.fn();
+
+    renderer.create(
+      <NavigationFocusEvents navigation={navigation} onEvent={onEvent} />
+    );
+
+    const lastState = {
+      routes: [
+        { key: 'First', routeName: 'First' },
+        { key: 'Second', routeName: 'Second' },
+      ],
+      index: 0,
+      routeKeyHistory: ['First'],
+    };
+    navigation.emit('action', {
+      state,
+      lastState,
+      action,
+      type: 'action',
+    });
+
+    const expectedPayload = {
+      action,
+      state: { key: 'Second', routeName: 'Second' },
+      lastState: { key: 'First', routeName: 'First' },
+      context: 'Second:Navigation/NAVIGATE_Root',
+      type: 'action',
+    };
+
+    expect(onEvent.mock.calls).toEqual([
+      ['Second', 'willFocus', expectedPayload],
+      ['Second', 'didFocus', expectedPayload],
+      ['First', 'willBlur', expectedPayload],
+      ['First', 'didBlur', expectedPayload],
+      ['Second', 'action', expectedPayload],
+    ]);
+  });
+
+  it('emits didBlur and didFocus when transition ends', () => {
+    const initialState = {
+      routes: [
+        { key: 'First', routeName: 'First' },
+        { key: 'Second', routeName: 'Second' },
+      ],
+      index: 0,
+      routeKeyHistory: ['First'],
+      isTransitioning: true,
+    };
+    const intermediateState = {
+      routes: [
+        { key: 'First', routeName: 'First' },
+        { key: 'Second', routeName: 'Second' },
+      ],
+      index: 1,
+      routeKeyHistory: ['First', 'Second'],
+      isTransitioning: true,
+    };
+    const finalState = {
+      routes: [
+        { key: 'First', routeName: 'First' },
+        { key: 'Second', routeName: 'Second' },
+      ],
+      index: 1,
+      routeKeyHistory: ['First', 'Second'],
+      isTransitioning: false,
+    };
+    const actionNavigate = NavigationActions.navigate({ routeName: 'Second' });
+    const actionEndTransition = StackActions.completeTransition({
+      key: 'Second',
+    });
+
+    const navigation = getNavigationMock({
+      state: intermediateState,
+    });
+    const onEvent = jest.fn();
+
+    renderer.create(
+      <NavigationFocusEvents navigation={navigation} onEvent={onEvent} />
+    );
+
+    navigation.emit('action', {
+      state: intermediateState,
+      lastState: initialState,
+      action: actionNavigate,
+      type: 'action',
+    });
+
+    const expectedPayloadNavigate = {
+      action: actionNavigate,
+      state: { key: 'Second', routeName: 'Second' },
+      lastState: { key: 'First', routeName: 'First' },
+      context: 'Second:Navigation/NAVIGATE_Root',
+      type: 'action',
+    };
+
+    expect(onEvent.mock.calls).toEqual([
+      ['Second', 'willFocus', expectedPayloadNavigate],
+      ['First', 'willBlur', expectedPayloadNavigate],
+      ['Second', 'action', expectedPayloadNavigate],
+    ]);
+    onEvent.mockClear();
+
+    navigation.emit('action', {
+      state: finalState,
+      lastState: intermediateState,
+      action: actionEndTransition,
+      type: 'action',
+    });
+
+    const expectedPayloadEndTransition = {
+      action: actionEndTransition,
+      state: { key: 'Second', routeName: 'Second' },
+      lastState: { key: 'Second', routeName: 'Second' },
+      context: 'Second:Navigation/COMPLETE_TRANSITION_Root',
+      type: 'action',
+    };
+
+    expect(onEvent.mock.calls).toEqual([
+      ['First', 'didBlur', expectedPayloadEndTransition],
+      ['Second', 'didFocus', expectedPayloadEndTransition],
+      ['Second', 'action', expectedPayloadEndTransition],
+    ]);
+  });
+});
+
+describe('on willFocus emitted', () => {
+  it('emits didFocus after willFocus if no transition', () => {
+    const navigation = getNavigationMock({
+      state: {
+        routes: [
+          { key: 'FirstLanding', routeName: 'FirstLanding' },
+          { key: 'Second', routeName: 'Second' },
+        ],
+        index: 0,
+        key: 'First',
+        routeName: 'First',
+      },
+    });
+    const onEvent = jest.fn();
+
+    renderer.create(
+      <NavigationFocusEvents navigation={navigation} onEvent={onEvent} />
+    );
+
+    const lastState = { key: 'Third', routeName: 'Third' };
+    const action = NavigationActions.navigate({ routeName: 'First' });
+
+    navigation.emit('willFocus', {
+      lastState,
+      action,
+      context: 'First:Navigation/NAVIGATE_Root',
+      type: 'action',
+    });
+
+    const expectedPayload = {
+      action,
+      state: { key: 'FirstLanding', routeName: 'FirstLanding' },
+      context:
+        'FirstLanding:Navigation/NAVIGATE_First:Navigation/NAVIGATE_Root',
+      type: 'action',
+    };
+
+    expect(onEvent.mock.calls).toEqual([
+      ['FirstLanding', 'willFocus', expectedPayload],
+      ['FirstLanding', 'didFocus', expectedPayload],
+    ]);
+
+    onEvent.mockClear();
+
+    // the nested navigator might emit a didFocus that should be ignored
+    navigation.emit('didFocus', {
+      lastState,
+      action,
+      context: 'First:Navigation/NAVIGATE_Root',
+      type: 'action',
+    });
+
+    expect(onEvent).not.toHaveBeenCalled();
+  });
+});

packages/drawer/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.6.0](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.5.2...react-navigation-drawer@2.6.0) (2020-10-26)
+
+
+### Features
+
+* add detachInactiveScreens prop for bottom tabs and drawer ([#8816](https://github.com/react-navigation/drawer/issues/8816)) ([707bea3](https://github.com/react-navigation/drawer/commit/707bea3cba1aa1f7b1eb5884dd1d129dcc2bbdc2))
+
+
+
+
+
 ## [2.5.2](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.5.1...react-navigation-drawer@2.5.2) (2020-10-02)
 
 **Note:** Version bump only for package react-navigation-drawer

packages/drawer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-drawer",
-  "version": "2.5.2",
+  "version": "2.6.0",
   "description": "Drawer navigator component for React Navigation",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -39,8 +39,8 @@
   "homepage": "https://github.com/react-navigation/drawer#readme",
   "devDependencies": {
     "@react-native-community/bob": "^0.16.2",
-    "@types/react": "^16.9.44",
-    "@types/react-native": "^0.63.4",
+    "@types/react": "^16.9.53",
+    "@types/react-native": "^0.63.30",
     "del-cli": "^3.0.1",
     "react": "~16.13.1",
     "react-lifecycles-compat": "^3.0.4",
@@ -49,7 +49,7 @@
     "react-native-reanimated": "~1.13.0",
     "react-native-screens": "~2.10.1",
     "react-native-testing-library": "^6.0.0",
-    "react-navigation": "^4.4.2",
+    "react-navigation": "^4.4.3",
     "typescript": "^4.0.3"
   },
   "peerDependencies": {

packages/drawer/src/types.tsx

@@ -69,6 +69,7 @@ export type NavigationDrawerConfig = {
   drawerBackgroundColor?: ThemedColor;
   overlayColor?: ThemedColor;
   screenContainerStyle?: StyleProp<ViewStyle>;
+  detachInactiveScreens?: boolean;
 };
 
 export type NavigationDrawerRouterConfig = {

packages/drawer/src/views/DrawerView.tsx

@@ -49,6 +49,7 @@ type Props = {
     contentOptions?: object;
   };
   screenProps: unknown;
+  detachInactiveScreens: boolean;
 };
 
 type State = {
@@ -166,7 +167,7 @@ export default class DrawerView extends React.PureComponent<Props, State> {
   };
 
   private renderContent = () => {
-    let { lazy, navigation } = this.props;
+    let { lazy, navigation, detachInactiveScreens = true } = this.props;
     let { loaded } = this.state;
     let { routes } = navigation.state;
 
@@ -183,7 +184,8 @@ export default class DrawerView extends React.PureComponent<Props, State> {
       );
     } else {
       return (
-        <ScreenContainer style={styles.content}>
+        // @ts-ignore
+        <ScreenContainer enabled={detachInactiveScreens} style={styles.content}>
           {routes.map((route, index) => {
             if (lazy && !loaded.includes(index)) {
               // Don't render a screen if we've never navigated to it
@@ -201,6 +203,7 @@ export default class DrawerView extends React.PureComponent<Props, State> {
                   { opacity: isFocused ? 1 : 0 },
                 ]}
                 isVisible={isFocused}
+                enabled={detachInactiveScreens}
               >
                 <SceneView
                   navigation={descriptor.navigation}

packages/drawer/src/views/ResourceSavingScene.tsx

@@ -6,6 +6,7 @@ type Props = {
   isVisible: boolean;
   children: React.ReactNode;
   style?: any;
+  enabled: boolean;
 };
 
 const FAR_FAR_AWAY = 30000; // this should be big enough to move the whole view out of its container
@@ -13,7 +14,7 @@ const FAR_FAR_AWAY = 30000; // this should be big enough to move the whole view
 export default class ResourceSavingScene extends React.Component<Props> {
   render() {
     // react-native-screens is buggy on web
-    if (screensEnabled?.() && Platform.OS !== 'web') {
+    if (screensEnabled?.() && this.props.enabled && Platform.OS !== 'web') {
       const { isVisible, ...rest } = this.props;
 
       // @ts-ignore

packages/material-bottom-tabs/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.3](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.3.2...react-navigation-material-bottom-tabs@2.3.3) (2020-10-26)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
 ## [2.3.2](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.3.1...react-navigation-material-bottom-tabs@2.3.2) (2020-10-02)
 
 **Note:** Version bump only for package react-navigation-material-bottom-tabs

packages/material-bottom-tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-material-bottom-tabs",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Material Bottom Tab Navigation component for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -40,13 +40,13 @@
   "devDependencies": {
     "@react-native-community/bob": "^0.16.2",
     "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/react": "^16.9.44",
-    "@types/react-native": "^0.63.4",
+    "@types/react": "^16.9.53",
+    "@types/react-native": "^0.63.30",
     "del-cli": "^3.0.1",
     "react": "~16.13.1",
     "react-native": "~0.63.2",
     "react-native-paper": "^4.2.0",
-    "react-navigation": "^4.4.2",
+    "react-navigation": "^4.4.3",
     "typescript": "^4.0.3"
   },
   "peerDependencies": {

packages/native/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.8.3](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.8.2...@react-navigation/native@3.8.3) (2020-10-26)
+
+**Note:** Version bump only for package @react-navigation/native
+
+
+
+
+
 ## [3.8.2](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.8.1...@react-navigation/native@3.8.2) (2020-10-02)
 
 **Note:** Version bump only for package @react-navigation/native

packages/native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-navigation/native",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "React Native support for React Navigation",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@react-native-community/bob": "^0.16.2",
-    "@react-navigation/core": "^3.7.8",
+    "@react-navigation/core": "^3.7.9",
     "@types/react-test-renderer": "^16.9.3",
     "del-cli": "^3.0.1",
     "react": "~16.13.1",

packages/react-navigation/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.4.3](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.4.2...react-navigation@4.4.3) (2020-10-26)
+
+**Note:** Version bump only for package react-navigation
+
+
+
+
+
 ## [4.4.2](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.4.1...react-navigation@4.4.2) (2020-10-02)
 
 **Note:** Version bump only for package react-navigation

packages/react-navigation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "description": "Routing and navigation for your React Native apps",
   "main": "src/index.js",
   "types": "typescript/react-navigation.d.ts",
@@ -24,12 +24,12 @@
     "react-native": "*"
   },
   "dependencies": {
-    "@react-navigation/core": "^3.7.8",
-    "@react-navigation/native": "^3.8.2"
+    "@react-navigation/core": "^3.7.9",
+    "@react-navigation/native": "^3.8.3"
   },
   "devDependencies": {
-    "@types/react": "^16.9.44",
-    "@types/react-native": "^0.63.4",
+    "@types/react": "^16.9.53",
+    "@types/react-native": "^0.63.30",
     "@types/react-test-renderer": "^16.9.3",
     "react": "~16.13.1",
     "react-native": "~0.63.2",

packages/stack/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.10.0](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.9.0...react-navigation-stack@2.10.0) (2020-10-30)
+
+
+### Features
+
+* enable react-native-screens in Stack by default on iOS ([8411e6f](https://github.com/react-navigation/react-navigation-stack/commit/8411e6f764b86341e747cb7ca1ff4a775b4a827a))
+
+
+
+
+
+# [2.9.0](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.8.4...react-navigation-stack@2.9.0) (2020-10-26)
+
+
+### Features
+
+* sync latest stack ([6bdc1e9](https://github.com/react-navigation/react-navigation-stack/commit/6bdc1e9e5f6ca05e0494f6b9a1f7b9b60764628a))
+
+
+
+
+
 ## [2.8.4](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.8.3...react-navigation-stack@2.8.4) (2020-10-02)
 
 **Note:** Version bump only for package react-navigation-stack

packages/stack/README.md

@@ -49,7 +49,7 @@ yarn example start
 
 The code in this repo uses the source from [`@react-navigation/stack`](https://github.com/react-navigation/navigation-ex/tree/master/packages/stack) and patches it to make it usable in React Navigation 4. If you need to make changes, please send a pull request there.
 
-If the change is specifically related to React Navigation 4 integration, first run `yarn sync`, then change the files in `src/vendor` and then run `yarn patch` to update the patch file with the latest changes.
+If the change is specifically related to React Navigation 4 integration, first run `yarn patch:apply`, then change the files in `src/vendor` to resolve any conflicts and then run `yarn patch:create` to update the patch file with the latest changes.
 
 Make sure your code passes TypeScript and ESLint. Run the following to verify:
 

packages/stack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-stack",
-  "version": "2.8.4",
+  "version": "2.10.0",
   "description": "Stack navigator component for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -13,8 +13,8 @@
   "scripts": {
     "prepare": "bob build",
     "clean": "del lib",
-    "sync": "bash scripts/sync-stack.sh",
-    "patch": "diff -Naur ../../node_modules/@react-navigation/stack/src src/vendor > scripts/stack.patch; printf ''"
+    "patch:apply": "bash scripts/sync-stack.sh",
+    "patch:create": "diff -Naur ../../node_modules/@react-navigation/stack/src src/vendor > scripts/stack.patch; printf ''"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -39,16 +39,16 @@
   },
   "homepage": "https://github.com/react-navigation/react-navigation-stack#readme",
   "dependencies": {
-    "color": "^3.1.2",
-    "react-native-iphone-x-helper": "^1.2.1"
+    "color": "^3.1.3",
+    "react-native-iphone-x-helper": "^1.3.0"
   },
   "devDependencies": {
     "@react-native-community/bob": "^0.16.2",
     "@react-native-community/masked-view": "0.1.10",
-    "@react-navigation/stack": "^5.9.0",
+    "@react-navigation/stack": "^5.11.0",
     "@types/color": "^3.0.1",
-    "@types/react": "^16.9.44",
-    "@types/react-native": "^0.63.4",
+    "@types/react": "^16.9.53",
+    "@types/react-native": "^0.63.30",
     "@types/react-test-renderer": "^16.9.3",
     "del-cli": "^3.0.1",
     "react": "~16.13.1",
@@ -56,7 +56,7 @@
     "react-native-gesture-handler": "~1.7.0",
     "react-native-safe-area-context": "3.1.4",
     "react-native-screens": "~2.10.1",
-    "react-navigation": "^4.4.2",
+    "react-navigation": "^4.4.3",
     "react-test-renderer": "~16.13.1",
     "typescript": "^4.0.3"
   },

packages/stack/scripts/stack.patch

@@ -1,6 +1,6 @@
 diff -Naur ../../node_modules/@react-navigation/stack/src/index.tsx src/vendor/index.tsx
---- ../../node_modules/@react-navigation/stack/src/index.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/index.tsx	2020-06-24 23:16:17.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/index.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/index.tsx	2020-10-26 16:08:35.000000000 +0100
 @@ -3,11 +3,6 @@
  import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
  import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
@@ -28,9 +28,9 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/index.tsx src/vendor/i
    StackHeaderLeftButtonProps,
    StackHeaderTitleProps,
 diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx src/vendor/navigators/createStackNavigator.tsx
---- ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx	2020-06-25 01:58:50.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx	2020-10-26 16:07:00.000000000 +0100
 +++ src/vendor/navigators/createStackNavigator.tsx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,96 +0,0 @@
+@@ -1,101 +0,0 @@
 -import * as React from 'react';
 -import { Platform } from 'react-native';
 -import {
@@ -42,6 +42,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
 -  StackRouterOptions,
 -  StackNavigationState,
 -  StackActions,
+-  ParamListBase,
+-  StackActionHelpers,
 -} from '@react-navigation/native';
 -import StackView from '../views/Stack/StackView';
 -import type {
@@ -62,12 +64,16 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
 -}: Props) {
 -  const defaultOptions = {
 -    gestureEnabled: Platform.OS === 'ios',
--    animationEnabled: Platform.OS !== 'web',
+-    animationEnabled:
+-      Platform.OS !== 'web' &&
+-      Platform.OS !== 'windows' &&
+-      Platform.OS !== 'macos',
 -  };
 -
 -  const { state, descriptors, navigation } = useNavigationBuilder<
--    StackNavigationState,
+-    StackNavigationState<ParamListBase>,
 -    StackRouterOptions,
+-    StackActionHelpers<ParamListBase>,
 -    StackNavigationOptions,
 -    StackNavigationEventMap
 -  >(StackRouter, {
@@ -87,8 +93,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
 -
 -  React.useEffect(
 -    () =>
--      navigation.addListener &&
--      navigation.addListener('tabPress', (e) => {
+-      navigation.addListener?.('tabPress', (e) => {
 -        const isFocused = navigation.isFocused();
 -
 -        // Run the operation in the next frame so we're sure all listeners have been run
@@ -122,15 +127,15 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
 -}
 -
 -export default createNavigatorFactory<
--  StackNavigationState,
+-  StackNavigationState<ParamListBase>,
 -  StackNavigationOptions,
 -  StackNavigationEventMap,
 -  typeof StackNavigator
 ->(StackNavigator);
 diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/types.tsx
---- ../../node_modules/@react-navigation/stack/src/types.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/types.tsx	2020-06-24 23:18:40.000000000 +0200
-@@ -8,15 +8,28 @@
+--- ../../node_modules/@react-navigation/stack/src/types.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/types.tsx	2020-10-26 16:13:50.000000000 +0100
+@@ -8,15 +8,29 @@
  } from 'react-native';
  import type { EdgeInsets } from 'react-native-safe-area-context';
  import type {
@@ -155,6 +160,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
 +} from 'react-navigation';
 +
 +// @ts-ignore
++// eslint-disable-next-line @typescript-eslint/no-unused-vars
 +export type Route<T extends string> = NavigationRoute;
 +
 +export type NavigationStackState = NavigationState;
@@ -167,23 +173,24 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
  
  export type StackNavigationEventMap = {
    /**
-@@ -29,29 +42,28 @@
-   transitionEnd: { data: { closing: boolean } };
+@@ -41,30 +55,29 @@
+   gestureCancel: { data: undefined };
  };
  
 -export type StackNavigationHelpers = NavigationHelpers<
 -  ParamListBase,
 -  StackNavigationEventMap
-->;
--
+-> &
+-  StackActionHelpers<ParamListBase>;
 +export type StackNavigationHelpers = NavigationProp<NavigationStackState>;
+ 
  export type StackNavigationProp<
 -  ParamList extends ParamListBase,
 -  RouteName extends keyof ParamList = string
 -> = NavigationProp<
 -  ParamList,
 -  RouteName,
--  StackNavigationState,
+-  StackNavigationState<ParamList>,
 -  StackNavigationOptions,
 -  StackNavigationEventMap
 -> &
@@ -218,7 +225,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
  };
  
  export type Layout = { width: number; height: number };
-@@ -228,24 +240,27 @@
+@@ -241,24 +254,27 @@
    /**
     * Navigation prop for the header.
     */
@@ -233,7 +240,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
 -export type StackDescriptor = Descriptor<
 -  ParamListBase,
 -  string,
--  StackNavigationState,
+-  StackNavigationState<ParamListBase>,
 -  StackNavigationOptions
 +export type StackDescriptor = NavigationDescriptor<
 +  NavigationParams,
@@ -252,18 +259,27 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
  export type StackNavigationOptions = StackHeaderOptions &
    Partial<TransitionPreset> & {
      /**
-@@ -330,6 +345,8 @@
-       bottom?: number;
-       left?: number;
-     };
+@@ -352,6 +368,8 @@
+      * Defaults to `false` for the last screen when mode='modal', otherwise `true`.
+      */
+     detachPreviousScreen?: boolean;
 +    onTransitionStart?: (props: TransitionCallbackProps) => void;
 +    onTransitionEnd?: (props: TransitionCallbackProps) => void;
    };
  
  export type StackNavigationConfig = {
+@@ -365,7 +383,7 @@
+   /**
+    * Whether inactive screens should be detached from the view hierarchy to save memory.
+    * Make sure to call `enableScreens` from `react-native-screens` to make it work.
+-   * Defaults to `true`.
++   * Defaults to `true` on Android, `false` on iOS.
+    */
+   detachInactiveScreens?: boolean;
+ };
 diff -Naur ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneContext.tsx src/vendor/utils/PreviousSceneContext.tsx
---- ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneContext.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/utils/PreviousSceneContext.tsx	2020-06-24 23:26:38.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneContext.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/utils/PreviousSceneContext.tsx	2020-10-26 16:08:40.000000000 +0100
 @@ -1,6 +1,5 @@
  import * as React from 'react';
 -import type { Route } from '@react-navigation/native';
@@ -273,8 +289,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/utils/PreviousSceneCon
  const PreviousSceneContext = React.createContext<
    Scene<Route<string>> | undefined
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx src/vendor/views/Header/Header.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Header/Header.tsx	2020-06-25 03:01:13.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Header/Header.tsx	2020-10-26 16:08:40.000000000 +0100
 @@ -1,12 +1,15 @@
  import * as React from 'react';
 -import { StackActions } from '@react-navigation/native';
@@ -362,22 +378,22 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/Header.ts
 +
 +export default Header;
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx src/vendor/views/Header/HeaderBackButton.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Header/HeaderBackButton.tsx	2020-06-24 23:21:49.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Header/HeaderBackButton.tsx	2020-10-26 16:14:24.000000000 +0100
 @@ -8,9 +8,9 @@
    StyleSheet,
    LayoutChangeEvent,
  } from 'react-native';
 -import { useTheme } from '@react-navigation/native';
  import MaskedView from '../MaskedView';
- import { TouchableItem } from '../TouchableItem';
+ import TouchableItem from '../TouchableItem';
 +import useTheme from '../../../utils/useTheme';
  import type { StackHeaderLeftButtonProps } from '../../types';
  
  type Props = StackHeaderLeftButtonProps;
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx src/vendor/views/Header/HeaderBackground.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Header/HeaderBackground.tsx	2020-06-24 23:16:23.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Header/HeaderBackground.tsx	2020-10-26 16:08:40.000000000 +0100
 @@ -7,7 +7,7 @@
    StyleProp,
    ViewStyle,
@@ -388,11 +404,11 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBac
  type Props = ViewProps & {
    style?: Animated.WithAnimatedValue<StyleProp<ViewStyle>>;
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx src/vendor/views/Header/HeaderContainer.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Header/HeaderContainer.tsx	2020-06-24 23:21:29.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Header/HeaderContainer.tsx	2020-10-26 16:15:18.000000000 +0100
 @@ -1,11 +1,6 @@
  import * as React from 'react';
- import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
+ import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 -import {
 -  NavigationContext,
 -  NavigationRouteContext,
@@ -411,7 +427,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderCon
    Scene,
    StackHeaderStyleInterpolator,
    StackNavigationProp,
-@@ -109,9 +105,7 @@
+@@ -105,9 +101,7 @@
            insets,
            scene,
            previous,
@@ -422,7 +438,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderCon
            styleInterpolator:
              mode === 'float'
                ? isHeaderStatic
-@@ -130,7 +124,7 @@
+@@ -126,7 +120,7 @@
              key={scene.route.key}
              value={scene.descriptor.navigation}
            >
@@ -431,7 +447,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderCon
                <View
                  onLayout={
                    onContentHeightChange
-@@ -156,7 +150,7 @@
+@@ -155,7 +149,7 @@
                >
                  {header !== undefined ? header(props) : <Header {...props} />}
                </View>
@@ -441,8 +457,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderCon
          );
        })}
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx src/vendor/views/Header/HeaderSegment.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Header/HeaderSegment.tsx	2020-06-24 23:20:58.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Header/HeaderSegment.tsx	2020-10-26 16:08:40.000000000 +0100
 @@ -8,7 +8,7 @@
    ViewStyle,
  } from 'react-native';
@@ -451,8 +467,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSeg
 +import type { NavigationRoute } from 'react-navigation';
  import HeaderBackButton from './HeaderBackButton';
  import HeaderBackground from './HeaderBackground';
- import memoize from '../../utils/memoize';
-@@ -28,7 +28,7 @@
+ import HeaderShownContext from '../../utils/HeaderShownContext';
+@@ -29,7 +29,7 @@
    onGoBack?: () => void;
    title?: string;
    leftLabel?: string;
@@ -462,31 +478,32 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSeg
  };
  
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx src/vendor/views/Header/HeaderTitle.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Header/HeaderTitle.tsx	2020-06-24 23:16:23.000000000 +0200
-@@ -1,6 +1,6 @@
- import * as React from 'react';
- import { Animated, StyleSheet, Platform } from 'react-native';
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Header/HeaderTitle.tsx	2020-10-26 16:14:52.000000000 +0100
+@@ -7,7 +7,7 @@
+   StyleProp,
+   TextStyle,
+ } from 'react-native';
 -import { useTheme } from '@react-navigation/native';
 +import useTheme from '../../../utils/useTheme';
  
- type Props = Omit<React.ComponentProps<typeof Animated.Text>, 'key'> & {
+ type Props = Omit<TextProps, 'style'> & {
    tintColor?: string;
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx src/vendor/views/Stack/Card.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Stack/Card.tsx	2020-06-24 23:16:23.000000000 +0200
-@@ -146,7 +146,7 @@
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Stack/Card.tsx	2020-10-26 16:08:40.000000000 +0100
+@@ -162,7 +162,7 @@
  
    private interactionHandle: number | undefined;
  
 -  private pendingGestureCallback: number | undefined;
 +  private pendingGestureCallback: any;
  
-   private animate = ({
-     closing,
+   private lastToValue: number | undefined;
+ 
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx src/vendor/views/Stack/CardContainer.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Stack/CardContainer.tsx	2020-06-24 23:20:38.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Stack/CardContainer.tsx	2020-10-26 16:08:40.000000000 +0100
 @@ -1,12 +1,13 @@
  import * as React from 'react';
  import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -503,18 +520,22 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContai
    Layout,
    StackHeaderMode,
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx src/vendor/views/Stack/CardStack.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Stack/CardStack.tsx	2020-06-24 23:20:16.000000000 +0200
-@@ -7,7 +7,7 @@
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Stack/CardStack.tsx	2020-10-26 16:17:14.000000000 +0100
+@@ -7,11 +7,7 @@
    Platform,
  } from 'react-native';
  import type { EdgeInsets } from 'react-native-safe-area-context';
--import type { Route, StackNavigationState } from '@react-navigation/native';
+-import type {
+-  ParamListBase,
+-  Route,
+-  StackNavigationState,
+-} from '@react-navigation/native';
 +import type { NavigationState as StackNavigationState } from 'react-navigation';
  
- import { MaybeScreenContainer, MaybeScreen } from '../Screens';
- import { getDefaultHeaderHeight } from '../Header/HeaderSegment';
-@@ -25,6 +25,7 @@
+ import {
+   MaybeScreenContainer,
+@@ -32,6 +28,7 @@
    Layout,
    StackHeaderMode,
    StackCardMode,
@@ -522,10 +543,19 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.
    Scene,
    StackDescriptorMap,
    StackNavigationOptions,
+@@ -45,7 +42,7 @@
+ type Props = {
+   mode: StackCardMode;
+   insets: EdgeInsets;
+-  state: StackNavigationState<ParamListBase>;
++  state: StackNavigationState;
+   descriptors: StackDescriptorMap;
+   routes: Route<string>[];
+   openingRouteKeys: string[];
 diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx src/vendor/views/Stack/StackView.tsx
---- ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx	2020-06-25 01:58:50.000000000 +0200
-+++ src/vendor/views/Stack/StackView.tsx	2020-06-24 23:19:46.000000000 +0200
-@@ -2,11 +2,11 @@
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx	2020-10-26 16:07:00.000000000 +0100
++++ src/vendor/views/Stack/StackView.tsx	2020-10-26 16:20:15.000000000 +0100
+@@ -2,12 +2,11 @@
  import { View, Platform, StyleSheet } from 'react-native';
  import { SafeAreaConsumer, EdgeInsets } from 'react-native-safe-area-context';
  import {
@@ -533,6 +563,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
    StackActions,
 -  StackNavigationState,
 -  Route,
+-  ParamListBase,
 -} from '@react-navigation/native';
 +  NavigationState as StackNavigationState,
 +  NavigationActions,
@@ -541,7 +572,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
  
  import { GestureHandlerRootView } from '../GestureHandler';
  import CardStack from './CardStack';
-@@ -16,6 +16,7 @@
+@@ -17,6 +16,7 @@
  } from '../Header/HeaderContainer';
  import SafeAreaProviderCompat from '../SafeAreaProviderCompat';
  import type {
@@ -549,15 +580,19 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
    StackNavigationHelpers,
    StackNavigationConfig,
    StackDescriptorMap,
-@@ -25,6 +26,7 @@
-   state: StackNavigationState;
+@@ -24,9 +24,10 @@
+ import HeaderShownContext from '../../utils/HeaderShownContext';
+ 
+ type Props = StackNavigationConfig & {
+-  state: StackNavigationState<ParamListBase>;
++  state: StackNavigationState;
    navigation: StackNavigationHelpers;
    descriptors: StackDescriptorMap;
 +  screenProps: unknown;
  };
  
  type State = {
-@@ -293,7 +295,9 @@
+@@ -295,7 +296,9 @@
          return false;
        }
  
@@ -568,7 +603,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
      }
  
      return false;
-@@ -321,26 +325,49 @@
+@@ -323,26 +326,49 @@
        return null;
      }
  
@@ -621,7 +656,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
      } else {
        this.setState((state) => ({
          routes: state.replacingRouteKeys.length
-@@ -366,12 +393,11 @@
+@@ -368,12 +394,11 @@
        // If a route exists in state, trigger a pop
        // This will happen in when the route was closed from the card component
        // e.g. When the close animation triggered from a gesture ends
@@ -638,7 +673,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
        // We need to clean up any state tracking the route and pop it immediately
        this.setState((state) => ({
          routes: state.routes.filter((r) => r.key !== route.key),
-@@ -388,26 +414,29 @@
+@@ -390,47 +415,41 @@
    private handleTransitionStart = (
      { route }: { route: Route<string> },
      closing: boolean
@@ -665,13 +700,45 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
 -      data: { closing },
 -      target: route.key,
 -    });
+-
+-  private handleGestureStart = ({ route }: { route: Route<string> }) => {
+-    this.props.navigation.emit({
+-      type: 'gestureStart',
+-      target: route.key,
+-    });
+-  };
+-
+-  private handleGestureEnd = ({ route }: { route: Route<string> }) => {
+-    this.props.navigation.emit({
+-      type: 'gestureEnd',
+-      target: route.key,
+-    });
+-  };
+-
+-  private handleGestureCancel = ({ route }: { route: Route<string> }) => {
+-    this.props.navigation.emit({
+-      type: 'gestureCancel',
+-      target: route.key,
+-    });
 +  ) => {
 +    const { descriptors } = this.props;
 +    const descriptor =
 +      descriptors[route.key] || this.state.descriptors[route.key];
 +
-+    descriptor?.options.onTransitionEnd?.({ closing });
++    descriptor?.options.onTransitionStart?.({ closing });
 +  };
++
++  private handleGestureStart = () => {
++    // Do nothing
++  };
++
++  private handleGestureEnd = () => {
++    // Do nothing
++  };
++
++  private handleGestureCancel = () => {
++    // Do nothing
+   };
  
    render() {
      const {
@@ -680,7 +747,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
        navigation,
        keyboardHandlingEnabled,
        mode = 'card',
-@@ -427,7 +456,7 @@
+@@ -450,7 +469,7 @@
      } = this.state;
  
      return (
@@ -689,7 +756,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
          <GestureHandlerWrapper style={styles.container}>
            <SafeAreaProviderCompat>
              <SafeAreaConsumer>
-@@ -460,7 +489,7 @@
+@@ -491,7 +510,7 @@
              </SafeAreaConsumer>
            </SafeAreaProviderCompat>
          </GestureHandlerWrapper>

packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap

@@ -11,12 +11,9 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
   <View
     pointerEvents="box-none"
     style={
-      Array [
-        Object {
-          "zIndex": 1,
-        },
-        false,
-      ]
+      Object {
+        "zIndex": 1,
+      }
     }
   >
     <View
@@ -194,6 +191,7 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
         }
       >
         <View
+          needsOffscreenAlphaCompositing={false}
           pointerEvents="box-none"
           style={
             Object {
@@ -362,6 +360,7 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
                             }
                           >
                             <View
+                              needsOffscreenAlphaCompositing={false}
                               pointerEvents="box-none"
                               style={
                                 Object {
@@ -458,17 +457,14 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
                       <View
                         pointerEvents="box-none"
                         style={
-                          Array [
-                            Object {
-                              "zIndex": 1,
-                            },
-                            Object {
-                              "left": 0,
-                              "position": "absolute",
-                              "right": 0,
-                              "top": 0,
-                            },
-                          ]
+                          Object {
+                            "height": 44,
+                            "left": 0,
+                            "position": "absolute",
+                            "right": 0,
+                            "top": 0,
+                            "zIndex": 1,
+                          }
                         }
                       />
                     </View>

packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap

@@ -11,12 +11,9 @@ exports[`StackNavigator applies correct values when headerRight is present 1`] =
   <View
     pointerEvents="box-none"
     style={
-      Array [
-        Object {
-          "zIndex": 1,
-        },
-        false,
-      ]
+      Object {
+        "zIndex": 1,
+      }
     }
   >
     <View
@@ -211,6 +208,7 @@ exports[`StackNavigator applies correct values when headerRight is present 1`] =
         }
       >
         <View
+          needsOffscreenAlphaCompositing={false}
           pointerEvents="box-none"
           style={
             Object {
@@ -317,12 +315,9 @@ exports[`StackNavigator renders successfully 1`] = `
   <View
     pointerEvents="box-none"
     style={
-      Array [
-        Object {
-          "zIndex": 1,
-        },
-        false,
-      ]
+      Object {
+        "zIndex": 1,
+      }
     }
   >
     <View
@@ -501,6 +496,7 @@ exports[`StackNavigator renders successfully 1`] = `
         }
       >
         <View
+          needsOffscreenAlphaCompositing={false}
           pointerEvents="box-none"
           style={
             Object {

packages/stack/src/vendor/TransitionConfigs/CardStyleInterpolators.tsx

@@ -289,8 +289,8 @@ export function forScaleFromCenterAndroid({
   );
 
   const opacity = progress.interpolate({
-    inputRange: [0, 0.8, 1, 1.2, 2],
-    outputRange: [0, 0.5, 1, 0.33, 0],
+    inputRange: [0, 0.75, 0.875, 1, 1.0825, 1.2075, 2],
+    outputRange: [0, 0, 1, 1, 1, 1, 0],
   });
 
   const scale = conditional(

packages/stack/src/vendor/TransitionConfigs/TransitionPresets.tsx

@@ -18,6 +18,7 @@ import {
 import type { TransitionPreset } from '../types';
 
 const ANDROID_VERSION_PIE = 28;
+const ANDROID_VERSION_10 = 29;
 
 /**
  * Standard iOS navigation transition.
@@ -102,10 +103,13 @@ export const ScaleFromCenterAndroid: TransitionPreset = {
  */
 export const DefaultTransition = Platform.select({
   ios: SlideFromRightIOS,
-  default:
-    Platform.OS === 'android' && Platform.Version >= ANDROID_VERSION_PIE
+  android:
+    Platform.Version >= ANDROID_VERSION_10
+      ? ScaleFromCenterAndroid
+      : Platform.Version >= ANDROID_VERSION_PIE
       ? RevealFromBottomAndroid
       : FadeFromBottomAndroid,
+  default: ScaleFromCenterAndroid,
 });
 
 /**

packages/stack/src/vendor/types.tsx

@@ -56,6 +56,7 @@ export type StackNavigationEventMap = {
 };
 
 export type StackNavigationHelpers = NavigationProp<NavigationStackState>;
+
 export type StackNavigationProp<
   State = NavigationRoute,
   Params = NavigationParams
@@ -336,11 +337,11 @@ export type StackNavigationOptions = StackHeaderOptions &
      */
     gestureResponseDistance?: {
       /**
-       * Distance for horizontal direction. Defaults to 25.
+       * Distance for vertical direction. Defaults to 135.
        */
       vertical?: number;
       /**
-       * Distance for vertical direction. Defaults to 135.
+       * Distance for horizontal direction. Defaults to 25.
        */
       horizontal?: number;
     };
@@ -360,6 +361,13 @@ export type StackNavigationOptions = StackHeaderOptions &
       bottom?: number;
       left?: number;
     };
+    /**
+     * Whether to detach the previous screen from the view hierarchy to save memory.
+     * Set it to `false` if you need the previous screen to be seen through the active screen.
+     * Only applicable if `detachInactiveScreens` isn't set to `false`.
+     * Defaults to `false` for the last screen when mode='modal', otherwise `true`.
+     */
+    detachPreviousScreen?: boolean;
     onTransitionStart?: (props: TransitionCallbackProps) => void;
     onTransitionEnd?: (props: TransitionCallbackProps) => void;
   };
@@ -372,6 +380,12 @@ export type StackNavigationConfig = {
    * Defaults to `true`.
    */
   keyboardHandlingEnabled?: boolean;
+  /**
+   * Whether inactive screens should be detached from the view hierarchy to save memory.
+   * Make sure to call `enableScreens` from `react-native-screens` to make it work.
+   * Defaults to `true` on Android, `false` on iOS.
+   */
+  detachInactiveScreens?: boolean;
 };
 
 export type StackHeaderLeftButtonProps = {

packages/stack/src/vendor/views/Header/HeaderBackButton.tsx

@@ -8,9 +8,9 @@ import {
   StyleSheet,
   LayoutChangeEvent,
 } from 'react-native';
-import useTheme from '../../../utils/useTheme';
 import MaskedView from '../MaskedView';
 import TouchableItem from '../TouchableItem';
+import useTheme from '../../../utils/useTheme';
 import type { StackHeaderLeftButtonProps } from '../../types';
 
 type Props = StackHeaderLeftButtonProps;

packages/stack/src/vendor/views/Header/HeaderContainer.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
+import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 import { NavigationContext } from 'react-navigation';
 import type { EdgeInsets } from 'react-native-safe-area-context';
 
@@ -56,7 +56,7 @@ export default function HeaderContainer({
   const parentPreviousScene = React.useContext(PreviousSceneContext);
 
   return (
-    <View pointerEvents="box-none" style={style}>
+    <Animated.View pointerEvents="box-none" style={style}>
       {scenes.slice(-3).map((scene, i, self) => {
         if ((mode === 'screen' && i !== self.length - 1) || !scene) {
           return null;
@@ -124,11 +124,14 @@ export default function HeaderContainer({
               <View
                 onLayout={
                   onContentHeightChange
-                    ? (e) =>
+                    ? (e) => {
+                        const { height } = e.nativeEvent.layout;
+
                         onContentHeightChange({
                           route: scene.route,
-                          height: e.nativeEvent.layout.height,
-                        })
+                          height,
+                        });
+                      }
                     : undefined
                 }
                 pointerEvents={isFocused ? 'box-none' : 'none'}
@@ -150,7 +153,7 @@ export default function HeaderContainer({
           </NavigationContext.Provider>
         );
       })}
-    </View>
+    </Animated.View>
   );
 }
 

packages/stack/src/vendor/views/Header/HeaderContainer.tsx.orig

@@ -1,170 +0,0 @@
-import * as React from 'react';
-import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
-import {
-  NavigationContext,
-  NavigationRouteContext,
-  Route,
-  ParamListBase,
-} from '@react-navigation/native';
-import type { EdgeInsets } from 'react-native-safe-area-context';
-
-import Header from './Header';
-import {
-  forSlideLeft,
-  forSlideUp,
-  forNoAnimation,
-  forSlideRight,
-} from '../../TransitionConfigs/HeaderStyleInterpolators';
-import HeaderShownContext from '../../utils/HeaderShownContext';
-import PreviousSceneContext from '../../utils/PreviousSceneContext';
-import type {
-  Layout,
-  Scene,
-  StackHeaderStyleInterpolator,
-  StackNavigationProp,
-  GestureDirection,
-} from '../../types';
-
-export type Props = {
-  mode: 'float' | 'screen';
-  layout: Layout;
-  insets: EdgeInsets;
-  scenes: (Scene<Route<string>> | undefined)[];
-  getPreviousScene: (props: {
-    route: Route<string>;
-  }) => Scene<Route<string>> | undefined;
-  getFocusedRoute: () => Route<string>;
-  onContentHeightChange?: (props: {
-    route: Route<string>;
-    height: number;
-  }) => void;
-  styleInterpolator: StackHeaderStyleInterpolator;
-  gestureDirection: GestureDirection;
-  style?: StyleProp<ViewStyle>;
-};
-
-export default function HeaderContainer({
-  mode,
-  scenes,
-  layout,
-  insets,
-  getPreviousScene,
-  getFocusedRoute,
-  onContentHeightChange,
-  gestureDirection,
-  styleInterpolator,
-  style,
-}: Props) {
-  const focusedRoute = getFocusedRoute();
-  const isParentHeaderShown = React.useContext(HeaderShownContext);
-  const parentPreviousScene = React.useContext(PreviousSceneContext);
-
-  return (
-    <View pointerEvents="box-none" style={style}>
-      {scenes.slice(-3).map((scene, i, self) => {
-        if ((mode === 'screen' && i !== self.length - 1) || !scene) {
-          return null;
-        }
-
-        const {
-          header,
-          headerShown = isParentHeaderShown === false,
-          headerTransparent,
-        } = scene.descriptor.options || {};
-
-        if (!headerShown) {
-          return null;
-        }
-
-        const isFocused = focusedRoute.key === scene.route.key;
-        const previous =
-          getPreviousScene({ route: scene.route }) ?? parentPreviousScene;
-
-        // If the screen is next to a headerless screen, we need to make the header appear static
-        // This makes the header look like it's moving with the screen
-        const previousScene = self[i - 1];
-        const nextScene = self[i + 1];
-
-        const {
-          headerShown: previousHeaderShown = isParentHeaderShown === false,
-        } = previousScene?.descriptor.options || {};
-
-        const { headerShown: nextHeaderShown = isParentHeaderShown === false } =
-          nextScene?.descriptor.options || {};
-
-        const isHeaderStatic =
-          (previousHeaderShown === false &&
-            // We still need to animate when coming back from next scene
-            // A hacky way to check this is if the next scene exists
-            !nextScene) ||
-          nextHeaderShown === false;
-
-        const props = {
-          mode,
-          layout,
-          insets,
-          scene,
-          previous,
-          navigation: scene.descriptor.navigation as StackNavigationProp<
-            ParamListBase
-          >,
-          styleInterpolator:
-            mode === 'float'
-              ? isHeaderStatic
-                ? gestureDirection === 'vertical' ||
-                  gestureDirection === 'vertical-inverted'
-                  ? forSlideUp
-                  : gestureDirection === 'horizontal-inverted'
-                  ? forSlideRight
-                  : forSlideLeft
-                : styleInterpolator
-              : forNoAnimation,
-        };
-
-        return (
-          <NavigationContext.Provider
-            key={scene.route.key}
-            value={scene.descriptor.navigation}
-          >
-            <NavigationRouteContext.Provider value={scene.route}>
-              <View
-                onLayout={
-                  onContentHeightChange
-                    ? (e) =>
-                        onContentHeightChange({
-                          route: scene.route,
-                          height: e.nativeEvent.layout.height,
-                        })
-                    : undefined
-                }
-                pointerEvents={isFocused ? 'box-none' : 'none'}
-                accessibilityElementsHidden={!isFocused}
-                importantForAccessibility={
-                  isFocused ? 'auto' : 'no-hide-descendants'
-                }
-                style={
-                  // Avoid positioning the focused header absolutely
-                  // Otherwise accessibility tools don't seem to be able to find it
-                  (mode === 'float' && !isFocused) || headerTransparent
-                    ? styles.header
-                    : null
-                }
-              >
-                {header !== undefined ? header(props) : <Header {...props} />}
-              </View>
-            </NavigationRouteContext.Provider>
-          </NavigationContext.Provider>
-        );
-      })}
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  header: {
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    right: 0,
-  },
-});

packages/stack/src/vendor/views/Header/HeaderSegment.tsx

@@ -11,6 +11,7 @@ import type { EdgeInsets } from 'react-native-safe-area-context';
 import type { NavigationRoute } from 'react-navigation';
 import HeaderBackButton from './HeaderBackButton';
 import HeaderBackground from './HeaderBackground';
+import HeaderShownContext from '../../utils/HeaderShownContext';
 import memoize from '../../utils/memoize';
 import type {
   Layout,
@@ -32,11 +33,6 @@ type Props = StackHeaderOptions & {
   styleInterpolator: StackHeaderStyleInterpolator;
 };
 
-type State = {
-  titleLayout?: Layout;
-  leftLabelLayout?: Layout;
-};
-
 const warnIfHeaderStylesDefined = (styles: Record<string, any>) => {
   Object.keys(styles).forEach((styleProp) => {
     const value = styles[styleProp];
@@ -76,30 +72,35 @@ export const getDefaultHeaderHeight = (
   return headerHeight + statusBarHeight;
 };
 
-export default class HeaderSegment extends React.Component<Props, State> {
-  state: State = {};
+export default function HeaderSegment(props: Props) {
+  const [leftLabelLayout, setLeftLabelLayout] = React.useState<
+    Layout | undefined
+  >(undefined);
 
-  private handleTitleLayout = (e: LayoutChangeEvent) => {
+  const [titleLayout, setTitleLayout] = React.useState<Layout | undefined>(
+    undefined
+  );
+
+  const isParentHeaderShown = React.useContext(HeaderShownContext);
+
+  const handleTitleLayout = (e: LayoutChangeEvent) => {
     const { height, width } = e.nativeEvent.layout;
 
-    this.setState(({ titleLayout }) => {
+    setTitleLayout((titleLayout) => {
       if (
         titleLayout &&
         height === titleLayout.height &&
         width === titleLayout.width
       ) {
-        return null;
+        return titleLayout;
       }
 
-      return {
-        titleLayout: { height, width },
-      };
+      return { height, width };
     });
   };
 
-  private handleLeftLabelLayout = (e: LayoutChangeEvent) => {
+  const handleLeftLabelLayout = (e: LayoutChangeEvent) => {
     const { height, width } = e.nativeEvent.layout;
-    const { leftLabelLayout } = this.state;
 
     if (
       leftLabelLayout &&
@@ -109,10 +110,10 @@ export default class HeaderSegment extends React.Component<Props, State> {
       return;
     }
 
-    this.setState({ leftLabelLayout: { height, width } });
+    setLeftLabelLayout({ height, width });
   };
 
-  private getInterpolatedStyle = memoize(
+  const getInterpolatedStyle = memoize(
     (
       styleInterpolator: StackHeaderStyleInterpolator,
       layout: Layout,
@@ -137,258 +138,251 @@ export default class HeaderSegment extends React.Component<Props, State> {
       })
   );
 
-  render() {
-    const {
-      scene,
-      layout,
-      insets,
-      title: currentTitle,
-      leftLabel: previousTitle,
-      onGoBack,
-      headerTitle,
-      headerTitleAlign = Platform.select({
-        ios: 'center',
-        default: 'left',
-      }),
-      headerLeft: left = onGoBack
-        ? (props: StackHeaderLeftButtonProps) => <HeaderBackButton {...props} />
-        : undefined,
-      headerTransparent,
-      headerTintColor,
-      headerBackground,
-      headerRight: right,
-      headerBackImage: backImage,
-      headerBackTitle: leftLabel,
-      headerBackTitleVisible,
-      headerTruncatedBackTitle: truncatedLabel,
-      headerPressColorAndroid: pressColorAndroid,
-      headerBackAllowFontScaling: backAllowFontScaling,
-      headerTitleAllowFontScaling: titleAllowFontScaling,
-      headerTitleStyle: customTitleStyle,
-      headerBackTitleStyle: customLeftLabelStyle,
-      headerLeftContainerStyle: leftContainerStyle,
-      headerRightContainerStyle: rightContainerStyle,
-      headerTitleContainerStyle: titleContainerStyle,
-      headerStyle: customHeaderStyle,
-      headerStatusBarHeight = insets.top,
-      styleInterpolator,
-    } = this.props;
+  const {
+    scene,
+    layout,
+    insets,
+    title: currentTitle,
+    leftLabel: previousTitle,
+    onGoBack,
+    headerTitle,
+    headerTitleAlign = Platform.select({
+      ios: 'center',
+      default: 'left',
+    }),
+    headerLeft: left = onGoBack
+      ? (props: StackHeaderLeftButtonProps) => <HeaderBackButton {...props} />
+      : undefined,
+    headerTransparent,
+    headerTintColor,
+    headerBackground,
+    headerRight: right,
+    headerBackImage: backImage,
+    headerBackTitle: leftLabel,
+    headerBackTitleVisible,
+    headerTruncatedBackTitle: truncatedLabel,
+    headerPressColorAndroid: pressColorAndroid,
+    headerBackAllowFontScaling: backAllowFontScaling,
+    headerTitleAllowFontScaling: titleAllowFontScaling,
+    headerTitleStyle: customTitleStyle,
+    headerBackTitleStyle: customLeftLabelStyle,
+    headerLeftContainerStyle: leftContainerStyle,
+    headerRightContainerStyle: rightContainerStyle,
+    headerTitleContainerStyle: titleContainerStyle,
+    headerStyle: customHeaderStyle,
+    headerStatusBarHeight = isParentHeaderShown ? 0 : insets.top,
+    styleInterpolator,
+  } = props;
 
-    const { leftLabelLayout, titleLayout } = this.state;
+  const defaultHeight = getDefaultHeaderHeight(layout, headerStatusBarHeight);
 
-    const defaultHeight = getDefaultHeaderHeight(layout, headerStatusBarHeight);
+  const {
+    height = defaultHeight,
+    minHeight,
+    maxHeight,
+    backgroundColor,
+    borderBottomColor,
+    borderBottomEndRadius,
+    borderBottomLeftRadius,
+    borderBottomRightRadius,
+    borderBottomStartRadius,
+    borderBottomWidth,
+    borderColor,
+    borderEndColor,
+    borderEndWidth,
+    borderLeftColor,
+    borderLeftWidth,
+    borderRadius,
+    borderRightColor,
+    borderRightWidth,
+    borderStartColor,
+    borderStartWidth,
+    borderStyle,
+    borderTopColor,
+    borderTopEndRadius,
+    borderTopLeftRadius,
+    borderTopRightRadius,
+    borderTopStartRadius,
+    borderTopWidth,
+    borderWidth,
+    // @ts-expect-error: web support for shadow
+    boxShadow,
+    elevation,
+    shadowColor,
+    shadowOffset,
+    shadowOpacity,
+    shadowRadius,
+    opacity,
+    transform,
+    ...unsafeStyles
+  } = StyleSheet.flatten(customHeaderStyle || {}) as ViewStyle;
 
-    const {
-      height = defaultHeight,
-      minHeight,
-      maxHeight,
-      backgroundColor,
-      borderBottomColor,
-      borderBottomEndRadius,
-      borderBottomLeftRadius,
-      borderBottomRightRadius,
-      borderBottomStartRadius,
-      borderBottomWidth,
-      borderColor,
-      borderEndColor,
-      borderEndWidth,
-      borderLeftColor,
-      borderLeftWidth,
-      borderRadius,
-      borderRightColor,
-      borderRightWidth,
-      borderStartColor,
-      borderStartWidth,
-      borderStyle,
-      borderTopColor,
-      borderTopEndRadius,
-      borderTopLeftRadius,
-      borderTopRightRadius,
-      borderTopStartRadius,
-      borderTopWidth,
-      borderWidth,
-      // @ts-expect-error: web support for shadow
-      boxShadow,
-      elevation,
-      shadowColor,
-      shadowOffset,
-      shadowOpacity,
-      shadowRadius,
-      opacity,
-      transform,
-      ...unsafeStyles
-    } = StyleSheet.flatten(customHeaderStyle || {}) as ViewStyle;
+  if (process.env.NODE_ENV !== 'production') {
+    warnIfHeaderStylesDefined(unsafeStyles);
+  }
 
-    if (process.env.NODE_ENV !== 'production') {
-      warnIfHeaderStylesDefined(unsafeStyles);
+  const safeStyles: ViewStyle = {
+    backgroundColor,
+    borderBottomColor,
+    borderBottomEndRadius,
+    borderBottomLeftRadius,
+    borderBottomRightRadius,
+    borderBottomStartRadius,
+    borderBottomWidth,
+    borderColor,
+    borderEndColor,
+    borderEndWidth,
+    borderLeftColor,
+    borderLeftWidth,
+    borderRadius,
+    borderRightColor,
+    borderRightWidth,
+    borderStartColor,
+    borderStartWidth,
+    borderStyle,
+    borderTopColor,
+    borderTopEndRadius,
+    borderTopLeftRadius,
+    borderTopRightRadius,
+    borderTopStartRadius,
+    borderTopWidth,
+    borderWidth,
+    // @ts-expect-error: boxShadow is only for Web
+    boxShadow,
+    elevation,
+    shadowColor,
+    shadowOffset,
+    shadowOpacity,
+    shadowRadius,
+    opacity,
+    transform,
+  };
+
+  // Setting a property to undefined triggers default style
+  // So we need to filter them out
+  // Users can use `null` instead
+  for (const styleProp in safeStyles) {
+    // @ts-expect-error: typescript wrongly complains that styleProp cannot be used to index safeStyles
+    if (safeStyles[styleProp] === undefined) {
+      // @ts-expect-error
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      delete safeStyles[styleProp];
     }
+  }
 
-    const safeStyles: ViewStyle = {
-      backgroundColor,
-      borderBottomColor,
-      borderBottomEndRadius,
-      borderBottomLeftRadius,
-      borderBottomRightRadius,
-      borderBottomStartRadius,
-      borderBottomWidth,
-      borderColor,
-      borderEndColor,
-      borderEndWidth,
-      borderLeftColor,
-      borderLeftWidth,
-      borderRadius,
-      borderRightColor,
-      borderRightWidth,
-      borderStartColor,
-      borderStartWidth,
-      borderStyle,
-      borderTopColor,
-      borderTopEndRadius,
-      borderTopLeftRadius,
-      borderTopRightRadius,
-      borderTopStartRadius,
-      borderTopWidth,
-      borderWidth,
-      // @ts-expect-error: boxShadow is only for Web
-      boxShadow,
-      elevation,
-      shadowColor,
-      shadowOffset,
-      shadowOpacity,
-      shadowRadius,
-      opacity,
-      transform,
-    };
+  const {
+    titleStyle,
+    leftButtonStyle,
+    leftLabelStyle,
+    rightButtonStyle,
+    backgroundStyle,
+  } = getInterpolatedStyle(
+    styleInterpolator,
+    layout,
+    scene.progress.current,
+    scene.progress.next,
+    titleLayout,
+    previousTitle ? leftLabelLayout : undefined,
+    typeof height === 'number' ? height : defaultHeight
+  );
 
-    // Setting a property to undefined triggers default style
-    // So we need to filter them out
-    // Users can use `null` instead
-    for (const styleProp in safeStyles) {
-      // @ts-expect-error: typescript wrongly complains that styleProp cannot be used to index safeStyles
-      if (safeStyles[styleProp] === undefined) {
-        // @ts-expect-error
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-        delete safeStyles[styleProp];
-      }
-    }
+  const leftButton = left
+    ? left({
+        backImage,
+        pressColorAndroid,
+        allowFontScaling: backAllowFontScaling,
+        onPress: onGoBack,
+        labelVisible: headerBackTitleVisible,
+        label: leftLabel !== undefined ? leftLabel : previousTitle,
+        truncatedLabel,
+        labelStyle: [leftLabelStyle, customLeftLabelStyle],
+        onLabelLayout: handleLeftLabelLayout,
+        screenLayout: layout,
+        titleLayout,
+        tintColor: headerTintColor,
+        canGoBack: Boolean(onGoBack),
+      })
+    : null;
 
-    const {
-      titleStyle,
-      leftButtonStyle,
-      leftLabelStyle,
-      rightButtonStyle,
-      backgroundStyle,
-    } = this.getInterpolatedStyle(
-      styleInterpolator,
-      layout,
-      scene.progress.current,
-      scene.progress.next,
-      titleLayout,
-      previousTitle ? leftLabelLayout : undefined,
-      typeof height === 'number' ? height : defaultHeight
-    );
+  const rightButton = right ? right({ tintColor: headerTintColor }) : null;
 
-    const leftButton = left
-      ? left({
-          backImage,
-          pressColorAndroid,
-          allowFontScaling: backAllowFontScaling,
-          onPress: onGoBack,
-          labelVisible: headerBackTitleVisible,
-          label: leftLabel !== undefined ? leftLabel : previousTitle,
-          truncatedLabel,
-          labelStyle: [leftLabelStyle, customLeftLabelStyle],
-          onLabelLayout: this.handleLeftLabelLayout,
-          screenLayout: layout,
-          titleLayout,
-          tintColor: headerTintColor,
-          canGoBack: Boolean(onGoBack),
-        })
-      : null;
-
-    const rightButton = right ? right({ tintColor: headerTintColor }) : null;
-
-    return (
-      <React.Fragment>
-        <Animated.View
-          pointerEvents="box-none"
-          style={[StyleSheet.absoluteFill, { zIndex: 0 }, backgroundStyle]}
-        >
-          {headerBackground ? (
-            headerBackground({ style: safeStyles })
-          ) : headerTransparent ? null : (
-            <HeaderBackground style={safeStyles} />
-          )}
-        </Animated.View>
-        <Animated.View
-          pointerEvents="box-none"
-          style={[{ height, minHeight, maxHeight, opacity, transform }]}
-        >
-          <View
-            pointerEvents="none"
-            style={{ height: headerStatusBarHeight }}
-          />
-          <View pointerEvents="box-none" style={styles.content}>
-            {leftButton ? (
-              <Animated.View
-                pointerEvents="box-none"
-                style={[
-                  styles.left,
-                  { left: insets.left },
-                  leftButtonStyle,
-                  leftContainerStyle,
-                ]}
-              >
-                {leftButton}
-              </Animated.View>
-            ) : null}
+  return (
+    <React.Fragment>
+      <Animated.View
+        pointerEvents="box-none"
+        style={[StyleSheet.absoluteFill, { zIndex: 0 }, backgroundStyle]}
+      >
+        {headerBackground ? (
+          headerBackground({ style: safeStyles })
+        ) : headerTransparent ? null : (
+          <HeaderBackground style={safeStyles} />
+        )}
+      </Animated.View>
+      <Animated.View
+        pointerEvents="box-none"
+        style={[{ height, minHeight, maxHeight, opacity, transform }]}
+      >
+        <View pointerEvents="none" style={{ height: headerStatusBarHeight }} />
+        <View pointerEvents="box-none" style={styles.content}>
+          {leftButton ? (
             <Animated.View
               pointerEvents="box-none"
               style={[
-                headerTitleAlign === 'left'
-                  ? {
-                      position: 'absolute',
-                      left: (leftButton ? 72 : 16) + insets.left,
-                      right: (rightButton ? 72 : 16) + insets.right,
-                    }
-                  : {
-                      marginHorizontal:
-                        (leftButton ? 32 : 16) +
-                        (leftButton && headerBackTitleVisible !== false
-                          ? 40
-                          : 0) +
-                        Math.max(insets.left, insets.right),
-                    },
-                titleStyle,
-                titleContainerStyle,
+                styles.left,
+                { left: insets.left },
+                leftButtonStyle,
+                leftContainerStyle,
               ]}
             >
-              {headerTitle({
-                children: currentTitle,
-                onLayout: this.handleTitleLayout,
-                allowFontScaling: titleAllowFontScaling,
-                tintColor: headerTintColor,
-                style: customTitleStyle,
-              })}
+              {leftButton}
             </Animated.View>
-            {rightButton ? (
-              <Animated.View
-                pointerEvents="box-none"
-                style={[
-                  styles.right,
-                  { right: insets.right },
-                  rightButtonStyle,
-                  rightContainerStyle,
-                ]}
-              >
-                {rightButton}
-              </Animated.View>
-            ) : null}
-          </View>
-        </Animated.View>
-      </React.Fragment>
-    );
-  }
+          ) : null}
+          <Animated.View
+            pointerEvents="box-none"
+            style={[
+              headerTitleAlign === 'left'
+                ? {
+                    position: 'absolute',
+                    left: (leftButton ? 72 : 16) + insets.left,
+                    right: (rightButton ? 72 : 16) + insets.right,
+                  }
+                : {
+                    marginHorizontal:
+                      (leftButton ? 32 : 16) +
+                      (leftButton && headerBackTitleVisible !== false
+                        ? 40
+                        : 0) +
+                      Math.max(insets.left, insets.right),
+                  },
+              titleStyle,
+              titleContainerStyle,
+            ]}
+          >
+            {headerTitle({
+              children: currentTitle,
+              onLayout: handleTitleLayout,
+              allowFontScaling: titleAllowFontScaling,
+              tintColor: headerTintColor,
+              style: customTitleStyle,
+            })}
+          </Animated.View>
+          {rightButton ? (
+            <Animated.View
+              pointerEvents="box-none"
+              style={[
+                styles.right,
+                { right: insets.right },
+                rightButtonStyle,
+                rightContainerStyle,
+              ]}
+            >
+              {rightButton}
+            </Animated.View>
+          ) : null}
+        </View>
+      </Animated.View>
+    </React.Fragment>
+  );
 }
 
 const styles = StyleSheet.create({

packages/stack/src/vendor/views/Screens.tsx

@@ -34,6 +34,9 @@ class WebScreen extends React.Component<
 
 const AnimatedWebScreen = Animated.createAnimatedComponent(WebScreen);
 
+// @ts-ignore
+export const shouldUseActivityState = Screens?.shouldUseActivityState;
+
 export const MaybeScreenContainer = ({
   enabled,
   ...rest
@@ -41,8 +44,11 @@ export const MaybeScreenContainer = ({
   enabled: boolean;
   children: React.ReactNode;
 }) => {
-  if (enabled && Platform.OS !== 'web' && Screens && Screens.screensEnabled()) {
-    return <Screens.ScreenContainer {...rest} />;
+  if (enabled && Platform.OS !== 'web' && Screens?.screensEnabled()) {
+    return (
+      // @ts-ignore
+      <Screens.ScreenContainer enabled={enabled} {...rest} />
+    );
   }
 
   return <View {...rest} />;
@@ -54,16 +60,25 @@ export const MaybeScreen = ({
   ...rest
 }: ViewProps & {
   enabled: boolean;
-  active: 0 | 1 | Animated.AnimatedInterpolation;
+  active: 0 | 1 | 2 | Animated.AnimatedInterpolation;
   children: React.ReactNode;
 }) => {
   if (enabled && Platform.OS === 'web') {
     return <AnimatedWebScreen active={active} {...rest} />;
   }
 
-  if (enabled && Screens && Screens.screensEnabled()) {
-    // @ts-expect-error: stackPresentation is incorrectly marked as required
-    return <Screens.Screen active={active} {...rest} />;
+  if (enabled && Screens?.screensEnabled()) {
+    if (shouldUseActivityState) {
+      return (
+        // @ts-expect-error: there was an `active` prop and no `activityState` in older version and stackPresentation was required
+        <Screens.Screen enabled={enabled} activityState={active} {...rest} />
+      );
+    } else {
+      return (
+        // @ts-expect-error: there was an `active` prop and no `activityState` in older version and stackPresentation was required
+        <Screens.Screen enabled={enabled} active={active} {...rest} />
+      );
+    }
   }
 
   return <View {...rest} />;

packages/stack/src/vendor/views/Stack/Card.tsx

@@ -79,6 +79,15 @@ const GESTURE_RESPONSE_DISTANCE_VERTICAL = 135;
 
 const useNativeDriver = Platform.OS !== 'web';
 
+const hasOpacityStyle = (style: any) => {
+  if (style) {
+    const flattenedStyle = StyleSheet.flatten(style);
+    return flattenedStyle.opacity != null;
+  }
+
+  return false;
+};
+
 export default class Card extends React.Component<Props> {
   static defaultProps = {
     overlayEnabled: Platform.OS !== 'ios',
@@ -533,6 +542,7 @@ export default class Card extends React.Component<Props> {
             </View>
           ) : null}
           <Animated.View
+            needsOffscreenAlphaCompositing={hasOpacityStyle(containerStyle)}
             style={[styles.container, containerStyle, customContainerStyle]}
             pointerEvents="box-none"
           >

packages/stack/src/vendor/views/Stack/CardContainer.tsx

@@ -67,6 +67,7 @@ type Props = TransitionPreset & {
     route: Route<string>;
     height: number;
   }) => void;
+  isParentHeaderShown: boolean;
 };
 
 const EPSILON = 0.1;
@@ -94,6 +95,7 @@ function CardContainer({
   hasAbsoluteHeader,
   headerHeight,
   onHeaderHeightChange,
+  isParentHeaderShown,
   index,
   layout,
   onCloseRoute,
@@ -182,7 +184,6 @@ function CardContainer({
     };
   }, [pointerEvents, scene.progress.next]);
 
-  const isParentHeaderShown = React.useContext(HeaderShownContext);
   const isCurrentHeaderShown = headerMode !== 'none' && headerShown !== false;
   const previousScene = getPreviousScene({ route: scene.route });
 

packages/stack/src/vendor/views/Stack/CardStack.tsx

@@ -4,12 +4,15 @@ import {
   StyleSheet,
   LayoutChangeEvent,
   Dimensions,
-  Platform,
 } from 'react-native';
 import type { EdgeInsets } from 'react-native-safe-area-context';
 import type { NavigationState as StackNavigationState } from 'react-navigation';
 
-import { MaybeScreenContainer, MaybeScreen } from '../Screens';
+import {
+  MaybeScreenContainer,
+  MaybeScreen,
+  shouldUseActivityState,
+} from '../Screens';
 import { getDefaultHeaderHeight } from '../Header/HeaderSegment';
 import type { Props as HeaderContainerProps } from '../Header/HeaderContainer';
 import CardContainer from './CardContainer';
@@ -19,7 +22,6 @@ import {
 } from '../../TransitionConfigs/TransitionPresets';
 import { forNoAnimation as forNoAnimationHeader } from '../../TransitionConfigs/HeaderStyleInterpolators';
 import { forNoAnimation as forNoAnimationCard } from '../../TransitionConfigs/CardStyleInterpolators';
-import HeaderShownContext from '../../utils/HeaderShownContext';
 import getDistanceForDirection from '../../utils/getDistanceForDirection';
 import type {
   Layout,
@@ -53,6 +55,7 @@ type Props = {
   renderHeader: (props: HeaderContainerProps) => React.ReactNode;
   renderScene: (props: { route: Route<string> }) => React.ReactNode;
   headerMode: StackHeaderMode;
+  isParentHeaderShown: boolean;
   onTransitionStart: (
     props: { route: Route<string> },
     closing: boolean
@@ -64,6 +67,7 @@ type Props = {
   onGestureStart?: (props: { route: Route<string> }) => void;
   onGestureEnd?: (props: { route: Route<string> }) => void;
   onGestureCancel?: (props: { route: Route<string> }) => void;
+  detachInactiveScreens?: boolean;
 };
 
 type State = {
@@ -77,11 +81,16 @@ type State = {
 
 const EPSILON = 0.01;
 
+const STATE_INACTIVE = 0;
+const STATE_TRANSITIONING_OR_BELOW_TOP = 1;
+const STATE_ON_TOP = 2;
+
 const FALLBACK_DESCRIPTOR = Object.freeze({ options: {} });
 
 const getHeaderHeights = (
   routes: Route<string>[],
   insets: EdgeInsets,
+  isParentHeaderShown: boolean,
   descriptors: StackDescriptorMap,
   layout: Layout,
   previous: Record<string, number>
@@ -98,7 +107,9 @@ const getHeaderHeights = (
       ...options.safeAreaInsets,
     };
 
-    const { headerStatusBarHeight = safeAreaInsets.top } = options;
+    const {
+      headerStatusBarHeight = isParentHeaderShown ? 0 : safeAreaInsets.top,
+    } = options;
 
     acc[curr.key] =
       typeof height === 'number'
@@ -261,6 +272,7 @@ export default class CardStack extends React.Component<Props, State> {
       headerHeights: getHeaderHeights(
         props.routes,
         props.insets,
+        props.isParentHeaderShown,
         state.descriptors,
         state.layout,
         state.headerHeights
@@ -303,6 +315,7 @@ export default class CardStack extends React.Component<Props, State> {
         headerHeights: getHeaderHeights(
           props.routes,
           props.insets,
+          props.isParentHeaderShown,
           state.descriptors,
           layout,
           state.headerHeights
@@ -371,6 +384,7 @@ export default class CardStack extends React.Component<Props, State> {
       renderHeader,
       renderScene,
       headerMode,
+      isParentHeaderShown,
       onTransitionStart,
       onTransitionEnd,
       onPageChangeStart,
@@ -379,6 +393,8 @@ export default class CardStack extends React.Component<Props, State> {
       onGestureStart,
       onGestureEnd,
       onGestureCancel,
+      // Enable on new versions of screens or for non modals on older versions
+      detachInactiveScreens = shouldUseActivityState || mode !== 'modal',
     } = this.props;
 
     const { scenes, layout, gestures, headerHeights } = this.state;
@@ -386,6 +402,7 @@ export default class CardStack extends React.Component<Props, State> {
     const focusedRoute = state.routes[state.index];
     const focusedDescriptor = descriptors[focusedRoute.key];
     const focusedOptions = focusedDescriptor ? focusedDescriptor.options : {};
+    const focusedHeaderHeight = headerHeights[focusedRoute.key];
 
     let defaultTransitionPreset =
       mode === 'modal' ? ModalTransition : DefaultTransition;
@@ -404,212 +421,250 @@ export default class CardStack extends React.Component<Props, State> {
       left = insets.left,
     } = focusedOptions.safeAreaInsets || {};
 
-    // Screens is buggy on iOS and web, so we only enable it on Android
-    // For modals, usually we want the screen underneath to be visible, so also disable it there
-    const isScreensEnabled = Platform.OS !== 'ios' && mode !== 'modal';
+    let activeScreensLimit = 1;
+
+    for (let i = scenes.length - 1; i >= 0; i--) {
+      const {
+        // By default, we don't want to detach the previous screen of the active one for modals
+        detachPreviousScreen = mode === 'modal'
+          ? i !== scenes.length - 1
+          : true,
+      } = scenes[i].descriptor.options;
+
+      if (detachPreviousScreen === false) {
+        activeScreensLimit++;
+      } else {
+        break;
+      }
+    }
+
+    const isFloatHeaderAbsolute =
+      headerMode === 'float'
+        ? this.state.scenes.slice(-2).some((scene) => {
+            const { descriptor } = scene;
+            const options = descriptor ? descriptor.options : {};
+            const {
+              headerTransparent,
+              headerShown = isParentHeaderShown === false,
+            } = options;
+
+            if (headerTransparent || headerShown === false) {
+              return true;
+            }
+
+            return false;
+          })
+        : false;
+
+    const floatingHeader =
+      headerMode === 'float' ? (
+        <React.Fragment key="header">
+          {renderHeader({
+            mode: 'float',
+            layout,
+            insets: { top, right, bottom, left },
+            scenes,
+            getPreviousScene: this.getPreviousScene,
+            getFocusedRoute: this.getFocusedRoute,
+            onContentHeightChange: this.handleHeaderLayout,
+            gestureDirection:
+              focusedOptions.gestureDirection !== undefined
+                ? focusedOptions.gestureDirection
+                : defaultTransitionPreset.gestureDirection,
+            styleInterpolator:
+              focusedOptions.headerStyleInterpolator !== undefined
+                ? focusedOptions.headerStyleInterpolator
+                : defaultTransitionPreset.headerStyleInterpolator,
+            style: [
+              styles.floating,
+              isFloatHeaderAbsolute && [
+                // Without this, the header buttons won't be touchable on Android when headerTransparent: true
+                { height: focusedHeaderHeight },
+                styles.absolute,
+              ],
+            ],
+          })}
+        </React.Fragment>
+      ) : null;
 
     return (
-      <HeaderShownContext.Consumer>
-        {(isParentHeaderShown) => {
-          const isFloatHeaderAbsolute =
-            headerMode === 'float'
-              ? this.state.scenes.slice(-2).some((scene) => {
-                  const { descriptor } = scene;
-                  const options = descriptor ? descriptor.options : {};
-                  const {
-                    headerTransparent,
-                    headerShown = isParentHeaderShown === false,
-                  } = options;
+      <React.Fragment>
+        {isFloatHeaderAbsolute ? null : floatingHeader}
+        <MaybeScreenContainer
+          enabled={detachInactiveScreens}
+          style={styles.container}
+          onLayout={this.handleLayout}
+        >
+          {routes.map((route, index, self) => {
+            const focused = focusedRoute.key === route.key;
+            const gesture = gestures[route.key];
+            const scene = scenes[index];
 
-                  if (headerTransparent || headerShown === false) {
-                    return true;
-                  }
+            // For the screens that shouldn't be active, the value is 0
+            // For those that should be active, but are not the top screen, the value is 1
+            // For those on top of the stack and with interaction enabled, the value is 2
+            // For the old implementation, it stays the same it was
+            let isScreenActive: Animated.AnimatedInterpolation | 2 | 1 | 0 = 1;
 
-                  return false;
-                })
-              : false;
+            if (shouldUseActivityState) {
+              if (index < self.length - activeScreensLimit - 1) {
+                // screen should be inactive because it is too deep in the stack
+                isScreenActive = STATE_INACTIVE;
+              } else {
+                const sceneForActivity = scenes[self.length - 1];
+                const outputValue =
+                  index === self.length - 1
+                    ? STATE_ON_TOP // the screen is on top after the transition
+                    : index >= self.length - activeScreensLimit
+                    ? STATE_TRANSITIONING_OR_BELOW_TOP // the screen should stay active after the transition, it is not on top but is in activeLimit
+                    : STATE_INACTIVE; // the screen should be active only during the transition, it is at the edge of activeLimit
+                isScreenActive = sceneForActivity
+                  ? sceneForActivity.progress.current.interpolate({
+                      inputRange: [0, 1 - EPSILON, 1],
+                      outputRange: [1, 1, outputValue],
+                      extrapolate: 'clamp',
+                    })
+                  : STATE_TRANSITIONING_OR_BELOW_TOP;
+              }
+            } else {
+              isScreenActive = scene.progress.next
+                ? scene.progress.next.interpolate({
+                    inputRange: [0, 1 - EPSILON, 1],
+                    outputRange: [1, 1, 0],
+                    extrapolate: 'clamp',
+                  })
+                : 1;
+            }
 
-          const floatingHeader =
-            headerMode === 'float' ? (
-              <React.Fragment key="header">
-                {renderHeader({
-                  mode: 'float',
-                  layout,
-                  insets: { top, right, bottom, left },
-                  scenes,
-                  getPreviousScene: this.getPreviousScene,
-                  getFocusedRoute: this.getFocusedRoute,
-                  onContentHeightChange: this.handleHeaderLayout,
-                  gestureDirection:
-                    focusedOptions.gestureDirection !== undefined
-                      ? focusedOptions.gestureDirection
-                      : defaultTransitionPreset.gestureDirection,
-                  styleInterpolator:
-                    focusedOptions.headerStyleInterpolator !== undefined
-                      ? focusedOptions.headerStyleInterpolator
-                      : defaultTransitionPreset.headerStyleInterpolator,
-                  style: [
-                    styles.floating,
-                    isFloatHeaderAbsolute && styles.absolute,
-                  ],
-                })}
-              </React.Fragment>
-            ) : null;
+            const {
+              safeAreaInsets,
+              headerShown = isParentHeaderShown === false,
+              headerTransparent,
+              cardShadowEnabled,
+              cardOverlayEnabled,
+              cardOverlay,
+              cardStyle,
+              animationEnabled,
+              gestureResponseDistance,
+              gestureVelocityImpact,
+              gestureDirection = defaultTransitionPreset.gestureDirection,
+              transitionSpec = defaultTransitionPreset.transitionSpec,
+              cardStyleInterpolator = animationEnabled === false
+                ? forNoAnimationCard
+                : defaultTransitionPreset.cardStyleInterpolator,
+              headerStyleInterpolator = defaultTransitionPreset.headerStyleInterpolator,
+            } = scene.descriptor
+              ? scene.descriptor.options
+              : ({} as StackNavigationOptions);
 
-          return (
-            <React.Fragment>
-              {isFloatHeaderAbsolute ? null : floatingHeader}
-              <MaybeScreenContainer
-                enabled={isScreensEnabled}
-                style={styles.container}
-                onLayout={this.handleLayout}
+            let transitionConfig = {
+              gestureDirection,
+              transitionSpec,
+              cardStyleInterpolator,
+              headerStyleInterpolator,
+            };
+
+            // When a screen is not the last, it should use next screen's transition config
+            // Many transitions also animate the previous screen, so using 2 different transitions doesn't look right
+            // For example combining a slide and a modal transition would look wrong otherwise
+            // With this approach, combining different transition styles in the same navigator mostly looks right
+            // This will still be broken when 2 transitions have different idle state (e.g. modal presentation),
+            // but majority of the transitions look alright
+            if (index !== self.length - 1) {
+              const nextScene = scenes[index + 1];
+
+              if (nextScene) {
+                const {
+                  animationEnabled,
+                  gestureDirection = defaultTransitionPreset.gestureDirection,
+                  transitionSpec = defaultTransitionPreset.transitionSpec,
+                  cardStyleInterpolator = animationEnabled === false
+                    ? forNoAnimationCard
+                    : defaultTransitionPreset.cardStyleInterpolator,
+                  headerStyleInterpolator = defaultTransitionPreset.headerStyleInterpolator,
+                } = nextScene.descriptor
+                  ? nextScene.descriptor.options
+                  : ({} as StackNavigationOptions);
+
+                transitionConfig = {
+                  gestureDirection,
+                  transitionSpec,
+                  cardStyleInterpolator,
+                  headerStyleInterpolator,
+                };
+              }
+            }
+
+            const {
+              top: safeAreaInsetTop = insets.top,
+              right: safeAreaInsetRight = insets.right,
+              bottom: safeAreaInsetBottom = insets.bottom,
+              left: safeAreaInsetLeft = insets.left,
+            } = safeAreaInsets || {};
+
+            const headerHeight =
+              headerMode !== 'none' && headerShown !== false
+                ? headerHeights[route.key]
+                : 0;
+
+            return (
+              <MaybeScreen
+                key={route.key}
+                style={StyleSheet.absoluteFill}
+                enabled={detachInactiveScreens}
+                active={isScreenActive}
+                pointerEvents="box-none"
               >
-                {routes.map((route, index, self) => {
-                  const focused = focusedRoute.key === route.key;
-                  const gesture = gestures[route.key];
-                  const scene = scenes[index];
-
-                  const isScreenActive = scene.progress.next
-                    ? scene.progress.next.interpolate({
-                        inputRange: [0, 1 - EPSILON, 1],
-                        outputRange: [1, 1, 0],
-                        extrapolate: 'clamp',
-                      })
-                    : 1;
-
-                  const {
-                    safeAreaInsets,
-                    headerShown = isParentHeaderShown === false,
-                    headerTransparent,
-                    cardShadowEnabled,
-                    cardOverlayEnabled,
-                    cardOverlay,
-                    cardStyle,
-                    animationEnabled,
-                    gestureResponseDistance,
-                    gestureVelocityImpact,
-                    gestureDirection = defaultTransitionPreset.gestureDirection,
-                    transitionSpec = defaultTransitionPreset.transitionSpec,
-                    cardStyleInterpolator = animationEnabled === false
-                      ? forNoAnimationCard
-                      : defaultTransitionPreset.cardStyleInterpolator,
-                    headerStyleInterpolator = defaultTransitionPreset.headerStyleInterpolator,
-                  } = scene.descriptor
-                    ? scene.descriptor.options
-                    : ({} as StackNavigationOptions);
-
-                  let transitionConfig = {
-                    gestureDirection,
-                    transitionSpec,
-                    cardStyleInterpolator,
-                    headerStyleInterpolator,
-                  };
-
-                  // When a screen is not the last, it should use next screen's transition config
-                  // Many transitions also animate the previous screen, so using 2 different transitions doesn't look right
-                  // For example combining a slide and a modal transition would look wrong otherwise
-                  // With this approach, combining different transition styles in the same navigator mostly looks right
-                  // This will still be broken when 2 transitions have different idle state (e.g. modal presentation),
-                  // but majority of the transitions look alright
-                  if (index !== self.length - 1) {
-                    const nextScene = scenes[index + 1];
-
-                    if (nextScene) {
-                      const {
-                        animationEnabled,
-                        gestureDirection = defaultTransitionPreset.gestureDirection,
-                        transitionSpec = defaultTransitionPreset.transitionSpec,
-                        cardStyleInterpolator = animationEnabled === false
-                          ? forNoAnimationCard
-                          : defaultTransitionPreset.cardStyleInterpolator,
-                        headerStyleInterpolator = defaultTransitionPreset.headerStyleInterpolator,
-                      } = nextScene.descriptor
-                        ? nextScene.descriptor.options
-                        : ({} as StackNavigationOptions);
-
-                      transitionConfig = {
-                        gestureDirection,
-                        transitionSpec,
-                        cardStyleInterpolator,
-                        headerStyleInterpolator,
-                      };
-                    }
+                <CardContainer
+                  index={index}
+                  active={index === self.length - 1}
+                  focused={focused}
+                  closing={closingRouteKeys.includes(route.key)}
+                  layout={layout}
+                  gesture={gesture}
+                  scene={scene}
+                  safeAreaInsetTop={safeAreaInsetTop}
+                  safeAreaInsetRight={safeAreaInsetRight}
+                  safeAreaInsetBottom={safeAreaInsetBottom}
+                  safeAreaInsetLeft={safeAreaInsetLeft}
+                  cardOverlay={cardOverlay}
+                  cardOverlayEnabled={cardOverlayEnabled}
+                  cardShadowEnabled={cardShadowEnabled}
+                  cardStyle={cardStyle}
+                  onPageChangeStart={onPageChangeStart}
+                  onPageChangeConfirm={onPageChangeConfirm}
+                  onPageChangeCancel={onPageChangeCancel}
+                  onGestureStart={onGestureStart}
+                  onGestureCancel={onGestureCancel}
+                  onGestureEnd={onGestureEnd}
+                  gestureResponseDistance={gestureResponseDistance}
+                  headerHeight={headerHeight}
+                  isParentHeaderShown={isParentHeaderShown}
+                  onHeaderHeightChange={this.handleHeaderLayout}
+                  getPreviousScene={this.getPreviousScene}
+                  getFocusedRoute={this.getFocusedRoute}
+                  mode={mode}
+                  headerMode={headerMode}
+                  headerShown={headerShown}
+                  hasAbsoluteHeader={
+                    isFloatHeaderAbsolute && !headerTransparent
                   }
-
-                  const {
-                    top: safeAreaInsetTop = insets.top,
-                    right: safeAreaInsetRight = insets.right,
-                    bottom: safeAreaInsetBottom = insets.bottom,
-                    left: safeAreaInsetLeft = insets.left,
-                  } = safeAreaInsets || {};
-
-                  const headerHeight =
-                    headerMode !== 'none' && headerShown !== false
-                      ? headerHeights[route.key]
-                      : 0;
-
-                  return (
-                    <MaybeScreen
-                      key={route.key}
-                      style={StyleSheet.absoluteFill}
-                      enabled={isScreensEnabled}
-                      active={isScreenActive}
-                      pointerEvents="box-none"
-                    >
-                      <CardContainer
-                        index={index}
-                        active={index === self.length - 1}
-                        focused={focused}
-                        closing={closingRouteKeys.includes(route.key)}
-                        layout={layout}
-                        gesture={gesture}
-                        scene={scene}
-                        safeAreaInsetTop={safeAreaInsetTop}
-                        safeAreaInsetRight={safeAreaInsetRight}
-                        safeAreaInsetBottom={safeAreaInsetBottom}
-                        safeAreaInsetLeft={safeAreaInsetLeft}
-                        cardOverlay={cardOverlay}
-                        cardOverlayEnabled={cardOverlayEnabled}
-                        cardShadowEnabled={cardShadowEnabled}
-                        cardStyle={cardStyle}
-                        onPageChangeStart={onPageChangeStart}
-                        onPageChangeConfirm={onPageChangeConfirm}
-                        onPageChangeCancel={onPageChangeCancel}
-                        onGestureStart={onGestureStart}
-                        onGestureCancel={onGestureCancel}
-                        onGestureEnd={onGestureEnd}
-                        gestureResponseDistance={gestureResponseDistance}
-                        headerHeight={headerHeight}
-                        onHeaderHeightChange={this.handleHeaderLayout}
-                        getPreviousScene={this.getPreviousScene}
-                        getFocusedRoute={this.getFocusedRoute}
-                        mode={mode}
-                        headerMode={headerMode}
-                        headerShown={headerShown}
-                        hasAbsoluteHeader={
-                          isFloatHeaderAbsolute && !headerTransparent
-                        }
-                        renderHeader={renderHeader}
-                        renderScene={renderScene}
-                        onOpenRoute={onOpenRoute}
-                        onCloseRoute={onCloseRoute}
-                        onTransitionStart={onTransitionStart}
-                        onTransitionEnd={onTransitionEnd}
-                        gestureEnabled={
-                          index !== 0 && getGesturesEnabled({ route })
-                        }
-                        gestureVelocityImpact={gestureVelocityImpact}
-                        {...transitionConfig}
-                      />
-                    </MaybeScreen>
-                  );
-                })}
-              </MaybeScreenContainer>
-              {isFloatHeaderAbsolute ? floatingHeader : null}
-            </React.Fragment>
-          );
-        }}
-      </HeaderShownContext.Consumer>
+                  renderHeader={renderHeader}
+                  renderScene={renderScene}
+                  onOpenRoute={onOpenRoute}
+                  onCloseRoute={onCloseRoute}
+                  onTransitionStart={onTransitionStart}
+                  onTransitionEnd={onTransitionEnd}
+                  gestureEnabled={index !== 0 && getGesturesEnabled({ route })}
+                  gestureVelocityImpact={gestureVelocityImpact}
+                  {...transitionConfig}
+                />
+              </MaybeScreen>
+            );
+          })}
+        </MaybeScreenContainer>
+        {isFloatHeaderAbsolute ? floatingHeader : null}
+      </React.Fragment>
     );
   }
 }

packages/stack/src/vendor/views/Stack/StackView.tsx

@@ -21,6 +21,7 @@ import type {
   StackNavigationConfig,
   StackDescriptorMap,
 } from '../../types';
+import HeaderShownContext from '../../utils/HeaderShownContext';
 
 type Props = StackNavigationConfig & {
   state: StackNavigationState;
@@ -430,7 +431,7 @@ export default class StackView extends React.Component<Props, State> {
     const descriptor =
       descriptors[route.key] || this.state.descriptors[route.key];
 
-    descriptor?.options.onTransitionEnd?.({ closing });
+    descriptor?.options.onTransitionStart?.({ closing });
   };
 
   private handleGestureStart = () => {
@@ -475,29 +476,34 @@ export default class StackView extends React.Component<Props, State> {
               {(insets) => (
                 <KeyboardManager enabled={keyboardHandlingEnabled !== false}>
                   {(props) => (
-                    <CardStack
-                      mode={mode}
-                      insets={insets as EdgeInsets}
-                      getPreviousRoute={this.getPreviousRoute}
-                      getGesturesEnabled={this.getGesturesEnabled}
-                      routes={routes}
-                      openingRouteKeys={openingRouteKeys}
-                      closingRouteKeys={closingRouteKeys}
-                      onOpenRoute={this.handleOpenRoute}
-                      onCloseRoute={this.handleCloseRoute}
-                      onTransitionStart={this.handleTransitionStart}
-                      onTransitionEnd={this.handleTransitionEnd}
-                      renderHeader={this.renderHeader}
-                      renderScene={this.renderScene}
-                      headerMode={headerMode}
-                      state={state}
-                      descriptors={descriptors}
-                      onGestureStart={this.handleGestureStart}
-                      onGestureEnd={this.handleGestureEnd}
-                      onGestureCancel={this.handleGestureCancel}
-                      {...rest}
-                      {...props}
-                    />
+                    <HeaderShownContext.Consumer>
+                      {(isParentHeaderShown) => (
+                        <CardStack
+                          mode={mode}
+                          insets={insets as EdgeInsets}
+                          isParentHeaderShown={isParentHeaderShown}
+                          getPreviousRoute={this.getPreviousRoute}
+                          getGesturesEnabled={this.getGesturesEnabled}
+                          routes={routes}
+                          openingRouteKeys={openingRouteKeys}
+                          closingRouteKeys={closingRouteKeys}
+                          onOpenRoute={this.handleOpenRoute}
+                          onCloseRoute={this.handleCloseRoute}
+                          onTransitionStart={this.handleTransitionStart}
+                          onTransitionEnd={this.handleTransitionEnd}
+                          renderHeader={this.renderHeader}
+                          renderScene={this.renderScene}
+                          headerMode={headerMode}
+                          state={state}
+                          descriptors={descriptors}
+                          onGestureStart={this.handleGestureStart}
+                          onGestureEnd={this.handleGestureEnd}
+                          onGestureCancel={this.handleGestureCancel}
+                          {...rest}
+                          {...props}
+                        />
+                      )}
+                    </HeaderShownContext.Consumer>
                   )}
                 </KeyboardManager>
               )}

packages/tabs/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.10.1](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.10.0...react-navigation-tabs@2.10.1) (2020-10-28)
+
+
+### Bug Fixes
+
+* add bottom insets to custom height for bottom tabs ([ffe3bdd](https://github.com/react-navigation/tabs/commit/ffe3bddcb27ecb3d663b13b433263d18f792ad4d))
+
+
+
+
+
+# [2.10.0](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.9.2...react-navigation-tabs@2.10.0) (2020-10-26)
+
+
+### Bug Fixes
+
+* use react-native-iphone-x-helper in bottom-tabs navigator ([ebe70f5](https://github.com/react-navigation/tabs/commit/ebe70f51fbb8d892be9c44b0c226947684c24338))
+
+
+### Features
+
+* add detachInactiveScreens prop for bottom tabs and drawer ([#8816](https://github.com/react-navigation/tabs/issues/8816)) ([707bea3](https://github.com/react-navigation/tabs/commit/707bea3cba1aa1f7b1eb5884dd1d129dcc2bbdc2))
+
+
+
+
+
 ## [2.9.2](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.9.1...react-navigation-tabs@2.9.2) (2020-10-02)
 
 **Note:** Version bump only for package react-navigation-tabs

packages/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-tabs",
-  "version": "2.9.2",
+  "version": "2.10.1",
   "description": "Tab Navigation components for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -42,21 +42,21 @@
   "dependencies": {
     "hoist-non-react-statics": "^3.3.2",
     "react-lifecycles-compat": "^3.0.4",
-    "react-native-safe-area-view": "^0.14.9",
-    "react-native-tab-view": "^2.15.1"
+    "react-native-iphone-x-helper": "^1.3.0",
+    "react-native-tab-view": "^2.15.2"
   },
   "devDependencies": {
     "@react-native-community/bob": "^0.16.2",
     "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/react": "^16.9.44",
-    "@types/react-native": "^0.63.4",
+    "@types/react": "^16.9.53",
+    "@types/react-native": "^0.63.30",
     "del-cli": "^3.0.1",
     "react": "~16.13.1",
     "react-native": "~0.63.2",
     "react-native-gesture-handler": "~1.7.0",
     "react-native-reanimated": "~1.13.0",
     "react-native-tab-view": "^2.13.0",
-    "react-navigation": "^4.4.2",
+    "react-navigation": "^4.4.3",
     "typescript": "^4.0.3"
   },
   "peerDependencies": {

packages/tabs/src/navigators/createBottomTabNavigator.tsx

@@ -20,6 +20,7 @@ type Config = {
   lazy?: boolean;
   tabBarComponent?: React.ComponentType<any>;
   tabBarOptions?: BottomTabBarOptions;
+  detachInactiveScreens?: boolean;
 };
 
 type Props = NavigationViewProps &
@@ -131,13 +132,19 @@ class TabNavigationView extends React.PureComponent<Props, State> {
   };
 
   render() {
-    const { navigation, renderScene, lazy } = this.props;
+    const {
+      navigation,
+      renderScene,
+      lazy,
+      detachInactiveScreens = true,
+    } = this.props;
     const { routes } = navigation.state;
     const { loaded } = this.state;
 
     return (
       <View style={styles.container}>
-        <ScreenContainer style={styles.pages}>
+        {/* @ts-ignore */}
+        <ScreenContainer enabled={detachInactiveScreens} style={styles.pages}>
           {routes.map((route, index) => {
             if (lazy && !loaded.includes(index)) {
               // Don't render a screen if we've never navigated to it
@@ -151,6 +158,7 @@ class TabNavigationView extends React.PureComponent<Props, State> {
                 key={route.key}
                 style={StyleSheet.absoluteFill}
                 isVisible={isFocused}
+                enabled={detachInactiveScreens}
               >
                 {renderScene({ route })}
               </ResourceSavingScene>

packages/tabs/src/types.tsx

@@ -6,7 +6,6 @@ import {
   TextStyle,
   ViewStyle,
 } from 'react-native';
-import SafeAreaView from 'react-native-safe-area-view';
 import Animated from 'react-native-reanimated';
 import {
   NavigationRoute,
@@ -94,7 +93,12 @@ export type BottomTabBarOptions = {
     | LabelPosition
     | ((options: { deviceOrientation: Orientation }) => LabelPosition);
   adaptive?: boolean;
-  safeAreaInset?: React.ComponentProps<typeof SafeAreaView>['forceInset'];
+  safeAreaInset?: {
+    top?: 'always' | 'never' | number;
+    right?: 'always' | 'never' | number;
+    bottom?: 'always' | 'never' | number;
+    left?: 'always' | 'never' | number;
+  };
   style?: StyleProp<ViewStyle>;
 };
 
@@ -149,6 +153,7 @@ export type BottomTabBarProps = BottomTabBarOptions & {
   isLandscape: boolean;
   jumpTo: (key: string) => void;
   screenProps: unknown;
+  detachInactiveScreens?: boolean;
 };
 
 export type MaterialTabBarOptions = {

packages/tabs/src/views/BottomTabBar.tsx

@@ -8,7 +8,10 @@ import {
   Platform,
   LayoutChangeEvent,
 } from 'react-native';
-import SafeAreaView from 'react-native-safe-area-view';
+import {
+  getStatusBarHeight,
+  getBottomSpace,
+} from 'react-native-iphone-x-helper';
 import { ThemeColors, ThemeContext, NavigationRoute } from 'react-navigation';
 
 import CrossFadeIcon from './CrossFadeIcon';
@@ -30,6 +33,9 @@ const majorVersion = parseInt(Platform.Version as string, 10);
 const isIos = Platform.OS === 'ios';
 const isIOS11 = majorVersion >= 11 && isIos;
 
+const DEFAULT_HEIGHT = 49;
+const COMPACT_HEIGHT = 29;
+
 const DEFAULT_MAX_TAB_ITEM_WIDTH = 125;
 const DEFAULT_KEYBOARD_ANIMATION_CONFIG: KeyboardHidesTabBarAnimationConfig = {
   show: {
@@ -103,9 +109,7 @@ class TabBarBottom extends React.Component<BottomTabBarProps, State> {
     showIcon: true,
     allowFontScaling: true,
     adaptive: isIOS11,
-    safeAreaInset: { bottom: 'always', top: 'never' } as React.ComponentProps<
-      typeof SafeAreaView
-    >['forceInset'],
+    safeAreaInset: { bottom: 'always', top: 'never' } as const,
   };
 
   // eslint-disable-next-line react/sort-comp
@@ -394,6 +398,7 @@ class TabBarBottom extends React.Component<BottomTabBarProps, State> {
       keyboardHidesTabBar,
       onTabPress,
       onTabLongPress,
+      isLandscape,
       safeAreaInset,
       style,
       tabStyle,
@@ -418,6 +423,7 @@ class TabBarBottom extends React.Component<BottomTabBarProps, State> {
       marginRight,
       marginHorizontal,
       marginVertical,
+      height,
       ...innerStyle
     } = StyleSheet.flatten(style || {});
 
@@ -436,13 +442,46 @@ class TabBarBottom extends React.Component<BottomTabBarProps, State> {
       marginVertical,
     };
 
+    const statusBarHeight = getStatusBarHeight(true);
+    const horizontalInset = isLandscape ? statusBarHeight : 0;
+    const insets = {
+      bottom:
+        typeof safeAreaInset?.bottom === 'number'
+          ? safeAreaInset.bottom
+          : safeAreaInset?.bottom === 'never'
+          ? 0
+          : getBottomSpace(),
+      left:
+        typeof safeAreaInset?.left === 'number'
+          ? safeAreaInset.left
+          : safeAreaInset?.left === 'never'
+          ? 0
+          : horizontalInset,
+      right:
+        typeof safeAreaInset?.right === 'number'
+          ? safeAreaInset.right
+          : safeAreaInset?.right === 'never'
+          ? 0
+          : horizontalInset,
+    };
+
     const tabBarStyle = [
+      {
+        height:
+          height != null
+            ? typeof height === 'number'
+              ? height + insets.bottom
+              : height
+            : // @ts-ignore: isPad exists in runtime but not available in type defs
+              (this._shouldUseHorizontalLabels() && !Platform.isPad
+                ? COMPACT_HEIGHT
+                : DEFAULT_HEIGHT) + insets.bottom,
+        paddingBottom: insets.bottom,
+        paddingLeft: insets.left,
+        paddingRight: insets.right,
+      },
       styles.tabBar,
       isDark ? styles.tabBarDark : styles.tabBarLight,
-      // @ts-ignore
-      this._shouldUseHorizontalLabels() && !Platform.isPad
-        ? styles.tabBarCompact
-        : styles.tabBarRegular,
       innerStyle,
     ];
 
@@ -473,7 +512,7 @@ class TabBarBottom extends React.Component<BottomTabBarProps, State> {
         }
         onLayout={this._handleLayout}
       >
-        <SafeAreaView style={tabBarStyle} forceInset={safeAreaInset}>
+        <View style={tabBarStyle}>
           {routes.map((route, index) => {
             const focused = index === navigation.state.index;
             const scene = { route, focused };
@@ -524,15 +563,12 @@ class TabBarBottom extends React.Component<BottomTabBarProps, State> {
               </ButtonComponent>
             );
           })}
-        </SafeAreaView>
+        </View>
       </Animated.View>
     );
   }
 }
 
-const DEFAULT_HEIGHT = 49;
-const COMPACT_HEIGHT = 29;
-
 const styles = StyleSheet.create({
   tabBar: {
     borderTopWidth: StyleSheet.hairlineWidth,
@@ -549,12 +585,6 @@ const styles = StyleSheet.create({
   container: {
     elevation: 8,
   },
-  tabBarCompact: {
-    height: COMPACT_HEIGHT,
-  },
-  tabBarRegular: {
-    height: DEFAULT_HEIGHT,
-  },
   tab: {
     flex: 1,
     alignItems: isIos ? 'center' : 'stretch',

packages/tabs/src/views/ResourceSavingScene.tsx

@@ -6,6 +6,7 @@ type Props = {
   isVisible: boolean;
   children: React.ReactNode;
   style?: any;
+  enabled: boolean;
 };
 
 const FAR_FAR_AWAY = 30000; // this should be big enough to move the whole view out of its container
@@ -13,7 +14,7 @@ const FAR_FAR_AWAY = 30000; // this should be big enough to move the whole view
 export default class ResourceSavingScene extends React.Component<Props> {
   render() {
     // react-native-screens is buggy on web
-    if (screensEnabled?.() && Platform.OS !== 'web') {
+    if (screensEnabled?.() && this.props.enabled && Platform.OS !== 'web') {
       const { isVisible, ...rest } = this.props;
 
       // @ts-ignore