one 1.26.1 → 2.0.0-beta.33.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (882) hide show
  1. package/dist/cjs/Root.native.js.map +1 -1
  2. package/dist/cjs/__mocks__/@react-navigation/native-stack.native.js.map +1 -1
  3. package/dist/cjs/__mocks__/expo-linking.native.js.map +1 -1
  4. package/dist/cjs/__mocks__/expo-modules-core.native.js.map +1 -1
  5. package/dist/cjs/__mocks__/react-native-screens.native.js.map +1 -1
  6. package/dist/cjs/__tests__/polyfills-mobile.test.native.js.map +1 -1
  7. package/dist/cjs/babel-plugins/environment-guard.native.js.map +1 -1
  8. package/dist/cjs/babel-plugins/inline-one-server-url.native.js.map +1 -1
  9. package/dist/cjs/babel-plugins/one-router-metro.native.js.map +1 -1
  10. package/dist/cjs/babel-plugins/one-router-metro.test.native.js.map +1 -1
  11. package/dist/cjs/babel-plugins/remove-server-code.native.js.map +1 -1
  12. package/dist/cjs/babel-preset/index.native.js.map +1 -1
  13. package/dist/cjs/babel-preset/index.test.native.js.map +1 -1
  14. package/dist/cjs/babel-preset/integration.test.native.js.map +1 -1
  15. package/dist/cjs/cli/build.native.js.map +1 -1
  16. package/dist/cjs/cli/buildPage.native.js.map +1 -1
  17. package/dist/cjs/cli/buildPageWorker.native.js.map +1 -1
  18. package/dist/cjs/cli/checkNodeVersion.native.js.map +1 -1
  19. package/dist/cjs/cli/daemon.native.js.map +1 -1
  20. package/dist/cjs/cli/dev.native.js.map +1 -1
  21. package/dist/cjs/cli/generateBundlerConfig.native.js.map +1 -1
  22. package/dist/cjs/cli/generateBundlerConfig.test.native.js.map +1 -1
  23. package/dist/cjs/cli/generateRoutes.native.js.map +1 -1
  24. package/dist/cjs/cli/generateSitemap.native.js.map +1 -1
  25. package/dist/cjs/cli/generateSitemap.test.native.js.map +1 -1
  26. package/dist/cjs/cli/install-error-handlers.native.js.map +1 -1
  27. package/dist/cjs/cli/label-process.native.js.map +1 -1
  28. package/dist/cjs/cli/main.native.js.map +1 -1
  29. package/dist/cjs/cli/patch.native.js.map +1 -1
  30. package/dist/cjs/cli/patch.test.native.js.map +1 -1
  31. package/dist/cjs/cli/prebuild.native.js.map +1 -1
  32. package/dist/cjs/cli/prebuild.test.native.js.map +1 -1
  33. package/dist/cjs/cli/runAndroid.native.js.map +1 -1
  34. package/dist/cjs/cli/runIos.native.js.map +1 -1
  35. package/dist/cjs/cli/securityScan.native.js.map +1 -1
  36. package/dist/cjs/cli/serverRouteModules.native.js.map +1 -1
  37. package/dist/cjs/cli/workerPool.native.js.map +1 -1
  38. package/dist/cjs/cli.native.js.map +1 -1
  39. package/dist/cjs/clientLoaderResolver.native.js.map +1 -1
  40. package/dist/cjs/config.native.js.map +1 -1
  41. package/dist/cjs/constants.native.js.map +1 -1
  42. package/dist/cjs/constants.test.native.js.map +1 -1
  43. package/dist/cjs/createAPIRoute.native.js.map +1 -1
  44. package/dist/cjs/createApp.native.js +25 -1
  45. package/dist/cjs/createApp.native.js.map +1 -1
  46. package/dist/cjs/createDevHandleRequest.native.js.map +1 -1
  47. package/dist/cjs/createHandleRequest.native.js.map +1 -1
  48. package/dist/cjs/createHandleRequest.test.native.js.map +1 -1
  49. package/dist/cjs/createMiddleware.native.js.map +1 -1
  50. package/dist/cjs/daemon/index.native.js.map +1 -1
  51. package/dist/cjs/daemon/ipc.native.js.map +1 -1
  52. package/dist/cjs/daemon/picker.native.js.map +1 -1
  53. package/dist/cjs/daemon/proxy.native.js.map +1 -1
  54. package/dist/cjs/daemon/registry.native.js.map +1 -1
  55. package/dist/cjs/daemon/server.native.js.map +1 -1
  56. package/dist/cjs/daemon/tui.native.js.map +1 -1
  57. package/dist/cjs/daemon/types.native.js.map +1 -1
  58. package/dist/cjs/daemon/utils.native.js.map +1 -1
  59. package/dist/cjs/devtools/registry.native.js.map +1 -1
  60. package/dist/cjs/drawer.native.js.map +1 -1
  61. package/dist/cjs/fallbackViews/Sitemap.cjs +1 -1
  62. package/dist/cjs/fallbackViews/Sitemap.native.js +1 -1
  63. package/dist/cjs/fallbackViews/Sitemap.native.js.map +1 -1
  64. package/dist/cjs/fallbackViews/Unmatched.native.js.map +1 -1
  65. package/dist/cjs/fork/NavigationContainer.cjs +25 -51
  66. package/dist/cjs/fork/NavigationContainer.native.js +29 -56
  67. package/dist/cjs/fork/NavigationContainer.native.js.map +1 -1
  68. package/dist/cjs/fork/__tests__/getPathFromState.test.native.js.map +1 -1
  69. package/dist/cjs/fork/__tests__/getStateFromPath.test.native.js.map +1 -1
  70. package/dist/cjs/fork/_shared.native.js.map +1 -1
  71. package/dist/cjs/fork/createMemoryHistory.native.js.map +1 -1
  72. package/dist/cjs/fork/createMemoryHistory.test.native.js.map +1 -1
  73. package/dist/cjs/fork/extractPathFromURL.native.js.map +1 -1
  74. package/dist/cjs/fork/extractPathFromURL.test.native.js.map +1 -1
  75. package/dist/cjs/fork/findFocusedRoute.native.js.map +1 -1
  76. package/dist/cjs/fork/getPathFromState-mods.native.js.map +1 -1
  77. package/dist/cjs/fork/getPathFromState.native.js.map +1 -1
  78. package/dist/cjs/fork/getPathFromState.test.native.js.map +1 -1
  79. package/dist/cjs/fork/getStateFromPath-mods.native.js.map +1 -1
  80. package/dist/cjs/fork/getStateFromPath.native.js.map +1 -1
  81. package/dist/cjs/fork/getStateFromPath.test.native.js.map +1 -1
  82. package/dist/cjs/fork/useLinking.cjs +18 -15
  83. package/dist/cjs/fork/useLinking.native.js +12 -21
  84. package/dist/cjs/fork/useLinking.native.js.map +1 -1
  85. package/dist/cjs/fork/useLinking.native.test.cjs +1 -1
  86. package/dist/cjs/fork/useLinking.native.test.native.js +1 -1
  87. package/dist/cjs/fork/useLinking.native.test.native.js.map +1 -1
  88. package/dist/cjs/fork/useThenable.native.js.map +1 -1
  89. package/dist/cjs/fork/validatePathConfig.cjs +9 -2
  90. package/dist/cjs/fork/validatePathConfig.native.js +9 -2
  91. package/dist/cjs/fork/validatePathConfig.native.js.map +1 -1
  92. package/dist/cjs/getReactNavigationConfig.cjs +49 -4
  93. package/dist/cjs/getReactNavigationConfig.native.js +55 -4
  94. package/dist/cjs/getReactNavigationConfig.native.js.map +1 -1
  95. package/dist/cjs/getURL.native.test.native.js.map +1 -1
  96. package/dist/cjs/head/Head.native.js.map +1 -1
  97. package/dist/cjs/head/HeadModule.native.js.map +1 -1
  98. package/dist/cjs/head/index.native.js.map +1 -1
  99. package/dist/cjs/head/types.native.js.map +1 -1
  100. package/dist/cjs/head/url.native.js.map +1 -1
  101. package/dist/cjs/headless/Presentations.native.js.map +1 -1
  102. package/dist/cjs/headless/__tests__/useStack.test.cjs +7 -15
  103. package/dist/cjs/headless/__tests__/useStack.test.native.js +7 -15
  104. package/dist/cjs/headless/__tests__/useStack.test.native.js.map +1 -1
  105. package/dist/cjs/headless/children.native.js.map +1 -1
  106. package/dist/cjs/headless/keepMounted.native.js.map +1 -1
  107. package/dist/cjs/headless/types.native.js.map +1 -1
  108. package/dist/cjs/headless/useDrawer.native.js.map +1 -1
  109. package/dist/cjs/headless/useStack.cjs +1 -2
  110. package/dist/cjs/headless/useStack.native.js +1 -2
  111. package/dist/cjs/headless/useStack.native.js.map +1 -1
  112. package/dist/cjs/headless/useTabs.native.js.map +1 -1
  113. package/dist/cjs/headless-server.native.js.map +1 -1
  114. package/dist/cjs/headless.native.js.map +1 -1
  115. package/dist/cjs/hooks.native.js.map +1 -1
  116. package/dist/cjs/hooks.test.native.js.map +1 -1
  117. package/dist/cjs/href.native.js.map +1 -1
  118. package/dist/cjs/image/getImageData.native.js.map +1 -1
  119. package/dist/cjs/image.native.js.map +1 -1
  120. package/dist/cjs/index.native.js +1 -1
  121. package/dist/cjs/index.native.js.map +1 -1
  122. package/dist/cjs/interfaces/router.native.js.map +1 -1
  123. package/dist/cjs/layouts/Drawer.native.js.map +1 -1
  124. package/dist/cjs/layouts/Stack.cjs +9 -12
  125. package/dist/cjs/layouts/Stack.native.js +11 -14
  126. package/dist/cjs/layouts/Stack.native.js.map +1 -1
  127. package/dist/cjs/layouts/Tabs.native.js +3 -84
  128. package/dist/cjs/layouts/Tabs.native.js.map +1 -1
  129. package/dist/cjs/layouts/nativeTabsOptions.cjs +49 -0
  130. package/dist/cjs/layouts/nativeTabsOptions.native.js +52 -0
  131. package/dist/cjs/layouts/nativeTabsOptions.native.js.map +1 -0
  132. package/dist/cjs/layouts/stack-navigator.native.js.map +1 -1
  133. package/dist/cjs/layouts/stack-utils/StackHeaderBackButton.cjs +4 -1
  134. package/dist/cjs/layouts/stack-utils/StackHeaderBackButton.native.js +4 -1
  135. package/dist/cjs/layouts/stack-utils/StackHeaderBackButton.native.js.map +1 -1
  136. package/dist/cjs/layouts/stack-utils/StackHeaderComponent.native.js.map +1 -1
  137. package/dist/cjs/layouts/stack-utils/StackHeaderLeft.native.js.map +1 -1
  138. package/dist/cjs/layouts/stack-utils/StackHeaderRight.native.js.map +1 -1
  139. package/dist/cjs/layouts/stack-utils/StackHeaderSearchBar.native.js.map +1 -1
  140. package/dist/cjs/layouts/stack-utils/StackHeaderTitle.cjs +2 -2
  141. package/dist/cjs/layouts/stack-utils/StackHeaderTitle.native.js +2 -2
  142. package/dist/cjs/layouts/stack-utils/StackHeaderTitle.native.js.map +1 -1
  143. package/dist/cjs/layouts/stack-utils/StackScreen.cjs +3 -6
  144. package/dist/cjs/layouts/stack-utils/StackScreen.native.js +4 -7
  145. package/dist/cjs/layouts/stack-utils/StackScreen.native.js.map +1 -1
  146. package/dist/cjs/layouts/stack-utils/__tests__/composition.test.cjs +14 -14
  147. package/dist/cjs/layouts/stack-utils/__tests__/composition.test.native.js +14 -14
  148. package/dist/cjs/layouts/stack-utils/__tests__/composition.test.native.js.map +1 -1
  149. package/dist/cjs/layouts/stack-utils/index.cjs +0 -2
  150. package/dist/cjs/layouts/stack-utils/index.native.js +0 -2
  151. package/dist/cjs/layouts/stack-utils/index.native.js.map +1 -1
  152. package/dist/cjs/layouts/withLayoutContext.cjs +0 -1
  153. package/dist/cjs/layouts/withLayoutContext.native.js +0 -1
  154. package/dist/cjs/layouts/withLayoutContext.native.js.map +1 -1
  155. package/dist/cjs/layouts/withLayoutContext.test.cjs +18 -0
  156. package/dist/cjs/layouts/withLayoutContext.test.native.js +24 -0
  157. package/dist/cjs/layouts/withLayoutContext.test.native.js.map +1 -1
  158. package/dist/cjs/lazyWithRetry.native.js.map +1 -1
  159. package/dist/cjs/link/Link.native.js.map +1 -1
  160. package/dist/cjs/link/Redirect.native.js.map +1 -1
  161. package/dist/cjs/link/Redirect.test.native.js.map +1 -1
  162. package/dist/cjs/link/getLinking.native.js.map +1 -1
  163. package/dist/cjs/link/href.native.js.map +1 -1
  164. package/dist/cjs/link/path.native.js.map +1 -1
  165. package/dist/cjs/link/prefetchIntent.native.js.map +1 -1
  166. package/dist/cjs/link/prefetchIntent.test.native.js.map +1 -1
  167. package/dist/cjs/link/prefetchViewport.native.js.map +1 -1
  168. package/dist/cjs/link/prefetchViewport.test.native.js.map +1 -1
  169. package/dist/cjs/link/useLinkTo.native.js.map +1 -1
  170. package/dist/cjs/link/useLoadedNavigation.native.js.map +1 -1
  171. package/dist/cjs/metro-config/buildOneMetroResolverOverrides.native.js.map +1 -1
  172. package/dist/cjs/metro-config/buildOneMetroResolverOverrides.test.native.js.map +1 -1
  173. package/dist/cjs/metro-config/getViteMetroPluginOptions.integration.test.native.js.map +1 -1
  174. package/dist/cjs/metro-config/getViteMetroPluginOptions.native.js +1 -1
  175. package/dist/cjs/metro-config/getViteMetroPluginOptions.native.js.map +1 -1
  176. package/dist/cjs/metro-config/withOne.native.js.map +1 -1
  177. package/dist/cjs/metro-config/withOne.test.native.js.map +1 -1
  178. package/dist/cjs/native-transforms.native.js.map +1 -1
  179. package/dist/cjs/notFoundState.native.js.map +1 -1
  180. package/dist/cjs/package-exports.test.native.js.map +1 -1
  181. package/dist/cjs/polyfills-mobile.native.js.map +1 -1
  182. package/dist/cjs/polyfills-server.native.js.map +1 -1
  183. package/dist/cjs/router/FlagsContext.native.js.map +1 -1
  184. package/dist/cjs/router/Route.cjs +10 -3
  185. package/dist/cjs/router/Route.native.js +13 -3
  186. package/dist/cjs/router/Route.native.js.map +1 -1
  187. package/dist/cjs/router/RouteInfoContext.native.js.map +1 -1
  188. package/dist/cjs/router/RouterStore.native.js.map +1 -1
  189. package/dist/cjs/router/SpaShellContext.native.js.map +1 -1
  190. package/dist/cjs/router/conditionalSlotPathname.test.native.js.map +1 -1
  191. package/dist/cjs/router/createRoute.native.js.map +1 -1
  192. package/dist/cjs/router/diagnoseRouteLoadFailure.native.js.map +1 -1
  193. package/dist/cjs/router/filterRootHTML.native.js.map +1 -1
  194. package/dist/cjs/router/findRouteNode.cjs +10 -10
  195. package/dist/cjs/router/findRouteNode.native.js +13 -29
  196. package/dist/cjs/router/findRouteNode.native.js.map +1 -1
  197. package/dist/cjs/router/findRouteNode.test.cjs +88 -0
  198. package/dist/cjs/router/findRouteNode.test.native.js +94 -0
  199. package/dist/cjs/router/findRouteNode.test.native.js.map +1 -0
  200. package/dist/cjs/router/getLinkingConfig.native.js.map +1 -1
  201. package/dist/cjs/router/getLinkingConfig.test.cjs +9 -0
  202. package/dist/cjs/router/getLinkingConfig.test.native.js +9 -0
  203. package/dist/cjs/router/getLinkingConfig.test.native.js.map +1 -1
  204. package/dist/cjs/router/getNormalizedStatePath.native.js.map +1 -1
  205. package/dist/cjs/router/getRouteArtifactPath.native.js.map +1 -1
  206. package/dist/cjs/router/getRouteArtifactPath.test.native.js.map +1 -1
  207. package/dist/cjs/router/getRouteInfo.native.js.map +1 -1
  208. package/dist/cjs/router/getRouteInfo.test.cjs +21 -0
  209. package/dist/cjs/router/getRouteInfo.test.native.js +23 -0
  210. package/dist/cjs/router/getRouteInfo.test.native.js.map +1 -1
  211. package/dist/cjs/router/getRoutes.native.js.map +1 -1
  212. package/dist/cjs/router/getRoutes.test.native.js.map +1 -1
  213. package/dist/cjs/router/glob-patterns.native.js.map +1 -1
  214. package/dist/cjs/router/hmrImport.native.test.native.js.map +1 -1
  215. package/dist/cjs/router/imperative-api.native.js.map +1 -1
  216. package/dist/cjs/router/interceptRoutes.native.js.map +1 -1
  217. package/dist/cjs/router/isIndexPath.cjs +1 -1
  218. package/dist/cjs/router/isIndexPath.native.js +2 -1
  219. package/dist/cjs/router/isIndexPath.native.js.map +1 -1
  220. package/dist/cjs/router/isStateAwaitingNavigatorMount.cjs +2 -1
  221. package/dist/cjs/router/isStateAwaitingNavigatorMount.native.js +2 -1
  222. package/dist/cjs/router/isStateAwaitingNavigatorMount.native.js.map +1 -1
  223. package/dist/cjs/router/lastAction.native.js.map +1 -1
  224. package/dist/cjs/router/linkToOrphaned.test.native.js.map +1 -1
  225. package/dist/cjs/router/linkingConfig.native.js.map +1 -1
  226. package/dist/cjs/router/matchers.native.js.map +1 -1
  227. package/dist/cjs/router/matchers.test.native.js.map +1 -1
  228. package/dist/cjs/router/params.native.js.map +1 -1
  229. package/dist/cjs/router/path.native.js.map +1 -1
  230. package/dist/cjs/router/path.test.native.js.map +1 -1
  231. package/dist/cjs/router/protectedRoutes.test.native.js.map +1 -1
  232. package/dist/cjs/router/routeHmr.native.test.native.js.map +1 -1
  233. package/dist/cjs/router/router.cjs +12 -14
  234. package/dist/cjs/router/router.native.js +13 -14
  235. package/dist/cjs/router/router.native.js.map +1 -1
  236. package/dist/cjs/router/serverLocationContext.native.js.map +1 -1
  237. package/dist/cjs/router/sitemap.native.js.map +1 -1
  238. package/dist/cjs/router/sitemap.test.native.js.map +1 -1
  239. package/dist/cjs/router/sortRoutes.native.js.map +1 -1
  240. package/dist/cjs/router/useInitializeOneRouter.native.js.map +1 -1
  241. package/dist/cjs/router/useInitializeOneRouter.preview-lifecycle.test.native.js.map +1 -1
  242. package/dist/cjs/router/useNavigation.cjs +30 -8
  243. package/dist/cjs/router/useNavigation.native.js +32 -8
  244. package/dist/cjs/router/useNavigation.native.js.map +1 -1
  245. package/dist/cjs/router/useScreens.cjs +4 -2
  246. package/dist/cjs/router/useScreens.native.js +4 -2
  247. package/dist/cjs/router/useScreens.native.js.map +1 -1
  248. package/dist/cjs/router/useScreens.test.native.js.map +1 -1
  249. package/dist/cjs/router/useViteRoutes.native.js.map +1 -1
  250. package/dist/cjs/router/useViteRoutes.test.native.js.map +1 -1
  251. package/dist/cjs/router/utils/getNavigateAction.cjs +2 -2
  252. package/dist/cjs/router/utils/getNavigateAction.native.js +5 -4
  253. package/dist/cjs/router/utils/getNavigateAction.native.js.map +1 -1
  254. package/dist/cjs/router/utils/getNavigateAction.test.cjs +37 -6
  255. package/dist/cjs/router/utils/getNavigateAction.test.native.js +37 -6
  256. package/dist/cjs/router/utils/getNavigateAction.test.native.js.map +1 -1
  257. package/dist/cjs/router/web/WebStackNavigator.native.js.map +1 -1
  258. package/dist/cjs/router/web/WebStackView.cjs +1 -1
  259. package/dist/cjs/router/web/WebStackView.native.js +1 -1
  260. package/dist/cjs/router/web/WebStackView.native.js.map +1 -1
  261. package/dist/cjs/router/web/__tests__/stackStateUtils.test.cjs +21 -1
  262. package/dist/cjs/router/web/__tests__/stackStateUtils.test.native.js +23 -1
  263. package/dist/cjs/router/web/__tests__/stackStateUtils.test.native.js.map +1 -1
  264. package/dist/cjs/router/web/stackStateUtils.cjs +1 -1
  265. package/dist/cjs/router/web/stackStateUtils.native.js +1 -1
  266. package/dist/cjs/router/web/stackStateUtils.native.js.map +1 -1
  267. package/dist/cjs/serve-worker.native.js.map +1 -1
  268. package/dist/cjs/serve.native.js.map +1 -1
  269. package/dist/cjs/server/ServerContextScript.native.js.map +1 -1
  270. package/dist/cjs/server/createRoutesManifest.native.js.map +1 -1
  271. package/dist/cjs/server/getServerManifest.native.js.map +1 -1
  272. package/dist/cjs/server/getServerManifest.test.native.js.map +1 -1
  273. package/dist/cjs/server/oneServe.native.js.map +1 -1
  274. package/dist/cjs/server/routeExportsFromEntry.native.js.map +1 -1
  275. package/dist/cjs/server/setServerGlobals.native.js.map +1 -1
  276. package/dist/cjs/server/setupBuildOptions.native.js.map +1 -1
  277. package/dist/cjs/server/setupServerGlobals.native.js.map +1 -1
  278. package/dist/cjs/server/ssrLoaderData.native.js.map +1 -1
  279. package/dist/cjs/server/staticHtmlFetcher.native.js.map +1 -1
  280. package/dist/cjs/server/workerHandler.native.js.map +1 -1
  281. package/dist/cjs/server/workerHandler.test.native.js.map +1 -1
  282. package/dist/cjs/server-render.native.js.map +1 -1
  283. package/dist/cjs/skewProtection.native.js.map +1 -1
  284. package/dist/cjs/testing-utils.native.js.map +1 -1
  285. package/dist/cjs/typed-routes/generateRouteTypes.native.js.map +1 -1
  286. package/dist/cjs/typed-routes/generateRouteTypes.test.native.js.map +1 -1
  287. package/dist/cjs/typed-routes/getTypedRoutesDeclarationFile.native.js.map +1 -1
  288. package/dist/cjs/typed-routes/getTypedRoutesDeclarationFile.test.native.js.map +1 -1
  289. package/dist/cjs/typed-routes/injectRouteHelpers.native.js.map +1 -1
  290. package/dist/cjs/types.native.js.map +1 -1
  291. package/dist/cjs/ui/Slot.cjs +3 -3
  292. package/dist/cjs/ui/Slot.native.js +1 -25
  293. package/dist/cjs/ui/Slot.native.js.map +1 -1
  294. package/dist/cjs/ui/TabContext.native.js.map +1 -1
  295. package/dist/cjs/ui/TabList.cjs +4 -5
  296. package/dist/cjs/ui/TabList.native.js +2 -15
  297. package/dist/cjs/ui/TabList.native.js.map +1 -1
  298. package/dist/cjs/ui/TabRouter.native.js.map +1 -1
  299. package/dist/cjs/ui/TabSlot.cjs +3 -3
  300. package/dist/cjs/ui/TabSlot.native.js +11 -43
  301. package/dist/cjs/ui/TabSlot.native.js.map +1 -1
  302. package/dist/cjs/ui/TabTrigger.cjs +3 -3
  303. package/dist/cjs/ui/TabTrigger.native.js +24 -22
  304. package/dist/cjs/ui/TabTrigger.native.js.map +1 -1
  305. package/dist/cjs/ui/Tabs.cjs +9 -10
  306. package/dist/cjs/ui/Tabs.native.js +2 -9
  307. package/dist/cjs/ui/Tabs.native.js.map +1 -1
  308. package/dist/cjs/ui/Tabs.shared.cjs +1 -4
  309. package/dist/cjs/ui/Tabs.shared.native.js +1 -4
  310. package/dist/cjs/ui/Tabs.shared.native.js.map +1 -1
  311. package/dist/cjs/ui/common.cjs +6 -5
  312. package/dist/cjs/ui/common.native.js +10 -7
  313. package/dist/cjs/ui/common.native.js.map +1 -1
  314. package/dist/cjs/ui/index.native.js +2 -4
  315. package/dist/cjs/ui/index.native.js.map +1 -1
  316. package/dist/cjs/ui/useComponent.native.js.map +1 -1
  317. package/dist/cjs/ui/useTabTrigger.native.js.map +1 -1
  318. package/dist/cjs/useFocusEffect.native.js.map +1 -1
  319. package/dist/cjs/useLoader.native.js.map +1 -1
  320. package/dist/cjs/useMatches.native.js.map +1 -1
  321. package/dist/cjs/useMatches.test.native.js.map +1 -1
  322. package/dist/cjs/useServerHeadInsertion.native.js.map +1 -1
  323. package/dist/cjs/utils/assertIsReady.native.js.map +1 -1
  324. package/dist/cjs/utils/buildOutputPointer.native.js.map +1 -1
  325. package/dist/cjs/utils/buildOutputPointer.test.native.js.map +1 -1
  326. package/dist/cjs/utils/children.native.js.map +1 -1
  327. package/dist/cjs/utils/cleanUrl.native.js.map +1 -1
  328. package/dist/cjs/utils/cleanUrl.test.native.js.map +1 -1
  329. package/dist/cjs/utils/dynamicImport.native.js.map +1 -1
  330. package/dist/cjs/utils/dynamicImport.test.native.js.map +1 -1
  331. package/dist/cjs/utils/ensureExists.native.js.map +1 -1
  332. package/dist/cjs/utils/evictOldest.native.js.map +1 -1
  333. package/dist/cjs/utils/existsAsync.native.js.map +1 -1
  334. package/dist/cjs/utils/findRootLayout.native.js.map +1 -1
  335. package/dist/cjs/utils/getPageExport.native.js.map +1 -1
  336. package/dist/cjs/utils/getPathnameFromFilePath.native.js.map +1 -1
  337. package/dist/cjs/utils/getPathnameFromFilePath.test.native.js.map +1 -1
  338. package/dist/cjs/utils/getRouterRootFromOneOptions.native.js.map +1 -1
  339. package/dist/cjs/utils/globDir.native.js.map +1 -1
  340. package/dist/cjs/utils/hashString.native.js.map +1 -1
  341. package/dist/cjs/utils/htmlEscape.native.js.map +1 -1
  342. package/dist/cjs/utils/isResponse.native.js.map +1 -1
  343. package/dist/cjs/utils/isRolldown.native.js.map +1 -1
  344. package/dist/cjs/utils/isStatus.native.js.map +1 -1
  345. package/dist/cjs/utils/pLimit.native.js.map +1 -1
  346. package/dist/cjs/utils/platform.native.js.map +1 -1
  347. package/dist/cjs/utils/posixPathContract.test.native.js.map +1 -1
  348. package/dist/cjs/utils/promiseWithResolvers.native.js.map +1 -1
  349. package/dist/cjs/utils/rand.native.js.map +1 -1
  350. package/dist/cjs/utils/redirect.native.js.map +1 -1
  351. package/dist/cjs/utils/removeParams.native.js.map +1 -1
  352. package/dist/cjs/utils/removeSearch.native.js.map +1 -1
  353. package/dist/cjs/utils/removeUndefined.native.js.map +1 -1
  354. package/dist/cjs/utils/routeFileWatch.native.js.map +1 -1
  355. package/dist/cjs/utils/routeFileWatch.test.native.js.map +1 -1
  356. package/dist/cjs/utils/routeIndex.native.js.map +1 -1
  357. package/dist/cjs/utils/routeIndex.test.native.js.map +1 -1
  358. package/dist/cjs/utils/style.native.js.map +1 -1
  359. package/dist/cjs/utils/toAbsolute.native.js.map +1 -1
  360. package/dist/cjs/utils/toServerOutputPath.native.js.map +1 -1
  361. package/dist/cjs/utils/toServerOutputPath.test.native.js.map +1 -1
  362. package/dist/cjs/utils/trackLoaderDependencies.native.js.map +1 -1
  363. package/dist/cjs/utils/url.native.js.map +1 -1
  364. package/dist/cjs/utils/useConstant.native.js.map +1 -1
  365. package/dist/cjs/utils/watchFile.native.js.map +1 -1
  366. package/dist/cjs/utils/weakKey.native.js.map +1 -1
  367. package/dist/cjs/utils/weakMemo.native.js.map +1 -1
  368. package/dist/cjs/utils/withStaticProperties.native.js.map +1 -1
  369. package/dist/cjs/utils/workerImport.native.js.map +1 -1
  370. package/dist/cjs/validateParams.native.js.map +1 -1
  371. package/dist/cjs/validateSearch.native.js.map +1 -1
  372. package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js.map +1 -1
  373. package/dist/cjs/vercel/build/config/vc-build-output-config-base.native.js.map +1 -1
  374. package/dist/cjs/vercel/build/config/vc-config-base.native.js.map +1 -1
  375. package/dist/cjs/vercel/build/config/vc-package-base.native.js.map +1 -1
  376. package/dist/cjs/vercel/build/generate/createApiServerlessFunction.native.js.map +1 -1
  377. package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js.map +1 -1
  378. package/dist/cjs/vercel/build/getPathFromRoute.native.js.map +1 -1
  379. package/dist/cjs/views/EmptyRoute.native.js.map +1 -1
  380. package/dist/cjs/views/ErrorBoundary.native.js.map +1 -1
  381. package/dist/cjs/views/LoadProgressBar.native.js.map +1 -1
  382. package/dist/cjs/views/Navigator.cjs +2 -19
  383. package/dist/cjs/views/Navigator.native.js +2 -23
  384. package/dist/cjs/views/Navigator.native.js.map +1 -1
  385. package/dist/cjs/views/Protected.native.js.map +1 -1
  386. package/dist/cjs/views/RootErrorBoundary.native.js.map +1 -1
  387. package/dist/cjs/views/RouteErrorView.native.js.map +1 -1
  388. package/dist/cjs/views/Screen.native.js.map +1 -1
  389. package/dist/cjs/views/ScrollBehavior.native.js.map +1 -1
  390. package/dist/cjs/views/ScrollBehavior.test.native.js.map +1 -1
  391. package/dist/cjs/views/SourceInspector.native.js.map +1 -1
  392. package/dist/cjs/views/SuspenseFallback.native.js.map +1 -1
  393. package/dist/cjs/views/Try.native.js.map +1 -1
  394. package/dist/cjs/vite/DevHead.native.js.map +1 -1
  395. package/dist/cjs/vite/cloudflareWranglerConfig.native.js.map +1 -1
  396. package/dist/cjs/vite/cloudflareWranglerConfig.test.native.js.map +1 -1
  397. package/dist/cjs/vite/constants.native.js.map +1 -1
  398. package/dist/cjs/vite/customNodeExternals.native.js.map +1 -1
  399. package/dist/cjs/vite/ensureTsConfig.native.js.map +1 -1
  400. package/dist/cjs/vite/findDepsToOptimize.native.js.map +1 -1
  401. package/dist/cjs/vite/getManifest.native.js.map +1 -1
  402. package/dist/cjs/vite/getManifest.test.native.js.map +1 -1
  403. package/dist/cjs/vite/loadConfig.native.js.map +1 -1
  404. package/dist/cjs/vite/makePluginWebOnly.native.js.map +1 -1
  405. package/dist/cjs/vite/one-server-only.test.native.js.map +1 -1
  406. package/dist/cjs/vite/one.native.js.map +1 -1
  407. package/dist/cjs/vite/plugins/SSRCSSPlugin.native.js.map +1 -1
  408. package/dist/cjs/vite/plugins/bundledDevPlugin.native.js.map +1 -1
  409. package/dist/cjs/vite/plugins/clientTreeShakePlugin.native.js.map +1 -1
  410. package/dist/cjs/vite/plugins/clientTreeShakePlugin.test.native.js.map +1 -1
  411. package/dist/cjs/vite/plugins/criticalCSSPlugin.native.js.map +1 -1
  412. package/dist/cjs/vite/plugins/criticalCSSPlugin.test.native.js.map +1 -1
  413. package/dist/cjs/vite/plugins/devtoolsPlugin.native.js.map +1 -1
  414. package/dist/cjs/vite/plugins/environmentGuardPlugin.native.js.map +1 -1
  415. package/dist/cjs/vite/plugins/environmentGuardPlugin.test.native.js.map +1 -1
  416. package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
  417. package/dist/cjs/vite/plugins/fileSystemRouterPlugin.test.native.js.map +1 -1
  418. package/dist/cjs/vite/plugins/fixDependenciesPlugin.native.js.map +1 -1
  419. package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +1 -1
  420. package/dist/cjs/vite/plugins/imageDataPlugin.native.js.map +1 -1
  421. package/dist/cjs/vite/plugins/imageDataPlugin.test.native.js.map +1 -1
  422. package/dist/cjs/vite/plugins/removeReactNativeWebAnimatedPlugin.native.js.map +1 -1
  423. package/dist/cjs/vite/plugins/routeModuleHmrPlugin.native.js.map +1 -1
  424. package/dist/cjs/vite/plugins/routeModuleHmrPlugin.test.native.js.map +1 -1
  425. package/dist/cjs/vite/plugins/sourceInspectorPlugin.native.js.map +1 -1
  426. package/dist/cjs/vite/plugins/sourceInspectorPlugin.test.native.js.map +1 -1
  427. package/dist/cjs/vite/plugins/useDomPlugin.native.js.map +1 -1
  428. package/dist/cjs/vite/plugins/virtualEntryConstants.native.js.map +1 -1
  429. package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
  430. package/dist/cjs/vite/plugins/virtualEntryPlugin.test.native.js.map +1 -1
  431. package/dist/cjs/vite/plugins/warmRoutesPlugin.native.js.map +1 -1
  432. package/dist/cjs/vite/plugins/workerdDevPlugin.native.js.map +1 -1
  433. package/dist/cjs/vite/plugins/workerdDevPlugin.test.native.js.map +1 -1
  434. package/dist/cjs/vite/resolveResponse.native.js.map +1 -1
  435. package/dist/cjs/vite/types.native.js.map +1 -1
  436. package/dist/cjs/vite-auto-warm.native.js.map +1 -1
  437. package/dist/cjs/vite.native.js.map +1 -1
  438. package/dist/cjs/zero/getQueryKey.native.js.map +1 -1
  439. package/dist/cjs/zero/isZeroQuery.native.js.map +1 -1
  440. package/dist/cjs/zero/resolveQuery.native.js.map +1 -1
  441. package/dist/cjs/zero/subscribeToQuery.native.js.map +1 -1
  442. package/dist/cjs/zero/types.native.js.map +1 -1
  443. package/dist/cjs/zero/useQuery.native.js.map +1 -1
  444. package/dist/cjs/zero/useQueryZero.native.js.map +1 -1
  445. package/dist/cjs/zero.native.js.map +1 -1
  446. package/dist/esm/createApp.native.js +25 -1
  447. package/dist/esm/createApp.native.js.map +1 -1
  448. package/dist/esm/fallbackViews/Sitemap.mjs +1 -1
  449. package/dist/esm/fallbackViews/Sitemap.mjs.map +1 -1
  450. package/dist/esm/fallbackViews/Sitemap.native.js +1 -1
  451. package/dist/esm/fallbackViews/Sitemap.native.js.map +1 -1
  452. package/dist/esm/fork/NavigationContainer.mjs +26 -52
  453. package/dist/esm/fork/NavigationContainer.mjs.map +1 -1
  454. package/dist/esm/fork/NavigationContainer.native.js +30 -57
  455. package/dist/esm/fork/NavigationContainer.native.js.map +1 -1
  456. package/dist/esm/fork/getPathFromState.mjs.map +1 -1
  457. package/dist/esm/fork/useLinking.mjs +18 -15
  458. package/dist/esm/fork/useLinking.mjs.map +1 -1
  459. package/dist/esm/fork/useLinking.native.js +12 -21
  460. package/dist/esm/fork/useLinking.native.js.map +1 -1
  461. package/dist/esm/fork/useLinking.native.test.js +12 -17
  462. package/dist/esm/fork/useLinking.native.test.js.map +1 -1
  463. package/dist/esm/fork/useLinking.native.test.mjs +2 -2
  464. package/dist/esm/fork/useLinking.native.test.mjs.map +1 -1
  465. package/dist/esm/fork/useLinking.native.test.native.js +1 -1
  466. package/dist/esm/fork/useLinking.native.test.native.js.map +1 -1
  467. package/dist/esm/fork/validatePathConfig.mjs +9 -2
  468. package/dist/esm/fork/validatePathConfig.mjs.map +1 -1
  469. package/dist/esm/fork/validatePathConfig.native.js +9 -2
  470. package/dist/esm/fork/validatePathConfig.native.js.map +1 -1
  471. package/dist/esm/getReactNavigationConfig.mjs +48 -5
  472. package/dist/esm/getReactNavigationConfig.mjs.map +1 -1
  473. package/dist/esm/getReactNavigationConfig.native.js +54 -5
  474. package/dist/esm/getReactNavigationConfig.native.js.map +1 -1
  475. package/dist/esm/getURL.native.test.mjs +1 -1
  476. package/dist/esm/headless/__tests__/useStack.test.mjs +7 -15
  477. package/dist/esm/headless/__tests__/useStack.test.mjs.map +1 -1
  478. package/dist/esm/headless/__tests__/useStack.test.native.js +7 -15
  479. package/dist/esm/headless/__tests__/useStack.test.native.js.map +1 -1
  480. package/dist/esm/headless/useStack.mjs +1 -2
  481. package/dist/esm/headless/useStack.mjs.map +1 -1
  482. package/dist/esm/headless/useStack.native.js +1 -2
  483. package/dist/esm/headless/useStack.native.js.map +1 -1
  484. package/dist/esm/index.js.map +1 -1
  485. package/dist/esm/index.mjs.map +1 -1
  486. package/dist/esm/index.native.js.map +1 -1
  487. package/dist/esm/interfaces/router.mjs.map +1 -1
  488. package/dist/esm/interfaces/router.native.js.map +1 -1
  489. package/dist/esm/layouts/Stack.mjs +10 -13
  490. package/dist/esm/layouts/Stack.mjs.map +1 -1
  491. package/dist/esm/layouts/Stack.native.js +11 -14
  492. package/dist/esm/layouts/Stack.native.js.map +1 -1
  493. package/dist/esm/layouts/Tabs.native.js +4 -74
  494. package/dist/esm/layouts/Tabs.native.js.map +1 -1
  495. package/dist/esm/layouts/nativeTabsOptions.mjs +24 -0
  496. package/dist/esm/layouts/nativeTabsOptions.mjs.map +1 -0
  497. package/dist/esm/layouts/nativeTabsOptions.native.js +24 -0
  498. package/dist/esm/layouts/nativeTabsOptions.native.js.map +1 -0
  499. package/dist/esm/layouts/stack-utils/StackHeaderBackButton.mjs +4 -1
  500. package/dist/esm/layouts/stack-utils/StackHeaderBackButton.mjs.map +1 -1
  501. package/dist/esm/layouts/stack-utils/StackHeaderBackButton.native.js +4 -1
  502. package/dist/esm/layouts/stack-utils/StackHeaderBackButton.native.js.map +1 -1
  503. package/dist/esm/layouts/stack-utils/StackHeaderTitle.mjs +2 -2
  504. package/dist/esm/layouts/stack-utils/StackHeaderTitle.mjs.map +1 -1
  505. package/dist/esm/layouts/stack-utils/StackHeaderTitle.native.js +2 -2
  506. package/dist/esm/layouts/stack-utils/StackHeaderTitle.native.js.map +1 -1
  507. package/dist/esm/layouts/stack-utils/StackScreen.mjs +3 -6
  508. package/dist/esm/layouts/stack-utils/StackScreen.mjs.map +1 -1
  509. package/dist/esm/layouts/stack-utils/StackScreen.native.js +4 -7
  510. package/dist/esm/layouts/stack-utils/StackScreen.native.js.map +1 -1
  511. package/dist/esm/layouts/stack-utils/__tests__/composition.test.mjs +14 -14
  512. package/dist/esm/layouts/stack-utils/__tests__/composition.test.mjs.map +1 -1
  513. package/dist/esm/layouts/stack-utils/__tests__/composition.test.native.js +14 -14
  514. package/dist/esm/layouts/stack-utils/__tests__/composition.test.native.js.map +1 -1
  515. package/dist/esm/layouts/stack-utils/index.mjs +1 -2
  516. package/dist/esm/layouts/stack-utils/index.mjs.map +1 -1
  517. package/dist/esm/layouts/stack-utils/index.native.js +1 -2
  518. package/dist/esm/layouts/stack-utils/index.native.js.map +1 -1
  519. package/dist/esm/layouts/withLayoutContext.mjs +0 -1
  520. package/dist/esm/layouts/withLayoutContext.mjs.map +1 -1
  521. package/dist/esm/layouts/withLayoutContext.native.js +0 -1
  522. package/dist/esm/layouts/withLayoutContext.native.js.map +1 -1
  523. package/dist/esm/layouts/withLayoutContext.test.mjs +18 -0
  524. package/dist/esm/layouts/withLayoutContext.test.mjs.map +1 -1
  525. package/dist/esm/layouts/withLayoutContext.test.native.js +24 -0
  526. package/dist/esm/layouts/withLayoutContext.test.native.js.map +1 -1
  527. package/dist/esm/link/useLoadedNavigation.mjs.map +1 -1
  528. package/dist/esm/link/useLoadedNavigation.native.js.map +1 -1
  529. package/dist/esm/router/Route.mjs +9 -3
  530. package/dist/esm/router/Route.mjs.map +1 -1
  531. package/dist/esm/router/Route.native.js +12 -3
  532. package/dist/esm/router/Route.native.js.map +1 -1
  533. package/dist/esm/router/findRouteNode.mjs +10 -10
  534. package/dist/esm/router/findRouteNode.mjs.map +1 -1
  535. package/dist/esm/router/findRouteNode.native.js +13 -29
  536. package/dist/esm/router/findRouteNode.native.js.map +1 -1
  537. package/dist/esm/router/findRouteNode.test.mjs +89 -0
  538. package/dist/esm/router/findRouteNode.test.mjs.map +1 -0
  539. package/dist/esm/router/findRouteNode.test.native.js +92 -0
  540. package/dist/esm/router/findRouteNode.test.native.js.map +1 -0
  541. package/dist/esm/router/getLinkingConfig.test.mjs +9 -0
  542. package/dist/esm/router/getLinkingConfig.test.mjs.map +1 -1
  543. package/dist/esm/router/getLinkingConfig.test.native.js +9 -0
  544. package/dist/esm/router/getLinkingConfig.test.native.js.map +1 -1
  545. package/dist/esm/router/getRouteInfo.test.mjs +21 -0
  546. package/dist/esm/router/getRouteInfo.test.mjs.map +1 -1
  547. package/dist/esm/router/getRouteInfo.test.native.js +23 -0
  548. package/dist/esm/router/getRouteInfo.test.native.js.map +1 -1
  549. package/dist/esm/router/hmrImport.native.test.mjs +1 -1
  550. package/dist/esm/router/isIndexPath.mjs +1 -1
  551. package/dist/esm/router/isIndexPath.mjs.map +1 -1
  552. package/dist/esm/router/isIndexPath.native.js +2 -1
  553. package/dist/esm/router/isIndexPath.native.js.map +1 -1
  554. package/dist/esm/router/isStateAwaitingNavigatorMount.mjs +2 -1
  555. package/dist/esm/router/isStateAwaitingNavigatorMount.mjs.map +1 -1
  556. package/dist/esm/router/isStateAwaitingNavigatorMount.native.js +2 -1
  557. package/dist/esm/router/isStateAwaitingNavigatorMount.native.js.map +1 -1
  558. package/dist/esm/router/routeHmr.native.test.mjs +1 -1
  559. package/dist/esm/router/routeHmr.native.test.mjs.map +1 -1
  560. package/dist/esm/router/router.mjs +11 -13
  561. package/dist/esm/router/router.mjs.map +1 -1
  562. package/dist/esm/router/router.native.js +12 -13
  563. package/dist/esm/router/router.native.js.map +1 -1
  564. package/dist/esm/router/useInitializeOneRouter.mjs.map +1 -1
  565. package/dist/esm/router/useInitializeOneRouter.native.js.map +1 -1
  566. package/dist/esm/router/useNavigation.mjs +32 -11
  567. package/dist/esm/router/useNavigation.mjs.map +1 -1
  568. package/dist/esm/router/useNavigation.native.js +34 -11
  569. package/dist/esm/router/useNavigation.native.js.map +1 -1
  570. package/dist/esm/router/useScreens.mjs +4 -2
  571. package/dist/esm/router/useScreens.mjs.map +1 -1
  572. package/dist/esm/router/useScreens.native.js +4 -2
  573. package/dist/esm/router/useScreens.native.js.map +1 -1
  574. package/dist/esm/router/utils/getNavigateAction.mjs +2 -2
  575. package/dist/esm/router/utils/getNavigateAction.mjs.map +1 -1
  576. package/dist/esm/router/utils/getNavigateAction.native.js +5 -4
  577. package/dist/esm/router/utils/getNavigateAction.native.js.map +1 -1
  578. package/dist/esm/router/utils/getNavigateAction.test.mjs +37 -6
  579. package/dist/esm/router/utils/getNavigateAction.test.mjs.map +1 -1
  580. package/dist/esm/router/utils/getNavigateAction.test.native.js +37 -6
  581. package/dist/esm/router/utils/getNavigateAction.test.native.js.map +1 -1
  582. package/dist/esm/router/web/WebStackView.mjs +1 -1
  583. package/dist/esm/router/web/WebStackView.mjs.map +1 -1
  584. package/dist/esm/router/web/WebStackView.native.js +1 -1
  585. package/dist/esm/router/web/WebStackView.native.js.map +1 -1
  586. package/dist/esm/router/web/__tests__/stackStateUtils.test.mjs +21 -1
  587. package/dist/esm/router/web/__tests__/stackStateUtils.test.mjs.map +1 -1
  588. package/dist/esm/router/web/__tests__/stackStateUtils.test.native.js +23 -1
  589. package/dist/esm/router/web/__tests__/stackStateUtils.test.native.js.map +1 -1
  590. package/dist/esm/router/web/stackStateUtils.mjs +1 -1
  591. package/dist/esm/router/web/stackStateUtils.mjs.map +1 -1
  592. package/dist/esm/router/web/stackStateUtils.native.js +1 -1
  593. package/dist/esm/router/web/stackStateUtils.native.js.map +1 -1
  594. package/dist/esm/ui/Slot.mjs.map +1 -1
  595. package/dist/esm/ui/Slot.native.js +1 -25
  596. package/dist/esm/ui/Slot.native.js.map +1 -1
  597. package/dist/esm/ui/TabContext.mjs.map +1 -1
  598. package/dist/esm/ui/TabContext.native.js.map +1 -1
  599. package/dist/esm/ui/TabList.mjs +1 -2
  600. package/dist/esm/ui/TabList.mjs.map +1 -1
  601. package/dist/esm/ui/TabList.native.js +2 -15
  602. package/dist/esm/ui/TabList.native.js.map +1 -1
  603. package/dist/esm/ui/TabSlot.mjs.map +1 -1
  604. package/dist/esm/ui/TabSlot.native.js +12 -44
  605. package/dist/esm/ui/TabSlot.native.js.map +1 -1
  606. package/dist/esm/ui/TabTrigger.mjs.map +1 -1
  607. package/dist/esm/ui/TabTrigger.native.js +25 -23
  608. package/dist/esm/ui/TabTrigger.native.js.map +1 -1
  609. package/dist/esm/ui/Tabs.mjs +1 -2
  610. package/dist/esm/ui/Tabs.mjs.map +1 -1
  611. package/dist/esm/ui/Tabs.native.js +2 -9
  612. package/dist/esm/ui/Tabs.native.js.map +1 -1
  613. package/dist/esm/ui/Tabs.shared.mjs +1 -4
  614. package/dist/esm/ui/Tabs.shared.mjs.map +1 -1
  615. package/dist/esm/ui/Tabs.shared.native.js +1 -4
  616. package/dist/esm/ui/Tabs.shared.native.js.map +1 -1
  617. package/dist/esm/ui/common.mjs +6 -5
  618. package/dist/esm/ui/common.mjs.map +1 -1
  619. package/dist/esm/ui/common.native.js +10 -7
  620. package/dist/esm/ui/common.native.js.map +1 -1
  621. package/dist/esm/ui/index.native.js +1 -1
  622. package/dist/esm/ui/index.native.js.map +1 -1
  623. package/dist/esm/views/Navigator.mjs +2 -19
  624. package/dist/esm/views/Navigator.mjs.map +1 -1
  625. package/dist/esm/views/Navigator.native.js +2 -23
  626. package/dist/esm/views/Navigator.native.js.map +1 -1
  627. package/dist/esm/vite/plugins/sourceInspectorPlugin.test.mjs.map +1 -1
  628. package/package.json +30 -45
  629. package/src/__mocks__/@react-navigation/native-stack.ts +2 -2
  630. package/src/createApp.native.tsx +23 -1
  631. package/src/fallbackViews/Sitemap.tsx +1 -1
  632. package/src/fallbackViews/Sitemap.web.tsx +1 -1
  633. package/src/fork/NavigationContainer.tsx +36 -80
  634. package/src/fork/getPathFromState.ts +3 -3
  635. package/src/fork/useLinking.native.test.tsx +11 -15
  636. package/src/fork/useLinking.native.ts +13 -27
  637. package/src/fork/useLinking.ts +24 -21
  638. package/src/fork/validatePathConfig.ts +11 -4
  639. package/src/getReactNavigationConfig.ts +96 -4
  640. package/src/headless/__tests__/useStack.test.tsx +4 -13
  641. package/src/headless/types.ts +1 -2
  642. package/src/headless/useStack.ts +1 -2
  643. package/src/index.ts +0 -12
  644. package/src/interfaces/router.ts +2 -2
  645. package/src/layouts/Drawer.tsx +4 -2
  646. package/src/layouts/Stack.tsx +17 -36
  647. package/src/layouts/Tabs.tsx +6 -81
  648. package/src/layouts/nativeTabsOptions.ts +38 -0
  649. package/src/layouts/stack-utils/README.md +0 -1
  650. package/src/layouts/stack-utils/StackHeaderBackButton.tsx +1 -1
  651. package/src/layouts/stack-utils/StackHeaderTitle.tsx +2 -2
  652. package/src/layouts/stack-utils/StackScreen.tsx +5 -26
  653. package/src/layouts/stack-utils/__tests__/composition.test.tsx +14 -14
  654. package/src/layouts/stack-utils/index.tsx +0 -17
  655. package/src/layouts/withLayoutContext.test.tsx +16 -0
  656. package/src/layouts/withLayoutContext.tsx +2 -2
  657. package/src/link/useLoadedNavigation.ts +2 -1
  658. package/src/router/Route.tsx +12 -2
  659. package/src/router/findRouteNode.test.ts +92 -0
  660. package/src/router/findRouteNode.ts +22 -17
  661. package/src/router/getLinkingConfig.test.ts +13 -0
  662. package/src/router/getRouteInfo.test.ts +21 -0
  663. package/src/router/isIndexPath.ts +5 -2
  664. package/src/router/isStateAwaitingNavigatorMount.ts +4 -1
  665. package/src/router/router.ts +10 -9
  666. package/src/router/useInitializeOneRouter.ts +2 -2
  667. package/src/router/useNavigation.ts +49 -14
  668. package/src/router/useScreens.tsx +4 -2
  669. package/src/router/utils/getNavigateAction.test.ts +28 -6
  670. package/src/router/utils/getNavigateAction.ts +6 -3
  671. package/src/router/web/WebStackView.tsx +1 -1
  672. package/src/router/web/__tests__/stackStateUtils.test.ts +23 -1
  673. package/src/router/web/stackStateUtils.ts +3 -2
  674. package/src/ui/README.md +8 -16
  675. package/src/ui/Slot.tsx +4 -38
  676. package/src/ui/TabContext.tsx +2 -7
  677. package/src/ui/TabList.tsx +7 -19
  678. package/src/ui/TabSlot.tsx +17 -60
  679. package/src/ui/TabTrigger.tsx +22 -30
  680. package/src/ui/Tabs.shared.tsx +3 -6
  681. package/src/ui/Tabs.tsx +3 -10
  682. package/src/ui/common.tsx +7 -5
  683. package/src/ui/index.native.ts +1 -0
  684. package/src/views/Navigator.tsx +5 -21
  685. package/src/vite/plugins/sourceInspectorPlugin.test.ts +3 -1
  686. package/types/__mocks__/@react-navigation/native-stack.d.ts +2 -2
  687. package/types/__mocks__/@react-navigation/native-stack.d.ts.map +1 -1
  688. package/types/createApp.native.d.ts.map +1 -1
  689. package/types/fork/NavigationContainer.d.ts +2 -7
  690. package/types/fork/NavigationContainer.d.ts.map +1 -1
  691. package/types/fork/findFocusedRoute.d.ts +12 -2
  692. package/types/fork/findFocusedRoute.d.ts.map +1 -1
  693. package/types/fork/useLinking.d.ts +1 -1
  694. package/types/fork/useLinking.d.ts.map +1 -1
  695. package/types/fork/useLinking.native.d.ts +4 -20
  696. package/types/fork/useLinking.native.d.ts.map +1 -1
  697. package/types/fork/validatePathConfig.d.ts.map +1 -1
  698. package/types/getReactNavigationConfig.d.ts +10 -0
  699. package/types/getReactNavigationConfig.d.ts.map +1 -1
  700. package/types/headless/types.d.ts +1 -4
  701. package/types/headless/types.d.ts.map +1 -1
  702. package/types/headless/useStack.d.ts.map +1 -1
  703. package/types/index.d.ts +1 -1
  704. package/types/index.d.ts.map +1 -1
  705. package/types/interfaces/router.d.ts +2 -2
  706. package/types/interfaces/router.d.ts.map +1 -1
  707. package/types/layouts/Drawer.d.ts +3 -108
  708. package/types/layouts/Drawer.d.ts.map +1 -1
  709. package/types/layouts/Drawer.web.d.ts +189 -2
  710. package/types/layouts/Drawer.web.d.ts.map +1 -1
  711. package/types/layouts/Stack.d.ts +7 -120
  712. package/types/layouts/Stack.d.ts.map +1 -1
  713. package/types/layouts/Tabs.d.ts +5 -100
  714. package/types/layouts/Tabs.d.ts.map +1 -1
  715. package/types/layouts/nativeTabsOptions.d.ts +8 -0
  716. package/types/layouts/nativeTabsOptions.d.ts.map +1 -0
  717. package/types/layouts/stack-navigator.d.ts +1 -2
  718. package/types/layouts/stack-navigator.d.ts.map +1 -1
  719. package/types/layouts/stack-navigator.web.d.ts +1 -1
  720. package/types/layouts/stack-navigator.web.d.ts.map +1 -1
  721. package/types/layouts/stack-utils/StackScreen.d.ts +1 -2
  722. package/types/layouts/stack-utils/StackScreen.d.ts.map +1 -1
  723. package/types/layouts/stack-utils/index.d.ts +1 -3
  724. package/types/layouts/stack-utils/index.d.ts.map +1 -1
  725. package/types/layouts/withLayoutContext.d.ts +1 -2
  726. package/types/layouts/withLayoutContext.d.ts.map +1 -1
  727. package/types/link/useLoadedNavigation.d.ts +2 -2
  728. package/types/link/useLoadedNavigation.d.ts.map +1 -1
  729. package/types/router/Route.d.ts +1 -0
  730. package/types/router/Route.d.ts.map +1 -1
  731. package/types/router/findRouteNode.d.ts +4 -1
  732. package/types/router/findRouteNode.d.ts.map +1 -1
  733. package/types/router/findRouteNode.test.d.ts +2 -0
  734. package/types/router/findRouteNode.test.d.ts.map +1 -0
  735. package/types/router/isIndexPath.d.ts.map +1 -1
  736. package/types/router/isStateAwaitingNavigatorMount.d.ts.map +1 -1
  737. package/types/router/router.d.ts +2 -2
  738. package/types/router/router.d.ts.map +1 -1
  739. package/types/router/useNavigation.d.ts +4 -2
  740. package/types/router/useNavigation.d.ts.map +1 -1
  741. package/types/router/useScreens.d.ts +25 -1
  742. package/types/router/useScreens.d.ts.map +1 -1
  743. package/types/router/utils/getNavigateAction.d.ts.map +1 -1
  744. package/types/router/web/WebStackNavigator.d.ts +1 -1
  745. package/types/router/web/WebStackNavigator.d.ts.map +1 -1
  746. package/types/router/web/stackStateUtils.d.ts +2 -1
  747. package/types/router/web/stackStateUtils.d.ts.map +1 -1
  748. package/types/ui/Slot.d.ts +2 -3
  749. package/types/ui/Slot.d.ts.map +1 -1
  750. package/types/ui/TabContext.d.ts +36 -84
  751. package/types/ui/TabContext.d.ts.map +1 -1
  752. package/types/ui/TabList.d.ts +4 -5
  753. package/types/ui/TabList.d.ts.map +1 -1
  754. package/types/ui/TabRouter.d.ts +31 -33
  755. package/types/ui/TabRouter.d.ts.map +1 -1
  756. package/types/ui/TabSlot.d.ts +5 -10
  757. package/types/ui/TabSlot.d.ts.map +1 -1
  758. package/types/ui/TabTrigger.d.ts +3 -2
  759. package/types/ui/TabTrigger.d.ts.map +1 -1
  760. package/types/ui/Tabs.d.ts.map +1 -1
  761. package/types/ui/Tabs.shared.d.ts +29 -137
  762. package/types/ui/Tabs.shared.d.ts.map +1 -1
  763. package/types/ui/common.d.ts +1 -1
  764. package/types/ui/common.d.ts.map +1 -1
  765. package/types/ui/index.native.d.ts +2 -0
  766. package/types/ui/index.native.d.ts.map +1 -0
  767. package/types/views/Navigator.d.ts.map +1 -1
  768. package/types/views/Protected.d.ts +9 -1
  769. package/types/views/Protected.d.ts.map +1 -1
  770. package/dist/cjs/layouts/NativeTabs.cjs +0 -65
  771. package/dist/cjs/layouts/NativeTabs.native.js +0 -68
  772. package/dist/cjs/layouts/NativeTabs.native.js.map +0 -1
  773. package/dist/cjs/layouts/NativeTabs.test.cjs +0 -24
  774. package/dist/cjs/layouts/NativeTabs.test.native.js +0 -35
  775. package/dist/cjs/layouts/NativeTabs.test.native.js.map +0 -1
  776. package/dist/cjs/layouts/stack-utils/StackToolbar.cjs +0 -124
  777. package/dist/cjs/layouts/stack-utils/StackToolbar.native.js +0 -129
  778. package/dist/cjs/layouts/stack-utils/StackToolbar.native.js.map +0 -1
  779. package/dist/cjs/layouts/stack-utils/StackToolbar.shared.cjs +0 -57
  780. package/dist/cjs/layouts/stack-utils/StackToolbar.shared.native.js +0 -61
  781. package/dist/cjs/layouts/stack-utils/StackToolbar.shared.native.js.map +0 -1
  782. package/dist/cjs/layouts/stack-utils/StackToolbar.types.cjs +0 -18
  783. package/dist/cjs/layouts/stack-utils/StackToolbar.types.native.js +0 -21
  784. package/dist/cjs/layouts/stack-utils/StackToolbar.types.native.js.map +0 -1
  785. package/dist/cjs/layouts/stack-utils/StackToolbarImplementation.cjs +0 -39
  786. package/dist/cjs/layouts/stack-utils/StackToolbarImplementation.native.js +0 -41
  787. package/dist/cjs/layouts/stack-utils/StackToolbarImplementation.native.js.map +0 -1
  788. package/dist/cjs/layouts/stack-utils/__tests__/StackToolbar.test.cjs +0 -66
  789. package/dist/cjs/layouts/stack-utils/__tests__/StackToolbar.test.native.js +0 -99
  790. package/dist/cjs/layouts/stack-utils/__tests__/StackToolbar.test.native.js.map +0 -1
  791. package/dist/cjs/native-tabs.cjs +0 -29
  792. package/dist/cjs/native-tabs.native.js +0 -32
  793. package/dist/cjs/native-tabs.native.js.map +0 -1
  794. package/dist/cjs/stack-toolbar-implementation.cjs +0 -30
  795. package/dist/cjs/stack-toolbar-implementation.native.js +0 -33
  796. package/dist/cjs/stack-toolbar-implementation.native.js.map +0 -1
  797. package/dist/cjs/views/OneStackRouter.cjs +0 -46
  798. package/dist/cjs/views/OneStackRouter.native.js +0 -39
  799. package/dist/cjs/views/OneStackRouter.native.js.map +0 -1
  800. package/dist/esm/layouts/NativeTabs.mjs +0 -28
  801. package/dist/esm/layouts/NativeTabs.mjs.map +0 -1
  802. package/dist/esm/layouts/NativeTabs.native.js +0 -28
  803. package/dist/esm/layouts/NativeTabs.native.js.map +0 -1
  804. package/dist/esm/layouts/NativeTabs.test.mjs +0 -24
  805. package/dist/esm/layouts/NativeTabs.test.mjs.map +0 -1
  806. package/dist/esm/layouts/NativeTabs.test.native.js +0 -32
  807. package/dist/esm/layouts/NativeTabs.test.native.js.map +0 -1
  808. package/dist/esm/layouts/stack-utils/StackToolbar.mjs +0 -89
  809. package/dist/esm/layouts/stack-utils/StackToolbar.mjs.map +0 -1
  810. package/dist/esm/layouts/stack-utils/StackToolbar.native.js +0 -92
  811. package/dist/esm/layouts/stack-utils/StackToolbar.native.js.map +0 -1
  812. package/dist/esm/layouts/stack-utils/StackToolbar.shared.mjs +0 -31
  813. package/dist/esm/layouts/stack-utils/StackToolbar.shared.mjs.map +0 -1
  814. package/dist/esm/layouts/stack-utils/StackToolbar.shared.native.js +0 -32
  815. package/dist/esm/layouts/stack-utils/StackToolbar.shared.native.js.map +0 -1
  816. package/dist/esm/layouts/stack-utils/StackToolbar.types.mjs +0 -2
  817. package/dist/esm/layouts/stack-utils/StackToolbar.types.mjs.map +0 -1
  818. package/dist/esm/layouts/stack-utils/StackToolbar.types.native.js +0 -2
  819. package/dist/esm/layouts/stack-utils/StackToolbar.types.native.js.map +0 -1
  820. package/dist/esm/layouts/stack-utils/StackToolbarImplementation.mjs +0 -12
  821. package/dist/esm/layouts/stack-utils/StackToolbarImplementation.mjs.map +0 -1
  822. package/dist/esm/layouts/stack-utils/StackToolbarImplementation.native.js +0 -12
  823. package/dist/esm/layouts/stack-utils/StackToolbarImplementation.native.js.map +0 -1
  824. package/dist/esm/layouts/stack-utils/__tests__/StackToolbar.test.mjs +0 -67
  825. package/dist/esm/layouts/stack-utils/__tests__/StackToolbar.test.mjs.map +0 -1
  826. package/dist/esm/layouts/stack-utils/__tests__/StackToolbar.test.native.js +0 -73
  827. package/dist/esm/layouts/stack-utils/__tests__/StackToolbar.test.native.js.map +0 -1
  828. package/dist/esm/native-tabs.mjs +0 -3
  829. package/dist/esm/native-tabs.mjs.map +0 -1
  830. package/dist/esm/native-tabs.native.js +0 -3
  831. package/dist/esm/native-tabs.native.js.map +0 -1
  832. package/dist/esm/stack-toolbar-implementation.mjs +0 -3
  833. package/dist/esm/stack-toolbar-implementation.mjs.map +0 -1
  834. package/dist/esm/stack-toolbar-implementation.native.js +0 -3
  835. package/dist/esm/stack-toolbar-implementation.native.js.map +0 -1
  836. package/dist/esm/views/OneStackRouter.mjs +0 -21
  837. package/dist/esm/views/OneStackRouter.mjs.map +0 -1
  838. package/dist/esm/views/OneStackRouter.native.js +0 -11
  839. package/dist/esm/views/OneStackRouter.native.js.map +0 -1
  840. package/src/layouts/NativeTabs.test.ts +0 -30
  841. package/src/layouts/NativeTabs.tsx +0 -46
  842. package/src/layouts/stack-utils/StackToolbar.shared.ts +0 -44
  843. package/src/layouts/stack-utils/StackToolbar.tsx +0 -134
  844. package/src/layouts/stack-utils/StackToolbar.types.ts +0 -100
  845. package/src/layouts/stack-utils/StackToolbarImplementation.tsx +0 -39
  846. package/src/layouts/stack-utils/__tests__/StackToolbar.test.tsx +0 -70
  847. package/src/native-tabs.ts +0 -1
  848. package/src/stack-toolbar-implementation.ts +0 -8
  849. package/src/ui/Slot.web.tsx +0 -9
  850. package/src/ui/TabList.web.tsx +0 -27
  851. package/src/ui/TabSlot.web.tsx +0 -90
  852. package/src/ui/TabTrigger.web.tsx +0 -71
  853. package/src/ui/Tabs.web.tsx +0 -40
  854. package/src/views/OneStackRouter.tsx +0 -75
  855. package/types/layouts/NativeTabs.d.ts +0 -8
  856. package/types/layouts/NativeTabs.d.ts.map +0 -1
  857. package/types/layouts/NativeTabs.test.d.ts +0 -2
  858. package/types/layouts/NativeTabs.test.d.ts.map +0 -1
  859. package/types/layouts/stack-utils/StackToolbar.d.ts +0 -28
  860. package/types/layouts/stack-utils/StackToolbar.d.ts.map +0 -1
  861. package/types/layouts/stack-utils/StackToolbar.shared.d.ts +0 -5
  862. package/types/layouts/stack-utils/StackToolbar.shared.d.ts.map +0 -1
  863. package/types/layouts/stack-utils/StackToolbar.types.d.ts +0 -83
  864. package/types/layouts/stack-utils/StackToolbar.types.d.ts.map +0 -1
  865. package/types/layouts/stack-utils/StackToolbarImplementation.d.ts +0 -12
  866. package/types/layouts/stack-utils/StackToolbarImplementation.d.ts.map +0 -1
  867. package/types/native-tabs.d.ts +0 -2
  868. package/types/native-tabs.d.ts.map +0 -1
  869. package/types/stack-toolbar-implementation.d.ts +0 -3
  870. package/types/stack-toolbar-implementation.d.ts.map +0 -1
  871. package/types/ui/Slot.web.d.ts +0 -5
  872. package/types/ui/Slot.web.d.ts.map +0 -1
  873. package/types/ui/TabList.web.d.ts +0 -11
  874. package/types/ui/TabList.web.d.ts.map +0 -1
  875. package/types/ui/TabSlot.web.d.ts +0 -24
  876. package/types/ui/TabSlot.web.d.ts.map +0 -1
  877. package/types/ui/TabTrigger.web.d.ts +0 -11
  878. package/types/ui/TabTrigger.web.d.ts.map +0 -1
  879. package/types/ui/Tabs.web.d.ts +0 -10
  880. package/types/ui/Tabs.web.d.ts.map +0 -1
  881. package/types/views/OneStackRouter.d.ts +0 -3
  882. package/types/views/OneStackRouter.d.ts.map +0 -1
