chore: publish

- react-navigation-animated-switch@0.5.12 - @react-navigation/core@3.7.6 - react-navigation-drawer@2.4.13 - react-navigation-material-bottom-tabs@2.2.12 - @react-navigation/native@3.7.13 - react-navigation@4.3.9 - react-navigation-stack@2.4.0 - react-navigation-tabs@2.8.13
feat: sync latest stack
2026-01-13 17:32:55 +08:00 · 2020-05-01 01:45:52 +02:00 · 2020-05-01 01:45:10 +02:00 · 2020-04-30 16:57:36 +02:00 · 2020-04-22 16:47:35 +02:00 · 2020-04-22 16:45:32 +02:00
35 changed files with 589 additions and 309 deletions
--- a/packages/animated-switch/CHANGELOG.md
+++ b/packages/animated-switch/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [0.5.12](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.11...react-navigation-animated-switch@0.5.12) (2020-04-30)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
+## [0.5.11](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.10...react-navigation-animated-switch@0.5.11) (2020-04-22)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
 ## [0.5.10](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.9...react-navigation-animated-switch@0.5.10) (2020-04-02)

 **Note:** Version bump only for package react-navigation-animated-switch
--- a/packages/animated-switch/package.json
+++ b/packages/animated-switch/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-navigation-animated-switch",
-  "version": "0.5.10",
+  "version": "0.5.12",
  "description": "Animated switch for React Navigation",
  "main": "lib/commonjs/index.js",
  "react-native": "lib/module/index.js",
@@ -28,7 +28,7 @@
    "react": "~16.9.0",
    "react-native": "~0.61.5",
    "react-native-reanimated": "~1.7.0",
