diff --git a/package.json b/package.json index 5675681cae..a68abe5751 100644 --- a/package.json +++ b/package.json @@ -94,10 +94,10 @@ "@react-native-async-storage/async-storage": "2.1.2", "@react-native-menu/menu": "^1.2.3", "@react-native-picker/picker": "2.11.0", - "@react-navigation/bottom-tabs": "^6.5.20", - "@react-navigation/drawer": "^6.6.15", - "@react-navigation/native": "^6.1.17", - "@react-navigation/native-stack": "^6.9.26", + "@react-navigation/bottom-tabs": "7.0.0-rc.35", + "@react-navigation/drawer": "7.0.0-rc.32", + "@react-navigation/native": "7.0.0-rc.21", + "@react-navigation/native-stack": "7.0.0-rc.29", "@sentry/react-native": "~6.10.0", "@tanstack/query-async-storage-persister": "^5.25.0", "@tanstack/react-query": "^5.8.1", diff --git a/src/Navigation.tsx b/src/Navigation.tsx index 8b981df7c1..f7f9396e10 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -524,6 +524,7 @@ function HomeTabNavigator() { animationDuration: 285, gestureEnabled: true, fullScreenGestureEnabled: true, + fullScreenSwipeShadowEnabled: true, headerShown: false, contentStyle: t.atoms.bg, }}> @@ -542,6 +543,7 @@ function SearchTabNavigator() { animationDuration: 285, gestureEnabled: true, fullScreenGestureEnabled: true, + fullScreenSwipeShadowEnabled: true, headerShown: false, contentStyle: t.atoms.bg, }}> @@ -559,6 +561,7 @@ function NotificationsTabNavigator() { animationDuration: 285, gestureEnabled: true, fullScreenGestureEnabled: true, + fullScreenSwipeShadowEnabled: true, headerShown: false, contentStyle: t.atoms.bg, }}> @@ -580,6 +583,7 @@ function MyProfileTabNavigator() { animationDuration: 285, gestureEnabled: true, fullScreenGestureEnabled: true, + fullScreenSwipeShadowEnabled: true, headerShown: false, contentStyle: t.atoms.bg, }}> @@ -605,6 +609,7 @@ function MessagesTabNavigator() { animationDuration: 285, gestureEnabled: true, fullScreenGestureEnabled: true, + fullScreenSwipeShadowEnabled: true, headerShown: false, contentStyle: t.atoms.bg, }}> @@ -638,6 +643,7 @@ const FlatNavigator = () => { animationDuration: 285, gestureEnabled: true, fullScreenGestureEnabled: true, + fullScreenSwipeShadowEnabled: true, headerShown: false, contentStyle: t.atoms.bg, }}> diff --git a/src/components/Link.tsx b/src/components/Link.tsx index cca93c0c8c..01060ab461 100644 --- a/src/components/Link.tsx +++ b/src/components/Link.tsx @@ -93,8 +93,12 @@ export function useLink({ }) { const navigation = useNavigationDeduped() const {href} = useLinkProps({ - to: - typeof to === 'string' ? convertBskyAppUrlIfNeeded(sanitizeUrl(to)) : to, + params: typeof to === 'string' ? undefined : to.params, + screen: typeof to === 'string' ? undefined : to.screen, + href: + typeof to === 'string' + ? convertBskyAppUrlIfNeeded(sanitizeUrl(to)) + : undefined, }) const isExternal = isExternalUrl(href) const {openModal, closeModal} = useModalControls() diff --git a/yarn.lock b/yarn.lock index a9901c42c5..f7b219f971 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6289,65 +6289,69 @@ invariant "^2.2.4" nullthrows "^1.1.1" -"@react-navigation/bottom-tabs@^6.5.20": - version "6.5.20" - resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-6.5.20.tgz#5335e75b02c527ef0569bd97d4f9185d65616e49" - integrity sha512-ow6Z06iS4VqBO8d7FP+HsGjJLWt2xTWIvuWjpoCvsM/uQXzCRDIjBv9HaKcXbF0yTW7IMir0oDAbU5PFzEDdgA== +"@react-navigation/bottom-tabs@7.0.0-rc.35": + version "7.0.0-rc.35" + resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-7.0.0-rc.35.tgz#4dd364682b9dbefc7da28ced638a9c079eafce74" + integrity sha512-Kxnr2uZ8VK02Qy6zwvxNrJNt9a1NIQWTbIWU2RBdFfGis7YRoE2RHGkAdMhB+7GlQuXaoiBDok0YPKfHbTy/oQ== dependencies: - "@react-navigation/elements" "^1.3.30" + "@react-navigation/elements" "^2.0.0-rc.26" color "^4.2.3" - warn-once "^0.1.0" -"@react-navigation/core@^6.4.16": - version "6.4.16" - resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-6.4.16.tgz#f9369a134805174536b9aa0f0f483b930511caf9" - integrity sha512-UDTJBsHxnzgFETR3ZxhctP+RWr4SkyeZpbhpkQoIGOuwSCkt1SE0qjU48/u6r6w6XlX8OqVudn1Ab0QFXTHxuQ== +"@react-navigation/core@^7.0.0-rc.15": + version "7.0.0-rc.15" + resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-7.0.0-rc.15.tgz#a6f1ae41c6afc690c54c2c3473011bab25e224dc" + integrity sha512-g02FyrUVVzUrzlYSp3ZHXWCFyZEDFEjiccEMBDwmgCWr/9NnnSYQ00utlyTU5GmGoFK1G1NAN1O+Q4YlT+GT1A== dependencies: - "@react-navigation/routers" "^6.1.9" + "@react-navigation/routers" "^7.0.0-rc.8" escape-string-regexp "^4.0.0" - nanoid "^3.1.23" + nanoid "3.3.7" query-string "^7.1.3" - react-is "^16.13.0" - use-latest-callback "^0.1.9" + react-is "^18.2.0" + use-latest-callback "^0.2.1" + use-sync-external-store "^1.2.2" -"@react-navigation/drawer@^6.6.15": - version "6.6.15" - resolved "https://registry.yarnpkg.com/@react-navigation/drawer/-/drawer-6.6.15.tgz#fcedba68f735103dbc035911f5959ce926081d62" - integrity sha512-GLkFQNxjtmxB/qXSHmu1DfoB89jCzW64tmX68iPndth+9U+0IP27GcCCaMZxQfwj+nI8Kn2zlTlXAZDIIHE+DQ== +"@react-navigation/drawer@7.0.0-rc.32": + version "7.0.0-rc.32" + resolved "https://registry.yarnpkg.com/@react-navigation/drawer/-/drawer-7.0.0-rc.32.tgz#914065b38767289a7b0878bb3b007b816b7b0c3b" + integrity sha512-fKdSvPNkBCjpqpxouKNYzVuoqdGfUjYF2IrJNtA/yphnH7peGtRRvITpC+7FAkWWe0A5ZC275YzG/5CpvVeLyA== dependencies: - "@react-navigation/elements" "^1.3.30" + "@react-navigation/elements" "^2.0.0-rc.26" color "^4.2.3" - warn-once "^0.1.0" + react-native-drawer-layout "^4.0.0-rc.11" + use-latest-callback "^0.2.1" -"@react-navigation/elements@^1.3.30": - version "1.3.30" - resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-1.3.30.tgz#a81371f599af1070b12014f05d6c09b1a611fd9a" - integrity sha512-plhc8UvCZs0UkV+sI+3bisIyn78wz9O/BiWZXpounu72k/R/Sj5PuZYFJ1fi6psvriUveMCGh4LeZckAZu2qiQ== - -"@react-navigation/native-stack@^6.9.26": - version "6.9.26" - resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-6.9.26.tgz#90facf7783c9927f094bc9f01c613af75b6c241e" - integrity sha512-++dueQ+FDj2XkZ902DVrK79ub1vp19nSdAZWxKRgd6+Bc0Niiesua6rMCqymYOVaYh+dagwkA9r00bpt/U5WLw== +"@react-navigation/elements@^2.0.0-rc.26": + version "2.0.0-rc.26" + resolved "https://registry.yarnpkg.com/@react-navigation/elements/-/elements-2.0.0-rc.26.tgz#a786367f3fc1d6d041d6e9ca097a66da8018ae70" + integrity sha512-omtEkb2E8j3dYLq08YGsDykQoVLtTLWAQXp0ql6cB8qjtMhP7rMhoBU50veh0Tes/96Sm3X0e3WZPQMVBKrSSg== dependencies: - "@react-navigation/elements" "^1.3.30" - warn-once "^0.1.0" + color "^4.2.3" -"@react-navigation/native@^6.1.17": - version "6.1.17" - resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-6.1.17.tgz#439f15a99809d26ea4682d2a3766081cf2ca31cf" - integrity sha512-mer3OvfwWOHoUSMJyLa4vnBH3zpFmCwuzrBPlw7feXklurr/ZDiLjLxUScOot6jLRMz/67GyilEYMmP99LL0RQ== +"@react-navigation/native-stack@7.0.0-rc.29": + version "7.0.0-rc.29" + resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-7.0.0-rc.29.tgz#6301559139d906171bffbc22fa090aa4957e103e" + integrity sha512-KHjtwN+PFDiQi75MdJXQqvkBr5In6hwZKQJsFqWiwNa5bCWMV/KxtHK6LkC2sXAGO64A2xixIFYUgkx71Cd5xw== dependencies: - "@react-navigation/core" "^6.4.16" + "@react-navigation/elements" "^2.0.0-rc.26" + warn-once "^0.1.1" + +"@react-navigation/native@7.0.0-rc.21": + version "7.0.0-rc.21" + resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-7.0.0-rc.21.tgz#055aad0f2835696a501212060f7d0377ec01cb18" + integrity sha512-7cPQ6lX+ovR2YQa0AzVI4YnE3tDl01vVi+TZrss4HYXsxuRlKOE45PS1Seel0b7PlLf9df0OhDckPJWoHF+qaQ== + dependencies: + "@react-navigation/core" "^7.0.0-rc.15" escape-string-regexp "^4.0.0" fast-deep-equal "^3.1.3" - nanoid "^3.1.23" + nanoid "3.3.7" + use-latest-callback "^0.2.1" -"@react-navigation/routers@^6.1.9": - version "6.1.9" - resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-6.1.9.tgz#73f5481a15a38e36592a0afa13c3c064b9f90bed" - integrity sha512-lTM8gSFHSfkJvQkxacGM6VJtBt61ip2XO54aNfswD+KMw6eeZ4oehl7m0me3CR9hnDE4+60iAZR8sAhvCiI3NA== +"@react-navigation/routers@^7.0.0-rc.8": + version "7.0.0-rc.8" + resolved "https://registry.yarnpkg.com/@react-navigation/routers/-/routers-7.0.0-rc.8.tgz#fac5f6b3bfe2c29b77a0767493b262df19c4ee68" + integrity sha512-90E091XEiBd2pimv3ANNpjoAJK0V090SGuyPwU9CmgYfVe6BFdzfSNcOvIvJ9qLgjVKWrBzzoVBqZOwcYv+8zQ== dependencies: - nanoid "^3.1.23" + nanoid "3.3.7" "@remirror/core-constants@3.0.0": version "3.0.0" @@ -14962,16 +14966,16 @@ mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" -nanoid@^3.1.23, nanoid@^3.3.1, nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== - -nanoid@^3.3.7: +nanoid@3.3.7, nanoid@^3.3.7: version "3.3.7" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== +nanoid@^3.3.1, nanoid@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + nanoid@^5.0.5: version "5.0.5" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.0.5.tgz#5112efb5c0caf4fc80680d66d303c65233a79fdd" @@ -16732,7 +16736,7 @@ react-is@19, react-is@^19.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.1.0.tgz#805bce321546b7e14c084989c77022351bbdd11b" integrity sha512-Oe56aUPnkHyyDxxkvqtd7KkdQP5uIUfHxd5XTb3wE9d/kRnZLmKbDB0GWk919tdQ+mxxPtG6EAs6RMT6i1qtHg== -react-is@^16.13.0, react-is@^16.13.1, react-is@^16.7.0: +react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -16742,6 +16746,11 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== +react-is@^18.2.0: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" + integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== + react-keyed-flatten-children@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/react-keyed-flatten-children/-/react-keyed-flatten-children-5.0.0.tgz#3024fc8819f7b60fc5039b527f133d9ac3a02a82" @@ -16764,6 +16773,13 @@ react-native-dotenv@^3.4.11: dependencies: dotenv "^16.4.5" +react-native-drawer-layout@^4.0.0-rc.11: + version "4.0.0-rc.11" + resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.0.0-rc.11.tgz#cae94060f24068d15b6699cbda12031daa209f34" + integrity sha512-LIKLAdS07GSNKV5f3K6RX+nLQskvSYp4Fe8VV2dvIMwrmEFEKagruM/S3NenwSsh8sewraV1oV4BjHHUq2PSsQ== + dependencies: + use-latest-callback "^0.2.1" + react-native-drawer-layout@^4.1.6: version "4.1.7" resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-4.1.7.tgz#1c741c9bf9c739d6672201692e4ba4839ca0c8ff" @@ -19388,10 +19404,10 @@ use-isomorphic-layout-effect@^1.1.1: resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== -use-latest-callback@^0.1.9: - version "0.1.9" - resolved "https://registry.yarnpkg.com/use-latest-callback/-/use-latest-callback-0.1.9.tgz#10191dc54257e65a8e52322127643a8940271e2a" - integrity sha512-CL/29uS74AwreI/f2oz2hLTW7ZqVeV5+gxFeGudzQrgkCytrHw33G4KbnQOrRlAEzzAFXi7dDLMC9zhWcVpzmw== +use-latest-callback@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/use-latest-callback/-/use-latest-callback-0.2.1.tgz#4d4e6a9e4817b13142834850dcfa8d24ca4569cf" + integrity sha512-QWlq8Is8BGWBf883QOEQP5HWYX/kMI+JTbJ5rdtvJLmXTIh9XoHIO3PQcmQl8BU44VKxow1kbQUHa6mQSMALDQ== use-latest-callback@^0.2.3: version "0.2.3" @@ -19527,7 +19543,7 @@ walker@^1.0.7, walker@^1.0.8: dependencies: makeerror "1.0.12" -warn-once@0.1.1, warn-once@^0.1.0: +warn-once@0.1.1, warn-once@^0.1.0, warn-once@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/warn-once/-/warn-once-0.1.1.tgz#952088f4fb56896e73fd4e6a3767272a3fccce43" integrity sha512-VkQZJbO8zVImzYFteBXvBOZEl1qL175WH8VmZcxF2fZAoudNhNDvHi+doCaAEdU2l2vtcIwa2zn0QK5+I1HQ3Q==