one 1.1.371 → 1.1.373

package/package.json

@@ -1,35 +1,12 @@
 {
   "name": "one",
-  "version": "1.1.371",
-  "source": "src/index.ts",
-  "types": "./types/index.d.ts",
+  "version": "1.1.373",
+  "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
     "setup.js"
   ],
   "type": "module",
-  "license": "BSD-3-Clause",
-  "main": "dist/cjs",
-  "module": "dist/esm",
-  "bin": "run.mjs",
-  "files": [
-    "src",
-    "types",
-    "dist",
-    "vendor",
-    "LICENSE"
-  ],
-  "scripts": {
-    "build": "tamagui-build",
-    "watch": "tamagui-build --watch",
-    "check": "yarn depcheck",
-    "lint:fix": "../../node_modules/.bin/biome check --apply-unsafe src",
-    "clean": "tamagui-build clean",
-    "clean:build": "tamagui-build clean:build",
-    "test:dev": "TEST_ONLY=dev yarn test",
-    "test": "vitest --run --pool=forks",
-    "test:watch": "vitest --watch"
-  },
   "exports": {
     "./package.json": "./package.json",
     ".": {
@@ -94,6 +71,29 @@
       "import": "./vendor/react-dom/cjs/react-dom.development.js"
     }
   },
+  "main": "dist/cjs",
+  "module": "dist/esm",
+  "source": "src/index.ts",
+  "types": "./types/index.d.ts",
+  "bin": "run.mjs",
+  "files": [
+    "src",
+    "types",
+    "dist",
+    "vendor",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "tamagui-build",
+    "check": "yarn depcheck",
+    "clean": "tamagui-build clean",
+    "clean:build": "tamagui-build clean:build",
+    "lint:fix": "../../node_modules/.bin/biome check --apply-unsafe src",
+    "test": "vitest --run --pool=forks",
+    "test:dev": "TEST_ONLY=dev yarn test",
+    "test:watch": "vitest --watch",
+    "watch": "tamagui-build --watch"
+  },
   "dependencies": {
     "@azure/core-asynciterator-polyfill": "^1.0.2",
     "@babel/core": "^7.26.0",
@@ -103,27 +103,27 @@
     "@babel/traverse": "^7.26.4",
     "@radix-ui/react-slot": "^1.0.2",
     "@react-native-masked-view/masked-view": "^0.3.1",
-    "@react-navigation/bottom-tabs": "~6.5.8",
-    "@react-navigation/core": "6.4.17",
-    "@react-navigation/drawer": "~6.6.3",
-    "@react-navigation/elements": "^1.3.30",
-    "@react-navigation/native": "~6.1.7",
-    "@react-navigation/native-stack": "~6.9.13",
-    "@react-navigation/routers": "~6.1.9",
+    "@react-navigation/bottom-tabs": "~7",
+    "@react-navigation/core": "~7",
+    "@react-navigation/drawer": "~7",
+    "@react-navigation/elements": "~2",
+    "@react-navigation/native": "~7",
+    "@react-navigation/native-stack": "~7",
+    "@react-navigation/routers": "~7",
     "@swc/core": "^1.7.14",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/resolve": "1.1.371",
-    "@vxrn/tslib-lite": "1.1.371",
-    "@vxrn/universal-color-scheme": "1.1.371",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.371",
+    "@vxrn/resolve": "1.1.373",
+    "@vxrn/tslib-lite": "1.1.373",
+    "@vxrn/universal-color-scheme": "1.1.373",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.373",
     "babel-dead-code-elimination": "^1.0.6",
     "babel-plugin-react-compiler": "^19.0.0-beta-201e55d-20241215",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.371",
+    "create-vxrn": "1.1.373",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
-    "expo-modules-core": "^1.12.24",
+    "expo-modules-core": "2.1.2",
     "fast-deep-equal": "^3.1.3",
     "fast-glob": "^3.2.11",
     "fs-extra": "^11.2.0",
@@ -137,33 +137,33 @@
     "react-compiler-runtime": "^19.0.0-beta-201e55d-20241215",
     "react-dom": "^18.3.1",
     "react-native-gesture-handler": "^2.18.1",
-    "react-native-reanimated": "~3.10.1",
+    "react-native-reanimated": "~3.16.5",
     "react-native-safe-area-context": "4.10.5",
-    "react-native-screens": "3.31.1",
-    "react-scan": "0.0.36-native",
+    "react-native-screens": "4.4.0-rc.1",
+    "react-scan": "^0.0.54",
     "rollup-plugin-node-externals": "^7.1.2",
     "url-parse": "^1.5.10",
-    "vite": "^6.0.5",
+    "vite": "^6.0.6",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.371",
+    "vxrn": "1.1.373",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },
-  "peerDependencies": {
-    "react-native": "*"
-  },
   "devDependencies": {
-    "@tamagui/build": "^1.120.2",
+    "@tamagui/build": "^1.121.2",
     "@types/node": "^22.1.0",
     "@types/react-dom": "^18.2.25",
     "@types/url-parse": "^1.4.11",
     "@types/xxhashjs": "^0.2.4",
     "depcheck": "^1.4.7",
     "get-port": "^7.1.0",
-    "react-native": "0.74.5",
+    "react-native": "0.76.4",
     "rollup": "^4.29.1",
     "vitest": "^2.1.8"
   },
