Skip to content

Commit 255453d

Browse files
drewvolzdrewvolz
authored
Merge pull request #4184 from StoDevX/update-react-navigation-4.0.10
2 parents 65946fe + ecee121 commit 255453d

File tree

10 files changed

+54
-39
lines changed

10 files changed

+54
-39
lines changed

‎ios/Podfile.lock‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ PODS:
237237
- React
238238
- RNKeychain (6.2.0):
239239
- React
240+
- RNReanimated (1.4.0):
241+
- React
240242
- RNScreens (2.15.0):
241243
- React-Core
242244
- RNSearchBar (3.5.1):
@@ -289,6 +291,7 @@ DEPENDENCIES:
289291
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
290292
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
291293
- RNKeychain (from `../node_modules/react-native-keychain`)
294+
- RNReanimated (from `../node_modules/react-native-reanimated`)
292295
- RNScreens (from `../node_modules/react-native-screens`)
293296
- RNSearchBar (from `../node_modules/react-native-search-bar`)
294297
- "RNSentry (from `../node_modules/@sentry/react-native`)"
@@ -369,6 +372,8 @@ EXTERNAL SOURCES:
369372
:path: "../node_modules/react-native-gesture-handler"
370373
RNKeychain:
371374
:path: "../node_modules/react-native-keychain"
375+
RNReanimated:
376+
:path: "../node_modules/react-native-reanimated"
372377
RNScreens:
373378
:path: "../node_modules/react-native-screens"
374379
RNSearchBar:
@@ -416,7 +421,8 @@ SPEC CHECKSUMS:
416421
RNDeviceInfo: c5f8f3a456adcbba405ace475254b08febc4c095
417422
RNGestureHandler: 7a5833d0f788dbd107fbb913e09aa0c1ff333c39
418423
RNKeychain: b8e0711b959a19c5b057d1e970d3c83d159b6da5
419-
RNScreens: 2ad555d4d9fa10b91bb765ca07fe9b29d59573f0
424+
RNReanimated: b2ab0b693dddd2339bd2f300e770f6302d2e960c
425+
RNScreens: ca5c144495ebf33cc1f66be04a7fd3fafd3e40ff
420426
RNSearchBar: 9860431356b7d12a8449d2fddb2b5f3c78d1e99f
421427
RNSentry: 5408304a9fc37053c5589cfa4123a7ad2dce2456
422428
RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4

‎modules/ccc-calendar/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"peerDependencies": {
1212
"react": "^16.0.0",
13-
"react-navigation": "^3.0.0",
13+
"react-navigation": "^4.0.10",
1414
"moment-timezone": "^0.5.21",
1515
"delay": "^4.1.0"
1616
},

‎modules/event-list/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"react": "^16.0.0",
1414
"react-native": "^0.61.0",
1515
"react-native-vector-icons": "^6.0.0",
16-
"react-navigation": "^3.0.0"
16+
"react-navigation": "^4.0.10"
1717
},
1818
"dependencies": {
1919
"@callstack/react-theme-provider": "^3.0.5",

‎modules/food-menu/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"react": "^16.0.0",
1515
"react-native": "^0.61.0",
1616
"react-native-vector-icons": "^6.0.0",
17-
"react-navigation": "^3.0.0"
17+
"react-navigation": "^4.0.10"
1818
},
1919
"dependencies": {
2020
"@callstack/react-theme-provider": "^3.0.5",

‎modules/navigation-buttons/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"react": "^16.0.0",
1414
"react-native": "^0.61.0",
1515
"react-native-vector-icons": "^6.0.0",
16-
"react-navigation": "^3.0.0"
16+
"react-navigation": "^4.0.10"
1717
}
1818
}

‎modules/navigation-tabs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"react": "^16.0.0",
1414
"react-native": "^0.61.0",
1515
"react-native-vector-icons": "^6.0.0",
16-
"react-navigation": "^3.0.0",
16+
"react-navigation": "^4.0.10",
1717
"react-navigation-material-bottom-tabs": "^1.0.0"
1818
}
1919
}

‎modules/navigation-tabs/tabbed-view.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import {Platform} from 'react-native'
2-
import {
3-
createBottomTabNavigator,
4-
NavigationScreenRouteConfig,
5-
} from 'react-navigation'
2+
import {NavigationScreenRouteConfig} from 'react-navigation'
3+
import {createBottomTabNavigator} from 'react-navigation-tabs'
64
import {getTheme} from '@frogpond/app-theme'
75
import {createMaterialBottomTabNavigator} from 'react-navigation-material-bottom-tabs'
86

