one 1.24.5 → 1.24.7

package/src/fork/useLinking.ts

@@ -35,7 +35,9 @@ import {
 import {
   consumePendingNavigationAction,
   rootState as routerRootState,
+  routeNode,
 } from '../router/router'
+import { isStateAwaitingNavigatorMount } from '../router/isStateAwaitingNavigatorMount'
 import { ServerLocationContext } from '../router/serverLocationContext'
 import { clearAllSlotStates } from '../views/Navigator'
 import { createMemoryHistory } from './createMemoryHistory'
@@ -626,20 +628,19 @@ export function useLinking(
       const pendingPath = pendingPopStatePathRef.current
       const route = findFocusedRoute(state)
 
-      // guard: during spa-shell hydration, child navigators may not have
-      // mounted yet. getRootState() returns a state where group routes like
-      // (app) have no nested state. findFocusedRoute stops at the group
-      // route because there's nothing to drill into. if we compute the path
-      // from this incomplete state, getPathFromState picks the first child
-      // alphabetically (e.g. /deploy) instead of the correct route (e.g. /).
-      // detect this by checking if the focused route is a group route — leaf
-      // routes are never named with parentheses.
-      if (route && /^\(.*\)$/.test(route.name)) {
+      // @modified - guard: the container state only carries the navigators that
+      // are mounted, so a layout that renders anything other than its <Slot />
+      // (late mount during hydration, an auth gate, a loading state) makes
+      // react-navigation publish a state truncated at that layout. computing a
+      // path from it picks the first child alphabetically (e.g. /deploy) instead
+      // of the route the URL names. same predicate router.updateState uses, so
+      // the URL and usePathname() cannot disagree about it.
+      if (isStateAwaitingNavigatorMount(state, routeNode)) {
         if (process.env.ONE_DEBUG_ROUTER) {
           console.info(
-            `[one] 📜 onStateChange - skipping: focused route is a group`,
-            route.name,
-            `(child navigator not mounted yet)`
+            `[one] 📜 onStateChange - skipping: navigator below`,
+            route?.name,
+            `has not mounted`
           )
         }
         return

package/src/router/conditionalSlotPathname.test.tsx

@@ -0,0 +1,147 @@
+import React from 'react'
+import TestRenderer, { act } from 'react-test-renderer'
+import { describe, expect, it } from 'vitest'
+import { usePathname } from '../hooks'
+import { Root } from '../Root'
+import { Slot } from '../views/Navigator'
+
+// react-test-renderer needs both of these; neither exists in a bare node env
+;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true
+;(globalThis as any).requestAnimationFrame ??= (cb: any) => setTimeout(() => cb(0), 0)
+;(globalThis as any).cancelAnimationFrame ??= (id: any) => clearTimeout(id)
+
+const routerRoot = 'app'
+
+// route modules are passed as objects rather than importers so the route context
+// resolves them synchronously; bumping the version makes Root build a fresh
+// route tree per test instead of reusing the module-level cache
+function makeRoutes(modules: Record<string, { default: React.ComponentType<any> }>) {
+  globalThis['__vxrnVersion'] = ((globalThis['__vxrnVersion'] as number) ?? 0) + 1
+  const routes: Record<string, unknown> = {}
+  for (const [file, module] of Object.entries(modules)) {
+    routes[`/${routerRoot}/${file}`] = module
+  }
+  return routes as any
+}
+
+const slotLayout = { default: () => <Slot /> }
+const leaf = (label: string) => ({ default: () => label })
+
+// `/project/:projectId/:sessionId` lives four navigators below the root, under a
+// route group, so a gate on the group's layout leaves three of them unmounted
+function routeTreeWithGate(gate: React.ComponentType<{ children: React.ReactNode }>) {
+  const Gate = gate
+  return makeRoutes({
+    '_layout.tsx': slotLayout,
+    '(app)/_layout.tsx': {
+      default: () => (
+        <Gate>
+          <Slot />
+        </Gate>
+      ),
+    },
+    '(app)/index.tsx': leaf('app-index'),
+    '(app)/project/_layout.tsx': slotLayout,
+    '(app)/project/[projectId]/_layout.tsx': slotLayout,
+    '(app)/project/[projectId]/[sessionId]/_layout.tsx': slotLayout,
+    '(app)/project/[projectId]/[sessionId]/index.tsx': leaf('session'),
+    '(site)/_layout.tsx': slotLayout,
+    '(site)/pricing.tsx': leaf('pricing'),
+  })
+}
+
+function renderAt(path: string, routes: any) {
+  let renderer: TestRenderer.ReactTestRenderer
+  act(() => {
+    renderer = TestRenderer.create(
+      <Root path={path} routes={routes} routerRoot={routerRoot} isClient={false} />
+    )
+  })
+  return renderer!
+}
+
+function bodyText(renderer: TestRenderer.ReactTestRenderer) {
+  const collect = (node: any): string =>
+    typeof node === 'string'
+      ? node
+      : Array.isArray(node)
+        ? node.map(collect).join('')
+        : node
+          ? collect(node.children ?? [])
+          : ''
+  return collect(renderer.toJSON())
+}
+
+describe('a layout that renders something other than its <Slot />', () => {
+  it('does not move the pathname while the URL stands still', () => {
+    const pathnames: string[] = []
+    let setBlocked: ((blocked: boolean) => void) | undefined
+
+    function Probe() {
+      const pathname = usePathname()
+      if (pathnames[pathnames.length - 1] !== pathname) pathnames.push(pathname)
+      return null
+    }
+
+    function Gate({ children }: { children: React.ReactNode }) {
+      const [blocked, set] = React.useState(true)
+      setBlocked = set
+      return (
+        <>
+          <Probe />
+          {blocked ? 'placeholder' : children}
+        </>
+      )
+    }
+
+    const renderer = renderAt('/project/p1/main', routeTreeWithGate(Gate))
+
+    // the gate starts blocked, so the three navigators below it never mounted
+    expect(bodyText(renderer)).toBe('placeholder')
+
+    act(() => setBlocked!(false))
+    expect(bodyText(renderer)).toBe('session')
+
+    act(() => setBlocked!(true))
+    expect(bodyText(renderer)).toBe('placeholder')
+
+    act(() => setBlocked!(false))
+
+    // the address bar never moved, so neither may usePathname(). unmounting the
+    // navigators used to collapse it to '/', which is a route the app is not on
+    expect(pathnames).toEqual(['/project/p1/main'])
+  })
+
+  it('settles when the gate itself reads the pathname', async () => {
+    // an access gate that blocks project routes once a check says the route is
+    // not proven yet — the shape that turned the collapse into an unbounded
+    // loop, because blocking changed the very pathname the gate decides from
+    let renders = 0
+    let requestBlock: (() => void) | undefined
+
+    function Gate({ children }: { children: React.ReactNode }) {
+      const pathname = usePathname()
+      const [blockRequested, setBlockRequested] = React.useState(false)
+      requestBlock = () => setBlockRequested(true)
+      renders++
+      if (renders > 100) {
+        throw new Error(`gate rendered ${renders} times without settling`)
+      }
+      const blocked = blockRequested && pathname.startsWith('/project/')
+      return <>{blocked ? 'blocked' : children}</>
+    }
+
+    const renderer = renderAt('/project/p1/main', routeTreeWithGate(Gate))
+    await act(async () => {})
+    expect(bodyText(renderer)).toBe('session')
+
+    await act(async () => requestBlock!())
+    await act(async () => {})
+
+    // blocking unmounts the navigators below, which must not report a pathname
+    // the gate reads as a different route — that flips the gate back open, which
+    // remounts them, which reports the project route again, forever
+    expect(bodyText(renderer)).toBe('blocked')
+    expect(renders).toBeLessThan(20)
+  })
+})

package/src/router/isStateAwaitingNavigatorMount.ts

@@ -0,0 +1,64 @@
+import type { OneRouter } from '../interfaces/router'
+import type { RouteNode } from './Route'
+
+type PartialState = {
+  index?: number
+  routes: Array<{ name: string; state?: PartialState }>
+}
+
+// the same focus rule getPathFromState walks, so the predicate agrees with the
+// pathname that state would serialize to
+function focusedRouteOf(state: PartialState) {
+  return typeof state.index === 'number'
+    ? state.routes[state.index]
+    : state.routes[state.routes.length - 1]
+}
+
+/**
+ * True when `state` stops short of the route the URL names because the
+ * navigator that owns the rest of it is not mounted.
+ *
+ * React Navigation rebuilds the container state from the navigators that are
+ * mounted right now: `useOnGetState` asks each one for its state and a route
+ * whose navigator is absent gets `state: undefined`. So a layout that renders
+ * anything other than its `<Slot />` — an auth gate, a loading state, an access
+ * check, a late mount during hydration — makes the container publish a state
+ * that is a TRUNCATION of the real location. Serializing that gives a pathname
+ * the app is not on: `/project/x/main` reads as `/`.
+ *
+ * The URL did not change, only the tree did, so nothing derived from the URL
+ * may move. A consumer that acts on the truncated pathname and in turn decides
+ * whether to render the routed subtree oscillates forever.
+ */
+export function isStateAwaitingNavigatorMount(
+  state: OneRouter.ResultState | PartialState | undefined,
+  rootNode: RouteNode | null
+): boolean {
+  if (!rootNode) return false
+
+  let node = rootNode
+  let current = state as PartialState | undefined
+
+  while (current?.routes?.length) {
+    const route = focusedRouteOf(current)
+    if (!route) return false
+
+    // direct children only: a directory with no `_layout` is flattened into the
+    // parent navigator under a multi-segment route name, and that name is what
+    // the state carries, so a recursive search would match the wrong depth
+    const child = node.children.find((candidate) => candidate.route === route.name)
+    if (!child) return false
+
+    if (route.state) {
+      node = child
+      current = route.state
+      continue
+    }
+
+    // deepest route this state carries. if the route tree says it still has
+    // child routes to render, its navigator has not mounted yet
+    return child.children.some((grandchild) => !grandchild.internal)
+  }
+
+  return false
+}

package/src/router/router.ts

@@ -44,6 +44,7 @@ import {
 } from './findRouteNode'
 import type { UrlObject } from './getNormalizedStatePath'
 import { getRouteInfo } from './getRouteInfo'
+import { isStateAwaitingNavigatorMount } from './isStateAwaitingNavigatorMount'
 import { getRouteArtifactPaths } from './getRouteArtifactPath'
 import { getRoutes } from './getRoutes'
 import { setLastAction } from './lastAction'
@@ -496,6 +497,18 @@ export function updateState(state: OneRouter.ResultState, nextStateParam = state
   rootState = state
   nextState = nextStateParam
 
+  // a layout that renders anything other than its <Slot /> leaves the navigator
+  // below it unmounted, and react-navigation then publishes a state truncated at
+  // that layout. the URL is unchanged, so route info must not move: serializing
+  // the truncation reports `/` for `/project/x/main`, and a layout whose gate
+  // reads the pathname then flips on its own report, forever.
+  if (isStateAwaitingNavigatorMount(state, routeNode)) {
+    if (process.env.ONE_DEBUG_ROUTER) {
+      console.info(`[one] 🧭 keeping ${routeInfo?.pathname}: a navigator has not mounted`)
+    }
+    return
+  }
+
   const nextRouteInfo = getRouteInfo(state)
   if (pendingNavigationPathname === nextRouteInfo.pathname) {
     pendingNavigationPathname = undefined

package/src/views/RootErrorBoundary.web.tsx

@@ -40,20 +40,25 @@ export class RootErrorBoundary extends React.Component<
       }
     }
 
-    window.dispatchEvent(
-      new CustomEvent('one-error', {
-        detail: {
-          error: {
-            message: error.message,
-            stack: error.stack,
-            name: error.name,
+    // this boundary also runs during SSR of a web build, where `window` doesn't
+    // exist. dispatching unconditionally threw here and replaced the render
+    // error above with `window is not defined`.
+    if (typeof window !== 'undefined') {
+      window.dispatchEvent(
+        new CustomEvent('one-error', {
+          detail: {
+            error: {
+              message: error.message,
+              stack: error.stack,
+              name: error.name,
+            },
+            componentStack: info.componentStack,
+            timestamp: Date.now(),
+            type: 'render',
           },
-          componentStack: info.componentStack,
-          timestamp: Date.now(),
-          type: 'render',
-        },
-      })
-    )
+        })
+      )
+    }
   }
 
   handleRetry = () => {

package/types/fork/useLinking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAML,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAE9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAmB9B,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAkG7D;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,eAO7C,CAAA;AAID,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;AAE5C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,EAClE,EACE,OAAc,EACd,MAAM,EACN,gBAA0C,EAC1C,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;2BAe5D,WAAW,CAAC,WAAW,GAAG,SAAS,CAAC;EA4mB9C"}
+{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAML,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAE9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAqB9B,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAkG7D;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,eAO7C,CAAA;AAID,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;AAE5C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,EAClE,EACE,OAAc,EACd,MAAM,EACN,gBAA0C,EAC1C,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;2BAe5D,WAAW,CAAC,WAAW,GAAG,SAAS,CAAC;EA2mB9C"}

package/types/layouts/Drawer.d.ts

@@ -5,42 +5,42 @@ export declare const Drawer: React.ForwardRefExoticComponent<Omit<Omit<Omit<impo
     children: React.ReactNode;
     layout?: ((props: {
         state: DrawerNavigationState<ParamListBase>;
-        navigation: import("@react-navigation/native").NavigationHelpers<ParamListBase, {}>;
-        descriptors: Record<string, import("@react-navigation/native").Descriptor<DrawerNavigationOptions, import("@react-navigation/native").NavigationProp<ParamListBase, string, string | undefined, DrawerNavigationState<ParamListBase>, DrawerNavigationOptions, DrawerNavigationEventMap>, import("@react-navigation/native").RouteProp<ParamListBase, string>>>;
+        navigation: import("@react-navigation/core").NavigationHelpers<ParamListBase, {}>;
+        descriptors: Record<string, import("@react-navigation/core").Descriptor<DrawerNavigationOptions, import("@react-navigation/core").NavigationProp<ParamListBase, string, string | undefined, DrawerNavigationState<ParamListBase>, DrawerNavigationOptions, DrawerNavigationEventMap>, import("@react-navigation/core").RouteProp<ParamListBase, string>>>;
         children: React.ReactNode;
     }) => React.ReactElement) | undefined;
     screenListeners?: Partial<{
-        drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "drawerItemPress", true>;
-        transitionStart: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionStart", unknown>;
-        transitionEnd: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionEnd", unknown>;
-        gestureStart: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureStart", unknown>;
-        gestureEnd: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureEnd", unknown>;
-        gestureCancel: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureCancel", unknown>;
-        focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "focus", unknown>;
-        blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "blur", unknown>;
-        state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "state", unknown>;
-        beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "beforeRemove", true>;
+        drawerItemPress: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "drawerItemPress", true>;
+        transitionStart: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionStart", unknown>;
+        transitionEnd: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionEnd", unknown>;
+        gestureStart: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureStart", unknown>;
+        gestureEnd: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureEnd", unknown>;
+        gestureCancel: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureCancel", unknown>;
+        focus: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "focus", unknown>;
+        blur: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "blur", unknown>;
+        state: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "state", unknown>;
+        beforeRemove: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "beforeRemove", true>;
     }> | ((props: {
-        route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
+        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
         navigation: import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, string | undefined>;
     }) => Partial<{
-        drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "drawerItemPress", true>;
-        transitionStart: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionStart", unknown>;
-        transitionEnd: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionEnd", unknown>;
-        gestureStart: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureStart", unknown>;
-        gestureEnd: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureEnd", unknown>;
-        gestureCancel: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureCancel", unknown>;
-        focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "focus", unknown>;
-        blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "blur", unknown>;
-        state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "state", unknown>;
-        beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "beforeRemove", true>;
+        drawerItemPress: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "drawerItemPress", true>;
+        transitionStart: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionStart", unknown>;
+        transitionEnd: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionEnd", unknown>;
+        gestureStart: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureStart", unknown>;
+        gestureEnd: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureEnd", unknown>;
+        gestureCancel: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureCancel", unknown>;
+        focus: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "focus", unknown>;
+        blur: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "blur", unknown>;
+        state: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "state", unknown>;
+        beforeRemove: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "beforeRemove", true>;
     }>) | undefined;
     screenOptions?: DrawerNavigationOptions | ((props: {
-        route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
+        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
         navigation: import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, string | undefined>;
         theme: ReactNavigation.Theme;
     }) => DrawerNavigationOptions) | undefined;
-    screenLayout?: ((props: import("@react-navigation/native").ScreenLayoutArgs<ParamListBase, string, DrawerNavigationOptions, import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, string | undefined>>) => React.ReactElement) | undefined;
+    screenLayout?: ((props: import("@react-navigation/core").ScreenLayoutArgs<ParamListBase, string, DrawerNavigationOptions, import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, string | undefined>>) => React.ReactElement) | undefined;
     UNSTABLE_router?: (<Action extends Readonly<{
         type: string;
         payload?: object;
@@ -56,42 +56,42 @@ export declare const Drawer: React.ForwardRefExoticComponent<Omit<Omit<Omit<impo
     children: React.ReactNode;
     layout?: ((props: {
         state: DrawerNavigationState<ParamListBase>;
-        navigation: import("@react-navigation/native").NavigationHelpers<ParamListBase, {}>;
-        descriptors: Record<string, import("@react-navigation/native").Descriptor<DrawerNavigationOptions, import("@react-navigation/native").NavigationProp<ParamListBase, string, string | undefined, DrawerNavigationState<ParamListBase>, DrawerNavigationOptions, DrawerNavigationEventMap>, import("@react-navigation/native").RouteProp<ParamListBase, string>>>;
+        navigation: import("@react-navigation/core").NavigationHelpers<ParamListBase, {}>;
+        descriptors: Record<string, import("@react-navigation/core").Descriptor<DrawerNavigationOptions, import("@react-navigation/core").NavigationProp<ParamListBase, string, string | undefined, DrawerNavigationState<ParamListBase>, DrawerNavigationOptions, DrawerNavigationEventMap>, import("@react-navigation/core").RouteProp<ParamListBase, string>>>;
         children: React.ReactNode;
     }) => React.ReactElement) | undefined;
     screenListeners?: Partial<{
-        drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "drawerItemPress", true>;
-        transitionStart: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionStart", unknown>;
-        transitionEnd: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionEnd", unknown>;
-        gestureStart: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureStart", unknown>;
-        gestureEnd: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureEnd", unknown>;
-        gestureCancel: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureCancel", unknown>;
-        focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "focus", unknown>;
-        blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "blur", unknown>;
-        state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "state", unknown>;
-        beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "beforeRemove", true>;
+        drawerItemPress: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "drawerItemPress", true>;
+        transitionStart: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionStart", unknown>;
+        transitionEnd: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionEnd", unknown>;
+        gestureStart: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureStart", unknown>;
+        gestureEnd: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureEnd", unknown>;
+        gestureCancel: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureCancel", unknown>;
+        focus: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "focus", unknown>;
+        blur: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "blur", unknown>;
+        state: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "state", unknown>;
+        beforeRemove: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "beforeRemove", true>;
     }> | ((props: {
-        route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
+        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
         navigation: import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, string | undefined>;
     }) => Partial<{
-        drawerItemPress: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "drawerItemPress", true>;
-        transitionStart: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionStart", unknown>;
-        transitionEnd: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionEnd", unknown>;
-        gestureStart: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureStart", unknown>;
-        gestureEnd: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureEnd", unknown>;
-        gestureCancel: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureCancel", unknown>;
-        focus: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "focus", unknown>;
-        blur: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "blur", unknown>;
-        state: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "state", unknown>;
-        beforeRemove: import("@react-navigation/native").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/native").EventMapCore<DrawerNavigationState<ParamListBase>>, "beforeRemove", true>;
+        drawerItemPress: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "drawerItemPress", true>;
+        transitionStart: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionStart", unknown>;
+        transitionEnd: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "transitionEnd", unknown>;
+        gestureStart: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureStart", unknown>;
+        gestureEnd: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureEnd", unknown>;
+        gestureCancel: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "gestureCancel", unknown>;
+        focus: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "focus", unknown>;
+        blur: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "blur", unknown>;
+        state: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "state", unknown>;
+        beforeRemove: import("@react-navigation/core").EventListenerCallback<DrawerNavigationEventMap & import("@react-navigation/core").EventMapCore<DrawerNavigationState<ParamListBase>>, "beforeRemove", true>;
     }>) | undefined;
     screenOptions?: DrawerNavigationOptions | ((props: {
-        route: import("@react-navigation/native").RouteProp<ParamListBase, string>;
+        route: import("@react-navigation/core").RouteProp<ParamListBase, string>;
         navigation: import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, string | undefined>;
         theme: ReactNavigation.Theme;
     }) => DrawerNavigationOptions) | undefined;
-    screenLayout?: ((props: import("@react-navigation/native").ScreenLayoutArgs<ParamListBase, string, DrawerNavigationOptions, import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, string | undefined>>) => React.ReactElement) | undefined;
+    screenLayout?: ((props: import("@react-navigation/core").ScreenLayoutArgs<ParamListBase, string, DrawerNavigationOptions, import("@react-navigation/drawer").DrawerNavigationProp<ParamListBase, string, string | undefined>>) => React.ReactElement) | undefined;
     UNSTABLE_router?: (<Action extends Readonly<{
         type: string;
         payload?: object;