one 1.1.387 → 1.1.389

package/dist/esm/vite/plugins/fixDependenciesPlugin.mjs

@@ -17,7 +17,7 @@ function fixDependenciesPlugin(options) {
       !hasApplied && patches.length && (hasApplied = !0, await applyOptimizePatches(patches, config));
     },
     async configResolved(config) {
-      patches.length && (await applyDependencyPatches(patches, config));
+      !hasApplied && patches.length && (hasApplied = !0, await applyDependencyPatches(patches, config));
     }
   };
 }

package/dist/esm/vite/plugins/fixDependenciesPlugin.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["applyDependencyPatches","applyOptimizePatches","hasApplied","fixDependenciesPlugin","options","patches","key","value","push","module","patchFiles","optimize","name","config","length","configResolved"],"sources":["../../../../src/vite/plugins/fixDependenciesPlugin.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,sBAAA,EAAwBC,oBAAA,QAA2C;AAI5E,IAAIC,UAAA,GAAa;AAEV,SAASC,sBAAsBC,OAAA,EAAuC;EAC3E,MAAMC,OAAA,GAAsB,EAAC;EAC7B,WAAWC,GAAA,IAAOF,OAAA,EAAS;IACzB,MAAMG,KAAA,GAAQH,OAAA,CAAQE,GAAG;IACzBD,OAAA,CAAQG,IAAA,CAAK;MACXC,MAAA,EAAQH,GAAA;MACRI,UAAA,EACEH,KAAA,IAAS,OAAOA,KAAA,IAAU,WACtBA,KAAA,GACA;QACEI,QAAA,EAAUJ;MACZ;IACR,CAAC;EACH;EAEA,OAAO;IACLK,IAAA,EAAM;IAEN,MAAMC,OAAOA,MAAA,EAAQ;MACf,CAACX,UAAA,IAAcG,OAAA,CAAQS,MAAA,KACzBZ,UAAA,GAAa,IACb,MAAMD,oBAAA,CAAqBI,OAAA,EAASQ,MAAM;IAE9C;IAEA,MAAME,eAAeF,MAAA,EAAQ;MACvBR,OAAA,CAAQS,MAAA,KACV,MAAMd,sBAAA,CAAuBK,OAAA,EAASQ,MAAM;IAEhD;EACF;AACF","ignoreList":[]}
+{"version":3,"names":["applyDependencyPatches","applyOptimizePatches","hasApplied","fixDependenciesPlugin","options","patches","key","value","push","module","patchFiles","optimize","name","config","length","configResolved"],"sources":["../../../../src/vite/plugins/fixDependenciesPlugin.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,sBAAA,EAAwBC,oBAAA,QAA2C;AAI5E,IAAIC,UAAA,GAAa;AAEV,SAASC,sBAAsBC,OAAA,EAAuC;EAC3E,MAAMC,OAAA,GAAsB,EAAC;EAC7B,WAAWC,GAAA,IAAOF,OAAA,EAAS;IACzB,MAAMG,KAAA,GAAQH,OAAA,CAAQE,GAAG;IACzBD,OAAA,CAAQG,IAAA,CAAK;MACXC,MAAA,EAAQH,GAAA;MACRI,UAAA,EACEH,KAAA,IAAS,OAAOA,KAAA,IAAU,WACtBA,KAAA,GACA;QACEI,QAAA,EAAUJ;MACZ;IACR,CAAC;EACH;EAEA,OAAO;IACLK,IAAA,EAAM;IAEN,MAAMC,OAAOA,MAAA,EAAQ;MACf,CAACX,UAAA,IAAcG,OAAA,CAAQS,MAAA,KACzBZ,UAAA,GAAa,IACb,MAAMD,oBAAA,CAAqBI,OAAA,EAASQ,MAAM;IAE9C;IAEA,MAAME,eAAeF,MAAA,EAAQ;MACvB,CAACX,UAAA,IAAcG,OAAA,CAAQS,MAAA,KACzBZ,UAAA,GAAa,IACb,MAAMF,sBAAA,CAAuBK,OAAA,EAASQ,MAAM;IAEhD;EACF;AACF","ignoreList":[]}

package/dist/esm/vite/plugins/fixDependenciesPlugin.native.js

@@ -17,7 +17,7 @@ function fixDependenciesPlugin(options) {
       !hasApplied && patches.length && (hasApplied = !0, await applyOptimizePatches(patches, config));
     },
     async configResolved(config) {
-      patches.length && await applyDependencyPatches(patches, config);
+      !hasApplied && patches.length && (hasApplied = !0, await applyDependencyPatches(patches, config));
     }
   };
 }

