chore: publish

- react-navigation-animated-switch@0.5.6
 - @react-navigation/core@3.7.1
 - react-navigation-drawer@2.4.7
 - react-navigation-material-bottom-tabs@2.2.6
 - @react-navigation/native@3.7.7
 - react-navigation@4.3.3
 - react-navigation-stack@2.3.5
 - react-navigation-tabs@2.8.7

.gitignore

@@ -4,6 +4,7 @@
 .idea
 .expo
 .gradle
+.history
 
 local.properties
 

example/App.tsx

@@ -335,7 +335,7 @@ class MainScreen extends React.Component<any, State> {
                 }}
               >
                 {(Object.keys(ExampleInfo) as (keyof typeof ExampleInfo)[]).map(
-                  routeName => (
+                  (routeName) => (
                     <RectButton
                       key={routeName}
                       underlayColor="#ccc"

example/babel.config.js

@@ -1,4 +1,4 @@
-module.exports = function(api) {
+module.exports = function (api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],

example/metro.config.js

@@ -11,8 +11,8 @@ const modules = ['@expo/vector-icons']
       // List all packages under `packages/`
       .readdirSync(packages)
       // Ignore hidden files such as .DS_Store
-      .filter(p => !p.startsWith('.'))
+      .filter((p) => !p.startsWith('.'))
-      .map(p => {
+      .map((p) => {
         const pak = JSON.parse(
           fs.readFileSync(path.join(packages, p, 'package.json'), 'utf8')
         );
@@ -50,7 +50,7 @@ module.exports = {
   },
 
   server: {
-    enhanceMiddleware: middleware => {
+    enhanceMiddleware: (middleware) => {
       return (req, res, next) => {
         // When an asset is imported outside the project root, it has wrong path on Android
         // This happens for the back button in stack, so we fix the path to correct one

example/package.json

@@ -8,9 +8,9 @@
     "ios": "expo start --ios"
   },
   "dependencies": {
-    "@babel/runtime": "^7.8.4",
+    "@babel/runtime": "^7.8.7",
     "@expo/vector-icons": "^10.0.6",
-    "@react-native-community/masked-view": "0.1.6",
+    "@react-native-community/masked-view": "0.1.7",
     "expo": "^36.0.0",
     "expo-asset": "~8.0.0",
     "expo-barcode-scanner": "^8.0.0",
@@ -21,16 +21,16 @@
     "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.1.tar.gz",
     "react-native-gesture-handler": "~1.6.0",
     "react-native-iphone-x-helper": "^1.2.1",
-    "react-native-maps": "0.26.1",
+    "react-native-maps": "0.27.0",
     "react-native-paper": "^3.4.0",
     "react-native-reanimated": "~1.7.0",
     "react-native-safe-area-context": "0.7.3",
-    "react-native-screens": "2.0.0-beta.10",
+    "react-native-screens": "2.3.0",
     "react-native-webview": "8.1.2",
     "react-navigation-header-buttons": "^3.0.5"
   },
   "devDependencies": {
     "babel-plugin-module-resolver": "^4.0.0",
-    "expo-cli": "^3.13.1"
+    "expo-cli": "^3.13.8"
   }
 }

example/src/CustomTabs.tsx

@@ -62,7 +62,7 @@ const CustomTabBar = ({
   const { routes } = navigation.state;
   return (
     <SafeAreaView style={styles.tabContainer}>
-      {routes.map(route => (
+      {routes.map((route) => (
         <BorderlessButton
           onPress={() => navigation.navigate(route.routeName)}
           style={styles.tab}

example/src/GestureInteraction.tsx

@@ -44,7 +44,7 @@ const ContainerWithButtons = withNavigation(
 const MapScreen = () => (
   <ContainerWithButtons>
     <DrawerGestureContext.Consumer>
-      {ref => (
+      {(ref) => (
         <NativeViewGestureHandler waitFor={ref}>
           <MapView style={{ flex: 1 }} />
         </NativeViewGestureHandler>
@@ -60,7 +60,7 @@ MapScreen.navigationOptions = {
 const WebViewScreen = () => (
   <ContainerWithButtons>
     <DrawerGestureContext.Consumer>
-      {ref => (
+      {(ref) => (
         <NativeViewGestureHandler waitFor={ref}>
           <WebView
             style={{ flex: 1 }}

example/src/LifecycleInteraction.tsx

@@ -33,7 +33,7 @@ const BarCodeScreenBase = (
       <BarCodeScanner
         onBarCodeScanned={
           props.isFocused
-            ? data => {
+            ? (data) => {
                 console.log('scanned...');
                 props.navigation.navigate('Info', { data });
               }
@@ -51,7 +51,7 @@ BarCodeScreenBase.navigationOptions = {
 
 const BarCodeScreen = withNavigationFocus(BarCodeScreenBase);
 
-const InfoScreen: NavigationStackScreenComponent = props => {
+const InfoScreen: NavigationStackScreenComponent = (props) => {
   return (
     <View style={{ flex: 1 }}>
       <Text>{JSON.stringify(props.navigation.getParam('data'))}</Text>

example/src/ModalStack.tsx

@@ -82,7 +82,7 @@ class ListScreen extends React.Component<
   state = { isInverted: false };
 
   onSwitch = () =>
-    this.setState(prevState => ({ isInverted: !prevState.isInverted }));
+    this.setState((prevState) => ({ isInverted: !prevState.isInverted }));
 
   render() {
     return (

example/src/ParallaxDrawer.tsx

@@ -158,7 +158,7 @@ const DrawerContents = ({
     <Animated.View style={{ transform: [{ translateX }] }}>
       <ScrollView>
         <SafeAreaView forceInset={{ top: 'always' }}>
-          {navigation.state.routes.map(route => (
+          {navigation.state.routes.map((route) => (
             <DrawerItem
               key={route.key}
               navigation={descriptors[route.key].navigation}

example/src/RTLDrawer.tsx

@@ -32,7 +32,7 @@ class RightDrawer extends Component<DrawerContentComponentProps> {
         <ScrollView
           style={{ height: '100%', width: '100%', backgroundColor: '#333333' }}
         >
-          {this.state.categories.map(key => {
+          {this.state.categories.map((key) => {
             return (
               <TouchableOpacity
                 key={key.n}

example/src/Shared/PhotoGrid.tsx

@@ -59,7 +59,7 @@ export default function PhotoGrid({ id }: { id: string }) {
 
   return (
     <NavigationAwareScrollView contentContainerStyle={styles.content}>
-      {PHOTOS.map(uri => (
+      {PHOTOS.map((uri) => (
         <View key={uri} style={styles.item}>
           <Image source={{ uri }} style={styles.photo} />
         </View>

example/src/StackAnimationConsumerStack.tsx

@@ -25,7 +25,7 @@ const ListScreen = (props: NavigationStackScreenProps) => (
 
 const AnotherScreen = () => (
   <CardAnimationContext.Consumer>
-    {value => {
+    {(value) => {
       const scale = value
         ? value.current.progress.interpolate({
             inputRange: [0, 1],
@@ -67,7 +67,7 @@ const YetAnotherScreen = () => (
     }}
   >
     <CardAnimationContext.Consumer>
-      {value => (
+      {(value) => (
         <Animated.Text
           style={{
             fontSize: 24,
@@ -84,7 +84,7 @@ const YetAnotherScreen = () => (
       )}
     </CardAnimationContext.Consumer>
     <CardAnimationContext.Consumer>
-      {value => (
+      {(value) => (
         <Animated.Text
           style={{
             fontSize: 24,

example/src/StackWithDrawer.tsx

@@ -59,7 +59,7 @@ const Drawer = createDrawerNavigator(
     },
   },
   {
-    contentComponent: props => <Menu {...props} />,
+    contentComponent: (props) => <Menu {...props} />,
     navigationOptions: { title: 'Example' },
   }
 );

example/src/TransparentStack.tsx

@@ -5,7 +5,7 @@ import {
   NavigationStackScreenComponent,
 } from 'react-navigation-stack';
 
-const ListScreen: NavigationStackScreenComponent = function(props) {
+const ListScreen: NavigationStackScreenComponent = function (props) {
   return (
     <View
       style={{
@@ -29,7 +29,7 @@ const ListScreen: NavigationStackScreenComponent = function(props) {
   );
 };
 
-const ModalDialogScreen: NavigationStackScreenComponent = function(props) {
+const ModalDialogScreen: NavigationStackScreenComponent = function (props) {
   return (
     <View
       style={{

package.json

@@ -27,12 +27,12 @@
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-    "@babel/preset-env": "^7.8.4",
+    "@babel/preset-env": "^7.8.7",
     "@babel/preset-react": "^7.8.3",
     "@babel/preset-typescript": "^7.8.3",
-    "@babel/runtime": "^7.8.4",
+    "@babel/runtime": "^7.8.7",
     "@commitlint/config-conventional": "^8.3.4",
-    "@types/jest": "^25.1.2",
+    "@types/jest": "^25.1.4",
     "commitlint": "^8.3.5",
     "core-js": "^3.6.4",
     "eslint": "^6.8.0",
@@ -40,7 +40,7 @@
     "husky": "^4.2.1",
     "jest": "^25.1.0",
     "lerna": "^3.20.2",
-    "prettier": "^1.19.1",
+    "prettier": "^2.0.1",
     "typescript": "~3.7.5"
   },
   "resolutions": {

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.6](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.5...react-navigation-animated-switch@0.5.6) (2020-03-22)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
+## [0.5.5](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.4...react-navigation-animated-switch@0.5.5) (2020-03-20)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
+## [0.5.4](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.3...react-navigation-animated-switch@0.5.4) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
+## [0.5.3](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.2...react-navigation-animated-switch@0.5.3) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation-animated-switch
+
+
+
+
+
 ## [0.5.2](https://github.com/react-navigation/react-navigation/compare/react-navigation-animated-switch@0.5.1...react-navigation-animated-switch@0.5.2) (2020-02-26)
 
 **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.2",
+  "version": "0.5.6",
   "description": "Animated switch for React Navigation",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -21,14 +21,14 @@
     "access": "public"
   },
   "devDependencies": {
-    "@react-native-community/bob": "0.9.7",
+    "@react-native-community/bob": "0.10.0",
-    "@types/react": "16.9.22",
+    "@types/react": "16.9.23",
-    "@types/react-native": "0.61.17",
+    "@types/react-native": "0.61.22",
     "del-cli": "^3.0.0",
     "react": "~16.9.0",
     "react-native": "~0.61.5",
     "react-native-reanimated": "~1.7.0",
-    "react-navigation": "^4.2.2",
+    "react-navigation": "^4.3.3",
     "typescript": "~3.7.5"
   },
   "peerDependencies": {

packages/core/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.1](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.7.0...@react-navigation/core@3.7.1) (2020-03-22)
+
+**Note:** Version bump only for package @react-navigation/core
+
+
+
+
+
+# [3.7.0](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.6.1...@react-navigation/core@3.7.0) (2020-03-16)
+
+
+### Features
+
+* add prune option to pop action to match v5 behaviour ([5927f42](https://github.com/react-navigation/react-navigation-core/commit/5927f4287f5e1ab106537865523daa1c03b14b47))
+
+
+
+
+
 ## [3.6.1](https://github.com/react-navigation/react-navigation-core/compare/@react-navigation/core@3.6.0...@react-navigation/core@3.6.1) (2020-02-24)
 
 

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-navigation/core",
-  "version": "3.6.1",
+  "version": "3.7.1",
   "description": "Core utilities for the react-navigation framework",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -15,7 +15,8 @@
   },
   "sideEffects": false,
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "tag": "4.x"
   },
   "keywords": [
     "react-navigation",
@@ -36,11 +37,11 @@
   "dependencies": {
     "hoist-non-react-statics": "^3.3.2",
     "path-to-regexp": "^1.8.0",
-    "query-string": "^6.11.0",
+    "query-string": "^6.11.1",
-    "react-is": "^16.8.6"
+    "react-is": "^16.13.0"
   },
   "devDependencies": {
-    "@react-native-community/bob": "^0.9.7",
+    "@react-native-community/bob": "^0.10.0",
     "del-cli": "^3.0.0",
     "react": "~16.9.0",
     "react-native": "~0.61.5",

packages/core/src/StateUtils.js

@@ -13,7 +13,7 @@ const StateUtils = {
    * Gets a route by key. If the route isn't found, returns `null`.
    */
   get(state, key) {
-    return state.routes.find(route => route.key === key) || null;
+    return state.routes.find((route) => route.key === key) || null;
   },
 
   /**
@@ -21,7 +21,7 @@ const StateUtils = {
    * routes of the navigation state, or -1 if it is not present.
    */
   indexOf(state, key) {
-    return state.routes.findIndex(route => route.key === key);
+    return state.routes.findIndex((route) => route.key === key);
   },
 
   /**
@@ -29,7 +29,7 @@ const StateUtils = {
    * routes of the navigation state.
    */
   has(state, key) {
-    return !!state.routes.some(route => route.key === key);
+    return !!state.routes.some((route) => route.key === key);
   },
 
   /**

packages/core/src/__tests__/getChildEventSubscriber.test.js

@@ -2,8 +2,8 @@ import getChildEventSubscriber from '../getChildEventSubscriber';
 
 it('child action events only flow when focused', () => {
   const parentSubscriber = jest.fn();
-  const emitParentAction = payload => {
+  const emitParentAction = (payload) => {
-    parentSubscriber.mock.calls.forEach(subs => {
+    parentSubscriber.mock.calls.forEach((subs) => {
       if (subs[0] === payload.type) {
         subs[1](payload);
       }
@@ -52,8 +52,8 @@ it('child action events only flow when focused', () => {
 
 it('grandchildren subscription', () => {
   const grandParentSubscriber = jest.fn();
-  const emitGrandParentAction = payload => {
+  const emitGrandParentAction = (payload) => {
-    grandParentSubscriber.mock.calls.forEach(subs => {
+    grandParentSubscriber.mock.calls.forEach((subs) => {
       if (subs[0] === payload.type) {
         subs[1](payload);
       }
@@ -119,8 +119,8 @@ it('grandchildren subscription', () => {
 
 it('grandchildren transitions', () => {
   const grandParentSubscriber = jest.fn();
-  const emitGrandParentAction = payload => {
+  const emitGrandParentAction = (payload) => {
-    grandParentSubscriber.mock.calls.forEach(subs => {
+    grandParentSubscriber.mock.calls.forEach((subs) => {
       if (subs[0] === payload.type) {
         subs[1](payload);
       }
@@ -212,8 +212,8 @@ it('grandchildren transitions', () => {
 
 it('grandchildren pass through transitions', () => {
   const grandParentSubscriber = jest.fn();
-  const emitGrandParentAction = payload => {
+  const emitGrandParentAction = (payload) => {
-    grandParentSubscriber.mock.calls.forEach(subs => {
+    grandParentSubscriber.mock.calls.forEach((subs) => {
       if (subs[0] === payload.type) {
         subs[1](payload);
       }
@@ -305,8 +305,8 @@ it('grandchildren pass through transitions', () => {
 
 it('child focus with transition', () => {
   const parentSubscriber = jest.fn();
-  const emitParentAction = payload => {
+  const emitParentAction = (payload) => {
-    parentSubscriber.mock.calls.forEach(subs => {
+    parentSubscriber.mock.calls.forEach((subs) => {
       if (subs[0] === payload.type) {
         subs[1](payload);
       }
@@ -398,8 +398,8 @@ it('child focus with transition', () => {
 
 it('child focus with immediate transition', () => {
   const parentSubscriber = jest.fn();
-  const emitParentAction = payload => {
+  const emitParentAction = (payload) => {
-    parentSubscriber.mock.calls.forEach(subs => {
+    parentSubscriber.mock.calls.forEach((subs) => {
       if (subs[0] === payload.type) {
         subs[1](payload);
       }
@@ -461,8 +461,8 @@ it('child focus with immediate transition', () => {
 
 const setupEventTest = (subscriptionKey, initialLastFocusEvent) => {
   const parentSubscriber = jest.fn();
-  const emitEvent = payload => {
+  const emitEvent = (payload) => {
-    parentSubscriber.mock.calls.forEach(subs => {
+    parentSubscriber.mock.calls.forEach((subs) => {
       if (subs[0] === payload.type) {
         subs[1](payload);
       }

packages/core/src/__tests__/getNavigation.test.js

@@ -30,7 +30,7 @@ it('getNavigation provides default action helpers', () => {
 it.skip('getNavigation provides router action helpers', () => {
   const router = {
     getActionCreators: () => ({
-      foo: bar => ({ type: 'FooBarAction', bar }),
+      foo: (bar) => ({ type: 'FooBarAction', bar }),
     }),
     getStateForAction(action, lastState = {}) {
       return lastState;

packages/core/src/getChildEventSubscriber.js

@@ -24,12 +24,12 @@ export default function getChildEventSubscriber(
       willBlurSubscribers,
       didBlurSubscribers,
       refocusSubscribers,
-    ].forEach(set => set.clear());
+    ].forEach((set) => set.clear());
 
-    upstreamSubscribers.forEach(subs => subs && subs.remove());
+    upstreamSubscribers.forEach((subs) => subs && subs.remove());
   };
 
-  const getChildSubscribers = evtName => {
+  const getChildSubscribers = (evtName) => {
     switch (evtName) {
       case 'action':
         return actionSubscribers;
@@ -52,7 +52,7 @@ export default function getChildEventSubscriber(
     const payloadWithType = { ...payload, type };
     const subscribers = getChildSubscribers(type);
     subscribers &&
-      subscribers.forEach(subs => {
+      subscribers.forEach((subs) => {
         subs(payloadWithType);
       });
   };
@@ -72,8 +72,8 @@ export default function getChildEventSubscriber(
     'action',
   ];
 
-  const upstreamSubscribers = upstreamEvents.map(eventName =>
+  const upstreamSubscribers = upstreamEvents.map((eventName) =>
-    addListener(eventName, payload => {
+    addListener(eventName, (payload) => {
       if (eventName === 'refocus') {
         emit(eventName, payload);
         return;
@@ -89,8 +89,8 @@ export default function getChildEventSubscriber(
 
       const isChildFocused = focusKey === key;
       const lastRoute =
-        lastRoutes && lastRoutes.find(route => route.key === key);
+        lastRoutes && lastRoutes.find((route) => route.key === key);
-      const newRoute = routes && routes.find(route => route.key === key);
+      const newRoute = routes && routes.find((route) => route.key === key);
       const childPayload = {
         context: `${key}:${action.type}_${payload.context || 'Root'}`,
         state: newRoute,

packages/core/src/getChildNavigation.js

@@ -3,7 +3,7 @@ import getChildRouter from './getChildRouter';
 import getNavigationActionCreators from './routers/getNavigationActionCreators';
 import getChildrenNavigationCache from './getChildrenNavigationCache';
 
-const createParamGetter = route => (paramName, defaultValue) => {
+const createParamGetter = (route) => (paramName, defaultValue) => {
   const params = route.params;
 
   if (params && paramName in params) {
@@ -15,7 +15,7 @@ const createParamGetter = route => (paramName, defaultValue) => {
 
 function getChildNavigation(navigation, childKey, getCurrentParentNavigation) {
   const children = getChildrenNavigationCache(navigation);
-  const childRoute = navigation.state.routes.find(r => r.key === childKey);
+  const childRoute = navigation.state.routes.find((r) => r.key === childKey);
 
   if (!childRoute) {
     return null;
@@ -47,7 +47,7 @@ function getChildNavigation(navigation, childKey, getCurrentParentNavigation) {
   };
 
   const actionHelpers = {};
-  Object.keys(actionCreators).forEach(actionName => {
+  Object.keys(actionCreators).forEach((actionName) => {
     actionHelpers[actionName] = (...args) => {
       const actionCreator = actionCreators[actionName];
       const action = actionCreator(...args);
@@ -91,7 +91,7 @@ function getChildNavigation(navigation, childKey, getCurrentParentNavigation) {
       actions: actionCreators,
       getParam: createParamGetter(childRoute),
 
-      getChildNavigation: grandChildKey =>
+      getChildNavigation: (grandChildKey) =>
         getChildNavigation(children[childKey], grandChildKey, () => {
           const nav = getCurrentParentNavigation();
           return nav && nav.getChildNavigation(childKey);

packages/core/src/getChildrenNavigationCache.js

@@ -5,8 +5,8 @@ export default function getChildrenNavigationCache(navigation) {
 
   let childrenNavigationCache =
     navigation._childrenNavigation || (navigation._childrenNavigation = {});
-  let childKeys = navigation.state.routes.map(route => route.key);
+  let childKeys = navigation.state.routes.map((route) => route.key);
-  Object.keys(childrenNavigationCache).forEach(cacheKey => {
+  Object.keys(childrenNavigationCache).forEach((cacheKey) => {
     if (!childKeys.includes(cacheKey) && !navigation.state.isTransitioning) {
       delete childrenNavigationCache[cacheKey];
     }

packages/core/src/getNavigation.js

@@ -18,9 +18,9 @@ export default function getNavigation(
     state,
     dispatch,
     getScreenProps,
-    getChildNavigation: childKey =>
+    getChildNavigation: (childKey) =>
       getChildNavigation(navigation, childKey, getCurrentNavigation),
-    isFocused: childKey => {
+    isFocused: (childKey) => {
       const { routes, index } = getCurrentNavigation().state;
       if (childKey == null || routes[index].key === childKey) {
         return true;
@@ -48,7 +48,7 @@ export default function getNavigation(
     ...actions,
   };
 
-  Object.keys(actionCreators).forEach(actionName => {
+  Object.keys(actionCreators).forEach((actionName) => {
     navigation[actionName] = (...args) =>
       navigation.dispatch(actionCreators[actionName](...args));
   });

packages/core/src/navigators/__tests__/createSwitchNavigator.test.js

@@ -4,8 +4,8 @@ import { render, fireEvent } from 'react-native-testing-library';
 import { createAppContainer } from '@react-navigation/native';
 import createSwitchNavigator from '../createSwitchNavigator';
 
-const getActiveRouteName = state => state.routes[state.index].routeName;
+const getActiveRouteName = (state) => state.routes[state.index].routeName;
-const createScreen = (routeName, nextRouteName) => props => (
+const createScreen = (routeName, nextRouteName) => (props) => (
   <View>
     <Text testID="title">{routeName}</Text>
     <Text testID={routeName + '-isFirstRoute'}>

packages/core/src/routers/StackActions.js

@@ -5,33 +5,33 @@ export const RESET = 'Navigation/RESET';
 export const REPLACE = 'Navigation/REPLACE';
 export const COMPLETE_TRANSITION = 'Navigation/COMPLETE_TRANSITION';
 
-export const pop = payload => ({
+export const pop = (payload) => ({
   type: POP,
   ...payload,
 });
 
-export const popToTop = payload => ({
+export const popToTop = (payload) => ({
   type: POP_TO_TOP,
   ...payload,
 });
 
-export const push = payload => ({
+export const push = (payload) => ({
   type: PUSH,
   ...payload,
 });
 
-export const reset = payload => ({
+export const reset = (payload) => ({
   type: RESET,
   key: null,
   ...payload,
 });
 
-export const replace = payload => ({
+export const replace = (payload) => ({
   type: REPLACE,
   ...payload,
 });
 
-export const completeTransition = payload => ({
+export const completeTransition = (payload) => ({
   type: COMPLETE_TRANSITION,
   preserveFocus: true,
   ...payload,

packages/core/src/routers/StackRouter.js

@@ -29,7 +29,7 @@ export default (routeConfigs, stackConfig = {}) => {
   const routeNames = Object.keys(routeConfigs);
 
   // Loop through routes and find child routers
-  routeNames.forEach(routeName => {
+  routeNames.forEach((routeName) => {
     // We're not using `getScreenForRouteName` here to preserve the lazy loading
     // behaviour of routes. This means that routes with child routers must be
     // defined using a component directly or with an object with a screen prop.
@@ -152,7 +152,7 @@ export default (routeConfigs, stackConfig = {}) => {
             n,
             ...params,
           }),
-        popToTop: params => StackActions.popToTop(params),
+        popToTop: (params) => StackActions.popToTop(params),
         push: (routeName, params, action) =>
           StackActions.push({
             routeName,
@@ -280,7 +280,7 @@ export default (routeConfigs, stackConfig = {}) => {
 
         // Before pushing a new route we first try to find one in the existing route stack
         // More information on this: https://github.com/react-navigation/rfcs/blob/master/text/0004-less-pushy-navigate.md
-        const lastRouteIndex = state.routes.findIndex(r => {
+        const lastRouteIndex = state.routes.findIndex((r) => {
           if (action.key) {
             return r.key === action.key;
           } else {
@@ -425,7 +425,7 @@ export default (routeConfigs, stackConfig = {}) => {
         if (action.key === undefined && state.routes.length) {
           routeIndex = state.routes.length - 1;
         } else {
-          routeIndex = state.routes.findIndex(r => r.key === action.key);
+          routeIndex = state.routes.findIndex((r) => r.key === action.key);
         }
 
         // Only replace if the key matches one of our routes
@@ -467,7 +467,7 @@ export default (routeConfigs, stackConfig = {}) => {
 
       if (action.type === NavigationActions.SET_PARAMS) {
         const key = action.key;
-        const lastRoute = state.routes.find(route => route.key === key);
+        const lastRoute = state.routes.find((route) => route.key === key);
         if (lastRoute) {
           const params = {
             ...lastRoute.params,
@@ -496,7 +496,7 @@ export default (routeConfigs, stackConfig = {}) => {
 
         return {
           ...state,
-          routes: newStackActions.map(newStackAction => {
+          routes: newStackActions.map((newStackAction) => {
             const router = childRouters[newStackAction.routeName];
 
             let childState = {};
@@ -532,24 +532,43 @@ export default (routeConfigs, stackConfig = {}) => {
         action.type === NavigationActions.BACK ||
         action.type === StackActions.POP
       ) {
-        const { key, n, immediate } = action;
+        const { key, n, immediate, prune } = action;
-        let backRouteIndex = state.index;
-        if (action.type === StackActions.POP && n != null) {
-          // determine the index to go back *from*. In this case, n=1 means to go
-          // back from state.index, as if it were a normal "BACK" action
-          backRouteIndex = Math.max(1, state.index - n + 1);
-        } else if (key) {
-          const backRoute = state.routes.find(route => route.key === key);
-          backRouteIndex = state.routes.indexOf(backRoute);
-        }
 
-        if (backRouteIndex > 0) {
+        if (action.type === StackActions.POP && prune === false && key) {
-          return {
+          const index = state.routes.findIndex((r) => r.key === key);
-            ...state,
+          const count = Math.max(index - (n == null ? 1 : n) + 1, 1);
-            routes: state.routes.slice(0, backRouteIndex),
+          const routes = state.routes
-            index: backRouteIndex - 1,
+            .slice(0, count)
-            isTransitioning: immediate !== true,
+            .concat(state.routes.slice(index + 1));
-          };
+
+          if (routes.length) {
+            return {
+              ...state,
+              routes,
+              index: routes.length - 1,
+              isTransitioning: immediate !== true,
+            };
+          }
+        } else {
+          let backRouteIndex = state.index;
+
+          if (action.type === StackActions.POP && n != null) {
+            // determine the index to go back *from*. In this case, n=1 means to go
+            // back from state.index, as if it were a normal "BACK" action
+            backRouteIndex = Math.max(1, state.index - n + 1);
+          } else if (key) {
+            const backRoute = state.routes.find((route) => route.key === key);
+            backRouteIndex = state.routes.indexOf(backRoute);
+          }
+
+          if (backRouteIndex > 0) {
+            return {
+              ...state,
+              routes: state.routes.slice(0, backRouteIndex),
+              index: backRouteIndex - 1,
+              isTransitioning: immediate !== true,
+            };
+          }
         }
       }
 

packages/core/src/routers/SwitchRouter.js

@@ -30,12 +30,12 @@ export default (routeConfigs, config = {}) => {
   if (initialRouteIndex === -1) {
     throw new Error(
       `Invalid initialRouteName '${initialRouteName}'.` +
-        `Should be one of ${order.map(n => `"${n}"`).join(', ')}`
+        `Should be one of ${order.map((n) => `"${n}"`).join(', ')}`
     );
   }
 
   const childRouters = {};
-  order.forEach(routeName => {
+  order.forEach((routeName) => {
     childRouters[routeName] = null;
     const screen = getScreenForRouteName(routeConfigs, routeName);
     if (screen.router) {
@@ -93,7 +93,7 @@ export default (routeConfigs, config = {}) => {
       if (action.type === NavigationActions.NAVIGATE) {
         nextRouteKeyHistory = [...nextRouteKeyHistory]; // copy
         const keyToAdd = nextState.routes[nextState.index].key;
-        nextRouteKeyHistory = nextRouteKeyHistory.filter(k => k !== keyToAdd); // dedup
+        nextRouteKeyHistory = nextRouteKeyHistory.filter((k) => k !== keyToAdd); // dedup
         nextRouteKeyHistory.push(keyToAdd);
       } else if (action.type === NavigationActions.BACK) {
         nextRouteKeyHistory = [...nextRouteKeyHistory]; // copy
@@ -156,7 +156,7 @@ export default (routeConfigs, config = {}) => {
         // Merge any params from the action into all the child routes
         const { params } = action;
         if (params) {
-          state.routes = state.routes.map(route => ({
+          state.routes = state.routes.map((route) => ({
             ...route,
             params: {
               ...route.params,
@@ -175,14 +175,14 @@ export default (routeConfigs, config = {}) => {
       ) {
         const { params } = action;
         const index = state.routes.findIndex(
-          route => route.routeName === action.routeName
+          (route) => route.routeName === action.routeName
         );
 
         if (index === -1) {
           throw new Error(
             `There is no route named '${action.routeName}' in the navigator with the key '${action.key}'.\n` +
               `Must be one of: ${state.routes
-                .map(route => `'${route.routeName}'`)
+                .map((route) => `'${route.routeName}'`)
                 .join(',')}`
           );
         }
@@ -305,7 +305,7 @@ export default (routeConfigs, config = {}) => {
 
       if (action.type === NavigationActions.SET_PARAMS) {
         const key = action.key;
-        const lastRoute = state.routes.find(route => route.key === key);
+        const lastRoute = state.routes.find((route) => route.key === key);
         if (lastRoute) {
           const params = {
             ...lastRoute.params,

packages/core/src/routers/__tests__/PathHandling.test.js

@@ -12,7 +12,7 @@ beforeEach(() => {
   _TESTING_ONLY_normalize_keys();
 });
 
-const performRouterTest = createTestRouter => {
+const performRouterTest = (createTestRouter) => {
   const ListScreen = () => <div />;
 
   const ProfileNavigator = () => <div />;
@@ -584,7 +584,7 @@ it('Handles nested switch routers', () => {
   expect(action.action.routeName).toEqual('B');
 });
 
-const performRouteNameAsPathDisabledTest = createTestRouter => {
+const performRouteNameAsPathDisabledTest = (createTestRouter) => {
   const BScreen = () => <div />;
   const NestedNavigator = () => <div />;
   NestedNavigator.router = createTestRouter({

packages/core/src/routers/__tests__/Routers.test.js

@@ -24,7 +24,7 @@ const dummyEventSubscriber = () => ({
   remove: () => {},
 });
 
-Object.keys(ROUTERS).forEach(routerName => {
+Object.keys(ROUTERS).forEach((routerName) => {
   const Router = ROUTERS[routerName];
 
   describe(`General router features - ${routerName}`, () => {
@@ -441,7 +441,7 @@ it('Inner actions are only unpacked if the current tab matches', () => {
     routes: [screenApreState],
   };
 
-  const comparable = state => {
+  const comparable = (state) => {
     let result = {};
     if (typeof state.routeName === 'string') {
       result = { ...result, routeName: state.routeName };

packages/core/src/routers/__tests__/StackRouter.test.js

@@ -562,6 +562,31 @@ describe('StackRouter', () => {
     expect(poppedState3.routes.length).toBe(1);
     expect(poppedState3.index).toBe(0);
     expect(poppedState3.isTransitioning).toBe(true);
+
+    const poppedState4 = TestRouter.getStateForAction(
+      StackActions.pop({ key: 'C', prune: false, immediate: true }),
+      state
+    );
+    expect(poppedState4.routes.length).toBe(3);
+    expect(poppedState4.index).toBe(2);
+    expect(poppedState4.isTransitioning).toBe(false);
+    expect(poppedState4.routes).toEqual([
+      { key: 'A', routeName: 'foo' },
+      { key: 'B', routeName: 'bar', params: { bazId: '321' } },
+      { key: 'D', routeName: 'bar' },
+    ]);
+
+    const poppedState5 = TestRouter.getStateForAction(
+      StackActions.pop({ n: 2, key: 'C', prune: false }),
+      state
+    );
+    expect(poppedState5.routes.length).toBe(2);
+    expect(poppedState5.index).toBe(1);
+    expect(poppedState5.isTransitioning).toBe(true);
+    expect(poppedState5.routes).toEqual([
+      { key: 'A', routeName: 'foo' },
+      { key: 'D', routeName: 'bar' },
+    ]);
   });
 
   it('popToTop works as expected', () => {

packages/core/src/routers/__tests__/TabRouter.test.js

@@ -775,7 +775,7 @@ describe('TabRouter', () => {
       routes: [screenApreState],
     };
 
-    const comparable = state => {
+    const comparable = (state) => {
       let result = {};
       if (typeof state.routeName === 'string') {
         result = { ...result, routeName: state.routeName };

packages/core/src/routers/__tests__/routerTestHelper.js

@@ -17,7 +17,7 @@ export const getRouterTestHelper = (router, options = defaultOptions) => {
       ? undefined
       : router.getStateForAction({ type: NavigationActions.INIT });
 
-  const applyAction = action => {
+  const applyAction = (action) => {
     state = router.getStateForAction(action, state);
   };
 
@@ -35,7 +35,7 @@ export const getRouterTestHelper = (router, options = defaultOptions) => {
       ...otherActionAttributes,
     });
 
-  const back = key =>
+  const back = (key) =>
     applyAction({
       type: NavigationActions.BACK,
       key,

packages/core/src/routers/getScreenForRouteName.js

@@ -13,7 +13,7 @@ export default function getScreenForRouteName(routeConfigs, routeName) {
     throw new Error(
       `There is no route defined for key ${routeName}.\n` +
         `Must be one of: ${Object.keys(routeConfigs)
-          .map(a => `'${a}'`)
+          .map((a) => `'${a}'`)
           .join(',')}`
     );
   }

packages/core/src/routers/pathUtils.js

@@ -36,7 +36,7 @@ export const getParamsFromPath = (inputParams, pathMatch, pathMatchKeys) => {
   return params;
 };
 const getRestOfPath = (pathMatch, pathMatchKeys) => {
-  const rest = pathMatch[pathMatchKeys.findIndex(k => k.asterisk) + 1];
+  const rest = pathMatch[pathMatchKeys.findIndex((k) => k.asterisk) + 1];
   return rest;
 };
 
@@ -81,7 +81,7 @@ export const createPathParser = (
   let paths = [];
 
   // Build pathsByRouteNames, which includes a regex to match paths for each route. Keep in mind, the regex will pass for the route and all child routes. The code that uses pathsByRouteNames will need to also verify that the child router produces an action, in the case of isPathMatchable false (a null path).
-  Object.keys(childRouters).forEach(routeName => {
+  Object.keys(childRouters).forEach((routeName) => {
     let pathPattern;
 
     // First check for paths on the router, then check the route config
@@ -189,7 +189,7 @@ export const createPathParser = (
 
     return null;
   };
-  const getPathAndParamsForRoute = route => {
+  const getPathAndParamsForRoute = (route) => {
     const { routeName, params } = route;
     const childRouter = childRouters[routeName];
     const { toPath, exactReKeys } = pathsByRouteNames[routeName];
@@ -197,8 +197,8 @@ export const createPathParser = (
     const nonPathParams = {};
     if (params) {
       Object.keys(params)
-        .filter(paramName => !exactReKeys.find(k => k.name === paramName))
+        .filter((paramName) => !exactReKeys.find((k) => k.name === paramName))
-        .forEach(paramName => {
+        .forEach((paramName) => {
           nonPathParams[paramName] = params[paramName];
         });
     }

packages/core/src/routers/validateRouteConfigMap.js

@@ -13,7 +13,7 @@ function validateRouteConfigMap(routeConfigs) {
     'Please specify at least one route when configuring a navigator.'
   );
 
-  routeNames.forEach(routeName => {
+  routeNames.forEach((routeName) => {
     const routeConfig = routeConfigs[routeName];
     const screenComponent = getScreenComponent(routeConfig);
 

packages/core/src/routers/validateScreenOptions.js

@@ -7,7 +7,7 @@ const deprecatedKeys = ['tabBar'];
 export default (screenOptions, route) => {
   const keys = Object.keys(screenOptions);
 
-  const deprecatedKey = keys.find(key => deprecatedKeys.includes(key));
+  const deprecatedKey = keys.find((key) => deprecatedKeys.includes(key));
 
   if (typeof screenOptions.title === 'function') {
     throw new Error(
@@ -54,7 +54,7 @@ export default (screenOptions, route) => {
         '{',
         `    ${deprecatedKey}: {`,
         ...Object.keys(screenOptions[deprecatedKey]).map(
-          key => `        ${key}: ...,`
+          (key) => `        ${key}: ...,`
         ),
         '    },',
         '}',
@@ -62,7 +62,7 @@ export default (screenOptions, route) => {
         'with:',
         '{',
         ...Object.keys(screenOptions[deprecatedKey]).map(
-          key =>
+          (key) =>
             `    ${deprecatedKey + key[0].toUpperCase() + key.slice(1)}: ...,`
         ),
         '}',

packages/core/src/utils/getSceneIndicesForInterpolationInputRange.js

@@ -5,8 +5,10 @@ function getSceneIndicesForInterpolationInputRange(props) {
   const isBack = !scenes[lastSceneIndexInScenes].isActive;
 
   if (isBack) {
-    const currentSceneIndexInScenes = scenes.findIndex(item => item === scene);
+    const currentSceneIndexInScenes = scenes.findIndex(
-    const targetSceneIndexInScenes = scenes.findIndex(item => item.isActive);
+      (item) => item === scene
+    );
+    const targetSceneIndexInScenes = scenes.findIndex((item) => item.isActive);
     const targetSceneIndex = scenes[targetSceneIndexInScenes].index;
     const lastSceneIndex = scenes[lastSceneIndexInScenes].index;
 

packages/core/src/utils/invariant.ts

@@ -9,10 +9,10 @@
  * will remain to ensure logic does not differ in production.
  */
 
-let validateFormat: (format?: string) => void = function() {};
+let validateFormat: (format?: string) => void = function () {};
 
 if (process.env.NODE_ENV !== 'production') {
-  validateFormat = function(format?: string) {
+  validateFormat = function (format?: string) {
     if (format === undefined) {
       throw new Error('invariant requires an error message argument');
     }

packages/core/src/views/NavigationEvents.js

@@ -17,7 +17,7 @@ class NavigationEvents extends React.Component {
     // We register all navigation listeners on mount to ensure listener stability across re-render
     // A former implementation was replacing (removing/adding) listeners on all update (if prop provided)
     // but there were issues (see https://github.com/react-navigation/react-navigation/issues/5058)
-    EventNames.forEach(eventName => {
+    EventNames.forEach((eventName) => {
       this.subscriptions[eventName] = this.props.navigation.addListener(
         eventName,
         (...args) => {
@@ -29,12 +29,12 @@ class NavigationEvents extends React.Component {
   }
 
   componentWillUnmount() {
-    EventNames.forEach(eventName => {
+    EventNames.forEach((eventName) => {
       this.subscriptions[eventName].remove();
     });
   }
 
-  getPropListener = eventName => this.props[EventNameToPropName[eventName]];
+  getPropListener = (eventName) => this.props[EventNameToPropName[eventName]];
 
   render() {
     return null;

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

@@ -26,13 +26,15 @@ const createTestNavigationAndHelpers = () => {
         listeners[eventName].push(handler);
       },
       remove: (eventName, handler) => {
-        listeners[eventName] = listeners[eventName].filter(h => h !== handler);
+        listeners[eventName] = listeners[eventName].filter(
+          (h) => h !== handler
+        );
       },
-      get: eventName => {
+      get: (eventName) => {
         return listeners[eventName];
       },
-      call: eventName => {
+      call: (eventName) => {
-        listeners[eventName].forEach(listener => listener());
+        listeners[eventName].forEach((listener) => listener());
       },
     };
   })();

packages/core/src/views/withNavigation.js

@@ -8,14 +8,15 @@ export default function withNavigation(
   config = { forwardRef: true }
 ) {
   class ComponentWithNavigation extends React.Component {
-    static displayName = `withNavigation(${Component.displayName ||
+    static displayName = `withNavigation(${
-      Component.name})`;
+      Component.displayName || Component.name
+    })`;
 
     render() {
       const navigationProp = this.props.navigation;
       return (
         <NavigationContext.Consumer>
-          {navigationContext => {
+          {(navigationContext) => {
             const navigation = navigationProp || navigationContext;
             invariant(
               !!navigation,

packages/core/src/views/withNavigationFocus.js

@@ -4,8 +4,9 @@ import withNavigation from './withNavigation';
 
 export default function withNavigationFocus(Component) {
   class ComponentWithNavigationFocus extends React.Component {
-    static displayName = `withNavigationFocus(${Component.displayName ||
+    static displayName = `withNavigationFocus(${
-      Component.name})`;
+      Component.displayName || Component.name
+    })`;
 
     constructor(props) {
       super(props);
@@ -25,7 +26,7 @@ export default function withNavigationFocus(Component) {
     }
 
     componentWillUnmount() {
-      this.subscriptions.forEach(sub => sub.remove());
+      this.subscriptions.forEach((sub) => sub.remove());
     }
 
     render() {

packages/drawer/CHANGELOG.md

@@ -3,6 +3,49 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.7](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.6...react-navigation-drawer@2.4.7) (2020-03-22)
+
+**Note:** Version bump only for package react-navigation-drawer
+
+
+
+
+
+## [2.4.6](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.5...react-navigation-drawer@2.4.6) (2020-03-20)
+
+**Note:** Version bump only for package react-navigation-drawer
+
+
+
+
+
+## [2.4.5](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.4...react-navigation-drawer@2.4.5) (2020-03-19)
+
+
+### Bug Fixes
+
+* don't use react-native-screens on web ([44c3900](https://github.com/react-navigation/drawer/commit/44c390075f7b76664e09fd9a1a7926645133ebec)), closes [#7485](https://github.com/react-navigation/drawer/issues/7485)
+
+
+
+
+
+## [2.4.4](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.3...react-navigation-drawer@2.4.4) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation-drawer
+
+
+
+
+
+## [2.4.3](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.2...react-navigation-drawer@2.4.3) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation-drawer
+
+
+
+
+
 ## [2.4.2](https://github.com/react-navigation/drawer/compare/react-navigation-drawer@2.4.1...react-navigation-drawer@2.4.2) (2020-02-26)
 
 **Note:** Version bump only for package react-navigation-drawer

packages/drawer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-drawer",
-  "version": "2.4.2",
+  "version": "2.4.7",
   "description": "Drawer navigator component for React Navigation",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -38,18 +38,18 @@
   },
   "homepage": "https://github.com/react-navigation/drawer#readme",
   "devDependencies": {
-    "@react-native-community/bob": "^0.9.7",
+    "@react-native-community/bob": "^0.10.0",
-    "@types/react": "^16.9.22",
+    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.17",
+    "@types/react-native": "^0.61.22",
     "del-cli": "^3.0.0",
     "react": "~16.9.0",
     "react-lifecycles-compat": "^3.0.4",
     "react-native": "~0.61.5",
     "react-native-gesture-handler": "^1.6.0",
     "react-native-reanimated": "^1.2.0",
-    "react-native-screens": "^2.0.0-beta.10",
+    "react-native-screens": "^2.3.0",
     "react-native-testing-library": "^1.12.0",
-    "react-navigation": "^4.2.2",
+    "react-navigation": "^4.3.3",
     "typescript": "~3.7.5"
   },
   "peerDependencies": {
@@ -57,7 +57,7 @@
     "react-native": "*",
     "react-native-gesture-handler": "^1.0.12",
     "react-native-reanimated": "^1.0.0",
-    "react-native-screens": "^1.0.0 || ^1.0.0-alpha",
+    "react-native-screens": ">=1.0.0 || >= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0",
     "react-navigation": "^4.1.1"
   },
   "@react-native-community/bob": {

packages/drawer/src/views/ResourceSavingScene.tsx

@@ -1,5 +1,3 @@
-/* @flow */
-
 import * as React from 'react';
 import { Platform, StyleSheet, View } from 'react-native';
 import { Screen, screensEnabled } from 'react-native-screens';
@@ -10,21 +8,29 @@ type Props = {
   style?: any;
 };
 
-const FAR_FAR_AWAY = 3000; // this should be big enough to move the whole view out of its container
+const FAR_FAR_AWAY = 30000; // this should be big enough to move the whole view out of its container
 
 export default class ResourceSavingScene extends React.Component<Props> {
   render() {
-    if (screensEnabled?.()) {
+    // react-native-screens is buggy on web
+    if (screensEnabled?.() && Platform.OS !== 'web') {
       const { isVisible, ...rest } = this.props;
 
       // @ts-ignore
       return <Screen active={isVisible ? 1 : 0} {...rest} />;
     }
+
     const { isVisible, children, style, ...rest } = this.props;
 
     return (
       <View
-        style={[styles.container, style]}
+        style={[
+          styles.container,
+          Platform.OS === 'web'
+            ? { display: isVisible ? 'flex' : 'none' }
+            : null,
+          style,
+        ]}
         collapsable={false}
         removeClippedSubviews={
           // On iOS, set removeClippedSubviews to true only when not focused

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.6](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.5...react-navigation-material-bottom-tabs@2.2.6) (2020-03-22)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
+## [2.2.5](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.4...react-navigation-material-bottom-tabs@2.2.5) (2020-03-20)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
+## [2.2.4](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.3...react-navigation-material-bottom-tabs@2.2.4) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
+## [2.2.3](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.2...react-navigation-material-bottom-tabs@2.2.3) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation-material-bottom-tabs
+
+
+
+
+
 ## [2.2.2](https://github.com/react-navigation/react-navigation-material-bottom-tabs/compare/react-navigation-material-bottom-tabs@2.2.1...react-navigation-material-bottom-tabs@2.2.2) (2020-02-26)
 
 **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.2",
+  "version": "2.2.6",
   "description": "Material Bottom Tab Navigation component for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -38,17 +38,17 @@
   },
   "homepage": "https://github.com/react-navigation/react-navigation-material-bottom-tabs#readme",
   "devDependencies": {
-    "@react-native-community/bob": "^0.9.7",
+    "@react-native-community/bob": "^0.10.0",
     "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/react": "^16.9.22",
+    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.17",
+    "@types/react-native": "^0.61.22",
     "del-cli": "^3.0.0",
     "react": "~16.9.0",
     "react-native": "~0.61.5",
     "react-native-gesture-handler": "^1.6.0",
     "react-native-paper": "^3.1.1",
     "react-native-reanimated": "^1.2.0",
-    "react-navigation": "^4.2.2",
+    "react-navigation": "^4.3.3",
     "typescript": "~3.7.5"
   },
   "peerDependencies": {

packages/native/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.7](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.6...@react-navigation/native@3.7.7) (2020-03-22)
+
+**Note:** Version bump only for package @react-navigation/native
+
+
+
+
+
+## [3.7.6](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.5...@react-navigation/native@3.7.6) (2020-03-20)
+
+
+### Bug Fixes
+
+* don't mix import and module.exports. closes [#7660](https://github.com/react-navigation/react-navigation-native/issues/7660) ([80c8c9d](https://github.com/react-navigation/react-navigation-native/commit/80c8c9d1dead57eab3b977a1eebf1e9f5f35cd1a))
+
+
+
+
+
+## [3.7.5](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.4...@react-navigation/native@3.7.5) (2020-03-16)
+
+
+### Bug Fixes
+
+* downgrade react-native-safe-area-view ([cfc1bac](https://github.com/react-navigation/react-navigation-native/commit/cfc1bac4e153db4a4ba3f2a9033f77b53367fcbc)), closes [#7813](https://github.com/react-navigation/react-navigation-native/issues/7813)
+
+
+
+
+
+## [3.7.4](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.3...@react-navigation/native@3.7.4) (2020-03-16)
+
+**Note:** Version bump only for package @react-navigation/native
+
+
+
+
+
 ## [3.7.3](https://github.com/react-navigation/react-navigation-native/compare/@react-navigation/native@3.7.0...@react-navigation/native@3.7.3) (2020-02-24)
 
 **Note:** Version bump only for package @react-navigation/native

packages/native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-navigation/native",
-  "version": "3.7.3",
+  "version": "3.7.7",
   "description": "React Native support for React Navigation",
   "main": "lib/commonjs/index.js",
   "react-native": "lib/module/index.js",
@@ -15,7 +15,8 @@
   },
   "sideEffects": false,
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "tag": "4.x"
   },
   "keywords": [
     "react-native",
@@ -38,14 +39,13 @@
     "react-native-safe-area-view": "^0.14.8"
   },
   "devDependencies": {
-    "@react-native-community/bob": "^0.9.7",
+    "@react-native-community/bob": "^0.10.0",
-    "@react-navigation/core": "^3.6.1",
+    "@react-navigation/core": "^3.7.1",
     "@types/react-test-renderer": "^16.9.2",
     "del-cli": "^3.0.0",
     "react": "~16.9.0",
     "react-native": "~0.61.5",
     "react-native-gesture-handler": "^1.6.0",
-    "react-native-screens": "^2.0.0-beta.10",
     "react-test-renderer": "^16.9.2"
   },
   "@react-native-community/bob": {

packages/native/src/Scrollables.js

@@ -52,7 +52,7 @@ const WrappedFlatList = React.forwardRef((props, ref) => (
   <FlatList
     ref={ref}
     {...props}
-    renderScrollComponent={props => (
+    renderScrollComponent={(props) => (
       <WrappedScrollView {...propsMaybeWithRefreshControl(props)} />
     )}
   />
@@ -62,15 +62,14 @@ const WrappedSectionList = React.forwardRef((props, ref) => (
   <SectionList
     ref={ref}
     {...props}
-    renderScrollComponent={props => (
+    renderScrollComponent={(props) => (
       <WrappedScrollView {...propsMaybeWithRefreshControl(props)} />
     )}
   />
 ));
 
-// eslint-disable-next-line import/no-commonjs
+export {
-module.exports = {
+  WrappedScrollView as ScrollView,
-  ScrollView: WrappedScrollView,
+  WrappedFlatList as FlatList,
-  FlatList: WrappedFlatList,
+  WrappedSectionList as SectionList,
-  SectionList: WrappedSectionList,
 };

packages/native/src/__tests__/createAppContainer.test.js

@@ -274,7 +274,7 @@ describe('NavigationContainer', () => {
   });
 
   // https://github.com/facebook/jest/issues/2157#issuecomment-279171856
-  const flushPromises = () => new Promise(resolve => setImmediate(resolve));
+  const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
 
   describe('state persistence', () => {
     async function createPersistenceEnabledContainer(

packages/native/src/createAppContainer.js

@@ -266,7 +266,7 @@ export default function createNavigationContainer(Component) {
       }
 
       const dispatchActions = () =>
-        this._actionEventSubscribers.forEach(subscriber =>
+        this._actionEventSubscribers.forEach((subscriber) =>
           subscriber({
             type: 'action',
             action,
@@ -316,7 +316,7 @@ export default function createNavigationContainer(Component) {
       }
     }
 
-    _persistNavigationState = async nav => {
+    _persistNavigationState = async (nav) => {
       const { persistNavigationState } = this.props;
       if (persistNavigationState) {
         try {
@@ -341,7 +341,7 @@ export default function createNavigationContainer(Component) {
 
     // Per-tick temporary storage for state.nav
 
-    dispatch = action => {
+    dispatch = (action) => {
       if (this.props.navigation) {
         return this.props.navigation.dispatch(action);
       }
@@ -357,7 +357,7 @@ export default function createNavigationContainer(Component) {
       const navState = reducedState === null ? lastNavState : reducedState;
 
       const dispatchActionEvents = () => {
-        this._actionEventSubscribers.forEach(subscriber =>
+        this._actionEventSubscribers.forEach((subscriber) =>
           subscriber({
             type: 'action',
             action,

packages/native/src/createNavigationAwareScrollable.js

@@ -5,8 +5,9 @@ import { withNavigation } from '@react-navigation/core';
 export default function createNavigationAwareScrollable(Component) {
   const ComponentWithNavigationScrolling = withNavigation(
     class extends React.PureComponent<any> {
-      static displayName = `withNavigationScrolling(${Component.displayName ||
+      static displayName = `withNavigationScrolling(${
-        Component.name})`;
+        Component.displayName || Component.name
+      })`;
 
       componentDidMount() {
         this._subscription = this.props.navigation.addListener(
@@ -49,7 +50,7 @@ export default function createNavigationAwareScrollable(Component) {
       render() {
         return (
           <Component
-            ref={view => {
+            ref={(view) => {
               this._scrollRef = view;
             }}
             {...this.props}
@@ -60,10 +61,11 @@ export default function createNavigationAwareScrollable(Component) {
   );
 
   class NavigationAwareScrollable extends React.PureComponent<any> {
-    static displayName = `NavigationAwareScrollable(${Component.displayName ||
+    static displayName = `NavigationAwareScrollable(${
-      Component.name})`;
+      Component.displayName || Component.name
+    })`;
 
-    _captureRef = view => {
+    _captureRef = (view) => {
       this._innerRef = view;
       this.props.onRef && this.props.onRef(view);
     };

packages/native/src/throwIfWrongVersion.js

@@ -1,4 +1,4 @@
-export default function() {
+export default function () {
   throw new Error(
     "This version of '@react-navigation/native' is not compatible with React Navigation 5. Make sure you install 5.x version of '@react-navigation/native'."
   );

packages/native/src/utils/invariant.js

@@ -9,17 +9,17 @@
  * will remain to ensure logic does not differ in production.
  */
 
-var validateFormat = function() {};
+var validateFormat = function () {};
 
 if (process.env.NODE_ENV !== 'production') {
-  validateFormat = function(format) {
+  validateFormat = function (format) {
     if (format === undefined) {
       throw new Error('invariant requires an error message argument');
     }
   };
 }
 
-function invariant(condition, format, a, b, c, d, e, f) {
+export default function invariant(condition, format, a, b, c, d, e, f) {
   validateFormat(format);
 
   if (!condition) {
@@ -32,7 +32,7 @@ function invariant(condition, format, a, b, c, d, e, f) {
       var args = [a, b, c, d, e, f];
       var argIndex = 0;
       error = new Error(
-        format.replace(/%s/g, function() {
+        format.replace(/%s/g, function () {
           return args[argIndex++];
         })
       );
@@ -43,6 +43,3 @@ function invariant(condition, format, a, b, c, d, e, f) {
     throw error;
   }
 }
-
-// eslint-disable-next-line import/no-commonjs
-module.exports = invariant;

packages/native/src/withOrientation.js

@@ -4,7 +4,7 @@ import hoistNonReactStatic from 'hoist-non-react-statics';
 
 export const isOrientationLandscape = ({ width, height }) => width > height;
 
-export default function(WrappedComponent) {
+export default function (WrappedComponent) {
   class withOrientation extends React.Component {
     constructor() {
       super();

packages/react-navigation/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.
 
+## [4.3.3](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.2...react-navigation@4.3.3) (2020-03-22)
+
+**Note:** Version bump only for package react-navigation
+
+
+
+
+
+## [4.3.2](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.1...react-navigation@4.3.2) (2020-03-20)
+
+**Note:** Version bump only for package react-navigation
+
+
+
+
+
+## [4.3.1](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.3.0...react-navigation@4.3.1) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation
+
+
+
+
+
+# [4.3.0](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.2.2...react-navigation@4.3.0) (2020-03-16)
+
+
+### Features
+
+* add prune option to pop action to match v5 behaviour ([5927f42](https://github.com/react-navigation/react-navigation/commit/5927f4287f5e1ab106537865523daa1c03b14b47))
+
+
+
+
+
 ## [4.2.2](https://github.com/react-navigation/react-navigation/compare/react-navigation@4.2.1...react-navigation@4.2.2) (2020-02-26)
 
 

packages/react-navigation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation",
-  "version": "4.2.2",
+  "version": "4.3.3",
   "description": "Routing and navigation for your React Native apps",
   "main": "src/index.js",
   "types": "typescript/react-navigation.d.ts",
@@ -24,12 +24,12 @@
     "react-native": "*"
   },
   "dependencies": {
-    "@react-navigation/core": "^3.6.1",
+    "@react-navigation/core": "^3.7.1",
-    "@react-navigation/native": "^3.7.3"
+    "@react-navigation/native": "^3.7.7"
   },
   "devDependencies": {
-    "@types/react": "^16.9.22",
+    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.17",
+    "@types/react-native": "^0.61.22",
     "@types/react-test-renderer": "^16.9.2",
     "react": "~16.9.0",
     "react-native": "~0.61.5",

packages/react-navigation/typescript/react-navigation.d.ts

@@ -328,6 +328,7 @@ export interface NavigationPopActionPayload {
   // n: the number of routes to pop of the stack
   n?: number;
   immediate?: boolean;
+  prune?: boolean;
   key?: string;
 }
 

packages/stack/CHANGELOG.md

@@ -3,6 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.5](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.4...react-navigation-stack@2.3.5) (2020-03-22)
+
+**Note:** Version bump only for package react-navigation-stack
+
+
+
+
+
+## [2.3.4](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.3...react-navigation-stack@2.3.4) (2020-03-20)
+
+**Note:** Version bump only for package react-navigation-stack
+
+
+
+
+
+## [2.3.3](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.2...react-navigation-stack@2.3.3) (2020-03-20)
+
+**Note:** Version bump only for package react-navigation-stack
+
+
+
+
+
+## [2.3.2](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.1...react-navigation-stack@2.3.2) (2020-03-19)
+
+**Note:** Version bump only for package react-navigation-stack
+
+
+
+
+
+## [2.3.1](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.3.0...react-navigation-stack@2.3.1) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation-stack
+
+
+
+
+
+# [2.3.0](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.2.3...react-navigation-stack@2.3.0) (2020-03-16)
+
+
+### Features
+
+* add prune option to pop action to match v5 behaviour ([5927f42](https://github.com/react-navigation/react-navigation-stack/commit/5927f4287f5e1ab106537865523daa1c03b14b47))
+
+
+
+
+
 ## [2.2.3](https://github.com/react-navigation/react-navigation-stack/compare/react-navigation-stack@2.2.2...react-navigation-stack@2.2.3) (2020-03-04)
 
 

packages/stack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-stack",
-  "version": "2.2.3",
+  "version": "2.3.5",
   "description": "Stack navigator component for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -43,20 +43,20 @@
     "react-native-iphone-x-helper": "^1.2.1"
   },
   "devDependencies": {
-    "@react-native-community/bob": "^0.9.7",
+    "@react-native-community/bob": "^0.10.0",
-    "@react-native-community/masked-view": "^0.1.6",
+    "@react-native-community/masked-view": "^0.1.7",
-    "@react-navigation/stack": "^5.1.1",
+    "@react-navigation/stack": "^5.2.4",
     "@types/color": "^3.0.1",
-    "@types/react": "^16.9.22",
+    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.17",
+    "@types/react-native": "^0.61.22",
     "@types/react-test-renderer": "^16.9.2",
     "del-cli": "^3.0.0",
     "react": "~16.9.0",
     "react-native": "~0.61.4",
     "react-native-gesture-handler": "^1.6.0",
     "react-native-safe-area-context": "^0.7.3",
-    "react-native-screens": "^2.0.0-beta.10",
+    "react-native-screens": "^2.3.0",
-    "react-navigation": "^4.2.2",
+    "react-navigation": "^4.3.3",
     "react-test-renderer": "~16.9.0",
     "typescript": "~3.7.5"
   },
@@ -66,7 +66,7 @@
     "react-native": "*",
     "react-native-gesture-handler": "^1.5.0",
     "react-native-safe-area-context": "^0.6.0",
-    "react-native-screens": "^1.0.0 || ^1.0.0-alpha.0 || ^2.0.0-alpha.20",
+    "react-native-screens": ">=1.0.0 || >= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0",
     "react-navigation": "^4.1.1"
   },
   "@react-native-community/bob": {

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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/index.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/index.tsx	2020-03-04 00:03:45.000000000 +0100
++++ src/vendor/index.tsx	2020-03-23 00:04:37.000000000 +0100
 @@ -3,11 +3,6 @@
  import * as TransitionSpecs from './TransitionConfigs/TransitionSpecs';
  import * as TransitionPresets from './TransitionConfigs/TransitionPresets';
@@ -28,7 +28,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/index.tsx src/vendor/i
    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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/navigators/createStackNavigator.tsx	2020-03-23 00:04:17.000000000 +0100
 +++ src/vendor/navigators/createStackNavigator.tsx	1970-01-01 01:00:00.000000000 +0100
 @@ -1,81 +0,0 @@
 -import * as React from 'react';
@@ -73,7 +73,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/navigators/createStack
 -  React.useEffect(
 -    () =>
 -      navigation.addListener &&
--      navigation.addListener('tabPress', e => {
+-      navigation.addListener('tabPress', (e) => {
 -        const isFocused = navigation.isFocused();
 -
 -        // Run the operation in the next frame so we're sure all listeners have been run
@@ -113,9 +113,9 @@ 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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/types.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/types.tsx	2020-03-04 00:03:48.000000000 +0100
++++ src/vendor/types.tsx	2020-03-23 00:04:40.000000000 +0100
-@@ -7,13 +7,28 @@
+@@ -8,14 +8,28 @@
  } from 'react-native';
  import { EdgeInsets } from 'react-native-safe-area-context';
  import {
@@ -128,6 +128,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
 -  Route,
 -  NavigationHelpers,
 -  StackNavigationState,
+-  StackActionHelpers,
 -} from '@react-navigation/native';
 +  NavigationParams,
 +  NavigationNavigateAction,
@@ -150,7 +151,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
  
  export type StackNavigationEventMap = {
    /**
-@@ -26,42 +41,29 @@
+@@ -28,22 +42,29 @@
    transitionEnd: { data: { closing: boolean } };
  };
  
@@ -158,8 +159,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
 -  ParamListBase,
 -  StackNavigationEventMap
 ->;
+-
 +export type StackNavigationHelpers = NavigationProp<NavigationStackState>;
- 
  export type StackNavigationProp<
 -  ParamList extends ParamListBase,
 -  RouteName extends keyof ParamList = string
@@ -169,28 +170,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
 -  StackNavigationState,
 -  StackNavigationOptions,
 -  StackNavigationEventMap
--> & {
+-> &
--  /**
+-  StackActionHelpers<ParamList>;
--   * Push a new screen onto the stack.
--   *
--   * @param name Name of the route for the tab.
--   * @param [params] Params object for the route.
--   */
--  push<RouteName extends keyof ParamList>(
--    ...args: ParamList[RouteName] extends undefined | any
--      ? [RouteName] | [RouteName, ParamList[RouteName]]
--      : [RouteName, ParamList[RouteName]]
--  ): void;
--
--  /**
--   * Pop a screen from the stack.
--   */
--  pop(count?: number): void;
--
--  /**
--   * Pop to the first route in the stack, dismissing all other screens.
--   */
--  popToTop(): void;
 +  State = NavigationRoute,
 +  Params = NavigationParams
 +> = NavigationScreenProp<State, Params> & {
@@ -211,10 +192,11 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
 +    event: NavigationStackEventName,
 +    callback: NavigationEventCallback
 +  ) => NavigationEventSubscription;
- };
++};
  
  export type Layout = { width: number; height: number };
-@@ -237,24 +239,27 @@
+ 
+@@ -218,24 +239,27 @@
    /**
     * Navigation prop for the header.
     */
@@ -248,7 +230,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/types.tsx src/vendor/t
  export type StackNavigationOptions = StackHeaderOptions &
    Partial<TransitionPreset> & {
      /**
-@@ -332,6 +337,8 @@
+@@ -317,6 +341,8 @@
        bottom?: number;
        left?: number;
      };
@@ -257,20 +239,9 @@ 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/BorderlessButton.tsx src/vendor/views/BorderlessButton.tsx
---- ../../node_modules/@react-navigation/stack/src/views/BorderlessButton.tsx	2020-03-03 23:57:02.000000000 +0100
-+++ src/vendor/views/BorderlessButton.tsx	2020-03-04 00:03:48.000000000 +0100
-@@ -39,6 +39,7 @@
-     const { children, style, enabled, ...rest } = this.props;
- 
-     return (
-+      // @ts-ignore
-       <AnimatedBaseButton
-         {...rest}
-         onActiveStateChange={this.handleActiveStateChange}
 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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/Header.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Header/Header.tsx	2020-03-04 00:04:05.000000000 +0100
++++ src/vendor/views/Header/Header.tsx	2020-03-23 00:04:40.000000000 +0100
 @@ -1,12 +1,14 @@
  import * as React from 'react';
 -import { StackActions } from '@react-navigation/native';
@@ -350,8 +321,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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackButton.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderBackButton.tsx	2020-03-04 00:03:48.000000000 +0100
++++ src/vendor/views/Header/HeaderBackButton.tsx	2020-03-23 00:04:40.000000000 +0100
 @@ -8,9 +8,9 @@
    StyleSheet,
    LayoutChangeEvent,
@@ -364,8 +335,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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderBackground.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderBackground.tsx	2020-03-04 00:03:48.000000000 +0100
++++ src/vendor/views/Header/HeaderBackground.tsx	2020-03-23 00:04:40.000000000 +0100
 @@ -1,6 +1,6 @@
  import * as React from 'react';
  import { Animated, StyleSheet, Platform, ViewProps } from 'react-native';
@@ -375,8 +346,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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderContainer.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderContainer.tsx	2020-03-04 00:03:48.000000000 +0100
++++ src/vendor/views/Header/HeaderContainer.tsx	2020-03-23 00:04:40.000000000 +0100
 @@ -1,11 +1,6 @@
  import * as React from 'react';
  import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -428,8 +399,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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderSegment.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderSegment.tsx	2020-03-04 00:03:48.000000000 +0100
++++ src/vendor/views/Header/HeaderSegment.tsx	2020-03-23 00:04:40.000000000 +0100
 @@ -8,7 +8,7 @@
    ViewStyle,
  } from 'react-native';
@@ -449,24 +420,20 @@ 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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Header/HeaderTitle.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Header/HeaderTitle.tsx	2020-03-04 00:03:48.000000000 +0100
++++ src/vendor/views/Header/HeaderTitle.tsx	2020-03-23 00:04:40.000000000 +0100
-@@ -1,8 +1,8 @@
+@@ -1,6 +1,6 @@
  import * as React from 'react';
--import { Animated, StyleSheet, Platform, TextProps } from 'react-native';
+ import { Animated, StyleSheet, Platform } from 'react-native';
 -import { useTheme } from '@react-navigation/native';
-+import { Animated, StyleSheet, Platform } from 'react-native';
 +import useTheme from '../../../utils/useTheme';
  
--type Props = TextProps & {
+ type Props = React.ComponentProps<typeof Animated.Text> & {
-+type Props = React.ComponentProps<typeof Animated.Text> & {
    tintColor?: string;
-   children?: 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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Stack/Card.tsx	2020-03-04 00:03:48.000000000 +0100
++++ src/vendor/views/Stack/Card.tsx	2020-03-23 00:04:40.000000000 +0100
-@@ -133,7 +133,7 @@
+@@ -138,7 +138,7 @@
  
    private interactionHandle: number | undefined;
  
@@ -475,18 +442,9 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/Card.tsx s
  
    private animate = ({
      closing,
-@@ -507,7 +507,7 @@
-               ) : null}
-               <View
-                 ref={this.contentRef}
--                style={[styles.content, contentStyle]}
-+                style={[styles.content, contentStyle] as any}
-               >
-                 <StackGestureRefContext.Provider value={this.gestureRef}>
-                   <CardAnimationContext.Provider value={animationContext}>
 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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Stack/CardContainer.tsx	2020-03-04 13:24:38.000000000 +0100
++++ src/vendor/views/Stack/CardContainer.tsx	2020-03-23 00:04:40.000000000 +0100
 @@ -1,10 +1,16 @@
  import * as React from 'react';
  import { Animated, View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
@@ -506,7 +464,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContai
  
  type Props = TransitionPreset & {
    index: number;
-@@ -35,6 +41,7 @@
+@@ -36,6 +42,7 @@
      closing: boolean
    ) => void;
    onTransitionEnd?: (props: { route: Route<string> }, closing: boolean) => void;
@@ -514,7 +472,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContai
    onPageChangeStart?: () => void;
    onPageChangeConfirm?: () => void;
    onPageChangeCancel?: () => void;
-@@ -81,6 +88,7 @@
+@@ -83,6 +90,7 @@
    layout,
    onCloseRoute,
    onOpenRoute,
@@ -522,7 +480,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContai
    onPageChangeCancel,
    onPageChangeConfirm,
    onPageChangeStart,
-@@ -150,6 +158,9 @@
+@@ -152,6 +160,9 @@
      };
    }, [pointerEvents, scene.progress.next]);
  
@@ -532,7 +490,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardContai
    return (
      <Card
        index={index}
-@@ -180,7 +191,7 @@
+@@ -183,7 +194,7 @@
            ? { marginTop: headerHeight }
            : null
        }
@@ -542,8 +500,8 @@ 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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Stack/CardStack.tsx	2020-03-04 13:31:28.000000000 +0100
++++ src/vendor/views/Stack/CardStack.tsx	2020-03-23 00:04:40.000000000 +0100
 @@ -9,9 +9,8 @@
    ViewProps,
  } from 'react-native';
@@ -571,7 +529,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.
    onTransitionStart: (
      props: { route: Route<string> },
      closing: boolean
-@@ -371,6 +372,7 @@
+@@ -383,6 +384,7 @@
        renderHeader,
        renderScene,
        headerMode,
@@ -579,7 +537,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.
        onTransitionStart,
        onTransitionEnd,
        onPageChangeStart,
-@@ -546,6 +548,7 @@
+@@ -560,6 +562,7 @@
                    renderScene={renderScene}
                    onOpenRoute={onOpenRoute}
                    onCloseRoute={onCloseRoute}
@@ -588,8 +546,8 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/CardStack.
                    onTransitionEnd={onTransitionEnd}
                    gestureEnabled={index !== 0 && getGesturesEnabled({ route })}
 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-03 23:57:02.000000000 +0100
+--- ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx	2020-03-23 00:04:17.000000000 +0100
-+++ src/vendor/views/Stack/StackView.tsx	2020-03-04 13:24:28.000000000 +0100
++++ src/vendor/views/Stack/StackView.tsx	2020-03-23 00:07:11.000000000 +0100
 @@ -4,9 +4,9 @@
  import { GestureHandlerRootView } from 'react-native-gesture-handler';
  import {
@@ -655,10 +613,10 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
 +
    private handleOpenRoute = ({ route }: { route: Route<string> }) => {
 +    this.handleTransitionComplete({ route });
-     this.setState(state => ({
+     this.setState((state) => ({
        routes: state.replacingRouteKeys.length
-         ? state.routes.filter(r => !state.replacingRouteKeys.includes(r.key))
+         ? state.routes.filter((r) => !state.replacingRouteKeys.includes(r.key))
-@@ -315,12 +340,17 @@
+@@ -319,12 +344,17 @@
        // 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
@@ -668,20 +626,20 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
 -        target: state.key,
 -      });
 +      // @ts-ignore
-+      navigation.dispatch(StackActions.pop({ key: route.key }));
++      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);
++      const index = this.state.routes.findIndex((r) => r.key === route.key);
 +
 +      this.handleTransitionComplete({
 +        route: this.state.routes[Math.max(index - 1, 0)],
 +      });
 +
        // We need to clean up any state tracking the route and pop it immediately
-       this.setState(state => ({
+       this.setState((state) => ({
-         routes: state.routes.filter(r => r.key !== route.key),
+         routes: state.routes.filter((r) => r.key !== route.key),
-@@ -337,22 +367,24 @@
+@@ -341,22 +371,24 @@
    private handleTransitionStart = (
      { route }: { route: Route<string> },
      closing: boolean
@@ -718,7 +676,7 @@ diff -Naur ../../node_modules/@react-navigation/stack/src/views/Stack/StackView.
  
    render() {
      const {
-@@ -391,6 +423,7 @@
+@@ -395,6 +427,7 @@
                      closingRouteKeys={closingRouteKeys}
                      onOpenRoute={this.handleOpenRoute}
                      onCloseRoute={this.handleCloseRoute}

packages/stack/src/navigators/createStackNavigator.tsx

@@ -30,7 +30,7 @@ function createStackNavigator(
   return createNavigator(
     // TODO: don't have time to fix it right now
     // @ts-ignore
-    navigatorProps => <StackView {...navigatorProps} />,
+    (navigatorProps) => <StackView {...navigatorProps} />,
     router,
     stackConfig
   );

packages/stack/src/utils/validateDeprecatedConfig.tsx

@@ -58,7 +58,7 @@ export default function validateDeprecatedConfig(
 ) {
   let result = options;
 
-  Object.keys(validations).forEach(name => {
+  Object.keys(validations).forEach((name) => {
     if (name in config) {
       const { compat, message } = validations[name];
 

packages/stack/src/utils/validateDeprecatedOptions.tsx

@@ -12,10 +12,10 @@ const shownWarnings: string[] = [];
 
 const validations: Validation[] = [
   {
-    check: o => typeof o.headerForceInset === 'object',
+    check: (o) => typeof o.headerForceInset === 'object',
     deprecated: 'headerForceInset',
     updated: 'safeAreaInsets',
-    compat: o => {
+    compat: (o) => {
       const { headerForceInset, ...rest } = o;
 
       let safeAreaInsets: Partial<EdgeInsets> | undefined = {
@@ -55,20 +55,20 @@ const validations: Validation[] = [
     },
   },
   {
-    check: o => o.gesturesEnabled !== undefined,
+    check: (o) => o.gesturesEnabled !== undefined,
     deprecated: 'gesturesEnabled',
     updated: 'gestureEnabled',
-    compat: o => {
+    compat: (o) => {
       const { gesturesEnabled, ...rest } = o;
 
       return { ...rest, gestureEnabled: gesturesEnabled };
     },
   },
   {
-    check: o => o.header === null,
+    check: (o) => o.header === null,
     deprecated: 'header: null',
     updated: 'headerShown: false',
-    compat: o => {
+    compat: (o) => {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const { header, ...rest } = o;
 
@@ -76,26 +76,26 @@ const validations: Validation[] = [
     },
   },
   {
-    check: o => o.header != null && typeof o.header !== 'function',
+    check: (o) => o.header != null && typeof o.header !== 'function',
     deprecated: 'header: <SomeElement />',
     updated: 'header: () => <SomeElement />',
-    compat: o => ({ ...o, header: () => o.header }),
+    compat: (o) => ({ ...o, header: () => o.header }),
   },
   {
-    check: o =>
+    check: (o) =>
       o.headerTitle !== undefined &&
       typeof o.headerTitle !== 'string' &&
       typeof o.headerTitle !== 'function',
     deprecated: 'headerTitle: <SomeElement />',
     updated: 'headerTitle: () => <SomeElement />',
-    compat: o => ({ ...o, headerTitle: () => o.headerTitle }),
+    compat: (o) => ({ ...o, headerTitle: () => o.headerTitle }),
   },
   ...['headerLeft', 'headerRight', 'headerBackground', 'headerBackImage'].map(
     (p): Validation => ({
       check: (o: any) => o[p] !== undefined && typeof o[p] !== 'function',
       deprecated: `${p}: <SomeElement />`,
       updated: `${p}: () => <SomeElement />`,
-      compat: o => ({ ...o, [p]: () => o[p] }),
+      compat: (o) => ({ ...o, [p]: () => o[p] }),
     })
   ),
 ];
@@ -108,7 +108,7 @@ export default function validateDeprecatedOptions(
   const warnings: Validation[] = [];
 
   // Validate options to show warnings for deprecations
-  validations.forEach(v => {
+  validations.forEach((v) => {
     if (v.check(options)) {
       result = v.compat(result);
 
@@ -127,7 +127,7 @@ export default function validateDeprecatedOptions(
     console.warn(
       `Deprecation in 'navigationOptions':\n${warnings
         .map(
-          v =>
+          (v) =>
             `- '${v.deprecated}' will be removed in a future version. Use '${v.updated}' instead`
         )
         .join('\n')}`

packages/stack/src/vendor/types.tsx

@@ -1,3 +1,4 @@
+import * as React from 'react';
 import {
   Animated,
   StyleProp,
@@ -42,7 +43,6 @@ export type StackNavigationEventMap = {
 };
 
 export type StackNavigationHelpers = NavigationProp<NavigationStackState>;
-
 export type StackNavigationProp<
   State = NavigationRoute,
   Params = NavigationParams
@@ -124,7 +124,7 @@ export type StackHeaderOptions = {
   /**
    * Style object for the title component.
    */
-  headerTitleStyle?: StyleProp<TextStyle>;
+  headerTitleStyle?: React.ComponentProps<typeof Animated.Text>['style'];
   /**
    * Style object for the container of the `headerTitle` component, for example to add padding.
    * By default, `headerTitleContainerStyle` is with an absolute position style and offsets both `left` and `right`.
@@ -284,6 +284,10 @@ export type StackNavigationOptions = StackHeaderOptions &
      * Defaults to `true` on Android and `false` on iOS.
      */
     cardOverlayEnabled?: boolean;
+    /**
+     * Function that returns a React Element to display as a overlay for the card.
+     */
+    cardOverlay?: (props: { style: StyleProp<ViewStyle> }) => React.ReactNode;
     /**
      * Style object for the card in stack.
      * You can provide a custom background color to use instead of the default background here.
@@ -437,7 +441,7 @@ export type StackHeaderTitleProps = {
   /**
    * Style object for the title element.
    */
-  style?: StyleProp<TextStyle>;
+  style?: React.ComponentProps<typeof Animated.Text>['style'];
 };
 
 export type TransitionSpec =

packages/stack/src/vendor/utils/debounce.tsx

@@ -4,7 +4,7 @@ export default function debounce<T extends (...args: any[]) => void>(
 ): T {
   let timeout: NodeJS.Timeout | number | undefined;
 
-  return function(this: any, ...args) {
+  return function (this: any, ...args) {
     if (!timeout) {
       // eslint-disable-next-line babel/no-invalid-this
       func.apply(this, args);

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

@@ -32,7 +32,7 @@ export default class BorderlessButton extends React.Component<Props> {
       }).start();
     }
 
-    this.props.onActiveStateChange && this.props.onActiveStateChange(active);
+    this.props.onActiveStateChange?.(active);
   };
 
   render() {

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

@@ -118,7 +118,7 @@ export default function HeaderContainer({
               <View
                 onLayout={
                   onContentHeightChange
-                    ? e =>
+                    ? (e) =>
                         onContentHeightChange({
                           route: scene.route,
                           height: e.nativeEvent.layout.height,

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

@@ -38,7 +38,7 @@ type State = {
 };
 
 const warnIfHeaderStylesDefined = (styles: Record<string, any>) => {
-  Object.keys(styles).forEach(styleProp => {
+  Object.keys(styles).forEach((styleProp) => {
     const value = styles[styleProp];
 
     if (styleProp === 'position' && value === 'absolute') {

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

@@ -32,7 +32,8 @@ const styles = StyleSheet.create({
     },
     android: {
       fontSize: 20,
-      fontWeight: '500',
+      fontFamily: 'sans-serif-medium',
+      fontWeight: 'normal',
     },
     default: {
       fontSize: 18,

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { TextInput, Keyboard } from 'react-native';
+import { TextInput } from 'react-native';
 
 type Props = {
   enabled: boolean;
@@ -54,7 +54,11 @@ export default class KeyboardManager extends React.Component<Props> {
 
     this.clearKeyboardTimeout();
 
-    Keyboard.dismiss();
+    const input = this.previouslyFocusedTextInput;
+
+    if (input) {
+      TextInput.State.blurTextInput(input);
+    }
 
     // Cleanup the ID on successful page change
     this.previouslyFocusedTextInput = null;

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

@@ -30,7 +30,7 @@ type Props = {
 export default function SafeAreaProviderCompat({ children }: Props) {
   return (
     <SafeAreaConsumer>
-      {insets => {
+      {(insets) => {
         if (insets) {
           // If we already have insets, don't wrap the stack in another safe area provider
           // This avoids an issue with updates at the cost of potentially incorrect values

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

@@ -44,6 +44,7 @@ type Props = ViewProps & {
   onGestureCanceled?: () => void;
   onGestureEnd?: () => void;
   children: React.ReactNode;
+  overlay: (props: { style: StyleProp<ViewStyle> }) => React.ReactNode;
   overlayEnabled: boolean;
   shadowEnabled: boolean;
   gestureEnabled: boolean;
@@ -80,6 +81,10 @@ export default class Card extends React.Component<Props> {
     shadowEnabled: true,
     gestureEnabled: true,
     gestureVelocityImpact: GESTURE_VELOCITY_IMPACT,
+    overlay: ({ style }: { style: StyleProp<ViewStyle> }) =>
+      style ? (
+        <Animated.View pointerEvents="none" style={[styles.overlay, style]} />
+      ) : null,
   };
 
   componentDidMount() {
@@ -267,7 +272,9 @@ export default class Card extends React.Component<Props> {
         }
 
         const closing =
-          Math.abs(translation + velocity * gestureVelocityImpact) >
+          (translation + velocity) *
+            gestureVelocityImpact *
+            getInvertedMultiplier(gestureDirection) >
           distance / 2
             ? velocity !== 0 || translation !== 0
             : false;
@@ -409,6 +416,7 @@ export default class Card extends React.Component<Props> {
       next,
       layout,
       insets,
+      overlay,
       overlayEnabled,
       shadowEnabled,
       gestureEnabled,
@@ -470,55 +478,54 @@ export default class Card extends React.Component<Props> {
       : false;
 
     return (
-      <View pointerEvents="box-none" {...rest}>
+      <CardAnimationContext.Provider value={animationContext}>
-        {overlayEnabled && overlayStyle ? (
+        <View pointerEvents="box-none" {...rest}>
+          {overlayEnabled ? (
+            <View style={StyleSheet.absoluteFill}>
+              {overlay({ style: overlayStyle })}
+            </View>
+          ) : null}
           <Animated.View
-            pointerEvents="none"
+            style={[styles.container, containerStyle, customContainerStyle]}
-            style={[styles.overlay, overlayStyle]}
+            pointerEvents="box-none"
-          />
-        ) : null}
-        <Animated.View
-          style={[styles.container, containerStyle, customContainerStyle]}
-          pointerEvents="box-none"
-        >
-          <PanGestureHandler
-            ref={this.gestureRef}
-            enabled={layout.width !== 0 && gestureEnabled}
-            onGestureEvent={handleGestureEvent}
-            onHandlerStateChange={this.handleGestureStateChange}
-            {...this.gestureActivationCriteria()}
           >
-            <Animated.View style={[styles.container, cardStyle]}>
+            <PanGestureHandler
-              {shadowEnabled && shadowStyle && !isTransparent ? (
+              ref={this.gestureRef}
-                <Animated.View
+              enabled={layout.width !== 0 && gestureEnabled}
-                  style={[
+              onGestureEvent={handleGestureEvent}
-                    styles.shadow,
+              onHandlerStateChange={this.handleGestureStateChange}
-                    gestureDirection === 'horizontal'
+              {...this.gestureActivationCriteria()}
-                      ? [styles.shadowHorizontal, styles.shadowLeft]
+            >
-                      : gestureDirection === 'horizontal-inverted'
+              <Animated.View style={[styles.container, cardStyle]}>
-                      ? [styles.shadowHorizontal, styles.shadowRight]
+                {shadowEnabled && shadowStyle && !isTransparent ? (
-                      : gestureDirection === 'vertical'
+                  <Animated.View
-                      ? [styles.shadowVertical, styles.shadowTop]
+                    style={[
-                      : [styles.shadowVertical, styles.shadowBottom],
+                      styles.shadow,
-                    shadowStyle,
+                      gestureDirection === 'horizontal'
-                  ]}
+                        ? [styles.shadowHorizontal, styles.shadowLeft]
-                  pointerEvents="none"
+                        : gestureDirection === 'horizontal-inverted'
-                />
+                        ? [styles.shadowHorizontal, styles.shadowRight]
-              ) : null}
+                        : gestureDirection === 'vertical'
-              <View
+                        ? [styles.shadowVertical, styles.shadowTop]
-                ref={this.contentRef}
+                        : [styles.shadowVertical, styles.shadowBottom],
-                style={[styles.content, contentStyle] as any}
+                      shadowStyle,
-              >
+                    ]}
-                <StackGestureRefContext.Provider value={this.gestureRef}>
+                    pointerEvents="none"
-                  <CardAnimationContext.Provider value={animationContext}>
+                  />
+                ) : null}
+                <View
+                  ref={this.contentRef}
+                  style={[styles.content, contentStyle]}
+                >
+                  <StackGestureRefContext.Provider value={this.gestureRef}>
                     {children}
-                  </CardAnimationContext.Provider>
+                  </StackGestureRefContext.Provider>
-                </StackGestureRefContext.Provider>
+                </View>
-              </View>
+              </Animated.View>
-            </Animated.View>
+            </PanGestureHandler>
-          </PanGestureHandler>
+          </Animated.View>
-        </Animated.View>
+        </View>
-      </View>
+      </CardAnimationContext.Provider>
     );
   }
 }
@@ -532,7 +539,7 @@ const styles = StyleSheet.create({
     overflow: 'hidden',
   },
   overlay: {
-    ...StyleSheet.absoluteFillObject,
+    flex: 1,
     backgroundColor: '#000',
   },
   shadow: {

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

@@ -25,6 +25,7 @@ type Props = TransitionPreset & {
   safeAreaInsetRight: number;
   safeAreaInsetBottom: number;
   safeAreaInsetLeft: number;
+  cardOverlay?: (props: { style: StyleProp<ViewStyle> }) => React.ReactNode;
   cardOverlayEnabled?: boolean;
   cardShadowEnabled?: boolean;
   cardStyle?: StyleProp<ViewStyle>;
@@ -65,6 +66,7 @@ const EPSILON = 0.1;
 
 function CardContainer({
   active,
+  cardOverlay,
   cardOverlayEnabled,
   cardShadowEnabled,
   cardStyle,
@@ -173,6 +175,7 @@ function CardContainer({
       closing={closing}
       onOpen={handleOpen}
       onClose={handleClose}
+      overlay={cardOverlay}
       overlayEnabled={cardOverlayEnabled}
       shadowEnabled={cardShadowEnabled}
       onTransitionStart={handleTransitionStart}

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

@@ -76,9 +76,6 @@ type State = {
 
 const EPSILON = 0.01;
 
-const dimensions = Dimensions.get('window');
-const layout = { width: dimensions.width, height: dimensions.height };
-
 const MaybeScreenContainer = ({
   enabled,
   ...rest
@@ -161,7 +158,16 @@ const getProgressFromGesture = (
   layout: Layout,
   descriptor?: StackDescriptor
 ) => {
-  const distance = getDistanceFromOptions(mode, layout, descriptor);
+  const distance = getDistanceFromOptions(
+    mode,
+    {
+      // Make sure that we have a non-zero distance, otherwise there will be incorrect progress
+      // This causes blank screen on web if it was previously inside container with display: none
+      width: Math.max(1, layout.width),
+      height: Math.max(1, layout.height),
+    },
+    descriptor
+  );
 
   if (distance > 0) {
     return gesture.interpolate({
@@ -291,19 +297,25 @@ export default class CardStack extends React.Component<Props, State> {
     };
   }
 
-  state: State = {
+  constructor(props: Props) {
-    routes: [],
+    super(props);
-    scenes: [],
+
-    gestures: {},
+    const { height = 0, width = 0 } = Dimensions.get('window');
-    layout,
+
-    descriptors: this.props.descriptors,
+    this.state = {
-    // Used when card's header is null and mode is float to make transition
+      routes: [],
-    // between screens with headers and those without headers smooth.
+      scenes: [],
-    // This is not a great heuristic here. We don't know synchronously
+      gestures: {},
-    // on mount what the header height is so we have just used the most
+      layout: { height, width },
-    // common cases here.
+      descriptors: this.props.descriptors,
-    headerHeights: {},
+      // Used when card's header is null and mode is float to make transition
-  };
+      // between screens with headers and those without headers smooth.
+      // This is not a great heuristic here. We don't know synchronously
+      // on mount what the header height is so we have just used the most
+      // common cases here.
+      headerHeights: {},
+    };
+  }
 
   private handleLayout = (e: LayoutChangeEvent) => {
     const { height, width } = e.nativeEvent.layout;
@@ -403,9 +415,9 @@ export default class CardStack extends React.Component<Props, State> {
       left = insets.left,
     } = focusedOptions.safeAreaInsets || {};
 
-    // Screens is buggy on iOS, so we don't enable it there
+    // Screens is buggy on iOS and web, so we only enable it on Android
     // For modals, usually we want the screen underneath to be visible, so also disable it there
-    const isScreensEnabled = Platform.OS !== 'ios' && mode !== 'modal';
+    const isScreensEnabled = Platform.OS === 'android' && mode !== 'modal';
 
     return (
       <React.Fragment>
@@ -433,6 +445,7 @@ export default class CardStack extends React.Component<Props, State> {
               headerTransparent,
               cardShadowEnabled,
               cardOverlayEnabled,
+              cardOverlay,
               cardStyle,
               animationEnabled,
               gestureResponseDistance,
@@ -530,6 +543,7 @@ export default class CardStack extends React.Component<Props, State> {
                   safeAreaInsetRight={safeAreaInsetRight}
                   safeAreaInsetBottom={safeAreaInsetBottom}
                   safeAreaInsetLeft={safeAreaInsetLeft}
+                  cardOverlay={cardOverlay}
                   cardOverlayEnabled={cardOverlayEnabled}
                   cardShadowEnabled={cardShadowEnabled}
                   cardStyle={cardStyle}

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

@@ -117,7 +117,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.find((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
 
@@ -130,17 +130,17 @@ export default class StackView extends React.Component<Props, State> {
           openingRouteKeys = [...openingRouteKeys, nextFocusedRoute.key];
 
           closingRouteKeys = closingRouteKeys.filter(
-            key => key !== nextFocusedRoute.key
+            (key) => key !== nextFocusedRoute.key
           );
           replacingRouteKeys = replacingRouteKeys.filter(
-            key => key !== nextFocusedRoute.key
+            (key) => key !== nextFocusedRoute.key
           );
 
-          if (!routes.find(r => r.key === previousFocusedRoute.key)) {
+          if (!routes.find((r) => r.key === previousFocusedRoute.key)) {
             // The previous focused route isn't present in state, we treat this as a replace
 
             openingRouteKeys = openingRouteKeys.filter(
-              key => key !== previousFocusedRoute.key
+              (key) => key !== previousFocusedRoute.key
             );
 
             if (getAnimationTypeForReplace(nextFocusedRoute.key) === 'pop') {
@@ -153,7 +153,7 @@ export default class StackView extends React.Component<Props, State> {
               // But since user configured it to animate the old screen like a pop, we need to add this without animation
               // So remove it from `openingRouteKeys` which will remove the animation
               openingRouteKeys = openingRouteKeys.filter(
-                key => key !== nextFocusedRoute.key
+                (key) => key !== nextFocusedRoute.key
               );
 
               // Keep the route being removed at the end to animate it out
@@ -165,7 +165,7 @@ export default class StackView extends React.Component<Props, State> {
               ];
 
               closingRouteKeys = closingRouteKeys.filter(
-                key => key !== previousFocusedRoute.key
+                (key) => key !== previousFocusedRoute.key
               );
 
               // Keep the old route in the state because it's visible under the new route, and removing it will feel abrupt
@@ -176,7 +176,7 @@ export default class StackView extends React.Component<Props, State> {
             }
           }
         }
-      } else if (!routes.find(r => r.key === previousFocusedRoute.key)) {
+      } else if (!routes.find((r) => r.key === previousFocusedRoute.key)) {
         // The previously focused route was removed, we treat this as a pop
 
         if (
@@ -188,10 +188,10 @@ export default class StackView extends React.Component<Props, State> {
           // Sometimes a route can be closed before the opening animation finishes
           // So we also need to remove it from the opening list
           openingRouteKeys = openingRouteKeys.filter(
-            key => key !== previousFocusedRoute.key
+            (key) => key !== previousFocusedRoute.key
           );
           replacingRouteKeys = replacingRouteKeys.filter(
-            key => key !== previousFocusedRoute.key
+            (key) => key !== previousFocusedRoute.key
           );
 
           // Keep a copy of route being removed in the state to be able to animate it
@@ -273,13 +273,13 @@ export default class StackView extends React.Component<Props, State> {
   private getPreviousRoute = ({ route }: { route: Route<string> }) => {
     const { closingRouteKeys, replacingRouteKeys } = this.state;
     const routes = this.state.routes.filter(
-      r =>
+      (r) =>
         r.key === route.key ||
         (!closingRouteKeys.includes(r.key) &&
           !replacingRouteKeys.includes(r.key))
     );
 
-    const index = routes.findIndex(r => r.key === route.key);
+    const index = routes.findIndex((r) => r.key === route.key);
 
     return routes[index - 1];
   };
@@ -323,12 +323,16 @@ export default class StackView extends React.Component<Props, State> {
 
   private handleOpenRoute = ({ route }: { route: Route<string> }) => {
     this.handleTransitionComplete({ route });
-    this.setState(state => ({
+    this.setState((state) => ({
       routes: state.replacingRouteKeys.length
-        ? state.routes.filter(r => !state.replacingRouteKeys.includes(r.key))
+        ? state.routes.filter((r) => !state.replacingRouteKeys.includes(r.key))
         : state.routes,
-      openingRouteKeys: state.openingRouteKeys.filter(key => key !== route.key),
+      openingRouteKeys: state.openingRouteKeys.filter(
-      closingRouteKeys: state.closingRouteKeys.filter(key => key !== route.key),
+        (key) => key !== route.key
+      ),
+      closingRouteKeys: state.closingRouteKeys.filter(
+        (key) => key !== route.key
+      ),
       replacingRouteKeys: [],
     }));
   };
@@ -336,29 +340,29 @@ export default class StackView extends React.Component<Props, State> {
   private handleCloseRoute = ({ route }: { route: Route<string> }) => {
     const { state, navigation } = this.props;
 
-    if (state.routes.find(r => r.key === route.key)) {
+    if (state.routes.find((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 }));
+      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);
+      const index = this.state.routes.findIndex((r) => r.key === route.key);
 
       this.handleTransitionComplete({
         route: this.state.routes[Math.max(index - 1, 0)],
       });
 
       // We need to clean up any state tracking the route and pop it immediately
-      this.setState(state => ({
+      this.setState((state) => ({
-        routes: state.routes.filter(r => r.key !== route.key),
+        routes: state.routes.filter((r) => r.key !== route.key),
         openingRouteKeys: state.openingRouteKeys.filter(
-          key => key !== route.key
+          (key) => key !== route.key
         ),
         closingRouteKeys: state.closingRouteKeys.filter(
-          key => key !== route.key
+          (key) => key !== route.key
         ),
       }));
     }
@@ -410,9 +414,9 @@ export default class StackView extends React.Component<Props, State> {
       <GestureHandlerWrapper style={styles.container}>
         <SafeAreaProviderCompat>
           <SafeAreaConsumer>
-            {insets => (
+            {(insets) => (
               <KeyboardManager enabled={keyboardHandlingEnabled !== false}>
-                {props => (
+                {(props) => (
                   <CardStack
                     mode={mode}
                     insets={insets as EdgeInsets}

packages/tabs/CHANGELOG.md

@@ -3,6 +3,52 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.8.7](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.6...react-navigation-tabs@2.8.7) (2020-03-22)
+
+**Note:** Version bump only for package react-navigation-tabs
+
+
+
+
+
+## [2.8.6](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.5...react-navigation-tabs@2.8.6) (2020-03-20)
+
+**Note:** Version bump only for package react-navigation-tabs
+
+
+
+
+
+## [2.8.5](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.4...react-navigation-tabs@2.8.5) (2020-03-19)
+
+
+### Bug Fixes
+
+* don't use react-native-screens on web ([44c3900](https://github.com/react-navigation/tabs/commit/44c390075f7b76664e09fd9a1a7926645133ebec)), closes [#7485](https://github.com/react-navigation/tabs/issues/7485)
+
+
+
+
+
+## [2.8.4](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.3...react-navigation-tabs@2.8.4) (2020-03-16)
+
+
+### Bug Fixes
+
+* downgrade react-native-safe-area-view ([cfc1bac](https://github.com/react-navigation/tabs/commit/cfc1bac4e153db4a4ba3f2a9033f77b53367fcbc)), closes [#7813](https://github.com/react-navigation/tabs/issues/7813)
+
+
+
+
+
+## [2.8.3](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.2...react-navigation-tabs@2.8.3) (2020-03-16)
+
+**Note:** Version bump only for package react-navigation-tabs
+
+
+
+
+
 ## [2.8.2](https://github.com/react-navigation/tabs/compare/react-navigation-tabs@2.8.1...react-navigation-tabs@2.8.2) (2020-02-26)
 
 **Note:** Version bump only for package react-navigation-tabs

packages/tabs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-navigation-tabs",
-  "version": "2.8.2",
+  "version": "2.8.7",
   "description": "Tab Navigation components for React Navigation",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -42,21 +42,21 @@
   "dependencies": {
     "hoist-non-react-statics": "^3.3.2",
     "react-lifecycles-compat": "^3.0.4",
-    "react-native-safe-area-view": "^0.14.6",
+    "react-native-safe-area-view": "^0.14.8",
     "react-native-tab-view": "^2.11.0"
   },
   "devDependencies": {
-    "@react-native-community/bob": "^0.9.7",
+    "@react-native-community/bob": "^0.10.0",
     "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/react": "^16.9.22",
+    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.17",
+    "@types/react-native": "^0.61.22",
     "del-cli": "^3.0.0",
     "react": "~16.9.0",
     "react-native": "~0.61.5",
     "react-native-gesture-handler": "^1.6.0",
     "react-native-reanimated": "^1.2.0",
     "react-native-tab-view": "^2.13.0",
-    "react-navigation": "^4.2.2",
+    "react-navigation": "^4.3.3",
     "typescript": "~3.7.5"
   },
   "peerDependencies": {
@@ -64,7 +64,7 @@
     "react-native": "*",
     "react-native-gesture-handler": "^1.0.0",
     "react-native-reanimated": "^1.0.0-alpha",
-    "react-native-screens": "^1.0.0 || ^1.0.0-alpha",
+    "react-native-screens": ">=1.0.0 || >= 2.0.0-alpha.0 || >= 2.0.0-beta.0 || >= 2.0.0",
     "react-navigation": "^4.1.1"
   },
   "@react-native-community/bob": {

packages/tabs/src/navigators/createBottomTabNavigator.tsx

@@ -131,7 +131,9 @@ class TabNavigationView extends React.PureComponent<Props, State> {
   _jumpTo = (key: string) => {
     const { navigation, onIndexChange } = this.props;
 
-    const index = navigation.state.routes.findIndex(route => route.key === key);
+    const index = navigation.state.routes.findIndex(
+      (route) => route.key === key
+    );
 
     onIndexChange(index);
   };

packages/tabs/src/navigators/createMaterialTopTabNavigator.tsx

@@ -134,12 +134,12 @@ class MaterialTabView extends React.PureComponent<Props> {
         renderTabBar={this.renderTabBar}
         renderLazyPlaceholder={
           lazyPlaceholderComponent !== undefined
-            ? props => React.createElement(lazyPlaceholderComponent, props)
+            ? (props) => React.createElement(lazyPlaceholderComponent, props)
             : undefined
         }
         renderPager={
           pagerComponent !== undefined
-            ? props => React.createElement(pagerComponent, props)
+            ? (props) => React.createElement(pagerComponent, props)
             : undefined
         }
       />

packages/tabs/src/views/ResourceSavingScene.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { Platform, StyleSheet, View } from 'react-native';
-
 import { Screen, screensEnabled } from 'react-native-screens';
 
 type Props = {
@@ -9,12 +8,14 @@ type Props = {
   style?: any;
 };
 
-const FAR_FAR_AWAY = 3000; // this should be big enough to move the whole view out of its container
+const FAR_FAR_AWAY = 30000; // this should be big enough to move the whole view out of its container
 
 export default class ResourceSavingScene extends React.Component<Props> {
   render() {
-    if (screensEnabled?.()) {
+    // react-native-screens is buggy on web
+    if (screensEnabled?.() && Platform.OS !== 'web') {
       const { isVisible, ...rest } = this.props;
+
       // @ts-ignore
       return <Screen active={isVisible ? 1 : 0} {...rest} />;
     }
@@ -23,7 +24,13 @@ export default class ResourceSavingScene extends React.Component<Props> {
 
     return (
       <View
-        style={[styles.container, style, { opacity: isVisible ? 1 : 0 }]}
+        style={[
+          styles.container,
+          Platform.OS === 'web'
+            ? { display: isVisible ? 'flex' : 'none' }
+            : null,
+          style,
+        ]}
         collapsable={false}
         removeClippedSubviews={
           // On iOS, set removeClippedSubviews to true only when not focused

scripts/check-types-path.js

@@ -9,7 +9,7 @@ const packages = path.join(__dirname, '..', 'packages');
 
 const invalid = [];
 
-fs.readdirSync(packages).forEach(name => {
+fs.readdirSync(packages).forEach((name) => {
   const dir = path.join(packages, name);
 
   if (fs.statSync(path.join(packages, name)).isDirectory()) {
@@ -26,6 +26,6 @@ fs.readdirSync(packages).forEach(name => {
 if (invalid.length) {
   console.log(
     'Found invalid path to type definitions in the following packages:\n',
-    invalid.map(p => `- ${p.name} (${p.types})`).join('\n')
+    invalid.map((p) => `- ${p.name} (${p.types})`).join('\n')
   );
 }