one 1.1.390 → 1.1.392

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 (294) hide show
  1. package/dist/cjs/Root.cjs +6 -17
  2. package/dist/cjs/Root.js +9 -13
  3. package/dist/cjs/Root.js.map +1 -1
  4. package/dist/cjs/Root.native.js +4 -12
  5. package/dist/cjs/Root.native.js.map +1 -1
  6. package/dist/cjs/cli/build.cjs +2 -3
  7. package/dist/cjs/cli/build.js +2 -3
  8. package/dist/cjs/cli/build.js.map +1 -1
  9. package/dist/cjs/cli/build.native.js +2 -3
  10. package/dist/cjs/cli/build.native.js.map +2 -2
  11. package/dist/cjs/constants.cjs +9 -1
  12. package/dist/cjs/constants.js +7 -1
  13. package/dist/cjs/constants.js.map +1 -1
  14. package/dist/cjs/constants.native.js +9 -1
  15. package/dist/cjs/constants.native.js.map +2 -2
  16. package/dist/cjs/fork/NavigationContainer.cjs +49 -31
  17. package/dist/cjs/fork/NavigationContainer.js +40 -21
  18. package/dist/cjs/fork/NavigationContainer.js.map +2 -2
  19. package/dist/cjs/fork/NavigationContainer.native.js +51 -29
  20. package/dist/cjs/fork/NavigationContainer.native.js.map +2 -2
  21. package/dist/cjs/fork/createMemoryHistory.cjs +4 -3
  22. package/dist/cjs/fork/createMemoryHistory.js +3 -2
  23. package/dist/cjs/fork/createMemoryHistory.js.map +1 -1
  24. package/dist/cjs/fork/createMemoryHistory.native.js +8 -4
  25. package/dist/cjs/fork/createMemoryHistory.native.js.map +2 -2
  26. package/dist/cjs/fork/extractPathFromURL.cjs +48 -28
  27. package/dist/cjs/fork/extractPathFromURL.js +44 -21
  28. package/dist/cjs/fork/extractPathFromURL.js.map +2 -2
  29. package/dist/cjs/fork/extractPathFromURL.native.js +58 -26
  30. package/dist/cjs/fork/extractPathFromURL.native.js.map +2 -2
  31. package/dist/cjs/fork/findFocusedRoute.js.map +1 -1
  32. package/dist/cjs/fork/findFocusedRoute.native.js.map +1 -1
  33. package/dist/cjs/fork/getPathFromState-mods.cjs +65 -0
  34. package/dist/cjs/fork/getPathFromState-mods.js +56 -0
  35. package/dist/cjs/fork/getPathFromState-mods.js.map +6 -0
  36. package/dist/cjs/fork/getPathFromState-mods.native.js +70 -0
  37. package/dist/cjs/fork/getPathFromState-mods.native.js.map +6 -0
  38. package/dist/cjs/fork/getPathFromState.cjs +75 -224
  39. package/dist/cjs/fork/getPathFromState.js +68 -223
  40. package/dist/cjs/fork/getPathFromState.js.map +2 -2
  41. package/dist/cjs/fork/getPathFromState.native.js +79 -261
  42. package/dist/cjs/fork/getPathFromState.native.js.map +2 -2
  43. package/dist/cjs/fork/getStateFromPath-mods.cjs +187 -0
  44. package/dist/cjs/fork/getStateFromPath-mods.js +199 -0
  45. package/dist/cjs/fork/getStateFromPath-mods.js.map +6 -0
  46. package/dist/cjs/fork/getStateFromPath-mods.native.js +284 -0
  47. package/dist/cjs/fork/getStateFromPath-mods.native.js.map +6 -0
  48. package/dist/cjs/fork/getStateFromPath.cjs +181 -263
  49. package/dist/cjs/fork/getStateFromPath.js +148 -264
  50. package/dist/cjs/fork/getStateFromPath.js.map +2 -2
  51. package/dist/cjs/fork/getStateFromPath.native.js +164 -304
  52. package/dist/cjs/fork/getStateFromPath.native.js.map +2 -2
  53. package/dist/cjs/fork/useBackButton.js.map +1 -1
  54. package/dist/cjs/fork/useBackButton.native.js.map +1 -1
  55. package/dist/cjs/fork/useDocumentTitle.js +4 -1
  56. package/dist/cjs/fork/useDocumentTitle.js.map +1 -1
  57. package/dist/cjs/fork/useDocumentTitle.native.js +1 -1
  58. package/dist/cjs/fork/useDocumentTitle.native.js.map +2 -2
  59. package/dist/cjs/fork/useLinking.cjs +21 -24
  60. package/dist/cjs/fork/useLinking.js +21 -25
  61. package/dist/cjs/fork/useLinking.js.map +2 -2
  62. package/dist/cjs/fork/useLinking.native.js +68 -66
  63. package/dist/cjs/fork/useLinking.native.js.map +2 -2
  64. package/dist/cjs/fork/useThenable.js.map +1 -1
  65. package/dist/cjs/fork/useThenable.native.js.map +1 -1
  66. package/dist/cjs/fork/validatePathConfig.cjs +32 -11
  67. package/dist/cjs/fork/validatePathConfig.js +41 -11
  68. package/dist/cjs/fork/validatePathConfig.js.map +1 -1
  69. package/dist/cjs/fork/validatePathConfig.native.js +47 -18
  70. package/dist/cjs/fork/validatePathConfig.native.js.map +2 -2
  71. package/dist/cjs/layouts/withLayoutContext.cjs +1 -1
  72. package/dist/cjs/layouts/withLayoutContext.js +1 -1
  73. package/dist/cjs/layouts/withLayoutContext.js.map +1 -1
  74. package/dist/cjs/layouts/withLayoutContext.native.js +1 -1
  75. package/dist/cjs/layouts/withLayoutContext.native.js.map +1 -1
  76. package/dist/cjs/link/linking.cjs +4 -4
  77. package/dist/cjs/link/linking.js +3 -3
  78. package/dist/cjs/link/linking.js.map +2 -2
  79. package/dist/cjs/link/linking.native.js +3 -3
  80. package/dist/cjs/link/linking.native.js.map +1 -1
  81. package/dist/cjs/link/useLinkTo.cjs +2 -2
  82. package/dist/cjs/link/useLinkTo.js +2 -2
  83. package/dist/cjs/link/useLinkTo.js.map +1 -1
  84. package/dist/cjs/link/useLinkTo.native.js +2 -2
  85. package/dist/cjs/link/useLinkTo.native.js.map +1 -1
  86. package/dist/cjs/router/getNormalizedStatePath.cjs +2 -2
  87. package/dist/cjs/router/getNormalizedStatePath.js +2 -2
  88. package/dist/cjs/router/getNormalizedStatePath.js.map +1 -1
  89. package/dist/cjs/router/getNormalizedStatePath.native.js +2 -2
  90. package/dist/cjs/router/getNormalizedStatePath.native.js.map +1 -1
  91. package/dist/cjs/router/router.cjs +19 -3
  92. package/dist/cjs/router/router.js +25 -3
  93. package/dist/cjs/router/router.js.map +1 -1
  94. package/dist/cjs/router/router.native.js +39 -3
  95. package/dist/cjs/router/router.native.js.map +2 -2
  96. package/dist/cjs/utils/serverContext.cjs +7 -7
  97. package/dist/cjs/utils/serverContext.js +7 -7
  98. package/dist/cjs/utils/serverContext.js.map +1 -1
  99. package/dist/cjs/utils/serverContext.native.js +5 -5
  100. package/dist/cjs/utils/serverContext.native.js.map +2 -2
  101. package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +6 -6
  102. package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +3 -4
  103. package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +2 -2
  104. package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +3 -4
  105. package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +2 -2
  106. package/dist/esm/Root.js +6 -2
  107. package/dist/esm/Root.js.map +1 -1
  108. package/dist/esm/Root.mjs +1 -1
  109. package/dist/esm/Root.mjs.map +1 -1
  110. package/dist/esm/Root.native.js +1 -1
  111. package/dist/esm/Root.native.js.map +2 -2
  112. package/dist/esm/cli/build.js +2 -3
  113. package/dist/esm/cli/build.js.map +1 -1
  114. package/dist/esm/cli/build.mjs +2 -3
  115. package/dist/esm/cli/build.mjs.map +1 -1
  116. package/dist/esm/cli/build.native.js +2 -3
  117. package/dist/esm/cli/build.native.js.map +2 -2
  118. package/dist/esm/constants.js +7 -1
  119. package/dist/esm/constants.js.map +1 -1
  120. package/dist/esm/constants.mjs +8 -2
  121. package/dist/esm/constants.mjs.map +1 -1
  122. package/dist/esm/constants.native.js +7 -1
  123. package/dist/esm/constants.native.js.map +2 -2
  124. package/dist/esm/fork/NavigationContainer.js +43 -20
  125. package/dist/esm/fork/NavigationContainer.js.map +1 -1
  126. package/dist/esm/fork/NavigationContainer.mjs +42 -24
  127. package/dist/esm/fork/NavigationContainer.mjs.map +1 -1
  128. package/dist/esm/fork/NavigationContainer.native.js +44 -24
  129. package/dist/esm/fork/NavigationContainer.native.js.map +2 -2
  130. package/dist/esm/fork/createMemoryHistory.js +3 -2
  131. package/dist/esm/fork/createMemoryHistory.js.map +1 -1
  132. package/dist/esm/fork/createMemoryHistory.mjs +4 -3
  133. package/dist/esm/fork/createMemoryHistory.mjs.map +1 -1
  134. package/dist/esm/fork/createMemoryHistory.native.js +4 -4
  135. package/dist/esm/fork/createMemoryHistory.native.js.map +2 -2
  136. package/dist/esm/fork/extractPathFromURL.js +42 -11
  137. package/dist/esm/fork/extractPathFromURL.js.map +1 -1
  138. package/dist/esm/fork/extractPathFromURL.mjs +39 -11
  139. package/dist/esm/fork/extractPathFromURL.mjs.map +1 -1
  140. package/dist/esm/fork/extractPathFromURL.native.js +52 -15
  141. package/dist/esm/fork/extractPathFromURL.native.js.map +2 -2
  142. package/dist/esm/fork/findFocusedRoute.js.map +1 -1
  143. package/dist/esm/fork/findFocusedRoute.mjs.map +1 -1
  144. package/dist/esm/fork/findFocusedRoute.native.js.map +1 -1
  145. package/dist/esm/fork/getPathFromState-mods.js +40 -0
  146. package/dist/esm/fork/getPathFromState-mods.js.map +6 -0
  147. package/dist/esm/fork/getPathFromState-mods.mjs +40 -0
  148. package/dist/esm/fork/getPathFromState-mods.mjs.map +1 -0
  149. package/dist/esm/fork/getPathFromState-mods.native.js +47 -0
  150. package/dist/esm/fork/getPathFromState-mods.native.js.map +6 -0
  151. package/dist/esm/fork/getPathFromState.js +71 -228
  152. package/dist/esm/fork/getPathFromState.js.map +2 -2
  153. package/dist/esm/fork/getPathFromState.mjs +73 -221
  154. package/dist/esm/fork/getPathFromState.mjs.map +1 -1
  155. package/dist/esm/fork/getPathFromState.native.js +79 -260
  156. package/dist/esm/fork/getPathFromState.native.js.map +2 -2
  157. package/dist/esm/fork/getStateFromPath-mods.js +176 -0
  158. package/dist/esm/fork/getStateFromPath-mods.js.map +6 -0
  159. package/dist/esm/fork/getStateFromPath-mods.mjs +143 -0
  160. package/dist/esm/fork/getStateFromPath-mods.mjs.map +1 -0
  161. package/dist/esm/fork/getStateFromPath-mods.native.js +246 -0
  162. package/dist/esm/fork/getStateFromPath-mods.native.js.map +6 -0
  163. package/dist/esm/fork/getStateFromPath.js +160 -265
  164. package/dist/esm/fork/getStateFromPath.js.map +2 -2
  165. package/dist/esm/fork/getStateFromPath.mjs +181 -260
  166. package/dist/esm/fork/getStateFromPath.mjs.map +1 -1
  167. package/dist/esm/fork/getStateFromPath.native.js +164 -302
  168. package/dist/esm/fork/getStateFromPath.native.js.map +2 -2
  169. package/dist/esm/fork/useBackButton.js.map +1 -1
  170. package/dist/esm/fork/useBackButton.mjs.map +1 -1
  171. package/dist/esm/fork/useBackButton.native.js.map +1 -1
  172. package/dist/esm/fork/useDocumentTitle.js +4 -1
  173. package/dist/esm/fork/useDocumentTitle.js.map +1 -1
  174. package/dist/esm/fork/useDocumentTitle.mjs.map +1 -1
  175. package/dist/esm/fork/useDocumentTitle.native.js +1 -1
  176. package/dist/esm/fork/useDocumentTitle.native.js.map +2 -2
  177. package/dist/esm/fork/useLinking.js +22 -26
  178. package/dist/esm/fork/useLinking.js.map +1 -1
  179. package/dist/esm/fork/useLinking.mjs +20 -23
  180. package/dist/esm/fork/useLinking.mjs.map +1 -1
  181. package/dist/esm/fork/useLinking.native.js +65 -67
  182. package/dist/esm/fork/useLinking.native.js.map +2 -2
  183. package/dist/esm/fork/useThenable.js.map +1 -1
  184. package/dist/esm/fork/useThenable.mjs.map +1 -1
  185. package/dist/esm/fork/useThenable.native.js.map +1 -1
  186. package/dist/esm/fork/validatePathConfig.js +41 -11
  187. package/dist/esm/fork/validatePathConfig.js.map +1 -1
  188. package/dist/esm/fork/validatePathConfig.mjs +32 -11
  189. package/dist/esm/fork/validatePathConfig.mjs.map +1 -1
  190. package/dist/esm/fork/validatePathConfig.native.js +43 -18
  191. package/dist/esm/fork/validatePathConfig.native.js.map +2 -2
  192. package/dist/esm/layouts/withLayoutContext.js +1 -1
  193. package/dist/esm/layouts/withLayoutContext.js.map +1 -1
  194. package/dist/esm/layouts/withLayoutContext.mjs +1 -1
  195. package/dist/esm/layouts/withLayoutContext.mjs.map +1 -1
  196. package/dist/esm/layouts/withLayoutContext.native.js +1 -1
  197. package/dist/esm/layouts/withLayoutContext.native.js.map +1 -1
  198. package/dist/esm/link/linking.js +2 -2
  199. package/dist/esm/link/linking.js.map +1 -1
  200. package/dist/esm/link/linking.mjs +2 -2
  201. package/dist/esm/link/linking.mjs.map +1 -1
  202. package/dist/esm/link/linking.native.js +2 -2
  203. package/dist/esm/link/linking.native.js.map +1 -1
  204. package/dist/esm/link/useLinkTo.js +1 -1
  205. package/dist/esm/link/useLinkTo.mjs +1 -1
  206. package/dist/esm/link/useLinkTo.native.js +1 -1
  207. package/dist/esm/router/getNormalizedStatePath.js +1 -1
  208. package/dist/esm/router/getNormalizedStatePath.mjs +1 -1
  209. package/dist/esm/router/getNormalizedStatePath.native.js +1 -1
  210. package/dist/esm/router/router.js +24 -2
  211. package/dist/esm/router/router.js.map +1 -1
  212. package/dist/esm/router/router.mjs +18 -2
  213. package/dist/esm/router/router.mjs.map +1 -1
  214. package/dist/esm/router/router.native.js +38 -2
  215. package/dist/esm/router/router.native.js.map +2 -2
  216. package/dist/esm/utils/serverContext.js +2 -1
  217. package/dist/esm/utils/serverContext.js.map +1 -1
  218. package/dist/esm/utils/serverContext.mjs +1 -1
  219. package/dist/esm/utils/serverContext.mjs.map +1 -1
  220. package/dist/esm/utils/serverContext.native.js +2 -1
  221. package/dist/esm/utils/serverContext.native.js.map +2 -2
  222. package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +3 -3
  223. package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
  224. package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +3 -3
  225. package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
  226. package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +3 -3
  227. package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +2 -2
  228. package/package.json +8 -9
  229. package/src/Root.tsx +6 -2
  230. package/src/cli/build.ts +2 -3
  231. package/src/constants.ts +8 -0
  232. package/src/fork/NavigationContainer.tsx +101 -39
  233. package/src/fork/createMemoryHistory.tsx +15 -13
  234. package/src/fork/extractPathFromURL.ts +85 -40
  235. package/src/fork/findFocusedRoute.tsx +9 -1
  236. package/src/fork/getPathFromState-mods.ts +142 -0
  237. package/src/fork/getPathFromState.ts +244 -501
  238. package/src/fork/getStateFromPath-mods.ts +400 -0
  239. package/src/fork/getStateFromPath.ts +447 -538
  240. package/src/fork/useBackButton.native.tsx +16 -2
  241. package/src/fork/useBackButton.tsx +11 -2
  242. package/src/fork/useDocumentTitle.native.tsx +9 -4
  243. package/src/fork/useDocumentTitle.tsx +12 -7
  244. package/src/fork/useLinking.native.ts +71 -63
  245. package/src/fork/useLinking.ts +75 -40
  246. package/src/fork/useThenable.tsx +7 -1
  247. package/src/fork/validatePathConfig.ts +64 -12
  248. package/src/layouts/withLayoutContext.tsx +1 -1
  249. package/src/link/linking.ts +2 -2
  250. package/src/link/useLinkTo.tsx +1 -1
  251. package/src/router/getNormalizedStatePath.tsx +1 -1
  252. package/src/router/router.ts +41 -2
  253. package/src/utils/serverContext.tsx +3 -1
  254. package/src/vite/plugins/fileSystemRouterPlugin.tsx +3 -3
  255. package/types/Root.d.ts.map +1 -1
  256. package/types/cli/build.d.ts.map +1 -1
  257. package/types/constants.d.ts +2 -0
  258. package/types/constants.d.ts.map +1 -1
  259. package/types/fork/NavigationContainer.d.ts +19 -8
  260. package/types/fork/NavigationContainer.d.ts.map +1 -1
  261. package/types/fork/createMemoryHistory.d.ts +10 -1
  262. package/types/fork/createMemoryHistory.d.ts.map +1 -1
  263. package/types/fork/extractPathFromURL.d.ts +7 -1
  264. package/types/fork/extractPathFromURL.d.ts.map +1 -1
  265. package/types/fork/findFocusedRoute.d.ts +9 -0
  266. package/types/fork/findFocusedRoute.d.ts.map +1 -1
  267. package/types/fork/getPathFromState-mods.d.ts +23 -0
  268. package/types/fork/getPathFromState-mods.d.ts.map +1 -0
  269. package/types/fork/getPathFromState.d.ts +15 -14
  270. package/types/fork/getPathFromState.d.ts.map +1 -1
  271. package/types/fork/getStateFromPath-mods.d.ts +58 -0
  272. package/types/fork/getStateFromPath-mods.d.ts.map +1 -0
  273. package/types/fork/getStateFromPath.d.ts +28 -29
  274. package/types/fork/getStateFromPath.d.ts.map +1 -1
  275. package/types/fork/useBackButton.d.ts +6 -0
  276. package/types/fork/useBackButton.d.ts.map +1 -1
  277. package/types/fork/useBackButton.native.d.ts +9 -1
  278. package/types/fork/useBackButton.native.d.ts.map +1 -1
  279. package/types/fork/useDocumentTitle.d.ts +8 -6
  280. package/types/fork/useDocumentTitle.d.ts.map +1 -1
  281. package/types/fork/useDocumentTitle.native.d.ts +5 -2
  282. package/types/fork/useDocumentTitle.native.d.ts.map +1 -1
  283. package/types/fork/useLinking.d.ts +8 -1
  284. package/types/fork/useLinking.d.ts.map +1 -1
  285. package/types/fork/useLinking.native.d.ts +9 -2
  286. package/types/fork/useLinking.native.d.ts.map +1 -1
  287. package/types/fork/useThenable.d.ts +6 -0
  288. package/types/fork/useThenable.d.ts.map +1 -1
  289. package/types/fork/validatePathConfig.d.ts +8 -1
  290. package/types/fork/validatePathConfig.d.ts.map +1 -1
  291. package/types/link/linking.d.ts +2 -2
  292. package/types/link/linking.d.ts.map +1 -1
  293. package/types/utils/serverContext.d.ts.map +1 -1
  294. package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