package/dist/esm/vite/plugins/fixDependenciesPlugin.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../src/vite/plugins/Users/n8/one/packages/one/src/vite/plugins/fixDependenciesPlugin.ts"],
-  "mappings": "AACA,SAASA,wBAAwBC,4BAA2C;AAI5E,IAAIC,aAAa;AAEV,SAASC,sBAAsBC,SAA6B;AACjE,MAAMC,UAAsB,CAAA;AAC5B,WAAWC,OAAOF,SAAS;AACzB,QAAMG,QAAQH,QAAQE,GAAAA;AACtBD,YAAQG,KAAK;MACXC,QAAQH;MACRI,YACEH,SAAS,OAAOA,SAAU,WACtBA,QACA;QACEI,UAAUJ;MACZ;IACR,CAAA;EACF;AAEA,SAAO;IACLK,MAAM;IAEN,MAAMC,OAAOA,QAAM;AACjB,MAAI,CAACX,cAAcG,QAAQS,WACzBZ,aAAa,IACb,MAAMD,qBAAqBI,SAASQ,MAAAA;IAExC;IAEA,MAAME,eAAeF,QAAM;AACzB,MAAIR,QAAQS,UACV,MAAMd,uBAAuBK,SAASQ,MAAAA;IAE1C;EACF;AACF;",
+  "mappings": "AACA,SAASA,wBAAwBC,4BAA2C;AAI5E,IAAIC,aAAa;AAEV,SAASC,sBAAsBC,SAA6B;AACjE,MAAMC,UAAsB,CAAA;AAC5B,WAAWC,OAAOF,SAAS;AACzB,QAAMG,QAAQH,QAAQE,GAAAA;AACtBD,YAAQG,KAAK;MACXC,QAAQH;MACRI,YACEH,SAAS,OAAOA,SAAU,WACtBA,QACA;QACEI,UAAUJ;MACZ;IACR,CAAA;EACF;AAEA,SAAO;IACLK,MAAM;IAEN,MAAMC,OAAOA,QAAM;AACjB,MAAI,CAACX,cAAcG,QAAQS,WACzBZ,aAAa,IACb,MAAMD,qBAAqBI,SAASQ,MAAAA;IAExC;IAEA,MAAME,eAAeF,QAAM;AACzB,MAAI,CAACX,cAAcG,QAAQS,WACzBZ,aAAa,IACb,MAAMF,uBAAuBK,SAASQ,MAAAA;IAE1C;EACF;AACF;",
   "names": ["applyDependencyPatches", "applyOptimizePatches", "hasApplied", "fixDependenciesPlugin", "options", "patches", "key", "value", "push", "module", "patchFiles", "optimize", "name", "config", "length", "configResolved"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.387",
+  "version": "1.1.389",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -113,15 +113,15 @@
     "@react-navigation/routers": "~7",
     "@swc/core": "^1.10.4",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/resolve": "1.1.387",
-    "@vxrn/tslib-lite": "1.1.387",
-    "@vxrn/universal-color-scheme": "1.1.387",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.387",
+    "@vxrn/resolve": "1.1.389",
+    "@vxrn/tslib-lite": "1.1.389",
+    "@vxrn/universal-color-scheme": "1.1.389",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.389",
     "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.387",
+    "create-vxrn": "1.1.389",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "2.1.2",
@@ -134,9 +134,9 @@
     "nanoid": "^3.3.7",
     "perfect-debounce": "^1.0.0",
     "picocolors": "^1.0.0",
-    "react": "^18.3.1",
+    "react": "^18.3.1 || ^19.0.0",
     "react-compiler-runtime": "^19.0.0-beta-201e55d-20241215",
-    "react-dom": "^18.3.1",
+    "react-dom": "^18.3.1 || ^19.0.0",
     "react-native-gesture-handler": "^2.18.1",
     "react-native-reanimated": "~3.16.5",
     "react-native-safe-area-context": "4.10.5",
@@ -147,7 +147,7 @@
     "vite": "^6.0.6",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.387",
+    "vxrn": "1.1.389",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/layouts/Tabs.tsx

@@ -16,6 +16,9 @@ const TabBar = ({ state, ...restProps }: BottomTabBarProps) => {
   /**
    * With React Navigation v7, spacial routes such as +not-found and _sitemap are being added to `state.routes`, but we don't want them to be shown in the tab bar.
    */
+
+  // TODO due to adding onlyMatching, we can remove this now i think (need to make sure)
+
   const filteredRoutes = state.routes.filter(
     (r) => r.name !== '+not-found' && !r.name.startsWith('_sitemap')
   )
@@ -43,40 +46,44 @@ export const Tabs = withLayoutContext<
   typeof BottomTabNavigator,
   TabNavigationState<ParamListBase>,
   BottomTabNavigationEventMap
->(BottomTabNavigator, (screens) => {
-  // Support the `href` shortcut prop.
-  return screens.map((screen) => {
-    if (typeof screen.options !== 'function' && screen.options?.href !== undefined) {
-      const { href, ...options } = screen.options
-      if (options.tabBarButton) {
-        throw new Error('Cannot use `href` and `tabBarButton` together.')
-      }
-      return {
-        ...screen,
-        options: {
-          ...options,
-          tabBarButton: (props) => {
-            if (href == null) {
-              return null
-            }
-            const children =
-              Platform.OS === 'web' ? props.children : <Pressable>{props.children}</Pressable>
-            return (
-              <Link
-                {...props}
-                style={[{ display: 'flex' }, props.style]}
-                href={href}
-                asChild={Platform.OS !== 'web'}
-                // biome-ignore lint/correctness/noChildrenProp: <explanation>
-                children={children}
-              />
-            )
+>(
+  BottomTabNavigator,
+  (screens) => {
+    // Support the `href` shortcut prop.
+    return screens.map((screen) => {
+      if (typeof screen.options !== 'function' && screen.options?.href !== undefined) {
+        const { href, ...options } = screen.options
+        if (options.tabBarButton) {
+          throw new Error('Cannot use `href` and `tabBarButton` together.')
+        }
+        return {
+          ...screen,
+          options: {
+            ...options,
+            tabBarButton: (props) => {
+              if (href == null) {
+                return null
+              }
+              const children =
+                Platform.OS === 'web' ? props.children : <Pressable>{props.children}</Pressable>
+              return (
+                <Link
+                  {...props}
+                  style={[{ display: 'flex' }, props.style]}
+                  href={href}
+                  asChild={Platform.OS !== 'web'}
+                  // biome-ignore lint/correctness/noChildrenProp: <explanation>
+                  children={children}
+                />
+              )
+            },
           },
-        },
+        }
       }
-    }
-    return screen
-  })
-}, { props: { tabBar: TabBar } })
+      return screen
+    })
+  },
+  { props: { tabBar: TabBar } }
+)
 
 export default Tabs

package/src/layouts/withLayoutContext.tsx

@@ -1,10 +1,10 @@
 import type { EventMapBase, NavigationState } from '@react-navigation/native'
 import React from 'react'
-
 import { useContextKey } from '../Route'
 import type { PickPartial } from '../types'
 import { useSortedScreens, type ScreenProps } from '../useScreens'
 import { Screen } from '../views/Screen'
+import { withStaticProperties } from '../utils/withStaticProperties'
 
 export function useFilterScreenChildren(
   children: React.ReactNode,
@@ -19,6 +19,7 @@ export function useFilterScreenChildren(
 ) {
   return React.useMemo(() => {
     const customChildren: any[] = []
+
     const screens = React.Children.map(children, (child) => {
       if (React.isValidElement(child) && child && child.type === Screen) {
         if (!child.props.name) {
@@ -43,7 +44,7 @@ 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"`
         )
       }
-    })
+    })?.filter(Boolean)
 
     // Add an assertion for development
     if (process.env.NODE_ENV !== 'production') {
@@ -73,23 +74,19 @@ export function withLayoutContext<
     options: ScreenProps<TOptions, State, EventMap>[]
   ) => ScreenProps<TOptions, State, EventMap>[],
   options?: { props: any }
-): React.ForwardRefExoticComponent<
-  React.PropsWithoutRef<PickPartial<React.ComponentProps<T>, 'children'>> &
-    React.RefAttributes<unknown>
-> & {
-  Screen: (props: ScreenProps<TOptions, State, EventMap>) => null
-} {
-  const Navigator = React.forwardRef<unknown, React.ComponentProps<T>>(
-    ({ children: userDefinedChildren, ...props }, ref) => {
+) {
+  return withStaticProperties(
+    React.forwardRef<unknown, PickPartial<React.ComponentProps<T>, 'children'>>((propsIn, ref) => {
+      const { children, ...props } = propsIn as React.ComponentProps<T>
       const contextKey = useContextKey()
-
-      const { screens } = useFilterScreenChildren(userDefinedChildren, {
+      const { screens } = useFilterScreenChildren(children, {
         contextKey,
       })
 
       const processed = processor ? processor(screens ?? []) : screens
-
-      const sorted = useSortedScreens(processed ?? [])
+      const sorted = useSortedScreens(processed ?? [], {
+        onlyMatching: true,
+      })
 
       // Prevent throwing an error when there are no screens.
       if (!sorted.length) {
@@ -101,11 +98,9 @@ export function withLayoutContext<
           {sorted}
         </Nav>
       )
+    }),
+    {
+      Screen,
     }
   )
-
-  // @ts-expect-error
-  Navigator.Screen = Screen
-  // @ts-expect-error
-  return Navigator
 }

package/src/useScreens.tsx

@@ -52,13 +52,15 @@ export type ScreenProps<
 function getSortedChildren(
   children: RouteNode[],
   order?: ScreenProps[],
-  initialRouteName?: string
+  initialRouteName?: string,
+  options?: { onlyMatching?: boolean }
 ): { route: RouteNode; props: Partial<ScreenProps> }[] {
   if (!order?.length) {
     return children
       .sort(sortRoutesWithInitial(initialRouteName))
       .map((route) => ({ route, props: {} }))
   }
+
   const entries = [...children]
 
   const ordered = order
@@ -98,9 +100,13 @@ function getSortedChildren(
   }[]
 
   // Add any remaining children
-  ordered.push(
-    ...entries.sort(sortRoutesWithInitial(initialRouteName)).map((route) => ({ route, props: {} }))
-  )
+  if (!options?.onlyMatching) {
+    ordered.push(
+      ...entries
+        .sort(sortRoutesWithInitial(initialRouteName))
+        .map((route) => ({ route, props: {} }))
+    )
+  }
 
   return ordered
 }
@@ -108,12 +114,15 @@ function getSortedChildren(
 /**
  * @returns React Navigation screens sorted by the `route` property.
  */
-export function useSortedScreens(order: ScreenProps[]): React.ReactNode[] {
+export function useSortedScreens(
+  order: ScreenProps[],
+  options?: { onlyMatching?: boolean }
+): React.ReactNode[] {
   const node = useRouteNode()
 
   const sortedScreens = React.useMemo(() => {
     const sorted = node?.children?.length
-      ? getSortedChildren(node.children, order, node.initialRouteName)
+      ? getSortedChildren(node.children, order, node.initialRouteName, options)
       : []
 
     return sorted.map((value) => routeToScreen(value.route, value.props))
@@ -264,7 +273,6 @@ export function getQualifiedRouteComponent(value: RouteNode) {
       }: any,
       ref: any
     ) => {
-      console.log('route', route)
       const loadable = getLoadable(props, ref)
       return (
         <Route route={route} node={value}>

package/src/utils/withStaticProperties.ts

@@ -0,0 +1,32 @@
+import React from 'react'
+
+const Decorated = Symbol()
+
+type Combined<A, B> = A & B
+
+export const withStaticProperties = <A extends Function, B>(
+  component: A,
+  staticProps: B
+): Combined<A, B> => {
+  // clone component if already wrapped once
+  const next = (() => {
+    if (component[Decorated]) {
+      const _ = React.forwardRef((props, ref) =>
+        React.createElement(component as any, { ...props, ref })
+      )
+      // attach existing things again
+      for (const key in component) {
+        const v = component[key]
+        // @ts-ignore
+        _[key] = v && typeof v === 'object' ? { ...v } : v
+      }
+    }
+    return component
+  })()
+
+  // add new things
+  Object.assign(next, staticProps)
+  next[Decorated] = true
+
+  return next as any as A & B
+}

package/src/vite/one.ts

@@ -410,34 +410,6 @@ export function one(options: One.PluginOptions = {}): PluginOption {
       },
     } satisfies Plugin,
 
-    {
-      name: 'one-use-react-18-for-native',
-      enforce: 'pre',
-
-      async config() {
-        const sharedNativeConfig = {
-          resolve: {
-            alias: {
-              react: resolvePath('one/react-18', process.cwd()),
-              'react-dom': resolvePath('one/react-dom-18', process.cwd()),
-            },
-          },
-        } satisfies UserConfig
-
-        return {
-          environments: {
-            ios: {
-              ...sharedNativeConfig,
-            },
-            android: {
-              ...sharedNativeConfig,
-            },
-            // this started erroring for no reason..
-          } as any,
-        }
-      },
-    } satisfies Plugin,
-
     {
       name: 'one:optimize-deps-load-web-extensions-web-only',
       enforce: 'pre',

package/src/vite/plugins/fixDependenciesPlugin.ts

@@ -31,7 +31,8 @@ export function fixDependenciesPlugin(options?: One.FixDependencies): Plugin {
     },
 
     async configResolved(config) {
-      if (patches.length) {
+      if (!hasApplied && patches.length) {
+        hasApplied = true
         await applyDependencyPatches(patches, config)
       }
     },

package/types/layouts/Drawer.d.ts

@@ -97,7 +97,7 @@ export declare const Drawer: import("react").ForwardRefExoticComponent<Omit<Omit
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {
-    Screen: (props: import("../useScreens").ScreenProps<DrawerNavigationOptions, DrawerNavigationState<ParamListBase>, DrawerNavigationEventMap>) => null;
+    Screen: typeof import("../views/Screen").Screen;
 };
 export default Drawer;
 //# sourceMappingURL=Drawer.d.ts.map

package/types/layouts/Stack.d.ts

@@ -89,7 +89,7 @@ export declare const Stack: import("react").ForwardRefExoticComponent<Omit<Omit<
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {
-    Screen: (props: import("../useScreens").ScreenProps<NativeStackNavigationOptions, StackNavigationState<ParamListBase>, NativeStackNavigationEventMap>) => null;
+    Screen: typeof import("../views/Screen").Screen;
 };
 export default Stack;
 //# sourceMappingURL=Stack.d.ts.map

package/types/layouts/Tabs.d.ts

@@ -1,9 +1,5 @@
 import { type BottomTabNavigationEventMap, type BottomTabNavigationOptions } from '@react-navigation/bottom-tabs';
 import type { ParamListBase, TabNavigationState } from '@react-navigation/native';
-import type { OneRouter } from '../interfaces/router';
-type BottomTabNavigationOptionsWithHref = BottomTabNavigationOptions & {
-    href?: OneRouter.Href | null;
-};
 export declare const Tabs: import("react").ForwardRefExoticComponent<Omit<Omit<import("@react-navigation/bottom-tabs").BottomTabNavigatorProps, "initialRouteName" | "children" | "screenOptions" | "id" | "layout" | "screenListeners" | "screenLayout" | "UNSTABLE_getStateForRouteNamesChange"> & import("@react-navigation/routers").DefaultRouterOptions<string> & {
     children: React.ReactNode;
     layout?: ((props: {
@@ -93,7 +89,7 @@ export declare const Tabs: import("react").ForwardRefExoticComponent<Omit<Omit<i
 } & {
     id?: undefined;
 }, "children">> & import("react").RefAttributes<unknown>> & {
-    Screen: (props: import("../useScreens").ScreenProps<BottomTabNavigationOptionsWithHref, TabNavigationState<ParamListBase>, BottomTabNavigationEventMap>) => null;
+    Screen: typeof import("../views/Screen").Screen;
 };
 export default Tabs;
 //# sourceMappingURL=Tabs.d.ts.map

package/types/layouts/Tabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tabs.d.ts","sourceRoot":"","sources":["../../src/layouts/Tabs.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAGhC,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAGjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AA0BrD,KAAK,kCAAkC,GAAG,0BAA0B,GAAG;IACrE,IAAI,CAAC,EAAE,SAAS,CAAC,IAAI,GAAG,IAAI,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,IAAI;cAJK,MAAO,SAAS;;;;;kBAY4C,MAC5E,SAAM;UAAW,MAAQ,YAAW;;;;;;;;;;;;;;;;;;;;;;;;;;eAe3B,gBACC,KAAC;;;;;eAKD,gBAAE,KAAK;kBACT,MAAA,YACN;UACE,MACF,YACR;;;;;cAvCsB,MAAO,SAAS;;;;;kBAY4C,MAC5E,SAAM;UAAW,MAAQ,YAAW;;;;;;;;;;;;;;;;;;;;;;;;;;eAe3B,gBACC,KAAC;;;;;eAKD,gBAAE,KAAK;kBACT,MAAA,YACN;UACE,MACF,YACR;;;;;;CAIiC,CAAA;AAEjC,eAAe,IAAI,CAAA"}
+{"version":3,"file":"Tabs.d.ts","sourceRoot":"","sources":["../../src/layouts/Tabs.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,0BAA0B,EAGhC,MAAM,+BAA+B,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAoCjF,eAAO,MAAM,IAAI;cAP4B,MAC1C,SAAS;;;;;kBAeO,MAAO,SAAS;UAC1B,MAAQ,YAAW;;;;;;;;;;;;;;;;;;;;;;;;;;eAcZ,gBAAI,KAAK;;;;;eAKP,gBACA,KAAR;kBAAmB,MAAO,YAAY;UAE9B,MAAA,YADU;;;;;cAtCiB,MAC1C,SAAS;;;;;kBAeO,MAAO,SAAS;UAC1B,MAAQ,YAAW;;;;;;;;;;;;;;;;;;;;;;;;;;eAcZ,gBAAI,KAAK;;;;;eAKP,gBACA,KAAR;kBAAmB,MAAO,YAAY;UAE9B,MAAA,YADU;;;;;;CAY3B,CAAA;AAED,eAAe,IAAI,CAAA"}

package/types/layouts/withLayoutContext.d.ts

@@ -2,18 +2,19 @@ import type { EventMapBase, NavigationState } from '@react-navigation/native';
 import React from 'react';
 import type { PickPartial } from '../types';
 import { type ScreenProps } from '../useScreens';
+import { Screen } from '../views/Screen';
 export declare function useFilterScreenChildren(children: React.ReactNode, { isCustomNavigator, contextKey, }?: {
     isCustomNavigator?: boolean;
     /** Used for sending developer hints */
     contextKey?: string;
 }): {
-    screens: any[] | null | undefined;
+    screens: any[] | undefined;
     children: any[];
 };
 /** Return a navigator that automatically injects matched routes and renders nothing when there are no children. Return type with children prop optional */
 export declare function withLayoutContext<TOptions extends object, T extends React.ComponentType<any>, State extends NavigationState, EventMap extends EventMapBase>(Nav: T, processor?: (options: ScreenProps<TOptions, State, EventMap>[]) => ScreenProps<TOptions, State, EventMap>[], options?: {
     props: any;
-}): React.ForwardRefExoticComponent<React.PropsWithoutRef<PickPartial<React.ComponentProps<T>, 'children'>> & React.RefAttributes<unknown>> & {
-    Screen: (props: ScreenProps<TOptions, State, EventMap>) => null;
+}): React.ForwardRefExoticComponent<React.PropsWithoutRef<PickPartial<React.ComponentProps<T>, "children">> & React.RefAttributes<unknown>> & {
+    Screen: typeof Screen;
 };
 //# sourceMappingURL=withLayoutContext.d.ts.map

package/types/layouts/withLayoutContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withLayoutContext.d.ts","sourceRoot":"","sources":["../../src/layouts/withLayoutContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAA;AAGlE,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,EACE,iBAAiB,EACjB,UAAU,GACX,GAAE;IACD,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAA;CACf;;;EA4CP;AAED,2JAA2J;AAC3J,wBAAgB,iBAAiB,CAC/B,QAAQ,SAAS,MAAM,EACvB,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAClC,KAAK,SAAS,eAAe,EAC7B,QAAQ,SAAS,YAAY,EAE7B,GAAG,EAAE,CAAC,EACN,SAAS,CAAC,EAAE,CACV,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,KAC9C,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAC7C,OAAO,CAAC,EAAE;IAAE,KAAK,EAAE,GAAG,CAAA;CAAE,GACvB,KAAK,CAAC,yBAAyB,CAChC,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,GACrE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAC/B,GAAG;IACF,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,IAAI,CAAA;CAChE,CA8BA"}
+{"version":3,"file":"withLayoutContext.d.ts","sourceRoot":"","sources":["../../src/layouts/withLayoutContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC7E,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAGxC,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,EACzB,EACE,iBAAiB,EACjB,UAAU,GACX,GAAE;IACD,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAA;CACf;;;EA6CP;AAED,2JAA2J;AAC3J,wBAAgB,iBAAiB,CAC/B,QAAQ,SAAS,MAAM,EACvB,CAAC,SAAS,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,EAClC,KAAK,SAAS,eAAe,EAC7B,QAAQ,SAAS,YAAY,EAE7B,GAAG,EAAE,CAAC,EACN,SAAS,CAAC,EAAE,CACV,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,KAC9C,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAC7C,OAAO,CAAC,EAAE;IAAE,KAAK,EAAE,GAAG,CAAA;CAAE;;EA8BzB"}

package/types/useScreens.d.ts

@@ -23,7 +23,9 @@ export type ScreenProps<TOptions extends Record<string, any> = Record<string, an
 /**
  * @returns React Navigation screens sorted by the `route` property.
  */
-export declare function useSortedScreens(order: ScreenProps[]): React.ReactNode[];
+export declare function useSortedScreens(order: ScreenProps[], options?: {
+    onlyMatching?: boolean;
+}): React.ReactNode[];
 /** Wrap the component with various enhancements and add access to child routes. */
 export declare function getQualifiedRouteComponent(value: RouteNode): React.ComponentType<any> | React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 /** @returns a function which provides a screen id that matches the dynamic route name in params. */

package/types/useScreens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../src/useScreens.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,aAAa,EACb,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAA8B,MAAM,OAAO,CAAA;AAClD,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,SAAS,CAAA;AAShB,eAAO,MAAQ,MAAM,OAAE,KAAK,KAAwC,CAAA;AAEpE,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1D,KAAK,SAAS,eAAe,GAAG,eAAe,EAC/C,QAAQ,SAAS,YAAY,GAAG,YAAY,IAC1C;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAA;IAElB,SAAS,CAAC,EACN,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,GAChC,CAAC,CAAC,IAAI,EAAE;QACN,KAAK,EAAE,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;QACvC,UAAU,EAAE,GAAG,CAAA;KAChB,KAAK,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;IAE3C,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,KAAK,MAAM,GAAG,SAAS,CAAA;CAC7E,CAAA;AA0DD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAYxE;AA4BD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,+GAiI1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,GAAG,YAAY,GAAG,UAAU,CAAC;aAU5B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;aAoB/D"}
+{"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../src/useScreens.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,aAAa,EACb,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAA8B,MAAM,OAAO,CAAA;AAClD,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,SAAS,CAAA;AAShB,eAAO,MAAQ,MAAM,OAAE,KAAK,KAAwC,CAAA;AAEpE,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1D,KAAK,SAAS,eAAe,GAAG,eAAe,EAC/C,QAAQ,SAAS,YAAY,GAAG,YAAY,IAC1C;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAA;IAElB,SAAS,CAAC,EACN,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,GAChC,CAAC,CAAC,IAAI,EAAE;QACN,KAAK,EAAE,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;QACvC,UAAU,EAAE,GAAG,CAAA;KAChB,KAAK,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;IAE3C,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,KAAK,MAAM,GAAG,SAAS,CAAA;CAC7E,CAAA;AAgED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,WAAW,EAAE,EACpB,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GACnC,KAAK,CAAC,SAAS,EAAE,CAYnB;AA4BD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,+GAgI1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,GAAG,YAAY,GAAG,UAAU,CAAC;aAU5B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;aAoB/D"}

package/types/utils/withStaticProperties.d.ts

@@ -0,0 +1,4 @@
+type Combined<A, B> = A & B;
+export declare const withStaticProperties: <A extends Function, B>(component: A, staticProps: B) => Combined<A, B>;
+export {};
+//# sourceMappingURL=withStaticProperties.d.ts.map

package/types/utils/withStaticProperties.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withStaticProperties.d.ts","sourceRoot":"","sources":["../../src/utils/withStaticProperties.ts"],"names":[],"mappings":"AAIA,KAAK,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAE3B,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,QAAQ,EAAE,CAAC,aAC7C,CAAC,eACC,CAAC,KACb,QAAQ,CAAC,CAAC,EAAE,CAAC,CAsBf,CAAA"}

package/types/vite/one.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"one.d.ts","sourceRoot":"","sources":["../../src/vite/one.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,YAAY,EAAc,MAAM,MAAM,CAAA;AAW5D,OAAO,qBAAqB,CAAA;AAY5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAkBlC,wBAAgB,GAAG,CAAC,OAAO,GAAE,GAAG,CAAC,aAAkB,GAAG,YAAY,CA8ajE"}
+{"version":3,"file":"one.d.ts","sourceRoot":"","sources":["../../src/vite/one.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,YAAY,EAAc,MAAM,MAAM,CAAA;AAW5D,OAAO,qBAAqB,CAAA;AAY5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAkBlC,wBAAgB,GAAG,CAAC,OAAO,GAAE,GAAG,CAAC,aAAkB,GAAG,YAAY,CAkZjE"}

package/types/vite/plugins/fixDependenciesPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixDependenciesPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/fixDependenciesPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAKnC,wBAAgB,qBAAqB,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,eAAe,GAAG,MAAM,CA+B3E"}
+{"version":3,"file":"fixDependenciesPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/fixDependenciesPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAKnC,wBAAgB,qBAAqB,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,eAAe,GAAG,MAAM,CAgC3E"}

package/vendor/react-dom/package.json

@@ -21,7 +21,7 @@
     "scheduler": "^0.23.2"
   },
   "peerDependencies": {
-    "react": "^18.3.1"
+    "react": "^19.0.0"
   },
   "files": [
     "LICENSE",
@@ -59,4 +59,4 @@
       "loose-envify"
     ]
   }
-}
+}