diff --git a/package.json b/package.json index 044f7a6..7195f45 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,8 @@ "react-native-reanimated@4.7.1": "patches/react-native-reanimated@4.7.1.patch", "expo-modules-core@58.0.24": "patches/expo-modules-core@58.0.24.patch", "expo-file-system@58.0.10": "patches/expo-file-system@58.0.10.patch", - "@react-native-community/slider@5.2.1": "patches/@react-native-community__slider@5.2.1.patch" + "@react-native-community/slider@5.2.1": "patches/@react-native-community__slider@5.2.1.patch", + "expo-router@58.0.25": "patches/expo-router@58.0.25.patch" } } } diff --git a/patches/expo-router@58.0.25.patch b/patches/expo-router@58.0.25.patch new file mode 100644 index 0000000..d4b5bb1 --- /dev/null +++ b/patches/expo-router@58.0.25.patch @@ -0,0 +1,27 @@ +diff --git a/build/useScreens.js b/build/useScreens.js +index fec20121290650f18f39bc18cbb9e4a2a1626133..31c32ff23b36c43f1e98c58fdd7c1727c8a839df 100644 +--- a/build/useScreens.js ++++ b/build/useScreens.js +@@ -364,9 +364,6 @@ function getQualifiedRouteComponent(value) { + /*#__PURE__*/ (0, _jsxruntime().jsxs)(_zoomtransitioncontextproviders.ZoomTransitionTargetContextProvider, { + route: route, + children: [ +- /*#__PURE__*/ (0, _jsxruntime().jsx)(_ZoomTransitionEnabler.ZoomTransitionEnabler, { +- route: route +- }), + /*#__PURE__*/ (0, _jsxruntime().jsx)(_react().default.Suspense, { + name: route ? `Route(${route.name})` : undefined, + fallback: // `ResolvedSuspenseFallback` only selects between statically defined +@@ -380,6 +377,12 @@ function getQualifiedRouteComponent(value) { + hideWhenNestedAtLevel: activityThreshold, + children: screenContent + }) : screenContent ++ }), ++ // Render the enabler after the screen content so the screen's scroll ++ // view stays its first descendant. react-native-screens only wires the ++ // header search bar and content insets to the first descendant chain. ++ /*#__PURE__*/ (0, _jsxruntime().jsx)(_ZoomTransitionEnabler.ZoomTransitionEnabler, { ++ route: route + }) + ] + }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 92fa032..c4c9276 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ patchedDependencies: expo-modules-core@58.0.24: hash: c6fb26bed9ccbc12a81ff69ff56d98af89bacc0a3e44770950f9addf302657ed path: patches/expo-modules-core@58.0.24.patch + expo-router@58.0.25: + hash: 9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c + path: patches/expo-router@58.0.25.patch react-native-reanimated@4.7.1: hash: badfed6babfff7fa495b3a06ba8f324be0e5ff82cedb6084f9f4d1dad65984d3 path: patches/react-native-reanimated@4.7.1.patch @@ -111,7 +114,7 @@ importers: version: 58.0.4(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0) expo-router: specifier: ~58.0.25 - version: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585) + version: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(8aefb264c8a29c1f36eeb4f71100c585) expo-secure-store: specifier: ~58.0.2 version: 58.0.2(expo@58.0.17) @@ -7562,7 +7565,7 @@ snapshots: ws: 8.21.0 zod: 3.25.76 optionalDependencies: - expo-router: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585) + expo-router: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(8aefb264c8a29c1f36eeb4f71100c585) react-native: 0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0) transitivePeerDependencies: - '@expo/dom-webview' @@ -7863,7 +7866,7 @@ snapshots: react: 19.3.0 optionalDependencies: '@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0) - expo-router: 58.0.25(8aefb264c8a29c1f36eeb4f71100c585) + expo-router: 58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(8aefb264c8a29c1f36eeb4f71100c585) react-dom: 19.3.0(react@19.3.0) transitivePeerDependencies: - supports-color @@ -11272,7 +11275,7 @@ snapshots: transitivePeerDependencies: - supports-color - expo-router@58.0.25(8aefb264c8a29c1f36eeb4f71100c585): + expo-router@58.0.25(patch_hash=9a20fd2b8a07da2435e76bf21a7242492a103d3e3d43b1a20165c290c494ae8c)(8aefb264c8a29c1f36eeb4f71100c585): dependencies: '@expo/log-box': 58.0.13(@expo/dom-webview@58.0.2)(expo@58.0.17)(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0) '@expo/metro-runtime': 58.0.15(@expo/log-box@58.0.13)(expo@58.0.17)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.0(@babel/core@7.29.7)(@react-native/metro-config@0.88.0(@babel/core@7.29.7))(@types/react@19.3.0)(react@19.3.0))(react@19.3.0)