‎package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
"react-native-linear-gradient": "2.5.6",
123123
"react-native-paper": "2.16.0",
124124
"react-native-popover-view": "3.1.1",
125+
"react-native-reanimated": "1.4.0",
125126
"react-native-restart": "0.0.18",
126127
"react-native-safari-view": "2.1.0",
127128
"react-native-screens": "2.16.1",
@@ -130,8 +131,10 @@
130131
"react-native-typography": "1.4.1",
131132
"react-native-vector-icons": "6.6.0",
132133
"react-native-webview": "8.1.2",
133-
"react-navigation": "3.13.0",
134+
"react-navigation": "4.0.10",
134135
"react-navigation-material-bottom-tabs": "1.1.1",
136+
"react-navigation-stack": "1.10.3",
137+
"react-navigation-tabs": "2.5.6",
135138
"react-redux": "7.2.2",
136139
"redux": "4.0.5",
137140
"redux-logger": "3.0.6",

‎source/navigation/navigator.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {Platform, StyleSheet} from 'react-native'
2-
import {createStackNavigator, createAppContainer} from 'react-navigation'
2+
import {createAppContainer} from 'react-navigation'
3+
import {createStackNavigator} from 'react-navigation-stack'
34
import * as c from '@frogpond/colors'
45
import {getTheme} from '@frogpond/app-theme'
56
import {routes} from './routes'

‎yarn.lock‎

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,7 @@
13001300
query-string "^6.13.6"
13011301
react-is "^16.13.0"
13021302

1303-
"@react-navigation/core@~3.5.1":
1303+
"@react-navigation/core@^3.5.1":
13041304
version "3.5.1"
13051305
resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.1.tgz#7a2339fca3496979305fb3a8ab88c2ca8d8c214d"
13061306
integrity sha512-q7NyhWVYOhVIWqL2GZKa6G78YarXaVTTtOlSDkvy4ZIggo40wZzamlnrJRvsaQX46gsgw45FAWb5SriHh8o7eA==
@@ -7761,6 +7761,11 @@ [email protected]:
77617761
dependencies:
77627762
react-native-safe-area-view "0.14.9"
77637763

7764+
[email protected]:
7765+
version "1.4.0"
7766+
resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.4.0.tgz#7f1acbf9be08492d834f512700570978052be2f9"
7767+
integrity sha512-tO7nSNNP+iRLVbkcSS5GXyDBb7tSI02+XuRL3/S39EAr35rnvUy2JfeLUQG+fWSObJjnMVhasUDEUwlENk8IXw==
7768+
77647769
[email protected]:
77657770
version "0.0.18"
77667771
resolved "https://registry.yarnpkg.com/react-native-restart/-/react-native-restart-0.0.18.tgz#f3eeb90cfde7834ad91bd3ede25c8e992965db39"
@@ -7785,10 +7790,10 @@ react-native-safe-area-view@^0.12.0:
77857790
dependencies:
77867791
hoist-non-react-statics "^2.3.1"
77877792

7788-
react-native-safe-area-view@^0.14.1:
7789-
version "0.14.6"
7790-
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.6.tgz#9a9d37d9f8f3887d60c4076eae7b5d2319539446"
7791-
integrity sha512-dbzuvaeHFV1VBpyMaC0gtJ2BqFt6ls/405A0t78YN1sXiTrVr3ki86Ysct8mzifWqLdvWzcWagE5wfMtdxnqoA==
7793+
react-native-safe-area-view@^0.14.6:
7794+
version "0.14.8"
7795+
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz#ef33c46ff8164ae77acad48c3039ec9c34873e5b"
7796+
integrity sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==
77927797
dependencies:
77937798
hoist-non-react-statics "^2.3.1"
77947799

@@ -7804,13 +7809,18 @@ [email protected]:
78047809
dependencies:
78057810
prop-types "^15.5.10"
78067811

7807-
react-native-tab-view@^1.2.0, react-native-tab-view@^1.4.1:
7812+
react-native-tab-view@^1.4.1:
78087813
version "1.4.1"
78097814
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.4.1.tgz#f113cd87485808f0c991abec937f70fa380478b9"
78107815
integrity sha512-Bke8KkDcDhvB/z0AS7MnQKMD2p6Kwfc1rSKlMOvg9CC5CnClQ2QEnhPSbwegKDYhUkBI92iH/BYy7hNSm5kbUQ==
78117816
dependencies:
78127817
prop-types "^15.6.1"
78137818

