@react-navigation/native 7.3.8 → 7.3.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -11,7 +11,7 @@ import { useLinkProps } from "./useLinkProps.js";
11
11
  * @param props.screen Name of the screen to navigate to (e.g. `'Feeds'`).
12
12
  * @param props.params Params to pass to the screen to navigate to (e.g. `{ sort: 'hot' }`).
13
13
  * @param props.href Optional absolute path to use for the href (e.g. `/feeds/hot`).
14
- * @param props.action Optional action to use for in-page navigation. By default, the path is parsed to an action based on linking config.
14
+ * @param props.action Optional action to override the in-page navigation. The `href` is still derived from `screen`, so this can be used to render a link while dispatching a different action (e.g. a `replace`).
15
15
  * @param props.children Child elements to render the content.
16
16
  */
17
17
  export function Link({
@@ -20,12 +20,9 @@ export function Link({
20
20
  action,
21
21
  href,
22
22
  style,
23
+ target,
23
24
  ...rest
24
25
  }) {
25
- const {
26
- colors,
27
- fonts
28
- } = useTheme();
29
26
  // @ts-expect-error: This is already type-checked by the prop types
30
27
  const props = useLinkProps({
31
28
  screen,
@@ -33,7 +30,19 @@ export function Link({
33
30
  action,
34
31
  href
35
32
  });
33
+
34
+ // Keep usage of `useTheme` after `useLinkProps`
35
+ // This ensures proper error when used outside of navigation container
36
+ const {
37
+ colors,
38
+ fonts
39
+ } = useTheme();
36
40
  const onPress = e => {
41
+ if (rest.disabled) {
42
+ e.preventDefault();
43
+ e.stopPropagation();
44
+ return;
45
+ }
37
46
  if ('onPress' in rest) {
38
47
  rest.onPress?.(e);
39
48
  }
@@ -48,7 +57,15 @@ export function Link({
48
57
  ...rest,
49
58
  ...Platform.select({
50
59
  web: {
51
- onClick: onPress
60
+ 'aria-disabled': rest.disabled,
61
+ 'onAuxClick': rest.disabled ? e => {
62
+ e.preventDefault();
63
+ e.stopPropagation();
64
+ } : undefined,
65
+ 'onClick': onPress,
66
+ 'hrefAttrs': {
67
+ target
68
+ }
52
69
  },
53
70
  default: {
54
71
  onPress
@@ -1 +1 @@
1
- {"version":3,"names":["useTheme","React","Platform","Text","useLinkProps","Link","screen","params","action","href","style","rest","colors","fonts","props","onPress","e","defaultPrevented","createElement","select","web","onClick","default","color","primary","regular"],"sourceRoot":"../../src","sources":["Link.tsx"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,wBAAwB;AACjD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAEEC,QAAQ,EACRC,IAAI,QAEC,cAAc;AAErB,SAAyBC,YAAY,QAAQ,mBAAgB;AAe7D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,IAAIA,CAAkD;EACpEC,MAAM;EACNC,MAAM;EACNC,MAAM;EACNC,IAAI;EACJC,KAAK;EACL,GAAGC;AACa,CAAC,EAAE;EACnB,MAAM;IAAEC,MAAM;IAAEC;EAAM,CAAC,GAAGb,QAAQ,CAAC,CAAC;EACpC;EACA,MAAMc,KAAK,GAAGV,YAAY,CAAY;IAAEE,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAK,CAAC,CAAC;EAEvE,MAAMM,OAAO,GACXC,CAA0E,IACvE;IACH,IAAI,SAAS,IAAIL,IAAI,EAAE;MACrBA,IAAI,CAACI,OAAO,GAAGC,CAAC,CAAC;IACnB;;IAEA;IACA,IAAI,CAACA,CAAC,CAACC,gBAAgB,EAAE;MACvBH,KAAK,CAACC,OAAO,CAACC,CAAC,CAAC;IAClB;EACF,CAAC;EAED,oBAAOf,KAAK,CAACiB,aAAa,CAACf,IAAI,EAAE;IAC/B,GAAGW,KAAK;IACR,GAAGH,IAAI;IACP,GAAGT,QAAQ,CAACiB,MAAM,CAAC;MACjBC,GAAG,EAAE;QAAEC,OAAO,EAAEN;MAAQ,CAAQ;MAChCO,OAAO,EAAE;QAAEP;MAAQ;IACrB,CAAC,CAAC;IACFL,KAAK,EAAE,CAAC;MAAEa,KAAK,EAAEX,MAAM,CAACY;IAAQ,CAAC,EAAEX,KAAK,CAACY,OAAO,EAAEf,KAAK;EACzD,CAAC,CAAC;AACJ","ignoreList":[]}
1
+ {"version":3,"names":["useTheme","React","Platform","Text","useLinkProps","Link","screen","params","action","href","style","target","rest","props","colors","fonts","onPress","e","disabled","preventDefault","stopPropagation","defaultPrevented","createElement","select","web","undefined","default","color","primary","regular"],"sourceRoot":"../../src","sources":["Link.tsx"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,wBAAwB;AACjD,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAEEC,QAAQ,EACRC,IAAI,QAEC,cAAc;AAErB,SAAyBC,YAAY,QAAQ,mBAAgB;AAe7D;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,IAAIA,CAAkD;EACpEC,MAAM;EACNC,MAAM;EACNC,MAAM;EACNC,IAAI;EACJC,KAAK;EACLC,MAAM;EACN,GAAGC;AACa,CAAC,EAAE;EACnB;EACA,MAAMC,KAAK,GAAGT,YAAY,CAAY;IAAEE,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAK,CAAC,CAAC;;EAEvE;EACA;EACA,MAAM;IAAEK,MAAM;IAAEC;EAAM,CAAC,GAAGf,QAAQ,CAAC,CAAC;EAEpC,MAAMgB,OAAO,GAAIC,CAAa,IAAK;IACjC,IAAIL,IAAI,CAACM,QAAQ,EAAE;MACjBD,CAAC,CAACE,cAAc,CAAC,CAAC;MAClBF,CAAC,CAACG,eAAe,CAAC,CAAC;MACnB;IACF;IAEA,IAAI,SAAS,IAAIR,IAAI,EAAE;MACrBA,IAAI,CAACI,OAAO,GAAGC,CAAC,CAAC;IACnB;;IAEA;IACA,IAAI,CAACA,CAAC,CAACI,gBAAgB,EAAE;MACvBR,KAAK,CAACG,OAAO,CAACC,CAAC,CAAC;IAClB;EACF,CAAC;EAED,oBAAOhB,KAAK,CAACqB,aAAa,CAACnB,IAAI,EAAE;IAC/B,GAAGU,KAAK;IACR,GAAGD,IAAI;IACP,GAAGV,QAAQ,CAACqB,MAAM,CAAC;MACjBC,GAAG,EAAE;QACH,eAAe,EAAEZ,IAAI,CAACM,QAAQ;QAC9B,YAAY,EAAEN,IAAI,CAACM,QAAQ,GACtBD,CAAkD,IAAK;UACtDA,CAAC,CAACE,cAAc,CAAC,CAAC;UAClBF,CAAC,CAACG,eAAe,CAAC,CAAC;QACrB,CAAC,GACDK,SAAS;QACb,SAAS,EAAET,OAAO;QAClB,WAAW,EAAE;UAAEL;QAAO;MACxB,CAAC;MACDe,OAAO,EAAE;QAAEV;MAAQ;IACrB,CAAC,CAAC;IACFN,KAAK,EAAE,CAAC;MAAEiB,KAAK,EAAEb,MAAM,CAACc;IAAQ,CAAC,EAAEb,KAAK,CAACc,OAAO,EAAEnB,KAAK;EACzD,CAAC,CAAC;AACJ","ignoreList":[]}
@@ -189,6 +189,7 @@ export function createMemoryHistory() {
189
189
  // But on Firefox, it seems to take much longer, around 50ms from our testing
190
190
  // We're using a hacky timeout since there doesn't seem to be way to know for sure
191
191
  const timer = setTimeout(() => {
192
+ window.removeEventListener('popstate', onPopState);
192
193
  const foundIndex = pending.findIndex(it => it.ref === done);
193
194
  if (foundIndex > -1) {
194
195
  pending[foundIndex]?.cb();
@@ -1 +1 @@
1
- {"version":3,"names":["nanoid","getPathWithoutHash","path","split","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","pathWithoutHash","i","push","slice","length","pushState","replace","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","targetId","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","foundIndex","splice","onPopState","last","pop","removeEventListener","addEventListener","listen","listener"],"sourceRoot":"../../src","sources":["createMemoryHistory.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["nanoid","getPathWithoutHash","path","split","createMemoryHistory","index","items","pending","interrupt","forEach","it","cb","history","id","window","state","findIndex","item","get","backIndex","pathWithoutHash","i","push","slice","length","pushState","replace","pathWithHash","hash","includes","location","replaceState","go","n","nextIndex","lastItemIndex","targetId","Promise","resolve","reject","done","interrupted","clearTimeout","timer","Error","title","document","ref","setTimeout","removeEventListener","onPopState","foundIndex","splice","last","pop","addEventListener","listen","listener"],"sourceRoot":"../../src","sources":["createMemoryHistory.tsx"],"mappings":"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","ignoreList":[]}
@@ -0,0 +1,12 @@
1
+ "use strict";
2
+
3
+ import isEqual from 'fast-deep-equal';
4
+ import * as React from 'react';
5
+ export function useDeepStableValue(value) {
6
+ const valueRef = React.useRef(value);
7
+ if (!isEqual(valueRef.current, value)) {
8
+ valueRef.current = value;
9
+ }
10
+ return valueRef.current;
11
+ }
12
+ //# sourceMappingURL=useDeepStableValue.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"names":["isEqual","React","useDeepStableValue","value","valueRef","useRef","current"],"sourceRoot":"../../src","sources":["useDeepStableValue.tsx"],"mappings":";;AAAA,OAAOA,OAAO,MAAM,iBAAiB;AACrC,OAAO,KAAKC,KAAK,MAAM,OAAO;AAE9B,OAAO,SAASC,kBAAkBA,CAAIC,KAAQ,EAAK;EACjD,MAAMC,QAAQ,GAAGH,KAAK,CAACI,MAAM,CAACF,KAAK,CAAC;EAEpC,IAAI,CAACH,OAAO,CAACI,QAAQ,CAACE,OAAO,EAAEH,KAAK,CAAC,EAAE;IACrCC,QAAQ,CAACE,OAAO,GAAGH,KAAK;EAC1B;EAEA,OAAOC,QAAQ,CAACE,OAAO;AACzB","ignoreList":[]}
@@ -1,24 +1,69 @@
1
1
  "use strict";
2
2
 
3
- import { getPathFromState, NavigationContainerRefContext, NavigationHelpersContext } from '@react-navigation/core';
3
+ import { CommonActions, getPathFromState, NavigationContainerRefContext, NavigationHelpersContext } from '@react-navigation/core';
4
4
  import * as React from 'react';
5
5
  import { Platform } from 'react-native';
6
+ import useLatestCallback from 'use-latest-callback';
6
7
  import { LinkingContext } from "./LinkingContext.js";
7
- const getStateFromParams = params => {
8
- if (params?.state) {
9
- return params.state;
8
+ import { useDeepStableValue } from "./useDeepStableValue.js";
9
+ const NESTED_KEYS = ['payload', 'params', 'state', 'routes'];
10
+ const NESTED_PARAMS_KEYS = ['params', 'state'];
11
+ const NAVIGATE_ACTION_TYPES = ['NAVIGATE', 'PUSH', 'REPLACE', 'POP_TO', 'JUMP_TO'];
12
+
13
+ /**
14
+ * Nested params are tracked as consumed after handling
15
+ * So navigating with same params again won't work
16
+ * This can happen if the action or params are memoized
17
+ * Or component hasn't re-renderd to re-create inline objects
18
+ * So we clone the action and params when necessary before dispatch
19
+ */
20
+
21
+ function clone(value, keys = NESTED_KEYS, clones) {
22
+ if (typeof value !== 'object' || value == null) {
23
+ return value;
10
24
  }
11
- if (params?.screen) {
12
- return {
13
- routes: [{
14
- name: params.screen,
15
- params: params.params,
16
- // @ts-expect-error this is fine 🔥
17
- state: params.screen ? getStateFromParams(params.params) : undefined
18
- }]
19
- };
25
+ const existing = clones?.get(value);
26
+ if (existing) {
27
+ return existing;
28
+ }
29
+ const isArray = Array.isArray(value);
30
+ if (keys === NESTED_PARAMS_KEYS && 'screen' in value && typeof value.screen !== 'string' && !('state' in value && typeof value.state === 'object' && value.state != null && 'routes' in value.state && Array.isArray(value.state.routes))) {
31
+ return value;
32
+ }
33
+ let copy = keys === NESTED_PARAMS_KEYS ? {
34
+ ...value
35
+ } : undefined;
36
+ clones ??= new WeakMap();
37
+ clones.set(value, copy ?? value);
38
+ for (const key of isArray ? value.keys() : keys) {
39
+ const nested = Reflect.get(value, key);
40
+ const cloned = clone(nested, key === 'params' ? NESTED_PARAMS_KEYS : NESTED_KEYS, clones);
41
+ if (cloned !== nested) {
42
+ copy ??= isArray ? [...value] : {
43
+ ...value
44
+ };
45
+ clones.set(value, copy);
46
+ Object.assign(copy, {
47
+ [key]: cloned
48
+ });
49
+ }
50
+ }
51
+ return copy ?? value;
52
+ }
53
+ const getTargetFromAction = (action, screens) => {
54
+ if (action === undefined || screens === undefined) {
55
+ return undefined;
56
+ }
57
+ const {
58
+ payload
59
+ } = action;
60
+ if (!NAVIGATE_ACTION_TYPES.includes(action.type) || payload === undefined || !('name' in payload) || typeof payload.name !== 'string' || !(payload.name in screens)) {
61
+ return undefined;
20
62
  }
21
- return undefined;
63
+ return {
64
+ screen: payload.name,
65
+ params: 'params' in payload && typeof payload.params === 'object' && payload.params != null ? payload.params : undefined
66
+ };
22
67
  };
23
68
 
24
69
  /**
@@ -27,65 +72,63 @@ const getStateFromParams = params => {
27
72
  * @param props.screen Name of the screen to navigate to (e.g. `'Feeds'`).
28
73
  * @param props.params Params to pass to the screen to navigate to (e.g. `{ sort: 'hot' }`).
29
74
  * @param props.href Optional absolute path to use for the href (e.g. `/feeds/hot`).
30
- * @param props.action Optional action to use for in-page navigation. By default, the path is parsed to an action based on linking config.
75
+ * @param props.action Optional action to override the in-page navigation. The `href` is still derived from `screen`, so this can be used to render a link while dispatching a different action (e.g. a `replace`).
31
76
  */
32
77
  export function useLinkProps({
33
78
  screen,
34
79
  params,
35
- href,
36
- action
80
+ action,
81
+ ...rest
37
82
  }) {
38
83
  const root = React.useContext(NavigationContainerRefContext);
39
- const navigation = React.useContext(NavigationHelpersContext);
84
+ const navigation = React.useContext(NavigationHelpersContext) ?? root;
85
+ if (navigation == null) {
86
+ throw new Error("Couldn't find a navigation object. Is your component inside NavigationContainer?");
87
+ }
40
88
  const {
41
89
  options
42
90
  } = React.useContext(LinkingContext);
43
- const onPress = e => {
44
- let shouldHandle = false;
45
- if (Platform.OS !== 'web' || !e) {
46
- e?.preventDefault?.();
47
- shouldHandle = true;
48
- } else {
49
- // ignore clicks with modifier keys
91
+ const onPress = useLatestCallback(e => {
92
+ if (Platform.OS === 'web' && e) {
50
93
  const hasModifierKey = 'metaKey' in e && e.metaKey || 'altKey' in e && e.altKey || 'ctrlKey' in e && e.ctrlKey || 'shiftKey' in e && e.shiftKey;
51
-
52
- // only handle left clicks
53
94
  const isLeftClick = 'button' in e ? e.button == null || e.button === 0 : true;
54
-
55
- // let browser handle "target=_blank" etc.
56
- const isSelfTarget = e.currentTarget && 'target' in e.currentTarget ? [undefined, null, '', 'self'].includes(e.currentTarget.target) : true;
57
- if (!hasModifierKey && isLeftClick && isSelfTarget) {
58
- e.preventDefault?.();
59
- shouldHandle = true;
95
+ const isSelfTarget = e.currentTarget && 'target' in e.currentTarget ? [undefined, null, '', '_self'].includes(e.currentTarget.target) : true;
96
+ if (hasModifierKey || !isLeftClick || !isSelfTarget) {
97
+ return;
60
98
  }
61
99
  }
62
- if (shouldHandle) {
63
- if (action) {
64
- if (navigation) {
65
- navigation.dispatch(action);
66
- } else if (root) {
67
- root.dispatch(action);
68
- } else {
69
- throw new Error("Couldn't find a navigation object. Is your component inside NavigationContainer?");
70
- }
71
- } else {
72
- // @ts-expect-error This is already type-checked by the prop types
73
- navigation?.navigate(screen, params);
100
+ e?.preventDefault();
101
+ let cloned;
102
+ if (action != null) {
103
+ cloned = clone(action);
104
+ } else {
105
+ if (screen == null) {
106
+ throw new Error("Couldn't find a screen to navigate to. Make sure to provide a screen name.");
74
107
  }
108
+ cloned = clone(
109
+ // @ts-expect-error This is already type-checked by the prop types
110
+ CommonActions.navigate(screen, params));
75
111
  }
76
- };
77
- const getPathFromStateHelper = options?.getPathFromState ?? getPathFromState;
78
- return {
79
- href: href ?? (Platform.OS === 'web' && screen != null ? getPathFromStateHelper({
112
+ navigation.dispatch(cloned);
113
+ });
114
+ const target = useDeepStableValue(Platform.OS === 'web' ? typeof screen === 'string' ? {
115
+ screen,
116
+ params: typeof params === 'object' && params != null ? params : undefined
117
+ } : getTargetFromAction(action, options?.config?.screens) : undefined);
118
+ const href = React.useMemo(() => {
119
+ if (Platform.OS !== 'web' || rest.href != null || target == null) {
120
+ return rest.href;
121
+ }
122
+ const getPath = options?.getPathFromState ?? getPathFromState;
123
+ return getPath({
80
124
  routes: [{
81
- // @ts-expect-error this is fine 🔥
82
- name: screen,
83
- // @ts-expect-error this is fine 🔥
84
- params: params,
85
- // @ts-expect-error this is fine 🔥
86
- state: getStateFromParams(params)
125
+ name: target.screen,
126
+ params: target.params
87
127
  }]
88
- }, options?.config) : undefined),
128
+ }, options?.config);
129
+ }, [rest.href, target, options?.getPathFromState, options?.config]);
130
+ return {
131
+ href,
89
132
  role: 'link',
90
133
  onPress
91
134
  };
@@ -1 +1 @@
1
- {"version":3,"names":["getPathFromState","NavigationContainerRefContext","NavigationHelpersContext","React","Platform","LinkingContext","getStateFromParams","params","state","screen","routes","name","undefined","useLinkProps","href","action","root","useContext","navigation","options","onPress","e","shouldHandle","OS","preventDefault","hasModifierKey","metaKey","altKey","ctrlKey","shiftKey","isLeftClick","button","isSelfTarget","currentTarget","includes","target","dispatch","Error","navigate","getPathFromStateHelper","config","role"],"sourceRoot":"../../src","sources":["useLinkProps.tsx"],"mappings":";;AAAA,SACEA,gBAAgB,EAEhBC,6BAA6B,EAC7BC,wBAAwB,QAGnB,wBAAwB;AAE/B,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAAqCC,QAAQ,QAAQ,cAAc;AAEnE,SAASC,cAAc,QAAQ,qBAAkB;AAqBjD,MAAMC,kBAAkB,GACtBC,MAAwD,IACQ;EAChE,IAAIA,MAAM,EAAEC,KAAK,EAAE;IACjB,OAAOD,MAAM,CAACC,KAAK;EACrB;EAEA,IAAID,MAAM,EAAEE,MAAM,EAAE;IAClB,OAAO;MACLC,MAAM,EAAE,CACN;QACEC,IAAI,EAAEJ,MAAM,CAACE,MAAM;QACnBF,MAAM,EAAEA,MAAM,CAACA,MAAM;QACrB;QACAC,KAAK,EAAED,MAAM,CAACE,MAAM,GAChBH,kBAAkB,CAChBC,MAAM,CAACA,MAGT,CAAC,GACDK;MACN,CAAC;IAEL,CAAC;EACH;EAEA,OAAOA,SAAS;AAClB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAAkD;EAC5EJ,MAAM;EACNF,MAAM;EACNO,IAAI;EACJC;AACoB,CAAC,EAAE;EACvB,MAAMC,IAAI,GAAGb,KAAK,CAACc,UAAU,CAAChB,6BAA6B,CAAC;EAC5D,MAAMiB,UAAU,GAAGf,KAAK,CAACc,UAAU,CAACf,wBAAwB,CAAC;EAC7D,MAAM;IAAEiB;EAAQ,CAAC,GAAGhB,KAAK,CAACc,UAAU,CAACZ,cAAc,CAAC;EAEpD,MAAMe,OAAO,GACXC,CAA2E,IACxE;IACH,IAAIC,YAAY,GAAG,KAAK;IAExB,IAAIlB,QAAQ,CAACmB,EAAE,KAAK,KAAK,IAAI,CAACF,CAAC,EAAE;MAC/BA,CAAC,EAAEG,cAAc,GAAG,CAAC;MACrBF,YAAY,GAAG,IAAI;IACrB,CAAC,MAAM;MACL;MACA,MAAMG,cAAc,GACjB,SAAS,IAAIJ,CAAC,IAAIA,CAAC,CAACK,OAAO,IAC3B,QAAQ,IAAIL,CAAC,IAAIA,CAAC,CAACM,MAAO,IAC1B,SAAS,IAAIN,CAAC,IAAIA,CAAC,CAACO,OAAQ,IAC5B,UAAU,IAAIP,CAAC,IAAIA,CAAC,CAACQ,QAAS;;MAEjC;MACA,MAAMC,WAAW,GACf,QAAQ,IAAIT,CAAC,GAAGA,CAAC,CAACU,MAAM,IAAI,IAAI,IAAIV,CAAC,CAACU,MAAM,KAAK,CAAC,GAAG,IAAI;;MAE3D;MACA,MAAMC,YAAY,GAChBX,CAAC,CAACY,aAAa,IAAI,QAAQ,IAAIZ,CAAC,CAACY,aAAa,GAC1C,CAACrB,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,CAACsB,QAAQ,CAACb,CAAC,CAACY,aAAa,CAACE,MAAM,CAAC,GAC9D,IAAI;MAEV,IAAI,CAACV,cAAc,IAAIK,WAAW,IAAIE,YAAY,EAAE;QAClDX,CAAC,CAACG,cAAc,GAAG,CAAC;QACpBF,YAAY,GAAG,IAAI;MACrB;IACF;IAEA,IAAIA,YAAY,EAAE;MAChB,IAAIP,MAAM,EAAE;QACV,IAAIG,UAAU,EAAE;UACdA,UAAU,CAACkB,QAAQ,CAACrB,MAAM,CAAC;QAC7B,CAAC,MAAM,IAAIC,IAAI,EAAE;UACfA,IAAI,CAACoB,QAAQ,CAACrB,MAAM,CAAC;QACvB,CAAC,MAAM;UACL,MAAM,IAAIsB,KAAK,CACb,kFACF,CAAC;QACH;MACF,CAAC,MAAM;QACL;QACAnB,UAAU,EAAEoB,QAAQ,CAAC7B,MAAM,EAAEF,MAAM,CAAC;MACtC;IACF;EACF,CAAC;EAED,MAAMgC,sBAAsB,GAAGpB,OAAO,EAAEnB,gBAAgB,IAAIA,gBAAgB;EAE5E,OAAO;IACLc,IAAI,EACFA,IAAI,KACHV,QAAQ,CAACmB,EAAE,KAAK,KAAK,IAAId,MAAM,IAAI,IAAI,GACpC8B,sBAAsB,CACpB;MACE7B,MAAM,EAAE,CACN;QACE;QACAC,IAAI,EAAEF,MAAM;QACZ;QACAF,MAAM,EAAEA,MAAM;QACd;QACAC,KAAK,EAAEF,kBAAkB,CAACC,MAAM;MAClC,CAAC;IAEL,CAAC,EACDY,OAAO,EAAEqB,MACX,CAAC,GACD5B,SAAS,CAAC;IAChB6B,IAAI,EAAE,MAAe;IACrBrB;EACF,CAAC;AACH","ignoreList":[]}
1
+ {"version":3,"names":["CommonActions","getPathFromState","NavigationContainerRefContext","NavigationHelpersContext","React","Platform","useLatestCallback","LinkingContext","useDeepStableValue","NESTED_KEYS","NESTED_PARAMS_KEYS","NAVIGATE_ACTION_TYPES","clone","value","keys","clones","existing","get","isArray","Array","screen","state","routes","copy","undefined","WeakMap","set","key","nested","Reflect","cloned","Object","assign","getTargetFromAction","action","screens","payload","includes","type","name","params","useLinkProps","rest","root","useContext","navigation","Error","options","onPress","e","OS","hasModifierKey","metaKey","altKey","ctrlKey","shiftKey","isLeftClick","button","isSelfTarget","currentTarget","target","preventDefault","navigate","dispatch","config","href","useMemo","getPath","role"],"sourceRoot":"../../src","sources":["useLinkProps.tsx"],"mappings":"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","ignoreList":[]}
@@ -1,10 +1,11 @@
1
1
  import * as React from 'react';
2
2
  import { type GestureResponderEvent, Text, type TextProps } from 'react-native';
3
3
  import { type LinkProps } from './useLinkProps.js';
4
+ type PressEvent = React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent;
4
5
  type Props<ParamList extends ReactNavigation.RootParamList> = LinkProps<ParamList> & Omit<TextProps, 'disabled'> & {
5
6
  target?: string;
6
- onPress?: (e: React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent) => void;
7
- disabled?: boolean | null;
7
+ onPress?: (e: PressEvent) => void;
8
+ disabled?: boolean | undefined;
8
9
  children: React.ReactNode;
9
10
  };
10
11
  /**
@@ -14,9 +15,9 @@ type Props<ParamList extends ReactNavigation.RootParamList> = LinkProps<ParamLis
14
15
  * @param props.screen Name of the screen to navigate to (e.g. `'Feeds'`).
15
16
  * @param props.params Params to pass to the screen to navigate to (e.g. `{ sort: 'hot' }`).
16
17
  * @param props.href Optional absolute path to use for the href (e.g. `/feeds/hot`).
17
- * @param props.action Optional action to use for in-page navigation. By default, the path is parsed to an action based on linking config.
18
+ * @param props.action Optional action to override the in-page navigation. The `href` is still derived from `screen`, so this can be used to render a link while dispatching a different action (e.g. a `replace`).
18
19
  * @param props.children Child elements to render the content.
19
20
  */
20
- export declare function Link<ParamList extends ReactNavigation.RootParamList>({ screen, params, action, href, style, ...rest }: Props<ParamList>): React.CElement<TextProps, Text>;
21
+ export declare function Link<ParamList extends ReactNavigation.RootParamList>({ screen, params, action, href, style, target, ...rest }: Props<ParamList>): React.CElement<TextProps, Text>;
21
22
  export {};
22
23
  //# sourceMappingURL=Link.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../src/Link.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,KAAK,qBAAqB,EAE1B,IAAI,EACJ,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,mBAAgB,CAAC;AAE9D,KAAK,KAAK,CAAC,SAAS,SAAS,eAAe,CAAC,aAAa,IACxD,SAAS,CAAC,SAAS,CAAC,GAClB,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,CACR,CAAC,EACG,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,GAC/C,qBAAqB,KACtB,IAAI,CAAC;IACV,QAAQ,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEN;;;;;;;;;GASG;AACH,wBAAgB,IAAI,CAAC,SAAS,SAAS,eAAe,CAAC,aAAa,EAAE,EACpE,MAAM,EACN,MAAM,EACN,MAAM,EACN,IAAI,EACJ,KAAK,EACL,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,SAAS,CAAC,mCA2BlB"}
1
+ {"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../src/Link.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EACL,KAAK,qBAAqB,EAE1B,IAAI,EACJ,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,mBAAgB,CAAC;AAE9D,KAAK,UAAU,GACX,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,GAC/C,qBAAqB,CAAC;AAE1B,KAAK,KAAK,CAAC,SAAS,SAAS,eAAe,CAAC,aAAa,IACxD,SAAS,CAAC,SAAS,CAAC,GAClB,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAEN;;;;;;;;;GASG;AACH,wBAAgB,IAAI,CAAC,SAAS,SAAS,eAAe,CAAC,aAAa,EAAE,EACpE,MAAM,EACN,MAAM,EACN,MAAM,EACN,IAAI,EACJ,KAAK,EACL,MAAM,EACN,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,SAAS,CAAC,mCA4ClB"}
@@ -1,5 +1,5 @@
1
1
  import { type DefaultNavigatorOptions, type NavigationListBase, type ParamListBase, type StackNavigationState, type TypedNavigator } from '@react-navigation/core';
2
- declare const StackNavigator: (props: DefaultNavigatorOptions<ParamListBase, string | undefined, StackNavigationState<ParamListBase>, {}, {}, unknown>) => import("react/jsx-runtime").JSX.Element;
2
+ declare const StackNavigator: (props: DefaultNavigatorOptions<ParamListBase, string | undefined, StackNavigationState<ParamListBase>, {}, {}, unknown>) => import("react").JSX.Element;
3
3
  export declare function createStackNavigator<ParamList extends ParamListBase>(): TypedNavigator<{
4
4
  ParamList: ParamList;
5
5
  NavigatorID: string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"createStackNavigator.d.ts","sourceRoot":"","sources":["../../../../src/__stubs__/createStackNavigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,cAAc,EAEpB,MAAM,wBAAwB,CAAC;AAEhC,QAAA,MAAM,cAAc,GAClB,OAAO,uBAAuB,CAC5B,aAAa,EACb,MAAM,GAAG,SAAS,EAClB,oBAAoB,CAAC,aAAa,CAAC,EACnC,EAAE,EACF,EAAE,EACF,OAAO,CACR,4CAYF,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,SAAS,SAAS,aAAa,KAC5B,cAAc,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,KAAK,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACvC,aAAa,EAAE,EAAE,CAAC;IAClB,QAAQ,EAAE,EAAE,CAAC;IACb,cAAc,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC9C,SAAS,EAAE,OAAO,cAAc,CAAC;CAClC,CAAC,CAED"}
1
+ {"version":3,"file":"createStackNavigator.d.ts","sourceRoot":"","sources":["../../../../src/__stubs__/createStackNavigator.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAEzB,KAAK,cAAc,EAEpB,MAAM,wBAAwB,CAAC;AAEhC,QAAA,MAAM,cAAc,GAClB,OAAO,uBAAuB,CAC5B,aAAa,EACb,MAAM,GAAG,SAAS,EAClB,oBAAoB,CAAC,aAAa,CAAC,EACnC,EAAE,EACF,EAAE,EACF,OAAO,CACR,gCAYF,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,SAAS,SAAS,aAAa,KAC5B,cAAc,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,KAAK,EAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACvC,aAAa,EAAE,EAAE,CAAC;IAClB,QAAQ,EAAE,EAAE,CAAC;IACb,cAAc,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC9C,SAAS,EAAE,OAAO,cAAc,CAAC;CAClC,CAAC,CAED"}
@@ -1 +1 @@
1
- {"version":3,"file":"createMemoryHistory.d.ts","sourceRoot":"","sources":["../../../src/createMemoryHistory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,KAAK,aAAa,GAAG;IAEnB,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAIF,wBAAgB,mBAAmB;oBAmBlB,MAAM;eAcR,MAAM;wBAIG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;0BAmBd;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;6BAoBrC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;UAwC3D,MAAM;qBAgGK,MAAM,IAAI;EAqB9B"}
1
+ {"version":3,"file":"createMemoryHistory.d.ts","sourceRoot":"","sources":["../../../src/createMemoryHistory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,KAAK,aAAa,GAAG;IAEnB,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,eAAe,CAAC;IAEvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAIF,wBAAgB,mBAAmB;oBAmBlB,MAAM;eAcR,MAAM;wBAIG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;0BAmBd;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;6BAoBrC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,eAAe,CAAA;KAAE;UAwC3D,MAAM;qBAkGK,MAAM,IAAI;EAqB9B"}
@@ -0,0 +1,2 @@
1
+ export declare function useDeepStableValue<T>(value: T): T;
2
+ //# sourceMappingURL=useDeepStableValue.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useDeepStableValue.d.ts","sourceRoot":"","sources":["../../../src/useDeepStableValue.tsx"],"names":[],"mappings":"AAGA,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAQjD"}
@@ -22,10 +22,19 @@ export type LinkProps<ParamList extends ReactNavigation.RootParamList, RouteName
22
22
  * @param props.screen Name of the screen to navigate to (e.g. `'Feeds'`).
23
23
  * @param props.params Params to pass to the screen to navigate to (e.g. `{ sort: 'hot' }`).
24
24
  * @param props.href Optional absolute path to use for the href (e.g. `/feeds/hot`).
25
- * @param props.action Optional action to use for in-page navigation. By default, the path is parsed to an action based on linking config.
25
+ * @param props.action Optional action to override the in-page navigation. The `href` is still derived from `screen`, so this can be used to render a link while dispatching a different action (e.g. a `replace`).
26
26
  */
27
- export declare function useLinkProps<ParamList extends ReactNavigation.RootParamList>({ screen, params, href, action, }: LinkProps<ParamList>): {
28
- href: string | undefined;
27
+ export declare function useLinkProps<ParamList extends ReactNavigation.RootParamList>({ screen, params, action, ...rest }: LinkProps<ParamList>): {
28
+ href: string | ({
29
+ href?: string;
30
+ action?: NavigationAction;
31
+ } & (keyof ParamList extends infer T ? T extends keyof ParamList ? T extends unknown ? undefined extends ParamList[T] ? {
32
+ screen: T;
33
+ params?: ParamList[T] | undefined;
34
+ } : {
35
+ screen: T;
36
+ params: ParamList[T];
37
+ } : never : never : never))["href"] | undefined;
29
38
  role: "link";
30
39
  onPress: (e?: React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent) => void;
31
40
  };
@@ -1 +1 @@
1
- {"version":3,"file":"useLinkProps.d.ts","sourceRoot":"","sources":["../../../src/useLinkProps.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EAKtB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,qBAAqB,EAAY,MAAM,cAAc,CAAC;AAIpE,MAAM,MAAM,SAAS,CACnB,SAAS,SAAS,eAAe,CAAC,aAAa,EAC/C,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,SAAS,IAEjD,CAAC;IACC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B,GAAG,CAAC,SAAS,SAAS,OAAO,GAC1B,SAAS,SAAS,SAAS,CAAC,SAAS,CAAC,GACpC;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,GACpD;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,GACrD,KAAK,CAAC,CAAC,GACX;IACE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB,CAAC;AA+BN;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,SAAS,SAAS,eAAe,CAAC,aAAa,EAAE,EAC5E,MAAM,EACN,MAAM,EACN,IAAI,EACJ,MAAM,GACP,EAAE,SAAS,CAAC,SAAS,CAAC;;;kBAMf,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,GAAG,qBAAqB;EA0E9E"}
1
+ {"version":3,"file":"useLinkProps.d.ts","sourceRoot":"","sources":["../../../src/useLinkProps.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EAGtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,qBAAqB,EAAY,MAAM,cAAc,CAAC;AAMpE,MAAM,MAAM,SAAS,CACnB,SAAS,SAAS,eAAe,CAAC,aAAa,EAC/C,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,SAAS,IAEjD,CAAC;IACC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,gBAAgB,CAAC;CAC3B,GAAG,CAAC,SAAS,SAAS,OAAO,GAC1B,SAAS,SAAS,SAAS,CAAC,SAAS,CAAC,GACpC;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,GACpD;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,GACrD,KAAK,CAAC,CAAC,GACX;IACE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB,CAAC;AAkHN;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,SAAS,SAAS,eAAe,CAAC,aAAa,EAAE,EAC5E,MAAM,EACN,MAAM,EACN,MAAM,EACN,GAAG,IAAI,EACR,EAAE,SAAS,CAAC,SAAS,CAAC;;eA3IV,MAAM;iBACJ,gBAAgB;;;;;;;;;kBAyJrB,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,GAC/C,qBAAqB;EAkF9B"}
@@ -11,7 +11,7 @@ export declare function useLinking(ref: React.RefObject<NavigationContainerRef<P
11
11
  routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
12
12
  type: string;
13
13
  stale: false;
14
- }>, "stale" | "routes">> & Readonly<{
14
+ }>, "routes" | "stale">> & Readonly<{
15
15
  stale?: true;
16
16
  routes: import("@react-navigation/routers").PartialRoute<import("@react-navigation/routers").Route<string, object | undefined>>[];
17
17
  }> & {
@@ -23,7 +23,7 @@ export declare function useLinking(ref: React.RefObject<NavigationContainerRef<P
23
23
  routes: import("@react-navigation/routers").NavigationRoute<ParamListBase, string>[];
24
24
  type: string;
25
25
  stale: false;
26
- }>, "stale" | "routes">> & Readonly<{
26
+ }>, "routes" | "stale">> & Readonly<{
27
27
  stale?: true;
28
28
  routes: import("@react-navigation/routers").PartialRoute<import("@react-navigation/routers").Route<string, object | undefined>>[];
29
29
  }> & /*elided*/ any;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@react-navigation/native",
3
3
  "description": "React Native integration for React Navigation",
4
- "version": "7.3.8",
4
+ "version": "7.3.10",
5
5
  "keywords": [
6
6
  "react-native",
7
7
  "react-navigation",
@@ -42,25 +42,25 @@
42
42
  "clean": "del lib"
43
43
  },
44
44
  "dependencies": {
45
- "@react-navigation/core": "^7.21.5",
45
+ "@react-navigation/core": "^7.21.7",
46
46
  "escape-string-regexp": "^4.0.0",
47
47
  "fast-deep-equal": "^3.1.3",
48
48
  "nanoid": "^3.3.11",
49
- "standard-navigation": "^0.0.7",
49
+ "standard-navigation": "^0.0.8",
50
50
  "use-latest-callback": "^0.2.4"
51
51
  },
52
52
  "devDependencies": {
53
53
  "@jest/globals": "^30.0.0",
54
54
  "@testing-library/react-native": "^13.2.1",
55
- "@types/react": "~19.0.10",
56
- "@types/react-dom": "~19.1.7",
55
+ "@types/react": "~19.2.4",
56
+ "@types/react-dom": "~19.2.3",
57
57
  "del-cli": "^6.0.0",
58
- "react": "19.1.0",
59
- "react-dom": "19.1.0",
60
- "react-native": "0.81.5",
58
+ "react": "19.2.3",
59
+ "react-dom": "19.2.3",
60
+ "react-native": "0.85.3",
61
61
  "react-native-builder-bob": "^0.42.1",
62
- "react-test-renderer": "19.1.0",
63
- "typescript": "^5.9.2"
62
+ "react-test-renderer": "19.2.3",
63
+ "typescript": "~6.0.3"
64
64
  },
65
65
  "peerDependencies": {
66
66
  "react": ">= 18.2.0",
@@ -84,5 +84,5 @@
84
84
  ]
85
85
  ]
86
86
  },
87
- "gitHead": "239bf71a90e8f8a5264bab48926c7be1d28c2bc6"
87
+ "gitHead": "449fee23ff8ebf226dad3328d711d1b95734d23b"
88
88
  }
package/src/Link.tsx CHANGED
@@ -9,16 +9,16 @@ import {
9
9
 
10
10
  import { type LinkProps, useLinkProps } from './useLinkProps';
11
11
 
12
+ type PressEvent =
13
+ | React.MouseEvent<HTMLAnchorElement, MouseEvent>
14
+ | GestureResponderEvent;
15
+
12
16
  type Props<ParamList extends ReactNavigation.RootParamList> =
13
17
  LinkProps<ParamList> &
14
18
  Omit<TextProps, 'disabled'> & {
15
19
  target?: string;
16
- onPress?: (
17
- e:
18
- | React.MouseEvent<HTMLAnchorElement, MouseEvent>
19
- | GestureResponderEvent
20
- ) => void;
21
- disabled?: boolean | null;
20
+ onPress?: (e: PressEvent) => void;
21
+ disabled?: boolean | undefined;
22
22
  children: React.ReactNode;
23
23
  };
24
24
 
@@ -29,7 +29,7 @@ type Props<ParamList extends ReactNavigation.RootParamList> =
29
29
  * @param props.screen Name of the screen to navigate to (e.g. `'Feeds'`).
30
30
  * @param props.params Params to pass to the screen to navigate to (e.g. `{ sort: 'hot' }`).
31
31
  * @param props.href Optional absolute path to use for the href (e.g. `/feeds/hot`).
32
- * @param props.action Optional action to use for in-page navigation. By default, the path is parsed to an action based on linking config.
32
+ * @param props.action Optional action to override the in-page navigation. The `href` is still derived from `screen`, so this can be used to render a link while dispatching a different action (e.g. a `replace`).
33
33
  * @param props.children Child elements to render the content.
34
34
  */
35
35
  export function Link<ParamList extends ReactNavigation.RootParamList>({
@@ -38,15 +38,23 @@ export function Link<ParamList extends ReactNavigation.RootParamList>({
38
38
  action,
39
39
  href,
40
40
  style,
41
+ target,
41
42
  ...rest
42
43
  }: Props<ParamList>) {
43
- const { colors, fonts } = useTheme();
44
44
  // @ts-expect-error: This is already type-checked by the prop types
45
45
  const props = useLinkProps<ParamList>({ screen, params, action, href });
46
46
 
47
- const onPress = (
48
- e: React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent
49
- ) => {
47
+ // Keep usage of `useTheme` after `useLinkProps`
48
+ // This ensures proper error when used outside of navigation container
49
+ const { colors, fonts } = useTheme();
50
+
51
+ const onPress = (e: PressEvent) => {
52
+ if (rest.disabled) {
53
+ e.preventDefault();
54
+ e.stopPropagation();
55
+ return;
56
+ }
57
+
50
58
  if ('onPress' in rest) {
51
59
  rest.onPress?.(e);
52
60
  }
@@ -61,7 +69,17 @@ export function Link<ParamList extends ReactNavigation.RootParamList>({
61
69
  ...props,
62
70
  ...rest,
63
71
  ...Platform.select({
64
- web: { onClick: onPress } as any,
72
+ web: {
73
+ 'aria-disabled': rest.disabled,
74
+ 'onAuxClick': rest.disabled
75
+ ? (e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
76
+ e.preventDefault();
77
+ e.stopPropagation();
78
+ }
79
+ : undefined,
80
+ 'onClick': onPress,
81
+ 'hrefAttrs': { target },
82
+ },
65
83
  default: { onPress },
66
84
  }),
67
85
  style: [{ color: colors.primary }, fonts.regular, style],
@@ -195,6 +195,8 @@ export function createMemoryHistory() {
195
195
  // But on Firefox, it seems to take much longer, around 50ms from our testing
196
196
  // We're using a hacky timeout since there doesn't seem to be way to know for sure
197
197
  const timer = setTimeout(() => {
198
+ window.removeEventListener('popstate', onPopState);
199
+
198
200
  const foundIndex = pending.findIndex((it) => it.ref === done);
199
201
 
200
202
  if (foundIndex > -1) {
@@ -0,0 +1,12 @@
1
+ import isEqual from 'fast-deep-equal';
2
+ import * as React from 'react';
3
+
4
+ export function useDeepStableValue<T>(value: T): T {
5
+ const valueRef = React.useRef(value);
6
+
7
+ if (!isEqual(valueRef.current, value)) {
8
+ valueRef.current = value;
9
+ }
10
+
11
+ return valueRef.current;
12
+ }
@@ -1,16 +1,16 @@
1
1
  import {
2
+ CommonActions,
2
3
  getPathFromState,
3
4
  type NavigationAction,
4
5
  NavigationContainerRefContext,
5
6
  NavigationHelpersContext,
6
- type NavigatorScreenParams,
7
- type ParamListBase,
8
7
  } from '@react-navigation/core';
9
- import type { NavigationState, PartialState } from '@react-navigation/routers';
10
8
  import * as React from 'react';
11
9
  import { type GestureResponderEvent, Platform } from 'react-native';
10
+ import useLatestCallback from 'use-latest-callback';
12
11
 
13
12
  import { LinkingContext } from './LinkingContext';
13
+ import { useDeepStableValue } from './useDeepStableValue';
14
14
 
15
15
  export type LinkProps<
16
16
  ParamList extends ReactNavigation.RootParamList,
@@ -31,33 +31,116 @@ export type LinkProps<
31
31
  params?: undefined;
32
32
  };
33
33
 
34
- const getStateFromParams = (
35
- params: NavigatorScreenParams<ParamListBase> | undefined
36
- ): PartialState<NavigationState> | NavigationState | undefined => {
37
- if (params?.state) {
38
- return params.state;
34
+ const NESTED_KEYS = ['payload', 'params', 'state', 'routes'] as const;
35
+ const NESTED_PARAMS_KEYS = ['params', 'state'] as const;
36
+ const NAVIGATE_ACTION_TYPES = [
37
+ 'NAVIGATE',
38
+ 'PUSH',
39
+ 'REPLACE',
40
+ 'POP_TO',
41
+ 'JUMP_TO',
42
+ ];
43
+
44
+ /**
45
+ * Nested params are tracked as consumed after handling
46
+ * So navigating with same params again won't work
47
+ * This can happen if the action or params are memoized
48
+ * Or component hasn't re-renderd to re-create inline objects
49
+ * So we clone the action and params when necessary before dispatch
50
+ */
51
+ function clone<T>(value: T): T;
52
+ function clone(
53
+ value: unknown,
54
+ keys: typeof NESTED_KEYS | typeof NESTED_PARAMS_KEYS,
55
+ clones: WeakMap<object, object>
56
+ ): unknown;
57
+ function clone(
58
+ value: unknown,
59
+ keys: typeof NESTED_KEYS | typeof NESTED_PARAMS_KEYS = NESTED_KEYS,
60
+ clones?: WeakMap<object, object>
61
+ ): unknown {
62
+ if (typeof value !== 'object' || value == null) {
63
+ return value;
39
64
  }
40
65
 
41
- if (params?.screen) {
42
- return {
43
- routes: [
44
- {
45
- name: params.screen,
46
- params: params.params,
47
- // @ts-expect-error this is fine 🔥
48
- state: params.screen
49
- ? getStateFromParams(
50
- params.params as
51
- | NavigatorScreenParams<ParamListBase>
52
- | undefined
53
- )
54
- : undefined,
55
- },
56
- ],
57
- };
66
+ const existing = clones?.get(value);
67
+
68
+ if (existing) {
69
+ return existing;
70
+ }
71
+
72
+ const isArray = Array.isArray(value);
73
+
74
+ if (
75
+ keys === NESTED_PARAMS_KEYS &&
76
+ 'screen' in value &&
77
+ typeof value.screen !== 'string' &&
78
+ !(
79
+ 'state' in value &&
80
+ typeof value.state === 'object' &&
81
+ value.state != null &&
82
+ 'routes' in value.state &&
83
+ Array.isArray(value.state.routes)
84
+ )
85
+ ) {
86
+ return value;
87
+ }
88
+
89
+ let copy: object | undefined =
90
+ keys === NESTED_PARAMS_KEYS ? { ...value } : undefined;
91
+
92
+ clones ??= new WeakMap();
93
+ clones.set(value, copy ?? value);
94
+
95
+ for (const key of isArray ? value.keys() : keys) {
96
+ const nested: unknown = Reflect.get(value, key);
97
+
98
+ const cloned = clone(
99
+ nested,
100
+ key === 'params' ? NESTED_PARAMS_KEYS : NESTED_KEYS,
101
+ clones
102
+ );
103
+
104
+ if (cloned !== nested) {
105
+ copy ??= isArray ? [...value] : { ...value };
106
+ clones.set(value, copy);
107
+
108
+ Object.assign(copy, { [key]: cloned });
109
+ }
110
+ }
111
+
112
+ return copy ?? value;
113
+ }
114
+
115
+ const getTargetFromAction = (
116
+ action: NavigationAction | undefined,
117
+ screens: Record<string, unknown> | undefined
118
+ ) => {
119
+ if (action === undefined || screens === undefined) {
120
+ return undefined;
121
+ }
122
+
123
+ const { payload } = action;
124
+
125
+ if (
126
+ !NAVIGATE_ACTION_TYPES.includes(action.type) ||
127
+ payload === undefined ||
128
+ !('name' in payload) ||
129
+ typeof payload.name !== 'string' ||
130
+ !(payload.name in screens)
131
+ ) {
132
+ return undefined;
58
133
  }
59
134
 
60
- return undefined;
135
+ return {
136
+ screen: payload.name,
137
+ params:
138
+ 'params' in payload &&
139
+ typeof payload.params === 'object' &&
140
+ payload.params != null
141
+ ? payload.params
142
+ : undefined,
143
+ };
61
144
  };
62
145
 
63
146
  /**
@@ -66,90 +149,108 @@ const getStateFromParams = (
66
149
  * @param props.screen Name of the screen to navigate to (e.g. `'Feeds'`).
67
150
  * @param props.params Params to pass to the screen to navigate to (e.g. `{ sort: 'hot' }`).
68
151
  * @param props.href Optional absolute path to use for the href (e.g. `/feeds/hot`).
69
- * @param props.action Optional action to use for in-page navigation. By default, the path is parsed to an action based on linking config.
152
+ * @param props.action Optional action to override the in-page navigation. The `href` is still derived from `screen`, so this can be used to render a link while dispatching a different action (e.g. a `replace`).
70
153
  */
71
154
  export function useLinkProps<ParamList extends ReactNavigation.RootParamList>({
72
155
  screen,
73
156
  params,
74
- href,
75
157
  action,
158
+ ...rest
76
159
  }: LinkProps<ParamList>) {
77
160
  const root = React.useContext(NavigationContainerRefContext);
78
- const navigation = React.useContext(NavigationHelpersContext);
161
+ const navigation = React.useContext(NavigationHelpersContext) ?? root;
162
+
163
+ if (navigation == null) {
164
+ throw new Error(
165
+ "Couldn't find a navigation object. Is your component inside NavigationContainer?"
166
+ );
167
+ }
168
+
79
169
  const { options } = React.useContext(LinkingContext);
80
170
 
81
- const onPress = (
82
- e?: React.MouseEvent<HTMLAnchorElement, MouseEvent> | GestureResponderEvent
83
- ) => {
84
- let shouldHandle = false;
85
-
86
- if (Platform.OS !== 'web' || !e) {
87
- e?.preventDefault?.();
88
- shouldHandle = true;
89
- } else {
90
- // ignore clicks with modifier keys
91
- const hasModifierKey =
92
- ('metaKey' in e && e.metaKey) ||
93
- ('altKey' in e && e.altKey) ||
94
- ('ctrlKey' in e && e.ctrlKey) ||
95
- ('shiftKey' in e && e.shiftKey);
96
-
97
- // only handle left clicks
98
- const isLeftClick =
99
- 'button' in e ? e.button == null || e.button === 0 : true;
100
-
101
- // let browser handle "target=_blank" etc.
102
- const isSelfTarget =
103
- e.currentTarget && 'target' in e.currentTarget
104
- ? [undefined, null, '', 'self'].includes(e.currentTarget.target)
105
- : true;
106
-
107
- if (!hasModifierKey && isLeftClick && isSelfTarget) {
108
- e.preventDefault?.();
109
- shouldHandle = true;
171
+ const onPress = useLatestCallback(
172
+ (
173
+ e?:
174
+ | React.MouseEvent<HTMLAnchorElement, MouseEvent>
175
+ | GestureResponderEvent
176
+ ) => {
177
+ if (Platform.OS === 'web' && e) {
178
+ const hasModifierKey =
179
+ ('metaKey' in e && e.metaKey) ||
180
+ ('altKey' in e && e.altKey) ||
181
+ ('ctrlKey' in e && e.ctrlKey) ||
182
+ ('shiftKey' in e && e.shiftKey);
183
+
184
+ const isLeftClick =
185
+ 'button' in e ? e.button == null || e.button === 0 : true;
186
+
187
+ const isSelfTarget =
188
+ e.currentTarget && 'target' in e.currentTarget
189
+ ? [undefined, null, '', '_self'].includes(e.currentTarget.target)
190
+ : true;
191
+
192
+ if (hasModifierKey || !isLeftClick || !isSelfTarget) {
193
+ return;
194
+ }
110
195
  }
111
- }
112
196
 
113
- if (shouldHandle) {
114
- if (action) {
115
- if (navigation) {
116
- navigation.dispatch(action);
117
- } else if (root) {
118
- root.dispatch(action);
119
- } else {
197
+ e?.preventDefault();
198
+
199
+ let cloned: NavigationAction;
200
+
201
+ if (action != null) {
202
+ cloned = clone(action);
203
+ } else {
204
+ if (screen == null) {
120
205
  throw new Error(
121
- "Couldn't find a navigation object. Is your component inside NavigationContainer?"
206
+ "Couldn't find a screen to navigate to. Make sure to provide a screen name."
122
207
  );
123
208
  }
124
- } else {
125
- // @ts-expect-error This is already type-checked by the prop types
126
- navigation?.navigate(screen, params);
209
+
210
+ cloned = clone(
211
+ // @ts-expect-error This is already type-checked by the prop types
212
+ CommonActions.navigate(screen, params)
213
+ );
127
214
  }
215
+
216
+ navigation.dispatch(cloned);
128
217
  }
129
- };
218
+ );
219
+
220
+ const target = useDeepStableValue(
221
+ Platform.OS === 'web'
222
+ ? typeof screen === 'string'
223
+ ? {
224
+ screen,
225
+ params:
226
+ typeof params === 'object' && params != null ? params : undefined,
227
+ }
228
+ : getTargetFromAction(action, options?.config?.screens)
229
+ : undefined
230
+ );
231
+
232
+ const href = React.useMemo(() => {
233
+ if (Platform.OS !== 'web' || rest.href != null || target == null) {
234
+ return rest.href;
235
+ }
236
+
237
+ const getPath = options?.getPathFromState ?? getPathFromState;
130
238
 
131
- const getPathFromStateHelper = options?.getPathFromState ?? getPathFromState;
239
+ return getPath(
240
+ {
241
+ routes: [
242
+ {
243
+ name: target.screen,
244
+ params: target.params,
245
+ },
246
+ ],
247
+ },
248
+ options?.config
249
+ );
250
+ }, [rest.href, target, options?.getPathFromState, options?.config]);
132
251
 
133
252
  return {
134
- href:
135
- href ??
136
- (Platform.OS === 'web' && screen != null
137
- ? getPathFromStateHelper(
138
- {
139
- routes: [
140
- {
141
- // @ts-expect-error this is fine 🔥
142
- name: screen,
143
- // @ts-expect-error this is fine 🔥
144
- params: params,
145
- // @ts-expect-error this is fine 🔥
146
- state: getStateFromParams(params),
147
- },
148
- ],
149
- },
150
- options?.config
151
- )
152
- : undefined),
253
+ href,
153
254
  role: 'link' as const,
154
255
  onPress,
155
256
  };