chore: publish

- @react-navigation/bottom-tabs@5.4.0 - @react-navigation/compat@5.1.16 - @react-navigation/core@5.5.1 - @react-navigation/drawer@5.7.0 - @react-navigation/material-bottom-tabs@5.2.0 - @react-navigation/material-top-tabs@5.2.0 - @react-navigation/native@5.2.5 - @react-navigation/routers@5.4.3 - @react-navigation/stack@5.3.0
feat: use links in bottom navigation tabs
2026-01-13 22:42:25 +08:00 · 2020-05-08 16:34:03 +02:00 · 2020-05-08 16:11:24 +02:00 · 2020-05-08 16:06:28 +02:00 · 2020-05-08 03:19:47 +02:00 · 2020-05-07 21:08:55 +02:00
48 changed files with 2950 additions and 1118 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,89 +1,96 @@
-version: 2
+version: 2.1

-defaults: &defaults
-  docker:
-    - image: circleci/node:10
-  working_directory: ~/project
+executors:
+  default:
+    docker:
+      - image: circleci/node:10
+    working_directory: ~/project
+    environment:
+      YARN_CACHE_FOLDER: "~/.cache/yarn"
+
+commands:
+  attach_project:
+    steps:
+      - attach_workspace:
+          at: ~/project

 jobs:
  install-dependencies:
-    <<: *defaults
+    executor: default
    steps:
      - checkout
-      - attach_workspace:
-          at: ~/project
+      - attach_project
      - restore_cache:
          keys:
-            - v1-dependencies-{{ checksum "yarn.lock" }}
-            - v1-dependencies-
+            - v2-dependencies-{{ checksum "yarn.lock" }}
+            - v2-dependencies-
      - run:
          name: Install project dependencies
          command: yarn install --frozen-lockfile
      - save_cache:
-          key: v1-dependencies-{{ checksum "yarn.lock" }}
-          paths: node_modules
+          key: v2-dependencies-{{ checksum "yarn.lock" }}
+          paths: ~/.cache/yarn
      - persist_to_workspace:
          root: .
          paths: .
+
  lint-and-typecheck:
-      <<: *defaults
-      steps:
-        - attach_workspace:
-            at: ~/project
-        - run:
-            name: Lint files
-            command: yarn lint
-        - run:
-            name: Typecheck files
-            command: yarn typescript
+    executor: default
+    steps:
+      - attach_project
+      - run:
+          name: Lint files
+          command: yarn lint
+      - run:
+          name: Typecheck files
+          command: yarn typescript
+
  unit-tests:
-      <<: *defaults
-      steps:
-        - attach_workspace:
-            at: ~/project
-        - run:
-            name: Run unit tests
-            command: yarn test --coverage
-        - run:
-            name: Upload test coverage
-            command: cat ./coverage/lcov.info | ./node_modules/.bin/codecov
-        - store_artifacts:
-            path: coverage
-            destination: coverage
+    executor: default
+    steps:
+      - attach_project
+      - run:
+          name: Run unit tests
+          command: yarn test --coverage
+      - run:
+          name: Upload test coverage
+          command: cat ./coverage/lcov.info | ./node_modules/.bin/codecov
+      - store_artifacts:
+          path: coverage
+          destination: coverage
+
  integration-tests:
-      <<: *defaults
-      steps:
-        - attach_workspace:
-            at: ~/project
-        - run:
-            name: Install Headless Chrome dependencies
-            command: |
-              sudo apt-get install -yq \
-              gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
-              libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
-              libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \
-              libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates \
-              fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
-        - run:
-            name: Build example for web
-            command: yarn example expo build:web --no-pwa
-        - run:
-            name: Run integration tests
-            command: yarn example test --maxWorkers=2
+    executor: default
+    steps:
+      - attach_project
+      - run:
+          name: Install Headless Chrome dependencies
+          command: |
+            sudo apt-get install -yq \
+            gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
+            libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
+            libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \
+            libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates \
+            fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
+      - run:
+          name: Build example for web
+          command: yarn example expo build:web --no-pwa
+      - run:
+          name: Run integration tests
+          command: yarn example test --maxWorkers=2
+
  build-packages:
-      <<: *defaults
-      steps:
-        - attach_workspace:
-            at: ~/project
-        - run:
-            name: Build packages in the monorepo
-            command: yarn lerna run prepare
-        - run:
-            name: Verify paths for types
-            command: node scripts/check-types-path.js
+    executor: default
+    steps:
+      - attach_project
+      - run:
+          name: Build packages in the monorepo
+          command: yarn lerna run prepare
+      - run:
+          name: Verify paths for types
+          command: node scripts/check-types-path.js

 workflows:
-  version: 2
  build-and-test:
    jobs:
      - install-dependencies