7819+
react-native-tab-view@^2.9.0:
7820+
version "2.10.0"
7821+
resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-2.10.0.tgz#5e249e5650502010013449ffd4e5edc18a95364b"
7822+
integrity sha512-qgexVz5eO4yaFjdkmn/sURXgVvaBo6pZD/q1eoca96SbPVbaH3WzVhF3bRUfeTHwZkXwznFTpS3JURqIFU8vQA==
7823+
78147824
[email protected]:
78157825
version "3.2.0"
78167826
resolved "https://registry.yarnpkg.com/react-native-tableview-simple/-/react-native-tableview-simple-3.2.0.tgz#5e306200962734fb9717ee1379d71d47056e578e"
@@ -7873,13 +7883,6 @@ [email protected]:
78737883
stacktrace-parser "^0.1.3"
78747884
whatwg-fetch "^3.0.0"
78757885

7876-
react-navigation-drawer@~1.4.0:
7877-
version "1.4.0"
7878-
resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-1.4.0.tgz#70f3dd83e3da9cd4ea6e2739526502c823d466b9"
7879-
integrity sha512-ZyWBozcjB2aZ7vwCALv90cYA2NpDjM+WALaiYRshvPvue8l7cqynePbHK8GhlMGyJDwZqp4MxQmu8u1XAKp3Bw==
7880-
dependencies:
7881-
react-native-tab-view "^1.2.0"
7882-
78837886
[email protected]:
78847887
version "1.1.1"
78857888
resolved "https://registry.yarnpkg.com/react-navigation-material-bottom-tabs/-/react-navigation-material-bottom-tabs-1.1.1.tgz#17e12719958c1d6770b3138789608f54d5cb7f57"
@@ -7889,13 +7892,23 @@ [email protected]:
78897892
prop-types "^15.6.0"
78907893
react-navigation-tabs "~1.2.0"
78917894

7892-
react-navigation-stack@1.5.3:
7893-
version "1.5.3"
7894-
resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.5.3.tgz#cdc9f5a6dbdc55509a15f60d765722573dec1997"
7895-
integrity sha512-MQcwDVbZUYsTtDJb5cFOSm+K+e7KpUCoROaGoUOR+JHWE3uuaJ3pd/Nu+32a57J98TNBf4qq0+2TPJWl6z6IBg==
7895+
react-navigation-stack@1.10.3:
7896+
version "1.10.3"
7897+
resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.10.3.tgz#e714e442b20427f0d2d3c18fce1f9e8cfe69be0b"
7898+
integrity sha512-1gksFi/g/Lg9sBhgLlD0OiEB5xnatHb4C0eNMA5tli9cTVlhq375XNPIqOiTyftibBmjdApAsZFj5srUCoOu/w==
78967899
dependencies:
78977900
prop-types "^15.7.2"
78987901

7902+
[email protected]:
7903+
version "2.5.6"
7904+
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-2.5.6.tgz#51f1a39b6c9525e6b5fe035945c243c04e53242b"
7905+
integrity sha512-4WivEAsChJ+MuJ6JHxhAUMekHnVIt/zc4y/07KChXD5NBkSE0sk4vmMRndZQ6AP3n/ZihACcfigBAsMoqt0JXA==
7906+
dependencies:
7907+
hoist-non-react-statics "^3.3.0"
7908+
react-lifecycles-compat "^3.0.4"
7909+
react-native-safe-area-view "^0.14.6"
7910+
react-native-tab-view "^2.9.0"
7911+
78997912
react-navigation-tabs@~1.2.0:
79007913
version "1.2.0"
79017914
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-1.2.0.tgz#602c147029bb4f1c569b26479ddba534fe3ebb19"
@@ -7913,16 +7926,10 @@ react-navigation@*:
79137926
"@react-navigation/core" "^3.7.9"
79147927
"@react-navigation/native" "^3.8.3"
79157928

7916-
[email protected]:
7917-
version "3.13.0"
7918-
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-3.13.0.tgz#e802bb5174c1ec8b727c69f8e4409ff1351a5250"
7919-
integrity sha512-r64bTImY2aNye8wtd39ubouVB6ZMJqjVQYKxH4LFmOav4FsI59fQTDN7sZzyJa29owowYw/wVkh+NWGT+tdD1A==
7920-
dependencies:
7921-
"@react-navigation/core" "~3.5.1"
7922-
"@react-navigation/native" "~3.6.2"
7923-
react-navigation-drawer "~1.4.0"
7924-
react-navigation-stack "1.5.3"
7925-
react-navigation-tabs "~1.2.0"
7929+
[email protected]:
7930+
version "4.0.10"
7931+
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.0.10.tgz#ddf41134600689d6ba99e35dd22ba1f664f91e5c"
7932+
integrity sha512-7PqvmsdQ7HIyxPUMYbd9Uq//VoMdniEOLAOSvIhb/ExtbAt/1INSjUF+RiMWOMCWLTCNvNPRvTz7xy7qwWureg==
79267933

79277934
[email protected]:
79287935
version "7.2.2"

0 commit comments

Comments
 (0)