@@ -1,19 +1,23 @@
1
1
  import {
2
2
  BaseNavigationContainer,
3
- DefaultTheme,
4
- LinkingContext,
5
- LocaleDirContext,
6
- ThemeProvider,
7
3
  getActionFromState,
8
4
  getPathFromState,
9
5
  getStateFromPath,
6
+ ThemeProvider,
10
7
  validatePathConfig
11
- } from "@react-navigation/native";
8
+ } from "@react-navigation/core";
12
9
  import * as React from "react";
13
- import useLinking from "./useLinking";
14
10
  import { I18nManager } from "react-native-web";
11
+ import useLatestCallback from "use-latest-callback";
12
+ import {
13
+ LinkingContext,
14
+ LocaleDirContext,
15
+ DefaultTheme,
16
+ UNSTABLE_UnhandledLinkingContext as UnhandledLinkingContext
17
+ } from "@react-navigation/native";
15
18
  import { useBackButton } from "./useBackButton";
16
19
  import { useDocumentTitle } from "./useDocumentTitle";
20
+ import { useLinking } from "./useLinking";
17
21
  import { useThenable } from "./useThenable";
18
22
  import { jsx } from "react/jsx-runtime";
19
23
  globalThis.REACT_NAVIGATION_DEVTOOLS = /* @__PURE__ */ new WeakMap();