--- a/example/package.json
+++ b/example/package.json
@@ -12,33 +12,33 @@
    "test": "jest"
  },
  "dependencies": {
-    "@expo/vector-icons": "^10.0.0",
-    "@react-native-community/masked-view": "^0.1.7",
+    "@expo/vector-icons": "^10.2.0",
+    "@react-native-community/masked-view": "^0.1.10",
    "color": "^3.1.2",
-    "expo": "^37.0.0",
+    "expo": "^37.0.8",
    "expo-asset": "~8.1.3",
    "expo-blur": "~8.1.0",
    "react": "~16.9.0",
    "react-dom": "~16.9.0",
    "react-native": "~0.61.5",
    "react-native-gesture-handler": "^1.6.0",
-    "react-native-paper": "^3.7.0",
-    "react-native-reanimated": "^1.7.0",
-    "react-native-restart": "^0.0.14",
+    "react-native-paper": "^3.10.1",
+    "react-native-reanimated": "^1.8.0",
+    "react-native-restart": "^0.0.15",
    "react-native-safe-area-context": "^0.7.3",
-    "react-native-screens": "^2.3.0",
+    "react-native-screens": "^2.7.0",
    "react-native-tab-view": "2.14.0",
-    "react-native-unimodules": "~0.8.1",
+    "react-native-unimodules": "~0.9.1",
    "react-native-web": "^0.11.7"
  },
  "devDependencies": {
    "@expo/webpack-config": "^0.11.19",
    "@types/jest-dev-server": "^4.2.0",
-    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.60.22",
+    "@types/react": "^16.9.34",
+    "@types/react-native": "^0.62.7",
    "babel-preset-expo": "^8.1.0",
-    "expo-cli": "^3.17.18",
-    "jest": "^25.2.7",
+    "expo-cli": "^3.20.1",
+    "jest": "^26.0.1",
    "jest-dev-server": "^4.4.0",
    "playwright": "^0.14.0",
    "serve": "^11.3.0",
--- a/example/webpack.config.js
+++ b/example/webpack.config.js
@@ -24,7 +24,7 @@ module.exports = async function (env, argv) {
  );

  Object.assign(config.resolve.alias, {
-    react: path.resolve(node_modules, 'react'),
+    'react': path.resolve(node_modules, 'react'),
    'react-native': path.resolve(node_modules, 'react-native-web'),
    'react-native-web': path.resolve(node_modules, 'react-native-web'),
    '@expo/vector-icons': path.resolve(node_modules, '@expo/vector-icons'),
--- a/package.json
+++ b/package.json
@@ -27,23 +27,23 @@
  "devDependencies": {
    "@babel/plugin-proposal-class-properties": "^7.8.3",
    "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-env": "^7.9.6",
    "@babel/preset-flow": "^7.9.0",
    "@babel/preset-react": "^7.9.4",
    "@babel/preset-typescript": "^7.9.0",
-    "@babel/runtime": "^7.9.2",
+    "@babel/runtime": "^7.9.6",
    "@commitlint/config-conventional": "^8.3.4",
    "@types/jest": "^25.2.1",
-    "babel-jest": "^25.2.6",
+    "babel-jest": "^26.0.1",
    "codecov": "^3.6.5",
    "commitlint": "^8.3.5",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
    "eslint": "^6.8.0",
-    "eslint-config-satya164": "^3.1.6",
-    "husky": "^4.2.3",
-    "jest": "^25.2.7",
+    "eslint-config-satya164": "^3.1.7",
+    "husky": "^4.2.5",
+    "jest": "^26.0.1",
    "lerna": "^3.20.2",
-    "prettier": "^2.0.4",
+    "prettier": "^2.0.5",
    "typescript": "^3.8.3"
  },
  "resolutions": {
--- a/packages/bottom-tabs/CHANGELOG.md
+++ b/packages/bottom-tabs/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.

+# [5.4.0](https://github.com/react-navigation/react-navigation/tree/master/packages/bottom-tabs/compare/@react-navigation/bottom-tabs@5.3.4...@react-navigation/bottom-tabs@5.4.0) (2020-05-08)
+
+
+### Features
+
+* add generic type aliases for screen props ([bea14aa](https://github.com/react-navigation/react-navigation/tree/master/packages/bottom-tabs/commit/bea14aa26fd5cbfebc7973733c5cf1f44fd323aa)), closes [#7971](https://github.com/react-navigation/react-navigation/tree/master/packages/bottom-tabs/issues/7971)
+
+
+
+
+
+## [5.3.4](https://github.com/react-navigation/react-navigation/tree/master/packages/bottom-tabs/compare/@react-navigation/bottom-tabs@5.3.3...@react-navigation/bottom-tabs@5.3.4) (2020-05-05)
+
+**Note:** Version bump only for package @react-navigation/bottom-tabs
+
+
+
+
+
 ## [5.3.3](https://github.com/react-navigation/react-navigation/tree/master/packages/bottom-tabs/compare/@react-navigation/bottom-tabs@5.3.2...@react-navigation/bottom-tabs@5.3.3) (2020-05-01)

 **Note:** Version bump only for package @react-navigation/bottom-tabs
--- a/packages/bottom-tabs/package.json
+++ b/packages/bottom-tabs/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/bottom-tabs",
  "description": "Bottom tab navigator following iOS design guidelines",
-  "version": "5.3.3",
+  "version": "5.4.0",
  "keywords": [
    "react-native-component",
    "react-component",
@@ -34,16 +34,16 @@
    "react-native-iphone-x-helper": "^1.2.1"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
-    "@react-navigation/native": "^5.2.3",
+    "@react-native-community/bob": "^0.13.0",
+    "@react-navigation/native": "^5.2.5",
    "@types/color": "^3.0.1",
-    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.22",
+    "@types/react": "^16.9.34",
+    "@types/react-native": "^0.62.7",
    "del-cli": "^3.0.0",
    "react": "~16.9.0",
    "react-native": "~0.61.5",
    "react-native-safe-area-context": "^0.7.3",
-    "react-native-screens": "^2.3.0",
+    "react-native-screens": "^2.7.0",
    "typescript": "^3.8.3"
  },
  "peerDependencies": {
--- a/packages/bottom-tabs/src/index.tsx
+++ b/packages/bottom-tabs/src/index.tsx
@@ -15,6 +15,7 @@ export { default as BottomTabBar } from './views/BottomTabBar';
 export type {
  BottomTabNavigationOptions,
  BottomTabNavigationProp,
+  BottomTabScreenProps,
  BottomTabBarProps,
  BottomTabBarOptions,
 } from './types';
--- a/packages/bottom-tabs/src/types.tsx
+++ b/packages/bottom-tabs/src/types.tsx
@@ -13,6 +13,7 @@ import {
  Descriptor,
  TabNavigationState,
  TabActionHelpers,
+  RouteProp,
 } from '@react-navigation/native';

 export type BottomTabNavigationEventMap = {
@@ -45,6 +46,14 @@ export type BottomTabNavigationProp<
 > &
  TabActionHelpers<ParamList>;

+export type BottomTabScreenProps<
+  ParamList extends ParamListBase,
+  RouteName extends keyof ParamList = string
+> = {
+  navigation: BottomTabNavigationProp<ParamList, RouteName>;
+  route: RouteProp<ParamList, RouteName>;
+};
+
 export type BottomTabNavigationOptions = {
  /**
   * Title text for the screen.
--- a/packages/compat/CHANGELOG.md
+++ b/packages/compat/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [5.1.16](https://github.com/react-navigation/react-navigation/tree/master/packages/compat/compare/@react-navigation/compat@5.1.15...@react-navigation/compat@5.1.16) (2020-05-08)
+
+**Note:** Version bump only for package @react-navigation/compat
+
+
+
+
+
+## [5.1.15](https://github.com/react-navigation/react-navigation/tree/master/packages/compat/compare/@react-navigation/compat@5.1.14...@react-navigation/compat@5.1.15) (2020-05-05)
+
+**Note:** Version bump only for package @react-navigation/compat
+
+
+
+
+
 ## [5.1.14](https://github.com/react-navigation/react-navigation/tree/master/packages/compat/compare/@react-navigation/compat@5.1.13...@react-navigation/compat@5.1.14) (2020-05-01)

 **Note:** Version bump only for package @react-navigation/compat
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/compat",
  "description": "Compatibility layer to write navigator definitions in static configuration format",
-  "version": "5.1.14",
+  "version": "5.1.16",
  "license": "MIT",
  "repository": "https://github.com/react-navigation/react-navigation/tree/master/packages/compat",
  "bugs": {
@@ -25,9 +25,9 @@
    "clean": "del lib"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
-    "@react-navigation/native": "^5.2.3",
-    "@types/react": "^16.9.23",
+    "@react-native-community/bob": "^0.13.0",
+    "@react-navigation/native": "^5.2.5",
+    "@types/react": "^16.9.34",
    "react": "~16.9.0",
    "typescript": "^3.8.3"
  },
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [5.5.1](https://github.com/react-navigation/react-navigation/tree/master/packages/core/compare/@react-navigation/core@5.5.0...@react-navigation/core@5.5.1) (2020-05-08)
+
+
+### Bug Fixes
+
+* avoid cleaning up state when a new navigator is mounted. fixes [#8195](https://github.com/react-navigation/react-navigation/tree/master/packages/core/issues/8195) ([f6d0676](https://github.com/react-navigation/react-navigation/tree/master/packages/core/commit/f6d06768d3c36d1f5beaffcb660f3c259209f2e7))
+
+
+
+
+
+# [5.5.0](https://github.com/react-navigation/react-navigation/tree/master/packages/core/compare/@react-navigation/core@5.4.0...@react-navigation/core@5.5.0) (2020-05-05)
+
+
+### Features
+
+* add support for optional params to linking ([#8196](https://github.com/react-navigation/react-navigation/tree/master/packages/core/issues/8196)) ([fcd1cc6](https://github.com/react-navigation/react-navigation/tree/master/packages/core/commit/fcd1cc64c151e4941f3f544a54b5048d853821f6))
+* support params anywhere in path segement ([#8184](https://github.com/react-navigation/react-navigation/tree/master/packages/core/issues/8184)) ([3999fc2](https://github.com/react-navigation/react-navigation/tree/master/packages/core/commit/3999fc28365c3a06a17d963c7be7fb7e897f99e0))
+
+
+
+
+
 # [5.4.0](https://github.com/react-navigation/react-navigation/tree/master/packages/core/compare/@react-navigation/core@5.3.5...@react-navigation/core@5.4.0) (2020-04-30)


--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/core",
  "description": "Core utilities for building navigators",
-  "version": "5.4.0",
+  "version": "5.5.1",
  "keywords": [
    "react",
    "react-native",
@@ -29,21 +29,21 @@
    "clean": "del lib"
  },
  "dependencies": {
-    "@react-navigation/routers": "^5.4.2",
-    "escape-string-regexp": "^2.0.0",
-    "nanoid": "^3.0.2",
-    "query-string": "^6.12.0",
+    "@react-navigation/routers": "^5.4.3",
+    "escape-string-regexp": "^4.0.0",
+    "nanoid": "^3.1.5",
+    "query-string": "^6.12.1",
    "react-is": "^16.13.0",
    "use-subscription": "^1.4.0"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
-    "@types/react": "^16.9.23",
+    "@react-native-community/bob": "^0.13.0",
+    "@types/react": "^16.9.34",
    "@types/react-is": "^16.7.1",
    "@types/use-subscription": "^1.0.0",
    "del-cli": "^3.0.0",
    "react": "~16.9.0",
-    "react-native-testing-library": "^1.12.0",
+    "react-native-testing-library": "^1.13.2",
    "react-test-renderer": "~16.13.1",
    "typescript": "^3.8.3"
  },
--- a/packages/core/src/tests/getStateFromPath.test.tsx
+++ b/packages/core/src/tests/getStateFromPath.test.tsx
@@ -984,3 +984,796 @@ it('handles not taking path with too many segments', () => {
    state
  );
 });
+
+it('handles differently ordered params v1', () => {
+  const path = '/foos/5/res/20';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foos/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/res/:pwd',
+          parse: {
+            id: Number,
+            pwd: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, pwd: 20 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handles differently ordered params v2', () => {
+  const path = '/5/20/foos/res';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foos/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: ':id/:pwd/foos/res',
+          parse: {
+            id: Number,
+            pwd: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, pwd: 20 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handles differently ordered params v3', () => {
+  const path = '/foos/5/20/res';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foos/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/:pwd/res',
+          parse: {
+            id: Number,
+            pwd: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, pwd: 20 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handles differently ordered params v4', () => {
+  const path = '5/foos/res/20';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foos/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: ':id/foos/res/:pwd',
+          parse: {
+            id: Number,
+            pwd: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, pwd: 20 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handles simple optional params', () => {
+  const path = '/foos/5';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/:nip?',
+          parse: {
+            id: Number,
+            nip: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle 2 optional params at the end v1', () => {
+  const path = '/foos/5';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/:nip?/:pwd?',
+          parse: {
+            id: Number,
+            nip: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle 2 optional params at the end v2', () => {
+  const path = '/foos/5/10';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/:nip?/:pwd?',
+          parse: {
+            id: Number,
+            nip: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, nip: 10 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle 2 optional params at the end v3', () => {
+  const path = '/foos/5/10/15';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/:nip?/:pwd?',
+          parse: {
+            id: Number,
+            nip: Number,
+            pwd: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, nip: 10, pwd: 15 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle optional params in the middle v1', () => {
+  const path = '/foos/5/10';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/:nip?/:pwd',
+          parse: {
+            id: Number,
+            nip: Number,
+            pwd: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, pwd: 10 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle optional params in the middle v2', () => {
+  const path = '/foos/5/10/15';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/:nip?/:pwd',
+          parse: {
+            id: Number,
+            nip: Number,
+            pwd: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, nip: 10, pwd: 15 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle optional params in the middle v3', () => {
+  const path = '/foos/5/10/15';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:id/:nip?/:pwd/:smh',
+          parse: {
+            id: Number,
+            nip: Number,
+            pwd: Number,
+            smh: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { id: 5, pwd: 10, smh: 15 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle optional params in the middle v4', () => {
+  const path = '/foos/5/10';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:nip?/:pwd/:smh?/:id',
+          parse: {
+            id: Number,
+            nip: Number,
+            pwd: Number,
+            smh: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { pwd: 5, id: 10 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle optional params in the middle v5', () => {
+  const path = '/foos/5/10/15';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: 'foos/:nip?/:pwd/:smh?/:id',
+          parse: {
+            id: Number,
+            nip: Number,
+            pwd: Number,
+            smh: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { nip: 5, pwd: 10, id: 15 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle optional params in the beginning v1', () => {
+  const path = '5/10/foos/15';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: ':nip?/:pwd/foos/:smh?/:id',
+          parse: {
+            id: Number,
+            nip: Number,
+            pwd: Number,
+            smh: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { nip: 5, pwd: 10, id: 15 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
+
+it('handle optional params in the beginning v2', () => {
+  const path = '5/10/foos/15';
+
+  const config = {
+    Foe: {
+      path: '/',
+      initialRouteName: 'Foo',
+      screens: {
+        Foo: 'foo',
+        Bis: {
+          path: 'foo/:id',
+          parse: {
+            id: Number,
+          },
+        },
+        Bas: {
+          path: ':nip?/:smh?/:pwd/foos/:id',
+          parse: {
+            id: Number,
+            nip: Number,
+            pwd: Number,
+            smh: Number,
+          },
+        },
+      },
+    },
+  };
+
+  const state = {
+    routes: [
+      {
+        name: 'Foe',
+        state: {
+          index: 1,
+          routes: [
+            {
+              name: 'Foo',
+            },
+            {
+              name: 'Bas',
+              params: { nip: 5, pwd: 10, id: 15 },
+            },
+          ],
+        },
+      },
+    ],
+  };
+
+  expect(getStateFromPath(path, config)).toEqual(state);
+  expect(getStateFromPath(getPathFromState(state, config), config)).toEqual(
+    state
+  );
+});
--- a/packages/core/src/tests/index.test.tsx
+++ b/packages/core/src/tests/index.test.tsx
@@ -379,6 +379,8 @@ it("doesn't update state if action wasn't handled", () => {
 });

 it('cleans up state when the navigator unmounts', () => {
+  jest.useFakeTimers();
+
  const TestNavigator = (props: any) => {
    const { state, descriptors } = useNavigationBuilder(MockRouter, props);

@@ -426,6 +428,8 @@ it('cleans up state when the navigator unmounts', () => {
    <BaseNavigationContainer onStateChange={onStateChange} children={null} />
  );

+  act(() => jest.runAllTimers());
+
  expect(onStateChange).toBeCalledTimes(2);
  expect(onStateChange).lastCalledWith(undefined);
 });
--- a/packages/core/src/getPathFromState.tsx
+++ b/packages/core/src/getPathFromState.tsx
@@ -135,7 +135,7 @@ export default function getPathFromState(
      path += pattern
        .split('/')
        .map((p) => {
-          const name = p.replace(/^:/, '');
+          const name = p.replace(/^:/, '').replace(/\?$/, '');

          // If the path has a pattern for a param, put the param in the path
          if (params && name in params && p.startsWith(':')) {
@@ -144,8 +144,10 @@ export default function getPathFromState(
            // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
            delete params[name];
            return encodeURIComponent(value);
+          } else if (p.endsWith('?')) {
+            // optional params without value assigned in route.params should be ignored
+            return '';
          }
-
          return encodeURIComponent(p);
        })
        .join('/');
@@ -173,7 +175,7 @@ export default function getPathFromState(
  }

  // Remove multiple as well as trailing slashes
-  path = path.replace(/\/+/, '/');
+  path = path.replace(/\/+/g, '/');
  path = path.length > 1 ? path.replace(/\/$/, '') : path;

  return path;
--- a/packages/core/src/getStateFromPath.tsx
+++ b/packages/core/src/getStateFromPath.tsx
@@ -1,3 +1,4 @@
+import escape from 'escape-string-regexp';
 import queryString from 'query-string';
 import {
  NavigationState,
@@ -20,7 +21,7 @@ type Options = {

 type RouteConfig = {
  screen: string;
-  match: string | null;
+  match: RegExp | null;
  pattern: string;
  routeNames: string[];
  parse: ParseConfig | undefined;
@@ -74,11 +75,14 @@ export default function getStateFromPath(
  );

  let remaining = path
-    .replace(/[/]+/, '/') // Replace multiple slash (//) with single ones
+    .replace(/\/+/g, '/') // Replace multiple slash (//) with single ones
    .replace(/^\//, '') // Remove extra leading slash
-    .replace(/\?.*/, ''); // Remove query params which we will handle later
+    .replace(/\?.*$/, ''); // Remove query params which we will handle later

-  if (remaining === '') {
+  // Make sure there is a trailing slash
+  remaining = remaining.endsWith('/') ? remaining : `${remaining}/`;
+
+  if (remaining === '/') {
    // We need to add special handling of empty path so navigation to empty path also works
    // When handling empty path, we should only look at the root level config
    const match = configs.find(
@@ -114,27 +118,10 @@ export default function getStateFromPath(
        continue;
      }

-      let didMatch = true;
-      const matchParts = config.match.split('/');
-      const remainingParts = remaining.split('/');
+      const match = remaining.match(config.match);

-      // we check if remaining path has enough segments to be handled with this pattern
-      if (config.pattern.split('/').length > remainingParts.length) {
-        continue;
-      }
-
-      // we keep info about the index of segment on which the params start
-      let paramsIndex = 0;
-      // the beginning of the remaining path should be the same as the part of config before params
-      for (paramsIndex; paramsIndex < matchParts.length; paramsIndex++) {
-        if (matchParts[paramsIndex] !== remainingParts[paramsIndex]) {
-          didMatch = false;
-          break;
-        }
-      }
-
-      // If the first part of the path matches, we need to extract params from the path
-      if (didMatch) {
+      // If our regex matches, we need to extract params from the path
+      if (match) {
        routeNames = [...config.routeNames];

        const paramPatterns = config.pattern
@@ -143,27 +130,21 @@ export default function getStateFromPath(

        if (paramPatterns.length) {
          params = paramPatterns.reduce<Record<string, any>>((acc, p, i) => {
-            const key = p.replace(/^:/, '');
-            const value = remainingParts[i + paramsIndex]; // The param segments start from the end of matched part
-            acc[key] =
-              config.parse && config.parse[key]
-                ? config.parse[key](value)
-                : value;
+            const key = p.replace(/^:/, '').replace(/\?$/, '');
+            const value = match[(i + 1) * 2].replace(/\//, ''); // The param segments appear every second item starting from 2 in the regex match result
+
+            if (value) {
+              acc[key] =
+                config.parse && config.parse[key]
+                  ? config.parse[key](value)
+                  : value;
+            }

            return acc;
          }, {});
        }

-        // if pattern and remaining path have same amount of segments, there should be nothing left
-        if (config.pattern.split('/').length === remainingParts.length) {
-          remaining = '';
-        } else {
-          // For each segment of the pattern, remove one segment from remaining path
-          let i = config.pattern.split('/').length;
-          while (i--) {
-            remaining = remaining.substr(remaining.indexOf('/') + 1);
-          }
-        }
+        remaining = remaining.replace(match[1], '');

        break;
      }
@@ -267,8 +248,20 @@ function createConfigItem(
  pattern: string,
  parse?: ParseConfig
 ): RouteConfig {
-  // part being matched ends on the first param
-  const match = pattern !== '' ? pattern.split('/:')[0] : null;
+  const match = pattern
+    ? new RegExp(
+        `^(${pattern
+          .split('/')
+          .map((it) => {
+            if (it.startsWith(':')) {
+              return `(([^/]+\\/)${it.endsWith('?') ? '?' : ''})`;
+            }
+
+            return `${escape(it)}\\/`;
+          })
+          .join('')})`
+      )
+    : null;

  return {
    screen,
--- a/packages/core/src/useIsFocused.tsx
+++ b/packages/core/src/useIsFocused.tsx
@@ -9,6 +9,7 @@ import useNavigation from './useNavigation';
 */
 export default function useIsFocused(): boolean {
  const navigation = useNavigation();
+  // eslint-disable-next-line react-hooks/exhaustive-deps
  const getCurrentValue = React.useCallback(navigation.isFocused, [navigation]);
  const subscribe = React.useCallback(
    (callback: (value: boolean) => void) => {
--- a/packages/core/src/useNavigationBuilder.tsx
+++ b/packages/core/src/useNavigationBuilder.tsx
@@ -362,9 +362,14 @@ export default function useNavigationBuilder<

    return () => {
      // We need to clean up state for this navigator on unmount
-      if (getCurrentState() !== undefined && getKey() === navigatorKey) {
-        setState(undefined);
-      }
+      // We do it in a timeout because we need to detect if another navigator mounted in the meantime
+      // For example, if another navigator has started rendering, we should skip cleanup
+      // Otherwise, our cleanup step will cleanup state for the other navigator and re-initialize it
+      setTimeout(() => {
+        if (getCurrentState() !== undefined && getKey() === navigatorKey) {
+          setState(undefined);
+        }
+      }, 0);
    };
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);
--- a/packages/drawer/CHANGELOG.md
+++ b/packages/drawer/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.

+# [5.7.0](https://github.com/react-navigation/react-navigation/tree/master/packages/drawer/compare/@react-navigation/drawer@5.6.4...@react-navigation/drawer@5.7.0) (2020-05-08)
+
+
+### Features
+
+* add generic type aliases for screen props ([bea14aa](https://github.com/react-navigation/react-navigation/tree/master/packages/drawer/commit/bea14aa26fd5cbfebc7973733c5cf1f44fd323aa)), closes [#7971](https://github.com/react-navigation/react-navigation/tree/master/packages/drawer/issues/7971)
+
+
+
+
+
+## [5.6.4](https://github.com/react-navigation/react-navigation/tree/master/packages/drawer/compare/@react-navigation/drawer@5.6.3...@react-navigation/drawer@5.6.4) (2020-05-05)
+
+**Note:** Version bump only for package @react-navigation/drawer
+
+
+
+
+
 ## [5.6.3](https://github.com/react-navigation/react-navigation/tree/master/packages/drawer/compare/@react-navigation/drawer@5.6.2...@react-navigation/drawer@5.6.3) (2020-05-01)

 **Note:** Version bump only for package @react-navigation/drawer
--- a/packages/drawer/package.json
+++ b/packages/drawer/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/drawer",
  "description": "Drawer navigator component with animated transitions and gesturess",
-  "version": "5.6.3",
+  "version": "5.7.0",
  "keywords": [
    "react-native-component",
    "react-component",
@@ -39,17 +39,17 @@
    "react-native-iphone-x-helper": "^1.2.1"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
-    "@react-navigation/native": "^5.2.3",
-    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.22",
+    "@react-native-community/bob": "^0.13.0",
+    "@react-navigation/native": "^5.2.5",
+    "@types/react": "^16.9.34",
+    "@types/react-native": "^0.62.7",
    "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.7.0",
+    "react-native-reanimated": "^1.8.0",
    "react-native-safe-area-context": "^0.7.3",
-    "react-native-screens": "^2.3.0",
+    "react-native-screens": "^2.7.0",
    "typescript": "^3.8.3"
  },
  "peerDependencies": {
--- a/packages/drawer/src/index.tsx
+++ b/packages/drawer/src/index.tsx
@@ -25,6 +25,7 @@ export { default as useIsDrawerOpen } from './utils/useIsDrawerOpen';
 export type {
  DrawerNavigationOptions,
  DrawerNavigationProp,
+  DrawerScreenProps,
  DrawerContentOptions,
  DrawerContentComponentProps,
 } from './types';
--- a/packages/drawer/src/types.tsx
+++ b/packages/drawer/src/types.tsx
@@ -8,6 +8,7 @@ import {
  NavigationHelpers,
  DrawerNavigationState,
  DrawerActionHelpers,
+  RouteProp,
 } from '@react-navigation/native';
 import type { PanGestureHandlerProperties } from 'react-native-gesture-handler';

@@ -208,6 +209,14 @@ export type DrawerNavigationProp<
 > &
  DrawerActionHelpers<ParamList>;

+export type DrawerScreenProps<
+  ParamList extends ParamListBase,
+  RouteName extends keyof ParamList = string
+> = {
+  navigation: DrawerNavigationProp<ParamList, RouteName>;
+  route: RouteProp<ParamList, RouteName>;
+};
+
 export type DrawerDescriptor = Descriptor<
  ParamListBase,
  string,
--- a/packages/drawer/src/views/Drawer.tsx
+++ b/packages/drawer/src/views/Drawer.tsx
@@ -655,14 +655,14 @@ export default class DrawerView extends React.Component<Props> {
                    gestureEnabled ? () => this.toggleDrawer(false) : undefined
                  }
                >
-                  <Overlay progress={progress} style={overlayStyle} />
+                  <Overlay progress={progress} style={overlayStyle as any} />
                </TouchableWithoutFeedback>
              ) : (
                <TapGestureHandler
                  enabled={gestureEnabled}
                  onHandlerStateChange={this.handleTapStateChange}
                >
-                  <Overlay progress={progress} style={overlayStyle} />
+                  <Overlay progress={progress} style={overlayStyle as any} />
                </TapGestureHandler>
              )
            }
--- a/packages/material-bottom-tabs/CHANGELOG.md
+++ b/packages/material-bottom-tabs/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [5.2.0](https://github.com/react-navigation/react-navigation/tree/master/packages/material-bottom-tabs/compare/@react-navigation/material-bottom-tabs@5.1.15...@react-navigation/material-bottom-tabs@5.2.0) (2020-05-08)
+
+
+### Features
+
+* add generic type aliases for screen props ([bea14aa](https://github.com/react-navigation/react-navigation/tree/master/packages/material-bottom-tabs/commit/bea14aa26fd5cbfebc7973733c5cf1f44fd323aa)), closes [#7971](https://github.com/react-navigation/react-navigation/tree/master/packages/material-bottom-tabs/issues/7971)
+* use links in bottom navigation tabs ([f384706](https://github.com/react-navigation/react-navigation/tree/master/packages/material-bottom-tabs/commit/f384706741f7e2422c284b65da10425f7af680c0))
+
+
+
+
+
+## [5.1.15](https://github.com/react-navigation/react-navigation/tree/master/packages/material-bottom-tabs/compare/@react-navigation/material-bottom-tabs@5.1.14...@react-navigation/material-bottom-tabs@5.1.15) (2020-05-05)
+
+**Note:** Version bump only for package @react-navigation/material-bottom-tabs
+
+
+
+
+
 ## [5.1.14](https://github.com/react-navigation/react-navigation/tree/master/packages/material-bottom-tabs/compare/@react-navigation/material-bottom-tabs@5.1.13...@react-navigation/material-bottom-tabs@5.1.14) (2020-05-01)

 **Note:** Version bump only for package @react-navigation/material-bottom-tabs
--- a/packages/material-bottom-tabs/package.json
+++ b/packages/material-bottom-tabs/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/material-bottom-tabs",
  "description": "Integration for bottom navigation component from react-native-paper",
-  "version": "5.1.14",
+  "version": "5.2.0",
  "keywords": [
    "react-native-component",
    "react-component",
@@ -35,15 +35,15 @@
    "clean": "del lib"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
-    "@react-navigation/native": "^5.2.3",
-    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.22",
+    "@react-native-community/bob": "^0.13.0",
+    "@react-navigation/native": "^5.2.5",
+    "@types/react": "^16.9.34",
+    "@types/react-native": "^0.62.7",
    "@types/react-native-vector-icons": "^6.4.5",
    "del-cli": "^3.0.0",
    "react": "~16.9.0",
    "react-native": "~0.61.5",
-    "react-native-paper": "^3.7.0",
+    "react-native-paper": "^3.10.1",
    "react-native-vector-icons": "^6.6.0",
    "typescript": "^3.8.3"
  },
--- a/packages/material-bottom-tabs/src/index.tsx
+++ b/packages/material-bottom-tabs/src/index.tsx
@@ -14,4 +14,5 @@ export { default as MaterialBottomTabView } from './views/MaterialBottomTabView'
 export type {
  MaterialBottomTabNavigationOptions,
  MaterialBottomTabNavigationProp,
+  MaterialBottomTabScreenProps,
 } from './types';
--- a/packages/material-bottom-tabs/src/types.tsx
+++ b/packages/material-bottom-tabs/src/types.tsx
@@ -6,6 +6,7 @@ import {
  NavigationHelpers,
  TabNavigationState,
  TabActionHelpers,
+  RouteProp,
 } from '@react-navigation/native';

 export type MaterialBottomTabNavigationEventMap = {
@@ -32,6 +33,14 @@ export type MaterialBottomTabNavigationProp<
 > &
  TabActionHelpers<ParamList>;

+export type MaterialBottomTabScreenProps<
+  ParamList extends ParamListBase,
+  RouteName extends keyof ParamList = string
+> = {
+  navigation: MaterialBottomTabNavigationProp<ParamList, RouteName>;
+  route: RouteProp<ParamList, RouteName>;
+};
+
 export type MaterialBottomTabNavigationOptions = {
  /**
   * Title text for the screen.
--- a/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx
+++ b/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyleSheet } from 'react-native';
+import { StyleSheet, Platform } from 'react-native';
 import { BottomNavigation, DefaultTheme, DarkTheme } from 'react-native-paper';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 import {
@@ -8,6 +8,8 @@ import {
  TabNavigationState,
  TabActions,
  useTheme,
+  useLinkBuilder,
+  Link,
 } from '@react-navigation/native';

 import {
@@ -24,13 +26,14 @@ type Props = MaterialBottomTabNavigationConfig & {

 type Scene = { route: { key: string } };

-export default function MaterialBottomTabView({
+function MaterialBottomTabViewInner({
  state,
  navigation,
  descriptors,
  ...rest
 }: Props) {
  const { dark, colors } = useTheme();
+  const buildLink = useLinkBuilder();

  const theme = React.useMemo(() => {
    const t = dark ? DarkTheme : DefaultTheme;
@@ -46,67 +49,102 @@ export default function MaterialBottomTabView({
  }, [colors, dark]);

  return (
-    <NavigationHelpersContext.Provider value={navigation}>
-      <BottomNavigation
-        {...rest}
-        theme={theme}
-        navigationState={state}
-        onIndexChange={(index: number) =>
-          navigation.dispatch({
-            ...TabActions.jumpTo(state.routes[index].name),
-            target: state.key,
-          })
+    <BottomNavigation
+      {...rest}
+      theme={theme}
+      navigationState={state}
+      onIndexChange={(index: number) =>
+        navigation.dispatch({
+          ...TabActions.jumpTo(state.routes[index].name),
+          target: state.key,
+        })
+      }
+      renderScene={({ route }) => descriptors[route.key].render()}
+      renderTouchable={
+        Platform.OS === 'web'
+          ? ({
+              onPress,
+              route,
+              accessibilityRole: _0,
+              borderless: _1,
+              centered: _2,
+              rippleColor: _3,
+              ...rest
+            }) => {
+              return (
+                <Link
+                  {...rest}
+                  // @ts-ignore
+                  to={buildLink(route.name, route.params)}
+                  accessibilityRole="link"
+                  onPress={(e: any) => {
+                    if (
+                      !(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) && // ignore clicks with modifier keys
+                      (e.button == null || e.button === 0) // ignore everything but left clicks
+                    ) {
+                      e.preventDefault();
+                      onPress?.(e);
+                    }
+                  }}
+                />
+              );
+            }
+          : undefined
+      }
+      renderIcon={({ route, focused, color }) => {
+        const { options } = descriptors[route.key];
+
+        if (typeof options.tabBarIcon === 'string') {
+          return (
+            <MaterialCommunityIcons
+              name={options.tabBarIcon}
+              color={color}
+              size={24}
+              style={styles.icon}
+            />
+          );
        }
-        renderScene={({ route }) => descriptors[route.key].render()}
-        renderIcon={({ route, focused, color }) => {
-          const { options } = descriptors[route.key];

-          if (typeof options.tabBarIcon === 'string') {
-            return (
-              <MaterialCommunityIcons
-                name={options.tabBarIcon}
-                color={color}
-                size={24}
-                style={styles.icon}
-                importantForAccessibility="no-hide-descendants"
-                accessibilityElementsHidden
-              />
-            );
-          }
-
-          if (typeof options.tabBarIcon === 'function') {
-            return options.tabBarIcon({ focused, color });
-          }
-
-          return null;
-        }}
-        getLabelText={({ route }: Scene) => {
-          const { options } = descriptors[route.key];
-
-          return options.tabBarLabel !== undefined
-            ? options.tabBarLabel
-            : options.title !== undefined
-            ? options.title
-            : (route as Route<string>).name;
-        }}
-        getColor={({ route }) => descriptors[route.key].options.tabBarColor}
-        getBadge={({ route }) => descriptors[route.key].options.tabBarBadge}
-        getAccessibilityLabel={({ route }) =>
-          descriptors[route.key].options.tabBarAccessibilityLabel
+        if (typeof options.tabBarIcon === 'function') {
+          return options.tabBarIcon({ focused, color });
        }
-        getTestID={({ route }) => descriptors[route.key].options.tabBarTestID}
-        onTabPress={({ route, preventDefault }) => {
-          const event = navigation.emit({
-            type: 'tabPress',
-            target: route.key,
-            canPreventDefault: true,
-          });

-          if (event.defaultPrevented) {
-            preventDefault();
-          }
-        }}
-      />
+        return null;
+      }}
+      getLabelText={({ route }: Scene) => {
+        const { options } = descriptors[route.key];
+
+        return options.tabBarLabel !== undefined
+          ? options.tabBarLabel
+          : options.title !== undefined
+          ? options.title
+          : (route as Route<string>).name;
+      }}
+      getColor={({ route }) => descriptors[route.key].options.tabBarColor}
+      getBadge={({ route }) => descriptors[route.key].options.tabBarBadge}
+      getAccessibilityLabel={({ route }) =>
+        descriptors[route.key].options.tabBarAccessibilityLabel
+      }
+      getTestID={({ route }) => descriptors[route.key].options.tabBarTestID}
+      onTabPress={({ route, preventDefault }) => {
+        const event = navigation.emit({
+          type: 'tabPress',
+          target: route.key,
+          canPreventDefault: true,
+        });
+
+        if (event.defaultPrevented) {
+          preventDefault();
+        }
+      }}
+    />
+  );
+}
+
+export default function MaterialBottomTabView(props: Props) {
+  return (
+    <NavigationHelpersContext.Provider value={props.navigation}>
+      <MaterialBottomTabViewInner {...props} />
    </NavigationHelpersContext.Provider>
  );
 }
--- a/packages/material-top-tabs/CHANGELOG.md
+++ b/packages/material-top-tabs/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.

+# [5.2.0](https://github.com/react-navigation/react-navigation/tree/master/packages/material-top-tabs/compare/@react-navigation/material-top-tabs@5.1.15...@react-navigation/material-top-tabs@5.2.0) (2020-05-08)
+
+
+### Features
+
+* add generic type aliases for screen props ([bea14aa](https://github.com/react-navigation/react-navigation/tree/master/packages/material-top-tabs/commit/bea14aa26fd5cbfebc7973733c5cf1f44fd323aa)), closes [#7971](https://github.com/react-navigation/react-navigation/tree/master/packages/material-top-tabs/issues/7971)
+
+
+
+
+
+## [5.1.15](https://github.com/react-navigation/react-navigation/tree/master/packages/material-top-tabs/compare/@react-navigation/material-top-tabs@5.1.14...@react-navigation/material-top-tabs@5.1.15) (2020-05-05)
+
+**Note:** Version bump only for package @react-navigation/material-top-tabs
+
+
+
+
+
 ## [5.1.14](https://github.com/react-navigation/react-navigation/tree/master/packages/material-top-tabs/compare/@react-navigation/material-top-tabs@5.1.13...@react-navigation/material-top-tabs@5.1.14) (2020-05-01)

 **Note:** Version bump only for package @react-navigation/material-top-tabs
--- a/packages/material-top-tabs/package.json
+++ b/packages/material-top-tabs/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/material-top-tabs",
  "description": "Integration for the animated tab view component from react-native-tab-view",
-  "version": "5.1.14",
+  "version": "5.2.0",
  "keywords": [
    "react-native-component",
    "react-component",
@@ -38,15 +38,15 @@
    "color": "^3.1.2"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
-    "@react-navigation/native": "^5.2.3",
-    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.22",
+    "@react-native-community/bob": "^0.13.0",
+    "@react-navigation/native": "^5.2.5",
+    "@types/react": "^16.9.34",
+    "@types/react-native": "^0.62.7",
    "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.7.0",
+    "react-native-reanimated": "^1.8.0",
    "react-native-tab-view": "^2.14.0",
    "typescript": "^3.8.3"
  },
--- a/packages/material-top-tabs/src/index.tsx
+++ b/packages/material-top-tabs/src/index.tsx
@@ -15,6 +15,7 @@ export { default as MaterialTopTabBar } from './views/MaterialTopTabBar';
 export type {
  MaterialTopTabNavigationOptions,
  MaterialTopTabNavigationProp,
+  MaterialTopTabScreenProps,
  MaterialTopTabBarProps,
  MaterialTopTabBarOptions,
 } from './types';
--- a/packages/material-top-tabs/src/types.tsx
+++ b/packages/material-top-tabs/src/types.tsx
@@ -8,6 +8,7 @@ import {
  NavigationProp,
  TabNavigationState,
  TabActionHelpers,
+  RouteProp,
 } from '@react-navigation/native';

 export type MaterialTopTabNavigationEventMap = {
@@ -46,6 +47,14 @@ export type MaterialTopTabNavigationProp<
 > &
  TabActionHelpers<ParamList>;

+export type MaterialTopTabScreenProps<
+  ParamList extends ParamListBase,
+  RouteName extends keyof ParamList = string
+> = {
+  navigation: MaterialTopTabNavigationProp<ParamList, RouteName>;
+  route: RouteProp<ParamList, RouteName>;
+};
+
 export type MaterialTopTabNavigationOptions = {
  /**
   * Title text for the screen.
--- a/packages/native/CHANGELOG.md
+++ b/packages/native/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [5.2.5](https://github.com/react-navigation/react-navigation/tree/master/packages/native/compare/@react-navigation/native@5.2.4...@react-navigation/native@5.2.5) (2020-05-08)
+
+
+### Bug Fixes
+
+* return a promise-like from getInitialState ([#8210](https://github.com/react-navigation/react-navigation/tree/master/packages/native/issues/8210)) ([85ae378](https://github.com/react-navigation/react-navigation/tree/master/packages/native/commit/85ae378d8cb1073895b281e13ebccee881d4c062))
+
+
+
+
+
+## [5.2.4](https://github.com/react-navigation/react-navigation/tree/master/packages/native/compare/@react-navigation/native@5.2.3...@react-navigation/native@5.2.4) (2020-05-05)
+
+
+### Bug Fixes
+
+* return undefined for buildLink if linking is not enabled ([9fd2635](https://github.com/react-navigation/react-navigation/tree/master/packages/native/commit/9fd2635756362c8da79656b4d9b101bebaaf7003))
+
+
+
+
+
 ## [5.2.3](https://github.com/react-navigation/react-navigation/tree/master/packages/native/compare/@react-navigation/native@5.2.2...@react-navigation/native@5.2.3) (2020-05-01)


--- a/packages/native/package.json
+++ b/packages/native/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/native",
  "description": "React Native integration for React Navigation",
-  "version": "5.2.3",
+  "version": "5.2.5",
  "keywords": [
    "react-native",
    "react-navigation",
@@ -31,16 +31,16 @@
    "clean": "del lib"
  },
  "dependencies": {
-    "@react-navigation/core": "^5.4.0"
+    "@react-navigation/core": "^5.5.1"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
-    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.22",
+    "@react-native-community/bob": "^0.13.0",
+    "@types/react": "^16.9.34",
+    "@types/react-native": "^0.62.7",
    "del-cli": "^3.0.0",
    "react": "~16.9.0",
    "react-native": "~0.61.5",
-    "react-native-testing-library": "^1.12.0",
+    "react-native-testing-library": "^1.13.2",
    "typescript": "^3.8.3"
  },
  "peerDependencies": {
--- a/packages/native/src/useLinkBuilder.tsx
+++ b/packages/native/src/useLinkBuilder.tsx
@@ -52,14 +52,18 @@ export default function useLinkBuilder() {
    (name: string, params?: object) => {
      const { options } = linking;

-      // If we couldn't find a navigation object in context, we're at root
-      // So we'll construct a basic state object to use
+      if (options?.enabled === false) {
+        return undefined;
+      }
+
      const state = navigation
        ? getRootStateForNavigate(navigation, {
            index: 0,
            routes: [{ name, params }],
          })
-        : {
+        : // If we couldn't find a navigation object in context, we're at root
+          // So we'll construct a basic state object to use
+          {
            index: 0,
            routes: [{ name, params }],
          };
--- a/packages/native/src/useLinkProps.tsx
+++ b/packages/native/src/useLinkProps.tsx
@@ -49,6 +49,14 @@ export default function useLinkProps({ to, action }: Props) {
          throw new Error("Couldn't find a navigation object.");
        }
      } else {
+        if (typeof to !== 'string') {
+          throw new Error(
+            `To 'to' option is invalid (found '${String(
+              to
+            )}'. It must be a valid string for navigation.`
+          );
+        }
+
        linkTo(to);
      }
    }
--- a/packages/native/src/useLinking.tsx
+++ b/packages/native/src/useLinking.tsx
@@ -95,18 +95,17 @@ export default function useLinking(
      }
    }

-    const then = (callback: (state: ResultState | undefined) => void) =>
-      Promise.resolve(callback(value));
-
    // Make it a thenable to keep consistent with the native impl
    const thenable = {
-      then,
+      then(onfulfilled?: (state: ResultState | undefined) => void) {
+        return Promise.resolve(onfulfilled ? onfulfilled(value) : value);
+      },
      catch() {
        return thenable;
      },
    };

-    return thenable;
+    return thenable as PromiseLike<ResultState | undefined>;
  }, []);

  const previousStateLengthRef = React.useRef<number | undefined>(undefined);
--- a/packages/native/src/useThenable.tsx
+++ b/packages/native/src/useThenable.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';

-type Thenable<T> = { then(cb: (result: T) => void): void };
-
-export default function useThenable<T>(create: () => Thenable<T>) {
+export default function useThenable<T>(create: () => PromiseLike<T>) {
  const [promise] = React.useState(create);

  // Check if our thenable is synchronous
--- a/packages/routers/CHANGELOG.md
+++ b/packages/routers/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [5.4.3](https://github.com/react-navigation/react-navigation/tree/master/packages/routers/compare/@react-navigation/routers@5.4.2...@react-navigation/routers@5.4.3) (2020-05-08)
+
+**Note:** Version bump only for package @react-navigation/routers
+
+
+
+
+
 ## [5.4.2](https://github.com/react-navigation/react-navigation/tree/master/packages/routers/compare/@react-navigation/routers@5.4.1...@react-navigation/routers@5.4.2) (2020-04-30)


--- a/packages/routers/package.json
+++ b/packages/routers/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/routers",
  "description": "Routers to help build custom navigators",
-  "version": "5.4.2",
+  "version": "5.4.3",
  "keywords": [
    "react",
    "react-native",
@@ -30,10 +30,10 @@
    "clean": "del lib"
  },
  "dependencies": {
-    "nanoid": "^3.0.2"
+    "nanoid": "^3.1.5"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
+    "@react-native-community/bob": "^0.13.0",
    "del-cli": "^3.0.0",
    "typescript": "^3.8.3"
  },
--- a/packages/stack/CHANGELOG.md
+++ b/packages/stack/CHANGELOG.md
@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+# [5.3.0](https://github.com/react-navigation/react-navigation/tree/master/packages/stack/compare/@react-navigation/stack@5.2.19...@react-navigation/stack@5.3.0) (2020-05-08)
+
+
+### Bug Fixes
+
+* add proper margins to the header title ([f07cd13](https://github.com/react-navigation/react-navigation/tree/master/packages/stack/commit/f07cd135619d635e8841aa0df0b6e687636e7408))
+* include safe are insets in title's margins ([4d1e102](https://github.com/react-navigation/react-navigation/tree/master/packages/stack/commit/4d1e102f8c3ffab116d0195fbab3086f6345a077))
+
+
+### Features
+
+* add generic type aliases for screen props ([bea14aa](https://github.com/react-navigation/react-navigation/tree/master/packages/stack/commit/bea14aa26fd5cbfebc7973733c5cf1f44fd323aa)), closes [#7971](https://github.com/react-navigation/react-navigation/tree/master/packages/stack/issues/7971)
+
+
+
+
+
+## [5.2.19](https://github.com/react-navigation/react-navigation/tree/master/packages/stack/compare/@react-navigation/stack@5.2.18...@react-navigation/stack@5.2.19) (2020-05-05)
+
+**Note:** Version bump only for package @react-navigation/stack
+
+
+
+
+
 ## [5.2.18](https://github.com/react-navigation/react-navigation/tree/master/packages/stack/compare/@react-navigation/stack@5.2.17...@react-navigation/stack@5.2.18) (2020-05-01)

 **Note:** Version bump only for package @react-navigation/stack
--- a/packages/stack/package.json
+++ b/packages/stack/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@react-navigation/stack",
  "description": "Stack navigator component for iOS and Android with animated transitions and gestures",
-  "version": "5.2.18",
+  "version": "5.3.0",
  "keywords": [
    "react-native-component",
    "react-component",
@@ -38,18 +38,18 @@
    "react-native-iphone-x-helper": "^1.2.1"
  },
  "devDependencies": {
-    "@react-native-community/bob": "^0.10.0",
-    "@react-native-community/masked-view": "^0.1.7",
-    "@react-navigation/native": "^5.2.3",
+    "@react-native-community/bob": "^0.13.0",
+    "@react-native-community/masked-view": "^0.1.10",
+    "@react-navigation/native": "^5.2.5",
    "@types/color": "^3.0.1",
-    "@types/react": "^16.9.23",
-    "@types/react-native": "^0.61.22",
+    "@types/react": "^16.9.34",
+    "@types/react-native": "^0.62.7",
    "del-cli": "^3.0.0",
    "react": "~16.9.0",
    "react-native": "~0.61.5",
    "react-native-gesture-handler": "^1.6.0",
    "react-native-safe-area-context": "^0.7.3",
-    "react-native-screens": "^2.3.0",
+    "react-native-screens": "^2.7.0",
    "typescript": "^3.8.3"
  },
  "peerDependencies": {
--- a/packages/stack/src/index.tsx
+++ b/packages/stack/src/index.tsx
@@ -51,6 +51,7 @@ export { default as useGestureHandlerRef } from './utils/useGestureHandlerRef';
 export type {
  StackNavigationOptions,
  StackNavigationProp,
+  StackScreenProps,
  StackHeaderProps,
  StackHeaderLeftButtonProps,
  StackHeaderTitleProps,
--- a/packages/stack/src/types.tsx
+++ b/packages/stack/src/types.tsx
@@ -15,6 +15,7 @@ import {
  NavigationHelpers,
  StackNavigationState,
  StackActionHelpers,
+  RouteProp,
 } from '@react-navigation/native';

 export type StackNavigationEventMap = {
@@ -45,6 +46,14 @@ export type StackNavigationProp<
 > &
  StackActionHelpers<ParamList>;

+export type StackScreenProps<
+  ParamList extends ParamListBase,
+  RouteName extends keyof ParamList = string
+> = {
+  navigation: StackNavigationProp<ParamList, RouteName>;
+  route: RouteProp<ParamList, RouteName>;
+};
+
 export type Layout = { width: number; height: number };

 export type GestureDirection =
--- a/packages/stack/src/views/Header/Header.tsx
+++ b/packages/stack/src/views/Header/Header.tsx
@@ -41,6 +41,7 @@ export default React.memo(function Header(props: StackHeaderProps) {
        : previous.route.name;
  }

+  // eslint-disable-next-line react-hooks/exhaustive-deps
  const goBack = React.useCallback(
    debounce(() => {
      if (navigation.isFocused() && navigation.canGoBack()) {
--- a/packages/stack/src/views/Header/HeaderSegment.tsx
+++ b/packages/stack/src/views/Header/HeaderSegment.tsx
@@ -307,6 +307,8 @@ export default class HeaderSegment extends React.Component<Props, State> {
        })
      : null;

+    const rightButton = right ? right({ tintColor: headerTintColor }) : null;
+
    return (
      <React.Fragment>
        <Animated.View
@@ -345,8 +347,17 @@ export default class HeaderSegment extends React.Component<Props, State> {
              pointerEvents="box-none"
              style={[
                headerTitleAlign === 'left'
-                  ? { position: 'absolute', left: leftButton ? 72 : 16 }
-                  : { marginHorizontal: 18 },
+                  ? {
+                      position: 'absolute',
+                      left: (leftButton ? 72 : 16) + insets.left,
+                      right: (rightButton ? 72 : 16) + insets.right,
+                    }
+                  : {
+                      marginHorizontal:
+                        (leftButton ? 32 : 16) +
+                        (leftLabelLayout?.width || 0) +
+                        Math.max(insets.left, insets.right),
+                    },
                titleStyle,
                titleContainerStyle,
              ]}
@@ -359,7 +370,7 @@ export default class HeaderSegment extends React.Component<Props, State> {
                style: customTitleStyle,
              })}
            </Animated.View>
-            {right ? (
+            {rightButton ? (
              <Animated.View
                pointerEvents="box-none"
                style={[
@@ -369,7 +380,7 @@ export default class HeaderSegment extends React.Component<Props, State> {
                  rightContainerStyle,
                ]}
              >
-                {right({ tintColor: headerTintColor })}
+                {rightButton}
              </Animated.View>
            ) : null}
          </View>
--- a/packages/stack/src/views/Header/HeaderTitle.tsx
+++ b/packages/stack/src/views/Header/HeaderTitle.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Animated, StyleSheet, Platform } from 'react-native';
 import { useTheme } from '@react-navigation/native';

-type Props = React.ComponentProps<typeof Animated.Text> & {
+type Props = Omit<React.ComponentProps<typeof Animated.Text>, 'key'> & {
  tintColor?: string;
  children?: string;
 };
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Satyajit Sahoo	00b11e303e	chore: publish - @react-navigation/bottom-tabs@5.4.0 - @react-navigation/compat@5.1.16 - @react-navigation/core@5.5.1 - @react-navigation/drawer@5.7.0 - @react-navigation/material-bottom-tabs@5.2.0 - @react-navigation/material-top-tabs@5.2.0 - @react-navigation/native@5.2.5 - @react-navigation/routers@5.4.3 - @react-navigation/stack@5.3.0	2020-05-08 16:34:03 +02:00
Satyajit Sahoo	f384706741	feat: use links in bottom navigation tabs	2020-05-08 16:11:24 +02:00
Satyajit Sahoo	d1a6f3e30e	chore: upgrade depenendecies	2020-05-08 16:06:28 +02:00
Satyajit Sahoo	fd6636a8cd	chore: update circleci config	2020-05-08 03:19:47 +02:00
Satyajit Sahoo	eb24fea8b9	chore: upgrade depenendecies	2020-05-07 21:08:55 +02:00
Linus Unnebäck	85ae378d8c	fix: return a promise-like from getInitialState (#8210 )	2020-05-07 20:56:55 +02:00
Satyajit Sahoo	bea14aa26f	feat: add generic type aliases for screen props closes #7971	2020-05-06 19:00:04 +02:00
Satyajit Sahoo	4d1e102f8c	fix: include safe are insets in title's margins	2020-05-06 16:49:02 +02:00
Satyajit Sahoo	f07cd13561	fix: add proper margins to the header title	2020-05-06 16:14:40 +02:00
Satyajit Sahoo	f6d06768d3	fix: avoid cleaning up state when a new navigator is mounted. fixes #8195	2020-05-06 15:49:59 +02:00
Satyajit Sahoo	3381d680d7	chore: publish - @react-navigation/bottom-tabs@5.3.4 - @react-navigation/compat@5.1.15 - @react-navigation/core@5.5.0 - @react-navigation/drawer@5.6.4 - @react-navigation/material-bottom-tabs@5.1.15 - @react-navigation/material-top-tabs@5.1.15 - @react-navigation/native@5.2.4 - @react-navigation/stack@5.2.19	2020-05-05 20:07:13 +02:00
Wojciech Lewicki	fcd1cc64c1	feat: add support for optional params to linking (#8196 )	2020-05-05 17:18:34 +02:00
Wojciech Lewicki	3999fc2836	feat: support params anywhere in path segement (#8184 )	2020-05-04 15:07:27 +02:00
Satyajit Sahoo	9fd2635756	fix: return undefined for buildLink if linking is not enabled	2020-05-04 06:35:22 +02:00