one 1.1.547-1762219526973 → 1.1.547-1762236328455

package/src/fork/NavigationContainer.tsx

@@ -18,10 +18,6 @@ import {
   ThemeProvider,
   validatePathConfig,
 } from '@react-navigation/core'
-import * as React from 'react'
-import { I18nManager } from 'react-native'
-import useLatestCallback from 'use-latest-callback'
-
 // @modified - start
 // import { LinkingContext } from './LinkingContext'
 // import { LocaleDirContext } from './LocaleDirContext'
@@ -29,14 +25,17 @@ import useLatestCallback from 'use-latest-callback'
 // import type { DocumentTitleOptions, LinkingOptions, LocaleDirection } from './types'
 // import { UnhandledLinkingContext } from './UnhandledLinkingContext'
 import {
-  LinkingContext,
-  LocaleDirContext,
   DefaultTheme,
   type DocumentTitleOptions,
+  LinkingContext,
   type LinkingOptions,
+  LocaleDirContext,
   type LocaleDirection,
   UNSTABLE_UnhandledLinkingContext as UnhandledLinkingContext,
 } from '@react-navigation/native'
+import * as React from 'react'
+import { I18nManager } from 'react-native'
+import useLatestCallback from 'use-latest-callback'
 // @modified - end
 import { useBackButton } from './useBackButton'
 import { useDocumentTitle } from './useDocumentTitle'
@@ -95,7 +94,7 @@ function NavigationContainerInner(
     validatePathConfig(linking.config)
   }
 
-  const refContainer = React.useRef<NavigationContainerRef<ParamListBase>>(null)
+  const refContainer = React.useRef<NavigationContainerRef<ParamListBase> | null>(null)
 
   useBackButton(refContainer)
   useDocumentTitle(refContainer, documentTitle)