@@ -24,17 +28,39 @@ function NavigationContainerInner({
24
28
  fallback = null,
25
29
  documentTitle,
26
30
  onReady,
31
+ onStateChange,
27
32
  ...rest
28
33
  }, ref) {
29
34
  const isLinkingEnabled = linking ? linking.enabled !== !1 : !1;
30
35
  linking?.config && validatePathConfig(linking.config);
31
36
  const refContainer = React.useRef(null);
32
37
  useBackButton(refContainer), useDocumentTitle(refContainer, documentTitle);
33
- const { getInitialState } = useLinking(refContainer, {
34
- enabled: isLinkingEnabled,
35
- prefixes: [],
36
- ...linking
37
- });
38
+ const [lastUnhandledLink, setLastUnhandledLink] = React.useState(), { getInitialState } = useLinking(
39
+ refContainer,
40
+ {
41
+ enabled: isLinkingEnabled,
42
+ prefixes: [],
43
+ ...linking
44
+ },
45
+ setLastUnhandledLink
46
+ ), linkingContext = React.useMemo(() => ({ options: linking }), [linking]), unhandledLinkingContext = React.useMemo(
47
+ () => ({ lastUnhandledLink, setLastUnhandledLink }),
48
+ [lastUnhandledLink, setLastUnhandledLink]
49
+ ), onReadyForLinkingHandling = useLatestCallback(() => {
50
+ const path = refContainer.current?.getCurrentRoute()?.path;
51
+ setLastUnhandledLink((previousLastUnhandledLink) => {
52
+ if (previousLastUnhandledLink !== path)
53
+ return previousLastUnhandledLink;
54
+ }), onReady?.();
55
+ }), onStateChangeForLinkingHandling = useLatestCallback(
56
+ (state) => {
57
+ const path = refContainer.current?.getCurrentRoute()?.path;
58
+ setLastUnhandledLink((previousLastUnhandledLink) => {
59
+ if (previousLastUnhandledLink !== path)
60
+ return previousLastUnhandledLink;
61
+ }), onStateChange?.(state);
62
+ }
63
+ );
38
64
  React.useEffect(() => {
39
65
  refContainer.current && REACT_NAVIGATION_DEVTOOLS.set(refContainer.current, {
40
66
  get linking() {
@@ -50,23 +76,20 @@ function NavigationContainerInner({
50
76
  });
51
77
  });
52
78
  const [isResolved, initialState] = useThenable(getInitialState);
53
- React.useImperativeHandle(ref, () => refContainer.current);
54
- const linkingContext = React.useMemo(() => ({ options: linking }), [linking]);
55
- return React.useEffect(() => {
56
- onReady?.();
57
- }, [onReady]), isResolved ? /* @__PURE__ */ jsx(LocaleDirContext.Provider, { value: direction, children: /* @__PURE__ */ jsx(LinkingContext.Provider, { value: linkingContext, children: /* @__PURE__ */ jsx(ThemeProvider, { value: theme, children: /* @__PURE__ */ jsx(
79
+ return React.useImperativeHandle(ref, () => refContainer.current), rest.initialState != null || !isLinkingEnabled || isResolved ? /* @__PURE__ */ jsx(LocaleDirContext.Provider, { value: direction, children: /* @__PURE__ */ jsx(UnhandledLinkingContext.Provider, { value: unhandledLinkingContext, children: /* @__PURE__ */ jsx(LinkingContext.Provider, { value: linkingContext, children: /* @__PURE__ */ jsx(
58
80
  BaseNavigationContainer,
59
81
  {
60
82
  ...rest,
61
83
  theme,
62
- ref: refContainer,
63
- initialState: initialState ?? rest.initialState
84
+ onReady: onReadyForLinkingHandling,
85
+ onStateChange: onStateChangeForLinkingHandling,
86
+ initialState: rest.initialState == null ? initialState : rest.initialState,
87
+ ref: refContainer
64
88
  }
65
89
  ) }) }) }) : /* @__PURE__ */ jsx(ThemeProvider, { value: theme, children: fallback });
66
90
  }
67
91
  const NavigationContainer = React.forwardRef(NavigationContainerInner);
68
- var NavigationContainer_default = NavigationContainer;
69
92
  export {
70
- NavigationContainer_default as default
93
+ NavigationContainer
71
94
  };
72
95
  //# sourceMappingURL=NavigationContainer.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/fork/NavigationContainer.tsx"],
4
- "mappings": "AAEA;AAAA,EACE;AAAA,EACA;AAAA,EAEA;AAAA,EAEA;AAAA,EAMA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,YAAY,WAAW;AAEvB,OAAO,gBAAgB;AACvB,SAAS,mBAAmB;AAC5B,SAAS,qBAAqB;AAC9B,SAAS,wBAAwB;AACjC,SAAS,mBAAmB;AAsFjB;AApFX,WAAW,4BAA4B,oBAAI,QAAQ;AAyBnD,SAAS,yBACP;AAAA,EACE,YAAY,YAAY,aAAa,EAAE,QAAQ,QAAQ;AAAA,EACvD,QAAQ;AAAA,EACR;AAAA,EACA,WAAW;AAAA,EACX;AAAA,EACA;AAAA,EACA,GAAG;AACL,GACA,KACA;AACA,QAAM,mBAAmB,UAAU,QAAQ,YAAY,KAAQ;AAE/D,EAAI,SAAS,UACX,mBAAmB,QAAQ,MAAM;AAGnC,QAAM,eAAe,MAAM,OAA8C,IAAI;AAE7E,gBAAc,YAAY,GAC1B,iBAAiB,cAAc,aAAa;AAE5C,QAAM,EAAE,gBAAgB,IAAI,WAAW,cAAc;AAAA,IACnD,SAAS;AAAA,IACT,UAAU,CAAC;AAAA,IACX,GAAG;AAAA,EACL,CAAC;AAID,QAAM,UAAU,MAAM;AACpB,IAAI,aAAa,WACf,0BAA0B,IAAI,aAAa,SAAS;AAAA,MAClD,IAAI,UAAU;AACZ,eAAO;AAAA,UACL,GAAG;AAAA,UACH,SAAS;AAAA,UACT,UAAU,SAAS,YAAY,CAAC;AAAA,UAChC,kBAAkB,SAAS,oBAAoB;AAAA,UAC/C,kBAAkB,SAAS,oBAAoB;AAAA,UAC/C,oBAAoB,SAAS,sBAAsB;AAAA,QACrD;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EAEL,CAAC;AAED,QAAM,CAAC,YAAY,YAAY,IAAI,YAAY,eAAe;AAE9D,QAAM,oBAAoB,KAAK,MAAM,aAAa,OAAO;AAEzD,QAAM,iBAAiB,MAAM,QAAQ,OAAO,EAAE,SAAS,QAAQ,IAAI,CAAC,OAAO,CAAC;AAM5E,SAJA,MAAM,UAAU,MAAM;AACpB,cAAU;AAAA,EACZ,GAAG,CAAC,OAAO,CAAC,GAEP,aAKH,oBAAC,iBAAiB,UAAjB,EAA0B,OAAO,WAChC,8BAAC,eAAe,UAAf,EAAwB,OAAO,gBAC9B,8BAAC,iBAAc,OAAO,OACpB;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACJ;AAAA,MACA,KAAK;AAAA,MACL,cAAc,gBAAgB,KAAK;AAAA;AAAA,EACrC,GACF,GACF,GACF,IAfO,oBAAC,iBAAc,OAAO,OAAQ,oBAAS;AAiBlD;AAEA,MAAM,sBAAsB,MAAM,WAAW,wBAAwB;AAQrE,IAAO,8BAAQ;",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -1,9 +1,11 @@
1
- import { BaseNavigationContainer, DefaultTheme, LinkingContext, LocaleDirContext, ThemeProvider, getActionFromState, getPathFromState, getStateFromPath, validatePathConfig } from "@react-navigation/native";
1
+ import { BaseNavigationContainer, getActionFromState, getPathFromState, getStateFromPath, ThemeProvider, validatePathConfig } from "@react-navigation/core";
2
2
  import * as React from "react";
3
- import useLinking from "./useLinking.mjs";
4
3
  import { I18nManager } from "react-native-web";
4
+ import useLatestCallback from "use-latest-callback";
5
+ import { LinkingContext, LocaleDirContext, DefaultTheme, UNSTABLE_UnhandledLinkingContext as UnhandledLinkingContext } from "@react-navigation/native";
5
6
  import { useBackButton } from "./useBackButton.mjs";
6
7
  import { useDocumentTitle } from "./useDocumentTitle.mjs";
8
+ import { useLinking } from "./useLinking.mjs";
7
9
  import { useThenable } from "./useThenable.mjs";
8
10
  import { jsx } from "react/jsx-runtime";
9
11
  globalThis.REACT_NAVIGATION_DEVTOOLS = /* @__PURE__ */new WeakMap();
@@ -14,19 +16,40 @@ function NavigationContainerInner({
14
16
  fallback = null,
15
17
  documentTitle,
16
18
  onReady,
19
+ onStateChange,
17
20
  ...rest
18
21
  }, ref) {
19
22
  const isLinkingEnabled = linking ? linking.enabled !== !1 : !1;
20
23
  linking?.config && validatePathConfig(linking.config);
21
24
  const refContainer = React.useRef(null);
22
25
  useBackButton(refContainer), useDocumentTitle(refContainer, documentTitle);
23
- const {
24
- getInitialState
25
- } = useLinking(refContainer, {
26
- enabled: isLinkingEnabled,
27
- prefixes: [],
28
- ...linking
29
- });
26
+ const [lastUnhandledLink, setLastUnhandledLink] = React.useState(),
27
+ {
28
+ getInitialState
29
+ } = useLinking(refContainer, {
30
+ enabled: isLinkingEnabled,
31
+ prefixes: [],
32
+ ...linking
33
+ }, setLastUnhandledLink),
34
+ linkingContext = React.useMemo(() => ({
35
+ options: linking
36
+ }), [linking]),
37
+ unhandledLinkingContext = React.useMemo(() => ({
38
+ lastUnhandledLink,
39
+ setLastUnhandledLink
40
+ }), [lastUnhandledLink, setLastUnhandledLink]),
41
+ onReadyForLinkingHandling = useLatestCallback(() => {
42
+ const path = refContainer.current?.getCurrentRoute()?.path;
43
+ setLastUnhandledLink(previousLastUnhandledLink => {
44
+ if (previousLastUnhandledLink !== path) return previousLastUnhandledLink;
45
+ }), onReady?.();
46
+ }),
47
+ onStateChangeForLinkingHandling = useLatestCallback(state => {
48
+ const path = refContainer.current?.getCurrentRoute()?.path;
49
+ setLastUnhandledLink(previousLastUnhandledLink => {
50
+ if (previousLastUnhandledLink !== path) return previousLastUnhandledLink;
51
+ }), onStateChange?.(state);
52
+ });
30
53
  React.useEffect(() => {
31
54
  refContainer.current && REACT_NAVIGATION_DEVTOOLS.set(refContainer.current, {
32
55
  get linking() {
@@ -42,23 +65,19 @@ function NavigationContainerInner({
42
65
  });
43
66
  });
44
67
  const [isResolved, initialState] = useThenable(getInitialState);
45
- React.useImperativeHandle(ref, () => refContainer.current);
46
- const linkingContext = React.useMemo(() => ({
47
- options: linking
48
- }), [linking]);
49
- return React.useEffect(() => {
50
- onReady?.();
51
- }, [onReady]), isResolved ? /* @__PURE__ */jsx(LocaleDirContext.Provider, {
68
+ return React.useImperativeHandle(ref, () => refContainer.current), rest.initialState != null || !isLinkingEnabled || isResolved ? /* @__PURE__ */jsx(LocaleDirContext.Provider, {
52
69
  value: direction,
53
- children: /* @__PURE__ */jsx(LinkingContext.Provider, {
54
- value: linkingContext,
55
- children: /* @__PURE__ */jsx(ThemeProvider, {
56
- value: theme,
70
+ children: /* @__PURE__ */jsx(UnhandledLinkingContext.Provider, {
71
+ value: unhandledLinkingContext,
72
+ children: /* @__PURE__ */jsx(LinkingContext.Provider, {
73
+ value: linkingContext,
57
74
  children: /* @__PURE__ */jsx(BaseNavigationContainer, {
58
75
  ...rest,
59
76
  theme,
60
- ref: refContainer,
61
- initialState: initialState ?? rest.initialState
77
+ onReady: onReadyForLinkingHandling,
78
+ onStateChange: onStateChangeForLinkingHandling,
79
+ initialState: rest.initialState == null ? initialState : rest.initialState,
80
+ ref: refContainer
62
81
  })
63
82
  })
64
83
  })
@@ -68,6 +87,5 @@ function NavigationContainerInner({
68
87
  });
69
88
  }
70
89
  const NavigationContainer = React.forwardRef(NavigationContainerInner);
71
- var NavigationContainer_default = NavigationContainer;
72
- export { NavigationContainer_default as default };
90
+ export { NavigationContainer };
73
91
  //# sourceMappingURL=NavigationContainer.mjs.map
@@ -1 +1 @@
1
- {"version":3,"names":["BaseNavigationContainer","DefaultTheme","LinkingContext","LocaleDirContext","ThemeProvider","getActionFromState","getPathFromState","getStateFromPath","validatePathConfig","React","useLinking","I18nManager","useBackButton","useDocumentTitle","useThenable","jsx","globalThis","REACT_NAVIGATION_DEVTOOLS","WeakMap","NavigationContainerInner","direction","getConstants","isRTL","theme","linking","fallback","documentTitle","onReady","rest","ref","isLinkingEnabled","enabled","config","refContainer","useRef","getInitialState","prefixes","useEffect","current","set","isResolved","initialState","useImperativeHandle","linkingContext","useMemo","options","Provider","value","children","NavigationContainer","forwardRef","NavigationContainer_default"],"sources":["../../../src/fork/NavigationContainer.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["BaseNavigationContainer","getActionFromState","getPathFromState","getStateFromPath","ThemeProvider","validatePathConfig","React","I18nManager","useLatestCallback","LinkingContext","LocaleDirContext","DefaultTheme","UNSTABLE_UnhandledLinkingContext","UnhandledLinkingContext","useBackButton","useDocumentTitle","useLinking","useThenable","jsx","globalThis","REACT_NAVIGATION_DEVTOOLS","WeakMap","NavigationContainerInner","direction","getConstants","isRTL","theme","linking","fallback","documentTitle","onReady","onStateChange","rest","ref","isLinkingEnabled","enabled","config","refContainer","useRef","lastUnhandledLink","setLastUnhandledLink","useState","getInitialState","prefixes","linkingContext","useMemo","options","unhandledLinkingContext","onReadyForLinkingHandling","path","current","getCurrentRoute","previousLastUnhandledLink","onStateChangeForLinkingHandling","state","useEffect","set","isResolved","initialState","useImperativeHandle","Provider","value","children","NavigationContainer","forwardRef"],"sources":["../../../src/fork/NavigationContainer.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1,21 +1,49 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
- import { BaseNavigationContainer, DefaultTheme, LinkingContext, LocaleDirContext, ThemeProvider, getActionFromState, getPathFromState, getStateFromPath, validatePathConfig } from "@react-navigation/native";
2
+ import { BaseNavigationContainer, getActionFromState, getPathFromState, getStateFromPath, ThemeProvider, validatePathConfig } from "@react-navigation/core";
3
3
  import * as React from "react";
4
- import useLinking from "./useLinking";
5
4
  import { I18nManager } from "react-native";
5
+ import useLatestCallback from "use-latest-callback";
6
+ import { LinkingContext, LocaleDirContext, DefaultTheme, UNSTABLE_UnhandledLinkingContext as UnhandledLinkingContext } from "@react-navigation/native";
6
7
  import { useBackButton } from "./useBackButton";
7
8
  import { useDocumentTitle } from "./useDocumentTitle";
9
+ import { useLinking } from "./useLinking";
8
10
  import { useThenable } from "./useThenable";
9
11
  globalThis.REACT_NAVIGATION_DEVTOOLS = /* @__PURE__ */ new WeakMap();
10
12
  function NavigationContainerInner(param, ref) {
11
- var { direction = I18nManager.getConstants().isRTL ? "rtl" : "ltr", theme = DefaultTheme, linking, fallback = null, documentTitle, onReady, ...rest } = param, isLinkingEnabled = linking ? linking.enabled !== !1 : !1;
13
+ var { direction = I18nManager.getConstants().isRTL ? "rtl" : "ltr", theme = DefaultTheme, linking, fallback = null, documentTitle, onReady, onStateChange, ...rest } = param, isLinkingEnabled = linking ? linking.enabled !== !1 : !1;
12
14
  linking?.config && validatePathConfig(linking.config);
13
15
  var refContainer = React.useRef(null);
14
16
  useBackButton(refContainer), useDocumentTitle(refContainer, documentTitle);
15
- var { getInitialState } = useLinking(refContainer, {
17
+ var [lastUnhandledLink, setLastUnhandledLink] = React.useState(), { getInitialState } = useLinking(refContainer, {
16
18
  enabled: isLinkingEnabled,
17
19
  prefixes: [],
18
20
  ...linking
21
+ }, setLastUnhandledLink), linkingContext = React.useMemo(function() {
22
+ return {
23
+ options: linking
24
+ };
25
+ }, [
26
+ linking
27
+ ]), unhandledLinkingContext = React.useMemo(function() {
28
+ return {
29
+ lastUnhandledLink,
30
+ setLastUnhandledLink
31
+ };
32
+ }, [
33
+ lastUnhandledLink,
34
+ setLastUnhandledLink
35
+ ]), onReadyForLinkingHandling = useLatestCallback(function() {
36
+ var _refContainer_current_getCurrentRoute, _refContainer_current, path = (_refContainer_current = refContainer.current) === null || _refContainer_current === void 0 || (_refContainer_current_getCurrentRoute = _refContainer_current.getCurrentRoute()) === null || _refContainer_current_getCurrentRoute === void 0 ? void 0 : _refContainer_current_getCurrentRoute.path;
37
+ setLastUnhandledLink(function(previousLastUnhandledLink) {
38
+ if (previousLastUnhandledLink !== path)
39
+ return previousLastUnhandledLink;
40
+ }), onReady?.();
41
+ }), onStateChangeForLinkingHandling = useLatestCallback(function(state) {
42
+ var _refContainer_current_getCurrentRoute, _refContainer_current, path = (_refContainer_current = refContainer.current) === null || _refContainer_current === void 0 || (_refContainer_current_getCurrentRoute = _refContainer_current.getCurrentRoute()) === null || _refContainer_current_getCurrentRoute === void 0 ? void 0 : _refContainer_current_getCurrentRoute.path;
43
+ setLastUnhandledLink(function(previousLastUnhandledLink) {
44
+ if (previousLastUnhandledLink !== path)
45
+ return previousLastUnhandledLink;
46
+ }), onStateChange?.(state);
19
47
  });
20
48
  React.useEffect(function() {
21
49
  refContainer.current && REACT_NAVIGATION_DEVTOOLS.set(refContainer.current, {
@@ -36,28 +64,20 @@ function NavigationContainerInner(param, ref) {
36
64
  React.useImperativeHandle(ref, function() {
37
65
  return refContainer.current;
38
66
  });
39
- var linkingContext = React.useMemo(function() {
40
- return {
41
- options: linking
42
- };
43
- }, [
44
- linking
45
- ]);
46
- return React.useEffect(function() {
47
- onReady?.();
48
- }, [
49
- onReady
50
- ]), isResolved ? /* @__PURE__ */ _jsx(LocaleDirContext.Provider, {
67
+ var isLinkingReady = rest.initialState != null || !isLinkingEnabled || isResolved;
68
+ return isLinkingReady ? /* @__PURE__ */ _jsx(LocaleDirContext.Provider, {
51
69
  value: direction,
52
- children: /* @__PURE__ */ _jsx(LinkingContext.Provider, {
53
- value: linkingContext,
54
- children: /* @__PURE__ */ _jsx(ThemeProvider, {
55
- value: theme,
70
+ children: /* @__PURE__ */ _jsx(UnhandledLinkingContext.Provider, {
71
+ value: unhandledLinkingContext,
72
+ children: /* @__PURE__ */ _jsx(LinkingContext.Provider, {
73
+ value: linkingContext,
56
74
  children: /* @__PURE__ */ _jsx(BaseNavigationContainer, {
57
75
  ...rest,
58
76
  theme,
59
- ref: refContainer,
60
- initialState: initialState ?? rest.initialState
77
+ onReady: onReadyForLinkingHandling,
78
+ onStateChange: onStateChangeForLinkingHandling,
79
+ initialState: rest.initialState == null ? initialState : rest.initialState,
80
+ ref: refContainer
61
81
  })
62
82
  })
63
83
  })
@@ -66,8 +86,8 @@ function NavigationContainerInner(param, ref) {
66
86
  children: fallback
67
87
  });
68
88
  }
69
- var NavigationContainer = /* @__PURE__ */ React.forwardRef(NavigationContainerInner), NavigationContainer_default = NavigationContainer;
89
+ var NavigationContainer = /* @__PURE__ */ React.forwardRef(NavigationContainerInner);
70
90
  export {
71
- NavigationContainer_default as default
91
+ NavigationContainer
72
92
  };
73
93
  //# sourceMappingURL=NavigationContainer.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/fork/Users/n8/one/packages/one/src/fork/NavigationContainer.tsx"],
4
- "mappings": ";AAEA,SACEA,yBACAC,cAEAC,gBAEAC,kBAMAC,eACAC,oBACAC,kBACAC,kBACAC,0BACK;AACP,YAAYC,WAAW;AAEvB,OAAOC,gBAAgB;AACvB,SAASC,mBAAmB;AAC5B,SAASC,qBAAqB;AAC9B,SAASC,wBAAwB;AACjC,SAASC,mBAAmB;AAE5BC,WAAWC,4BAA4B,oBAAIC,QAAAA;AAyB3C,SAASC,yBACP,OASAC,KAA6D;MAT7D,EACEC,YAAYT,YAAYU,aAAY,EAAGC,QAAQ,QAAQ,OACvDC,QAAQtB,cACRuB,SACAC,WAAW,MACXC,eACAC,SACA,GAAGC,KAAAA,IAPL,OAWMC,mBAAmBL,UAAUA,QAAQM,YAAY,KAAQ;AAE/D,EAAIN,SAASO,UACXvB,mBAAmBgB,QAAQO,MAAM;AAGnC,MAAMC,eAAevB,MAAMwB,OAA8C,IAAA;AAEzErB,gBAAcoB,YAAAA,GACdnB,iBAAiBmB,cAAcN,aAAAA;AAE/B,MAAM,EAAEQ,gBAAe,IAAKxB,WAAWsB,cAAc;IACnDF,SAASD;IACTM,UAAU,CAAA;IACV,GAAGX;EACL,CAAA;AAIAf,QAAM2B,UAAU,WAAA;AACd,IAAIJ,aAAaK,WACfrB,0BAA0BsB,IAAIN,aAAaK,SAAS;MAClD,IAAIb,UAAU;YAIAA,mBACQA,2BACAA,2BACEA;AANtB,eAAO;UACL,GAAGA;UACHM,SAASD;UACTM,WAAUX,oBAAAA,SAASW,cAAQ,QAAjBX,sBAAAA,SAAAA,oBAAqB,CAAA;UAC/BjB,mBAAkBiB,4BAAAA,SAASjB,sBAAgB,QAAzBiB,8BAAAA,SAAAA,4BAA6BjB;UAC/CD,mBAAkBkB,4BAAAA,SAASlB,sBAAgB,QAAzBkB,8BAAAA,SAAAA,4BAA6BlB;UAC/CD,qBAAoBmB,8BAAAA,SAASnB,wBAAkB,QAA3BmB,gCAAAA,SAAAA,8BAA+BnB;QACrD;MACF;IACF,CAAA;EAEJ,CAAA;AAEA,MAAM,CAACkC,YAAYC,YAAAA,IAAgB1B,YAAYoB,eAAAA;AAE/CzB,QAAMgC,oBAAoBtB,KAAK,WAAA;WAAMa,aAAaK;;AAElD,MAAMK,iBAAiBjC,MAAMkC,QAAQ,WAAA;WAAO;MAAEC,SAASpB;IAAQ;KAAI;IAACA;GAAQ;AAM5E,SAJAf,MAAM2B,UAAU,WAAA;AACdT,IAAAA,UAAAA;EACF,GAAG;IAACA;GAAQ,GAEPY,aAKH,qBAACpC,iBAAiB0C,UAAQ;IAACC,OAAO1B;cAChC,qBAAClB,eAAe2C,UAAQ;MAACC,OAAOJ;gBAC9B,qBAACtC,eAAAA;QAAc0C,OAAOvB;kBACpB,qBAACvB,yBAAAA;UACE,GAAG4B;UACJL;UACAJ,KAAKa;UACLQ,cAAcA,gBAAgBZ,KAAKY;;;;OAXpC,qBAACpC,eAAAA;IAAc0C,OAAOvB;cAAQE;;AAiBzC;AAEA,IAAMsB,sBAAsBtC,sBAAMuC,WAAW9B,wBAAAA,GAQ7C,8BAAe6B;",
5
- "names": ["BaseNavigationContainer", "DefaultTheme", "LinkingContext", "LocaleDirContext", "ThemeProvider", "getActionFromState", "getPathFromState", "getStateFromPath", "validatePathConfig", "React", "useLinking", "I18nManager", "useBackButton", "useDocumentTitle", "useThenable", "globalThis", "REACT_NAVIGATION_DEVTOOLS", "WeakMap", "NavigationContainerInner", "ref", "direction", "getConstants", "isRTL", "theme", "linking", "fallback", "documentTitle", "onReady", "rest", "isLinkingEnabled", "enabled", "config", "refContainer", "useRef", "getInitialState", "prefixes", "useEffect", "current", "set", "isResolved", "initialState", "useImperativeHandle", "linkingContext", "useMemo", "options", "Provider", "value", "NavigationContainer", "forwardRef"]
4
+ "mappings": "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",
5
+ "names": ["BaseNavigationContainer", "getActionFromState", "getPathFromState", "getStateFromPath", "ThemeProvider", "validatePathConfig", "React", "I18nManager", "useLatestCallback", "LinkingContext", "LocaleDirContext", "DefaultTheme", "UNSTABLE_UnhandledLinkingContext", "UnhandledLinkingContext", "useBackButton", "useDocumentTitle", "useLinking", "useThenable", "globalThis", "REACT_NAVIGATION_DEVTOOLS", "WeakMap", "NavigationContainerInner", "ref", "direction", "getConstants", "isRTL", "theme", "linking", "fallback", "documentTitle", "onReady", "onStateChange", "rest", "isLinkingEnabled", "enabled", "config", "refContainer", "useRef", "lastUnhandledLink", "setLastUnhandledLink", "useState", "getInitialState", "prefixes", "linkingContext", "useMemo", "options", "unhandledLinkingContext", "onReadyForLinkingHandling", "path", "current", "getCurrentRoute", "previousLastUnhandledLink", "onStateChangeForLinkingHandling", "state", "useEffect", "set", "isResolved", "initialState", "useImperativeHandle", "isLinkingReady", "Provider", "value", "NavigationContainer", "forwardRef"]
6
6
  }
@@ -34,7 +34,8 @@ function createMemoryHistory() {
34
34
  interrupt();
35
35
  const id = window.history.state?.id ?? nanoid();
36
36
  let pathWithHash = path;
37
- !items.length || items.findIndex((item) => item.id === id) < 0 ? (pathWithHash = pathWithHash + location.hash, items = [{ path: pathWithHash, state, id }], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + location.hash), items[index] = { path, state, id }), window.history.replaceState({ id }, "", pathWithHash);
37
+ const hash = pathWithHash.includes("#") ? "" : location.hash;
38
+ !items.length || items.findIndex((item) => item.id === id) < 0 ? (pathWithHash = pathWithHash + hash, items = [{ path: pathWithHash, state, id }], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + hash), items[index] = { path, state, id }), window.history.replaceState({ id }, "", pathWithHash);
38
39
  },
39
40
  // `history.go(n)` is asynchronous, there are couple of things to keep in mind:
40
41
  // - it won't do anything if we can't go `n` steps, the `popstate` event won't fire.
@@ -79,6 +80,6 @@ function createMemoryHistory() {
79
80
  };
80
81
  }
81
82
  export {
82
- createMemoryHistory as default
83
+ createMemoryHistory
83
84
  };
84
85
  //# sourceMappingURL=createMemoryHistory.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/fork/createMemoryHistory.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["index"]
6
6
  }
@@ -48,11 +48,12 @@ function createMemoryHistory() {
48
48
  interrupt();
49
49
  const id = window.history.state?.id ?? nanoid();
50
50
  let pathWithHash = path;
51
- !items.length || items.findIndex(item => item.id === id) < 0 ? (pathWithHash = pathWithHash + location.hash, items = [{
51
+ const hash = pathWithHash.includes("#") ? "" : location.hash;
52
+ !items.length || items.findIndex(item => item.id === id) < 0 ? (pathWithHash = pathWithHash + hash, items = [{
52
53
  path: pathWithHash,
53
54
  state,
54
55
  id
55
- }], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + location.hash), items[index] = {
56
+ }], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + hash), items[index] = {
56
57
  path,
57
58
  state,
58
59
  id
@@ -109,5 +110,5 @@ function createMemoryHistory() {
109
110
  }
110
111
  };
111
112
  }
112
- export { createMemoryHistory as default };
113
+ export { createMemoryHistory };
113
114
  //# sourceMappingURL=createMemoryHistory.mjs.map
@@ -1 +1 @@
1
- {"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","id","window","history","state","index2","findIndex","item","get","backIndex","path","i","push","slice","length","pushState","replace","pathWithHash","location","hash","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","splice","onPopState","currentIndex","Math","max","last","pop","removeEventListener","addEventListener","listen","listener"],"sources":["../../../src/fork/createMemoryHistory.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["nanoid","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","id","window","history","state","index2","findIndex","item","get","backIndex","path","i","push","slice","length","pushState","replace","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","splice","onPopState","currentIndex","Math","max","last","pop","removeEventListener","addEventListener","listen","listener"],"sources":["../../../src/fork/createMemoryHistory.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -44,16 +44,16 @@ function createMemoryHistory() {
44
44
  replace(param) {
45
45
  var { path, state } = param, _window_history_state;
46
46
  interrupt();
47
- var _window_history_state_id, id = (_window_history_state_id = (_window_history_state = window.history.state) === null || _window_history_state === void 0 ? void 0 : _window_history_state.id) !== null && _window_history_state_id !== void 0 ? _window_history_state_id : nanoid(), pathWithHash = path;
47
+ var _window_history_state_id, id = (_window_history_state_id = (_window_history_state = window.history.state) === null || _window_history_state === void 0 ? void 0 : _window_history_state.id) !== null && _window_history_state_id !== void 0 ? _window_history_state_id : nanoid(), pathWithHash = path, hash = pathWithHash.includes("#") ? "" : location.hash;
48
48
  !items.length || items.findIndex(function(item) {
49
49
  return item.id === id;
50
- }) < 0 ? (pathWithHash = pathWithHash + location.hash, items = [
50
+ }) < 0 ? (pathWithHash = pathWithHash + hash, items = [
51
51
  {
52
52
  path: pathWithHash,
53
53
  state,
54
54
  id
55
55
  }
56
- ], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + location.hash), items[index] = {
56
+ ], index = 0) : (items[index].path === path && (pathWithHash = pathWithHash + hash), items[index] = {
57
57
  path,
58
58
  state,
59
59
  id
@@ -114,6 +114,6 @@ function createMemoryHistory() {
114
114
  return history;
115
115
  }
116
116
  export {
117
- createMemoryHistory as default
117
+ createMemoryHistory
118
118
  };
119
119
  //# sourceMappingURL=createMemoryHistory.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/fork/Users/n8/one/packages/one/src/fork/createMemoryHistory.tsx"],
4
- "mappings": "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",
5
- "names": ["nanoid", "createMemoryHistory", "index", "items", "pending", "interrupt", "forEach", "it", "cb", "history", "window", "id", "state", "findIndex", "item", "get", "backIndex", "path", "i", "push", "slice", "length", "pushState", "replace", "pathWithHash", "location", "hash", "replaceState", "go", "n", "nextIndex", "lastItemIndex", "Promise", "resolve", "reject", "done", "interrupted", "clearTimeout", "timer", "Error", "title", "document", "ref", "setTimeout", "splice", "onPopState", "currentIndex", "Math", "max", "last", "pop", "removeEventListener", "addEventListener", "listen", "listener"]
4
+ "mappings": "AAWA,SAASA,cAAc;AAWhB,SAASC,sBAAAA;AACd,MAAIC,QAAQ,GACRC,QAAyB,CAAA,GAIvBC,UAAmE,CAAA,GAEnEC,YAAY,WAAA;AAIhBD,YAAQE,QAAQ,SAACC,IAAAA;AACf,UAAMC,KAAKD,GAAGC;AACdD,SAAGC,KAAK,WAAA;eAAMA,GAAG,EAAA;;IACnB,CAAA;EACF,GAEMC,UAAU;IACd,IAAIP,QAAgB;UAGPQ,uBAALC,MAAKD,wBAAAA,OAAOD,QAAQG,WAAK,QAApBF,0BAAAA,SAAAA,SAAAA,sBAAsBC;AAEjC,UAAIA,IAAI;AACN,YAAMT,SAAQC,MAAMU,UAAU,SAACC,MAAAA;iBAASA,KAAKH,OAAOA;;AAEpD,eAAOT,SAAQ,KAAKA,SAAQ;MAC9B;AAEA,aAAO;IACT;IAEAa,IAAIb,QAAa;AACf,aAAOC,MAAMD,MAAAA;IACf;IAEAc,UAAU,OAA0B;AAElC,eAFQ,EAAEC,KAAI,IAAN,OAECC,IAAIhB,QAAQ,GAAGgB,KAAK,GAAGA,KAAK;AACnC,YAAMJ,OAAOX,MAAMe,CAAAA;AAEnB,YAAIJ,KAAKG,SAASA;AAChB,iBAAOC;MAEX;AAEA,aAAO;IACT;IAEAC,KAAK,OAAyD;UAAzD,EAAEF,MAAML,MAAK,IAAb;AACHP,gBAAAA;AAEA,UAAMM,KAAKX,OAAAA;AAIXG,cAAQA,MAAMiB,MAAM,GAAGlB,QAAQ,CAAA,GAE/BC,MAAMgB,KAAK;QAAEF;QAAML;QAAOD;MAAG,CAAA,GAC7BT,QAAQC,MAAMkB,SAAS,GAMvBX,OAAOD,QAAQa,UAAU;QAAEX;MAAG,GAAG,IAAIM,IAAAA;IACvC;IAEAM,QAAQ,OAAyD;UAAzD,EAAEN,MAAML,MAAK,IAAb,OAGKF;AAFXL,gBAAAA;UAEWK,0BAALC,MAAKD,4BAAAA,wBAAAA,OAAOD,QAAQG,WAAK,QAApBF,0BAAAA,SAAAA,SAAAA,sBAAsBC,QAAE,QAAxBD,6BAAAA,SAAAA,2BAA4BV,OAAAA,GAInCwB,eAAeP,MACbQ,OAAOD,aAAaE,SAAS,GAAA,IAAO,KAAKC,SAASF;AAExD,MAAI,CAACtB,MAAMkB,UAAUlB,MAAMU,UAAU,SAACC,MAAAA;eAASA,KAAKH,OAAOA;WAAM,KAQ/Da,eAAeA,eAAeC,MAC9BtB,QAAQ;QAAC;UAAEc,MAAMO;UAAcZ;UAAOD;QAAG;SACzCT,QAAQ,MAEJC,MAAMD,KAAAA,EAAOe,SAASA,SACxBO,eAAeA,eAAeC,OAEhCtB,MAAMD,KAAAA,IAAS;QAAEe;QAAML;QAAOD;MAAG,IAGnCD,OAAOD,QAAQmB,aAAa;QAAEjB;MAAG,GAAG,IAAIa,YAAAA;IAC1C;;;;;;IAOAK,GAAGC,GAAS;AACVzB,gBAAAA;AAIA,UAAM0B,YAAY7B,QAAQ4B,GACpBE,gBAAgB7B,MAAMkB,SAAS;AAarC,UAZIS,IAAI,KAAK,CAAC3B,MAAM4B,SAAAA,KAElBD,IAAI,CAAC5B,OACLA,QAAQ,KACC4B,IAAI,KAAKC,YAAYC,iBAE9BF,IAAIE,gBAAgB9B,OACpBA,QAAQ8B,iBAER9B,QAAQ6B,WAGND,MAAM;AASV,eAAO,IAAIG,QAAc,SAACC,SAASC,QAAAA;AACjC,cAAMC,OAAO,SAACC,aAAAA;AAGZ,gBAFAC,aAAaC,KAAAA,GAETF,aAAa;AACfF,qBAAO,IAAIK,MAAM,wCAAA,CAAA;AACjB;YACF;AAUA,gBAAM,EAAEC,MAAK,IAAK/B,OAAOgC;AAEzBhC,mBAAOgC,SAASD,QAAQ,IACxB/B,OAAOgC,SAASD,QAAQA,OAExBP,QAAAA;UACF;AAEA9B,kBAAQe,KAAK;YAAEwB,KAAKP;YAAM5B,IAAI4B;UAAK,CAAA;AAOnC,cAAMG,QAAQK,WAAW,WAAA;AACvB,gBAAM1C,SAAQE,QAAQS,UAAU,SAACN,IAAAA;qBAAOA,GAAGoC,QAAQP;;AAEnD,YAAIlC,SAAQ,OACVE,QAAQF,MAAAA,EAAOM,GAAE,GACjBJ,QAAQyC,OAAO3C,QAAO,CAAA;UAE1B,GAAG,GAAA,GAEG4C,aAAa,WAAA;gBACNpC,uBAALC,MAAKD,wBAAAA,OAAOD,QAAQG,WAAK,QAApBF,0BAAAA,SAAAA,SAAAA,sBAAsBC,IAC3BoC,eAAe5C,MAAMU,UAAU,SAACC,MAAAA;qBAASA,KAAKH,OAAOA;;AAI3DT,oBAAQ8C,KAAKC,IAAIF,cAAc,CAAA;AAE/B,gBAAMG,OAAO9C,QAAQ+C,IAAG;AAExBzC,mBAAO0C,oBAAoB,YAAYN,UAAAA,GACvCI,MAAM1C,GAAE;UACV;AAEAE,iBAAO2C,iBAAiB,YAAYP,UAAAA,GACpCpC,OAAOD,QAAQoB,GAAGC,CAAAA;QACpB,CAAA;IACF;;;;IAKAwB,OAAOC,UAAoB;AACzB,UAAMT,aAAa,WAAA;AACjB,QAAI1C,QAAQiB,UAKZkC,SAAAA;MACF;AAEA7C,oBAAO2C,iBAAiB,YAAYP,UAAAA,GAE7B,WAAA;eAAMpC,OAAO0C,oBAAoB,YAAYN,UAAAA;;IACtD;EACF;AAEA,SAAOrC;AACT;",
5
+ "names": ["nanoid", "createMemoryHistory", "index", "items", "pending", "interrupt", "forEach", "it", "cb", "history", "window", "id", "state", "findIndex", "item", "get", "backIndex", "path", "i", "push", "slice", "length", "pushState", "replace", "pathWithHash", "hash", "includes", "location", "replaceState", "go", "n", "nextIndex", "lastItemIndex", "Promise", "resolve", "reject", "done", "interrupted", "clearTimeout", "timer", "Error", "title", "document", "ref", "setTimeout", "splice", "onPopState", "currentIndex", "Math", "max", "last", "pop", "removeEventListener", "addEventListener", "listen", "listener"]
6
6
  }
@@ -1,38 +1,69 @@
1
- import URL from "url-parse";
1
+ function parsePathAndParamsFromExpoGoLink(url) {
2
+ const results = parsePathFromExpoGoLink(url).match(/([^?]*)(\?.*)?/);
3
+ return {
4
+ pathname: results?.[1] ?? "",
5
+ queryString: results?.[2] ?? ""
6
+ };
7
+ }
8
+ function parsePathFromExpoGoLink(url) {
9
+ return url.match(/exps?:\/\/.*?\/--\/(.*)/)?.[1] ?? "";
10
+ }
2
11
  function extractExactPathFromURL(url) {
3
12
  if (
4
13
  // If a universal link / app link / web URL is used, we should use the path
5
14
  // from the URL, while stripping the origin.
6
15
  url.match(/^https?:\/\//)
7
16
  ) {
8
- const { origin, href } = new URL(url);
9
- return href.replace(origin, "");
17
+ const { origin, href, hostname } = new URL(url);
18
+ return hostname === "exp.host" || hostname === "u.expo.dev" ? "" : href.replace(origin, "");
19
+ }
20
+ if (typeof expo < "u" && globalThis.expo?.modules?.ExpoGo && // while not exhaustive, `exp` and `exps` are the only two schemes which
21
+ // are passed through to other apps in Expo Go.
22
+ url.match(/^exp(s)?:\/\//)) {
23
+ const pathname = parsePathFromExpoGoLink(url);
24
+ if (pathname)
25
+ return fromDeepLink("a://" + pathname);
26
+ const queryParams = url.match(/exps?:\/\/.*\?(.*)/)?.[1];
27
+ return queryParams ? fromDeepLink("a://?" + queryParams) : "";
10
28
  }
11
29
  return fromDeepLink(url);
12
30
  }
13
31
  function isExpoDevelopmentClient(url) {
14
- return !!url.hostname.match(/^expo-development-client$/);
32
+ return url.hostname === "expo-development-client";
15
33
  }
16
34
  function fromDeepLink(url) {
17
- const res = new URL(url, !0);
35
+ let res;
36
+ try {
37
+ res = new URL(url);
38
+ } catch {
39
+ return url.replace(/^[^:]+:\/\//, "");
40
+ }
18
41
  if (isExpoDevelopmentClient(res)) {
19
- if (!res.query || !res.query.url)
42
+ if (!res.searchParams.get("url"))
20
43
  return "";
21
- const incomingUrl = res.query.url;
44
+ const incomingUrl = res.searchParams.get("url");
22
45
  return extractExactPathFromURL(decodeURI(incomingUrl));
23
46
  }
24
- const qs = res.query ? Object.entries(res.query).map(([k, v]) => `${k}=${decodeURIComponent(v)}`).join("&") : "";
25
47
  let results = "";
26
- return res.host && (results += res.host), res.pathname && (results += res.pathname), qs && (results += "?" + qs), results;
48
+ res.host && (results += res.host), res.pathname && (results += res.pathname);
49
+ const qs = res.search ? (
50
+ // @ts-ignore: `entries` is not on `URLSearchParams` in some typechecks.
51
+ [...res.searchParams.entries()].map(([k, v]) => `${k}=${decodeURIComponent(v)}`).join("&")
52
+ ) : "";
53
+ return qs && (results += "?" + qs), results;
27
54
  }
28
- function extractExpoPathFromURL(url = "") {
55
+ function extractExpoPathFromURL(_prefixes, url = "") {
29
56
  return extractExactPathFromURL(url).replace(/^\//, "");
30
57
  }
31
58
  function adjustPathname(url) {
32
59
  return url.hostname === "exp.host" || url.hostname === "u.expo.dev" ? url.pathname.split("/").slice(2).join("/") : url.pathname;
33
60
  }
61
+ const extractPathFromURL = extractExpoPathFromURL;
34
62
  export {
35
63
  adjustPathname,
36
- extractExpoPathFromURL
64
+ extractExpoPathFromURL,
65
+ extractPathFromURL,
66
+ parsePathAndParamsFromExpoGoLink,
67
+ parsePathFromExpoGoLink
37
68
  };
38
69
  //# sourceMappingURL=extractPathFromURL.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/fork/extractPathFromURL.ts"],
4
- "mappings": "AAAA,OAAO,SAAS;AAGhB,SAAS,wBAAwB,KAAqB;AACpD;AAAA;AAAA;AAAA,IAGE,IAAI,MAAM,cAAc;AAAA,IACxB;AACA,UAAM,EAAE,QAAQ,KAAK,IAAI,IAAI,IAAI,GAAG;AACpC,WAAO,KAAK,QAAQ,QAAQ,EAAE;AAAA,EAChC;AA4BA,SAAO,aAAa,GAAG;AACzB;AAGA,SAAS,wBAAwB,KAAuD;AACtF,SAAO,CAAC,CAAC,IAAI,SAAS,MAAM,2BAA2B;AACzD;AAEA,SAAS,aAAa,KAAqB;AAGzC,QAAM,MAAM,IAAI,IAAI,KAAK,EAAI;AAE7B,MAAI,wBAAwB,GAAG,GAAG;AAChC,QAAI,CAAC,IAAI,SAAS,CAAC,IAAI,MAAM;AAC3B,aAAO;AAET,UAAM,cAAc,IAAI,MAAM;AAC9B,WAAO,wBAAwB,UAAU,WAAW,CAAC;AAAA,EACvD;AAEA,QAAM,KAAM,IAAI,QAEZ,OAAO,QAAQ,IAAI,KAA+B,EAC/C,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,CAAC,EAAE,EAC/C,KAAK,GAAG,IAHX;AAKJ,MAAI,UAAU;AAEd,SAAI,IAAI,SACN,WAAW,IAAI,OAGb,IAAI,aACN,WAAW,IAAI,WAGb,OACF,WAAW,MAAM,KAGZ;AACT;AAEO,SAAS,uBAAuB,MAAM,IAAI;AAE/C,SAAO,wBAAwB,GAAG,EAAE,QAAQ,OAAO,EAAE;AACvD;AAEO,SAAS,eAAe,KAAqD;AAClF,SAAI,IAAI,aAAa,cAAc,IAAI,aAAa,eAE3C,IAAI,SAAS,MAAM,GAAG,EAAE,MAAM,CAAC,EAAE,KAAK,GAAG,IAE3C,IAAI;AACb;",
4
+ "mappings": "AAAO,SAAS,iCAAiC,KAG/C;AAKA,QAAM,UADO,wBAAwB,GAAG,EACnB,MAAM,gBAAgB;AAC3C,SAAO;AAAA,IACL,UAAU,UAAU,CAAC,KAAK;AAAA,IAC1B,aAAa,UAAU,CAAC,KAAK;AAAA,EAC/B;AACF;AAEO,SAAS,wBAAwB,KAAqB;AAG3D,SAAO,IAAI,MAAM,yBAAyB,IAAI,CAAC,KAAK;AACtD;AAGA,SAAS,wBAAwB,KAAqB;AACpD;AAAA;AAAA;AAAA,IAGE,IAAI,MAAM,cAAc;AAAA,IACxB;AACA,UAAM,EAAE,QAAQ,MAAM,SAAS,IAAI,IAAI,IAAI,GAAG;AAE9C,WAAI,aAAa,cAAc,aAAa,eAGnC,KAGF,KAAK,QAAQ,QAAQ,EAAE;AAAA,EAChC;AAKA,MAHiB,OAAO,OAAS,OAAe,WAAW,MAAM,SAAS;AAAA;AAAA,EAOxE,IAAI,MAAM,eAAe,GACzB;AACA,UAAM,WAAW,wBAAwB,GAAG;AAC5C,QAAI;AACF,aAAO,aAAa,SAAS,QAAQ;AAGvC,UAAM,cAAc,IAAI,MAAM,oBAAoB,IAAI,CAAC;AACvD,WAAI,cACK,aAAa,UAAU,WAAW,IAGpC;AAAA,EACT;AAIA,SAAO,aAAa,GAAG;AACzB;AAGA,SAAS,wBAAwB,KAAmB;AAClD,SAAO,IAAI,aAAa;AAC1B;AAEA,SAAS,aAAa,KAAqB;AACzC,MAAI;AACJ,MAAI;AAGF,UAAM,IAAI,IAAI,GAAG;AAAA,EACnB,QAAQ;AAWN,WAAO,IAAI,QAAQ,eAAe,EAAE;AAAA,EACtC;AAEA,MAAI,wBAAwB,GAAG,GAAG;AAChC,QAAI,CAAC,IAAI,aAAa,IAAI,KAAK;AAC7B,aAAO;AAET,UAAM,cAAc,IAAI,aAAa,IAAI,KAAK;AAC9C,WAAO,wBAAwB,UAAU,WAAW,CAAC;AAAA,EACvD;AAEA,MAAI,UAAU;AAEd,EAAI,IAAI,SACN,WAAW,IAAI,OAGb,IAAI,aACN,WAAW,IAAI;AAGjB,QAAM,KAAM,IAAI;AAAA;AAAA,IAGZ,CAAC,GAAG,IAAI,aAAa,QAAQ,CAAC,EAC3B,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,mBAAmB,CAAC,CAAC,EAAE,EAC/C,KAAK,GAAG;AAAA,MAJX;AAMJ,SAAI,OACF,WAAW,MAAM,KAGZ;AACT;AAEO,SAAS,uBAAuB,WAAqB,MAAM,IAAI;AACpE,SACE,wBAAwB,GAAG,EAExB,QAAQ,OAAO,EAAE;AAExB;AAEO,SAAS,eAAe,KAAqD;AAClF,SAAI,IAAI,aAAa,cAAc,IAAI,aAAa,eAE3C,IAAI,SAAS,MAAM,GAAG,EAAE,MAAM,CAAC,EAAE,KAAK,GAAG,IAE3C,IAAI;AACb;AAEO,MAAM,qBAAqB;",
5
5
  "names": []
6
6
  }