diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2511f26d7f86..775b2fb870ff 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -528,7 +528,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -554,7 +553,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -579,7 +577,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -606,7 +603,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -632,7 +628,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -658,7 +653,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -684,7 +678,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -710,7 +703,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -736,7 +728,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -762,7 +753,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -788,7 +778,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -814,7 +803,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -840,7 +828,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -866,7 +853,6 @@ PODS: - React-jsinspectorcdp - React-jsitooling - React-perflogger - - React-rendererconsistency - React-runtimeexecutor - React-runtimescheduler - React-utils @@ -4625,7 +4611,7 @@ SPEC CHECKSUMS: AirshipServiceExtension: 50d11b2f62c4a490d4e81a1c36f70e2ecb70a27e AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73 AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0 - boost: 659a89341ea4ab3df8259733813b52f26d8be9a5 + boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90 DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb EXAV: ae28256069c4cdde93d185c007d8f68d92902c2e EXConstants: a95804601ee4a6aa7800645f9b070d753b1142b3 @@ -4637,7 +4623,7 @@ SPEC CHECKSUMS: ExpoFont: 86ceec09ffed1c99cfee36ceb79ba149074901b5 ExpoImage: e88f500585913969b930e13a4be47277eb7c6de8 ExpoImageManipulator: 7cb78b082bcc767b97867d833ce614ace424cd97 - ExpoLocation: 1dc9e4c06ef66ed081348a11eb637d1dfecc7d61 + ExpoLocation: 93d7faa0c2adbd5a04686af0c1a61bc6ed3ee2f7 ExpoModulesCore: e1b5401a7af4c7dbf4fe26b535918a72c6ed8a7b ExpoSecureStore: 3f1b632d6d40bcc62b4983ef9199cd079592a50a ExpoStoreReview: 15f19e0d6cb6e00330ba1b356485bf47ef19c39a @@ -4689,14 +4675,14 @@ SPEC CHECKSUMS: PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 pusher-websocket-react-native: 31b5fdd632bfa6d417f9ad0bceefe403ab41825d PusherSwift: fa3d5f6587c20ad5790de87a5c9b150367b5f0f5 - RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f + RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669 RCTDeprecation: c0ed3249a97243002615517dff789bf4666cf585 RCTRequired: 58719f5124f9267b5f9649c08bf23d9aea845b23 RCTTypeSafety: 4aefa8328ab1f86da273f08517f1f6b343f6c2cc React: 2073376f47c71b7e9a0af7535986a77522ce1049 React-callinvoker: 751b6f2c83347a0486391c3f266f291f0f53b27e React-Codegen: 4b8b4817cea7a54b83851d4c1f91f79aa73de30a - React-Core: aeebd9b37ac383279f610f1e53f66b9931686a41 + React-Core: dff5d29973349b11dd6631c9498456d75f846d5e React-CoreModules: c0ae04452e4c5d30e06f8e94692a49107657f537 React-cxxreact: 376fd672c95dfb64ad5cc246e6a1e9edb78dec4c React-debug: d4955c86870792887ed695df6ebf0e94e39dc7e1 @@ -4747,7 +4733,7 @@ SPEC CHECKSUMS: react-native-webview: cdce419e8022d0ef6f07db21890631258e7a9e6e React-NativeModulesApple: 8c7eb6057b00c191a11ad5ced41826ec5a0e4d78 React-oscompat: 93b5535ea7f7dff46aaee4f78309a70979bdde9d - React-perflogger: e7dcbfcb796d346be7936b75740c3e27a4bb3977 + React-perflogger: 5536d2df3d18fe0920263466f7b46a56351c0510 React-performancetimeline: c6c9393c1a0453a51e1852e3531defe60790b36c React-RCTActionSheet: 42195ae666e6d79b4af2346770f765b7c29435b9 React-RCTAnimation: fa103ccc3503b1ed8dedca7e62e7823937748843 @@ -4762,7 +4748,7 @@ SPEC CHECKSUMS: React-RCTSettings: 71f5c7fd7b5f4e725a4e2114a4b4373d0e46048f React-RCTText: b94d4699b49285bee22b8ebf768924d607eccee3 React-RCTVibration: 6e3993c4f6c36a3899059f9a9ead560ddaf5a7d7 - React-rendererconsistency: bef28690433e2b4bb00c2f884b22b86e61a430f2 + React-rendererconsistency: 612d0f6603d9837bb1236d7fd5194203b35c8799 React-renderercss: e5c2c3b84976f7a587cde8423c671db07a6a77da React-rendererdebug: cc7a6131733605b8897754f72c0c35c79f77da9e React-RuntimeApple: 3f96102fc1ebf738d36719cdce5422a5769293fb diff --git a/package-lock.json b/package-lock.json index 4068884d69dd..fbf518e0fe05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,9 +46,9 @@ "@react-native-google-signin/google-signin": "^10.0.1", "@react-native-picker/picker": "2.11.3", "@react-navigation/material-top-tabs": "7.2.13", - "@react-navigation/native": "7.1.10", + "@react-navigation/native": "7.1.24", "@react-navigation/native-stack": "7.3.14", - "@react-navigation/stack": "7.3.3", + "@react-navigation/stack": "7.6.11", "@react-ng/bounds-observer": "^0.2.1", "@rnmapbox/maps": "10.1.44", "@sentry/react-native": "^7.6.0", @@ -12746,15 +12746,18 @@ } }, "node_modules/@react-navigation/core": { - "version": "7.10.0", + "version": "7.13.5", + "resolved": "https://registry.npmjs.org/@react-navigation/core/-/core-7.13.5.tgz", + "integrity": "sha512-4aTSHPWa3oQPLoanFYnzR2tyQmVRD6qsWsPigW8qAdSDA0ngl/h9dl2h9XvDPcOb7PKeVVVhbukRyytkXKf50w==", "license": "MIT", "dependencies": { - "@react-navigation/routers": "^7.4.0", + "@react-navigation/routers": "^7.5.2", "escape-string-regexp": "^4.0.0", + "fast-deep-equal": "^3.1.3", "nanoid": "^3.3.11", "query-string": "^7.1.3", "react-is": "^19.1.0", - "use-latest-callback": "^0.2.3", + "use-latest-callback": "^0.2.4", "use-sync-external-store": "^1.5.0" }, "peerDependencies": { @@ -12762,16 +12765,11 @@ } }, "node_modules/@react-navigation/core/node_modules/react-is": { - "version": "19.1.0", + "version": "19.2.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.1.tgz", + "integrity": "sha512-L7BnWgRbMwzMAubQcS7sXdPdNLmKlucPlopgAzx7FtYbksWZgEWiuYM5x9T6UqS2Ne0rsgQTq5kY2SGqpzUkYA==", "license": "MIT" }, - "node_modules/@react-navigation/core/node_modules/use-latest-callback": { - "version": "0.2.3", - "license": "MIT", - "peerDependencies": { - "react": ">=16.8" - } - }, "node_modules/@react-navigation/devtools": { "version": "6.0.10", "dev": true, @@ -12786,14 +12784,18 @@ } }, "node_modules/@react-navigation/elements": { - "version": "2.4.3", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-2.9.1.tgz", + "integrity": "sha512-Jn2F+tXiQOY8L5mLMety6tfQUwBA8daz3whQmI8utvFvtSdfutOqH9P5ZC/QjlZEY5zcA4ZeuDzM0LKkrtFgqw==", "license": "MIT", "dependencies": { - "color": "^4.2.3" + "color": "^4.2.3", + "use-latest-callback": "^0.2.4", + "use-sync-external-store": "^1.5.0" }, "peerDependencies": { "@react-native-masked-view/masked-view": ">= 0.2.0", - "@react-navigation/native": "^7.1.10", + "@react-navigation/native": "^7.1.24", "react": ">= 18.2.0", "react-native": "*", "react-native-safe-area-context": ">= 4.0.0" @@ -12821,14 +12823,16 @@ } }, "node_modules/@react-navigation/native": { - "version": "7.1.10", + "version": "7.1.24", + "resolved": "https://registry.npmjs.org/@react-navigation/native/-/native-7.1.24.tgz", + "integrity": "sha512-L9glh8MywAtD1h6O65Y1alGDi2FsLEBYnXkb9sx3UPSbG7pkWEnLbkEy7rWgi4Vr+DZUS18VmFsCKPmczOWcow==", "license": "MIT", "dependencies": { - "@react-navigation/core": "^7.10.0", + "@react-navigation/core": "^7.13.5", "escape-string-regexp": "^4.0.0", "fast-deep-equal": "^3.1.3", "nanoid": "^3.3.11", - "use-latest-callback": "^0.2.3" + "use-latest-callback": "^0.2.4" }, "peerDependencies": { "react": ">= 18.2.0", @@ -12850,29 +12854,27 @@ "react-native-screens": ">= 4.0.0" } }, - "node_modules/@react-navigation/native/node_modules/use-latest-callback": { - "version": "0.2.3", - "license": "MIT", - "peerDependencies": { - "react": ">=16.8" - } - }, "node_modules/@react-navigation/routers": { - "version": "7.4.0", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-7.5.2.tgz", + "integrity": "sha512-kymreY5aeTz843E+iPAukrsOtc7nabAH6novtAPREmmGu77dQpfxPB2ZWpKb5nRErIRowp1kYRoN2Ckl+S6JYw==", "license": "MIT", "dependencies": { "nanoid": "^3.3.11" } }, "node_modules/@react-navigation/stack": { - "version": "7.3.3", + "version": "7.6.11", + "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-7.6.11.tgz", + "integrity": "sha512-jhLoXmmdeSv6MSYTgOTGaVnDNHrhcknO+AwaUdscle4yCavEsa+0maS8yI5HsOKWoT0zjVrvNfRofPXsz3i2cg==", "license": "MIT", "dependencies": { - "@react-navigation/elements": "^2.4.3", - "color": "^4.2.3" + "@react-navigation/elements": "^2.9.1", + "color": "^4.2.3", + "use-latest-callback": "^0.2.4" }, "peerDependencies": { - "@react-navigation/native": "^7.1.10", + "@react-navigation/native": "^7.1.24", "react": ">= 18.2.0", "react-native": "*", "react-native-gesture-handler": ">= 2.0.0", @@ -22735,6 +22737,8 @@ }, "node_modules/decode-uri-component": { "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "license": "MIT", "engines": { "node": ">=0.10" @@ -26689,6 +26693,8 @@ }, "node_modules/filter-obj": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz", + "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -35650,6 +35656,8 @@ }, "node_modules/query-string": { "version": "7.1.3", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz", + "integrity": "sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==", "license": "MIT", "dependencies": { "decode-uri-component": "^0.2.2", @@ -36926,13 +36934,6 @@ "react-native-pager-view": ">= 6.0.0" } }, - "node_modules/react-native-tab-view/node_modules/use-latest-callback": { - "version": "0.2.3", - "license": "MIT", - "peerDependencies": { - "react": ">=16.8" - } - }, "node_modules/react-native-url-polyfill": { "version": "2.0.0", "license": "MIT", @@ -39041,6 +39042,8 @@ }, "node_modules/split-on-first": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz", + "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==", "license": "MIT", "engines": { "node": ">=6" @@ -39254,6 +39257,8 @@ }, "node_modules/strict-uri-encode": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==", "license": "MIT", "engines": { "node": ">=4" @@ -40991,8 +40996,19 @@ "dev": true, "license": "MIT" }, + "node_modules/use-latest-callback": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.2.6.tgz", + "integrity": "sha512-FvRG9i1HSo0wagmX63Vrm8SnlUU3LMM3WyZkQ76RnslpBrX694AdG4A0zQBx2B3ZifFA0yv/BaEHGBnEax5rZg==", + "license": "MIT", + "peerDependencies": { + "react": ">=16.8" + } + }, "node_modules/use-sync-external-store": { - "version": "1.5.0", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz", + "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==", "license": "MIT", "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" diff --git a/package.json b/package.json index d459738bd2e7..a3320fca7245 100644 --- a/package.json +++ b/package.json @@ -119,9 +119,9 @@ "@react-native-google-signin/google-signin": "^10.0.1", "@react-native-picker/picker": "2.11.3", "@react-navigation/material-top-tabs": "7.2.13", - "@react-navigation/native": "7.1.10", + "@react-navigation/native": "7.1.24", "@react-navigation/native-stack": "7.3.14", - "@react-navigation/stack": "7.3.3", + "@react-navigation/stack": "7.6.11", "@react-ng/bounds-observer": "^0.2.1", "@rnmapbox/maps": "10.1.44", "@sentry/react-native": "^7.6.0", diff --git a/patches/react-navigation/@react-navigation+core+7.10.0+001+platform-navigation-stack-types.patch b/patches/react-navigation/@react-navigation+core+7.10.0+001+platform-navigation-stack-types.patch deleted file mode 100644 index 5f87fda692e9..000000000000 --- a/patches/react-navigation/@react-navigation+core+7.10.0+001+platform-navigation-stack-types.patch +++ /dev/null @@ -1,726 +0,0 @@ -diff --git a/node_modules/@react-navigation/core/lib/module/types.js.map b/node_modules/@react-navigation/core/lib/module/types.js.map -index c0b4975..96c6dac 100644 ---- a/node_modules/@react-navigation/core/lib/module/types.js.map -+++ b/node_modules/@react-navigation/core/lib/module/types.js.map -@@ -1 +1 @@ --{"version":3,"names":["PrivateValueStore"],"sourceRoot":"../../src","sources":["types.tsx"],"mappings":";;AAqNA,OAAO,MAAMA,iBAAiB,CAA4B","ignoreList":[]} -+{"version":3,"names":["PrivateValueStore"],"sourceRoot":"../../src","sources":["types.tsx"],"mappings":";;AAmPA,OAAO,MAAMA,iBAAiB,CAA4B","ignoreList":[]} -diff --git a/node_modules/@react-navigation/core/lib/module/useDescriptors.js b/node_modules/@react-navigation/core/lib/module/useDescriptors.js -index 710df03..07ae763 100644 ---- a/node_modules/@react-navigation/core/lib/module/useDescriptors.js -+++ b/node_modules/@react-navigation/core/lib/module/useDescriptors.js -@@ -16,6 +16,8 @@ import { jsx as _jsx } from "react/jsx-runtime"; - * - Helper method to render a screen - * - Options specified by the screen for the navigator - * - Navigation object intended for the route -+ * @param convertCustomScreenOptions Function to convert custom screen options to screen options. -+ * If passed, it means that the `options`/`screenOptions` passed to the navigator are custom and need to be converted to regular screen options. - */ - export function useDescriptors({ - state, -@@ -31,7 +33,7 @@ export function useDescriptors({ - onRouteFocus, - router, - emitter --}) { -+}, convertCustomScreenOptions) { - const theme = React.useContext(ThemeContext); - const [options, setOptions] = React.useState({}); - const { -@@ -68,15 +70,26 @@ export function useDescriptors({ - const getOptions = (route, navigation, overrides) => { - const config = screens[route.name]; - const screen = config.props; -- const optionsList = [ -- // The default `screenOptions` passed to the navigator -- screenOptions, -- // The `screenOptions` props passed to `Group` elements -- ...(config.options ? config.options.filter(Boolean) : []), -- // The `options` prop passed to `Screen` elements, -- screen.options, -- // The options set via `navigation.setOptions` -- overrides]; -+ let optionsList; -+ if (convertCustomScreenOptions) { -+ optionsList = [ -+ // The default `screenOptions` passed to the navigator -+ convertCustomScreenOptions(screenOptions), -+ // The `screenOptions` props passed to `Group` elements -+ ...(config.options ? config.options.filter(Boolean).map(convertCustomScreenOptions) : []), -+ // The `options` prop passed to `Screen` elements, -+ convertCustomScreenOptions(screen.options), convertCustomScreenOptions(overrides)]; -+ } else { -+ optionsList = [ -+ // The default `screenOptions` passed to the navigator -+ screenOptions, -+ // The `screenOptions` props passed to `Group` elements -+ ...(config.options ? config.options.filter(Boolean) : []), -+ // The `options` prop passed to `Screen` elements, -+ screen.options, -+ // The options set via `navigation.setOptions` -+ options[route.key]]; -+ } - return optionsList.reduce((acc, curr) => Object.assign(acc, - // @ts-expect-error: we check for function but TS still complains - typeof curr !== 'function' ? curr : curr({ -diff --git a/node_modules/@react-navigation/core/lib/module/useDescriptors.js.map b/node_modules/@react-navigation/core/lib/module/useDescriptors.js.map -index 9d2a903..c28b7e8 100644 ---- a/node_modules/@react-navigation/core/lib/module/useDescriptors.js.map -+++ b/node_modules/@react-navigation/core/lib/module/useDescriptors.js.map -@@ -1 +1 @@ --{"version":3,"names":["React","NavigationBuilderContext","NavigationContext","NavigationRouteContext","SceneView","ThemeContext","useNavigationCache","useRouteCache","jsx","_jsx","useDescriptors","state","screens","navigation","screenOptions","screenLayout","onAction","getState","setState","addListener","addKeyedListener","onRouteFocus","router","emitter","theme","useContext","options","setOptions","useState","onDispatchAction","onOptionsChange","scheduleUpdate","flushUpdates","stackRef","context","useMemo","base","navigations","routes","getOptions","route","overrides","config","name","screen","props","optionsList","filter","Boolean","reduce","acc","curr","Object","assign","render","customOptions","routeState","clearOptions","o","key","_","rest","layout","element","children","Provider","value","descriptors","i","describe","placeholder","Error","undefined"],"sourceRoot":"../../src","sources":["useDescriptors.tsx"],"mappings":"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","ignoreList":[]} -+{"version":3,"names":["React","NavigationBuilderContext","NavigationContext","NavigationRouteContext","SceneView","ThemeContext","useNavigationCache","useRouteCache","jsx","_jsx","useDescriptors","state","screens","navigation","screenOptions","screenLayout","onAction","getState","setState","addListener","addKeyedListener","onRouteFocus","router","emitter","convertCustomScreenOptions","theme","useContext","options","setOptions","useState","onDispatchAction","onOptionsChange","scheduleUpdate","flushUpdates","stackRef","context","useMemo","base","navigations","routes","getOptions","route","overrides","config","name","screen","props","optionsList","filter","Boolean","map","key","reduce","acc","curr","Object","assign","render","customOptions","routeState","clearOptions","o","_","rest","layout","element","children","Provider","value","descriptors","i","describe","placeholder","Error","undefined"],"sourceRoot":"../../src","sources":["useDescriptors.tsx"],"mappings":"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","ignoreList":[]} -diff --git a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js -index 586b8be..d7028e1 100644 ---- a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js -+++ b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js -@@ -138,9 +138,11 @@ const getRouteConfigsFromChildren = (children, groupKey, groupOptions, groupLayo - * - * @param createRouter Factory method which returns router object. - * @param options Options object containing `children` and additional options for the router. -+ * @param convertCustomScreenOptions Function to convert custom screen options to screen options. -+ * If passed, it means that the `options`/`screenOptions` passed to the navigator are custom and need to be converted to regular screen options. - * @returns An object containing `state`, `navigation`, `descriptors` objects. - */ --export function useNavigationBuilder(createRouter, options) { -+export function useNavigationBuilder(createRouter, options, convertCustomScreenOptions) { - const navigatorKey = useRegisterNavigator(); - const route = React.useContext(NavigationRouteContext); - const { -@@ -470,7 +472,7 @@ export function useNavigationBuilder(createRouter, options) { - router, - // @ts-expect-error: this should have both core and custom events, but too much work right now - emitter -- }); -+ }, convertCustomScreenOptions); - useCurrentRender({ - state, - navigation, -diff --git a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js.map b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js.map -index aababc4..ebbae11 100644 ---- a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js.map -+++ b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js.map -@@ -1 +1 @@ --{"version":3,"names":["CommonActions","React","isValidElementType","useLatestCallback","deepFreeze","Group","isArrayEqual","isRecordEqual","NavigationHelpersContext","NavigationRouteContext","NavigationStateContext","PreventRemoveProvider","Screen","PrivateValueStore","useChildListeners","useComponent","useCurrentRender","useDescriptors","useEventEmitter","useFocusedListenersChildrenAdapter","useFocusEvents","useIsomorphicLayoutEffect","useKeyedChildListeners","useLazyValue","useNavigationHelpers","useOnAction","useOnGetState","useOnRouteFocus","useRegisterNavigator","useScheduleUpdate","jsx","_jsx","isScreen","child","type","isGroup","Fragment","isValidKey","key","undefined","getRouteConfigsFromChildren","children","groupKey","groupOptions","groupLayout","configs","Children","toArray","reduce","acc","isValidElement","props","Error","name","JSON","stringify","navigationKey","push","keys","options","layout","screenOptions","screenLayout","String","process","env","NODE_ENV","forEach","config","component","getComponent","console","warn","test","useNavigationBuilder","createRouter","navigatorKey","route","useContext","screenListeners","UNSTABLE_router","rest","routeConfigs","router","initialRouteName","every","original","overrides","screens","routeNames","map","routeKeyList","curr","join","routeParamList","initialParams","routeGetIdList","Object","assign","getId","length","isStateValid","useCallback","state","isStateInitialized","stale","currentState","getState","getCurrentState","setState","setCurrentState","setKey","getKey","getIsInitial","stateCleanedUp","useRef","current","initializedState","isFirstStateInitialization","useMemo","initialRouteParamList","initialParamsFromParams","params","initial","screen","getInitialState","stateFromParams","index","routes","path","getRehydratedState","previousRouteKeyListRef","useEffect","previousRouteKeyList","nextState","getStateForRouteNamesChange","routeKeyChanges","filter","previousNestedParamsRef","previousParams","action","reset","navigate","pop","updatedState","getStateForAction","shouldUpdate","stateRef","emitter","e","target","find","navigation","descriptors","listeners","concat","cb","i","self","lastIndexOf","listener","emit","data","childListeners","addListener","keyedListeners","addKeyedListener","onAction","actionListeners","beforeRemoveListeners","beforeRemove","routerConfigOptions","onRouteFocus","id","focusedListeners","focus","getStateListeners","describe","NavigationContent","element","Provider","value"],"sourceRoot":"../../src","sources":["useNavigationBuilder.tsx"],"mappings":"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","ignoreList":[]} -+{"version":3,"names":["CommonActions","React","isValidElementType","useLatestCallback","deepFreeze","Group","isArrayEqual","isRecordEqual","NavigationHelpersContext","NavigationRouteContext","NavigationStateContext","PreventRemoveProvider","Screen","PrivateValueStore","useChildListeners","useComponent","useCurrentRender","useDescriptors","useEventEmitter","useFocusedListenersChildrenAdapter","useFocusEvents","useIsomorphicLayoutEffect","useKeyedChildListeners","useLazyValue","useNavigationHelpers","useOnAction","useOnGetState","useOnRouteFocus","useRegisterNavigator","useScheduleUpdate","jsx","_jsx","isScreen","child","type","isGroup","Fragment","isValidKey","key","undefined","getRouteConfigsFromChildren","children","groupKey","groupOptions","groupLayout","configs","Children","toArray","reduce","acc","isValidElement","props","Error","name","JSON","stringify","navigationKey","push","keys","options","layout","screenOptions","screenLayout","String","process","env","NODE_ENV","forEach","config","component","getComponent","console","warn","test","useNavigationBuilder","createRouter","convertCustomScreenOptions","navigatorKey","route","useContext","screenListeners","UNSTABLE_router","rest","routeConfigs","router","initialRouteName","every","original","overrides","screens","routeNames","map","routeKeyList","curr","join","routeParamList","initialParams","routeGetIdList","Object","assign","getId","length","isStateValid","useCallback","state","isStateInitialized","stale","currentState","getState","getCurrentState","setState","setCurrentState","setKey","getKey","getIsInitial","stateCleanedUp","useRef","current","initializedState","isFirstStateInitialization","useMemo","initialRouteParamList","initialParamsFromParams","params","initial","screen","getInitialState","stateFromParams","index","routes","path","getRehydratedState","previousRouteKeyListRef","useEffect","previousRouteKeyList","nextState","getStateForRouteNamesChange","routeKeyChanges","filter","previousNestedParamsRef","previousParams","action","reset","navigate","pop","updatedState","getStateForAction","shouldUpdate","stateRef","emitter","e","target","find","navigation","descriptors","listeners","concat","cb","i","self","lastIndexOf","listener","emit","data","childListeners","addListener","keyedListeners","addKeyedListener","onAction","actionListeners","beforeRemoveListeners","beforeRemove","routerConfigOptions","onRouteFocus","id","focusedListeners","focus","getStateListeners","describe","NavigationContent","element","Provider","value"],"sourceRoot":"../../src","sources":["useNavigationBuilder.tsx"],"mappings":"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","ignoreList":[]} -diff --git a/node_modules/@react-navigation/core/lib/typescript/src/types.d.ts b/node_modules/@react-navigation/core/lib/typescript/src/types.d.ts -index dca9f5e..e291031 100644 ---- a/node_modules/@react-navigation/core/lib/typescript/src/types.d.ts -+++ b/node_modules/@react-navigation/core/lib/typescript/src/types.d.ts -@@ -9,7 +9,16 @@ declare global { - } - } - type Keyof = Extract; --export type DefaultNavigatorOptions = DefaultRouterOptions> & { -+export type ScreenListenersOrCallback = ScreenListeners | ((props: { -+ route: RouteProp; -+ navigation: any; -+}) => ScreenListeners); -+export type ScreenOptionsOrCallback = ScreenOptions | ((props: { -+ route: RouteProp; -+ navigation: any; -+}) => ScreenOptions); -+ -+export type DefaultNavigatorOptions = DefaultRouterOptions> & { - /** - * Children React Elements to extract the route configuration from. - * Only `Screen`, `Group` and `React.Fragment` are supported as children. -@@ -28,18 +37,11 @@ export type DefaultNavigatorOptions | ((props: { -- route: RouteProp; -- navigation: Navigation; -- }) => ScreenListeners); -+ screenListeners?: ScreenListenersOrCallback; - /** - * Default options for all screens under this navigator. - */ -- screenOptions?: ScreenOptions | ((props: { -- route: RouteProp; -- navigation: Navigation; -- theme: ReactNavigation.Theme; -- }) => ScreenOptions); -+ screenOptions?: ScreenOptionsOrCallback; - /** - * Layout for all screens under this navigator. - */ -@@ -64,6 +66,7 @@ export type EventMapBase = Record; -+export type ConvertCustomScreenOptions = (options: ScreenOptionsOrCallback | undefined) => ScreenOptionsOrCallback | undefined; - export type EventMapCore = { - focus: { - data: undefined; -@@ -481,7 +484,7 @@ export type RouteConfigProps; - }; --export type RouteConfig = RouteConfigProps & RouteConfigComponent; -+export type RouteConfig = RouteConfigProps & RouteConfigComponent; - export type RouteGroupConfig = { - /** - * Optional key for the screens in this group. -diff --git a/node_modules/@react-navigation/core/lib/typescript/src/types.d.ts.map b/node_modules/@react-navigation/core/lib/typescript/src/types.d.ts.map -index 21e48db..29773a2 100644 ---- a/node_modules/@react-navigation/core/lib/typescript/src/types.d.ts.map -+++ b/node_modules/@react-navigation/core/lib/typescript/src/types.d.ts.map -@@ -1 +1 @@ --{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.tsx"],"names":[],"mappings":"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"} -\ No newline at end of file -+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.tsx"],"names":[],"mappings":"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"} -\ No newline at end of file -diff --git a/node_modules/@react-navigation/core/lib/typescript/src/useDescriptors.d.ts b/node_modules/@react-navigation/core/lib/typescript/src/useDescriptors.d.ts -index 7d017a9..9176f05 100644 ---- a/node_modules/@react-navigation/core/lib/typescript/src/useDescriptors.d.ts -+++ b/node_modules/@react-navigation/core/lib/typescript/src/useDescriptors.d.ts -@@ -1,13 +1,13 @@ - import type { NavigationAction, NavigationState, ParamListBase, PartialState, Router } from '@react-navigation/routers'; - import * as React from 'react'; - import { type AddKeyedListener, type AddListener } from './NavigationBuilderContext'; --import type { Descriptor, EventMapBase, NavigationHelpers, NavigationProp, RouteConfig, RouteProp } from './types'; -+import type { ConvertCustomScreenOptions, Descriptor, EventMapBase, NavigationHelpers, NavigationProp, RouteConfig, RouteProp, ScreenOptionsOrCallback } from './types'; - import type { NavigationEventEmitter } from './useEventEmitter'; --export type ScreenConfigWithParent = { -+export type ScreenConfigWithParent = { - keys: (string | undefined)[]; -- options: (ScreenOptionsOrCallback | undefined)[] | undefined; -- layout: ScreenLayout | undefined; -- props: RouteConfig; -+ options: (ScreenOptionsOrCallback | undefined)[] | undefined; -+ layout: ScreenLayout | undefined; -+ props: RouteConfig; - }; - type ScreenLayout = (props: { - route: RouteProp; -@@ -16,16 +16,11 @@ type ScreenLayout = (props: { - theme: ReactNavigation.Theme; - children: React.ReactElement; - }) => React.ReactElement; --type ScreenOptionsOrCallback = ScreenOptions | ((props: { -- route: RouteProp; -- navigation: any; -- theme: ReactNavigation.Theme; --}) => ScreenOptions); --type Options = { -+type Options = { - state: State; -- screens: Record>; -+ screens: Record>; - navigation: NavigationHelpers; -- screenOptions: ScreenOptionsOrCallback | undefined; -+ screenOptions: ScreenOptionsOrCallback | undefined; - screenLayout: ScreenLayout | undefined; - onAction: (action: NavigationAction) => boolean; - getState: () => State; -@@ -43,8 +38,10 @@ type Options void>, ScreenOptions extends {}, EventMap extends EventMapBase>({ state, screens, navigation, screenOptions, screenLayout, onAction, getState, setState, addListener, addKeyedListener, onRouteFocus, router, emitter, }: Options): { -+export declare function useDescriptors void>, ScreenOptions extends {}, EventMap extends EventMapBase, CustomScreenOptions extends {} = ScreenOptions>({ state, screens, navigation, screenOptions, screenLayout, onAction, getState, setState, addListener, addKeyedListener, onRouteFocus, router, emitter, }: Options, convertCustomScreenOptions: ConvertCustomScreenOptions | undefined): { - describe: (route: RouteProp, placeholder: boolean) => Descriptor void>, ScreenOptions extends {}, EventMap extends Record>(createRouter: RouterFactory, options: DefaultNavigatorOptions & RouterOptions): { -+export declare function useNavigationBuilder void>, ScreenOptions extends {}, EventMap extends Record, CustomScreenOptions extends {} = ScreenOptions>(createRouter: RouterFactory, options: DefaultNavigatorOptions & RouterOptions, convertCustomScreenOptions?: ConvertCustomScreenOptions): { - state: State; - navigation: { - dispatch(action: Readonly<{ -diff --git a/node_modules/@react-navigation/core/lib/typescript/src/useNavigationBuilder.d.ts.map b/node_modules/@react-navigation/core/lib/typescript/src/useNavigationBuilder.d.ts.map -index 11a6b9c..d1c5acd 100644 ---- a/node_modules/@react-navigation/core/lib/typescript/src/useNavigationBuilder.d.ts.map -+++ b/node_modules/@react-navigation/core/lib/typescript/src/useNavigationBuilder.d.ts.map -@@ -1 +1 @@ --{"version":3,"file":"useNavigationBuilder.d.ts","sourceRoot":"","sources":["../../../src/useNavigationBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,YAAY,EAIjB,KAAK,aAAa,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,EACL,KAAK,uBAAuB,EAE5B,KAAK,YAAY,EAEjB,iBAAiB,EAElB,MAAM,SAAS,CAAC;AAkPjB;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,SAAS,eAAe,EAC7B,aAAa,SAAS,oBAAoB,EAC1C,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,EAC5D,aAAa,SAAS,EAAE,EACxB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAEpC,YAAY,EAAE,aAAa,CAAC,KAAK,EAAE,gBAAgB,EAAE,aAAa,CAAC,EACnE,OAAO,EAAE,uBAAuB,CAC9B,aAAa,EACb,MAAM,GAAG,SAAS,EAClB,KAAK,EACL,aAAa,EACb,QAAQ,EACR,GAAG,CACJ,GACC,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4gBhB"} -\ No newline at end of file -+{"version":3,"file":"useNavigationBuilder.d.ts","sourceRoot":"","sources":["../../../src/useNavigationBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,YAAY,EAIjB,KAAK,aAAa,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAE5B,KAAK,YAAY,EAEjB,iBAAiB,EAElB,MAAM,SAAS,CAAC;AA8PjB;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,SAAS,eAAe,EAC7B,aAAa,SAAS,oBAAoB,EAC1C,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,EAC5D,aAAa,SAAS,EAAE,EACxB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACpC,mBAAmB,SAAS,EAAE,GAAG,aAAa,EAE9C,YAAY,EAAE,aAAa,CAAC,KAAK,EAAE,gBAAgB,EAAE,aAAa,CAAC,EACnE,OAAO,EAAE,uBAAuB,CAC9B,aAAa,EACb,MAAM,GAAG,SAAS,EAClB,KAAK,EACL,aAAa,GAAG,mBAAmB,EACnC,QAAQ,EACR,GAAG,CACJ,GACC,aAAa,EACf,0BAA0B,CAAC,EAAE,0BAA0B,CACrD,mBAAmB,EACnB,aAAa,CACd;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyhBF"} -\ No newline at end of file -diff --git a/node_modules/@react-navigation/core/src/types.tsx b/node_modules/@react-navigation/core/src/types.tsx -index 59a0b1a..5d13ad5 100644 ---- a/node_modules/@react-navigation/core/src/types.tsx -+++ b/node_modules/@react-navigation/core/src/types.tsx -@@ -23,6 +23,29 @@ declare global { - - type Keyof = Extract; - -+export type ScreenListenersOrCallback< -+ State extends NavigationState, -+ EventMap extends EventMapBase, -+ ParamList extends ParamListBase = ParamListBase, -+ RouteName extends keyof ParamList = keyof ParamList, -+> = -+ | ScreenListeners -+ | ((props: { -+ route: RouteProp; -+ navigation: any; -+ }) => ScreenListeners); -+ -+export type ScreenOptionsOrCallback< -+ ScreenOptions extends {}, -+ ParamList extends ParamListBase = ParamListBase, -+ RouteName extends keyof ParamList = keyof ParamList -+> = -+ | ScreenOptions -+ | ((props: { -+ route: RouteProp; -+ navigation: any; -+ }) => ScreenOptions); -+ - export type DefaultNavigatorOptions< - ParamList extends ParamListBase, - NavigatorID extends string | undefined, -@@ -30,6 +53,7 @@ export type DefaultNavigatorOptions< - ScreenOptions extends {}, - EventMap extends EventMapBase, - Navigation, -+ RouteName extends keyof ParamList = keyof ParamList, - > = DefaultRouterOptions> & { - /** - * Children React Elements to extract the route configuration from. -@@ -65,23 +89,21 @@ export type DefaultNavigatorOptions< - /** - * Event listeners for all the screens in the navigator. - */ -- screenListeners?: -- | ScreenListeners -- | ((props: { -- route: RouteProp; -- navigation: Navigation; -- }) => ScreenListeners); -+ screenListeners?: ScreenListenersOrCallback< -+ State, -+ EventMap, -+ ParamList, -+ RouteName -+ >; - - /** - * Default options for all screens under this navigator. - */ -- screenOptions?: -- | ScreenOptions -- | ((props: { -- route: RouteProp; -- navigation: Navigation; -- theme: ReactNavigation.Theme; -- }) => ScreenOptions); -+ screenOptions?: ScreenOptionsOrCallback< -+ ScreenOptions, -+ ParamList, -+ RouteName -+ >; - - /** - * Layout for all screens under this navigator. -@@ -121,6 +143,13 @@ export type EventMapBase = Record< - { data?: any; canPreventDefault?: boolean } - >; - -+export type ConvertCustomScreenOptions< -+ CustomScreenOptions extends {}, -+ ScreenOptions extends {}, -+> = ( -+ options: ScreenOptionsOrCallback | undefined -+) => ScreenOptionsOrCallback | undefined; -+ - export type EventMapCore = { - focus: { data: undefined }; - blur: { data: undefined }; -@@ -719,11 +748,12 @@ export type RouteConfig< - ScreenOptions extends {}, - EventMap extends EventMapBase, - Navigation, -+ CustomScreenOptions extends {} = ScreenOptions - > = RouteConfigProps< - ParamList, - RouteName, - State, -- ScreenOptions, -+ ScreenOptions | CustomScreenOptions, - EventMap, - Navigation - > & -diff --git a/node_modules/@react-navigation/core/src/useDescriptors.tsx b/node_modules/@react-navigation/core/src/useDescriptors.tsx -index d354323..f55288e 100644 ---- a/node_modules/@react-navigation/core/src/useDescriptors.tsx -+++ b/node_modules/@react-navigation/core/src/useDescriptors.tsx -@@ -17,12 +17,14 @@ import { NavigationRouteContext } from './NavigationRouteContext'; - import { SceneView } from './SceneView'; - import { ThemeContext } from './theming/ThemeContext'; - import type { -+ ConvertCustomScreenOptions, - Descriptor, - EventMapBase, - NavigationHelpers, - NavigationProp, - RouteConfig, - RouteProp, -+ ScreenOptionsOrCallback, - } from './types'; - import type { NavigationEventEmitter } from './useEventEmitter'; - import { useNavigationCache } from './useNavigationCache'; -@@ -32,15 +34,21 @@ export type ScreenConfigWithParent< - State extends NavigationState, - ScreenOptions extends {}, - EventMap extends EventMapBase, -+ CustomScreenOptions extends {} = ScreenOptions, - > = { - keys: (string | undefined)[]; -- options: (ScreenOptionsOrCallback | undefined)[] | undefined; -- layout: ScreenLayout | undefined; -+ options: -+ | ( -+ | ScreenOptionsOrCallback -+ | undefined -+ )[] -+ | undefined; -+ layout: ScreenLayout | undefined; - props: RouteConfig< - ParamListBase, - string, - State, -- ScreenOptions, -+ ScreenOptions | CustomScreenOptions, - EventMap, - unknown - >; -@@ -54,26 +62,22 @@ type ScreenLayout = (props: { - children: React.ReactElement; - }) => React.ReactElement; - --type ScreenOptionsOrCallback = -- | ScreenOptions -- | ((props: { -- route: RouteProp; -- navigation: any; -- theme: ReactNavigation.Theme; -- }) => ScreenOptions); - - type Options< - State extends NavigationState, - ScreenOptions extends {}, - EventMap extends EventMapBase, -+ CustomScreenOptions extends {} = ScreenOptions, - > = { - state: State; - screens: Record< - string, -- ScreenConfigWithParent -+ ScreenConfigWithParent - >; - navigation: NavigationHelpers; -- screenOptions: ScreenOptionsOrCallback | undefined; -+ screenOptions: -+ | ScreenOptionsOrCallback -+ | undefined; - screenLayout: ScreenLayout | undefined; - onAction: (action: NavigationAction) => boolean; - getState: () => State; -@@ -92,27 +96,35 @@ type Options< - * - Helper method to render a screen - * - Options specified by the screen for the navigator - * - Navigation object intended for the route -+ * @param convertCustomScreenOptions Function to convert custom screen options to screen options. -+ * If passed, it means that the `options`/`screenOptions` passed to the navigator are custom and need to be converted to regular screen options. - */ - export function useDescriptors< - State extends NavigationState, - ActionHelpers extends Record void>, - ScreenOptions extends {}, - EventMap extends EventMapBase, -->({ -- state, -- screens, -- navigation, -- screenOptions, -- screenLayout, -- onAction, -- getState, -- setState, -- addListener, -- addKeyedListener, -- onRouteFocus, -- router, -- emitter, --}: Options) { -+ CustomScreenOptions extends {} = ScreenOptions, -+>( -+ { -+ state, -+ screens, -+ navigation, -+ screenOptions, -+ screenLayout, -+ onAction, -+ getState, -+ setState, -+ addListener, -+ addKeyedListener, -+ onRouteFocus, -+ router, -+ emitter, -+ }: Options, -+ convertCustomScreenOptions: -+ | ConvertCustomScreenOptions -+ | undefined -+) { - const theme = React.useContext(ThemeContext); - const [options, setOptions] = React.useState>( - {} -@@ -183,18 +195,41 @@ export function useDescriptors< - const config = screens[route.name]; - const screen = config.props; - -- const optionsList = [ -- // The default `screenOptions` passed to the navigator -- screenOptions, -- // The `screenOptions` props passed to `Group` elements -- ...((config.options -- ? config.options.filter(Boolean) -- : []) as ScreenOptionsOrCallback[]), -- // The `options` prop passed to `Screen` elements, -- screen.options, -- // The options set via `navigation.setOptions` -- overrides, -- ]; -+ let optionsList: (ScreenOptionsOrCallback | undefined)[]; -+ if (convertCustomScreenOptions) { -+ optionsList = [ -+ // The default `screenOptions` passed to the navigator -+ convertCustomScreenOptions( -+ screenOptions as ScreenOptionsOrCallback -+ ), -+ // The `screenOptions` props passed to `Group` elements -+ ...((config.options -+ ? (config.options as ScreenOptionsOrCallback[]) -+ .filter(Boolean) -+ .map(convertCustomScreenOptions) -+ : []) as ScreenOptionsOrCallback[]), -+ // The `options` prop passed to `Screen` elements, -+ convertCustomScreenOptions( -+ screen.options as ScreenOptionsOrCallback -+ ), -+ convertCustomScreenOptions( -+ overrides as ScreenOptionsOrCallback -+ ), -+ ]; -+ } else { -+ optionsList = [ -+ // The default `screenOptions` passed to the navigator -+ screenOptions as ScreenOptionsOrCallback, -+ // The `screenOptions` props passed to `Group` elements -+ ...((config.options -+ ? config.options.filter(Boolean) -+ : []) as ScreenOptionsOrCallback[]), -+ // The `options` prop passed to `Screen` elements, -+ screen.options as ScreenOptionsOrCallback, -+ // The options set via `navigation.setOptions` -+ options[route.key] as ScreenOptionsOrCallback, -+ ]; -+ } - - return optionsList.reduce( - (acc, curr) => -diff --git a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx -index 01b1ea1..835bc07 100644 ---- a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx -+++ b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx -@@ -24,6 +24,7 @@ import { NavigationStateContext } from './NavigationStateContext'; - import { PreventRemoveProvider } from './PreventRemoveProvider'; - import { Screen } from './Screen'; - import { -+ type ConvertCustomScreenOptions, - type DefaultNavigatorOptions, - type EventMapBase, - type EventMapCore, -@@ -89,18 +90,25 @@ const getRouteConfigsFromChildren = < - State extends NavigationState, - ScreenOptions extends {}, - EventMap extends EventMapBase, -+ CustomScreenOptions extends {} = ScreenOptions, - >( - children: React.ReactNode, - groupKey?: string, - groupOptions?: ScreenConfigWithParent< - State, - ScreenOptions, -- EventMap -+ EventMap, -+ CustomScreenOptions - >['options'], -- groupLayout?: ScreenConfigWithParent['layout'] -+ groupLayout?: ScreenConfigWithParent< -+ State, -+ ScreenOptions, -+ EventMap, -+ CustomScreenOptions -+ >['layout'] - ) => { - const configs = React.Children.toArray(children).reduce< -- ScreenConfigWithParent[] -+ ScreenConfigWithParent[] - >((acc, child) => { - if (React.isValidElement(child)) { - if (isScreen(child)) { -@@ -141,7 +149,7 @@ const getRouteConfigsFromChildren = < - ParamListBase, - string, - State, -- ScreenOptions, -+ ScreenOptions | CustomScreenOptions, - EventMap, - unknown - >, -@@ -162,7 +170,12 @@ const getRouteConfigsFromChildren = < - // When we encounter a fragment or group, we need to dive into its children to extract the configs - // This is handy to conditionally define a group of screens - acc.push( -- ...getRouteConfigsFromChildren( -+ ...getRouteConfigsFromChildren< -+ State, -+ ScreenOptions, -+ EventMap, -+ CustomScreenOptions -+ >( - child.props.children as React.ReactNode, - child.props.navigationKey, - // FIXME -@@ -277,6 +290,8 @@ const getRouteConfigsFromChildren = < - * - * @param createRouter Factory method which returns router object. - * @param options Options object containing `children` and additional options for the router. -+ * @param convertCustomScreenOptions Function to convert custom screen options to screen options. -+ * If passed, it means that the `options`/`screenOptions` passed to the navigator are custom and need to be converted to regular screen options. - * @returns An object containing `state`, `navigation`, `descriptors` objects. - */ - export function useNavigationBuilder< -@@ -285,17 +300,22 @@ export function useNavigationBuilder< - ActionHelpers extends Record void>, - ScreenOptions extends {}, - EventMap extends Record, -+ CustomScreenOptions extends {} = ScreenOptions, - >( - createRouter: RouterFactory, - options: DefaultNavigatorOptions< - ParamListBase, - string | undefined, - State, -- ScreenOptions, -+ ScreenOptions | CustomScreenOptions, - EventMap, - any - > & -- RouterOptions -+ RouterOptions, -+ convertCustomScreenOptions?: ConvertCustomScreenOptions< -+ CustomScreenOptions, -+ ScreenOptions -+ > - ) { - const navigatorKey = useRegisterNavigator(); - -@@ -316,7 +336,8 @@ export function useNavigationBuilder< - const routeConfigs = getRouteConfigsFromChildren< - State, - ScreenOptions, -- EventMap -+ EventMap, -+ CustomScreenOptions - >(children); - - const router = useLazyValue>(() => { -@@ -346,7 +367,15 @@ export function useNavigationBuilder< - }); - - const screens = routeConfigs.reduce< -- Record> -+ Record< -+ string, -+ ScreenConfigWithParent< -+ State, -+ ScreenOptions, -+ EventMap, -+ CustomScreenOptions -+ > -+ > - >((acc, config) => { - if (config.props.name in acc) { - throw new Error( -@@ -770,23 +799,27 @@ export function useNavigationBuilder< - State, - ActionHelpers, - ScreenOptions, -- EventMap -- >({ -- state, -- screens, -- navigation, -- screenOptions, -- screenLayout, -- onAction, -- getState, -- setState, -- onRouteFocus, -- addListener, -- addKeyedListener, -- router, -- // @ts-expect-error: this should have both core and custom events, but too much work right now -- emitter, -- }); -+ EventMap, -+ CustomScreenOptions -+ >( -+ { -+ state, -+ screens, -+ navigation, -+ screenOptions, -+ screenLayout, -+ onAction, -+ getState, -+ setState, -+ onRouteFocus, -+ addListener, -+ addKeyedListener, -+ router, -+ // @ts-expect-error: this should have both core and custom events, but too much work right now -+ emitter, -+ }, -+ convertCustomScreenOptions -+ ); - - useCurrentRender({ - state, diff --git a/patches/react-navigation/@react-navigation+core+7.10.0+002+fix-crash-when-parsing-emoji.patch b/patches/react-navigation/@react-navigation+core+7.10.0+002+fix-crash-when-parsing-emoji.patch deleted file mode 100644 index 707ab3394934..000000000000 --- a/patches/react-navigation/@react-navigation+core+7.10.0+002+fix-crash-when-parsing-emoji.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/@react-navigation/core/lib/module/getPathFromState.js b/node_modules/@react-navigation/core/lib/module/getPathFromState.js -index 0d1ca6a..5c9d316 100644 ---- a/node_modules/@react-navigation/core/lib/module/getPathFromState.js -+++ b/node_modules/@react-navigation/core/lib/module/getPathFromState.js -@@ -156,7 +156,7 @@ export function getPathFromState(state, options) { - - // Valid characters according to - // https://datatracker.ietf.org/doc/html/rfc3986#section-3.3 (see pchar definition) -- return String(value).replace(/[^A-Za-z0-9\-._~!$&'()*+,;=:@]/g, char => encodeURIComponent(char)); -+ return Array.from(value).map(char => /[^A-Za-z0-9\-._~!$&'()*+,;=:@]/g.test(char) ? encodeURIComponent(char) : char).join(''); - } - return encodeURIComponent(segment); - }).join('/'); diff --git a/patches/react-navigation/@react-navigation+core+7.10.0+003+fix-clearing-preloaded-routes-after-logout.patch b/patches/react-navigation/@react-navigation+core+7.10.0+003+fix-clearing-preloaded-routes-after-logout.patch deleted file mode 100644 index 966f9e98449e..000000000000 --- a/patches/react-navigation/@react-navigation+core+7.10.0+003+fix-clearing-preloaded-routes-after-logout.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js -index d7028e1..769b798 100644 ---- a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js -+++ b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js -@@ -473,14 +473,15 @@ export function useNavigationBuilder(createRouter, options, convertCustomScreenO - // @ts-expect-error: this should have both core and custom events, but too much work right now - emitter - }, convertCustomScreenOptions); -+ const validState = state?.preloadedRoutes?.some(preloadedRoute => !state.routeNames.includes(preloadedRoute.name)) ? {...state, preloadedRoutes: []} : state; - useCurrentRender({ -- state, -+ state: validState, - navigation, - descriptors - }); - const NavigationContent = useComponent(children => { - const element = layout != null ? layout({ -- state, -+ state: validState, - descriptors, - navigation, - children -@@ -493,7 +494,7 @@ export function useNavigationBuilder(createRouter, options, convertCustomScreenO - }); - }); - return { -- state, -+ state: validState, - navigation, - describe, - descriptors, -diff --git a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx -index 835bc07..6e8481e 100644 ---- a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx -+++ b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx -@@ -821,8 +821,10 @@ export function useNavigationBuilder< - convertCustomScreenOptions - ); - -+ const validState = state?.preloadedRoutes?.some(preloadedRoute => !state.routeNames.includes(preloadedRoute.name)) ? {...state, preloadedRoutes: []} : state; -+ - useCurrentRender({ -- state, -+ state: validState, - navigation, - descriptors, - }); -@@ -831,7 +833,7 @@ export function useNavigationBuilder< - const element = - layout != null - ? layout({ -- state, -+ state: validState, - descriptors, - navigation, - children, -@@ -846,7 +848,7 @@ export function useNavigationBuilder< - }); - - return { -- state, -+ state: validState, - navigation, - describe, - descriptors, diff --git a/patches/react-navigation/@react-navigation+core+7.10.0+001+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+core+7.13.5+001+fix-failing-jest-by-disabling-esmodule.patch similarity index 100% rename from patches/react-navigation/@react-navigation+core+7.10.0+001+fix-failing-jest-by-disabling-esmodule.patch rename to patches/react-navigation/@react-navigation+core+7.13.5+001+fix-failing-jest-by-disabling-esmodule.patch diff --git a/patches/react-navigation/@react-navigation+core+7.13.5+002+platform-navigation-stack-types.patch b/patches/react-navigation/@react-navigation+core+7.13.5+002+platform-navigation-stack-types.patch new file mode 100644 index 000000000000..51779aa2668f --- /dev/null +++ b/patches/react-navigation/@react-navigation+core+7.13.5+002+platform-navigation-stack-types.patch @@ -0,0 +1,103 @@ +diff --git a/node_modules/@react-navigation/core/lib/module/useDescriptors.js b/node_modules/@react-navigation/core/lib/module/useDescriptors.js +index 710df03..07ae763 100644 +--- a/node_modules/@react-navigation/core/lib/module/useDescriptors.js ++++ b/node_modules/@react-navigation/core/lib/module/useDescriptors.js +@@ -16,6 +16,8 @@ import { jsx as _jsx } from "react/jsx-runtime"; + * - Helper method to render a screen + * - Options specified by the screen for the navigator + * - Navigation object intended for the route ++ * @param convertCustomScreenOptions Function to convert custom screen options to screen options. ++ * If passed, it means that the `options`/`screenOptions` passed to the navigator are custom and need to be converted to regular screen options. + */ + export function useDescriptors({ + state, +@@ -31,7 +33,7 @@ export function useDescriptors({ + onRouteFocus, + router, + emitter +-}) { ++}, convertCustomScreenOptions) { + const theme = React.useContext(ThemeContext); + const [options, setOptions] = React.useState({}); + const { +@@ -68,15 +70,26 @@ export function useDescriptors({ + const getOptions = (route, navigation, overrides) => { + const config = screens[route.name]; + const screen = config.props; +- const optionsList = [ +- // The default `screenOptions` passed to the navigator +- screenOptions, +- // The `screenOptions` props passed to `Group` elements +- ...(config.options ? config.options.filter(Boolean) : []), +- // The `options` prop passed to `Screen` elements, +- screen.options, +- // The options set via `navigation.setOptions` +- overrides]; ++ let optionsList; ++ if (convertCustomScreenOptions) { ++ optionsList = [ ++ // The default `screenOptions` passed to the navigator ++ convertCustomScreenOptions(screenOptions), ++ // The `screenOptions` props passed to `Group` elements ++ ...(config.options ? config.options.filter(Boolean).map(convertCustomScreenOptions) : []), ++ // The `options` prop passed to `Screen` elements, ++ convertCustomScreenOptions(screen.options), convertCustomScreenOptions(overrides)]; ++ } else { ++ optionsList = [ ++ // The default `screenOptions` passed to the navigator ++ screenOptions, ++ // The `screenOptions` props passed to `Group` elements ++ ...(config.options ? config.options.filter(Boolean) : []), ++ // The `options` prop passed to `Screen` elements, ++ screen.options, ++ // The options set via `navigation.setOptions` ++ options[route.key]]; ++ } + return optionsList.reduce((acc, curr) => Object.assign(acc, + // @ts-expect-error: we check for function but TS still complains + typeof curr !== 'function' ? curr : curr({ +diff --git a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js +index 1c8d466..1393e4c 100644 +--- a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js ++++ b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js +@@ -155,9 +155,11 @@ const getStateFromParams = params => { + * + * @param createRouter Factory method which returns router object. + * @param options Options object containing `children` and additional options for the router. ++ * @param convertCustomScreenOptions Function to convert custom screen options to screen options. ++ * If passed, it means that the `options`/`screenOptions` passed to the navigator are custom and need to be converted to regular screen options. + * @returns An object containing `state`, `navigation`, `descriptors` objects. + */ +-export function useNavigationBuilder(createRouter, options) { ++export function useNavigationBuilder(createRouter, options, convertCustomScreenOptions) { + const navigatorKey = useRegisterNavigator(); + const route = React.useContext(NavigationRouteContext); + const { +@@ -534,7 +536,7 @@ export function useNavigationBuilder(createRouter, options) { + router, + // @ts-expect-error: this should have both core and custom events, but too much work right now + emitter +- }); ++ }, convertCustomScreenOptions); + useCurrentRender({ + state, + navigation, +diff --git a/node_modules/@react-navigation/core/lib/typescript/src/useNavigationBuilder.d.ts b/node_modules/@react-navigation/core/lib/typescript/src/useNavigationBuilder.d.ts +index 1230c93..34bafda 100644 +--- a/node_modules/@react-navigation/core/lib/typescript/src/useNavigationBuilder.d.ts ++++ b/node_modules/@react-navigation/core/lib/typescript/src/useNavigationBuilder.d.ts +@@ -8,7 +8,13 @@ import { type DefaultNavigatorOptions, type EventMapCore, PrivateValueStore } fr + * @param options Options object containing `children` and additional options for the router. + * @returns An object containing `state`, `navigation`, `descriptors` objects. + */ +-export declare function useNavigationBuilder void>, ScreenOptions extends {}, EventMap extends Record>(createRouter: RouterFactory, options: DefaultNavigatorOptions & RouterOptions): { ++type ScreenOptionsOrCallback = ScreenOptions | ((props: { ++ route: import("./types").RouteProp; ++ navigation: any; ++ theme: ReactNavigation.Theme; ++}) => ScreenOptions); ++type ConvertCustomScreenOptions = (options: ScreenOptionsOrCallback | undefined) => ScreenOptionsOrCallback | undefined; ++export declare function useNavigationBuilder void>, ScreenOptions extends {}, EventMap extends Record, CustomScreenOptions extends {} = ScreenOptions>(createRouter: RouterFactory, options: DefaultNavigatorOptions & RouterOptions, convertCustomScreenOptions?: ConvertCustomScreenOptions): { + state: State; + navigation: { + dispatch(action: Readonly<{ diff --git a/patches/react-navigation/@react-navigation+core+7.13.5+003+fix-clearing-preloaded-routes-after-logout.patch b/patches/react-navigation/@react-navigation+core+7.13.5+003+fix-clearing-preloaded-routes-after-logout.patch new file mode 100644 index 000000000000..cf7ee25f9216 --- /dev/null +++ b/patches/react-navigation/@react-navigation+core+7.13.5+003+fix-clearing-preloaded-routes-after-logout.patch @@ -0,0 +1,31 @@ +diff --git a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js +index 1393e4c..2d06ae9 100644 +--- a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js ++++ b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js +@@ -537,14 +537,15 @@ export function useNavigationBuilder(createRouter, options, convertCustomScreenO + // @ts-expect-error: this should have both core and custom events, but too much work right now + emitter + }, convertCustomScreenOptions); ++ const validState = state?.preloadedRoutes?.some(preloadedRoute => !state.routeNames.includes(preloadedRoute.name)) ? {...state, preloadedRoutes: []} : state; + useCurrentRender({ +- state, ++ state: validState, + navigation, + descriptors + }); + const NavigationContent = useComponent(children => { + const element = layout != null ? layout({ +- state, ++ state: validState, + descriptors, + navigation, + children +@@ -560,7 +561,7 @@ export function useNavigationBuilder(createRouter, options, convertCustomScreenO + }); + }); + return { +- state, ++ state: validState, + navigation, + describe, + descriptors, diff --git a/patches/react-navigation/@react-navigation+elements+2.4.3+001+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+elements+2.9.1+001+fix-failing-jest-by-disabling-esmodule.patch similarity index 100% rename from patches/react-navigation/@react-navigation+elements+2.4.3+001+fix-failing-jest-by-disabling-esmodule.patch rename to patches/react-navigation/@react-navigation+elements+2.9.1+001+fix-failing-jest-by-disabling-esmodule.patch diff --git a/patches/react-navigation/@react-navigation+native+7.1.10+001+initial.patch b/patches/react-navigation/@react-navigation+native+7.1.24+001+initial.patch similarity index 100% rename from patches/react-navigation/@react-navigation+native+7.1.10+001+initial.patch rename to patches/react-navigation/@react-navigation+native+7.1.24+001+initial.patch diff --git a/patches/react-navigation/@react-navigation+native+7.1.10+002+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+native+7.1.24+002+fix-failing-jest-by-disabling-esmodule.patch similarity index 100% rename from patches/react-navigation/@react-navigation+native+7.1.10+002+fix-failing-jest-by-disabling-esmodule.patch rename to patches/react-navigation/@react-navigation+native+7.1.24+002+fix-failing-jest-by-disabling-esmodule.patch diff --git a/patches/react-navigation/@react-navigation+routers+7.4.0+001+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+routers+7.5.2+001+fix-failing-jest-by-disabling-esmodule.patch similarity index 100% rename from patches/react-navigation/@react-navigation+routers+7.4.0+001+fix-failing-jest-by-disabling-esmodule.patch rename to patches/react-navigation/@react-navigation+routers+7.5.2+001+fix-failing-jest-by-disabling-esmodule.patch diff --git a/patches/react-navigation/@react-navigation+stack+7.3.3+002+dontDetachScreen.patch b/patches/react-navigation/@react-navigation+stack+7.3.3+002+dontDetachScreen.patch deleted file mode 100644 index be874552cc35..000000000000 --- a/patches/react-navigation/@react-navigation+stack+7.3.3+002+dontDetachScreen.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js -index 9885b25..ae4fe46 100644 ---- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js -+++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js -@@ -396,6 +396,7 @@ export class CardStack extends React.Component { - extrapolate: 'clamp' - }) : STATE_TRANSITIONING_OR_BELOW_TOP; - } -+ const shouldNotDetachScreen = route?.dontDetachScreen && isScreenActive !== STATE_ON_TOP; - const { - headerShown = true, - headerTransparent, -@@ -416,7 +417,7 @@ export class CardStack extends React.Component { - return /*#__PURE__*/_jsx(MaybeScreen, { - style: [StyleSheet.absoluteFill], - enabled: detachInactiveScreens, -- active: isScreenActive, -+ active: shouldNotDetachScreen ? STATE_TRANSITIONING_OR_BELOW_TOP : isScreenActive, - freezeOnBlur: freezeOnBlur, - shouldFreeze: isScreenActive === STATE_INACTIVE && !isPreloaded, - homeIndicatorHidden: autoHideHomeIndicator, -@@ -451,7 +452,7 @@ export class CardStack extends React.Component { - onTransitionStart: onTransitionStart, - onTransitionEnd: onTransitionEnd, - isNextScreenTransparent: isNextScreenTransparent, -- detachCurrentScreen: detachCurrentScreen, -+ detachCurrentScreen: shouldNotDetachScreen ? false : detachCurrentScreen, - preloaded: isPreloaded - }) - }, route.key); -diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js -index c2240e8..63b95e9 100644 ---- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js -+++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js -@@ -3,7 +3,7 @@ - import { getHeaderTitle, HeaderBackContext, HeaderHeightContext, HeaderShownContext } from '@react-navigation/elements'; - import { useLinkBuilder, useLocale, useTheme } from '@react-navigation/native'; - import * as React from 'react'; --import { StyleSheet, View } from 'react-native'; -+import { Platform, StyleSheet, View } from 'react-native'; - import { ModalPresentationContext } from "../../utils/ModalPresentationContext.js"; - import { useKeyboardManager } from "../../utils/useKeyboardManager.js"; - import { Card } from "./Card.js"; -@@ -229,7 +229,8 @@ function CardContainerInner({ - display: - // Hide unfocused screens when animation isn't enabled - // This is also necessary for a11y on web -- animation === 'none' && isNextScreenTransparent === false && detachCurrentScreen !== false && !focused ? 'none' : 'flex' -+ animation === 'none' && isNextScreenTransparent === false && detachCurrentScreen !== false && !focused ? 'none' : 'flex', -+ zIndex: Platform.OS === 'web' ? 'auto' : undefined, - }, StyleSheet.absoluteFill], - children: /*#__PURE__*/_jsx(View, { - style: styles.container, diff --git a/patches/react-navigation/@react-navigation+stack+7.3.3+001+edge-drag-gesture.patch b/patches/react-navigation/@react-navigation+stack+7.6.11+001+edge-drag-gesture.patch similarity index 77% rename from patches/react-navigation/@react-navigation+stack+7.3.3+001+edge-drag-gesture.patch rename to patches/react-navigation/@react-navigation+stack+7.6.11+001+edge-drag-gesture.patch index 01baad621d03..049ead24499e 100644 --- a/patches/react-navigation/@react-navigation+stack+7.3.3+001+edge-drag-gesture.patch +++ b/patches/react-navigation/@react-navigation+stack+7.6.11+001+edge-drag-gesture.patch @@ -67,53 +67,49 @@ index 0000000..9c7b703 +//# sourceMappingURL=edgeDragGestureMonitor.native.js.map \ No newline at end of file diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js -index e8e6e90..7cbffe2 100644 +index b680e64..bf1e145 100644 --- a/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js +++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js -@@ -4,6 +4,7 @@ import Color from 'color'; - import * as React from 'react'; +@@ -5,6 +5,7 @@ import * as React from 'react'; import { Animated, InteractionManager, Platform, StyleSheet, View } from 'react-native'; + import useLatestCallback from 'use-latest-callback'; import { CardAnimationContext } from "../../utils/CardAnimationContext.js"; -+import { getIsEdgeDragGesture, resetExpectingTouchendWithDelay } from '../../utils/edgeDragGestureMonitor'; ++import { getIsEdgeDragGesture, resetExpectingTouchendWithDelay } from "../../utils/edgeDragGestureMonitor.js"; + import { gestureActivationCriteria } from "../../utils/gestureActivationCriteria.js"; import { getDistanceForDirection } from "../../utils/getDistanceForDirection.js"; import { getInvertedMultiplier } from "../../utils/getInvertedMultiplier.js"; - import { getShadowStyle } from "../../utils/getShadowStyle.js"; -@@ -130,6 +131,8 @@ export class Card extends React.Component { - }); - animation(gesture, { - ...spec.config, -+ // Detecting if the user used swipe gesture on iOS safari to trigger navigation in the browser history. -+ duration: getIsEdgeDragGesture() ? 0 : spec.config && 'duration' in spec.config ? spec.config.duration : undefined, - velocity, - toValue, - useNativeDriver, -@@ -139,6 +142,9 @@ export class Card extends React.Component { - }) => { - this.handleEndInteraction(); - clearTimeout(this.pendingGestureCallback); -+ -+ // We need to reset edgeDragGestureMonitor manually because of broken events on iOS safari. -+ resetExpectingTouchendWithDelay(); - if (finished) { - if (closing) { - onClose(); +@@ -140,12 +141,14 @@ function Card({ + velocity, + toValue, + useNativeDriver, +- isInteraction: false ++ isInteraction: false, ++ duration: getIsEdgeDragGesture() ? 0 : spec.config && 'duration' in spec.config ? spec.config.duration : undefined + }).start(({ + finished + }) => { + onEndInteraction(); + clearTimeout(pendingGestureCallbackRef.current); ++ resetExpectingTouchendWithDelay(); + if (finished) { + onFinish(); + } diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js -index 9885b25..22d0c3e 100644 +index a0c13a7..2e9bb70 100644 --- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js +++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js -@@ -5,6 +5,7 @@ import * as React from 'react'; +@@ -4,6 +4,7 @@ import { getDefaultHeaderHeight, SafeAreaProviderCompat } from '@react-navigatio + import * as React from 'react'; import { Animated, Platform, StyleSheet, View } from 'react-native'; import { forModalPresentationIOS, forNoAnimation as forNoAnimationCard } from "../../TransitionConfigs/CardStyleInterpolators.js"; ++import { maybeInitializeEdgeDragGestureMonitor } from "../../utils/edgeDragGestureMonitor.js"; import { BottomSheetAndroid, DefaultTransition, FadeFromBottomAndroid, FadeFromRightAndroid, ModalFadeTransition, ModalSlideFromBottomIOS, ModalTransition, RevealFromBottomAndroid, ScaleFromCenterAndroid, SlideFromLeftIOS, SlideFromRightIOS } from "../../TransitionConfigs/TransitionPresets.js"; -+import { maybeInitializeEdgeDragGestureMonitor } from '../../utils/edgeDragGestureMonitor'; import { findLastIndex } from "../../utils/findLastIndex.js"; import { getDistanceForDirection } from "../../utils/getDistanceForDirection.js"; - import { getModalRouteKeys } from "../../utils/getModalRoutesKeys.js"; -@@ -203,6 +204,8 @@ export class CardStack extends React.Component { +@@ -262,6 +263,7 @@ export class CardStack extends React.Component { } constructor(props) { super(props); -+ // Gesture monitor is only needed on iOS safari to detect if the user performed edge swipe gesture to to navigate in the browser history. + maybeInitializeEdgeDragGestureMonitor(); this.state = { routes: [], diff --git a/patches/react-navigation/@react-navigation+stack+7.6.11+002+dontDetachScreen.patch b/patches/react-navigation/@react-navigation+stack+7.6.11+002+dontDetachScreen.patch new file mode 100644 index 000000000000..c310de72165a --- /dev/null +++ b/patches/react-navigation/@react-navigation+stack+7.6.11+002+dontDetachScreen.patch @@ -0,0 +1,40 @@ +diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js +index 44c8f10..39f5065 100644 +--- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js ++++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js +@@ -30,7 +30,8 @@ export const CardA11yWrapper = /*#__PURE__*/React.forwardRef(({ + // Hide unfocused screens when animation isn't enabled + // This is also necessary for a11y on web + // @ts-expect-error visibility is only available on web +- visibility: isHidden ? 'hidden' : 'visible' ++ visibility: isHidden ? 'hidden' : 'visible', ++ zIndex: Platform.OS === 'web' ? 'auto' : undefined + }] + // Make sure this view is not removed on the new architecture, as it causes focus loss during navigation on Android. + // This can happen when the view flattening results in different trees - due to `overflow` style changing in a parent. +diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js +index a1b2c3d..2e9bb70 100644 +--- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js ++++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardStack.js +@@ -428,10 +428,11 @@ export class CardStack extends React.Component { + const isNextScreenTransparent = scenes[index + 1]?.descriptor.options.presentation === 'transparentModal'; + const detachCurrentScreen = scenes[index + 1]?.descriptor.options.detachPreviousScreen !== false; + const activityState = isPreloaded ? STATE_INACTIVE : activeStates[index]; ++ const shouldNotDetachScreen = route?.dontDetachScreen && activityState !== STATE_ON_TOP; + return /*#__PURE__*/_jsx(MaybeScreen, { + style: [StyleSheet.absoluteFill], + enabled: detachInactiveScreens, +- active: activityState, ++ active: shouldNotDetachScreen ? STATE_TRANSITIONING_OR_BELOW_TOP : activityState, + freezeOnBlur: freezeOnBlur, + shouldFreeze: activityState === STATE_INACTIVE && !isPreloaded, + homeIndicatorHidden: autoHideHomeIndicator, +@@ -466,7 +467,7 @@ export class CardStack extends React.Component { + onTransitionStart: onTransitionStart, + onTransitionEnd: onTransitionEnd, + isNextScreenTransparent: isNextScreenTransparent, +- detachCurrentScreen: detachCurrentScreen, ++ detachCurrentScreen: shouldNotDetachScreen ? false : detachCurrentScreen, + preloaded: isPreloaded + }) + }, route.key); diff --git a/patches/react-navigation/@react-navigation+stack+7.3.3+004+fix-failing-jest-by-disabling-esmodule.patch b/patches/react-navigation/@react-navigation+stack+7.6.11+003+fix-failing-jest-by-disabling-esmodule.patch similarity index 100% rename from patches/react-navigation/@react-navigation+stack+7.3.3+004+fix-failing-jest-by-disabling-esmodule.patch rename to patches/react-navigation/@react-navigation+stack+7.6.11+003+fix-failing-jest-by-disabling-esmodule.patch diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md index 353fac20ab40..fe65642ac679 100644 --- a/patches/react-navigation/details.md +++ b/patches/react-navigation/details.md @@ -1,13 +1,13 @@ # `@react-navigation` patches ### @react-navigation+package-name+7+fix-failing-jest-by-disabling-esmodule.patch -#### [@react-navigation+core+7.10.0+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+core+7.10.0+001+fix-failing-jest-by-disabling-esmodule.patch) -#### [@react-navigation+elements+2.4.3+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+elements+2.4.3+001+fix-failing-jest-by-disabling-esmodule.patch) +#### [@react-navigation+core+7.13.5+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+core+7.13.5+001+fix-failing-jest-by-disabling-esmodule.patch) +#### [@react-navigation+elements+2.9.1+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+elements+2.9.1+001+fix-failing-jest-by-disabling-esmodule.patch) #### [@react-navigation+material-top-tabs+7.2.13+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+material-top-tabs+7.2.13+001+fix-failing-jest-by-disabling-esmodule.patch) #### [@react-navigation+native-stack+7.3.14+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native-stack+7.3.14+002+fix-failing-jest-by-disabling-esmodule.patch) -#### [@react-navigation+native+7.1.10+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native+7.1.10+002+fix-failing-jest-by-disabling-esmodule.patch) -#### [@react-navigation+routers+7.4.0+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+routers+7.4.0+001+fix-failing-jest-by-disabling-esmodule.patch) -#### [@react-navigation+stack+7.3.3+004+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+stack+7.3.3+004+fix-failing-jest-by-disabling-esmodule.patch) +#### [@react-navigation+native+7.1.24+002+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+native+7.1.24+002+fix-failing-jest-by-disabling-esmodule.patch) +#### [@react-navigation+routers+7.5.2+001+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+routers+7.5.2+001+fix-failing-jest-by-disabling-esmodule.patch) +#### [@react-navigation+stack+7.6.11+003+fix-failing-jest-by-disabling-esmodule.patch](@react-navigation+stack+7.6.11+003+fix-failing-jest-by-disabling-esmodule.patch) - Reason: Necessary to run Jest with the obligatory `--experimental-vm-modules` flag. Currently we transpile all the code to `commonjs`, but Jest looks up to individual `package.jsons` to see whether the package is `commonjs` or `ESModule`. That causes a conflict, which can be solved by removing `{"type":"module"}` from `lib/module/package.json`. This might be an issue with Jest, but it would require much more investigation. More: https://github.com/react-navigation/react-navigation/issues/12637 - Upstream PR/issue: https://github.com/react-navigation/react-navigation/issues/12637 @@ -15,7 +15,7 @@ - PR Introducing Patch: [#64155](https://github.com/Expensify/App/pull/64155) - PR Updating Patch: N/A -### [@react-navigation+core+7.10.0+001+platform-navigation-stack-types.patch](@react-navigation+core+7.10.0+001+platform-navigation-stack-types.patch) +### [@react-navigation+core+7.13.5+002+platform-navigation-stack-types.patch](@react-navigation+core+7.13.5+002+platform-navigation-stack-types.patch) - Reason: Enables passing custom `ScreenOptions` and adjusts typing to have everything fully type-checked and make sure only the proper (common) platform-specific options are passed - Upstream PR/issue: N/A @@ -23,12 +23,12 @@ - PR Introducing Patch: [#37891](https://github.com/Expensify/App/pull/37891) - PR Updating Patch: [#64155](https://github.com/Expensify/App/pull/64155) -### [@react-navigation+core+7.10.0+002+fix-crash-when-parsing-emoji.patch](@react-navigation+core+7.10.0+002+fix-crash-when-parsing-emoji.patch) +### [@react-navigation+core+7.13.5+003+fix-clearing-preloaded-routes-after-logout.patch](@react-navigation+core+7.13.5+003+fix-clearing-preloaded-routes-after-logout.patch) -- Reason: App crashes when the path contains emoji -- Upstream PR/issue: https://www.github.com/react-navigation/react-navigation/pull/12679 -- E/App issue: [#65709](https://github.com/Expensify/App/issues/65709) -- PR Introducing Patch: [#65836](https://github.com/Expensify/App/pull/65836) +- Reason: Clear preloaded routes from state that are not available after logging out. +- Upstream PR/issue: N/A +- E/App issue: [#65211](https://github.com/Expensify/App/issues/65211) +- PR Introducing Patch: [#66890](https://github.com/Expensify/App/pull/66890) - PR Updating Patch: N/A ### [@react-navigation+native-stack+7.3.14+001+added-interaction-manager-integration.patch](@react-navigation+native-stack+7.3.14+001+added-interaction-manager-integration.patch) @@ -37,9 +37,9 @@ - Upstream PR/issue: https://github.com/react-navigation/react-navigation/pull/11887 - E/App issue: [#29948](https://github.com/Expensify/App/issues/29948) - PR Introducing Patch: [#37891](https://github.com/Expensify/App/pull/37891) -- PR Updating Patch: [#64155](https://github.com/Expensify/App/pull/64155) +- PR Updating Patch: [#64155](https://github.com/Expensify/App/pull/64155) -### [@react-navigation+native+7.1.10+001+initial.patch](@react-navigation+native+7.1.10+001+initial.patch) +### [@react-navigation+native+7.1.24+001+initial.patch](@react-navigation+native+7.1.24+001+initial.patch) - Reason: Allows us to use some more advanced navigation actions without messing up the browser history - Upstream PR/issue: https://github.com/react-navigation/react-navigation/pull/11887 @@ -47,7 +47,7 @@ - PR Introducing Patch: [#24165](https://github.com/Expensify/App/pull/24165) - PR Updating Patch: [#32087](https://github.com/Expensify/App/pull/32087) [#42465](https://github.com/Expensify/App/pull/42465) [#64155](https://github.com/Expensify/App/pull/64155) -### [@react-navigation+stack+7.3.3+001+edge-drag-gesture.patch](@react-navigation+stack+7.3.3+001+edge-drag-gesture.patch) +### [@react-navigation+stack+7.6.11+001+edge-drag-gesture.patch](@react-navigation+stack+7.6.11+001+edge-drag-gesture.patch) - Reason: Adds `edgeDragGestureMonitor` implementation - Upstream PR/issue: N/A @@ -55,24 +55,10 @@ - PR Introducing Patch: [#18402](https://github.com/Expensify/App/pull/18402) - PR Updating Patch: [#22678](https://github.com/Expensify/App/pull/22678) [#22437](https://github.com/Expensify/App/pull/22437) [#64155](https://github.com/Expensify/App/pull/64155) -### [@react-navigation+stack+7.3.3+002+dontDetachScreen.patch](@react-navigation+stack+7.3.3+002+dontDetachScreen.patch) -- Reason: Prevents the second screen in the stack from being detached too early. +### [@react-navigation+stack+7.6.11+002+dontDetachScreen.patch](@react-navigation+stack+7.6.11+002+dontDetachScreen.patch) +- Reason: Prevents the second screen in the stack from being detached too early. Additionally, setting `zIndex: Platform.OS === 'web' ? 'auto' : undefined` helps avoid issues in Safari where the home screen might be hidden due to `overflow: hidden`. - Upstream PR/issue: N/A - E/App issue: [#22372](https://github.com/Expensify/App/issues/22372) - PR Introducing Patch: [#22437](https://github.com/Expensify/App/pull/22437) - PR Updating Patch: [#33280](https://github.com/Expensify/App/pull/33280) [#37421](https://github.com/Expensify/App/pull/37421) [#49539](https://github.com/Expensify/App/pull/49539) [#64155](https://github.com/Expensify/App/pull/64155) [#65119](https://github.com/Expensify/App/issues/65119) - -### [@react-navigation+core+7.10.0+002+getStateFromPath.patch](@react-navigation+core+7.10.0+002+getStateFromPath.patch) -- Reason: Make sure navigation state props retrieved from the path are available at all nesting levels to avoid undefined state. -- Upstream PR/issue: N/A -- E/App issue: [#48150](https://github.com/Expensify/App/issues/48150) -- PR Introducing Patch: [#48151](https://github.com/Expensify/App/pull/48151) -- PR Updating Patch: [#64155](https://github.com/Expensify/App/pull/64155) - -### [@react-navigation+core+7.10.0+003+fix-clearing-preloaded-routes-after-logout.patch](@react-navigation+core+7.10.0+003+fix-clearing-preloaded-routes-after-logout.patch) -- Reason: Clear preloaded routes from state that are not available after logging out. -- Upstream PR/issue: N/A -- E/App issue: [#65709](https://github.com/Expensify/App/issues/65211) -- PR Introducing Patch: [#65836](https://github.com/Expensify/App/pull/66890) -- PR Updating Patch: N/A \ No newline at end of file diff --git a/src/libs/Navigation/PlatformStackNavigation/navigationOptions/convertToNativeNavigationOptions.ts b/src/libs/Navigation/PlatformStackNavigation/navigationOptions/convertToNativeNavigationOptions.ts index a1df022a03e2..cfb7fb4d92ac 100644 --- a/src/libs/Navigation/PlatformStackNavigation/navigationOptions/convertToNativeNavigationOptions.ts +++ b/src/libs/Navigation/PlatformStackNavigation/navigationOptions/convertToNativeNavigationOptions.ts @@ -1,7 +1,7 @@ -import type {ParamListBase, ScreenOptionsOrCallback} from '@react-navigation/native'; +import type {ParamListBase} from '@react-navigation/native'; import type {NativeStackNavigationOptions} from '@react-navigation/native-stack'; import {isRouteBasedScreenOptions} from '@libs/Navigation/PlatformStackNavigation/types'; -import type {PlatformStackNavigationOptions, PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import type {PlatformStackNavigationOptions, PlatformStackScreenProps, ScreenOptionsOrCallback} from '@libs/Navigation/PlatformStackNavigation/types'; import buildPlatformSpecificNavigationOptions from './buildPlatformSpecificNavigationOptions'; function convertToNativeNavigationOptions( diff --git a/src/libs/Navigation/PlatformStackNavigation/navigationOptions/convertToWebNavigationOptions.ts b/src/libs/Navigation/PlatformStackNavigation/navigationOptions/convertToWebNavigationOptions.ts index 358077a2f392..5421892142be 100644 --- a/src/libs/Navigation/PlatformStackNavigation/navigationOptions/convertToWebNavigationOptions.ts +++ b/src/libs/Navigation/PlatformStackNavigation/navigationOptions/convertToWebNavigationOptions.ts @@ -1,6 +1,6 @@ -import type {ParamListBase, ScreenOptionsOrCallback} from '@react-navigation/native'; +import type {ParamListBase} from '@react-navigation/native'; import type {StackNavigationOptions} from '@react-navigation/stack'; -import type {PlatformStackNavigationOptions, PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import type {PlatformStackNavigationOptions, PlatformStackScreenProps, ScreenOptionsOrCallback} from '@libs/Navigation/PlatformStackNavigation/types'; import {isRouteBasedScreenOptions} from '@libs/Navigation/PlatformStackNavigation/types'; import buildPlatformSpecificNavigationOptions from './buildPlatformSpecificNavigationOptions'; diff --git a/src/libs/Navigation/PlatformStackNavigation/types/NavigationBuilder.ts b/src/libs/Navigation/PlatformStackNavigation/types/NavigationBuilder.ts index 209b4a153a9a..2cc0cdc570c9 100644 --- a/src/libs/Navigation/PlatformStackNavigation/types/NavigationBuilder.ts +++ b/src/libs/Navigation/PlatformStackNavigation/types/NavigationBuilder.ts @@ -19,7 +19,7 @@ type PlatformNavigationBuilderOptions< EventMap extends PlatformSpecificEventMap & EventMapBase, ParamList extends ParamListBase = ParamListBase, RouterOptions extends PlatformStackRouterOptions = PlatformStackRouterOptions, -> = DefaultNavigatorOptions, NavigationOptions, EventMap, NavigationListBase, keyof ParamList> & +> = DefaultNavigatorOptions, NavigationOptions, EventMap, NavigationListBase> & RouterOptions & { persistentScreens?: Array>; defaultCentralScreen?: Extract; diff --git a/src/libs/Navigation/PlatformStackNavigation/types/index.ts b/src/libs/Navigation/PlatformStackNavigation/types/index.ts index 600fbfe5c624..86f1cd811e6e 100644 --- a/src/libs/Navigation/PlatformStackNavigation/types/index.ts +++ b/src/libs/Navigation/PlatformStackNavigation/types/index.ts @@ -6,7 +6,6 @@ import type { ParamListBase, RouteProp, RouterFactory, - ScreenOptionsOrCallback, StackNavigationState, StackRouterOptions, } from '@react-navigation/native'; @@ -15,6 +14,9 @@ import type {StackNavigationEventMap, StackNavigationOptions} from '@react-navig import type CommonProperties from '@src/types/utils/CommonProperties'; import type {PlatformStackNavigationOptions} from './NavigationOptions'; +// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-restricted-types +type ScreenOptionsOrCallback = ScreenOptions | ((props: any) => ScreenOptions); + // Represents the navigation state type for a platform-specific stack. type PlatformStackNavigationState = StackNavigationState; @@ -82,7 +84,7 @@ type PlatformStackNavigatorProps( - screenOptions: ScreenOptionsOrCallback | undefined, + screenOptions: ScreenOptionsOrCallback | undefined, ): screenOptions is (props: PlatformStackScreenProps) => PlatformStackNavigationOptions { return typeof screenOptions === 'function'; } @@ -99,6 +101,7 @@ export type { PlatformStackRouteProp, PlatformStackScreenProps, PlatformStackNavigatorProps, + ScreenOptionsOrCallback, }; // eslint-disable-next-line @typescript-eslint/consistent-type-exports diff --git a/tests/ui/BottomTabBarTest.tsx b/tests/ui/BottomTabBarTest.tsx index b4d4c5a35182..1035b93355a7 100644 --- a/tests/ui/BottomTabBarTest.tsx +++ b/tests/ui/BottomTabBarTest.tsx @@ -1,3 +1,4 @@ +import type * as ReactNavigationNative from '@react-navigation/native'; import {NavigationContainer} from '@react-navigation/native'; import {cleanup, render, screen} from '@testing-library/react-native'; import React from 'react'; @@ -13,6 +14,11 @@ import initOnyxDerivedValues from '@userActions/OnyxDerived'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +jest.mock('@react-navigation/native', () => ({ + ...jest.requireActual('@react-navigation/native'), + useNavigationState: () => undefined, +})); + jest.mock('@src/hooks/useRootNavigationState', () => { return jest.fn(() => ({ routes: [