Skip to content
This repository was archived by the owner on Feb 25, 2020. It is now read-only.

Commit 792281c

Browse files
committed
fix: set proper type for screenProps in ScreenComponent
1 parent 9cfe6ac commit 792281c

5 files changed

Lines changed: 23 additions & 22 deletions

File tree

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"react-native-gesture-handler": "~1.3.0",
2020
"react-native-paper": "^3.0.0-alpha.4",
2121
"react-native-reanimated": "~1.1.0",
22-
"react-navigation": "^4.0.4",
22+
"react-navigation": "^4.0.7",
2323
"react-navigation-stack": "^1.5.4"
2424
},
2525
"devDependencies": {

example/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -910,10 +910,10 @@
910910
xcode "^2.0.0"
911911
xmldoc "^0.4.0"
912912

913-
"@react-navigation/core@^3.5.0":
914-
version "3.5.0"
915-
resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.0.tgz#73d1a12448e2bd71855e0080b95a7f51ede0cd9e"
916-
integrity sha512-NLm24lA51R8o8c+iFnwtN9elqRzm4OJ8f1qPBCUNIYW1sb8M5yCD53vRP0fRcPFpr/6Xzs2TJMsWnnebwFp0Rw==
913+
"@react-navigation/core@^3.5.1":
914+
version "3.5.1"
915+
resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.1.tgz#7a2339fca3496979305fb3a8ab88c2ca8d8c214d"
916+
integrity sha512-q7NyhWVYOhVIWqL2GZKa6G78YarXaVTTtOlSDkvy4ZIggo40wZzamlnrJRvsaQX46gsgw45FAWb5SriHh8o7eA==
917917
dependencies:
918918
hoist-non-react-statics "^3.3.0"
919919
path-to-regexp "^1.7.0"
@@ -4318,12 +4318,12 @@ react-navigation-stack@^1.5.4:
43184318
dependencies:
43194319
prop-types "^15.7.2"
43204320

4321-
react-navigation@^4.0.4:
4322-
version "4.0.4"
4323-
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.0.4.tgz#afa43c7183891d38708cf57f1d4394fed1d4c2ad"
4324-
integrity sha512-MZeVkYkFTKZobhrXMV3Hgeg0HHeokCrYsbxActVfO0n6zfzm0/La6EiC2mIHiwOymvb1ZygyFf90vryLUMEBNA==
4321+
react-navigation@^4.0.7:
4322+
version "4.0.7"
4323+
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.0.7.tgz#cc7ce334fef009242494d623e50e9cf79eb63ddd"
4324+
integrity sha512-0tTWanq870Hyr1VGHuj98+myRHNQnKgpRgjgzhAwVuLShyPIB9OnoLGIwIcqEdxgxGo+JMFmIGg8KCr7xapfgg==
43254325
dependencies:
4326-
"@react-navigation/core" "^3.5.0"
4326+
"@react-navigation/core" "^3.5.1"
43274327
"@react-navigation/native" "^3.6.2"
43284328

43294329
react-proxy@^1.1.7:

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@
6161
"react-native-gesture-handler": "^1.4.1",
6262
"react-native-paper": "^3.0.0-alpha.4",
6363
"react-native-reanimated": "^1.2.0",
64-
"react-navigation": "^4.0.4",
64+
"react-navigation": "^4.0.7",
6565
"release-it": "^12.3.6",
6666
"typescript": "^3.5.2"
6767
},
6868
"peerDependencies": {
6969
"react": "*",
7070
"react-native": "*",
7171
"react-native-paper": "^2.2.2 || ^3.0.0-alpha.1",
72-
"react-navigation": "^4.0.4"
72+
"react-navigation": "^4.0.7"
7373
},
7474
"husky": {
7575
"hooks": {

src/types.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ export type NavigationMaterialBottomTabScreenComponent<
103103
> = React.ComponentType<NavigationTabScreenProps<Params, ScreenProps>> & {
104104
navigationOptions?: NavigationScreenConfig<
105105
NavigationMaterialBottomTabOptions,
106-
NavigationTabProp<NavigationRoute, Params>
106+
NavigationTabProp<NavigationRoute, Params>,
107+
ScreenProps
107108
>;
108109
};

yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,10 +1097,10 @@
10971097
xcode "^2.0.0"
10981098
xmldoc "^0.4.0"
10991099

1100-
"@react-navigation/core@^3.5.0":
1101-
version "3.5.0"
1102-
resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.0.tgz#73d1a12448e2bd71855e0080b95a7f51ede0cd9e"
1103-
integrity sha512-NLm24lA51R8o8c+iFnwtN9elqRzm4OJ8f1qPBCUNIYW1sb8M5yCD53vRP0fRcPFpr/6Xzs2TJMsWnnebwFp0Rw==
1100+
"@react-navigation/core@^3.5.1":
1101+
version "3.5.1"
1102+
resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.1.tgz#7a2339fca3496979305fb3a8ab88c2ca8d8c214d"
1103+
integrity sha512-q7NyhWVYOhVIWqL2GZKa6G78YarXaVTTtOlSDkvy4ZIggo40wZzamlnrJRvsaQX46gsgw45FAWb5SriHh8o7eA==
11041104
dependencies:
11051105
hoist-non-react-statics "^3.3.0"
11061106
path-to-regexp "^1.7.0"
@@ -7378,12 +7378,12 @@ react-native@~0.59.8:
73787378
xmldoc "^0.4.0"
73797379
yargs "^9.0.0"
73807380

7381-
react-navigation@^4.0.4:
7382-
version "4.0.4"
7383-
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.0.4.tgz#afa43c7183891d38708cf57f1d4394fed1d4c2ad"
7384-
integrity sha512-MZeVkYkFTKZobhrXMV3Hgeg0HHeokCrYsbxActVfO0n6zfzm0/La6EiC2mIHiwOymvb1ZygyFf90vryLUMEBNA==
7381+
react-navigation@^4.0.7:
7382+
version "4.0.7"
7383+
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.0.7.tgz#cc7ce334fef009242494d623e50e9cf79eb63ddd"
7384+
integrity sha512-0tTWanq870Hyr1VGHuj98+myRHNQnKgpRgjgzhAwVuLShyPIB9OnoLGIwIcqEdxgxGo+JMFmIGg8KCr7xapfgg==
73857385
dependencies:
7386-
"@react-navigation/core" "^3.5.0"
7386+
"@react-navigation/core" "^3.5.1"
73877387
"@react-navigation/native" "^3.6.2"
73887388

73897389
react-proxy@^1.1.7:

0 commit comments

Comments
 (0)