+  "peerDependencies": {
+    "react-native": "*"
+  },
   "publishConfig": {
     "access": "public"
   }

package/src/cli/runAndroid.ts

@@ -1,5 +1,3 @@
-import { loadUserOneOptions } from '../vite/one'
-
 export async function run(args: {}) {
   const { runAndroid } = await import('vxrn')
 

package/src/cli/runIos.ts

@@ -1,4 +1,4 @@
-import { loadUserOneOptions } from '../vite/one'
+import { loadUserOneOptions } from '../vite/loadConfig'
 
 export async function run(args: {}) {
   const { runIos } = await import('vxrn')

package/src/createApp.native.tsx

@@ -2,7 +2,7 @@ import { AppRegistry, LogBox } from 'react-native' // This should be the first i
 import './polyfills-mobile'
 import './setup'
 import { Root } from './Root'
-import { ReactScan } from 'react-scan/native'
+// import { ReactScan } from 'react-scan/native'
 
 export type CreateAppProps = { routes: Record<string, () => Promise<unknown>> }
 
@@ -13,12 +13,12 @@ export function createApp(options: CreateAppProps): void {
   const App = () => {
     let contents = <Root isClient routes={options.routes} path="/" />
 
-    if (process.env.ONE_ENABLE_REACT_SCAN) {
-      console.warn(`React Scan enabled with options: ${process.env.ONE_ENABLE_REACT_SCAN}`)
-      contents = (
-        <ReactScan options={JSON.parse(process.env.ONE_ENABLE_REACT_SCAN)}>{contents}</ReactScan>
-      )
-    }
+    // if (process.env.ONE_ENABLE_REACT_SCAN) {
+    //   console.warn(`React Scan enabled with options: ${process.env.ONE_ENABLE_REACT_SCAN}`)
+    //   contents = (
+    //     <ReactScan options={JSON.parse(process.env.ONE_ENABLE_REACT_SCAN)}>{contents}</ReactScan>
+    //   )
+    // }
 
     return contents
   }

package/src/fork/NavigationContainer.tsx

@@ -1,38 +1,40 @@
-// Forked from React Navigation in order to use a custom `useLinking` function.
-// https://github.com/react-navigation/react-navigation/blob/6.x/packages/native/src/NavigationContainer.tsx
+// Forked from React Navigation
+
 import {
   BaseNavigationContainer,
-  getActionFromState,
-  getPathFromState,
-  getStateFromPath,
-  type NavigationContainerProps,
-  type NavigationContainerRef,
-  type ParamListBase,
-  validatePathConfig,
-} from '@react-navigation/core'
-import {
   DefaultTheme,
-  ThemeProvider,
   type DocumentTitleOptions,
-  type LinkingOptions,
   LinkingContext,
+  type LinkingOptions,
+  LocaleDirContext,
+  type LocaleDirection,
+  type NavigationContainerProps,
+  type NavigationContainerRef,
+  type ParamListBase,
   type Theme,
+  ThemeProvider,
+  getActionFromState,
+  getPathFromState,
+  getStateFromPath,
+  validatePathConfig,
 } from '@react-navigation/native'
-// import useBackButton from '@react-navigation/native/src/useBackButton'
-// import useDocumentTitle from '@react-navigation/native/src/useDocumentTitle'
-// import useThenable from '@react-navigation/native/src/useThenable'
 import * as React from 'react'
 
 import useLinking from './useLinking'
+import { I18nManager } from 'react-native'
+import { useBackButton } from './useBackButton'
+import { useDocumentTitle } from './useDocumentTitle'
+import { useThenable } from './useThenable'
 
-global.REACT_NAVIGATION_DEVTOOLS = new WeakMap()
+globalThis.REACT_NAVIGATION_DEVTOOLS = new WeakMap()
 
 type Props<ParamList extends object> = NavigationContainerProps & {
-  theme?: Theme
-  linking?: LinkingOptions<ParamList>
-  fallback?: React.ReactNode
+  direction?: LocaleDirection
   documentTitle?: DocumentTitleOptions
+  fallback?: React.ReactNode
+  linking?: LinkingOptions<ParamList>
   onReady?: () => void
+  theme?: Theme
 }
 
 /**
@@ -51,6 +53,7 @@ type Props<ParamList extends object> = NavigationContainerProps & {
  */
 function NavigationContainerInner(
   {
+    direction = I18nManager.getConstants().isRTL ? 'rtl' : 'ltr',
     theme = DefaultTheme,
     linking,
     fallback = null,
@@ -68,11 +71,10 @@ function NavigationContainerInner(
 
   const refContainer = React.useRef<NavigationContainerRef<ParamListBase>>(null)
 
-  // useBackButton(refContainer)
-  // useDocumentTitle(refContainer, documentTitle)
+  useBackButton(refContainer)
+  useDocumentTitle(refContainer, documentTitle)
 
   const { getInitialState } = useLinking(refContainer, {
-    independent: rest.independent,
     enabled: isLinkingEnabled,
     prefixes: [],
     ...linking,
@@ -97,19 +99,7 @@ function NavigationContainerInner(
     }
   })
 
-  if (cache.val === 0) {
-    cache.promise = new Promise<void>((res) => {
-      getInitialState().then((val) => {
-        cache.val = val
-        cache.done = true
-        res()
-      })
-    })
-  }
-  if (!cache.done) {
-    throw cache.promise
-  }
-  const initialState = cache.val!
+  const [isResolved, initialState] = useThenable(getInitialState)
 
   React.useImperativeHandle(ref, () => refContainer.current)
 
@@ -119,16 +109,23 @@ function NavigationContainerInner(
     onReady?.()
   }, [onReady])
 
+  if (!isResolved) {
+    return <ThemeProvider value={theme}>{fallback}</ThemeProvider>
+  }
+
   return (
-    <LinkingContext.Provider value={linkingContext}>
-      <ThemeProvider value={theme}>
-        <BaseNavigationContainer
-          {...rest}
-          initialState={rest.initialState == null ? initialState : rest.initialState}
-          ref={refContainer}
-        />
-      </ThemeProvider>
-    </LinkingContext.Provider>
+    <LocaleDirContext.Provider value={direction}>
+      <LinkingContext.Provider value={linkingContext}>
+        <ThemeProvider value={theme}>
+          <BaseNavigationContainer
+            {...rest}
+            theme={theme}
+            ref={refContainer}
+            initialState={initialState ?? rest.initialState}
+          />
+        </ThemeProvider>
+      </LinkingContext.Provider>
+    </LocaleDirContext.Provider>
   )
 }
 

package/src/fork/getPathFromState.ts

@@ -217,7 +217,8 @@ function walkConfigItems(
 ) {
   // NOTE: Fill in current route using state that was passed as params.
   if (!route.state && isInvalidParams(route.params)) {
-    route.state = createFakeState(route.params)
+    // FIXME: This is a hack to make things work since the `route` object is immutable on react-navigation v7 (`TypeError: Cannot add property state, object is not extensible`), and seems that things are working. But we might want to do a proper migration for these forked code.
+    // route.state = createFakeState(route.params)
   }
 
   let pattern: string | null = null
@@ -264,7 +265,8 @@ function walkConfigItems(
     }
 
     if (!route.state && isInvalidParams(route.params)) {
-      route.state = createFakeState(route.params)
+      // FIXME: This is a hack to make things work since the `route` object is immutable on react-navigation v7, and seems that things are working. But we might want to do a proper migration for these forked code.
+      // route.state = createFakeState(route.params)
     }
 
     // If there is no `screens` property or no nested state, we return pattern
@@ -327,7 +329,10 @@ function walkConfigItems(
         routeName: route.name,
       })
     }
-    Object.assign(focusedParams, collectedParams)
+    focusedParams = {
+      ...focusedParams,
+      ...collectedParams,
+    }
   }
 
   return {
@@ -362,7 +367,8 @@ function getPathFromResolvedState(
     // NOTE: Fill in current route using state that was passed as params.
     // if (isInvalidParams(route.params)) {
     if (!route.state && isInvalidParams(route.params)) {
-      route.state = createFakeState(route.params)
+      // FIXME: This is a hack to make things work since the `route` object is immutable on react-navigation v7, and seems that things are working. But we might want to do a proper migration for these forked code.
+      // route.state = createFakeState(route.params)
     }
 
     const {

package/src/fork/useBackButton.native.tsx

@@ -0,0 +1,20 @@
+// No change just vendored to avoid import issue with RR7
+
+import * as React from 'react'
+import { BackHandler } from 'react-native'
+export function useBackButton(ref) {
+  React.useEffect(() => {
+    const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
+      const navigation = ref.current
+      if (navigation == null) {
+        return false
+      }
+      if (navigation.canGoBack()) {
+        navigation.goBack()
+        return true
+      }
+      return false
+    })
+    return () => subscription.remove()
+  }, [ref])
+}

package/src/fork/useBackButton.tsx

@@ -0,0 +1,5 @@
+// No change just vendored to avoid import issue with RR7
+
+import type { NavigationContainerRef, ParamListBase } from '@react-navigation/core'
+
+export function useBackButton(_: React.RefObject<NavigationContainerRef<ParamListBase>>) {}

package/src/fork/useDocumentTitle.native.tsx

@@ -0,0 +1,6 @@
+// No change just vendored to avoid import issue with RR7
+
+/**
+ * Set the document title for the active screen
+ */
+export function useDocumentTitle(ref) {}

package/src/fork/useDocumentTitle.tsx

@@ -0,0 +1,40 @@
+// No change just vendored to avoid import issue with RR7
+
+import type { NavigationContainerRef, ParamListBase, Route } from '@react-navigation/core'
+import * as React from 'react'
+
+type DocumentTitleOptions = {
+  enabled?: boolean
+  formatter?: (options: Record<string, any> | undefined, route: Route<string> | undefined) => string
+}
+
+/**
+ * Set the document title for the active screen
+ */
+export function useDocumentTitle(
+  ref: React.RefObject<NavigationContainerRef<ParamListBase>>,
+  {
+    enabled = true,
+    formatter = (options, route) => options?.title ?? route?.name,
+  }: DocumentTitleOptions = {}
+) {
+  React.useEffect(() => {
+    if (!enabled) {
+      return
+    }
+
+    const navigation = ref.current
+
+    if (navigation) {
+      const title = formatter(navigation.getCurrentOptions(), navigation.getCurrentRoute())
+
+      document.title = title
+    }
+
+    return navigation?.addListener('options', (e) => {
+      const title = formatter(e.data.options, navigation?.getCurrentRoute())
+
+      document.title = title
+    })
+  })
+}

package/src/fork/useLinking.native.ts

@@ -7,6 +7,7 @@ import {
   type ParamListBase,
   getActionFromState as getActionFromStateDefault,
   getStateFromPath as getStateFromPathDefault,
+  useNavigationIndependentTree,
 } from '@react-navigation/core'
 import type { LinkingOptions } from '@react-navigation/native'
 import * as React from 'react'
@@ -51,55 +52,52 @@ export default function useLinking(
     getActionFromState = getActionFromStateDefault,
   }: Options
 ) {
-  //   const independent = useNavigationIndependentTree();
+  const independent = useNavigationIndependentTree()
 
-  React.useEffect(
-    () => {
-      if (process.env.NODE_ENV === 'production') {
-        return undefined
-      }
+  React.useEffect(() => {
+    if (process.env.NODE_ENV === 'production') {
+      return undefined
+    }
 
-      // if (independent) {
-      //   return undefined;
-      // }
-
-      if (
-        // enabled !== false &&
-        linkingHandlers.length
-      ) {
-        console.error(
-          [
-            'Looks like you have configured linking in multiple places. This is likely an error since deep links should only be handled in one place to avoid conflicts. Make sure that:',
-            "- You don't have multiple NavigationContainers in the app each with 'linking' enabled",
-            '- Only a single instance of the root component is rendered',
-            Platform.OS === 'android'
-              ? "- You have set 'android:launchMode=singleTask' in the '<activity />' section of the 'AndroidManifest.xml' file to avoid launching multiple instances"
-              : '',
-          ]
-            .join('\n')
-            .trim()
-        )
-      }
+    if (independent) {
+      return
+    }
 
-      const handler = Symbol()
+    if (
+      // enabled !== false &&
+      linkingHandlers.length
+    ) {
+      console.error(
+        [
+          'Looks like you have configured linking in multiple places. This is likely an error since deep links should only be handled in one place to avoid conflicts. Make sure that:',
+          "- You don't have multiple NavigationContainers in the app each with 'linking' enabled",
+          '- Only a single instance of the root component is rendered',
+          Platform.OS === 'android'
+            ? "- You have set 'android:launchMode=singleTask' in the '<activity />' section of the 'AndroidManifest.xml' file to avoid launching multiple instances"
+            : '',
+        ]
+          .join('\n')
+          .trim()
+      )
+    }
 
-      // if (enabled !== false) {
-      linkingHandlers.push(handler)
-      // }
+    const handler = Symbol()
 
-      return () => {
-        const index = linkingHandlers.indexOf(handler)
+    // if (enabled !== false) {
+    linkingHandlers.push(handler)
+    // }
 
-        if (index > -1) {
-          linkingHandlers.splice(index, 1)
-        }
+    return () => {
+      const index = linkingHandlers.indexOf(handler)
+
+      if (index > -1) {
+        linkingHandlers.splice(index, 1)
       }
-    },
-    [
-      // enabled,
-      // independent
-    ]
-  )
+    }
+  }, [
+    // enabled,
+    independent,
+  ])
 
   // We store these options in ref to avoid re-creating getInitialState and re-subscribing listeners
   // This lets user avoid wrapping the items in `React.useCallback` or `React.useMemo`

package/src/fork/useLinking.ts

@@ -7,6 +7,7 @@ import {
   getActionFromState as getActionFromStateDefault,
   getPathFromState as getPathFromStateDefault,
   getStateFromPath as getStateFromPathDefault,
+  useNavigationIndependentTree,
   type NavigationContainerRef,
   type NavigationState,
   type ParamListBase,
@@ -88,14 +89,11 @@ export const series = (cb: () => Promise<void>) => {
 
 let linkingHandlers: Symbol[] = []
 
-type Options = LinkingOptions<ParamListBase> & {
-  independent?: boolean
-}
+type Options = LinkingOptions<ParamListBase>
 
 export default function useLinking(
   ref: React.RefObject<NavigationContainerRef<ParamListBase>>,
   {
-    independent,
     enabled = true,
     config,
     getStateFromPath = getStateFromPathDefault,
@@ -103,6 +101,8 @@ export default function useLinking(
     getActionFromState = getActionFromStateDefault,
   }: Options
 ) {
+  const independent = useNavigationIndependentTree()
+
   React.useEffect(() => {
     if (process.env.NODE_ENV === 'production') {
       return undefined

package/src/fork/useThenable.tsx

@@ -0,0 +1,43 @@
+// No change just vendored to avoid import issue with RR7
+import * as React from 'react'
+
+export function useThenable<T>(create: () => PromiseLike<T>) {
+  const [promise] = React.useState(create)
+
+  let initialState: [boolean, T | undefined] = [false, undefined]
+
+  // Check if our thenable is synchronous
+  // eslint-disable-next-line promise/catch-or-return, promise/always-return
+  promise.then((result) => {
+    initialState = [true, result]
+  })
+
+  const [state, setState] = React.useState(initialState)
+  const [resolved] = state
+
+  React.useEffect(() => {
+    let cancelled = false
+
+    const resolve = async () => {
+      let result
+
+      try {
+        result = await promise
+      } finally {
+        if (!cancelled) {
+          setState([true, result])
+        }
+      }
+    }
+
+    if (!resolved) {
+      resolve()
+    }
+
+    return () => {
+      cancelled = true
+    }
+  }, [promise, resolved])
+
+  return state
+}

package/src/interfaces/router.ts

@@ -4,7 +4,7 @@ import type {
   PartialState,
 } from '@react-navigation/core'
 import type { ReactNode } from 'react'
-import type { TextProps, GestureResponderEvent } from 'react-native'
+import type { TextProps, GestureResponderEvent, PressableProps } from 'react-native'
 
 export namespace OneRouter {
   export interface __routes<T extends string = string> extends Record<string, unknown> {}
@@ -305,7 +305,8 @@ export namespace OneRouter {
   }
 
   export interface LinkProps<T extends string | object>
-    extends Omit<TextProps, 'href'>,
+    extends Omit<TextProps, 'href' | 'disabled' | 'onLongPress' | 'onPressIn' | 'onPressOut'>,
+      Pick<PressableProps, 'disabled' | 'onLongPress' | 'onPressIn' | 'onPressOut'>,
       WebAnchorProps {
     /** Path to route to. */
     href: Href<T>

package/src/layouts/Drawer.tsx

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