one 1.25.8 → 1.25.10

package/src/cli/buildPage.ts

@@ -355,9 +355,11 @@ if (typeof document === 'undefined') globalThis.document = {}
         recordTiming('ssrRender', performance.now() - t0)
 
         // Apply after-LCP script loading if enabled
-        // Load all preloads (not just critical) to ensure good TTI after first paint
         if (useAfterLCP) {
-          html = applyAfterLCPScriptLoad(html, preloads)
+          html = applyAfterLCPScriptLoad(
+            html,
+            useAfterLCPAggressive ? criticalPreloads || preloads : preloads
+          )
         }
 
         t0 = performance.now()
@@ -400,7 +402,10 @@ if (typeof document === 'undefined') globalThis.document = {}
           recordTiming('spaShellRender', performance.now() - t0)
 
           if (useAfterLCP) {
-            html = applyAfterLCPScriptLoad(html, preloads)
+            html = applyAfterLCPScriptLoad(
+              html,
+              useAfterLCPAggressive ? criticalPreloads || preloads : preloads
+            )
           }
 
           t0 = performance.now()

package/src/fork/useLinking.native.test.tsx

@@ -0,0 +1,153 @@
+import type { NavigationState } from '@react-navigation/core'
+import React from 'react'
+import TestRenderer, { act } from 'react-test-renderer'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { getLinkingConfig } from '../router/getLinkingConfig'
+import { getRoutes } from '../router/getRoutes'
+import { getMockContext } from '../testing-utils'
+import { getStateFromPath } from './getStateFromPath'
+import { useLinking } from './useLinking.native'
+
+;(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true
+
+const linking = getLinkingConfig(
+  getRoutes(
+    getMockContext([
+      '_layout.tsx',
+      'home/_layout.tsx',
+      'home/[projectId]/_layout.tsx',
+      'home/[projectId]/index.tsx',
+      'settings.tsx',
+    ])
+  )!
+)
+const config = linking.config!
+
+const currentState: NavigationState = {
+  stale: false,
+  type: 'stack',
+  key: 'root-stack',
+  index: 1,
+  routeNames: ['home', 'settings'],
+  routes: [
+    {
+      name: 'home',
+      key: 'home-travelo',
+      params: { projectId: 'proj_example_travelo' },
+      state: {
+        stale: false,
+        type: 'stack',
+        key: 'home-stack',
+        index: 0,
+        routeNames: ['[projectId]'],
+        routes: [
+          {
+            name: '[projectId]',
+            key: 'project-travelo',
+            params: { projectId: 'proj_example_travelo' },
+          },
+        ],
+      },
+    },
+    { name: 'settings', key: 'settings' },
+  ],
+}
+
+type LinkingOverrides = Partial<Parameters<typeof useLinking>[1]>
+
+async function captureIncomingAction(overrides: LinkingOverrides = {}) {
+  const linkedState = getStateFromPath('/home/proj_example_pennywise?tab=design', config)!
+  const dispatch = vi.fn()
+  let listener: ((url: string) => void) | undefined
+  const navigation = {
+    dispatch,
+    getRootState: () => currentState,
+  }
+  const ref = { current: navigation }
+
+  function Harness() {
+    useLinking(
+      ref as any,
+      {
+        ...linking,
+        enabled: true,
+        prefixes: ['contrast:///'],
+        getInitialURL: () => null,
+        getStateFromPath: () => linkedState,
+        subscribe: (nextListener) => {
+          listener = nextListener
+          return () => {}
+        },
+        ...overrides,
+      },
+      () => {}
+    )
+    return null
+  }
+
+  let renderer: TestRenderer.ReactTestRenderer
+  await act(async () => {
+    renderer = TestRenderer.create(<Harness />)
+  })
+  act(() => listener!('contrast:///home/proj_example_pennywise?tab=design'))
+
+  return {
+    action: dispatch.mock.calls[0]?.[0],
+    linkedState,
+    renderer: renderer!,
+  }
+}
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
+describe('native incoming links', () => {
+  it('applies every nested dynamic param when leaving a sibling route', async () => {
+    const { action, renderer } = await captureIncomingAction()
+
+    expect(action).toStrictEqual({
+      type: 'NAVIGATE',
+      target: 'root-stack',
+      payload: {
+        key: undefined,
+        name: 'home',
+        params: {
+          projectId: 'proj_example_pennywise',
+          screen: '[projectId]',
+          params: {
+            projectId: 'proj_example_pennywise',
+            tab: 'design',
+            screen: 'index',
+            params: {
+              projectId: 'proj_example_pennywise',
+              tab: 'design',
+            },
+          },
+        },
+      },
+    })
+
+    act(() => renderer.unmount())
+  })
+
+  it('keeps a configured getActionFromState in control', async () => {
+    const customAction = { type: 'NAVIGATE', payload: { name: 'custom' } } as const
+    const getActionFromState = vi.fn(
+      (_state: Parameters<NonNullable<LinkingOverrides['getActionFromState']>>[0]) =>
+        customAction
+    )
+    const { action, linkedState, renderer } = await captureIncomingAction({
+      getActionFromState,
+    })
+
+    expect(action).toBe(customAction)
+    expect(getActionFromState).toHaveBeenCalledOnce()
+    expect(getActionFromState.mock.calls[0]![0]).toEqual({
+      ...linkedState,
+      routes: [expect.not.objectContaining({ key: expect.anything() })],
+    })
+
+    act(() => renderer.unmount())
+  })
+})

package/src/fork/useLinking.native.ts

@@ -16,6 +16,7 @@ import {
 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 { getNavigateAction } from '../router/utils/getNavigateAction' // @modified
 import { extractPathFromURL } from './extractPathFromURL'
 
 type ResultState = ReturnType<typeof getStateFromPathDefault>
@@ -24,13 +25,9 @@ type Options = LinkingOptions<ParamListBase>
 
 const linkingHandlers: symbol[] = []
 
-// @modified: our fork of getStateFromPath assigns deterministic route keys
-// (SSR/hydration stability), but upstream getActionFromState only produces a
-// nested NAVIGATE for keyless routes — keyed routes degrade to a whole-tree
-// RESET that the One router store immediately reverts, so incoming Linking
-// 'url' events never navigated on native. Strip the keys before deriving the
-// action; hydration keys only matter for web SSR, never for a live native
-// deep link.
+// @modified: custom getActionFromState functions have received keyless routes
+// since One added deterministic hydration keys. preserve that contract; the
+// default native path uses getNavigateAction directly.
 type LinkingResultState = NonNullable<ResultState>
 
 function stripRouteKeys(state: LinkingResultState): LinkingResultState {
@@ -218,11 +215,12 @@ export function useLinking(
           return
         }
 
-        // @modified: keys stripped so getActionFromState can produce NAVIGATE
-        const action = getActionFromStateRef.current(
-          stripRouteKeys(state),
-          configRef.current
-        )
+        // @modified: use One's action builder for the default path so incoming
+        // links get the same nested param propagation as imperative navigation.
+        const action =
+          getActionFromStateRef.current === getActionFromStateDefault
+            ? getNavigateAction(state, rootState)
+            : getActionFromStateRef.current(stripRouteKeys(state), configRef.current)
 
         if (action !== undefined) {
           try {

package/types/cli/buildPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildPage.d.ts","sourceRoot":"","sources":["../../src/cli/buildPage.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAkBnD,wBAAgB,iBAAiB,SAUhC;AAED,wBAAsB,SAAS,CAC7B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,GAAG,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,cAAc,CAAC,EAAE,MAAM,EAAE,EACzB,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,WAAW,CAAC,EAAE,OAAO,EACrB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CA6a7B"}
+{"version":3,"file":"buildPage.d.ts","sourceRoot":"","sources":["../../src/cli/buildPage.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAkBnD,wBAAgB,iBAAiB,SAUhC;AAED,wBAAsB,SAAS,CAC7B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,GAAG,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,cAAc,CAAC,EAAE,MAAM,EAAE,EACzB,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,gBAAgB,CAAC,EAAE,MAAM,EAAE,EAC3B,WAAW,CAAC,EAAE,OAAO,EACrB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAkb7B"}

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

@@ -1 +1 @@
-{"version":3,"file":"useLinking.native.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.native.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;AAyB5C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,EAC3D,EACE,OAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,aAQI,EACJ,SAmBC,EACD,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;EAoKtE"}
+{"version":3,"file":"useLinking.native.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.native.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAO9B,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;AAqB5C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,EAC3D,EACE,OAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,aAQI,EACJ,SAmBC,EACD,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;EAqKtE"}

package/types/fork/useLinking.native.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=useLinking.native.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useLinking.native.test.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.native.test.tsx"],"names":[],"mappings":""}