Skip to content

Commit

Permalink
Merge branch 'main' into allow-customizing-draweritem-link-pressable
Browse files Browse the repository at this point in the history
  • Loading branch information
MContagious committed May 29, 2023
2 parents 1144693 + 1613461 commit 4a4799d
Show file tree
Hide file tree
Showing 14 changed files with 1,678 additions and 2,023 deletions.
35 changes: 17 additions & 18 deletions example/package.json
Expand Up @@ -15,25 +15,25 @@
"dependencies": {
"@expo/vector-icons": "^13.0.0",
"@react-native-async-storage/async-storage": "~1.17.11",
"@react-native-masked-view/masked-view": "0.2.8",
"@react-native-masked-view/masked-view": "0.2.9",
"color": "^4.2.3",
"expo": "^47.0.8",
"expo": "^48.0.17",
"expo-asset": "~8.6.2",
"expo-blur": "~12.0.1",
"expo-linking": "~3.2.3",
"expo-splash-screen": "~0.17.5",
"expo-status-bar": "~1.4.2",
"expo-updates": "~0.15.6",
"expo-blur": "~12.2.2",
"expo-linking": "~4.0.1",
"expo-splash-screen": "~0.18.2",
"expo-status-bar": "~1.4.4",
"expo-updates": "~0.16.4",
"koa": "^2.14.1",
"react": "18.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.70.5",
"react-native-gesture-handler": "~2.8.0",
"react-native-pager-view": "6.0.1",
"react-native": "0.71.8",
"react-native-gesture-handler": "~2.9.0",
"react-native-pager-view": "6.1.2",
"react-native-paper": "^4.12.5",
"react-native-reanimated": "~2.9.1",
"react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.18.0",
"react-native-reanimated": "~2.14.4",
"react-native-safe-area-context": "4.5.0",
"react-native-screens": "~3.20.0",
"react-native-web": "~0.18.7"
},
"devDependencies": {
Expand All @@ -45,15 +45,14 @@
"@types/jest-dev-server": "^5.0.0",
"@types/koa": "^2.13.5",
"@types/mock-require": "^2.0.1",
"@types/react": "~18.0.26",
"@types/react-dom": "~18.0.9",
"@types/react": "~18.0.27",
"@types/react-dom": "~18.0.10",
"@types/react-native": "~0.70.8",
"babel-loader": "^8.3.0",
"babel-plugin-module-resolver": "^4.1.0",
"babel-preset-expo": "~9.2.2",
"babel-preset-expo": "^9.3.0",
"cheerio": "^1.0.0-rc.12",
"expect-type": "^0.15.0",
"expo-cli": "^6.2.1",
"jest-dev-server": "^6.1.1",
"mock-require": "^3.0.3",
"mock-require-assets": "^0.0.3",
Expand Down
10 changes: 5 additions & 5 deletions packages/bottom-tabs/package.json
Expand Up @@ -43,14 +43,14 @@
"@react-navigation/native": "workspace:^",
"@testing-library/react-native": "^11.5.0",
"@types/color": "^3.0.3",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"@types/react-native": "~0.70.8",
"del-cli": "^5.0.0",
"react": "18.1.0",
"react-native": "0.70.5",
"react": "18.2.0",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.18.0",
"react-native-safe-area-context": "4.5.0",
"react-native-screens": "~3.20.0",
"typescript": "^4.9.4"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Expand Up @@ -44,11 +44,11 @@
},
"devDependencies": {
"@testing-library/react-native": "^11.5.0",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"@types/react-is": "^17.0.3",
"del-cli": "^5.0.0",
"immer": "^9.0.16",
"react": "18.1.0",
"react": "18.2.0",
"react-native-builder-bob": "^0.20.4",
"react-test-renderer": "18.1.0",
"typescript": "^4.9.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/devtools/package.json
Expand Up @@ -44,9 +44,9 @@
"@react-navigation/core": "workspace:^",
"@testing-library/react-native": "^11.5.0",
"@types/deep-equal": "^1.0.1",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"del-cli": "^5.0.0",
"react": "18.1.0",
"react": "18.2.0",
"react-native-builder-bob": "^0.20.4",
"typescript": "^4.9.4"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/drawer/package.json
Expand Up @@ -49,16 +49,16 @@
"devDependencies": {
"@react-navigation/native": "workspace:^",
"@testing-library/react-native": "^11.5.0",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"@types/react-native": "~0.70.8",
"del-cli": "^5.0.0",
"react": "18.1.0",
"react-native": "0.70.5",
"react": "18.2.0",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"react-native-gesture-handler": "~2.8.0",
"react-native-reanimated": "~2.9.1",
"react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.18.0",
"react-native-gesture-handler": "~2.9.0",
"react-native-reanimated": "~2.14.4",
"react-native-safe-area-context": "4.5.0",
"react-native-screens": "~3.20.0",
"typescript": "^4.9.4"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/elements/package.json
Expand Up @@ -37,14 +37,14 @@
"clean": "del lib"
},
"devDependencies": {
"@react-native-masked-view/masked-view": "0.2.8",
"@react-native-masked-view/masked-view": "0.2.9",
"@react-navigation/native": "workspace:^",
"@testing-library/react-native": "^11.5.0",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"@types/react-native": "~0.70.8",
"del-cli": "^5.0.0",
"react": "18.1.0",
"react-native": "0.70.5",
"react": "18.2.0",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"typescript": "^4.9.4"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/material-top-tabs/package.json
Expand Up @@ -47,13 +47,13 @@
"devDependencies": {
"@react-navigation/native": "workspace:^",
"@testing-library/react-native": "^11.5.0",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"@types/react-native": "~0.70.8",
"del-cli": "^5.0.0",
"react": "18.1.0",
"react-native": "0.70.5",
"react": "18.2.0",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"react-native-pager-view": "6.0.1",
"react-native-pager-view": "6.1.2",
"typescript": "^4.9.4"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/native-stack/package.json
Expand Up @@ -47,13 +47,13 @@
"devDependencies": {
"@react-navigation/native": "workspace:^",
"@testing-library/react-native": "^11.5.0",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"@types/react-native": "~0.70.8",
"del-cli": "^5.0.0",
"react": "18.1.0",
"react-native": "0.70.5",
"react": "18.2.0",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"react-native-screens": "~3.18.0",
"react-native-screens": "~3.20.0",
"typescript": "^4.9.4"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/native/package.json
Expand Up @@ -44,13 +44,13 @@
},
"devDependencies": {
"@testing-library/react-native": "^11.5.0",
"@types/react": "~18.0.26",
"@types/react-dom": "~18.0.9",
"@types/react": "~18.0.27",
"@types/react-dom": "~18.0.10",
"@types/react-native": "~0.70.8",
"del-cli": "^5.0.0",
"react": "18.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.70.5",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"typescript": "^4.9.4"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-drawer-layout/package.json
Expand Up @@ -41,8 +41,8 @@
},
"devDependencies": {
"del-cli": "^5.0.0",
"react": "18.1.0",
"react-native": "0.70.5",
"react": "18.2.0",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"typescript": "^4.9.4"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native-tab-view/package.json
Expand Up @@ -43,10 +43,10 @@
},
"devDependencies": {
"del-cli": "^5.0.0",
"react": "18.1.0",
"react-native": "0.70.5",
"react": "18.2.0",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"react-native-pager-view": "6.0.1",
"react-native-pager-view": "6.1.2",
"typescript": "^4.9.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-tab-view/src/SceneView.tsx
Expand Up @@ -54,7 +54,7 @@ export function SceneView<T extends Route>({
};

let unsubscribe: (() => void) | undefined;
let timer: NodeJS.Timeout;
let timer: number;

if (lazy && isLoading) {
// If lazy mode is enabled, listen to when we enter screens
Expand Down
12 changes: 6 additions & 6 deletions packages/stack/package.json
Expand Up @@ -47,15 +47,15 @@
"@react-navigation/native": "workspace:^",
"@testing-library/react-native": "^11.5.0",
"@types/color": "^3.0.3",
"@types/react": "~18.0.26",
"@types/react": "~18.0.27",
"@types/react-native": "~0.70.8",
"del-cli": "^5.0.0",
"react": "18.1.0",
"react-native": "0.70.5",
"react": "18.2.0",
"react-native": "0.71.8",
"react-native-builder-bob": "^0.20.4",
"react-native-gesture-handler": "~2.8.0",
"react-native-safe-area-context": "4.4.1",
"react-native-screens": "~3.18.0",
"react-native-gesture-handler": "~2.9.0",
"react-native-safe-area-context": "4.5.0",
"react-native-screens": "~3.20.0",
"typescript": "^4.9.4"
},
"peerDependencies": {
Expand Down

0 comments on commit 4a4799d

Please sign in to comment.