-    "react-navigation": "^4.3.7",
+    "react-navigation": "^4.3.9",
    "typescript": "~3.8.3"
  },
  "peerDependencies": {
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/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.

+## [3.7.6](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.7.5...@react-navigation/core@3.7.6) (2020-04-30)
+
+
+### Bug Fixes
+
+* change old docUrl to new docUrl due v5 ([e09906a](https://github.com/react-navigation/react-navigation-core/commit/e09906a4235a0fca09140923ebe7af34b50b491a))
+
+
+
+
+
 ## [3.7.5](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.7.4...@react-navigation/core@3.7.5) (2020-04-02)


--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@react-navigation/core",
-  "version": "3.7.5",
+  "version": "3.7.6",
  "description": "Core utilities for the react-navigation framework",
  "main": "lib/commonjs/index.js",
  "react-native": "lib/module/index.js",
--- a/packages/core/src/utils/docsUrl.ts
+++ b/packages/core/src/utils/docsUrl.ts
@@ -1,3 +1,3 @@
 export default function docsUrl(path: string) {
-  return `https://reactnavigation.org/docs/${path}`;
+  return `https://reactnavigation.org/docs/4.x/${path}`;
 }
--- a/packages/drawer/CHANGELOG.md
+++ b/packages/drawer/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.4.13](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.12...react-navigation-drawer@2.4.13) (2020-04-30)
+
+**Note:** Version bump only for package react-navigation-drawer
+
+
+
+
+
+## [2.4.12](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.11...react-navigation-drawer@2.4.12) (2020-04-22)
+
+**Note:** Version bump only for package react-navigation-drawer
+
+
+
+
+
 ## [2.4.11](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.10...react-navigation-drawer@2.4.11) (2020-04-02)

 **Note:** Version bump only for package react-navigation-drawer
--- a/packages/drawer/package.json
+++ b/packages/drawer/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-navigation-drawer",
-  "version": "2.4.11",
+  "version": "2.4.13",
  "description": "Drawer navigator component for React Navigation",
  "main": "lib/commonjs/index.js",
  "react-native": "lib/module/index.js",
@@ -49,7 +49,7 @@
    "react-native-reanimated": "^1.2.0",
    "react-native-screens": "^2.3.0",
    "react-native-testing-library": "^1.12.0",
-    "react-navigation": "^4.3.7",
+    "react-navigation": "^4.3.9",
    "typescript": "~3.8.3"
  },
  "peerDependencies": {
--- a/packages/material-bottom-tabs/CHANGELOG.md
+++ b/packages/material-bottom-tabs/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.2.12](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.11...react-navigation-material-bottom-tabs@2.2.12) (2020-04-30)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
+## [2.2.11](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.10...react-navigation-material-bottom-tabs@2.2.11) (2020-04-22)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
 ## [2.2.10](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.9...react-navigation-material-bottom-tabs@2.2.10) (2020-04-02)

 **Note:** Version bump only for package react-navigation-material-bottom-tabs
--- a/packages/material-bottom-tabs/package.json
+++ b/packages/material-bottom-tabs/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-navigation-material-bottom-tabs",
-  "version": "2.2.10",
+  "version": "2.2.12",
  "description": "Material Bottom Tab Navigation component for React Navigation",
  "main": "lib/commonjs/index.js",
  "module": "lib/module/index.js",
@@ -48,7 +48,7 @@
    "react-native-gesture-handler": "^1.6.0",
    "react-native-paper": "^3.1.1",
    "react-native-reanimated": "^1.2.0",
-    "react-navigation": "^4.3.7",
+    "react-navigation": "^4.3.9",
    "typescript": "~3.8.3"
  },
  "peerDependencies": {
--- a/packages/native/CHANGELOG.md
+++ b/packages/native/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [3.7.13](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.12...@react-navigation/native@3.7.13) (2020-04-30)
+
+**Note:** Version bump only for package @react-navigation/native
+
+
+
+
+
+## [3.7.12](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.11...@react-navigation/native@3.7.12) (2020-04-22)
+
+**Note:** Version bump only for package @react-navigation/native
+
+
+
+
+
 ## [3.7.11](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.10...@react-navigation/native@3.7.11) (2020-04-02)

 **Note:** Version bump only for package @react-navigation/native
--- a/packages/native/package.json
+++ b/packages/native/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@react-navigation/native",
-  "version": "3.7.11",
+  "version": "3.7.13",
  "description": "React Native support for React Navigation",
  "main": "lib/commonjs/index.js",
  "react-native": "lib/module/index.js",
@@ -36,11 +36,11 @@
  "homepage": "https://github.com/react-navigation/react-navigation-native#readme",
  "dependencies": {
    "hoist-non-react-statics": "^3.3.2",
-    "react-native-safe-area-view": "^0.14.8"
+    "react-native-safe-area-view": "^0.14.9"
  },
  "devDependencies": {
    "@react-native-community/bob": "^0.10.0",
-    "@react-navigation/core": "^3.7.5",
+    "@react-navigation/core": "^3.7.6",
    "@types/react-test-renderer": "^16.9.2",
    "del-cli": "^3.0.0",
    "react": "~16.9.0",
--- a/packages/react-navigation/CHANGELOG.md
+++ b/packages/react-navigation/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [4.3.9](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.8...react-navigation@4.3.9) (2020-04-30)
+
+
+### Bug Fixes
+
+* change old docUrl to new docUrl due v5 ([e09906a](https://github.com/react-navigation/react-navigation/commit/e09906a4235a0fca09140923ebe7af34b50b491a))
+
+
+
+
+
+## [4.3.8](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.7...react-navigation@4.3.8) (2020-04-22)
+
+**Note:** Version bump only for package react-navigation
+
+
+
+
+
 ## [4.3.7](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.6...react-navigation@4.3.7) (2020-04-02)

 **Note:** Version bump only for package react-navigation
--- a/packages/react-navigation/package.json
+++ b/packages/react-navigation/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-navigation",
-  "version": "4.3.7",
+  "version": "4.3.9",
  "description": "Routing and navigation for your React Native apps",
  "main": "src/index.js",
  "types": "typescript/react-navigation.d.ts",
@@ -24,8 +24,8 @@
    "react-native": "*"
  },
  "dependencies": {
-    "@react-navigation/core": "^3.7.5",
-    "@react-navigation/native": "^3.7.11"
+    "@react-navigation/core": "^3.7.6",
+    "@react-navigation/native": "^3.7.13"
  },
  "devDependencies": {
    "@types/react": "^16.9.23",
--- a/packages/react-navigation/src/utils/docsUrl.js
+++ b/packages/react-navigation/src/utils/docsUrl.js
@@ -1,3 +1,3 @@
 export default function docsUrl(path) {
-  return `https://reactnavigation.org/docs/${path}`;
+  return `https://reactnavigation.org/docs/4.x/${path}`;
 }
--- a/packages/stack/CHANGELOG.md
+++ b/packages/stack/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [2.4.0](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.13...react-navigation-stack@2.4.0) (2020-04-30)
+
+
+### Features
+
+* sync latest stack ([8b79e9b](https://github.com/react-navigation/react-navigation-stack/commit/8b79e9bee65c3ba6a788ca76771379319168f117))
+
+
+
+
+
+## [2.3.13](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.12...react-navigation-stack@2.3.13) (2020-04-22)
+
+**Note:** Version bump only for package react-navigation-stack
+
+
+
+
+
 ## [2.3.12](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.11...react-navigation-stack@2.3.12) (2020-04-17)


--- a/packages/stack/package.json
+++ b/packages/stack/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-navigation-stack",
-  "version": "2.3.12",
+  "version": "2.4.0",
  "description": "Stack navigator component for React Navigation",
  "main": "lib/commonjs/index.js",
  "module": "lib/module/index.js",
@@ -45,7 +45,7 @@
  "devDependencies": {
    "@react-native-community/bob": "^0.10.0",
    "@react-native-community/masked-view": "^0.1.7",
-    "@react-navigation/stack": "^5.2.11",
+    "@react-navigation/stack": "^5.2.16",
    "@types/color": "^3.0.1",
    "@types/react": "^16.9.23",
    "@types/react-native": "^0.61.22",
@@ -56,7 +56,7 @@
    "react-native-gesture-handler": "^1.6.0",
    "react-native-safe-area-context": "^0.7.3",
    "react-native-screens": "^2.3.0",
-    "react-navigation": "^4.3.7",
+    "react-navigation": "^4.3.9",
    "react-test-renderer": "~16.9.0",
    "typescript": "~3.8.3"
  },
--- a/packages/stack/scripts/stack.patch
+++ b/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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/index.tsx	2020-04-18 01:41:48.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/index.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/index.tsx	2020-05-01 01:32:40.000000000 +0200
@@ -3,11 +3,6 @@
 import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
 import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
@@ -27,7 +27,7 @@ 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-04-18 01:38:52.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx	2020-05-01 01:29:42.000000000 +0200
 +++ src/vendor/navigators/createStackNavigator.tsx	1970-01-01 01:00:00.000000000 +0100
@@ -1,96 +0,0 @@
 -import * as React from 'react';
@@ -127,8 +127,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
 -  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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/types.tsx	2020-04-18 01:39:36.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/types.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/types.tsx	2020-05-01 01:32:40.000000000 +0200
@@ -8,14 +8,28 @@
 } from 'react-native';
 import { EdgeInsets } from 'react-native-safe-area-context';
@@ -244,7 +244,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
 export type StackNavigationOptions = StackHeaderOptions &
   Partial<TransitionPreset> & {
     /**
-@@ -317,6 +341,8 @@
+@@ -320,6 +344,8 @@
       bottom?: number;
       left?: number;
     };
@@ -254,8 +254,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
 
 export type StackNavigationConfig = {
 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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Header/Header.tsx	2020-04-18 01:39:36.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Header/Header.tsx	2020-05-01 01:32:40.000000000 +0200
@@ -1,12 +1,14 @@
 import * as React from 'react';
 -import { StackActions } from '@react-navigation/native';
@@ -335,22 +335,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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Header/HeaderBackButton.tsx	2020-04-18 01:39:36.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Header/HeaderBackButton.tsx	2020-05-01 01:33:40.000000000 +0200
@@ -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 { 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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Header/HeaderBackground.tsx	2020-04-18 01:39:36.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Header/HeaderBackground.tsx	2020-05-01 01:32:40.000000000 +0200
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Animated, StyleSheet, Platform, ViewProps } from 'react-native';
@@ -360,8 +360,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBac
 type Props = ViewProps & {
   children?: React.ReactNode;
 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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Header/HeaderContainer.tsx	2020-04-18 01:39:36.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Header/HeaderContainer.tsx	2020-05-01 01:32:40.000000000 +0200
@@ -1,11 +1,6 @@
 import * as React from 'react';
 import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -413,8 +413,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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Header/HeaderSegment.tsx	2020-04-18 01:39:36.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Header/HeaderSegment.tsx	2020-05-01 01:32:40.000000000 +0200
@@ -8,7 +8,7 @@
   ViewStyle,
 } from 'react-native';
@@ -434,8 +434,8 @@ 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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Header/HeaderTitle.tsx	2020-04-18 01:39:36.000000000 +0200
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Header/HeaderTitle.tsx	2020-05-01 01:32:40.000000000 +0200
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Animated, StyleSheet, Platform } from 'react-native';
@@ -445,9 +445,9 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTit
 type Props = React.ComponentProps<typeof Animated.Text> & {
   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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Stack/Card.tsx	2020-04-18 01:39:36.000000000 +0200
-@@ -138,7 +138,7 @@
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Stack/Card.tsx	2020-05-01 01:32:40.000000000 +0200
+@@ -140,7 +140,7 @@
 
   private interactionHandle: number | undefined;
 
@@ -457,28 +457,26 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx s
   private animate = ({
     closing,
 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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Stack/CardContainer.tsx	2020-04-18 01:39:36.000000000 +0200
-@@ -1,10 +1,16 @@
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Stack/CardContainer.tsx	2020-05-01 01:34:25.000000000 +0200
+@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 -import { Route, useTheme } from '@react-navigation/native';
 import { Props as HeaderContainerProps } from '../Header/HeaderContainer';
 import Card from './Card';
 import HeaderHeightContext from '../../utils/HeaderHeightContext';
-import { Scene, Layout, StackHeaderMode, TransitionPreset } from '../../types';
 +import useTheme from '../../../utils/useTheme';
-+import {
+ import {
 +  Route,
-+  Scene,
-+  Layout,
-+  StackHeaderMode,
-+  TransitionPreset,
-+} from '../../types';
+   Scene,
+   Layout,
+   StackHeaderMode,
+-  StackCardMode,
+   TransitionPreset,
+ } from '../../types';
 
- type Props = TransitionPreset & {
-   index: number;
-@@ -183,7 +189,7 @@
+@@ -192,7 +192,7 @@
           ? { marginTop: headerHeight }
           : null
       }
@@ -488,20 +486,18 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContai
     >
       <View style={styles.container}>
 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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Stack/CardStack.tsx	2020-04-18 01:39:36.000000000 +0200
-@@ -9,9 +9,8 @@
-   ViewProps,
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Stack/CardStack.tsx	2020-05-01 01:32:40.000000000 +0200
+@@ -7,7 +7,7 @@
+   Platform,
 } from 'react-native';
 import { EdgeInsets } from 'react-native-safe-area-context';
-// eslint-disable-next-line import/no-unresolved
- import { ScreenContainer, Screen, screensEnabled } from 'react-native-screens'; // Import with * as to prevent getters being called
 -import { Route, StackNavigationState } from '@react-navigation/native';
 +import { NavigationState as StackNavigationState } from 'react-navigation';
 
+ import { MaybeScreenContainer, MaybeScreen } from '../Screens';
 import { getDefaultHeaderHeight } from '../Header/HeaderSegment';
- import { Props as HeaderContainerProps } from '../Header/HeaderContainer';
-@@ -24,6 +23,7 @@
+@@ -21,6 +21,7 @@
 import { forNoAnimation as forNoAnimationCard } from '../../TransitionConfigs/CardStyleInterpolators';
 import getDistanceForDirection from '../../utils/getDistanceForDirection';
 import {
@@ -510,22 +506,23 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.
   StackHeaderMode,
   StackCardMode,
 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-04-18 01:38:52.000000000 +0200
-+++ src/vendor/views/Stack/StackView.tsx	2020-04-18 01:44:22.000000000 +0200
-@@ -4,9 +4,9 @@
- import { GestureHandlerRootView } from 'react-native-gesture-handler';
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx	2020-05-01 01:29:42.000000000 +0200
+++ src/vendor/views/Stack/StackView.tsx	2020-05-01 01:37:12.000000000 +0200
+@@ -4,9 +4,10 @@
 import {
+   NavigationHelpersContext,
   StackActions,
 -  StackNavigationState,
 -  Route,
 -} from '@react-navigation/native';
 +  NavigationState as StackNavigationState,
+  NavigationActions,
 +  SceneView,
 +} from 'react-navigation';
 
+ import { GestureHandlerRootView } from '../GestureHandler';
 import CardStack from './CardStack';
- import KeyboardManager from '../KeyboardManager';
-@@ -15,6 +15,7 @@
+@@ -16,6 +17,7 @@
 } from '../Header/HeaderContainer';
 import SafeAreaProviderCompat from '../SafeAreaProviderCompat';
 import {
@@ -533,7 +530,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
   StackNavigationHelpers,
   StackNavigationConfig,
   StackDescriptorMap,
-@@ -24,6 +25,7 @@
+@@ -25,6 +27,7 @@
   state: StackNavigationState;
   navigation: StackNavigationHelpers;
   descriptors: StackDescriptorMap;
@@ -541,7 +538,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
 };
 
 type State = {
-@@ -292,7 +294,9 @@
+@@ -293,7 +296,9 @@
         return false;
       }
 
@@ -552,7 +549,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
     }
 
     return false;
-@@ -320,14 +324,37 @@
+@@ -321,24 +326,47 @@
       return null;
     }
 
@@ -587,11 +584,23 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
 +  };
 +
   private handleOpenRoute = ({ route }: { route: Route<string> }) => {
+     const { state, navigation } = this.props;
+ 
 +    this.handleTransitionComplete();
-     this.setState((state) => ({
-       routes: state.replacingRouteKeys.length
-         ? state.routes.filter((r) => !state.replacingRouteKeys.includes(r.key))
-@@ -349,12 +376,11 @@
+
+     if (
+       this.state.replacingRouteKeys.every((key) => key !== route.key) &&
+-      state.routeNames.includes(route.name) &&
+       !state.routes.some((r) => r.key === route.key)
+     ) {
+       // If route isn't present in current state, assume that a close animation was cancelled
+       // So we need to add this route back to the state
+-      navigation.navigate(route);
+      navigation.dispatch(NavigationActions.navigate(route));
+     } else {
+       this.setState((state) => ({
+         routes: state.replacingRouteKeys.length
+@@ -364,12 +392,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
@@ -608,7 +617,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),
-@@ -371,22 +397,24 @@
+@@ -386,22 +413,24 @@
   private handleTransitionStart = (
     { route }: { route: Route<string> },
     closing: boolean
--- a/packages/stack/src/vendor/types.tsx
+++ b/packages/stack/src/vendor/types.tsx
@@ -300,7 +300,8 @@ export type StackNavigationOptions = StackHeaderOptions &
    cardStyle?: StyleProp<ViewStyle>;
    /**
     * Whether transition animation should be enabled the screen.
-     * If you set it to `false`, the screen won't animate when pushing or popping. Defaults to `true`.
+     * If you set it to `false`, the screen won't animate when pushing or popping.
+     * Defaults to `true` on Android and iOS, `false` on Web.
     */
    animationEnabled?: boolean;
    /**
@@ -310,10 +311,12 @@ export type StackNavigationOptions = StackHeaderOptions &
    animationTypeForReplace?: 'push' | 'pop';
    /**
     * Whether you can use gestures to dismiss this screen. Defaults to `true` on iOS, `false` on Android.
+     * Not supported on Web.
     */
    gestureEnabled?: boolean;
    /**
     * Object to override the distance of touch start from the edge of the screen to recognize gestures.
+     * Not supported on Web.
     */
    gestureResponseDistance?: {
      /**
@@ -326,8 +329,8 @@ export type StackNavigationOptions = StackHeaderOptions &
      horizontal?: number;
    };
    /**
-     * Number which determines the relevance of velocity for the gesture.
-     * Defaults to 0.3.
+     * Number which determines the relevance of velocity for the gesture. Defaults to 0.3.
+     * Not supported on Web.
     */
    gestureVelocityImpact?: number;
    /**
--- a/packages/stack/src/vendor/utils/GestureHandlerRefContext.tsx
+++ b/packages/stack/src/vendor/utils/GestureHandlerRefContext.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { PanGestureHandler } from 'react-native-gesture-handler';

-export default React.createContext<React.Ref<PanGestureHandler> | undefined>(
-  undefined
-);
+export default React.createContext<React.Ref<
+  import('react-native-gesture-handler').PanGestureHandler
+> | null>(null);
--- a/packages/stack/src/vendor/views/GestureHandler.native.tsx
+++ b/packages/stack/src/vendor/views/GestureHandler.native.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import {
+  PanGestureHandler as PanGestureHandlerNative,
+  PanGestureHandlerProperties,
+} from 'react-native-gesture-handler';
+import GestureHandlerRefContext from '../utils/GestureHandlerRefContext';
+
+export function PanGestureHandler(props: PanGestureHandlerProperties) {
+  const gestureRef = React.useRef<PanGestureHandlerNative>(null);
+
+  return (
+    <GestureHandlerRefContext.Provider value={gestureRef}>
+      <PanGestureHandlerNative {...props} />
+    </GestureHandlerRefContext.Provider>
+  );
+}
+
+export {
+  GestureHandlerRootView,
+  State as GestureState,
+  PanGestureHandlerGestureEvent,
+} from 'react-native-gesture-handler';
--- a/packages/stack/src/vendor/views/GestureHandler.tsx
+++ b/packages/stack/src/vendor/views/GestureHandler.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import { View } from 'react-native';
+import type { PanGestureHandlerProperties } from 'react-native-gesture-handler';
+
+const Dummy: any = ({ children }: { children: React.ReactNode }) => (
+  <>{children}</>
+);
+
+export const PanGestureHandler = Dummy as React.ComponentType<
+  PanGestureHandlerProperties
+>;
+
+export const GestureHandlerRootView = View;
+
+export const GestureState = {
+  UNDETERMINED: 0,
+  FAILED: 1,
+  BEGAN: 2,
+  CANCELLED: 3,
+  ACTIVE: 4,
+  END: 5,
+};
+
+export type { PanGestureHandlerGestureEvent } from 'react-native-gesture-handler';
--- a/packages/stack/src/vendor/views/Header/HeaderBackButton.tsx
+++ b/packages/stack/src/vendor/views/Header/HeaderBackButton.tsx
@@ -9,7 +9,7 @@ import {
  LayoutChangeEvent,
 } from 'react-native';
 import MaskedView from '../MaskedView';
-import TouchableItem from '../TouchableItem';
+import { TouchableItem } from '../TouchableItem';
 import useTheme from '../../../utils/useTheme';
 import { StackHeaderLeftButtonProps } from '../../types';

--- a/packages/stack/src/vendor/views/MaskedView.native.tsx
+++ b/packages/stack/src/vendor/views/MaskedView.native.tsx
@@ -1,17 +1,26 @@
 import * as React from 'react';
 import { UIManager } from 'react-native';
-import RNCMaskedView from '@react-native-community/masked-view';

-type Props = React.ComponentProps<typeof RNCMaskedView> & {
+type MaskedViewType = typeof import('@react-native-community/masked-view').default;
+
+type Props = React.ComponentProps<MaskedViewType> & {
  children: React.ReactElement;
 };

+let RNCMaskedView: MaskedViewType | undefined;
+
+try {
+  RNCMaskedView = require('@react-native-community/masked-view').default;
+} catch (e) {
+  // Ignore
+}
+
 const isMaskedViewAvailable =
  // @ts-ignore
  UIManager.getViewManagerConfig('RNCMaskedView') != null;

 export default function MaskedView({ children, ...rest }: Props) {
-  if (isMaskedViewAvailable) {
+  if (isMaskedViewAvailable && RNCMaskedView) {
    return <RNCMaskedView {...rest}>{children}</RNCMaskedView>;
  }

--- a/packages/stack/src/vendor/views/Screens.tsx
+++ b/packages/stack/src/vendor/views/Screens.tsx
@@ -0,0 +1,71 @@
+import * as React from 'react';
+import { Animated, View, Platform, ViewProps } from 'react-native';
+
+let Screens: typeof import('react-native-screens') | undefined;
+
+try {
+  Screens = require('react-native-screens');
+} catch (e) {
+  // Ignore
+}
+
+// The web implementation in react-native-screens seems buggy.
+// The view doesn't become visible after coming back in some cases.
+// So we use our custom implementation.
+class WebScreen extends React.Component<
+  ViewProps & {
+    active: number;
+    children: React.ReactNode;
+  }
+> {
+  render() {
+    const { active, style, ...rest } = this.props;
+
+    return (
+      <View
+        // @ts-ignore
+        hidden={!active}
+        style={[style, { display: active ? 'flex' : 'none' }]}
+        {...rest}
+      />
+    );
+  }
+}
+
+const AnimatedWebScreen = Animated.createAnimatedComponent(WebScreen);
+
+export const MaybeScreenContainer = ({
+  enabled,
+  ...rest
+}: ViewProps & {
+  enabled: boolean;
+  children: React.ReactNode;
+}) => {
+  if (enabled && Platform.OS !== 'web' && Screens && Screens.screensEnabled()) {
+    return <Screens.ScreenContainer {...rest} />;
+  }
+
+  return <View {...rest} />;
+};
+
+export const MaybeScreen = ({
+  enabled,
+  active,
+  ...rest
+}: ViewProps & {
+  enabled: boolean;
+  active: number | Animated.AnimatedInterpolation;
+  children: React.ReactNode;
+}) => {
+  if (enabled && Platform.OS === 'web') {
+    // @ts-ignore
+    return <AnimatedWebScreen active={active} {...rest} />;
+  }
+
+  if (enabled && Screens && Screens.screensEnabled()) {
+    // @ts-ignore
+    return <Screens.Screen active={active} {...rest} />;
+  }
+
+  return <View {...rest} />;
+};
--- a/packages/stack/src/vendor/views/Stack/Card.tsx
+++ b/packages/stack/src/vendor/views/Stack/Card.tsx
@@ -9,14 +9,15 @@ import {
  Platform,
  InteractionManager,
 } from 'react-native';
-import {
-  PanGestureHandler,
-  State as GestureState,
-  PanGestureHandlerGestureEvent,
-} from 'react-native-gesture-handler';
 import { EdgeInsets } from 'react-native-safe-area-context';
 import Color from 'color';
-import StackGestureRefContext from '../../utils/GestureHandlerRefContext';
+
+import CardSheet from './CardSheet';
+import {
+  PanGestureHandler,
+  GestureState,
+  PanGestureHandlerGestureEvent,
+} from '../GestureHandler';
 import CardAnimationContext from '../../utils/CardAnimationContext';
 import getDistanceForDirection from '../../utils/getDistanceForDirection';
 import getInvertedMultiplier from '../../utils/getInvertedMultiplier';
@@ -36,6 +37,7 @@ type Props = ViewProps & {
  gesture: Animated.Value;
  layout: Layout;
  insets: EdgeInsets;
+  pageOverflowEnabled: boolean;
  gestureDirection: GestureDirection;
  onOpen: () => void;
  onClose: () => void;
@@ -286,7 +288,7 @@ export default class Card extends React.Component<Props> {
            getInvertedMultiplier(gestureDirection) >
          distance / 2
            ? velocity !== 0 || translation !== 0
-            : false;
+            : this.props.closing;

        this.animate({ closing, velocity });

@@ -412,8 +414,6 @@ export default class Card extends React.Component<Props> {
    }
  }

-  private gestureRef = React.createRef<PanGestureHandler>();
-
  private contentRef = React.createRef<View>();

  render() {
@@ -430,6 +430,7 @@ export default class Card extends React.Component<Props> {
      shadowEnabled,
      gestureEnabled,
      gestureDirection,
+      pageOverflowEnabled,
      children,
      containerStyle: customContainerStyle,
      contentStyle,
@@ -499,7 +500,6 @@ export default class Card extends React.Component<Props> {
            pointerEvents="box-none"
          >
            <PanGestureHandler
-              ref={this.gestureRef}
              enabled={layout.width !== 0 && gestureEnabled}
              onGestureEvent={handleGestureEvent}
              onHandlerStateChange={this.handleGestureStateChange}
@@ -523,14 +523,14 @@ export default class Card extends React.Component<Props> {
                    pointerEvents="none"
                  />
                ) : null}
-                <View
+                <CardSheet
                  ref={this.contentRef}
-                  style={[styles.content, contentStyle]}
+                  enabled={pageOverflowEnabled}
+                  layout={layout}
+                  style={contentStyle}
                >
-                  <StackGestureRefContext.Provider value={this.gestureRef}>
-                    {children}
-                  </StackGestureRefContext.Provider>
-                </View>
+                  {children}
+                </CardSheet>
              </Animated.View>
            </PanGestureHandler>
          </Animated.View>
@@ -544,10 +544,6 @@ const styles = StyleSheet.create({
  container: {
    flex: 1,
  },
-  content: {
-    flex: 1,
-    overflow: 'hidden',
-  },
  overlay: {
    flex: 1,
    backgroundColor: '#000',
--- a/packages/stack/src/vendor/views/Stack/CardContainer.tsx
+++ b/packages/stack/src/vendor/views/Stack/CardContainer.tsx
@@ -8,6 +8,7 @@ import {
  Route,
  Scene,
  Layout,
+  StackCardMode,
  StackHeaderMode,
  TransitionPreset,
 } from '../../types';
@@ -51,6 +52,7 @@ type Props = TransitionPreset & {
    horizontal?: number;
  };
  gestureVelocityImpact?: number;
+  mode: StackCardMode;
  headerMode: StackHeaderMode;
  headerShown?: boolean;
  headerTransparent?: boolean;
@@ -79,6 +81,7 @@ function CardContainer({
  gestureVelocityImpact,
  getPreviousRoute,
  getFocusedRoute,
+  mode,
  headerMode,
  headerShown,
  headerStyleInterpolator,
@@ -184,6 +187,7 @@ function CardContainer({
      accessibilityElementsHidden={!focused}
      importantForAccessibility={focused ? 'auto' : 'no-hide-descendants'}
      pointerEvents={active ? 'box-none' : pointerEvents}
+      pageOverflowEnabled={headerMode === 'screen' && mode === 'card'}
      containerStyle={
        headerMode === 'float' && !headerTransparent && headerShown !== false
          ? { marginTop: headerHeight }
--- a/packages/stack/src/vendor/views/Stack/CardSheet.tsx
+++ b/packages/stack/src/vendor/views/Stack/CardSheet.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import { View, ViewProps, StyleSheet } from 'react-native';
+
+type Props = ViewProps & {
+  enabled: boolean;
+  layout: { width: number; height: number };
+  children: React.ReactNode;
+};
+
+// This component will render a page which overflows the screen
+// if the container fills the body by comparing the size
+// This lets the document.body handle scrolling of the content
+// It's necessary for mobile browsers to be able to hide address bar on scroll
+export default React.forwardRef<View, Props>(function CardSheet(
+  { enabled, layout, style, ...rest },
+  ref
+) {
+  const [fill, setFill] = React.useState(false);
+
+  React.useEffect(() => {
+    if (typeof document === 'undefined' || !document.body) {
+      // Only run when DOM is available
+      return;
+    }
+
+    const width = document.body.clientWidth;
+    const height = document.body.clientHeight;
+
+    setFill(width === layout.width && height === layout.height);
+  }, [layout.height, layout.width]);
+
+  return (
+    <View
+      {...rest}
+      ref={ref}
+      style={[enabled && fill ? styles.page : styles.card, style]}
+    />
+  );
+});
+
+const styles = StyleSheet.create({
+  page: {
+    minHeight: '100%',
+  },
+  card: {
+    flex: 1,
+    overflow: 'hidden',
+  },
+});
--- a/packages/stack/src/vendor/views/Stack/CardStack.tsx
+++ b/packages/stack/src/vendor/views/Stack/CardStack.tsx
@@ -1,17 +1,15 @@
 import * as React from 'react';
 import {
  Animated,
-  View,
  StyleSheet,
  LayoutChangeEvent,
  Dimensions,
  Platform,
-  ViewProps,
 } from 'react-native';
 import { EdgeInsets } from 'react-native-safe-area-context';
-import { ScreenContainer, Screen, screensEnabled } from 'react-native-screens'; // Import with * as to prevent getters being called
 import { NavigationState as StackNavigationState } from 'react-navigation';

+import { MaybeScreenContainer, MaybeScreen } from '../Screens';
 import { getDefaultHeaderHeight } from '../Header/HeaderSegment';
 import { Props as HeaderContainerProps } from '../Header/HeaderContainer';
 import CardContainer from './CardContainer';
@@ -75,67 +73,6 @@ type State = {

 const EPSILON = 0.01;

-// The web implementation in react-native-screens seems buggy.
-// The view doesn't become visible after coming back in some cases.
-// So we use our custom implementation.
-class WebScreen extends React.Component<
-  ViewProps & {
-    active: number;
-    children: React.ReactNode;
-  }
-> {
-  render() {
-    const { active, style, ...rest } = this.props;
-
-    return (
-      <View
-        // @ts-ignore
-        hidden={!active}
-        style={[style, { display: active ? 'flex' : 'none' }]}
-        {...rest}
-      />
-    );
-  }
-}
-
-const AnimatedWebScreen = Animated.createAnimatedComponent(WebScreen);
-
-const MaybeScreenContainer = ({
-  enabled,
-  ...rest
-}: ViewProps & {
-  enabled: boolean;
-  children: React.ReactNode;
-}) => {
-  if (enabled && Platform.OS !== 'web' && screensEnabled()) {
-    return <ScreenContainer {...rest} />;
-  }
-
-  return <View {...rest} />;
-};
-
-const MaybeScreen = ({
-  enabled,
-  active,
-  ...rest
-}: ViewProps & {
-  enabled: boolean;
-  active: number | Animated.AnimatedInterpolation;
-  children: React.ReactNode;
-}) => {
-  if (enabled && Platform.OS === 'web') {
-    // @ts-ignore
-    return <AnimatedWebScreen active={active} {...rest} />;
-  }
-
-  if (enabled && screensEnabled()) {
-    // @ts-ignore
-    return <Screen active={active} {...rest} />;
-  }
-
-  return <View {...rest} />;
-};
-
 const FALLBACK_DESCRIPTOR = Object.freeze({ options: {} });

 const getHeaderHeights = (
@@ -583,6 +520,7 @@ export default class CardStack extends React.Component<Props, State> {
                  onHeaderHeightChange={this.handleHeaderLayout}
                  getPreviousRoute={getPreviousRoute}
                  getFocusedRoute={this.getFocusedRoute}
+                  mode={mode}
                  headerMode={headerMode}
                  headerShown={headerShown}
                  headerTransparent={headerTransparent}
@@ -628,7 +566,6 @@ export default class CardStack extends React.Component<Props, State> {
 const styles = StyleSheet.create({
  container: {
    flex: 1,
-    overflow: 'hidden',
  },
  floating: {
    position: 'absolute',
--- a/packages/stack/src/vendor/views/Stack/StackView.tsx
+++ b/packages/stack/src/vendor/views/Stack/StackView.tsx
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { View, Platform, StyleSheet } from 'react-native';
 import { SafeAreaConsumer, EdgeInsets } from 'react-native-safe-area-context';
-import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import {
  StackActions,
  NavigationState as StackNavigationState,
+  NavigationActions,
  SceneView,
 } from 'react-navigation';

+import { GestureHandlerRootView } from '../GestureHandler';
 import CardStack from './CardStack';
 import KeyboardManager from '../KeyboardManager';
 import HeaderContainer, {
@@ -149,7 +150,7 @@ export default class StackView extends React.Component<Props, State> {
      // We only need to animate routes if the focused route changed
      // Animating previous routes won't be visible coz the focused route is on top of everything

-      if (!previousRoutes.find((r) => r.key === nextFocusedRoute.key)) {
+      if (!previousRoutes.some((r) => r.key === nextFocusedRoute.key)) {
        // A new route has come to the focus, we treat this as a push
        // A replace can also trigger this, the animation should look like push

@@ -168,7 +169,7 @@ export default class StackView extends React.Component<Props, State> {
            (key) => key !== nextFocusedRoute.key
          );

-          if (!routes.find((r) => r.key === previousFocusedRoute.key)) {
+          if (!routes.some((r) => r.key === previousFocusedRoute.key)) {
            // The previous focused route isn't present in state, we treat this as a replace

            openingRouteKeys = openingRouteKeys.filter(
@@ -208,7 +209,7 @@ export default class StackView extends React.Component<Props, State> {
            }
          }
        }
-      } else if (!routes.find((r) => r.key === previousFocusedRoute.key)) {
+      } else if (!routes.some((r) => r.key === previousFocusedRoute.key)) {
        // The previously focused route was removed, we treat this as a pop

        if (
@@ -354,25 +355,39 @@ export default class StackView extends React.Component<Props, State> {
  };

  private handleOpenRoute = ({ route }: { route: Route<string> }) => {
+    const { state, navigation } = this.props;
+
    this.handleTransitionComplete();
-    this.setState((state) => ({
-      routes: state.replacingRouteKeys.length
-        ? state.routes.filter((r) => !state.replacingRouteKeys.includes(r.key))
-        : state.routes,
-      openingRouteKeys: state.openingRouteKeys.filter(
-        (key) => key !== route.key
-      ),
-      closingRouteKeys: state.closingRouteKeys.filter(
-        (key) => key !== route.key
-      ),
-      replacingRouteKeys: [],
-    }));
+
+    if (
+      this.state.replacingRouteKeys.every((key) => key !== route.key) &&
+      !state.routes.some((r) => r.key === route.key)
+    ) {
+      // If route isn't present in current state, assume that a close animation was cancelled
+      // So we need to add this route back to the state
+      navigation.dispatch(NavigationActions.navigate(route));
+    } else {
+      this.setState((state) => ({
+        routes: state.replacingRouteKeys.length
+          ? state.routes.filter(
+              (r) => !state.replacingRouteKeys.includes(r.key)
+            )
+          : state.routes,
+        openingRouteKeys: state.openingRouteKeys.filter(
+          (key) => key !== route.key
+        ),
+        closingRouteKeys: state.closingRouteKeys.filter(
+          (key) => key !== route.key
+        ),
+        replacingRouteKeys: [],
+      }));
+    }
  };

  private handleCloseRoute = ({ route }: { route: Route<string> }) => {
    const { state, navigation } = this.props;

-    if (state.routes.find((r) => r.key === route.key)) {
+    if (state.routes.some((r) => r.key === route.key)) {
      // 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
@@ -434,41 +449,43 @@ export default class StackView extends React.Component<Props, State> {
    } = this.state;

    const headerMode =
-      mode !== 'modal' && Platform.OS === 'ios' ? 'float' : 'screen';
+      mode === 'card' && Platform.OS === 'ios' ? 'float' : 'screen';

    return (
-      <GestureHandlerWrapper style={styles.container}>
-        <SafeAreaProviderCompat>
-          <SafeAreaConsumer>
-            {(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}
-                    {...rest}
-                    {...props}
-                  />
-                )}
-              </KeyboardManager>
-            )}
-          </SafeAreaConsumer>
-        </SafeAreaProviderCompat>
-      </GestureHandlerWrapper>
+      <>
+        <GestureHandlerWrapper style={styles.container}>
+          <SafeAreaProviderCompat>
+            <SafeAreaConsumer>
+              {(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}
+                      {...rest}
+                      {...props}
+                    />
+                  )}
+                </KeyboardManager>
+              )}
+            </SafeAreaConsumer>
+          </SafeAreaProviderCompat>
+        </GestureHandlerWrapper>
+      </>
    );
  }
 }
--- a/packages/stack/src/vendor/views/TouchableItem.native.tsx
+++ b/packages/stack/src/vendor/views/TouchableItem.native.tsx
@@ -0,0 +1,81 @@
+/**
+ * TouchableItem renders a touchable that looks native on both iOS and Android.
+ *
+ * It provides an abstraction on top of TouchableNativeFeedback and
+ * TouchableOpacity.
+ *
+ * On iOS you can pass the props of TouchableOpacity, on Android pass the props
+ * of TouchableNativeFeedback.
+ */
+import * as React from 'react';
+import {
+  Platform,
+  TouchableNativeFeedback,
+  TouchableOpacity,
+  View,
+  ViewProps,
+} from 'react-native';
+
+import BorderlessButton from './BorderlessButton';
+
+export type Props = ViewProps & {
+  pressColor: string;
+  disabled?: boolean;
+  borderless?: boolean;
+  delayPressIn?: number;
+  onPress?: () => void;
+  children: React.ReactNode;
+};
+
+const ANDROID_VERSION_LOLLIPOP = 21;
+
+export class TouchableItem extends React.Component<Props> {
+  static defaultProps = {
+    borderless: false,
+    pressColor: 'rgba(0, 0, 0, .32)',
+  };
+
+  render() {
+    /*
+     * TouchableNativeFeedback.Ripple causes a crash on old Android versions,
+     * therefore only enable it on Android Lollipop and above.
+     *
+     * All touchables on Android should have the ripple effect according to
+     * platform design guidelines.
+     * We need to pass the background prop to specify a borderless ripple effect.
+     */
+    if (
+      Platform.OS === 'android' &&
+      Platform.Version >= ANDROID_VERSION_LOLLIPOP
+    ) {
+      const { style, pressColor, borderless, children, ...rest } = this.props;
+
+      return (
+        <TouchableNativeFeedback
+          {...rest}
+          useForeground={TouchableNativeFeedback.canUseNativeForeground()}
+          background={TouchableNativeFeedback.Ripple(pressColor, borderless)}
+        >
+          <View style={style}>{React.Children.only(children)}</View>
+        </TouchableNativeFeedback>
+      );
+    } else if (Platform.OS === 'ios') {
+      return (
+        <BorderlessButton
+          hitSlop={{ top: 10, bottom: 10, right: 10, left: 10 }}
+          disallowInterruption
+          enabled={!this.props.disabled}
+          {...this.props}
+        >
+          {this.props.children}
+        </BorderlessButton>
+      );
+    } else {
+      return (
+        <TouchableOpacity {...this.props}>
+          {this.props.children}
+        </TouchableOpacity>
+      );
+    }
+  }
+}
--- a/packages/stack/src/vendor/views/TouchableItem.tsx
+++ b/packages/stack/src/vendor/views/TouchableItem.tsx
@@ -1,80 +1,3 @@
-/**
- * TouchableItem renders a touchable that looks native on both iOS and Android.
- *
- * It provides an abstraction on top of TouchableNativeFeedback and
- * TouchableOpacity.
- *
- * On iOS you can pass the props of TouchableOpacity, on Android pass the props
- * of TouchableNativeFeedback.
- */
-import * as React from 'react';
-import {
-  Platform,
-  TouchableNativeFeedback,
-  TouchableOpacity,
-  View,
-  ViewProps,
-} from 'react-native';
+import { TouchableOpacity } from 'react-native';

-import BorderlessButton from './BorderlessButton';
-
-type Props = ViewProps & {
-  pressColor: string;
-  disabled?: boolean;
-  borderless?: boolean;
-  delayPressIn?: number;
-  onPress?: () => void;
-};
-
-const ANDROID_VERSION_LOLLIPOP = 21;
-
-export default class TouchableItem extends React.Component<Props> {
-  static defaultProps = {
-    borderless: false,
-    pressColor: 'rgba(0, 0, 0, .32)',
-  };
-
-  render() {
-    /*
-     * TouchableNativeFeedback.Ripple causes a crash on old Android versions,
-     * therefore only enable it on Android Lollipop and above.
-     *
-     * All touchables on Android should have the ripple effect according to
-     * platform design guidelines.
-     * We need to pass the background prop to specify a borderless ripple effect.
-     */
-    if (
-      Platform.OS === 'android' &&
-      Platform.Version >= ANDROID_VERSION_LOLLIPOP
-    ) {
-      const { style, pressColor, borderless, children, ...rest } = this.props;
-
-      return (
-        <TouchableNativeFeedback
-          {...rest}
-          useForeground={TouchableNativeFeedback.canUseNativeForeground()}
-          background={TouchableNativeFeedback.Ripple(pressColor, borderless)}
-        >
-          <View style={style}>{React.Children.only(children)}</View>
-        </TouchableNativeFeedback>
-      );
-    } else if (Platform.OS === 'ios') {
-      return (
-        <BorderlessButton
-          hitSlop={{ top: 10, bottom: 10, right: 10, left: 10 }}
-          disallowInterruption
-          enabled={!this.props.disabled}
-          {...this.props}
-        >
-          {this.props.children}
-        </BorderlessButton>
-      );
-    } else {
-      return (
-        <TouchableOpacity {...this.props}>
-          {this.props.children}
-        </TouchableOpacity>
-      );
-    }
-  }
-}
+export const TouchableItem = (TouchableOpacity as any) as typeof import('./TouchableItem.native').TouchableItem;
--- a/packages/tabs/CHANGELOG.md
+++ b/packages/tabs/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [2.8.13](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.12...react-navigation-tabs@2.8.13) (2020-04-30)
+
+**Note:** Version bump only for package react-navigation-tabs
+
+
+
+
+
+## [2.8.12](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.11...react-navigation-tabs@2.8.12) (2020-04-22)
+
+**Note:** Version bump only for package react-navigation-tabs
+
+
+
+
+
 ## [2.8.11](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.10...react-navigation-tabs@2.8.11) (2020-04-02)

 **Note:** Version bump only for package react-navigation-tabs
--- a/packages/tabs/package.json
+++ b/packages/tabs/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-navigation-tabs",
-  "version": "2.8.11",
+  "version": "2.8.13",
  "description": "Tab Navigation components for React Navigation",
  "main": "lib/commonjs/index.js",
  "module": "lib/module/index.js",
@@ -42,7 +42,7 @@
  "dependencies": {
    "hoist-non-react-statics": "^3.3.2",
    "react-lifecycles-compat": "^3.0.4",
-    "react-native-safe-area-view": "^0.14.8",
+    "react-native-safe-area-view": "^0.14.9",
    "react-native-tab-view": "^2.11.0"
  },
  "devDependencies": {
@@ -56,7 +56,7 @@
    "react-native-gesture-handler": "^1.6.0",
    "react-native-reanimated": "^1.2.0",
    "react-native-tab-view": "^2.13.0",
-    "react-navigation": "^4.3.7",
+    "react-navigation": "^4.3.9",
    "typescript": "~3.8.3"
  },
  "peerDependencies": {
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,7 @@
    "esModuleInterop": true,
    "forceConsistentCasingInFileNames": true,
    "jsx": "react",
-    "lib": ["esnext"],
+    "lib": ["esnext", "dom"],
    "module": "esnext",
    "moduleResolution": "node",
    "noFallthroughCasesInSwitch": true,
--- a/yarn.lock
+++ b/yarn.lock
@@ -3202,10 +3202,10 @@
  resolved "https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.7.tgz#a65ce0702f55cb67fd777995de6fc7b3e5781903"
  integrity sha512-9KbP7LTLFz9dx1heURJbO6nuVMdSjDez8znlrUzaB1nUwKVsTTwlKRuHxGUYIIkReLWrJQeCv9tidy+84z2eCw==

-"@react-navigation/stack@^5.2.11":
-  version "5.2.11"
-  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.2.11.tgz#3e8d5e64a7a46c9fdb672eed74c973c3073e8ca5"
-  integrity sha512-Gt+T9FlXB8yQGS/0Mg987Wzr/XbPwSROujn0lTzw328wVpHKoilLStdMf5u5pxMMsNQ6HBtzITksM3FyxY9/0A==
+"@react-navigation/stack@^5.2.16":
+  version "5.2.16"
+  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.2.16.tgz#0ab0b8b401f13f5823de7334a643baac3bc3cd04"
+  integrity sha512-0l0Aalj5RNcHLVaS2hgrs58eNDHlkAGPeyEUFcxbk2ii93F8W9MmSCYUn+Tpvruqfv/m9FnyLbQ1DpQOxsekIg==
  dependencies:
    color "^3.1.2"
    react-native-iphone-x-helper "^1.2.1"
@@ -14194,13 +14194,20 @@ react-native-safe-area-context@0.7.3, react-native-safe-area-context@^0.7.3:
  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-0.7.3.tgz#ad6bd4abbabe195332c53810e4ce5851eb21aa2a"
  integrity sha512-9Uqu1vlXPi+2cKW/CW6OnHxA76mWC4kF3wvlqzq4DY8hn37AeiXtLFs2WkxH4yXQRrnJdP6ivc65Lz+MqwRZAA==

-react-native-safe-area-view@^0.14.6, react-native-safe-area-view@^0.14.8:
+react-native-safe-area-view@^0.14.6:
  version "0.14.8"
  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz#ef33c46ff8164ae77acad48c3039ec9c34873e5b"
  integrity sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==
  dependencies:
    hoist-non-react-statics "^2.3.1"

+react-native-safe-area-view@^0.14.9:
+  version "0.14.9"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.9.tgz#90ee8383037010d9a5055a97cf97e4c1da1f0c3d"
+  integrity sha512-WII/ulhpVyL/qbYb7vydq7dJAfZRBcEhg4/UWt6F6nAKpLa3gAceMOxBxI914ppwSP/TdUsandFy6lkJQE0z4A==
+  dependencies:
+    hoist-non-react-statics "^2.3.1"
+
 react-native-screens@2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.3.0.tgz#fd2b0c841f4fdebb2937c0e84acccc62bf9ebb22"
Author	SHA1	Message	Date
Satyajit Sahoo	f34ec46111	chore: publish - react-navigation-animated-switch@0.5.12 - @react-navigation/core@3.7.6 - react-navigation-drawer@2.4.13 - react-navigation-material-bottom-tabs@2.2.12 - @react-navigation/native@3.7.13 - react-navigation@4.3.9 - react-navigation-stack@2.4.0 - react-navigation-tabs@2.8.13	2020-05-01 01:45:52 +02:00
Satyajit Sahoo	8b79e9bee6	feat: sync latest stack	2020-05-01 01:45:10 +02:00
linzera	e09906a423	fix: change old docUrl to new docUrl due v5	2020-04-30 16:57:36 +02:00
Satyajit Sahoo	ed7ffb98f4	chore: publish - react-navigation-animated-switch@0.5.11 - react-navigation-drawer@2.4.12 - react-navigation-material-bottom-tabs@2.2.11 - @react-navigation/native@3.7.12 - react-navigation@4.3.8 - react-navigation-stack@2.3.13 - react-navigation-tabs@2.8.12	2020-04-22 16:47:35 +02:00
Satyajit Sahoo	90eff6a5e2	chore: sync latest stack	2020-04-22 16:45:32 +02:00
Satyajit Sahoo	b4691d7de2	chore: update react-native-safe-area-view	2020-04-22 16:31:49 +02:00