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
chore: sync latest stack
2026-01-13 22:42:25 +08:00 · 2020-04-22 16:47:35 +02:00 · 2020-04-22 16:45:32 +02:00 · 2020-04-22 16:31:49 +02:00 · 2020-04-18 01:49:20 +02:00 · 2020-04-18 01:48:06 +02:00
36 changed files with 1266 additions and 677 deletions
--- a/example/App.tsx
+++ b/example/App.tsx
@@ -41,7 +41,7 @@ import StackWithTranslucentHeader from './src/StackWithTranslucentHeader';
 import SwitchWithStacks from './src/SwitchWithStacks';
 import TabsInDrawer from './src/TabsInDrawer';
 import DragLimitedToModal from './src/DragLimitedToModal';
-import EventsStack from './src/EventsStack';
+import FocusEvents from './src/FocusEvents';
 import FullScreen from './src/FullScreen';
 import GestureInteraction from './src/GestureInteraction';
 import {
@@ -144,7 +144,7 @@ const ExampleInfo = {
    name: 'Drag limited to modal',
    screen: DragLimitedToModal,
  },
-  EventsStack: { name: 'Events Stack', screen: EventsStack },
+  EventsStack: { name: 'Focus Events', screen: FocusEvents },
  FullScreen: { name: 'Fullscreen Stack', screen: FullScreen },
  GestureInteraction: {
    name: 'Gesture interaction',
--- a/example/src/FocusEvents.tsx
+++ b/example/src/FocusEvents.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Button, ScrollView, View, Text } from 'react-native';
+import { createBottomTabNavigator } from 'react-navigation-tabs';
 import {
  createStackNavigator,
  NavigationStackProp,
@@ -22,24 +23,36 @@ class FocusTag extends React.Component<NavigationStackScreenProps> {
  state = { mode: 'didBlur' };

  componentDidMount() {
-    this.props.navigation.addListener('willFocus', () => {
-      this.setMode('willFocus');
+    this._willFocusSub = this.props.navigation.addListener('willFocus', () => {
+      this._handleEvent('willFocus');
    });

-    this.props.navigation.addListener('willBlur', () => {
-      this.setMode('willBlur');
+    this._willBlurSub = this.props.navigation.addListener('willBlur', () => {
+      this._handleEvent('willBlur');
    });

-    this.props.navigation.addListener('didFocus', () => {
-      this.setMode('didFocus');
+    this._didFocusSub = this.props.navigation.addListener('didFocus', () => {
+      this._handleEvent('didFocus');
    });

-    this.props.navigation.addListener('didBlur', () => {
-      this.setMode('didBlur');
+    this._didBlurSub = this.props.navigation.addListener('didBlur', () => {
+      this._handleEvent('didBlur');
    });
  }

-  setMode = (mode: string) => {
+  componentWillUnmount() {
+    this._willFocusSub?.remove();
+    this._willBlurSub?.remove();
+    this._didFocusSub?.remove();
+    this._didBlurSub?.remove();
+  }
+
+  _willFocusSub: { remove: () => void } | undefined;
+  _willBlurSub: { remove: () => void } | undefined;
+  _didFocusSub: { remove: () => void } | undefined;
+  _didBlurSub: { remove: () => void } | undefined;
+
+  _handleEvent = (mode: string) => {
    this.setState({ mode });
  };

@@ -119,18 +132,19 @@ class SampleScreen extends React.Component<NavigationStackScreenProps> {
  }
 }

-const SimpleStack = createStackNavigator(
+const Stack = createStackNavigator(
  {
-    PageOne: {
-      screen: SampleScreen,
-    },
-    PageTwo: {
-      screen: SampleScreen,
-    },
+    PageOne: SampleScreen,
+    PageTwo: SampleScreen,
  },
  {
    initialRouteName: 'PageOne',
  }
 );

-export default SimpleStack;
+const Tabs = createBottomTabNavigator({
+  A: Stack,
+  B: Stack,
+});
+
+export default Tabs;
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
  "author": "Adam Miskiewicz <adam@sk3vy.com>, Eric Vicenti <ericvicenti@gmail.com>, Brent Vatne <brent@expo.io>, Satyajit Sahoo <satyajit.happy@gmail.com>",
  "scripts": {
    "lint": "eslint --ext '.js,.ts,.tsx' .",
-    "typescript": "tsc --noEmit",
+    "typescript": "tsc --noEmit --composite false",
    "test": "jest",
    "prerelease": "yarn lerna run clean",
    "release": "yarn lerna publish",
@@ -42,7 +42,7 @@
    "jest": "^25.1.0",
    "lerna": "^3.20.2",
    "prettier": "^2.0.1",
-    "typescript": "~3.7.5"
+    "typescript": "~3.8.3"
  },
  "resolutions": {
    "react": "~16.9.0",
--- a/packages/animated-switch/CHANGELOG.md
+++ b/packages/animated-switch/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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
+
+
+
+
+
+## [0.5.9](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.8...react-navigation-animated-switch@0.5.9) (2020-03-31)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
+## [0.5.8](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.6...react-navigation-animated-switch@0.5.8) (2020-03-28)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
 ## [0.5.7](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.6...react-navigation-animated-switch@0.5.7) (2020-03-27)

 **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.7",
+  "version": "0.5.11",
  "description": "Animated switch for React Navigation",
  "main": "lib/commonjs/index.js",
  "react-native": "lib/module/index.js",
@@ -28,8 +28,8 @@
    "react": "~16.9.0",
    "react-native": "~0.61.5",
    "react-native-reanimated": "~1.7.0",
-    "react-navigation": "^4.3.4",
-    "typescript": "~3.7.5"
+    "react-navigation": "^4.3.8",
+    "typescript": "~3.8.3"
  },
  "peerDependencies": {
    "react": "*",
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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)
+
+
+### Bug Fixes
+
+* emit refocus for child navigators ([66a4dbc](https://github.com/react-navigation/react-navigation-core/commit/66a4dbccd8e7b3cda51a1d9c7e9397dfc58d6b9e))
+
+
+
+
+
+## [3.7.4](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.7.3...@react-navigation/core@3.7.4) (2020-03-31)
+
+
+### Bug Fixes
+
+* remove isTransitioning from SwitchRouter state ([3bec1c9](https://github.com/react-navigation/react-navigation-core/commit/3bec1c964a49136c0ead8e8ba8a8c66c556bbcba))
+
+
+
+
+
+## [3.7.3](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.7.1...@react-navigation/core@3.7.3) (2020-03-28)
+
+
+### Bug Fixes
+
+* always emit didFocus/didBlur for root navigator ([ac98c0a](https://github.com/react-navigation/react-navigation-core/commit/ac98c0a668fe21200d0c6f62ae3043f92cc5aa7e))
+* don't handle prune if there's only one route ([d2433f0](https://github.com/react-navigation/react-navigation-core/commit/d2433f0ab8f9791df8169de4ddfdeed9bc699e3e))
+* emit didFocus and didBlur events based on parent's transition ([14a6538](https://github.com/react-navigation/react-navigation-core/commit/14a6538cc8e12c50d5d10722d75c9395a0a281ec))
+* rework focus and blur events to make them more reliable ([cd08338](https://github.com/react-navigation/react-navigation-core/commit/cd083381866506a192f1ec842ac169f2b4277ca5)), closes [#4867](https://github.com/react-navigation/react-navigation-core/issues/4867) [#6187](https://github.com/react-navigation/react-navigation-core/issues/6187) [#6451](https://github.com/react-navigation/react-navigation-core/issues/6451) [#7628](https://github.com/react-navigation/react-navigation-core/issues/7628) [#7749](https://github.com/react-navigation/react-navigation-core/issues/7749)
+
+
+
+
+
 ## [3.7.2](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.7.1...@react-navigation/core@3.7.2) (2020-03-27)


--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@react-navigation/core",
-  "version": "3.7.2",
+  "version": "3.7.5",
  "description": "Core utilities for the react-navigation framework",
  "main": "lib/commonjs/index.js",
  "react-native": "lib/module/index.js",
--- a/packages/core/src/routers/SwitchRouter.js
+++ b/packages/core/src/routers/SwitchRouter.js
@@ -128,8 +128,8 @@ export default (routeConfigs, config = {}) => {
    const initialState = {
      routes,
      index: initialRouteIndex,
-      isTransitioning: false,
    };
+
    if (backBehavior === 'history') {
      const initialKey = routes[initialRouteIndex].key;
      initialState['routeKeyHistory'] = [initialKey];
--- a/packages/core/src/routers/tests/TabRouter.test.js
+++ b/packages/core/src/routers/tests/TabRouter.test.js
@@ -26,7 +26,6 @@ describe('TabRouter', () => {
        { key: 'Foo', routeName: 'Foo' },
        { key: 'Bar', routeName: 'Bar' },
      ],
-      isTransitioning: false,
    };
    expect(state).toEqual(expectedState);
    const state2 = router.getStateForAction(
@@ -39,7 +38,6 @@ describe('TabRouter', () => {
        { key: 'Foo', routeName: 'Foo' },
        { key: 'Bar', routeName: 'Bar' },
      ],
-      isTransitioning: false,
    };
    expect(state2).toEqual(expectedState2);
    expect(router.getComponentForState(expectedState)).toEqual(ScreenA);
@@ -65,7 +63,6 @@ describe('TabRouter', () => {
        { key: 'Foo', routeName: 'Foo' },
        { key: 'Bar', routeName: 'Bar' },
      ],
-      isTransitioning: false,
    };
    expect(state).toEqual(expectedState);
    const state2 = router.getStateForAction(
@@ -78,7 +75,6 @@ describe('TabRouter', () => {
        { key: 'Foo', routeName: 'Foo' },
        { key: 'Bar', routeName: 'Bar' },
      ],
-      isTransitioning: false,
    };
    expect(state2).toEqual(expectedState2);
    expect(router.getComponentForState(expectedState)).toEqual(ScreenA);
@@ -102,7 +98,6 @@ describe('TabRouter', () => {
        { key: 'Foo', routeName: 'Foo' },
        { key: 'Bar', routeName: 'Bar' },
      ],
-      isTransitioning: false,
    });
  });

@@ -118,7 +113,6 @@ describe('TabRouter', () => {
        { key: 'Foo', routeName: 'Foo' },
        { key: 'Bar', routeName: 'Bar', params: { name: 'Qux' } },
      ],
-      isTransitioning: false,
    });
  });

@@ -230,7 +224,7 @@ describe('TabRouter', () => {
    const state = router.getStateForAction(navAction);
    expect(state).toEqual({
      index: 1,
-      isTransitioning: false,
+
      routes: [
        {
          key: 'Foo',
@@ -238,7 +232,7 @@ describe('TabRouter', () => {
        },
        {
          index: 1,
-          isTransitioning: false,
+
          key: 'Baz',
          routeName: 'Baz',
          params: { foo: '42' },
@@ -281,14 +275,14 @@ describe('TabRouter', () => {
    let state = router.getStateForAction(navAction);
    expect(state).toEqual({
      index: 1,
-      isTransitioning: false,
+
      routes: [
        { key: 'Foo', routeName: 'Foo' },
        {
          index: 0,
          key: 'Baz',
          routeName: 'Baz',
-          isTransitioning: false,
+
          routes: [
            { key: 'Boo', routeName: 'Boo' },
            { key: 'Bar', routeName: 'Bar' },
@@ -308,7 +302,7 @@ describe('TabRouter', () => {
    );
    expect(state && state.routes[1]).toEqual({
      index: 0,
-      isTransitioning: false,
+
      key: 'Baz',
      routeName: 'Baz',
      routes: [
@@ -335,14 +329,14 @@ describe('TabRouter', () => {
    });
    expect(state).toEqual({
      index: 1,
-      isTransitioning: false,
+
      routes: [
        { key: 'Foo', routeName: 'Foo' },
        {
          index: 1,
          key: 'Baz',
          routeName: 'Baz',
-          isTransitioning: false,
+
          routes: [
            { key: 'Foo', routeName: 'Foo' },
            { key: 'Bar', routeName: 'Bar' },
@@ -357,14 +351,14 @@ describe('TabRouter', () => {
    );
    expect(state2).toEqual({
      index: 1,
-      isTransitioning: false,
+
      routes: [
        { key: 'Foo', routeName: 'Foo' },
        {
          index: 0,
          key: 'Baz',
          routeName: 'Baz',
-          isTransitioning: false,
+
          routes: [
            { key: 'Foo', routeName: 'Foo' },
            { key: 'Bar', routeName: 'Bar' },
@@ -403,19 +397,19 @@ describe('TabRouter', () => {
    const state = router.getStateForAction(INIT_ACTION);
    expect(state).toEqual({
      index: 0,
-      isTransitioning: false,
+
      routes: [
        {
          index: 0,
          key: 'Foo',
          routeName: 'Foo',
-          isTransitioning: false,
+
          routes: [
            {
              index: 0,
              key: 'Fee',
              routeName: 'Fee',
-              isTransitioning: false,
+
              routes: [
                { key: 'Boo', routeName: 'Boo' },
                { key: 'Baz', routeName: 'Baz' },
@@ -425,7 +419,7 @@ describe('TabRouter', () => {
              index: 0,
              key: 'Bar',
              routeName: 'Bar',
-              isTransitioning: false,
+
              routes: [
                { key: 'Zoo', routeName: 'Zoo' },
                { key: 'Zap', routeName: 'Zap' },
@@ -442,19 +436,19 @@ describe('TabRouter', () => {
    );
    expect(state2).toEqual({
      index: 0,
-      isTransitioning: false,
+
      routes: [
        {
          index: 1,
          key: 'Foo',
          routeName: 'Foo',
-          isTransitioning: false,
+
          routes: [
            {
              index: 0,
              key: 'Fee',
              routeName: 'Fee',
-              isTransitioning: false,
+
              routes: [
                { key: 'Boo', routeName: 'Boo' },
                { key: 'Baz', routeName: 'Baz' },
@@ -464,7 +458,7 @@ describe('TabRouter', () => {
              index: 1,
              key: 'Bar',
              routeName: 'Bar',
-              isTransitioning: false,
+
              routes: [
                { key: 'Zoo', routeName: 'Zoo' },
                { key: 'Zap', routeName: 'Zap' },
@@ -494,19 +488,19 @@ describe('TabRouter', () => {
    });
    expect(state4).toEqual({
      index: 0,
-      isTransitioning: false,
+
      routes: [
        {
          index: 1,
          key: 'Foo',
          routeName: 'Foo',
-          isTransitioning: false,
+
          routes: [
            {
              index: 0,
              key: 'Fee',
              routeName: 'Fee',
-              isTransitioning: false,
+
              routes: [
                { key: 'Boo', routeName: 'Boo' },
                { key: 'Baz', routeName: 'Baz' },
@@ -516,7 +510,7 @@ describe('TabRouter', () => {
              index: 1,
              key: 'Bar',
              routeName: 'Bar',
-              isTransitioning: false,
+
              routes: [
                { key: 'Zoo', routeName: 'Zoo' },
                { key: 'Zap', routeName: 'Zap' },
@@ -557,7 +551,7 @@ describe('TabRouter', () => {
    const state = router.getStateForAction({ type: NavigationActions.INIT });
    const expectedState = {
      index: 0,
-      isTransitioning: false,
+
      routes: [
        { key: 'Foo', routeName: 'Foo' },
        { key: 'Bar', routeName: 'Bar' },
@@ -567,7 +561,7 @@ describe('TabRouter', () => {
    const state2 = router.getStateForAction(expectedAction, state);
    const expectedState2 = {
      index: 1,
-      isTransitioning: false,
+
      routes: [
        { key: 'Foo', routeName: 'Foo', params: undefined },
        {
@@ -628,13 +622,13 @@ describe('TabRouter', () => {

    const state = {
      index: 0,
-      isTransitioning: false,
+
      routes: [
        {
          index: 1,
          key: 'Foo',
          routeName: 'Foo',
-          isTransitioning: false,
+
          routes: [
            { key: 'Boo', routeName: 'Boo' },
            { key: 'Baz', routeName: 'Baz' },
@@ -660,7 +654,7 @@ describe('TabRouter', () => {

    expect(state0).toEqual({
      index: 0,
-      isTransitioning: false,
+
      routes: [
        { key: 'a', routeName: 'a' },
        { key: 'b', routeName: 'b' },
@@ -676,7 +670,7 @@ describe('TabRouter', () => {

    expect(state1).toEqual({
      index: 1,
-      isTransitioning: false,
+
      routes: [
        { key: 'a', routeName: 'a' },
        { key: 'b', routeName: 'b', params },
@@ -765,13 +759,13 @@ describe('TabRouter', () => {
    const screenApreState = {
      index: 0,
      key: 'Foo',
-      isTransitioning: false,
+
      routeName: 'Foo',
      routes: [{ key: 'Bar', routeName: 'Bar' }],
    };
    const preState = {
      index: 0,
-      isTransitioning: false,
+
      routes: [screenApreState],
    };

--- a/packages/core/src/views/NavigationFocusEvents.js
+++ b/packages/core/src/views/NavigationFocusEvents.js
@@ -51,12 +51,30 @@ export default class NavigationEventManager extends React.Component {
      'willBlur',
      this._handleWillBlur
    );
+
+    this._didFocusSubscription = navigation.addListener(
+      'didFocus',
+      this._handleDidFocus
+    );
+
+    this._didBlurSubscription = navigation.addListener(
+      'didBlur',
+      this._handleDidBlur
+    );
+
+    this._refocusSubscription = navigation.addListener(
+      'refocus',
+      this._handleRefocus
+    );
  }

  componentWillUnmount() {
    this._actionSubscription?.remove();
    this._willFocusSubscription?.remove();
    this._willBlurSubscription?.remove();
+    this._didFocusSubscription?.remove();
+    this._didBlurSubscription?.remove();
+    this._refocusSubscription?.remove();
  }

  /**
@@ -74,6 +92,21 @@ export default class NavigationEventManager extends React.Component {
   */
  _willBlurSubscription;

+  /**
+   * @type {{ remove(): void } | undefined}
+   */
+  _didFocusSubscription;
+
+  /**
+   * @type {{ remove(): void } | undefined}
+   */
+  _didBlurSubscription;
+
+  /**
+   * @type {{ remove(): void } | undefined}
+   */
+  _refocusSubscription;
+
  /**
   * @type {string | undefined}
   */
@@ -84,6 +117,16 @@ export default class NavigationEventManager extends React.Component {
   */
  _lastWillFocusKey;

+  /**
+   * @type {string | undefined}
+   */
+  _lastDidBlurKey;
+
+  /**
+   * @type {string | undefined}
+   */
+  _lastDidFocusKey;
+
  /**
   * The 'action' event will fire when navigation state changes.
   * Detect if the focused route changed here and emit appropriate events.
@@ -113,10 +156,10 @@ export default class NavigationEventManager extends React.Component {
    };

    if (previous?.key !== current.key) {
-      this._emitFocus(current.key, payload);
+      this._emitWillFocus(current.key, payload);

      if (previous?.key) {
-        this._emitBlur(previous.key, payload);
+        this._emitWillBlur(previous.key, payload);
      }
    }

@@ -125,11 +168,11 @@ export default class NavigationEventManager extends React.Component {
      state.isTransitioning === false
    ) {
      if (this._lastWillBlurKey) {
-        onEvent(this._lastWillBlurKey, 'didBlur', payload);
+        this._emitDidBlur(this._lastWillBlurKey, payload);
      }

      if (this._lastWillFocusKey) {
-        onEvent(this._lastWillFocusKey, 'didFocus', payload);
+        this._emitDidFocus(this._lastWillFocusKey, payload);
      }
    }

@@ -143,7 +186,7 @@ export default class NavigationEventManager extends React.Component {
    const { navigation } = this.props;
    const route = navigation.state.routes[navigation.state.index];

-    this._emitFocus(route.key, {
+    this._emitWillFocus(route.key, {
      context: `${route.key}:${action.type}_${context || 'Root'}`,
      state: route,
      lastState: lastState?.routes?.find((r) => r.key === route.key),
@@ -159,7 +202,7 @@ export default class NavigationEventManager extends React.Component {
    const { navigation } = this.props;
    const route = navigation.state.routes[navigation.state.index];

-    this._emitBlur(route.key, {
+    this._emitWillBlur(route.key, {
      context: `${route.key}:${action.type}_${context || 'Root'}`,
      state: route,
      lastState: lastState?.routes?.find((r) => r.key === route.key),
@@ -168,11 +211,64 @@ export default class NavigationEventManager extends React.Component {
    });
  };

+  /**
+   * @param {ParentPayload} payload
+   */
+  _handleDidFocus = ({ lastState, action, context, type }) => {
+    const { navigation } = this.props;
+
+    if (this._lastWillFocusKey) {
+      const route = navigation.state.routes.find(
+        (r) => r.key === this._lastWillFocusKey
+      );
+
+      if (route) {
+        this._emitDidFocus(route.key, {
+          context: `${route.key}:${action.type}_${context || 'Root'}`,
+          state: route,
+          lastState: lastState?.routes?.find((r) => r.key === route.key),
+          action,
+          type,
+        });
+      }
+    }
+  };
+
+  /**
+   * @param {ParentPayload} payload
+   */
+  _handleDidBlur = ({ lastState, action, context, type }) => {
+    const { navigation } = this.props;
+
+    if (this._lastWillBlurKey) {
+      const route = navigation.state.routes.find(
+        (r) => r.key === this._lastWillBlurKey
+      );
+
+      if (route) {
+        this._emitDidBlur(route.key, {
+          context: `${route.key}:${action.type}_${context || 'Root'}`,
+          state: route,
+          lastState: lastState?.routes?.find((r) => r.key === route.key),
+          action,
+          type,
+        });
+      }
+    }
+  };
+
+  _handleRefocus = () => {
+    const { onEvent, navigation } = this.props;
+    const route = navigation.state.routes[navigation.state.index];
+
+    onEvent(route.key, 'refocus');
+  };
+
  /**
   * @param {string} target
   * @param {Payload} payload
   */
-  _emitFocus = (target, payload) => {
+  _emitWillFocus = (target, payload) => {
    if (this._lastWillBlurKey === target) {
      this._lastWillBlurKey = undefined;
    }
@@ -181,14 +277,19 @@ export default class NavigationEventManager extends React.Component {
      return;
    }

+    this._lastDidFocusKey = undefined;
    this._lastWillFocusKey = target;

    const { navigation, onEvent } = this.props;

    onEvent(target, 'willFocus', payload);

-    if (typeof navigation.state.isTransitioning !== 'boolean') {
-      onEvent(target, 'didFocus', payload);
+    if (
+      typeof navigation.state.isTransitioning !== 'boolean' ||
+      (navigation.state.isTransitioning !== true &&
+        !navigation.dangerouslyGetParent())
+    ) {
+      this._emitDidFocus(target, payload);
    }
  };

@@ -196,7 +297,7 @@ export default class NavigationEventManager extends React.Component {
   * @param {string} target
   * @param {Payload} payload
   */
-  _emitBlur = (target, payload) => {
+  _emitWillBlur = (target, payload) => {
    if (this._lastWillFocusKey === target) {
      this._lastWillFocusKey = undefined;
    }
@@ -205,17 +306,54 @@ export default class NavigationEventManager extends React.Component {
      return;
    }

+    this._lastDidBlurKey = undefined;
    this._lastWillBlurKey = target;

    const { navigation, onEvent } = this.props;

    onEvent(target, 'willBlur', payload);

-    if (typeof navigation.state.isTransitioning !== 'boolean') {
-      onEvent(target, 'didBlur', payload);
+    if (
+      typeof navigation.state.isTransitioning !== 'boolean' ||
+      (navigation.state.isTransitioning !== true &&
+        !navigation.dangerouslyGetParent())
+    ) {
+      this._emitDidBlur(target, payload);
    }
  };

+  /**
+   * @param {string} target
+   * @param {Payload} payload
+   */
+  _emitDidFocus = (target, payload) => {
+    if (this._lastWillFocusKey !== target || this._lastDidFocusKey === target) {
+      return;
+    }
+
+    this._lastDidFocusKey = target;
+
+    const { onEvent } = this.props;
+
+    onEvent(target, 'didFocus', payload);
+  };
+
+  /**
+   * @param {string} target
+   * @param {Payload} payload
+   */
+  _emitDidBlur = (target, payload) => {
+    if (this._lastWillBlurKey !== target || this._lastDidBlurKey === target) {
+      return;
+    }
+
+    this._lastDidBlurKey = target;
+
+    const { onEvent } = this.props;
+
+    onEvent(target, 'didBlur', payload);
+  };
+
  render() {
    return null;
  }
--- a/packages/drawer/CHANGELOG.md
+++ b/packages/drawer/CHANGELOG.md
@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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
+
+
+
+
+
+## [2.4.10](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.9...react-navigation-drawer@2.4.10) (2020-03-31)
+
+
+### Bug Fixes
+
+* remove isTransitioning from SwitchRouter state ([3bec1c9](https://github.com/react-navigation/drawer/commit/3bec1c964a49136c0ead8e8ba8a8c66c556bbcba))
+
+
+
+
+
+## [2.4.9](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.7...react-navigation-drawer@2.4.9) (2020-03-28)
+
+**Note:** Version bump only for package react-navigation-drawer
+
+
+
+
+
 ## [2.4.8](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.7...react-navigation-drawer@2.4.8) (2020-03-27)

 **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.8",
+  "version": "2.4.12",
  "description": "Drawer navigator component for React Navigation",
  "main": "lib/commonjs/index.js",
  "react-native": "lib/module/index.js",
@@ -49,8 +49,8 @@
    "react-native-reanimated": "^1.2.0",
    "react-native-screens": "^2.3.0",
    "react-native-testing-library": "^1.12.0",
-    "react-navigation": "^4.3.4",
-    "typescript": "~3.7.5"
+    "react-navigation": "^4.3.8",
+    "typescript": "~3.8.3"
  },
  "peerDependencies": {
    "react": "*",
--- a/packages/drawer/src/routers/tests/DrawerRouter.test.tsx
+++ b/packages/drawer/src/routers/tests/DrawerRouter.test.tsx
@@ -18,7 +18,7 @@ it('handles basic drawer logic and fires close on switch', () => {
  const state = router.getStateForAction(INIT_ACTION);
  const expectedState = {
    index: 0,
-    isTransitioning: false,
+
    routes: [
      { key: 'Foo', routeName: 'Foo', params: undefined },
      { key: 'Bar', routeName: 'Bar', params: undefined },
@@ -32,7 +32,7 @@ it('handles basic drawer logic and fires close on switch', () => {
  );
  const expectedState2 = {
    index: 1,
-    isTransitioning: false,
+
    routes: [
      { key: 'Foo', routeName: 'Foo', params: undefined },
      { key: 'Bar', routeName: 'Bar', params: undefined },
@@ -65,7 +65,7 @@ it('handles initial route navigation', () => {
  expect(state).toEqual({
    index: 0,
    isDrawerOpen: false,
-    isTransitioning: false,
+
    routes: [
      {
        key: 'Foo',
--- a/packages/material-bottom-tabs/CHANGELOG.md
+++ b/packages/material-bottom-tabs/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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
+
+
+
+
+
+## [2.2.9](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.8...react-navigation-material-bottom-tabs@2.2.9) (2020-03-31)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
+## [2.2.8](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.6...react-navigation-material-bottom-tabs@2.2.8) (2020-03-28)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
 ## [2.2.7](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.6...react-navigation-material-bottom-tabs@2.2.7) (2020-03-27)

 **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.7",
+  "version": "2.2.11",
  "description": "Material Bottom Tab Navigation component for React Navigation",
  "main": "lib/commonjs/index.js",
  "module": "lib/module/index.js",
@@ -48,8 +48,8 @@
    "react-native-gesture-handler": "^1.6.0",
    "react-native-paper": "^3.1.1",
    "react-native-reanimated": "^1.2.0",
-    "react-navigation": "^4.3.4",
-    "typescript": "~3.7.5"
+    "react-navigation": "^4.3.8",
+    "typescript": "~3.8.3"
  },
  "peerDependencies": {
    "react": "*",
--- a/packages/native/CHANGELOG.md
+++ b/packages/native/CHANGELOG.md
@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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
+
+
+
+
+
+## [3.7.10](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.9...@react-navigation/native@3.7.10) (2020-03-31)
+
+**Note:** Version bump only for package @react-navigation/native
+
+
+
+
+
+## [3.7.9](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.7...@react-navigation/native@3.7.9) (2020-03-28)
+
+
+### Bug Fixes
+
+* rework focus and blur events to make them more reliable ([cd08338](https://github.com/react-navigation/react-navigation-native/commit/cd083381866506a192f1ec842ac169f2b4277ca5)), closes [#4867](https://github.com/react-navigation/react-navigation-native/issues/4867) [#6187](https://github.com/react-navigation/react-navigation-native/issues/6187) [#6451](https://github.com/react-navigation/react-navigation-native/issues/6451) [#7628](https://github.com/react-navigation/react-navigation-native/issues/7628) [#7749](https://github.com/react-navigation/react-navigation-native/issues/7749)
+
+
+
+
+
 ## [3.7.8](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.7...@react-navigation/native@3.7.8) (2020-03-27)


--- a/packages/native/package.json
+++ b/packages/native/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@react-navigation/native",
-  "version": "3.7.8",
+  "version": "3.7.12",
  "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.2",
+    "@react-navigation/core": "^3.7.5",
    "@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,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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
+
+
+
+
+
+## [4.3.6](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.5...react-navigation@4.3.6) (2020-03-31)
+
+**Note:** Version bump only for package react-navigation
+
+
+
+
+
+## [4.3.5](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.3...react-navigation@4.3.5) (2020-03-28)
+
+**Note:** Version bump only for package react-navigation
+
+
+
+
+
 ## [4.3.4](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.3...react-navigation@4.3.4) (2020-03-27)

 **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.4",
+  "version": "4.3.8",
  "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.2",
-    "@react-navigation/native": "^3.7.8"
+    "@react-navigation/core": "^3.7.5",
+    "@react-navigation/native": "^3.7.12"
  },
  "devDependencies": {
    "@types/react": "^16.9.23",
@@ -34,6 +34,6 @@
    "react": "~16.9.0",
    "react-native": "~0.61.5",
    "react-test-renderer": "^16.9.2",
-    "typescript": "~3.7.5"
+    "typescript": "~3.8.3"
  }
 }
--- a/packages/stack/CHANGELOG.md
+++ b/packages/stack/CHANGELOG.md
@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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)
+
+
+### Bug Fixes
+
+* stack peer warnings ([4c4e66f](https://github.com/react-navigation/react-navigation-stack/commit/4c4e66f05cd4d694f512f4cc38827f3fbf0f70de))
+
+
+
+
+
+## [2.3.11](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.10...react-navigation-stack@2.3.11) (2020-04-02)
+
+**Note:** Version bump only for package react-navigation-stack
+
+
+
+
+
+## [2.3.10](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.9...react-navigation-stack@2.3.10) (2020-03-31)
+
+**Note:** Version bump only for package react-navigation-stack
+
+
+
+
+
+## [2.3.9](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.7...react-navigation-stack@2.3.9) (2020-03-28)
+
+
+### Bug Fixes
+
+* emit didFocus and didBlur events based on parent's transition ([14a6538](https://github.com/react-navigation/react-navigation-stack/commit/14a6538cc8e12c50d5d10722d75c9395a0a281ec))
+* rework focus and blur events to make them more reliable ([cd08338](https://github.com/react-navigation/react-navigation-stack/commit/cd083381866506a192f1ec842ac169f2b4277ca5)), closes [#4867](https://github.com/react-navigation/react-navigation-stack/issues/4867) [#6187](https://github.com/react-navigation/react-navigation-stack/issues/6187) [#6451](https://github.com/react-navigation/react-navigation-stack/issues/6451) [#7628](https://github.com/react-navigation/react-navigation-stack/issues/7628) [#7749](https://github.com/react-navigation/react-navigation-stack/issues/7749)
+
+
+
+
+
 ## [2.3.8](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.7...react-navigation-stack@2.3.8) (2020-03-27)


--- a/packages/stack/package.json
+++ b/packages/stack/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-navigation-stack",
-  "version": "2.3.8",
+  "version": "2.3.13",
  "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.8",
+    "@react-navigation/stack": "^5.2.12",
    "@types/color": "^3.0.1",
    "@types/react": "^16.9.23",
    "@types/react-native": "^0.61.22",
@@ -56,16 +56,16 @@
    "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.4",
+    "react-navigation": "^4.3.8",
    "react-test-renderer": "~16.9.0",
-    "typescript": "~3.7.5"
+    "typescript": "~3.8.3"
  },
  "peerDependencies": {
-    "@react-native-community/masked-view": "^0.1.1",
+    "@react-native-community/masked-view": ">=0.1.0",
    "react": "*",
    "react-native": "*",
-    "react-native-gesture-handler": "^1.5.0",
-    "react-native-safe-area-context": "^0.6.0",
+    "react-native-gesture-handler": ">= 1.5.0",
+    "react-native-safe-area-context": ">= 0.6.0",
    "react-native-screens": ">=1.0.0 || >= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0",
    "react-navigation": "^4.1.1"
  },
--- 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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/index.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/index.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/index.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -3,11 +3,6 @@
 import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
 import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
@@ -13,25 +13,25 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/index.tsx src/vendor/i
 export const Assets = [
   // eslint-disable-next-line import/no-commonjs
   require('./views/assets/back-icon.png'),
-@@ -49,9 +44,10 @@
+@@ -49,8 +44,10 @@
  * Types
  */
- export {
+ export type {
 -  StackNavigationOptions,
 -  StackNavigationProp,
-  StackHeaderProps,
 +  NavigationStackState,
 +  StackNavigationProp as NavigationStackProp,
 +  StackNavigationOptions as NavigationStackOptions,
 +  StackNavigationConfig as NavigationStackConfig,
+   StackHeaderProps,
   StackHeaderLeftButtonProps,
   StackHeaderTitleProps,
-   StackCardInterpolatedStyle,
 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-03-23 11:43:17.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx	2020-04-22 16:34:01.000000000 +0200
 +++ src/vendor/navigators/createStackNavigator.tsx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,81 +0,0 @@
+@@ -1,96 +0,0 @@
 -import * as React from 'react';
+-import { Platform } from 'react-native';
 -import {
 -  useNavigationBuilder,
 -  createNavigatorFactory,
@@ -59,6 +59,11 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
 -  screenOptions,
 -  ...rest
 -}: Props) {
+-  const defaultOptions = {
+-    gestureEnabled: Platform.OS === 'ios',
+-    animationEnabled: Platform.OS !== 'web',
+-  };
+-
 -  const { state, descriptors, navigation } = useNavigationBuilder<
 -    StackNavigationState,
 -    StackRouterOptions,
@@ -67,7 +72,16 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
 -  >(StackRouter, {
 -    initialRouteName,
 -    children,
-    screenOptions,
+-    screenOptions:
+-      typeof screenOptions === 'function'
+-        ? (...args) => ({
+-            ...defaultOptions,
+-            ...screenOptions(...args),
+-          })
+-        : {
+-            ...defaultOptions,
+-            ...screenOptions,
+-          },
 -  });
 -
 -  React.useEffect(
@@ -113,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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/types.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/types.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/types.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -8,14 +8,28 @@
 } from 'react-native';
 import { EdgeInsets } from 'react-native-safe-area-context';
@@ -240,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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Header/Header.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Header/Header.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -1,12 +1,14 @@
 import * as React from 'react';
 -import { StackActions } from '@react-navigation/native';
@@ -321,8 +335,8 @@ 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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderBackButton.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Header/HeaderBackButton.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -8,9 +8,9 @@
   StyleSheet,
   LayoutChangeEvent,
@@ -335,8 +349,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBac
 
 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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderBackground.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Header/HeaderBackground.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Animated, StyleSheet, Platform, ViewProps } from 'react-native';
@@ -346,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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderContainer.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Header/HeaderContainer.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -1,11 +1,6 @@
 import * as React from 'react';
 import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -399,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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderSegment.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Header/HeaderSegment.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -8,7 +8,7 @@
   ViewStyle,
 } from 'react-native';
@@ -420,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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderTitle.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Header/HeaderTitle.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Animated, StyleSheet, Platform } from 'react-native';
@@ -431,8 +445,8 @@ 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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Stack/Card.tsx	2020-03-23 11:43:59.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Stack/Card.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -138,7 +138,7 @@
 
   private interactionHandle: number | undefined;
@@ -443,8 +457,8 @@ 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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Stack/CardContainer.tsx	2020-03-27 14:41:20.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Stack/CardContainer.tsx	2020-04-22 16:34:39.000000000 +0200
@@ -1,10 +1,16 @@
 import * as React from 'react';
 import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -474,20 +488,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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Stack/CardStack.tsx	2020-03-27 14:41:20.000000000 +0100
-@@ -9,9 +9,8 @@
-   ViewProps,
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Stack/CardStack.tsx	2020-04-22 16:35:12.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 {
@@ -496,9 +508,9 @@ 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-03-23 11:43:17.000000000 +0100
-+++ src/vendor/views/Stack/StackView.tsx	2020-03-27 14:41:20.000000000 +0100
-@@ -4,9 +4,9 @@
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx	2020-04-22 16:34:01.000000000 +0200
+++ src/vendor/views/Stack/StackView.tsx	2020-04-22 16:38:12.000000000 +0200
+@@ -4,9 +4,10 @@
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import {
   StackActions,
@@ -506,12 +518,13 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
 -  Route,
 -} from '@react-navigation/native';
 +  NavigationState as StackNavigationState,
+  NavigationActions,
 +  SceneView,
 +} from 'react-navigation';
 
 import CardStack from './CardStack';
 import KeyboardManager from '../KeyboardManager';
-@@ -15,6 +15,7 @@
+@@ -15,6 +16,7 @@
 } from '../Header/HeaderContainer';
 import SafeAreaProviderCompat from '../SafeAreaProviderCompat';
 import {
@@ -519,7 +532,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
   StackNavigationHelpers,
   StackNavigationConfig,
   StackDescriptorMap,
-@@ -24,6 +25,7 @@
+@@ -24,6 +26,7 @@
   state: StackNavigationState;
   navigation: StackNavigationHelpers;
   descriptors: StackDescriptorMap;
@@ -527,7 +540,18 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
 };
 
 type State = {
-@@ -290,14 +292,37 @@
+@@ -292,7 +295,9 @@
+         return false;
+       }
+ 
+-      return gestureEnabled !== false;
+      return gestureEnabled !== undefined
+        ? gestureEnabled
+        : Platform.OS !== 'android';
+     }
+ 
+     return false;
+@@ -320,23 +325,44 @@
       return null;
     }
 
@@ -548,25 +572,37 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
     return <HeaderContainer {...props} />;
   };
 
-+  private handleTransitionComplete = ({ route }: { route: Route<string> }) => {
+  private handleTransitionComplete = () => {
 +    const { state, navigation } = this.props;
 +
 +    if (state.isTransitioning) {
 +      navigation.dispatch(
 +        StackActions.completeTransition({
 +          key: navigation.state.key,
-+          toChildKey: route.key,
+          toChildKey: state.routes[state.index].key,
 +        })
 +      );
 +    }
 +  };
 +
   private handleOpenRoute = ({ route }: { route: Route<string> }) => {
-+    this.handleTransitionComplete({ route });
-     this.setState((state) => ({
-       routes: state.replacingRouteKeys.length
-         ? state.routes.filter((r) => !state.replacingRouteKeys.includes(r.key))
-@@ -319,12 +344,17 @@
+     const { state, navigation } = this.props;
+ 
+-    if (
+-      state.routeNames.includes(route.name) &&
+-      !state.routes.some((r) => r.key === route.key)
+-    ) {
+    this.handleTransitionComplete();
+
+    if (!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
+@@ -362,12 +388,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
@@ -578,18 +614,12 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
 +      // @ts-ignore
 +      navigation.dispatch(StackActions.pop({ key: route.key, prune: false }));
     } else {
-+      // While closing route we need to point to the previous one assuming that
-+      // this previous one in routes array
-+      const index = this.state.routes.findIndex((r) => r.key === route.key);
-+
-+      this.handleTransitionComplete({
-+        route: this.state.routes[Math.max(index - 1, 0)],
-+      });
+      this.handleTransitionComplete();
 +
       // 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),
-@@ -341,22 +371,24 @@
+@@ -384,22 +409,24 @@
   private handleTransitionStart = (
     { route }: { route: Route<string> },
     closing: boolean
--- a/packages/stack/src/index.tsx
+++ b/packages/stack/src/index.tsx
@@ -8,7 +8,7 @@ export { default as createStackNavigator } from './navigators/createStackNavigat
 /**
 * Types
 */
-export {
+export type {
  NavigationStackScreenComponent,
  NavigationStackScreenProps,
 } from './types';
--- a/packages/stack/src/navigators/tests/snapshots/NestedNavigator.test.tsx.snap
+++ b/packages/stack/src/navigators/tests/snapshots/NestedNavigator.test.tsx.snap
@@ -115,7 +115,7 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
                pointerEvents="none"
                style={
                  Object {
-                    "backgroundColor": "#fff",
+                    "backgroundColor": "rgb(242, 242, 242)",
                    "bottom": 0,
                    "left": 0,
                    "position": "absolute",
@@ -276,7 +276,7 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
                                    pointerEvents="none"
                                    style={
                                      Object {
-                                        "backgroundColor": "#fff",
+                                        "backgroundColor": "rgb(242, 242, 242)",
                                        "bottom": 0,
                                        "left": 0,
                                        "position": "absolute",
--- a/packages/stack/src/navigators/tests/snapshots/StackNavigator.test.tsx.snap
+++ b/packages/stack/src/navigators/tests/snapshots/StackNavigator.test.tsx.snap
@@ -115,7 +115,7 @@ exports[`StackNavigator applies correct values when headerRight is present 1`] =
                pointerEvents="none"
                style={
                  Object {
-                    "backgroundColor": "#fff",
+                    "backgroundColor": "rgb(242, 242, 242)",
                    "bottom": 0,
                    "left": 0,
                    "position": "absolute",
@@ -412,7 +412,7 @@ exports[`StackNavigator renders successfully 1`] = `
                pointerEvents="none"
                style={
                  Object {
-                    "backgroundColor": "#fff",
+                    "backgroundColor": "rgb(242, 242, 242)",
                    "bottom": 0,
                    "left": 0,
                    "position": "absolute",
--- a/packages/stack/src/vendor/TransitionConfigs/CardStyleInterpolators.tsx
+++ b/packages/stack/src/vendor/TransitionConfigs/CardStyleInterpolators.tsx
@@ -164,6 +164,7 @@ export function forModalPresentationIOS({
      borderTopLeftRadius: borderRadius,
      borderTopRightRadius: borderRadius,
      marginTop: index === 0 ? 0 : statusBarHeight,
+      marginBottom: index === 0 ? 0 : topOffset,
      transform: [{ translateY }, { scale }],
    },
    overlayStyle: { opacity: overlayOpacity },
--- a/packages/stack/src/vendor/index.tsx
+++ b/packages/stack/src/vendor/index.tsx
@@ -43,11 +43,12 @@ export { default as useGestureHandlerRef } from './utils/useGestureHandlerRef';
 /**
 * Types
 */
-export {
+export type {
  NavigationStackState,
  StackNavigationProp as NavigationStackProp,
  StackNavigationOptions as NavigationStackOptions,
  StackNavigationConfig as NavigationStackConfig,
+  StackHeaderProps,
  StackHeaderLeftButtonProps,
  StackHeaderTitleProps,
  StackCardInterpolatedStyle,
--- a/packages/stack/src/vendor/views/KeyboardManager.tsx
+++ b/packages/stack/src/vendor/views/KeyboardManager.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { TextInput } from 'react-native';
+import { TextInput, Platform, Keyboard } from 'react-native';

 type Props = {
  enabled: boolean;
@@ -56,7 +56,9 @@ export default class KeyboardManager extends React.Component<Props> {

    const input = this.previouslyFocusedTextInput;

-    if (input) {
+    if (Platform.OS === 'android') {
+      Keyboard.dismiss();
+    } else if (input) {
      TextInput.State.blurTextInput(input);
    }

--- 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
@@ -246,11 +246,21 @@ export default class Card extends React.Component<Props> {
        this.handleStartInteraction();
        onGestureBegin?.();
        break;
-      case GestureState.CANCELLED:
+      case GestureState.CANCELLED: {
        this.isSwiping.setValue(FALSE);
        this.handleEndInteraction();
+
+        const velocity =
+          gestureDirection === 'vertical' ||
+          gestureDirection === 'vertical-inverted'
+            ? nativeEvent.velocityY
+            : nativeEvent.velocityX;
+
+        this.animate({ closing: this.props.closing, velocity });
+
        onGestureCanceled?.();
        break;
+      }
      case GestureState.END: {
        this.isSwiping.setValue(FALSE);

@@ -276,7 +286,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 });

@@ -507,6 +517,7 @@ export default class Card extends React.Component<Props> {
                        : gestureDirection === 'vertical'
                        ? [styles.shadowVertical, styles.shadowTop]
                        : [styles.shadowVertical, styles.shadowBottom],
+                      { backgroundColor },
                      shadowStyle,
                    ]}
                    pointerEvents="none"
@@ -543,7 +554,6 @@ const styles = StyleSheet.create({
  },
  shadow: {
    position: 'absolute',
-    backgroundColor: '#fff',
    shadowRadius: 5,
    shadowColor: '#000',
    shadowOpacity: 0.3,
--- 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,37 +73,6 @@ type State = {

 const EPSILON = 0.01;

-const MaybeScreenContainer = ({
-  enabled,
-  ...rest
-}: ViewProps & {
-  enabled: boolean;
-  children: React.ReactNode;
-}) => {
-  if (enabled && screensEnabled()) {
-    return <ScreenContainer {...rest} />;
-  }
-
-  return <View {...rest} />;
-};
-
-const MaybeScreen = ({
-  enabled,
-  active,
-  ...rest
-}: ViewProps & {
-  enabled: boolean;
-  active: number | Animated.AnimatedInterpolation;
-  children: React.ReactNode;
-}) => {
-  if (enabled && screensEnabled()) {
-    // @ts-ignore
-    return <Screen active={active} {...rest} />;
-  }
-
-  return <View {...rest} />;
-};
-
 const FALLBACK_DESCRIPTOR = Object.freeze({ options: {} });

 const getHeaderHeights = (
@@ -415,7 +382,7 @@ export default class CardStack extends React.Component<Props, State> {

    // 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 === 'android' && mode !== 'modal';
+    const isScreensEnabled = Platform.OS !== 'ios' && mode !== 'modal';

    return (
      <React.Fragment>
--- a/packages/stack/src/vendor/views/Stack/StackView.tsx
+++ b/packages/stack/src/vendor/views/Stack/StackView.tsx
@@ -5,6 +5,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import {
  StackActions,
  NavigationState as StackNavigationState,
+  NavigationActions,
  SceneView,
 } from 'react-navigation';

@@ -48,31 +49,63 @@ type State = {

 const GestureHandlerWrapper = GestureHandlerRootView ?? View;

+/**
+ * Compare two arrays with primitive values as the content.
+ * We need to make sure that both values and order match.
+ */
+const isArrayEqual = (a: any[], b: any[]) =>
+  a.length === b.length && a.every((it, index) => it === b[index]);
+
 export default class StackView extends React.Component<Props, State> {
  static getDerivedStateFromProps(
    props: Readonly<Props>,
    state: Readonly<State>
  ) {
    // If there was no change in routes, we don't need to compute anything
-    if (props.state.routes === state.previousRoutes && state.routes.length) {
-      if (props.descriptors !== state.previousDescriptors) {
-        const descriptors = state.routes.reduce<StackDescriptorMap>(
-          (acc, route) => {
-            acc[route.key] =
-              props.descriptors[route.key] || state.descriptors[route.key];
+    if (
+      (props.state.routes === state.previousRoutes ||
+        isArrayEqual(
+          props.state.routes.map((r) => r.key),
+          state.previousRoutes.map((r) => r.key)
+        )) &&
+      state.routes.length
+    ) {
+      let routes = state.routes;
+      let previousRoutes = state.previousRoutes;
+      let descriptors = props.descriptors;
+      let previousDescriptors = state.previousDescriptors;

+      if (props.descriptors !== state.previousDescriptors) {
+        descriptors = state.routes.reduce<StackDescriptorMap>((acc, route) => {
+          acc[route.key] =
+            props.descriptors[route.key] || state.descriptors[route.key];
+
+          return acc;
+        }, {});
+
+        previousDescriptors = props.descriptors;
+      }
+
+      if (props.state.routes !== state.previousRoutes) {
+        // if any route objects have changed, we should update them
+        const map = props.state.routes.reduce<Record<string, Route<string>>>(
+          (acc, route) => {
+            acc[route.key] = route;
            return acc;
          },
          {}
        );

-        return {
-          previousDescriptors: props.descriptors,
-          descriptors,
-        };
+        routes = state.routes.map((route) => map[route.key] || route);
+        previousRoutes = props.state.routes;
      }

-      return null;
+      return {
+        routes,
+        previousRoutes,
+        descriptors,
+        previousDescriptors,
+      };
    }

    // Here we determine which routes were added or removed to animate them
@@ -117,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

@@ -136,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(
@@ -176,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 (
@@ -308,52 +341,57 @@ export default class StackView extends React.Component<Props, State> {
    return <HeaderContainer {...props} />;
  };

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

    if (state.isTransitioning) {
      navigation.dispatch(
        StackActions.completeTransition({
          key: navigation.state.key,
-          toChildKey: route.key,
+          toChildKey: state.routes[state.index].key,
        })
      );
    }
  };

  private handleOpenRoute = ({ route }: { route: Route<string> }) => {
-    this.handleTransitionComplete({ route });
-    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: [],
-    }));
+    const { state, navigation } = this.props;
+
+    this.handleTransitionComplete();
+
+    if (!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
      // @ts-ignore
      navigation.dispatch(StackActions.pop({ key: route.key, prune: false }));
    } else {
-      // While closing route we need to point to the previous one assuming that
-      // this previous one in routes array
-      const index = this.state.routes.findIndex((r) => r.key === route.key);
-
-      this.handleTransitionComplete({
-        route: this.state.routes[Math.max(index - 1, 0)],
-      });
+      this.handleTransitionComplete();

      // We need to clean up any state tracking the route and pop it immediately
      this.setState((state) => ({
--- a/packages/tabs/CHANGELOG.md
+++ b/packages/tabs/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [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
+
+
+
+
+
+## [2.8.10](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.9...react-navigation-tabs@2.8.10) (2020-03-31)
+
+**Note:** Version bump only for package react-navigation-tabs
+
+
+
+
+
+## [2.8.9](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.7...react-navigation-tabs@2.8.9) (2020-03-28)
+
+**Note:** Version bump only for package react-navigation-tabs
+
+
+
+
+
 ## [2.8.8](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.7...react-navigation-tabs@2.8.8) (2020-03-27)

 **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.8",
+  "version": "2.8.12",
  "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,8 +56,8 @@
    "react-native-gesture-handler": "^1.6.0",
    "react-native-reanimated": "^1.2.0",
    "react-native-tab-view": "^2.13.0",
-    "react-navigation": "^4.3.4",
-    "typescript": "~3.7.5"
+    "react-navigation": "^4.3.8",
+    "typescript": "~3.8.3"
  },
  "peerDependencies": {
    "react": "*",
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
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
Satyajit Sahoo	f99f523a37	chore: publish - react-navigation-stack@2.3.12	2020-04-18 01:49:20 +02:00
Satyajit Sahoo	05b47dbb09	chore: sync latest stack	2020-04-18 01:48:06 +02:00
Alejandro	4c4e66f05c	fix: stack peer warnings	2020-04-18 01:15:41 +02:00
Satyajit Sahoo	720d1f970d	chore: publish - react-navigation-animated-switch@0.5.10 - @react-navigation/core@3.7.5 - react-navigation-drawer@2.4.11 - react-navigation-material-bottom-tabs@2.2.10 - @react-navigation/native@3.7.11 - react-navigation@4.3.7 - react-navigation-stack@2.3.11 - react-navigation-tabs@2.8.11	2020-04-02 12:30:56 +02:00
Satyajit Sahoo	66a4dbccd8	fix: emit refocus for child navigators	2020-04-02 12:29:54 +02:00
Satyajit Sahoo	7925f0c8a3	chore: publish - react-navigation-animated-switch@0.5.9 - @react-navigation/core@3.7.4 - react-navigation-drawer@2.4.10 - react-navigation-material-bottom-tabs@2.2.9 - @react-navigation/native@3.7.10 - react-navigation@4.3.6 - react-navigation-stack@2.3.10 - react-navigation-tabs@2.8.10	2020-03-31 18:19:11 +02:00
Satyajit Sahoo	b3d77b79b7	chore: update typescript	2020-03-31 18:15:29 +02:00
Satyajit Sahoo	1d527ce16a	chore: sync latest stack	2020-03-31 18:07:52 +02:00
Satyajit Sahoo	3bec1c964a	fix: remove isTransitioning from SwitchRouter state	2020-03-31 17:38:42 +02:00
osdnk	a7e0c193cd	chore: publish - react-navigation-animated-switch@0.5.8 - @react-navigation/core@3.7.3 - react-navigation-drawer@2.4.9 - react-navigation-material-bottom-tabs@2.2.8 - @react-navigation/native@3.7.9 - react-navigation@4.3.5 - react-navigation-stack@2.3.9 - react-navigation-tabs@2.8.9	2020-03-28 22:34:14 +01:00
Satyajit Sahoo	ac98c0a668	fix: always emit didFocus/didBlur for root navigator	2020-03-28 17:20:33 +01:00
Satyajit Sahoo	14a6538cc8	fix: emit didFocus and didBlur events based on parent's transition	2020-03-28 16:04:06 +01:00