@@ -165,7 +164,7 @@ function NavigationContainerInner(
 
   const [isResolved, initialState] = useThenable(getInitialState)
 
-  React.useImperativeHandle(ref, () => refContainer.current)
+  React.useImperativeHandle(ref, () => refContainer.current!)
 
   const isLinkingReady = rest.initialState != null || !isLinkingEnabled || isResolved
 

package/src/fork/__tests__/getStateFromPath.test.tsx

@@ -5,12 +5,12 @@
  * All modifications except formatting should be marked with `// @modified` comment.
  */
 
-// @modified - start: use vitest instead of jest
-// import { expect, test } from '@jest/globals';
-import { expect, test } from 'vitest'
 // @modified - end: use vitest instead of jest
 import type { InitialState } from '@react-navigation/routers'
 import { produce } from 'immer'
+// @modified - start: use vitest instead of jest
+// import { expect, test } from '@jest/globals';
+import { expect, test } from 'vitest'
 
 import { findFocusedRoute } from '../findFocusedRoute'
 import { getPathFromState } from '../getPathFromState'

package/src/fork/getPathFromState-mods.ts

@@ -87,7 +87,7 @@ export function getPathWithConventionsCollapsed({
         // Optional params without value assigned in route.params should be ignored
         const value = params[name]
         if (value === undefined && p.endsWith('?')) {
-          return
+          return undefined
         }
 
         // return params[name]

package/src/fork/getPathFromState.test.ts

@@ -1,5 +1,5 @@
-import { describe, expect, it } from 'vitest'
 import type { PathConfigMap } from '@react-navigation/core'
+import { describe, expect, it } from 'vitest'
 
 import { getPathFromState, type State } from './getPathFromState'
 

package/src/fork/getPathFromState.ts

@@ -6,14 +6,14 @@
  * All modifications except formatting should be marked with `// @modified` comment.
  */
 
+import * as sharedModUtils from './_shared'
 // @modified - start
 import {
+  type AdditionalOptions,
+  appendBaseUrl,
   type ConfigItemMods,
   getPathWithConventionsCollapsed,
-  appendBaseUrl,
-  type AdditionalOptions,
 } from './getPathFromState-mods'
-import * as sharedModUtils from './_shared'
 // @modified - end
 
 import type { NavigationState, PartialState, Route } from '@react-navigation/routers'

package/src/fork/getStateFromPath-mods.ts

@@ -6,7 +6,7 @@
 
 import escape_ from 'escape-string-regexp'
 import { matchGroupName, stripGroupSegmentsFromPath } from '../router/matchers'
-import type { RouteConfig, ParsedRoute, InitialRouteConfig } from './getStateFromPath'
+import type { InitialRouteConfig, ParsedRoute, RouteConfig } from './getStateFromPath'
 
 export type AdditionalRouteConfig = {
   type: 'static' | 'dynamic' | 'layout'
@@ -365,7 +365,7 @@ export function parseQueryParamsExtended(
         )
       }
     } else {
-      // biome-ignore lint/suspicious/noPrototypeBuiltins: <explanation>
+      // biome-ignore lint/suspicious/noPrototypeBuiltins: forked code from react-navigation
       const values = parseConfig?.hasOwnProperty(name)
         ? searchParams.getAll(name).map((value) => parseConfig[name](value))
         : searchParams.getAll(name)

package/src/fork/getStateFromPath.ts

@@ -9,11 +9,12 @@
 import type { InitialState, NavigationState, PartialState } from '@react-navigation/routers'
 // biome-ignore lint/suspicious/noShadowRestrictedNames: ignore from forked code // @modified
 import escape from 'escape-string-regexp'
+
 // import * as queryString from 'query-string'
 
-import { findFocusedRoute } from './findFocusedRoute'
 import type { PathConfigMap } from '@react-navigation/core' // @modified
-import { validatePathConfig } from './validatePathConfig'
+import { getParamValue, isDynamicPart, replacePart } from './_shared'
+import { findFocusedRoute } from './findFocusedRoute'
 import {
   type AdditionalRouteConfig,
   appendIsInitial,
@@ -26,7 +27,7 @@ import {
   parseQueryParamsExtended,
   populateParams,
 } from './getStateFromPath-mods'
-import { getParamValue, isDynamicPart, replacePart } from './_shared'
+import { validatePathConfig } from './validatePathConfig'
 
 type Options<ParamList extends {}> = {
   path?: string
@@ -648,20 +649,17 @@ const createStateObject = (
         index: 1,
         routes: [{ name: initialRoute }, route],
       }
-      // biome-ignore lint/style/noUselessElse: not changing forked code
     } else {
       return {
         routes: [route],
       }
     }
-    // biome-ignore lint/style/noUselessElse: not changing forked code
   } else {
     if (initialRoute) {
       return {
         index: 1,
         routes: [{ name: initialRoute }, { ...route, state: { routes: [] } }],
       }
-      // biome-ignore lint/style/noUselessElse: not changing forked code
     } else {
       return {
         routes: [{ ...route, state: { routes: [] } }],

package/src/fork/useBackButton.tsx

@@ -8,7 +8,7 @@
 import type { NavigationContainerRef, ParamListBase } from '@react-navigation/core'
 
 // eslint-disable-next-line @eslint-react/hooks-extra/ensure-custom-hooks-using-other-hooks
-export function useBackButton(_: React.RefObject<NavigationContainerRef<ParamListBase>>) {
+export function useBackButton(_: React.RefObject<NavigationContainerRef<ParamListBase> | null>) {
   // No-op
   // BackHandler is not available on web
 }

package/src/fork/useDocumentTitle.tsx

@@ -6,15 +6,14 @@
  */
 
 import type { NavigationContainerRef, ParamListBase } from '@react-navigation/core'
-import * as React from 'react'
-
 import type { DocumentTitleOptions } from '@react-navigation/native'
+import * as React from 'react'
 
 /**
  * Set the document title for the active screen
  */
 export function useDocumentTitle(
-  ref: React.RefObject<NavigationContainerRef<ParamListBase>>,
+  ref: React.RefObject<NavigationContainerRef<ParamListBase> | null>,
   {
     enabled = true,
     formatter = (options, route) => options?.title ?? route?.name,

package/src/fork/useLinking.native.ts

@@ -13,11 +13,10 @@ import {
   type ParamListBase,
   useNavigationIndependentTree,
 } from '@react-navigation/core'
+import type { LinkingOptions } from '@react-navigation/native' // @modified: import from @react-navigation/native
 import * as React from 'react'
 import { Linking, Platform } from 'react-native'
-
 import { extractPathFromURL } from './extractPathFromURL'
-import type { LinkingOptions } from '@react-navigation/native' // @modified: import from @react-navigation/native
 
 type ResultState = ReturnType<typeof getStateFromPathDefault>
 
@@ -156,7 +155,6 @@ export function useLinking(
 
             return state
           })
-          // biome-ignore lint/style/noUselessElse: don't check copied code
         } else {
           onUnhandledLinking(extractPathFromURL(prefixes, url))
         }

package/src/fork/useLinking.ts

@@ -16,15 +16,14 @@ import {
   type ParamListBase,
   useNavigationIndependentTree,
 } from '@react-navigation/core'
+// @modified - end
+import type { LinkingOptions } from '@react-navigation/native' // @modified: change import path
 import isEqual from 'fast-deep-equal'
 import * as React from 'react'
-
-import { createMemoryHistory } from './createMemoryHistory'
 // @modified - start
 // import { ServerContext } from '@react-navigation/web';
 import { ServerLocationContext } from '../router/serverLocationContext'
-// @modified - end
-import type { LinkingOptions } from '@react-navigation/native' // @modified: change import path
+import { createMemoryHistory } from './createMemoryHistory'
 import { appendBaseUrl } from './getPathFromState-mods'
 
 type ResultState = ReturnType<typeof getStateFromPathDefault>
@@ -86,7 +85,7 @@ const linkingHandlers: symbol[] = []
 type Options = LinkingOptions<ParamListBase>
 
 export function useLinking(
-  ref: React.RefObject<NavigationContainerRef<ParamListBase>>,
+  ref: React.RefObject<NavigationContainerRef<ParamListBase> | null>,
   {
     enabled = true,
     config,

package/src/fork/validatePathConfig.ts

@@ -42,7 +42,6 @@ export function validatePathConfig(config: unknown, root = true) {
           const type = validation[key as keyof typeof validation] as string
           const value: string = config[key]
 
-          // biome-ignore lint/suspicious/useValidTypeof: do not check copied code
           if (value !== undefined && typeof value !== type) {
             return [key, `expected '${type}', got '${typeof value}'`]
           }

package/src/head/Head.android.tsx

@@ -2,7 +2,7 @@ import type { PropsWithChildren } from 'react'
 import { HeadModule } from './HeadModule'
 import type { HeadType } from './types'
 
-// @ts-ignore
+// @ts-expect-error
 export const Head: HeadType = (props: PropsWithChildren) => null
 
 Object.assign(Head, HeadModule)

package/src/head/Head.ios.tsx

@@ -1,9 +1,9 @@
 import { useIsFocused } from '@react-navigation/core'
-import React from 'react'
+import React, { type JSX } from 'react'
+import { useParams, usePathname, useSegments, useUnstableGlobalHref } from '../hooks'
 import { HeadModule, type UserActivity } from './HeadModule'
-import { getStaticUrlFromOneRouter } from './url'
-import { useParams, useUnstableGlobalHref, usePathname, useSegments } from '../hooks'
 import type { HeadType } from './types'
+import { getStaticUrlFromOneRouter } from './url'
 
 function urlToId(url: string) {
   return url.replace(/[^a-zA-Z0-9]/g, '-')
@@ -61,15 +61,33 @@ function serializedMetaChildren(meta: MetaNode[]): SerializedMeta[] {
       return {
         type: 'title',
         props: {
-          children: typeof child.props.children === 'string' ? child.props.children : undefined,
+          children:
+            child.props &&
+            typeof child.props === 'object' &&
+            'children' in child.props &&
+            typeof child.props.children === 'string'
+              ? child.props.children
+              : undefined,
         },
       }
     }
     return {
       type: 'meta',
       props: {
-        property: typeof child.props.property === 'string' ? child.props.property : undefined,
-        content: typeof child.props.content === 'string' ? child.props.content : undefined,
+        property:
+          child.props &&
+          typeof child.props === 'object' &&
+          'property' in child.props &&
+          typeof child.props.property === 'string'
+            ? child.props.property
+            : undefined,
+        content:
+          child.props &&
+          typeof child.props === 'object' &&
+          'content' in child.props &&
+          typeof child.props.content === 'string'
+            ? child.props.content
+            : undefined,
       },
     }
   })
@@ -296,7 +314,7 @@ function HeadShim(props: React.PropsWithChildren) {
 HeadShim.Provider = React.Fragment
 
 // Native Head is only enabled in bare iOS apps.
-// @ts-ignore
+// @ts-expect-error
 export const Head: HeadType = HeadModule ? HeadNative : HeadShim
 
 Object.assign(Head, HeadModule)

package/src/head/Head.tsx

@@ -1,7 +1,7 @@
 import { HeadModule } from './HeadModule'
 import type { HeadType } from './types'
 
-// @ts-ignore
+// @ts-expect-error
 export const Head: HeadType = ({ children }: { children?: any }) => {
   return children
 }

package/src/head/HeadModule.ts

@@ -42,7 +42,7 @@ let HeadModule: {
 } | null = null
 
 // If running in Expo Go.
-// @ts-ignore
+// @ts-expect-error
 if (typeof expo !== 'undefined' && globalThis.expo?.modules?.ExpoGo) {
   HeadModule = globalThis.expo?.modules?.HeadModule
 }

package/src/head/url.tsx

@@ -63,7 +63,7 @@ function throwOrAlert(msg: string) {
   console.warn(`TODO FIX: ${msg}`)
   // // Production apps fatally crash which is often not helpful.
   // if (
-  //   // @ts-ignore: process is defined
+  //   // @ts-expect-error: process is defined
   //   process.env.NODE_ENV === 'production'
   // ) {
   //   console.error(msg)

package/src/hooks.tsx

@@ -1,9 +1,9 @@
-import React, { createContext, useContext, type ReactNode } from 'react'
+import React, { createContext, type ReactNode, useContext } from 'react'
 import type { OneRouter } from './interfaces/router'
 import { router } from './router/imperative-api'
 import { RouteParamsContext, useRouteNode } from './router/Route'
-import { navigationRef, useStoreRootState, useStoreRouteInfo } from './router/router'
 import { RouteInfoContext } from './router/RouteInfoContext'
+import { navigationRef, useStoreRootState, useStoreRouteInfo } from './router/router'
 
 type SearchParams = OneRouter.SearchParams
 
@@ -55,11 +55,7 @@ export function Frozen({ on = false, children }: { on?: boolean; children: React
   return (
     <FrozeContext.Provider value={on}>
       {/* <Freeze freeze={on}> */}
-      <div
-        // @ts-ignore
-        inert
-        style={{ display: 'contents' }}
-      >
+      <div {...(on && { inert: true })} style={{ display: 'contents' }}>
         {children}
       </div>
       {/* </Freeze> */}

package/src/index.ts

@@ -1,75 +1,66 @@
 export { createApp } from './createApp'
 
-export type { OneRouter, One } from './interfaces/router'
+export type { One, OneRouter } from './interfaces/router'
+
 import type { OneRouter } from './interfaces/router'
 
 export type Href = OneRouter.Href
 export type LinkProps<T extends string | object = string> = OneRouter.LinkProps<T>
 
-export type { Endpoint, LoaderProps } from './types'
-
-// base
-export { router } from './router/imperative-api'
-export { createRoute, route } from './router/createRoute'
-export { onClientLoaderResolve } from './clientLoaderResolver'
-
-// middleware
-export { createMiddleware, type Middleware } from './createMiddleware'
-
-// internals
-export { render } from './render'
-export { Root } from './Root'
-export * as routerStore from './router/router'
-
-// components
-export { Stack } from './layouts/Stack'
-export { Tabs } from './layouts/Tabs'
+// hooks
+export { useIsFocused } from '@react-navigation/core'
+// re-export
+export * from '@vxrn/universal-color-scheme'
 // TODO breaking due to react-native-gesture-handler
 // export { Drawer } from './layouts/Drawer'
 // export { Unmatched } from './fallbackViews/Unmatched'
 export { SafeAreaView } from 'react-native-safe-area-context'
-export { Navigator, Slot } from './views/Navigator'
-export { ErrorBoundary } from './views/ErrorBoundary'
-export { ScrollBehavior } from './views/ScrollBehavior'
-export { LoadProgressBar } from './views/LoadProgressBar'
-export { Link } from './link/Link'
-export { Redirect } from './link/Redirect'
-export { Head } from './head'
+export { onClientLoaderResolve } from './clientLoaderResolver'
 
-// hooks
-export { useIsFocused } from '@react-navigation/core'
-export { useLinkTo } from './link/useLinkTo'
-export { useServerHeadInsertion, type ServerHeadInsertionCallback } from './useServerHeadInsertion'
+// middleware
+export { createMiddleware, type Middleware } from './createMiddleware'
+export { getURL } from './getURL'
+export { Head } from './head'
+// for easier expo-router migration
 export {
-  useRouter,
-  useUnstableGlobalHref,
-  usePathname,
+  useActiveParams,
+  useGlobalSearchParams,
+  useLocalSearchParams,
   useNavigationContainerRef,
   useParams,
-  useActiveParams,
-  useSegments,
+  usePathname,
   useRootNavigationState,
+  useRouter,
+  useSegments,
+  useUnstableGlobalHref,
 } from './hooks'
-// for easier expo-router migration
-export {
-  useLocalSearchParams,
-  useGlobalSearchParams,
-} from './hooks'
-
+export { href } from './href'
+// components
+export { Stack } from './layouts/Stack'
+export { Tabs } from './layouts/Tabs'
 // utilities
 export { withLayoutContext } from './layouts/withLayoutContext'
-export { isResponse } from './utils/isResponse'
-export { getURL } from './getURL'
-export { redirect } from './utils/redirect'
-export { href } from './href'
-
-// server
-export { setResponseHeaders, getServerData, setServerData } from './vite/one-server-only'
-
-// re-export
-export * from '@vxrn/universal-color-scheme'
-
+export { Link } from './link/Link'
+export { Redirect } from './link/Redirect'
+export { useLinkTo } from './link/useLinkTo'
+export { Root } from './Root'
+// internals
+export { render } from './render'
+export { createRoute, route } from './router/createRoute'
+// base
+export { router } from './router/imperative-api'
+export * as routerStore from './router/router'
+export { useNavigation } from './router/useNavigation'
+export type { Endpoint, LoaderProps } from './types'
 // React Navigation
 export { useFocusEffect } from './useFocusEffect'
-export { useNavigation } from './router/useNavigation'
 export { useLoader } from './useLoader'
+export { type ServerHeadInsertionCallback, useServerHeadInsertion } from './useServerHeadInsertion'
+export { isResponse } from './utils/isResponse'
+export { redirect } from './utils/redirect'
+export { ErrorBoundary } from './views/ErrorBoundary'
+export { LoadProgressBar } from './views/LoadProgressBar'
+export { Navigator, Slot } from './views/Navigator'
+export { ScrollBehavior } from './views/ScrollBehavior'
+// server
+export { getServerData, setResponseHeaders, setServerData } from './vite/one-server-only'

package/src/interfaces/router.ts

@@ -3,8 +3,8 @@ import type {
   NavigationState,
   PartialState,
 } from '@react-navigation/core'
-import type { ReactNode } from 'react'
-import type { TextProps, GestureResponderEvent, PressableProps } from 'react-native'
+import type { JSX, ReactNode } from 'react'
+import type { GestureResponderEvent, PressableProps, TextProps } from 'react-native'
 
 export namespace OneRouter {
   export interface __routes<T extends string = string> extends Record<string, unknown> {}

package/src/layouts/Drawer.tsx

@@ -1,7 +1,7 @@
 import {
   createDrawerNavigator,
-  type DrawerNavigationOptions,
   type DrawerNavigationEventMap,
+  type DrawerNavigationOptions,
 } from '@react-navigation/drawer'
 import type { DrawerNavigationState, ParamListBase } from '@react-navigation/native'
 

package/src/layouts/Stack.tsx

@@ -1,8 +1,8 @@
 import type { ParamListBase, StackNavigationState } from '@react-navigation/native'
 import {
+  createNativeStackNavigator,
   type NativeStackNavigationEventMap,
   type NativeStackNavigationOptions,
-  createNativeStackNavigator,
 } from '@react-navigation/native-stack'
 
 import { withLayoutContext } from './withLayoutContext'

package/src/layouts/Tabs.tsx

@@ -1,9 +1,9 @@
 import {
-  createBottomTabNavigator,
-  type BottomTabNavigationEventMap,
-  type BottomTabNavigationOptions,
   BottomTabBar,
   type BottomTabBarProps,
+  type BottomTabNavigationEventMap,
+  type BottomTabNavigationOptions,
+  createBottomTabNavigator,
 } from '@react-navigation/bottom-tabs'
 import type { ParamListBase, TabNavigationState } from '@react-navigation/native'
 import { Platform, Pressable } from 'react-native'
@@ -72,7 +72,7 @@ export const Tabs = withLayoutContext<
                   style={[{ display: 'flex' }, props.style]}
                   href={href}
                   asChild={Platform.OS !== 'web'}
-                  // biome-ignore lint/correctness/noChildrenProp: <explanation>
+                  // biome-ignore lint/correctness/noChildrenProp: children prop needed for asChild pattern
                   children={children}
                 />
               )

package/src/layouts/withLayoutContext.tsx

@@ -1,10 +1,10 @@
 import type { EventMapBase, NavigationState } from '@react-navigation/native'
 import React from 'react'
 import { useContextKey } from '../router/Route'
+import { type ScreenProps, useSortedScreens } from '../router/useScreens'
 import type { PickPartial } from '../types'
-import { useSortedScreens, type ScreenProps } from '../router/useScreens'
-import { Screen } from '../views/Screen'
 import { withStaticProperties } from '../utils/withStaticProperties'
+import { Screen } from '../views/Screen'
 
 export function useFilterScreenChildren(
   children: React.ReactNode,
@@ -22,19 +22,28 @@ export function useFilterScreenChildren(
 
     const screens = React.Children.map(children, (child) => {
       if (React.isValidElement(child) && child && child.type === Screen) {
-        if (!child.props.name) {
+        if (
+          typeof child.props === 'object' &&
+          child.props &&
+          'name' in child.props &&
+          !child.props.name
+        ) {
           throw new Error(
             `<Screen /> component in \`default export\` at \`app${contextKey}/_layout\` must have a \`name\` prop when used as a child of a Layout Route.`
           )
         }
         if (process.env.NODE_ENV !== 'production') {
-          if (['children', 'component', 'getComponent'].some((key) => key in child.props)) {
+          if (
+            ['children', 'component', 'getComponent'].some(
+              (key) => child.props && typeof child.props === 'object' && key in child.props
+            )
+          ) {
             throw new Error(
               `<Screen /> component in \`default export\` at \`app${contextKey}/_layout\` must not have a \`children\`, \`component\`, or \`getComponent\` prop when used as a child of a Layout Route`
             )
           }
         }
-        return child.props
+        return child.props as ScreenProps
       }
 
       if (isCustomNavigator) {
@@ -44,6 +53,8 @@ export function useFilterScreenChildren(
           `Layout children must be of type Screen, all other children are ignored. To use custom children, create a custom <Layout />. Update Layout Route at: "app${contextKey}/_layout"`
         )
       }
+
+      return null
     })?.filter(Boolean)
 
     // Add an assertion for development
@@ -83,8 +94,8 @@ export function withLayoutContext<
         contextKey,
       })
 
-      const processed = processor ? processor(screens ?? []) : screens
-      const sorted = useSortedScreens(processed ?? [], {
+      const processed = processor ? processor(screens ?? ([] as any)) : screens
+      const sorted = useSortedScreens((processed ?? []) as any, {
         onlyMatching: true,
       })
 

package/src/link/Link.tsx

@@ -2,7 +2,7 @@
 // `to` / `action` support removed.
 import { Slot } from '@radix-ui/react-slot'
 import * as React from 'react'
-import { Platform, Text, type GestureResponderEvent, type TextProps } from 'react-native'
+import { type GestureResponderEvent, Platform, Text, type TextProps } from 'react-native'
 
 import type { OneRouter } from '../interfaces/router'
 import { resolveHref } from './href'

package/src/link/linking.ts

@@ -5,7 +5,7 @@ import { adjustPathname } from '../fork/extractPathFromURL'
 import { getPathFromState } from '../fork/getPathFromState'
 import { getStateFromPath } from '../fork/getStateFromPath'
 
-// @ts-ignore
+// @ts-expect-error
 const isExpoGo = typeof expo !== 'undefined' && globalThis.expo?.modules?.ExpoGo
 
 // A custom getInitialURL is used on native to ensure the app always starts at

package/src/link/useLinkTo.tsx

@@ -1,9 +1,9 @@
 import type * as React from 'react'
-import { Platform, type GestureResponderEvent } from 'react-native'
+import { type GestureResponderEvent, Platform } from 'react-native'
 
 import { appendBaseUrl } from '../fork/getPathFromState-mods'
-import { useOneRouter } from '../router/router'
 import { stripGroupSegmentsFromPath } from '../router/matchers'
+import { useOneRouter } from '../router/router'
 
 function eventShouldPreventDefault(
   e: React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent