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

packages/animated-switch/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.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

packages/animated-switch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-animated-switch",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "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.4",
+    "react-navigation": "^4.3.5",
     "typescript": "~3.7.5"
   },
   "peerDependencies": {

packages/core/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
 
 

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-navigation/core",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "description": "Core utilities for the react-navigation framework",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",

packages/core/src/views/NavigationFocusEvents.js

@@ -51,12 +51,24 @@ export default class NavigationEventManager extends React.Component {
       'willBlur',
       this._handleWillBlur
     );
+
+    this._didFocusSubscription = navigation.addListener(
+      'didFocus',
+      this._handleDidFocus
+    );
+
+    this._didBlurSubscription = navigation.addListener(
+      'didBlur',
+      this._handleDidBlur
+    );
   }
 
   componentWillUnmount() {
     this._actionSubscription?.remove();
     this._willFocusSubscription?.remove();
     this._willBlurSubscription?.remove();
+    this._didFocusSubscription?.remove();
+    this._didBlurSubscription?.remove();
   }
 
   /**
@@ -74,6 +86,16 @@ export default class NavigationEventManager extends React.Component {
    */
   _willBlurSubscription;
 
+  /**
+   * @type {{ remove(): void } | undefined}
+   */
+  _didFocusSubscription;
+
+  /**
+   * @type {{ remove(): void } | undefined}
+   */
+  _didBlurSubscription;
+
   /**
    * @type {string | undefined}
    */
@@ -84,6 +106,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 +145,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 +157,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 +175,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 +191,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 +200,57 @@ 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,
+        });
+      }
+    }
+  };
+
   /**
    * @param {string} target
    * @param {Payload} payload
    */
-  _emitFocus = (target, payload) => {
+  _emitWillFocus = (target, payload) => {
     if (this._lastWillBlurKey === target) {
       this._lastWillBlurKey = undefined;
     }
@@ -181,14 +259,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 +279,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 +288,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;
   }

packages/drawer/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.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

packages/drawer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-drawer",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "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.4",
+    "react-navigation": "^4.3.5",
     "typescript": "~3.7.5"
   },
   "peerDependencies": {

packages/material-bottom-tabs/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.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

packages/material-bottom-tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-material-bottom-tabs",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "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.4",
+    "react-navigation": "^4.3.5",
     "typescript": "~3.7.5"
   },
   "peerDependencies": {

packages/native/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.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)
 
 

packages/native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-navigation/native",
-  "version": "3.7.8",
+  "version": "3.7.9",
   "description": "React Native support for React Navigation",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@react-native-community/bob": "^0.10.0",
-    "@react-navigation/core": "^3.7.2",
+    "@react-navigation/core": "^3.7.3",
     "@types/react-test-renderer": "^16.9.2",
     "del-cli": "^3.0.0",
     "react": "~16.9.0",

packages/react-navigation/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.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

packages/react-navigation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "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.3",
+    "@react-navigation/native": "^3.7.9"
   },
   "devDependencies": {
     "@types/react": "^16.9.23",

packages/stack/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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)
 
 

packages/stack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-stack",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "Stack navigator component for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -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.4",
+    "react-navigation": "^4.3.5",
     "react-test-renderer": "~16.9.0",
     "typescript": "~3.7.5"
   },

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

@@ -308,21 +308,21 @@ 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.handleTransitionComplete();
     this.setState((state) => ({
       routes: state.replacingRouteKeys.length
         ? state.routes.filter((r) => !state.replacingRouteKeys.includes(r.key))
@@ -347,13 +347,7 @@ export default class StackView extends React.Component<Props, State> {
       // @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) => ({

packages/tabs/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.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

packages/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-tabs",
-  "version": "2.8.8",
+  "version": "2.8.9",
   "description": "Tab Navigation components for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -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.4",
+    "react-navigation": "^4.3.5",
     "typescript": "~3.7.5"
   },
   "peerDependencies": {