@@ -1,8 +1,9 @@
1
+ import { getReactNavigationRouteName } from "../getReactNavigationConfig.mjs";
1
2
  function findRouteNodeFromState(state, rootNode) {
2
3
  if (!state || !state.routes || !rootNode) {
3
4
  return null;
4
5
  }
5
- const currentRoute = state.routes[state.routes.length - 1];
6
+ const currentRoute = state.routes[state.index ?? state.routes.length - 1];
6
7
  if (!currentRoute) {
7
8
  return null;
8
9
  }
@@ -19,7 +20,7 @@ function findRouteNodeFromState(state, rootNode) {
19
20
  return matchingNode;
20
21
  }
21
22
  function findNodeByRouteName(node, routeName) {
22
- if (node.route === routeName) {
23
+ if (getReactNavigationRouteName(node) === routeName) {
23
24
  return node;
24
25
  }
25
26
  for (const child of node.children) {
@@ -35,13 +36,12 @@ function extractParamsFromState(state) {
35
36
  return {};
36
37
  }
37
38
  const params = {};
38
- for (const route of state.routes) {
39
- if (route.params) {
40
- Object.assign(params, route.params);
41
- }
42
- if (route.state) {
43
- Object.assign(params, extractParamsFromState(route.state));
44
- }
39
+ const route = state.routes[state.index ?? state.routes.length - 1];
40
+ if (route?.params) {
41
+ Object.assign(params, route.params);
42
+ }
43
+ if (route?.state) {
44
+ Object.assign(params, extractParamsFromState(route.state));
45
45
  }
46
46
  return params;
47
47
  }
@@ -82,7 +82,7 @@ function findAllRouteNodesFromState(state, rootNode) {
82
82
  if (!currentState || !currentState.routes || !parentNode) {
83
83
  return;
84
84
  }
85
- const currentRoute = currentState.routes[currentState.routes.length - 1];
85
+ const currentRoute = currentState.routes[currentState.index ?? currentState.routes.length - 1];
86
86
  if (!currentRoute) {
87
87
  return;
88
88
  }
@@ -1 +1 @@
1
- {"version":3,"names":["findRouteNodeFromState","state","rootNode","routes","currentRoute","length","matchingNode","findNodeByRouteName","name","nestedResult","node","routeName","route","child","children","found","extractParamsFromState","params","Object","assign","extractSearchFromHref","href","searchIndex","indexOf","searchString","slice","searchParams","URLSearchParams","forEach","value","key","existing","Array","isArray","push","extractPathnameFromHref","hashIndex","endIndex","Math","min","findAllRouteNodesFromState","nodes","collectNodes","currentState","parentNode","process","env","NODE_ENV","console","log","screen","childRouteName","childNode","find","c"],"sources":["../../../src/router/findRouteNode.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getReactNavigationRouteName","findRouteNodeFromState","state","rootNode","routes","currentRoute","index","length","matchingNode","findNodeByRouteName","name","nestedResult","node","routeName","child","children","found","extractParamsFromState","params","route","Object","assign","extractSearchFromHref","href","searchIndex","indexOf","searchString","slice","searchParams","URLSearchParams","forEach","value","key","existing","Array","isArray","push","extractPathnameFromHref","hashIndex","endIndex","Math","min","findAllRouteNodesFromState","nodes","collectNodes","currentState","parentNode","process","env","NODE_ENV","console","log","screen","childRouteName","childNode","find","c"],"sources":["../../../src/router/findRouteNode.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1,8 +1,10 @@
1
+ import { getReactNavigationRouteName } from "../getReactNavigationConfig.native.js";
1
2
  function findRouteNodeFromState(state, rootNode) {
3
+ var _state_index;
2
4
  if (!state || !state.routes || !rootNode) {
3
5
  return null;
4
6
  }
5
- var currentRoute = state.routes[state.routes.length - 1];
7
+ var currentRoute = state.routes[(_state_index = state.index) !== null && _state_index !== void 0 ? _state_index : state.routes.length - 1];
6
8
  if (!currentRoute) {
7
9
  return null;
8
10
  }
@@ -19,7 +21,7 @@ function findRouteNodeFromState(state, rootNode) {
19
21
  return matchingNode;
20
22
  }
21
23
  function findNodeByRouteName(node, routeName) {
22
- if (node.route === routeName) {
24
+ if (getReactNavigationRouteName(node) === routeName) {
23
25
  return node;
24
26
  }
25
27
  var _iteratorNormalCompletion = true,
@@ -50,36 +52,17 @@ function findNodeByRouteName(node, routeName) {
50
52
  return null;
51
53
  }
52
54
  function extractParamsFromState(state) {
55
+ var _state_index;
53
56
  if (!state || !state.routes) {
54
57
  return {};
55
58
  }
56
59
  var params = {};
57
- var _iteratorNormalCompletion = true,
58
- _didIteratorError = false,
59
- _iteratorError = void 0;
60
- try {
61
- for (var _iterator = state.routes[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
62
- var route = _step.value;
63
- if (route.params) {
64
- Object.assign(params, route.params);
65
- }
66
- if (route.state) {
67
- Object.assign(params, extractParamsFromState(route.state));
68
- }
69
- }
70
- } catch (err) {
71
- _didIteratorError = true;
72
- _iteratorError = err;
73
- } finally {
74
- try {
75
- if (!_iteratorNormalCompletion && _iterator.return != null) {
76
- _iterator.return();
77
- }
78
- } finally {
79
- if (_didIteratorError) {
80
- throw _iteratorError;
81
- }
82
- }
60
+ var route = state.routes[(_state_index = state.index) !== null && _state_index !== void 0 ? _state_index : state.routes.length - 1];
61
+ if (route === null || route === void 0 ? void 0 : route.params) {
62
+ Object.assign(params, route.params);
63
+ }
64
+ if (route === null || route === void 0 ? void 0 : route.state) {
65
+ Object.assign(params, extractParamsFromState(route.state));
83
66
  }
84
67
  return params;
85
68
  }
@@ -117,11 +100,12 @@ function findAllRouteNodesFromState(state, rootNode) {
117
100
  }
118
101
  var nodes = [];
119
102
  function collectNodes(currentState, parentNode) {
103
+ var _currentState_index;
120
104
  var _currentRoute_params;
121
105
  if (!currentState || !currentState.routes || !parentNode) {
122
106
  return;
123
107
  }
124
- var currentRoute = currentState.routes[currentState.routes.length - 1];
108
+ var currentRoute = currentState.routes[(_currentState_index = currentState.index) !== null && _currentState_index !== void 0 ? _currentState_index : currentState.routes.length - 1];
125
109
  if (!currentRoute) {
126
110
  return;
127
111
  }
@@ -1 +1 @@
1
- {"version":3,"names":["findRouteNodeFromState","state","rootNode","routes","currentRoute","length","matchingNode","findNodeByRouteName","name","nestedResult","node","routeName","route","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","children","Symbol","iterator","_step","next","done","child","value","found","err","return","extractParamsFromState","params","Object","assign","extractSearchFromHref","href","searchIndex","indexOf","searchString","slice","searchParams","URLSearchParams","forEach","key","existing","Array","isArray","push","extractPathnameFromHref","hashIndex","endIndex","Math","min","findAllRouteNodesFromState","nodes","collectNodes","currentState","parentNode","_currentRoute_params"],"sources":["../../../src/router/findRouteNode.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["getReactNavigationRouteName","findRouteNodeFromState","state","rootNode","_state_index","routes","currentRoute","index","length","matchingNode","findNodeByRouteName","name","nestedResult","node","routeName","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","children","Symbol","iterator","_step","next","done","child","value","found","err","return","extractParamsFromState","params","route","Object","assign","extractSearchFromHref","href","searchIndex","indexOf","searchString","slice","searchParams","URLSearchParams","forEach","key","existing","Array","isArray","push","extractPathnameFromHref","hashIndex","endIndex","Math","min","findAllRouteNodesFromState","nodes","collectNodes","currentState","parentNode","_currentState_index","_currentRoute_params","process","env","NODE_ENV","console","log"],"sources":["../../../src/router/findRouteNode.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -0,0 +1,89 @@
1
+ import { describe, expect, it } from "vitest";
2
+ import { getReactNavigationRouteName, resolveInitialRouteNameFromState } from "../getReactNavigationConfig.mjs";
3
+ import { extractParamsFromState, findAllRouteNodesFromState, findRouteNodeFromState } from "./findRouteNode.mjs";
4
+ import { resolveParentRouteName } from "./useNavigation.mjs";
5
+ function node(route, contextKey, children = []) {
6
+ return {
7
+ type: children.length ? "layout" : "spa",
8
+ loadRoute: () => ({}),
9
+ children,
10
+ dynamic: null,
11
+ route,
12
+ contextKey
13
+ };
14
+ }
15
+ describe("focused route state", () => {
16
+ const current = node("index", "./index/index.tsx");
17
+ const preloaded = node("detail", "./index/detail.tsx");
18
+ const layout = node("index", "./index/_layout.tsx", [current, preloaded]);
19
+ const root = node("", "./_layout.tsx", [layout]);
20
+ const state = {
21
+ index: 0,
22
+ routes: [{
23
+ name: getReactNavigationRouteName(layout),
24
+ params: {
25
+ layout: "active"
26
+ },
27
+ state: {
28
+ index: 0,
29
+ routes: [{
30
+ name: "index",
31
+ params: {
32
+ page: "current"
33
+ }
34
+ }, {
35
+ name: "detail",
36
+ params: {
37
+ page: "preloaded"
38
+ }
39
+ }]
40
+ }
41
+ }, {
42
+ name: "other",
43
+ params: {
44
+ root: "preloaded"
45
+ }
46
+ }]
47
+ };
48
+ it("finds the focused node through an internal layout name", () => {
49
+ expect(findRouteNodeFromState(state, root)).toBe(current);
50
+ expect(findAllRouteNodesFromState(state, root)).toEqual([layout, current]);
51
+ });
52
+ it("collects params only from the focused route chain", () => {
53
+ expect(extractParamsFromState(state)).toEqual({
54
+ layout: "active",
55
+ page: "current"
56
+ });
57
+ });
58
+ });
59
+ describe("filesystem paths at React Navigation boundaries", () => {
60
+ const detail = node("detail", "./index/detail.tsx");
61
+ const index = node("index", "./index/index.tsx");
62
+ const collidingLayout = node("index", "./index/_layout.tsx", [index, detail]);
63
+ const root = node("", "./_layout.tsx", [collidingLayout]);
64
+ it("resolves absolute and relative parent paths to aliased screen names", () => {
65
+ const routeNodes = [root, collidingLayout, detail];
66
+ const routeName = getReactNavigationRouteName(collidingLayout);
67
+ expect(resolveParentRouteName(routeNodes, "/index/detail", "/index")).toBe(routeName);
68
+ expect(resolveParentRouteName(routeNodes, "/index/detail", "../")).toBe(routeName);
69
+ expect(resolveParentRouteName(routeNodes, "/index/detail", "/")).toBe("");
70
+ });
71
+ it("uses aliased layout names while resolving a late-mounted child", () => {
72
+ const state = {
73
+ index: 0,
74
+ routes: [{
75
+ name: getReactNavigationRouteName(collidingLayout),
76
+ state: {
77
+ index: 1,
78
+ routes: [{
79
+ name: "index"
80
+ }, {
81
+ name: "detail"
82
+ }]
83
+ }
84
+ }]
85
+ };
86
+ expect(resolveInitialRouteNameFromState("/index", state)).toBe("detail");
87
+ });
88
+ });
89
+ //# sourceMappingURL=findRouteNode.test.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["describe","expect","it","getReactNavigationRouteName","resolveInitialRouteNameFromState","extractParamsFromState","findAllRouteNodesFromState","findRouteNodeFromState","resolveParentRouteName","node","route","contextKey","children","type","length","loadRoute","dynamic","current","preloaded","layout","root","state","index","routes","name","params","page","toBe","toEqual","detail","collidingLayout","routeNodes","routeName"],"sources":["../../../src/router/findRouteNode.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -0,0 +1,92 @@
1
+ import { describe, expect, it } from "vitest";
2
+ import { getReactNavigationRouteName, resolveInitialRouteNameFromState } from "../getReactNavigationConfig.native.js";
3
+ import { extractParamsFromState, findAllRouteNodesFromState, findRouteNodeFromState } from "./findRouteNode.native.js";
4
+ import { resolveParentRouteName } from "./useNavigation.native.js";
5
+ function node(route, contextKey) {
6
+ var children = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
7
+ return {
8
+ type: children.length ? "layout" : "spa",
9
+ loadRoute: function () {
10
+ return {};
11
+ },
12
+ children,
13
+ dynamic: null,
14
+ route,
15
+ contextKey
16
+ };
17
+ }
18
+ describe("focused route state", function () {
19
+ var current = node("index", "./index/index.tsx");
20
+ var preloaded = node("detail", "./index/detail.tsx");
21
+ var layout = node("index", "./index/_layout.tsx", [current, preloaded]);
22
+ var root = node("", "./_layout.tsx", [layout]);
23
+ var state = {
24
+ index: 0,
25
+ routes: [{
26
+ name: getReactNavigationRouteName(layout),
27
+ params: {
28
+ layout: "active"
29
+ },
30
+ state: {
31
+ index: 0,
32
+ routes: [{
33
+ name: "index",
34
+ params: {
35
+ page: "current"
36
+ }
37
+ }, {
38
+ name: "detail",
39
+ params: {
40
+ page: "preloaded"
41
+ }
42
+ }]
43
+ }
44
+ }, {
45
+ name: "other",
46
+ params: {
47
+ root: "preloaded"
48
+ }
49
+ }]
50
+ };
51
+ it("finds the focused node through an internal layout name", function () {
52
+ expect(findRouteNodeFromState(state, root)).toBe(current);
53
+ expect(findAllRouteNodesFromState(state, root)).toEqual([layout, current]);
54
+ });
55
+ it("collects params only from the focused route chain", function () {
56
+ expect(extractParamsFromState(state)).toEqual({
57
+ layout: "active",
58
+ page: "current"
59
+ });
60
+ });
61
+ });
62
+ describe("filesystem paths at React Navigation boundaries", function () {
63
+ var detail = node("detail", "./index/detail.tsx");
64
+ var index = node("index", "./index/index.tsx");
65
+ var collidingLayout = node("index", "./index/_layout.tsx", [index, detail]);
66
+ var root = node("", "./_layout.tsx", [collidingLayout]);
67
+ it("resolves absolute and relative parent paths to aliased screen names", function () {
68
+ var routeNodes = [root, collidingLayout, detail];
69
+ var routeName = getReactNavigationRouteName(collidingLayout);
70
+ expect(resolveParentRouteName(routeNodes, "/index/detail", "/index")).toBe(routeName);
71
+ expect(resolveParentRouteName(routeNodes, "/index/detail", "../")).toBe(routeName);
72
+ expect(resolveParentRouteName(routeNodes, "/index/detail", "/")).toBe("");
73
+ });
74
+ it("uses aliased layout names while resolving a late-mounted child", function () {
75
+ var state = {
76
+ index: 0,
77
+ routes: [{
78
+ name: getReactNavigationRouteName(collidingLayout),
79
+ state: {
80
+ index: 1,
81
+ routes: [{
82
+ name: "index"
83
+ }, {
84
+ name: "detail"
85
+ }]
86
+ }
87
+ }]
88
+ };
89
+ expect(resolveInitialRouteNameFromState("/index", state)).toBe("detail");
90
+ });
91
+ });
92
+ //# sourceMappingURL=findRouteNode.test.native.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["describe","expect","it","getReactNavigationRouteName","resolveInitialRouteNameFromState","extractParamsFromState","findAllRouteNodesFromState","findRouteNodeFromState","resolveParentRouteName","node","route","contextKey","children","arguments","length","type","loadRoute","dynamic","current","preloaded","layout","root","state","index","routes","name","params","page","toBe","toEqual","detail","collidingLayout"],"sources":["../../../src/router/findRouteNode.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAAAC,2BAAA,EAAAC,gCAAA;AAAA,SACEC,sBAAA,EAAAC,0BAAA,EAAAC,sBAAA;AAAA,SACAC,sBAAA;AAAA,SACKC,KAAAC,KAAA,EAAAC,UAAA;EAEP,IAAAC,QAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EACE;IACAE,IAAA,EAAAH,QAAA,CAAAE,MAAA;IACAE,SAAA,WAAAA,CAAA;MAAA,OACK;IACP;IAEAJ,QAAS;IACPK,OAAO;IACLP,KAAA;IACAC;EAAmB;AACnB;AACSX,QACT;EAAA,IACAkB,OAAA,GAAAT,IAAA;EACF,IAAAU,SAAA,GAAAV,IAAA;EACF,IAAAW,MAAA,GAAAX,IAAA,kCAEAS,OAAS,EACPC,SAAM,CACN;EACA,IAAAE,IAAM,GAAAZ,IAAS,KAAK,eAAS,GAC7BW,MAAM,CACN;EAAc,IACZE,KAAO;IACPC,KAAA,GAAQ;IAAAC,MACN;MAEEC,IAAA,EAAAtB,2BAA2B,CAAAiB,MAAA;MAC3BM,MAAA,EAAO;QACLN,MAAA,EAAO;MAAA;MACCE,KACN,EAAE;QAA2CC,KAC3C;QACJC,MAAA,GACF;UACFC,IAAA;UACQC,MAAA;YACVC,IAAA;UACF;QAEG,GACM;UACAF,IAAA;UACRC,MAAA;YAEEC,IAAA;UACM;QACL;MAED;IACF,GACF;MAEDF,IAAS;MACDC,MAAA;QACAL,IAAA,EAAQ;MACR;IACN;EAGE;EACAnB,EAAA,yDAA8C,cAAe;IAE7DD,MAAA,CAAOM,sBAAA,CAAuBe,KAAA,EAAAD,IAAA,CAAY,EAAAO,IAAA,CAAAV,OAAA;IAC1CjB,MAAA,CAAOK,0BAAuB,CAAAgB,KAAA,EAAAD,IAAY,GAAAQ,OAAA,EAC1CT,MAAO,EACRF,OAAA,CAEE;EACD;EAAchB,EAAA,oDACL;IAAAD,MACP,CAAAI,sBAAQ,CAAAiB,KAAA,GAAAO,OAAA;MAAAT,MACN;MAAAO,IACE;IAAiD;EAC1C;AACE;AACuC3B,QAAA,kDAChD;EAAA,IAAA8B,MACF,GAAArB,IAAA;EAAA,IACFc,KAAA,GAAAd,IAAA;EAAA,IACFsB,eAAA,GAAAtB,IAAA,kCAEAc,KAAA,EACDO,MAAA,CACF","ignoreList":[]}
@@ -19,6 +19,15 @@ describe("getLinkingConfig", () => {
19
19
  });
20
20
  expect(linking.prefixes).toEqual(["threepunchconvo://", "threepunchconvo:///", "threepunchconvo://app"]);
21
21
  });
22
+ it("assigns distinct navigation names to nested routes with the same file name", () => {
23
+ const routes = getRoutes(getMockContext(["_layout.tsx", "index/_layout.tsx", "index/index.tsx"]));
24
+ const linking = getLinkingConfig(routes, true);
25
+ const state = linking.getStateFromPath("/", linking.config);
26
+ const parent = state.routes[0];
27
+ const child = parent.state.routes[0];
28
+ expect(parent.name).not.toBe(child.name);
29
+ expect(linking.getPathFromState(state, linking.config)).toBe("/");
30
+ });
22
31
  });
23
32
  describe("normalizeLinkingConfig", () => {
24
33
  it("merges manifest-default prefixes with user-supplied scheme/prefixes", () => {
@@ -1 +1 @@
1
- {"version":3,"names":["describe","expect","it","normalizeLinkingConfig","getRoutes","getLinkingConfig","getMockContext","routes","linking","scheme","prefixes","toEqual","result"],"sources":["../../../src/router/getLinkingConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,QAAiB;AAC1B,SAASC,gBAAA,QAAwB;AACjC,SAASC,cAAA,QAAsB;AAE/BN,QAAA,CAAS,oBAAoB,MAAM;EACjCE,EAAA,CAAG,4CAA4C,MAAM;IACnD,MAAMK,MAAA,GAASH,SAAA,CAAUE,cAAA,CAAe,CAAC,eAAe,WAAW,CAAC,CAAC;IACrE,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,MAAM;MAC7CE,MAAA,EAAQ;IACV,CAAC;IAEDR,MAAA,CAAOO,OAAA,CAAQE,QAAQ,EAAEC,OAAA,CAAQ,CAAC,sBAAsB,qBAAqB,CAAC;EAChF,CAAC;EAEDT,EAAA,CAAG,yDAAyD,MAAM;IAChE,MAAMK,MAAA,GAASH,SAAA,CAAUE,cAAA,CAAe,CAAC,eAAe,WAAW,CAAC,CAAC;IACrE,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,MAAM;MAC7CE,MAAA,EAAQ;MACRC,QAAA,EAAU,CAAC,uBAAuB;IACpC,CAAC;IAEDT,MAAA,CAAOO,OAAA,CAAQE,QAAQ,EAAEC,OAAA,CAAQ,CAC/B,sBACA,uBACA,wBACD;EACH,CAAC;AACH,CAAC;AAEDX,QAAA,CAAS,0BAA0B,MAAM;EACvCE,EAAA,CAAG,uEAAuE,MAAM;IAC9E,MAAMU,MAAA,GAAST,sBAAA,CACb;MAAEM,MAAA,EAAQ;MAAOC,QAAA,EAAU,CAAC,0BAA0B;IAAE,GACxD,CAAC,UAAU,SAAS,CACtB;IAEAT,MAAA,CAAOW,MAAA,CAAOF,QAAQ,EAAEC,OAAA,CAAQ,CAC9B,UACA,WACA,UACA,WACA,2BACD;EACH,CAAC;EAEDT,EAAA,CAAG,sEAAsE,MAAM;IAC7E,MAAMU,MAAA,GAAST,sBAAA,CAAuB,QAAW,CAAC,UAAU,SAAS,CAAC;IACtEF,MAAA,CAAOW,MAAA,CAAOF,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,SAAS,CAAC;EACvD,CAAC;EAEDT,EAAA,CAAG,wDAAwD,MAAM;IAC/D,MAAMU,MAAA,GAAST,sBAAA,CAAuB;MAAEM,MAAA,EAAQ;IAAM,GAAG,CAAC,UAAU,SAAS,CAAC;IAC9ER,MAAA,CAAOW,MAAA,CAAOF,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,SAAS,CAAC;EACvD,CAAC;AACH,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["describe","expect","it","normalizeLinkingConfig","getRoutes","getLinkingConfig","getMockContext","routes","linking","scheme","prefixes","toEqual","state","getStateFromPath","config","parent","child","name","not","toBe","getPathFromState","result"],"sources":["../../../src/router/getLinkingConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,QAAiB;AAC1B,SAASC,gBAAA,QAAwB;AACjC,SAASC,cAAA,QAAsB;AAE/BN,QAAA,CAAS,oBAAoB,MAAM;EACjCE,EAAA,CAAG,4CAA4C,MAAM;IACnD,MAAMK,MAAA,GAASH,SAAA,CAAUE,cAAA,CAAe,CAAC,eAAe,WAAW,CAAC,CAAC;IACrE,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,MAAM;MAC7CE,MAAA,EAAQ;IACV,CAAC;IAEDR,MAAA,CAAOO,OAAA,CAAQE,QAAQ,EAAEC,OAAA,CAAQ,CAAC,sBAAsB,qBAAqB,CAAC;EAChF,CAAC;EAEDT,EAAA,CAAG,yDAAyD,MAAM;IAChE,MAAMK,MAAA,GAASH,SAAA,CAAUE,cAAA,CAAe,CAAC,eAAe,WAAW,CAAC,CAAC;IACrE,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,MAAM;MAC7CE,MAAA,EAAQ;MACRC,QAAA,EAAU,CAAC,uBAAuB;IACpC,CAAC;IAEDT,MAAA,CAAOO,OAAA,CAAQE,QAAQ,EAAEC,OAAA,CAAQ,CAC/B,sBACA,uBACA,wBACD;EACH,CAAC;EAEDT,EAAA,CAAG,8EAA8E,MAAM;IACrF,MAAMK,MAAA,GAASH,SAAA,CACbE,cAAA,CAAe,CAAC,eAAe,qBAAqB,iBAAiB,CAAC,CACxE;IACA,MAAME,OAAA,GAAUH,gBAAA,CAAiBE,MAAA,EAAQ,IAAI;IAC7C,MAAMK,KAAA,GAAQJ,OAAA,CAAQK,gBAAA,CAAkB,KAAKL,OAAA,CAAQM,MAAe;IACpE,MAAMC,MAAA,GAASH,KAAA,CAAML,MAAA,CAAO,CAAC;IAC7B,MAAMS,KAAA,GAAQD,MAAA,CAAOH,KAAA,CAAOL,MAAA,CAAO,CAAC;IAEpCN,MAAA,CAAOc,MAAA,CAAOE,IAAI,EAAEC,GAAA,CAAIC,IAAA,CAAKH,KAAA,CAAMC,IAAI;IACvChB,MAAA,CAAOO,OAAA,CAAQY,gBAAA,CAAkBR,KAAA,EAAOJ,OAAA,CAAQM,MAAe,CAAC,EAAEK,IAAA,CAAK,GAAG;EAC5E,CAAC;AACH,CAAC;AAEDnB,QAAA,CAAS,0BAA0B,MAAM;EACvCE,EAAA,CAAG,uEAAuE,MAAM;IAC9E,MAAMmB,MAAA,GAASlB,sBAAA,CACb;MAAEM,MAAA,EAAQ;MAAOC,QAAA,EAAU,CAAC,0BAA0B;IAAE,GACxD,CAAC,UAAU,SAAS,CACtB;IAEAT,MAAA,CAAOoB,MAAA,CAAOX,QAAQ,EAAEC,OAAA,CAAQ,CAC9B,UACA,WACA,UACA,WACA,2BACD;EACH,CAAC;EAEDT,EAAA,CAAG,sEAAsE,MAAM;IAC7E,MAAMmB,MAAA,GAASlB,sBAAA,CAAuB,QAAW,CAAC,UAAU,SAAS,CAAC;IACtEF,MAAA,CAAOoB,MAAA,CAAOX,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,SAAS,CAAC;EACvD,CAAC;EAEDT,EAAA,CAAG,wDAAwD,MAAM;IAC/D,MAAMmB,MAAA,GAASlB,sBAAA,CAAuB;MAAEM,MAAA,EAAQ;IAAM,GAAG,CAAC,UAAU,SAAS,CAAC;IAC9ER,MAAA,CAAOoB,MAAA,CAAOX,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,SAAS,CAAC;EACvD,CAAC;AACH,CAAC","ignoreList":[]}
@@ -19,6 +19,15 @@ describe("getLinkingConfig", function () {
19
19
  });
20
20
  expect(linking.prefixes).toEqual(["threepunchconvo://", "threepunchconvo:///", "threepunchconvo://app"]);
21
21
  });
22
+ it("assigns distinct navigation names to nested routes with the same file name", function () {
23
+ var routes = getRoutes(getMockContext(["_layout.tsx", "index/_layout.tsx", "index/index.tsx"]));
24
+ var linking = getLinkingConfig(routes, true);
25
+ var state = linking.getStateFromPath("/", linking.config);
26
+ var parent = state.routes[0];
27
+ var child = parent.state.routes[0];
28
+ expect(parent.name).not.toBe(child.name);
29
+ expect(linking.getPathFromState(state, linking.config)).toBe("/");
30
+ });
22
31
  });
23
32
  describe("normalizeLinkingConfig", function () {
24
33
  it("merges manifest-default prefixes with user-supplied scheme/prefixes", function () {
@@ -1 +1 @@
1
- {"version":3,"names":["describe","expect","it","normalizeLinkingConfig","getRoutes","getLinkingConfig","getMockContext","routes","linking","scheme","prefixes","toEqual","result"],"sources":["../../../src/router/getLinkingConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,QAAiB;AAC1B,SAASC,gBAAA,QAAwB;AACjC,SAASC,cAAA,QAAsB;AAE/BN,QAAA,CAAS,oBAAoB,YAAM;EACjCE,EAAA,CAAG,4CAA4C,YAAM;IACnD,IAAAK,MAAM,GAAAH,SAAS,CAAAE,cAAU,EACzB,aAAM,EACJ,WAAQ,CACT;IAED,IAAAE,OAAO,GAAAH,gBAAkB,CAAAE,MAAS;MACnCE,MAAA;IAED,CAAG;IACDR,MAAM,CAAAO,OAAA,CAASE,QAAA,EAAUC,OAAA,EACzB,oBAAgB,EACd,qBAAQ,EACR;EAAkC,EACpC;EAEAT,EAAA,wDAAiC;IAAA,IAC/BK,MAAA,GAAAH,SAAA,CAAAE,cAAA,EACA,eACA,YACD;IACF,IAAAE,OAAA,GAAAH,gBAAA,CAAAE,MAAA;MACFE,MAAA;MAEDC,QAAS,GACJ;IACc,EACb;IAAwDT,MACvD,CAAAO,OAAU,CAAAE,QAAS,EAAAC,OAAA,EACtB,sBAEA,qBAAsB,EACpB,yBACA;EAAA;AACA;AACAX,QACA;EAAAE,EACF,CAAC;IACF,IAAAU,MAAA,GAAAT,sBAAA;MAEEM,MAAA;MACDC,QAAM,GACN,0BAAwB;IAG1B,CAAG,GACD,QAAM,EACN,SAAO,CACR;IACFT,MAAA,CAAAW,MAAA,CAAAF,QAAA,EAAAC,OAAA,E","ignoreList":[]}
1
+ {"version":3,"names":["describe","expect","it","normalizeLinkingConfig","getRoutes","getLinkingConfig","getMockContext","routes","linking","scheme","prefixes","toEqual","state","getStateFromPath","config","parent","child","name","not","toBe","getPathFromState","result"],"sources":["../../../src/router/getLinkingConfig.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,sBAAA,QAA8B;AACvC,SAASC,SAAA,QAAiB;AAC1B,SAASC,gBAAA,QAAwB;AACjC,SAASC,cAAA,QAAsB;AAE/BN,QAAA,CAAS,oBAAoB,YAAM;EACjCE,EAAA,CAAG,4CAA4C,YAAM;IACnD,IAAAK,MAAM,GAAAH,SAAS,CAAAE,cAAU,EACzB,aAAM,EACJ,WAAQ,CACT;IAED,IAAAE,OAAO,GAAAH,gBAAkB,CAAAE,MAAS;MACnCE,MAAA;IAED,CAAG;IACDR,MAAM,CAAAO,OAAA,CAASE,QAAA,EAAUC,OAAA,EACzB,oBAAgB,EACd,qBAAQ,EACR;EAAkC,EACpC;EAEAT,EAAA,wDAAiC;IAAA,IAC/BK,MAAA,GAAAH,SAAA,CAAAE,cAAA,EACA,eACA,YACD;IACF,IAAAE,OAAA,GAAAH,gBAAA,CAAAE,MAAA;MAEEE,MAAA;MACDC,QAAM,GACJ,uBAAgB;IAElB;IACAT,MAAM,CAAAO,OAAQ,CAAAE,QAAQ,EAAAC,OAAA,EACtB,oBAAqB,EACrB,qBAAqB,EAErB,uBAAwB,CACxB;EACF,CAAC;EACFT,EAAA;IAED,IAAAK,MAAS,GAAAH,SAAA,CAAAE,cAAgC,EACpC,eACD,mBAAe,EACb,iBAAiB,CAAuC,CACxD,CAAC;IACH,IAAAE,OAAA,GAAAH,gBAAA,CAAAE,MAAA;IAEA,IAAAK,KAAO,GAAAJ,OAAO,CAAAK,gBAAkB,MAAAL,OAAA,CAAAM,MAAA;IAAA,IAC9BC,MAAA,GAAAH,KAAA,CAAAL,MAAA;IAAA,IACAS,KAAA,GAAAD,MAAA,CAAAH,KAAA,CAAAL,MAAA;IAAAN,MACA,CAAAc,MAAA,CAAAE,IAAA,EAAAC,GAAA,CAAAC,IAAA,CAAAH,KAAA,CAAAC,IAAA;IAAAhB,MACA,CAAAO,OAAA,CAAAY,gBAAA,CAAAR,KAAA,EAAAJ,OAAA,CAAAM,MAAA,GAAAK,IAAA;EAAA;AACA;AACDnB,QACF;EAEDE,EAAA,CAAG,uEAAsE,YAAM;IAC7E,IAAAmB,MAAM,GAAAlB,sBAAS;MACfM,MAAO,OAAO;MACfC,QAAA,GAEE;IAED,IACD,UACF,U","ignoreList":[]}
@@ -32,5 +32,26 @@ describe("getRouteInfoFromState", () => {
32
32
  expect(info.pathname).toBe("/dev");
33
33
  expect(info.segments).toEqual(["dev"]);
34
34
  });
35
+ it("uses the focused nested route when later routes are preloaded", () => {
36
+ const stateWithPreload = {
37
+ index: 0,
38
+ routes: [{
39
+ name: "(site)",
40
+ state: {
41
+ index: 0,
42
+ routes: [{
43
+ name: "index"
44
+ }, {
45
+ name: "detail"
46
+ }]
47
+ }
48
+ }]
49
+ };
50
+ const info = getRouteInfoFromState((_state, asPath) => ({
51
+ path: asPath ? "/(site)" : "/",
52
+ params: {}
53
+ }), stateWithPreload);
54
+ expect(info.isIndex).toBe(true);
55
+ });
35
56
  });
36
57
  //# sourceMappingURL=getRouteInfo.test.mjs.map
@@ -1 +1 @@
1
- {"version":3,"names":["describe","expect","it","getRouteInfoFromState","state","routes","name","path","params","info","_state","asPath","pathname","toBe","segments","toEqual","unstable_globalHref","x"],"sources":["../../../src/router/getRouteInfo.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,qBAAA,QAA6B;AAKtCH,QAAA,CAAS,yBAAyB,MAAM;EACtC,MAAMI,KAAA,GAAQ;IACZC,MAAA,EAAQ,CAAC;MAAEC,IAAA,EAAM;MAAOC,IAAA,EAAM;MAAcC,MAAA,EAAQ;QAAE,KAAK;MAAQ;IAAE,CAAC;EACxE;EAEAN,EAAA,CAAG,6CAA6C,MAAM;IACpD,MAAMO,IAAA,GAAON,qBAAA,CACX,CAACO,MAAA,EAAQC,MAAA,MAAY;MACnBJ,IAAA,EAAMI,MAAA,GAAS,sBAAsB;MACrCH,MAAA,EAAQ;QAAE,KAAK;MAAQ;IACzB,IACAJ,KACF;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,KAAK,CAAC;IAC/Cd,MAAA,CAAOQ,IAAA,CAAKO,mBAAmB,EAAEH,IAAA,CAAK,YAAY;EACpD,CAAC;EAEDX,EAAA,CAAG,yCAAyC,MAAM;IAChD,MAAMO,IAAA,GAAON,qBAAA,CACX,OAAO;MAAEI,IAAA,EAAM;MAAkBC,MAAA,EAAQ;QAAES,CAAA,EAAG;QAAK,KAAK;MAAQ;IAAE,IAClEb,KACF;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAAC,KAAK,CAAC;EACvC,CAAC;AACH,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["describe","expect","it","getRouteInfoFromState","state","routes","name","path","params","info","_state","asPath","pathname","toBe","segments","toEqual","unstable_globalHref","x","stateWithPreload","index","isIndex"],"sources":["../../../src/router/getRouteInfo.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,qBAAA,QAA6B;AAKtCH,QAAA,CAAS,yBAAyB,MAAM;EACtC,MAAMI,KAAA,GAAQ;IACZC,MAAA,EAAQ,CAAC;MAAEC,IAAA,EAAM;MAAOC,IAAA,EAAM;MAAcC,MAAA,EAAQ;QAAE,KAAK;MAAQ;IAAE,CAAC;EACxE;EAEAN,EAAA,CAAG,6CAA6C,MAAM;IACpD,MAAMO,IAAA,GAAON,qBAAA,CACX,CAACO,MAAA,EAAQC,MAAA,MAAY;MACnBJ,IAAA,EAAMI,MAAA,GAAS,sBAAsB;MACrCH,MAAA,EAAQ;QAAE,KAAK;MAAQ;IACzB,IACAJ,KACF;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAAC,UAAU,KAAK,CAAC;IAC/Cd,MAAA,CAAOQ,IAAA,CAAKO,mBAAmB,EAAEH,IAAA,CAAK,YAAY;EACpD,CAAC;EAEDX,EAAA,CAAG,yCAAyC,MAAM;IAChD,MAAMO,IAAA,GAAON,qBAAA,CACX,OAAO;MAAEI,IAAA,EAAM;MAAkBC,MAAA,EAAQ;QAAES,CAAA,EAAG;QAAK,KAAK;MAAQ;IAAE,IAClEb,KACF;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAAC,KAAK,CAAC;EACvC,CAAC;EAEDb,EAAA,CAAG,iEAAiE,MAAM;IACxE,MAAMgB,gBAAA,GAAmB;MACvBC,KAAA,EAAO;MACPd,MAAA,EAAQ,CACN;QACEC,IAAA,EAAM;QACNF,KAAA,EAAO;UACLe,KAAA,EAAO;UACPd,MAAA,EAAQ,CAAC;YAAEC,IAAA,EAAM;UAAQ,GAAG;YAAEA,IAAA,EAAM;UAAS,CAAC;QAChD;MACF;IAEJ;IACA,MAAMG,IAAA,GAAON,qBAAA,CACX,CAACO,MAAA,EAAQC,MAAA,MAAY;MAAEJ,IAAA,EAAMI,MAAA,GAAS,YAAY;MAAKH,MAAA,EAAQ,CAAC;IAAE,IAClEU,gBACF;IAEAjB,MAAA,CAAOQ,IAAA,CAAKW,OAAO,EAAEP,IAAA,CAAK,IAAI;EAChC,CAAC;AACH,CAAC","ignoreList":[]}
@@ -36,5 +36,28 @@ describe("getRouteInfoFromState", function () {
36
36
  expect(info.pathname).toBe("/dev");
37
37
  expect(info.segments).toEqual(["dev"]);
38
38
  });
39
+ it("uses the focused nested route when later routes are preloaded", function () {
40
+ var stateWithPreload = {
41
+ index: 0,
42
+ routes: [{
43
+ name: "(site)",
44
+ state: {
45
+ index: 0,
46
+ routes: [{
47
+ name: "index"
48
+ }, {
49
+ name: "detail"
50
+ }]
51
+ }
52
+ }]
53
+ };
54
+ var info = getRouteInfoFromState(function (_state, asPath) {
55
+ return {
56
+ path: asPath ? "/(site)" : "/",
57
+ params: {}
58
+ };
59
+ }, stateWithPreload);
60
+ expect(info.isIndex).toBe(true);
61
+ });
39
62
  });
40
63
  //# sourceMappingURL=getRouteInfo.test.native.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["describe","expect","it","getRouteInfoFromState","state","routes","name","path","params","info","_state","asPath","pathname","toBe","segments","toEqual"],"sources":["../../../src/router/getRouteInfo.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,qBAAA,QAA6B;AAKtCH,QAAA,CAAS,yBAAyB,YAAM;EACtC,IAAAI,KAAM;IACJC,MAAA,EAAQ,CACV;MAEGC,IAAA;MACDC,IAAM,cAAO;MACVC,MAAA,EAAQ;QACP,KAAM;MACN;IACF;EACA;EAEFN,EAAA,4CAAiC;IACjC,IAAAO,IAAO,GAAAN,qBAAwB,WAAUO,MAAM,EAAAC,MAAA;MAC/C,OAAO;QACRJ,IAAA,EAAAI,MAAA;QAEEH,MAAA;UACK;QACJ;MACA;IACF,GAAAJ,KAAA;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAC/B,UACF,M","ignoreList":[]}
1
+ {"version":3,"names":["describe","expect","it","getRouteInfoFromState","state","routes","name","path","params","info","_state","asPath","pathname","toBe","segments","toEqual","unstable_globalHref","x"],"sources":["../../../src/router/getRouteInfo.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,QAAU;AACrC,SAASC,qBAAA,QAA6B;AAKtCH,QAAA,CAAS,yBAAyB,YAAM;EACtC,IAAAI,KAAM;IACJC,MAAA,EAAQ,CACV;MAEGC,IAAA;MACDC,IAAM,cAAO;MACVC,MAAA,EAAQ;QACP,KAAM;MACN;IACF;EACA;EAEFN,EAAA,4CAAiC;IACjC,IAAAO,IAAO,GAAAN,qBAAwB,WAAUO,MAAM,EAAAC,MAAA;MAC/C,OAAO;QACRJ,IAAA,EAAAI,MAAA;QAEEH,MAAA;UACK;QACJ;MACA;IACF,GAAAJ,KAAA;IACAH,MAAA,CAAOQ,IAAA,CAAKG,QAAQ,EAAEC,IAAA,CAAK,MAAM;IACjCZ,MAAA,CAAOQ,IAAA,CAAKK,QAAQ,EAAEC,OAAA,CAAQ,CAC/B,UAEE,MACD;IAAyBd,MACvB,CAAAQ,IAAO,CAAAO,mBAAA,EAAAH,IAAA;EAAA;EACCX,EAAA,wCACN;IAAA,IAAAO,IACE,GAAAN,qBAAM;MAAA,OACN;QAAOI,IACL,kBAAO;QAAAC,MACP;UACFS,CAAA;UACF;QACF;MACF;IACA,GAAAb,KAAM;IAAOH,MACV,CAAAQ,IAAQ,CAAAG,QAAA,EAAAC,IAAc,OAAM;IAAqCZ,MAClE,CAAAQ,IAAA,CAAAK,QAAA,EAAAC,OAAA,EACF,MAEA;EACF,CAAC;EACFb,EAAA","ignoreList":[]}
@@ -1,5 +1,5 @@
1
1
  import { afterEach, describe, expect, it, vi } from "vitest";
2
- import { hmrImport } from "./hmrImport.native.mjs";
2
+ import { hmrImport } from "./hmrImport.native";
3
3
  const realRuntime = globalThis.__rolldown_runtime__;
4
4
  afterEach(() => {
5
5
  ;
@@ -20,7 +20,7 @@ function isIndexPath(state) {
20
20
  function getActualLastRoute(routeLike) {
21
21
  if (routeLike.name[0] === "(" && routeLike.state?.routes) {
22
22
  const routes = routeLike.state.routes;
23
- return getActualLastRoute(routes[routes.length - 1]);
23
+ return getActualLastRoute(routes[routeLike.state.index ?? routes.length - 1]);
24
24
  }
25
25
  return routeLike;
26
26
  }
@@ -1 +1 @@
1
- {"version":3,"names":["isIndexPath","state","routes","route","getActualLastRoute","index","length","name","params","screen","match","routeLike"],"sources":["../../../src/router/isIndexPath.ts"],"sourcesContent":[null],"mappings":"AAIO,SAASA,YAAYC,KAAA,EAAc;EACxC,IAAI,CAACA,KAAA,CAAMC,MAAA,EAAQ;IACjB,OAAO;EACT;EAEA,MAAMC,KAAA,GAAQC,kBAAA,CAAmBH,KAAA,CAAMC,MAAA,CAAOD,KAAA,CAAMI,KAAA,IAASJ,KAAA,CAAMC,MAAA,CAAOI,MAAA,GAAS,CAAC,CAAC;EAErF,IAAIH,KAAA,CAAMF,KAAA,EAAO;IACf,OAAOD,WAAA,CAAYG,KAAA,CAAMF,KAAK;EAChC;EAEA,IAAIE,KAAA,CAAMI,IAAA,KAAS,SAAS;IAC1B,OAAO;EACT;EAEA,IAAIJ,KAAA,CAAMK,MAAA,IAAU,YAAYL,KAAA,CAAMK,MAAA,EAAQ;IAC5C,OAAOL,KAAA,CAAMK,MAAA,CAAOC,MAAA,KAAW;EACjC;EAEA,IAAIN,KAAA,CAAMI,IAAA,CAAKG,KAAA,CAAM,YAAY,GAAG;IAClC,OAAO;EACT;EAEA,OAAO;AACT;AAEA,SAASN,mBAA4CO,SAAA,EAAiB;EACpE,IAAIA,SAAA,CAAUJ,IAAA,CAAK,CAAC,MAAM,OAAOI,SAAA,CAAUV,KAAA,EAAOC,MAAA,EAAQ;IACxD,MAAMA,MAAA,GAASS,SAAA,CAAUV,KAAA,CAAMC,MAAA;IAC/B,OAAOE,kBAAA,CAAmBF,MAAA,CAAOA,MAAA,CAAOI,MAAA,GAAS,CAAC,CAAC;EACrD;EACA,OAAOK,SAAA;AACT","ignoreList":[]}
1
+ {"version":3,"names":["isIndexPath","state","routes","route","getActualLastRoute","index","length","name","params","screen","match","routeLike"],"sources":["../../../src/router/isIndexPath.ts"],"sourcesContent":[null],"mappings":"AAOO,SAASA,YAAYC,KAAA,EAAc;EACxC,IAAI,CAACA,KAAA,CAAMC,MAAA,EAAQ;IACjB,OAAO;EACT;EAEA,MAAMC,KAAA,GAAQC,kBAAA,CAAmBH,KAAA,CAAMC,MAAA,CAAOD,KAAA,CAAMI,KAAA,IAASJ,KAAA,CAAMC,MAAA,CAAOI,MAAA,GAAS,CAAC,CAAC;EAErF,IAAIH,KAAA,CAAMF,KAAA,EAAO;IACf,OAAOD,WAAA,CAAYG,KAAA,CAAMF,KAAK;EAChC;EAEA,IAAIE,KAAA,CAAMI,IAAA,KAAS,SAAS;IAC1B,OAAO;EACT;EAEA,IAAIJ,KAAA,CAAMK,MAAA,IAAU,YAAYL,KAAA,CAAMK,MAAA,EAAQ;IAC5C,OAAOL,KAAA,CAAMK,MAAA,CAAOC,MAAA,KAAW;EACjC;EAEA,IAAIN,KAAA,CAAMI,IAAA,CAAKG,KAAA,CAAM,YAAY,GAAG;IAClC,OAAO;EACT;EAEA,OAAO;AACT;AAEA,SAASN,mBAA4CO,SAAA,EAAiB;EACpE,IAAIA,SAAA,CAAUJ,IAAA,CAAK,CAAC,MAAM,OAAOI,SAAA,CAAUV,KAAA,EAAOC,MAAA,EAAQ;IACxD,MAAMA,MAAA,GAASS,SAAA,CAAUV,KAAA,CAAMC,MAAA;IAC/B,OAAOE,kBAAA,CAAmBF,MAAA,CAAOS,SAAA,CAAUV,KAAA,CAAMI,KAAA,IAASH,MAAA,CAAOI,MAAA,GAAS,CAAC,CAAC;EAC9E;EACA,OAAOK,SAAA;AACT","ignoreList":[]}
@@ -21,8 +21,9 @@ function isIndexPath(state) {
21
21
  function getActualLastRoute(routeLike) {
22
22
  var _routeLike_state;
23
23
  if (routeLike.name[0] === "(" && ((_routeLike_state = routeLike.state) === null || _routeLike_state === void 0 ? void 0 : _routeLike_state.routes)) {
24
+ var _routeLike_state_index;
24
25
  var routes = routeLike.state.routes;
25
- return getActualLastRoute(routes[routes.length - 1]);
26
+ return getActualLastRoute(routes[(_routeLike_state_index = routeLike.state.index) !== null && _routeLike_state_index !== void 0 ? _routeLike_state_index : routes.length - 1]);
26
27
  }
27
28
  return routeLike;
28
29
  }
@@ -1 +1 @@
1
- {"version":3,"names":["isIndexPath","state","_state_index","routes","route","getActualLastRoute","index","length","name","params","screen","match","routeLike","_routeLike_state"],"sources":["../../../src/router/isIndexPath.ts"],"sourcesContent":[null],"mappings":"AAIO,SAASA,YAAYC,KAAA,EAAc;EACxC,IAAIC,YAAO;EACT,KAAAD,KAAO,CAAAE,MAAA;IACT;EAEA;EAEA,IAAIC,KAAA,GAAMC,kBAAO,CAAAJ,KAAA,CAAAE,MAAA,EAAAD,YAAA,GAAAD,KAAA,CAAAK,KAAA,cAAAJ,YAAA,cAAAA,YAAA,GAAAD,KAAA,CAAAE,MAAA,CAAAI,MAAA;EACf,IAAAH,KAAO,CAAAH,KAAA;IACT,OAAAD,WAAA,CAAAI,KAAA,CAAAH,KAAA;EAEA;EACE,IAAAG,KAAO,CAAAI,IAAA;IACT;EAEA;EACE,IAAAJ,KAAO,CAAAK,MAAM,YAAO,IAAAL,KAAW,CAAAK,MAAA;IACjC,OAAAL,KAAA,CAAAK,MAAA,CAAAC,MAAA;EAEA;EACE,IAAAN,KAAO,CAAAI,IAAA,CAAAG,KAAA;IACT;EAEA;EACF;AAEA;AACE,SAAIN,kBAAgBA,CAAMO,SAAO;EAC/B,IAAAC,gBAAe;EACf,IAAAD,SAAO,CAAAJ,IAAA,WAAmB,MAAOK,gBAAgB,GAAED,SAAA,CAAAX,KAAA,cAAAY,gBAAA,uBAAAA,gBAAA,CAAAV,MAAA;IACrD,IAAAA,MAAA,GAAAS,SAAA,CAAAX,KAAA,CAAAE,MAAA;IACA,OAAOE,kBAAA,CAAAF,MAAA,CAAAA,MAAA,CAAAI,MAAA;EACT","ignoreList":[]}
1
+ {"version":3,"names":["isIndexPath","state","_state_index","routes","route","getActualLastRoute","index","length","name","params","screen","match","routeLike","_routeLike_state","_routeLike_state_index"],"sources":["../../../src/router/isIndexPath.ts"],"sourcesContent":[null],"mappings":"AAOO,SAASA,YAAYC,KAAA,EAAc;EACxC,IAAIC,YAAO;EACT,KAAAD,KAAO,CAAAE,MAAA;IACT;EAEA;EAEA,IAAIC,KAAA,GAAMC,kBAAO,CAAAJ,KAAA,CAAAE,MAAA,EAAAD,YAAA,GAAAD,KAAA,CAAAK,KAAA,cAAAJ,YAAA,cAAAA,YAAA,GAAAD,KAAA,CAAAE,MAAA,CAAAI,MAAA;EACf,IAAAH,KAAO,CAAAH,KAAA;IACT,OAAAD,WAAA,CAAAI,KAAA,CAAAH,KAAA;EAEA;EACE,IAAAG,KAAO,CAAAI,IAAA;IACT;EAEA;EACE,IAAAJ,KAAO,CAAAK,MAAM,YAAO,IAAAL,KAAW,CAAAK,MAAA;IACjC,OAAAL,KAAA,CAAAK,MAAA,CAAAC,MAAA;EAEA;EACE,IAAAN,KAAO,CAAAI,IAAA,CAAAG,KAAA;IACT;EAEA;EACF;AAEA;AACE,SAAIN,kBAAgBA,CAAMO,SAAO;EAC/B,IAAAC,gBAAe;EACf,IAAAD,SAAO,CAAAJ,IAAA,WAAmB,MAAOK,gBAAgB,GAAAD,SAAS,CAAAX,KAAO,UAAW,IAAAY,gBAAA,uBAAAA,gBAAA,CAAAV,MAAA;IAC9E,IAAAW,sBAAA;IACA,IAAAX,MAAO,GAAAS,SAAA,CAAAX,KAAA,CAAAE,MAAA;IACT,OAAAE,kBAAA,CAAAF,MAAA,EAAAW,sBAAA,GAAAF,SAAA,CAAAX,KAAA,CAAAK,KAAA,cAAAQ,sBAAA,cAAAA,sBAAA,GAAAX,MAAA,CAAAI,MAAA","ignoreList":[]}
@@ -1,3 +1,4 @@
1
+ import { getReactNavigationRouteName } from "../getReactNavigationConfig.mjs";
1
2
  function focusedRouteOf(state) {
2
3
  return typeof state.index === "number" ? state.routes[state.index] : state.routes[state.routes.length - 1];
3
4
  }
@@ -8,7 +9,7 @@ function isStateAwaitingNavigatorMount(state, rootNode) {
8
9
  while (current?.routes?.length) {
9
10
  const route = focusedRouteOf(current);
10
11
  if (!route) return false;
11
- const child = node.children.find(candidate => candidate.route === route.name);
12
+ const child = node.children.find(candidate => getReactNavigationRouteName(candidate) === route.name);
12
13
  if (!child) return false;
13
14
  if (route.state) {
14
15
  node = child;
@@ -1 +1 @@
1
- {"version":3,"names":["focusedRouteOf","state","index","routes","length","isStateAwaitingNavigatorMount","rootNode","node","current","route","child","children","find","candidate","name","some","grandchild","internal"],"sources":["../../../src/router/isStateAwaitingNavigatorMount.ts"],"sourcesContent":[null],"mappings":"AAUA,SAASA,eAAeC,KAAA,EAAqB;EAC3C,OAAO,OAAOA,KAAA,CAAMC,KAAA,KAAU,WAC1BD,KAAA,CAAME,MAAA,CAAOF,KAAA,CAAMC,KAAK,IACxBD,KAAA,CAAME,MAAA,CAAOF,KAAA,CAAME,MAAA,CAAOC,MAAA,GAAS,CAAC;AAC1C;AAkBO,SAASC,8BACdJ,KAAA,EACAK,QAAA,EACS;EACT,IAAI,CAACA,QAAA,EAAU,OAAO;EAEtB,IAAIC,IAAA,GAAOD,QAAA;EACX,IAAIE,OAAA,GAAUP,KAAA;EAEd,OAAOO,OAAA,EAASL,MAAA,EAAQC,MAAA,EAAQ;IAC9B,MAAMK,KAAA,GAAQT,cAAA,CAAeQ,OAAO;IACpC,IAAI,CAACC,KAAA,EAAO,OAAO;IAKnB,MAAMC,KAAA,GAAQH,IAAA,CAAKI,QAAA,CAASC,IAAA,CAAMC,SAAA,IAAcA,SAAA,CAAUJ,KAAA,KAAUA,KAAA,CAAMK,IAAI;IAC9E,IAAI,CAACJ,KAAA,EAAO,OAAO;IAEnB,IAAID,KAAA,CAAMR,KAAA,EAAO;MACfM,IAAA,GAAOG,KAAA;MACPF,OAAA,GAAUC,KAAA,CAAMR,KAAA;MAChB;IACF;IAIA,OAAOS,KAAA,CAAMC,QAAA,CAASI,IAAA,CAAMC,UAAA,IAAe,CAACA,UAAA,CAAWC,QAAQ;EACjE;EAEA,OAAO;AACT","ignoreList":[]}
1
+ {"version":3,"names":["getReactNavigationRouteName","focusedRouteOf","state","index","routes","length","isStateAwaitingNavigatorMount","rootNode","node","current","route","child","children","find","candidate","name","some","grandchild","internal"],"sources":["../../../src/router/isStateAwaitingNavigatorMount.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,2BAAA,QAAmC;AAU5C,SAASC,eAAeC,KAAA,EAAqB;EAC3C,OAAO,OAAOA,KAAA,CAAMC,KAAA,KAAU,WAC1BD,KAAA,CAAME,MAAA,CAAOF,KAAA,CAAMC,KAAK,IACxBD,KAAA,CAAME,MAAA,CAAOF,KAAA,CAAME,MAAA,CAAOC,MAAA,GAAS,CAAC;AAC1C;AAkBO,SAASC,8BACdJ,KAAA,EACAK,QAAA,EACS;EACT,IAAI,CAACA,QAAA,EAAU,OAAO;EAEtB,IAAIC,IAAA,GAAOD,QAAA;EACX,IAAIE,OAAA,GAAUP,KAAA;EAEd,OAAOO,OAAA,EAASL,MAAA,EAAQC,MAAA,EAAQ;IAC9B,MAAMK,KAAA,GAAQT,cAAA,CAAeQ,OAAO;IACpC,IAAI,CAACC,KAAA,EAAO,OAAO;IAKnB,MAAMC,KAAA,GAAQH,IAAA,CAAKI,QAAA,CAASC,IAAA,CACzBC,SAAA,IAAcd,2BAAA,CAA4Bc,SAAS,MAAMJ,KAAA,CAAMK,IAClE;IACA,IAAI,CAACJ,KAAA,EAAO,OAAO;IAEnB,IAAID,KAAA,CAAMR,KAAA,EAAO;MACfM,IAAA,GAAOG,KAAA;MACPF,OAAA,GAAUC,KAAA,CAAMR,KAAA;MAChB;IACF;IAIA,OAAOS,KAAA,CAAMC,QAAA,CAASI,IAAA,CAAMC,UAAA,IAAe,CAACA,UAAA,CAAWC,QAAQ;EACjE;EAEA,OAAO;AACT","ignoreList":[]}
@@ -1,3 +1,4 @@
1
+ import { getReactNavigationRouteName } from "../getReactNavigationConfig.native.js";
1
2
  function _type_of(obj) {
2
3
  "@swc/helpers - typeof";
3
4
 
@@ -13,7 +14,7 @@ function isStateAwaitingNavigatorMount(state, rootNode) {
13
14
  v: false
14
15
  };
15
16
  var child = node.children.find(function (candidate) {
16
- return candidate.route === route.name;
17
+ return getReactNavigationRouteName(candidate) === route.name;
17
18
  });
18
19
  if (!child) return {
19
20
  v: false
@@ -1 +1 @@
1
- {"version":3,"names":["_type_of","obj","Symbol","constructor","focusedRouteOf","state","index","routes","length","isStateAwaitingNavigatorMount","rootNode","_loop","route","current","v","child","node","children","find","candidate","name"],"sources":["../../../src/router/isStateAwaitingNavigatorMount.ts"],"sourcesContent":[null],"mappings":"AAUA,SAASA,SAAAC,GAAA;EACP,uBAAoB;;EAGtB,OAAAA,GAAA,WAAAC,MAAA,oBAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAkBO;AAIL,SAAKG,cAAUA,CAAOC,KAAA;EAEtB,OAAI,OAAOA,KAAA,CAAAC,KAAA,gBAAAD,KAAA,CAAAE,MAAA,CAAAF,KAAA,CAAAC,KAAA,IAAAD,KAAA,CAAAE,MAAA,CAAAF,KAAA,CAAAE,MAAA,CAAAC,MAAA;AACX;AAEA,SAAOC,6BAAyBA,CAAAJ,KAAA,EAAAK,QAAA;EAC9B,IAAAC,KAAM,YAAAA,CAAA,EAAQ;IACd,IAAIC,KAAC,GAAOR,cAAO,CAAAS,OAAA;IAKnB,KAAAD,KAAM,SAAa;MACnBE,CAAA,EAAK;IAEL;IACE,IAAAC,KAAO,GAAAC,IAAA,CAAAC,QAAA,CAAAC,IAAA,WAAAC,SAAA;MACP,OAAAA,SAAgB,CAAAP,KAAA,KAAAA,KAAA,CAAAQ,IAAA;IAChB;IACF,KAAAL,KAAA;MAIAD,CAAA;IACF;IAEA,IAAAF,KAAO,CAAAP,KAAA;MACTW,IAAA,GAAAD,KAAA","ignoreList":[]}
1
+ {"version":3,"names":["getReactNavigationRouteName","_type_of","obj","Symbol","constructor","focusedRouteOf","state","index","routes","length","isStateAwaitingNavigatorMount","rootNode","_loop","route","current","v","child","node","children","find","candidate","name"],"sources":["../../../src/router/isStateAwaitingNavigatorMount.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,2BAAA,QAAmC;AAU5C,SAASC,SAAAC,GAAA;EACP,uBAAoB;;EAGtB,OAAAA,GAAA,WAAAC,MAAA,oBAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAA,qBAAAD,GAAA;AAkBO;AAIL,SAAKG,cAAUA,CAAOC,KAAA;EAEtB,OAAI,OAAOA,KAAA,CAAAC,KAAA,gBAAAD,KAAA,CAAAE,MAAA,CAAAF,KAAA,CAAAC,KAAA,IAAAD,KAAA,CAAAE,MAAA,CAAAF,KAAA,CAAAE,MAAA,CAAAC,MAAA;AACX;AAEA,SAAOC,6BAAyBA,CAAAJ,KAAA,EAAAK,QAAA;EAC9B,IAAAC,KAAM,YAAAA,CAAA,EAAQ;IACd,IAAIC,KAAC,GAAOR,cAAO,CAAAS,OAAA;IAKnB,KAAAD,KAAM,SAAa;MACjBE,CAAC;IACH;IACA,IAAIC,KAAC,GAAOC,IAAA,CAAAC,QAAO,CAAAC,IAAA,WAAAC,SAAA;MAEnB,OAAIpB,2BAAa,CAAAoB,SAAA,MAAAP,KAAA,CAAAQ,IAAA;IACf;IACA,KAAAL,KAAA,EAAU,OAAM;MAChBD,CAAA;IACF;IAIA,IAAAF,KAAO,CAAAP,KAAM;MACfW,IAAA,GAAAD,KAAA;MAEAF,OAAO,GAAAD,KAAA,CAAAP,KAAA;MACT","ignoreList":[]}