@react-navigation/native 8.0.0-alpha.33 → 8.0.0-alpha.35
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.
- package/lib/module/NavigationContainer.js +3 -3
- package/lib/module/NavigationContainer.js.map +1 -1
- package/lib/module/createMemoryHistory.js +7 -1
- package/lib/module/createMemoryHistory.js.map +1 -1
- package/lib/module/createStandardNavigationFactories.js.map +1 -1
- package/lib/module/native/CornerInset.ios.js +4 -1
- package/lib/module/native/CornerInset.ios.js.map +1 -1
- package/lib/module/native/MaterialSymbolViewNativeComponent.ts +2 -2
- package/lib/module/native/SFSymbolViewNativeComponent.ts +4 -4
- package/lib/module/useBackButton.native.js +4 -1
- package/lib/module/useBackButton.native.js.map +1 -1
- package/lib/module/useLinking.js +51 -27
- package/lib/module/useLinking.js.map +1 -1
- package/lib/typescript/src/NavigationContainer.d.ts +1 -1
- package/lib/typescript/src/NavigationContainer.d.ts.map +1 -1
- package/lib/typescript/src/createMemoryHistory.d.ts.map +1 -1
- package/lib/typescript/src/createStandardNavigationFactories.d.ts +4 -2
- package/lib/typescript/src/createStandardNavigationFactories.d.ts.map +1 -1
- package/lib/typescript/src/native/CornerInset.ios.d.ts.map +1 -1
- package/lib/typescript/src/native/MaterialSymbolViewNativeComponent.d.ts +2 -2
- package/lib/typescript/src/native/MaterialSymbolViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/src/native/SFSymbolViewNativeComponent.d.ts +4 -4
- package/lib/typescript/src/native/SFSymbolViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/src/useBackButton.native.d.ts.map +1 -1
- package/lib/typescript/src/useLinkProps.d.ts +4 -4
- package/lib/typescript/src/useLinkProps.d.ts.map +1 -1
- package/lib/typescript/src/useLinking.d.ts.map +1 -1
- package/package.json +4 -3
- package/src/NavigationContainer.tsx +5 -5
- package/src/createMemoryHistory.tsx +7 -1
- package/src/createStandardNavigationFactories.tsx +9 -8
- package/src/native/CornerInset.ios.tsx +2 -0
- package/src/native/MaterialSymbolViewNativeComponent.ts +2 -2
- package/src/native/SFSymbolViewNativeComponent.ts +4 -4
- package/src/useBackButton.native.tsx +2 -0
- package/src/useLinkProps.tsx +4 -4
- package/src/useLinking.tsx +85 -30
|
@@ -30,9 +30,6 @@ export function NavigationContainer({
|
|
|
30
30
|
ref,
|
|
31
31
|
...rest
|
|
32
32
|
}) {
|
|
33
|
-
if (linking?.config) {
|
|
34
|
-
validatePathConfig(linking.config);
|
|
35
|
-
}
|
|
36
33
|
const refContainer = React.useRef(null);
|
|
37
34
|
useBackButton(refContainer);
|
|
38
35
|
useDocumentTitle(refContainer, documentTitle);
|
|
@@ -44,6 +41,9 @@ export function NavigationContainer({
|
|
|
44
41
|
}
|
|
45
42
|
};
|
|
46
43
|
}
|
|
44
|
+
if (linking?.config) {
|
|
45
|
+
validatePathConfig(linking.config);
|
|
46
|
+
}
|
|
47
47
|
return {
|
|
48
48
|
options: {
|
|
49
49
|
...linking,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["BaseNavigationContainer","getActionFromState","getPathFromState","getStateFromPath","ThemeProvider","validatePathConfig","React","I18nManager","Platform","LinkingContext","LocaleDirContext","LightTheme","useBackButton","useDocumentTitle","useLinking","useThenable","jsx","_jsx","globalThis","REACT_NAVIGATION_DEVTOOLS","WeakMap","RESTORE_STATE_ERROR","NavigationContainer","direction","getConstants","isRTL","theme","linking","persistor","fallback","documentTitle","onStateChange","ref","rest","
|
|
1
|
+
{"version":3,"names":["BaseNavigationContainer","getActionFromState","getPathFromState","getStateFromPath","ThemeProvider","validatePathConfig","React","I18nManager","Platform","LinkingContext","LocaleDirContext","LightTheme","useBackButton","useDocumentTitle","useLinking","useThenable","jsx","_jsx","globalThis","REACT_NAVIGATION_DEVTOOLS","WeakMap","RESTORE_STATE_ERROR","NavigationContainer","direction","getConstants","isRTL","theme","linking","persistor","fallback","documentTitle","onStateChange","ref","rest","refContainer","useRef","linkingConfig","useMemo","options","enabled","config","prefixes","getInitialState","useEffect","current","previous","get","listeners","Set","set","isLinkStateResolved","initialStateFromLink","initialState","undefined","isPersistenceSupported","OS","isPersistedStateResolved","initialStateFromPersisted","restoredState","restore","e","console","error","then","state","thenable","onfulfilled","Promise","resolve","useImperativeHandle","isStateReady","Provider","value","children","persist"],"sourceRoot":"../../src","sources":["NavigationContainer.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -143,6 +143,7 @@ export function createMemoryHistory() {
|
|
|
143
143
|
if (n === 0) {
|
|
144
144
|
return;
|
|
145
145
|
}
|
|
146
|
+
const targetId = items[index]?.id;
|
|
146
147
|
|
|
147
148
|
// When we call `history.go`, `popstate` will fire when there's history to go back to
|
|
148
149
|
// So we need to somehow handle following cases:
|
|
@@ -152,7 +153,12 @@ export function createMemoryHistory() {
|
|
|
152
153
|
return new Promise((resolve, reject) => {
|
|
153
154
|
const done = interrupted => {
|
|
154
155
|
clearTimeout(timer);
|
|
155
|
-
|
|
156
|
+
|
|
157
|
+
// The current entry may not be the one we intended to land on:
|
|
158
|
+
// - The traversal didn't happen yet, e.g. it took longer than the timeout
|
|
159
|
+
// - The user navigated in the browser while our traversal was in-flight
|
|
160
|
+
// So we treat it the same as the operation being interrupted
|
|
161
|
+
if (interrupted || window.history.state?.id !== targetId) {
|
|
156
162
|
reject(new Error('History was changed during navigation.'));
|
|
157
163
|
return;
|
|
158
164
|
}
|
|
@@ -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","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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
|
|
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":";;AACA,SAASA,MAAM,QAAQ,mBAAmB;AAW1C,MAAMC,kBAAkB,GAAIC,IAAY,IAAKA,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;AAErE,OAAO,SAASC,mBAAmBA,CAAA,EAAG;EACpC,IAAIC,KAAK,GAAG,CAAC;EACb,IAAIC,KAAsB,GAAG,EAAE;;EAE/B;EACA;EACA,MAAMC,OAAgE,GAAG,EAAE;EAE3E,MAAMC,SAAS,GAAGA,CAAA,KAAM;IACtB;IACA;IACA;IACAD,OAAO,CAACE,OAAO,CAAEC,EAAE,IAAK;MACtB,MAAMC,EAAE,GAAGD,EAAE,CAACC,EAAE;MAChBD,EAAE,CAACC,EAAE,GAAG,MAAMA,EAAE,CAAC,IAAI,CAAC;IACxB,CAAC,CAAC;EACJ,CAAC;EAED,MAAMC,OAAO,GAAG;IACd,IAAIP,KAAKA,CAAA,EAAW;MAClB;MACA;MACA,MAAMQ,EAAE,GAAGC,MAAM,CAACF,OAAO,CAACG,KAAK,EAAEF,EAAE;MAEnC,IAAIA,EAAE,EAAE;QACN,MAAMR,KAAK,GAAGC,KAAK,CAACU,SAAS,CAAEC,IAAI,IAAKA,IAAI,CAACJ,EAAE,KAAKA,EAAE,CAAC;QAEvD,OAAOR,KAAK,GAAG,CAAC,CAAC,GAAGA,KAAK,GAAG,CAAC;MAC/B;MAEA,OAAO,CAAC;IACV,CAAC;IAEDa,GAAGA,CAACb,KAAa,EAAE;MACjB,OAAOC,KAAK,CAACD,KAAK,CAAC;IACrB,CAAC;IAEDc,SAASA,CAAC;MAAEjB;IAAuB,CAAC,EAAE;MACpC,MAAMkB,eAAe,GAAGnB,kBAAkB,CAACC,IAAI,CAAC;;MAEhD;MACA,KAAK,IAAImB,CAAC,GAAGhB,KAAK,GAAG,CAAC,EAAEgB,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;QACnC,MAAMJ,IAAI,GAAGX,KAAK,CAACe,CAAC,CAAC;QAErB,IAAIJ,IAAI,IAAI,IAAI,EAAE;UAChB;QACF;QAEA,IAAIA,IAAI,CAACf,IAAI,KAAKkB,eAAe,EAAE;UACjC,OAAOC,CAAC;QACV;MACF;MAEA,OAAO,CAAC,CAAC;IACX,CAAC;IAEDC,IAAIA,CAAC;MAAEpB,IAAI;MAAEa;IAAgD,CAAC,EAAE;MAC9DP,SAAS,CAAC,CAAC;MAEX,MAAMK,EAAE,GAAGb,MAAM,CAAC,CAAC;MACnB,MAAMoB,eAAe,GAAGnB,kBAAkB,CAACC,IAAI,CAAC;;MAEhD;MACA;MACAI,KAAK,GAAGA,KAAK,CAACiB,KAAK,CAAC,CAAC,EAAElB,KAAK,GAAG,CAAC,CAAC;MAEjCC,KAAK,CAACgB,IAAI,CAAC;QAAEpB,IAAI,EAAEkB,eAAe;QAAEL,KAAK;QAAEF;MAAG,CAAC,CAAC;MAChDR,KAAK,GAAGC,KAAK,CAACkB,MAAM,GAAG,CAAC;;MAExB;MACA;MACA;MACA;MACAV,MAAM,CAACF,OAAO,CAACa,SAAS,CAAC;QAAEZ;MAAG,CAAC,EAAE,EAAE,EAAEX,IAAI,CAAC;IAC5C,CAAC;IAEDwB,OAAOA,CAAC;MAAExB,IAAI;MAAEa;IAAgD,CAAC,EAAE;MACjEP,SAAS,CAAC,CAAC;MAEX,MAAMK,EAAE,GAAGC,MAAM,CAACF,OAAO,CAACG,KAAK,EAAEF,EAAE,IAAIb,MAAM,CAAC,CAAC;MAC/C,MAAMoB,eAAe,GAAGnB,kBAAkB,CAACC,IAAI,CAAC;;MAEhD;MACA;MACA,IAAIyB,YAAY,GAAGzB,IAAI;MACvB,MAAM0B,IAAI,GAAGD,YAAY,CAACE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAGC,QAAQ,CAACF,IAAI;MAE5D,IAAI,CAACtB,KAAK,CAACkB,MAAM,IAAIlB,KAAK,CAACU,SAAS,CAAEC,IAAI,IAAKA,IAAI,CAACJ,EAAE,KAAKA,EAAE,CAAC,GAAG,CAAC,EAAE;QAClE;QACA;QACA;QACA;QACA;QACA;;QAEAc,YAAY,GAAGA,YAAY,GAAGC,IAAI;QAClCtB,KAAK,GAAG,CAAC;UAAEJ,IAAI,EAAEkB,eAAe;UAAEL,KAAK;UAAEF;QAAG,CAAC,CAAC;QAC9CR,KAAK,GAAG,CAAC;MACX,CAAC,MAAM;QACL,MAAMY,IAAI,GAAGX,KAAK,CAACD,KAAK,CAAC;QAEzB,IAAIY,IAAI,EAAEf,IAAI,KAAKkB,eAAe,EAAE;UAClCO,YAAY,GAAGA,YAAY,GAAGC,IAAI;QACpC;QAEAtB,KAAK,CAACD,KAAK,CAAC,GAAG;UAAEH,IAAI,EAAEkB,eAAe;UAAEL,KAAK;UAAEF;QAAG,CAAC;MACrD;MAEAC,MAAM,CAACF,OAAO,CAACmB,YAAY,CAAC;QAAElB;MAAG,CAAC,EAAE,EAAE,EAAEc,YAAY,CAAC;IACvD,CAAC;IAED;IACA;IACA;IACA;IACA;IACAK,EAAEA,CAACC,CAAS,EAAE;MACZzB,SAAS,CAAC,CAAC;;MAEX;MACA;MACA,MAAM0B,SAAS,GAAG7B,KAAK,GAAG4B,CAAC;MAC3B,MAAME,aAAa,GAAG7B,KAAK,CAACkB,MAAM,GAAG,CAAC;MACtC,IAAIS,CAAC,GAAG,CAAC,IAAI,CAAC3B,KAAK,CAAC4B,SAAS,CAAC,EAAE;QAC9B;QACAD,CAAC,GAAG,CAAC5B,KAAK;QACVA,KAAK,GAAG,CAAC;MACX,CAAC,MAAM,IAAI4B,CAAC,GAAG,CAAC,IAAIC,SAAS,GAAGC,aAAa,EAAE;QAC7C;QACAF,CAAC,GAAGE,aAAa,GAAG9B,KAAK;QACzBA,KAAK,GAAG8B,aAAa;MACvB,CAAC,MAAM;QACL9B,KAAK,GAAG6B,SAAS;MACnB;MAEA,IAAID,CAAC,KAAK,CAAC,EAAE;QACX;MACF;MAEA,MAAMG,QAAQ,GAAG9B,KAAK,CAACD,KAAK,CAAC,EAAEQ,EAAE;;MAEjC;MACA;MACA;MACA;MACA;MACA,OAAO,IAAIwB,OAAO,CAAO,CAACC,OAAO,EAAEC,MAAM,KAAK;QAC5C,MAAMC,IAAI,GAAIC,WAAqB,IAAK;UACtCC,YAAY,CAACC,KAAK,CAAC;;UAEnB;UACA;UACA;UACA;UACA,IAAIF,WAAW,IAAI3B,MAAM,CAACF,OAAO,CAACG,KAAK,EAAEF,EAAE,KAAKuB,QAAQ,EAAE;YACxDG,MAAM,CAAC,IAAIK,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC3D;UACF;;UAEA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA,MAAM;YAAEC;UAAM,CAAC,GAAG/B,MAAM,CAACgC,QAAQ;UAEjChC,MAAM,CAACgC,QAAQ,CAACD,KAAK,GAAG,EAAE;UAC1B/B,MAAM,CAACgC,QAAQ,CAACD,KAAK,GAAGA,KAAK;UAE7BP,OAAO,CAAC,CAAC;QACX,CAAC;QAED/B,OAAO,CAACe,IAAI,CAAC;UAAEyB,GAAG,EAAEP,IAAI;UAAE7B,EAAE,EAAE6B;QAAK,CAAC,CAAC;;QAErC;QACA;QACA;QACA;QACA;QACA,MAAMG,KAAK,GAAGK,UAAU,CAAC,MAAM;UAC7B,MAAMC,UAAU,GAAG1C,OAAO,CAACS,SAAS,CAAEN,EAAE,IAAKA,EAAE,CAACqC,GAAG,KAAKP,IAAI,CAAC;UAE7D,IAAIS,UAAU,GAAG,CAAC,CAAC,EAAE;YACnB1C,OAAO,CAAC0C,UAAU,CAAC,EAAEtC,EAAE,CAAC,CAAC;YACzBJ,OAAO,CAAC2C,MAAM,CAACD,UAAU,EAAE,CAAC,CAAC;UAC/B;UAEA5C,KAAK,GAAG,IAAI,CAACA,KAAK;QACpB,CAAC,EAAE,GAAG,CAAC;QAEP,MAAM8C,UAAU,GAAGA,CAAA,KAAM;UACvB;UACA;UACA9C,KAAK,GAAG,IAAI,CAACA,KAAK;UAElB,MAAM+C,IAAI,GAAG7C,OAAO,CAAC8C,GAAG,CAAC,CAAC;UAE1BvC,MAAM,CAACwC,mBAAmB,CAAC,UAAU,EAAEH,UAAU,CAAC;UAClDC,IAAI,EAAEzC,EAAE,CAAC,CAAC;QACZ,CAAC;QAEDG,MAAM,CAACyC,gBAAgB,CAAC,UAAU,EAAEJ,UAAU,CAAC;QAC/CrC,MAAM,CAACF,OAAO,CAACoB,EAAE,CAACC,CAAC,CAAC;MACtB,CAAC,CAAC;IACJ,CAAC;IAED;IACA;IACA;IACAuB,MAAMA,CAACC,QAAoB,EAAE;MAC3B,MAAMN,UAAU,GAAGA,CAAA,KAAM;QACvB;QACA;QACA9C,KAAK,GAAG,IAAI,CAACA,KAAK;QAElB,IAAIE,OAAO,CAACiB,MAAM,EAAE;UAClB;UACA;QACF;QAEAiC,QAAQ,CAAC,CAAC;MACZ,CAAC;MAED3C,MAAM,CAACyC,gBAAgB,CAAC,UAAU,EAAEJ,UAAU,CAAC;MAE/C,OAAO,MAAMrC,MAAM,CAACwC,mBAAmB,CAAC,UAAU,EAAEH,UAAU,CAAC;IACjE;EACF,CAAC;EAED,OAAOvC,OAAO;AAChB","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CommonActions","createNavigatorFactory","createScreenFactory","useNavigationBuilder","React","useBuildHref","useMemoArray","jsx","_jsx","createStandardNavigationFactories","navigator","router","mapper","type","version","NavigatorContent","Error","StandardNavigationNavigator","props","builder","buildHref","routes","state","map","route","href","name","params","key","useMemo","index","descriptors","descriptor","options","render","actions","navigate","navigation","dispatch","target","back","goBack","emitter","emit","mapped","children","initialRouteName","layout","routeNamesChangeBehavior","routerOverride","screenLayout","screenListeners","screenOptions","rest","NavigationContent","createNavigator","createScreen"],"sourceRoot":"../../src","sources":["createStandardNavigationFactories.tsx"],"mappings":";;AAAA,SACEA,aAAa,EACbC,sBAAsB,EACtBC,mBAAmB,EAOnBC,oBAAoB,QACf,wBAAwB;AAC/B,OAAO,KAAKC,KAAK,MAAM,OAAO;AAM9B,SAASC,YAAY,QAAQ,qBAAkB;AAC/C,SAASC,YAAY,QAAQ,mBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAwC9C,OAAO,SAASC,iCAAiCA,
|
|
1
|
+
{"version":3,"names":["CommonActions","createNavigatorFactory","createScreenFactory","useNavigationBuilder","React","useBuildHref","useMemoArray","jsx","_jsx","createStandardNavigationFactories","navigator","router","mapper","type","version","NavigatorContent","Error","StandardNavigationNavigator","props","builder","buildHref","routes","state","map","route","href","name","params","key","useMemo","index","descriptors","descriptor","options","render","actions","navigate","navigation","dispatch","target","back","goBack","emitter","emit","mapped","children","initialRouteName","layout","routeNamesChangeBehavior","routerOverride","screenLayout","screenListeners","screenOptions","rest","NavigationContent","createNavigator","createScreen"],"sourceRoot":"../../src","sources":["createStandardNavigationFactories.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -28,7 +28,10 @@ export function CornerInset({
|
|
|
28
28
|
// We freeze the corner insets after initial measurements
|
|
29
29
|
// This is to avoid the insets getting out of sync during transitions
|
|
30
30
|
// We trigger a relayout explicitly on window resize and transition end
|
|
31
|
-
|
|
31
|
+
// eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener
|
|
32
|
+
const unsubscribeWindowResize = Dimensions.addEventListener('change',
|
|
33
|
+
// eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener
|
|
34
|
+
() => {
|
|
32
35
|
relayout();
|
|
33
36
|
if (animationFrameHandle) {
|
|
34
37
|
cancelAnimationFrame(animationFrameHandle);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NavigationContainerRefContext","React","Dimensions","ReactNavigationCornerInsetViewNativeComponent","Commands","jsx","_jsx","CornerInset","ref","rest","root","use","nativeRef","useRef","relayout","useCallback","current","useEffect","animationFrameHandle","unsubscribeWindowResize","addEventListener","cancelAnimationFrame","requestAnimationFrame","unsubscribeTransition","addListener","e","data","type","remove","useImperativeHandle"],"sourceRoot":"../../../src","sources":["native/CornerInset.ios.tsx"],"mappings":";;AAAA,SAASA,6BAA6B,QAAQ,wBAAwB;AACtE,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,QAAQ,cAAc;;AAEzC;;AAEA,OAAOC,6CAA6C,IAClDC,QAAQ,QACH,iDAAiD;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMzD,OAAO,SAASC,WAAWA,CAAC;EAAEC,GAAG;EAAE,GAAGC;AAAY,CAAC,EAAE;EACnD,MAAMC,IAAI,GAAGT,KAAK,CAACU,GAAG,CAACX,6BAA6B,CAAC;EAErD,MAAMY,SAAS,GACbX,KAAK,CAACY,MAAM,CAEV,IAAI,CAAC;EAET,MAAMC,QAAQ,GAAGb,KAAK,CAACc,WAAW,CAAC,MAAM;IACvC,IAAIH,SAAS,CAACI,OAAO,EAAE;MACrBZ,QAAQ,CAACU,QAAQ,CAACF,SAAS,CAACI,OAAO,CAAC;IACtC;EACF,CAAC,EAAE,EAAE,CAAC;EAENf,KAAK,CAACgB,SAAS,CAAC,MAAM;IACpB,IAAIP,IAAI,IAAI,IAAI,EAAE;MAChB;IACF;IAEA,IAAIQ,oBAAmC,GAAG,IAAI;;IAE9C;IACA;IACA;IACA,MAAMC,uBAAuB,GAAGjB,UAAU,CAACkB,gBAAgB,CACzD,QAAQ,
|
|
1
|
+
{"version":3,"names":["NavigationContainerRefContext","React","Dimensions","ReactNavigationCornerInsetViewNativeComponent","Commands","jsx","_jsx","CornerInset","ref","rest","root","use","nativeRef","useRef","relayout","useCallback","current","useEffect","animationFrameHandle","unsubscribeWindowResize","addEventListener","cancelAnimationFrame","requestAnimationFrame","unsubscribeTransition","addListener","e","data","type","remove","useImperativeHandle"],"sourceRoot":"../../../src","sources":["native/CornerInset.ios.tsx"],"mappings":";;AAAA,SAASA,6BAA6B,QAAQ,wBAAwB;AACtE,OAAO,KAAKC,KAAK,MAAM,OAAO;AAC9B,SAASC,UAAU,QAAQ,cAAc;;AAEzC;;AAEA,OAAOC,6CAA6C,IAClDC,QAAQ,QACH,iDAAiD;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAMzD,OAAO,SAASC,WAAWA,CAAC;EAAEC,GAAG;EAAE,GAAGC;AAAY,CAAC,EAAE;EACnD,MAAMC,IAAI,GAAGT,KAAK,CAACU,GAAG,CAACX,6BAA6B,CAAC;EAErD,MAAMY,SAAS,GACbX,KAAK,CAACY,MAAM,CAEV,IAAI,CAAC;EAET,MAAMC,QAAQ,GAAGb,KAAK,CAACc,WAAW,CAAC,MAAM;IACvC,IAAIH,SAAS,CAACI,OAAO,EAAE;MACrBZ,QAAQ,CAACU,QAAQ,CAACF,SAAS,CAACI,OAAO,CAAC;IACtC;EACF,CAAC,EAAE,EAAE,CAAC;EAENf,KAAK,CAACgB,SAAS,CAAC,MAAM;IACpB,IAAIP,IAAI,IAAI,IAAI,EAAE;MAChB;IACF;IAEA,IAAIQ,oBAAmC,GAAG,IAAI;;IAE9C;IACA;IACA;IACA;IACA,MAAMC,uBAAuB,GAAGjB,UAAU,CAACkB,gBAAgB,CACzD,QAAQ;IACR;IACA,MAAM;MACJN,QAAQ,CAAC,CAAC;MAEV,IAAII,oBAAoB,EAAE;QACxBG,oBAAoB,CAACH,oBAAoB,CAAC;MAC5C;;MAEA;MACA;MACAA,oBAAoB,GAAGI,qBAAqB,CAAC,MAAM;QACjDJ,oBAAoB,GAAGI,qBAAqB,CAAC,MAAM;UACjDR,QAAQ,CAAC,CAAC;QACZ,CAAC,CAAC;MACJ,CAAC,CAAC;IACJ,CACF,CAAC;IAED,MAAMS,qBAAqB,GAAGb,IAAI,CAACc,WAAW,CAAC,kBAAkB,EAAGC,CAAC,IAAK;MACxE,IAAIA,CAAC,CAACC,IAAI,CAACC,IAAI,KAAK,eAAe,EAAE;QACnCb,QAAQ,CAAC,CAAC;MACZ;IACF,CAAC,CAAC;IAEF,OAAO,MAAM;MACX,IAAII,oBAAoB,EAAE;QACxBG,oBAAoB,CAACH,oBAAoB,CAAC;MAC5C;MAEAC,uBAAuB,CAACS,MAAM,CAAC,CAAC;MAChCL,qBAAqB,CAAC,CAAC;IACzB,CAAC;EACH,CAAC,EAAE,CAACb,IAAI,EAAEI,QAAQ,CAAC,CAAC;EAEpBb,KAAK,CAAC4B,mBAAmB,CACvBrB,GAAG,EACH,OAAO;IACLM;EACF,CAAC,CAAC,EACF,CAACA,QAAQ,CACX,CAAC;EAED,oBACER,IAAA,CAACH,6CAA6C;IAAA,GAAKM,IAAI;IAAED,GAAG,EAAEI;EAAU,CAAE,CAAC;AAE/E","ignoreList":[]}
|
|
@@ -9,13 +9,13 @@ import {
|
|
|
9
9
|
|
|
10
10
|
export interface NativeProps extends ViewProps {
|
|
11
11
|
name: string;
|
|
12
|
-
variant?: string;
|
|
12
|
+
variant?: string | undefined;
|
|
13
13
|
weight?: CodegenTypes.WithDefault<
|
|
14
14
|
0 | 100 | 200 | 300 | 400 | 500 | 600 | 700,
|
|
15
15
|
0
|
|
16
16
|
>;
|
|
17
17
|
size: CodegenTypes.Float;
|
|
18
|
-
color?: ColorValue;
|
|
18
|
+
color?: ColorValue | undefined;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
export default codegenNativeComponent<NativeProps>(
|
|
@@ -10,16 +10,16 @@ import {
|
|
|
10
10
|
export interface NativeProps extends ViewProps {
|
|
11
11
|
name: string;
|
|
12
12
|
size: CodegenTypes.Float;
|
|
13
|
-
color?: ColorValue;
|
|
13
|
+
color?: ColorValue | undefined;
|
|
14
14
|
weight: CodegenTypes.Int32;
|
|
15
15
|
scale: string;
|
|
16
16
|
variableValue: CodegenTypes.Float;
|
|
17
17
|
variableValueMode: string;
|
|
18
18
|
colorRenderingMode: string;
|
|
19
19
|
renderingMode: string;
|
|
20
|
-
colorPrimary?: ColorValue;
|
|
21
|
-
colorSecondary?: ColorValue;
|
|
22
|
-
colorTertiary?: ColorValue;
|
|
20
|
+
colorPrimary?: ColorValue | undefined;
|
|
21
|
+
colorSecondary?: ColorValue | undefined;
|
|
22
|
+
colorTertiary?: ColorValue | undefined;
|
|
23
23
|
effect: string;
|
|
24
24
|
effectRepeat: string;
|
|
25
25
|
effectRepeatCount: CodegenTypes.Int32;
|
|
@@ -4,7 +4,10 @@ import * as React from 'react';
|
|
|
4
4
|
import { BackHandler } from 'react-native';
|
|
5
5
|
export function useBackButton(ref) {
|
|
6
6
|
React.useEffect(() => {
|
|
7
|
-
|
|
7
|
+
// eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener
|
|
8
|
+
const subscription = BackHandler.addEventListener('hardwareBackPress',
|
|
9
|
+
// eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener
|
|
10
|
+
() => {
|
|
8
11
|
const navigation = ref.current;
|
|
9
12
|
if (navigation == null) {
|
|
10
13
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","BackHandler","useBackButton","ref","useEffect","subscription","addEventListener","navigation","current","canGoBack","goBack","remove"],"sourceRoot":"../../src","sources":["useBackButton.native.tsx"],"mappings":";;AAIA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,WAAW,QAAQ,cAAc;AAE1C,OAAO,SAASC,aAAaA,CAC3BC,GAAkE,EAClE;EACAH,KAAK,CAACI,SAAS,CAAC,MAAM;IACpB,MAAMC,YAAY,GAAGJ,WAAW,CAACK,gBAAgB,CAC/C,mBAAmB,
|
|
1
|
+
{"version":3,"names":["React","BackHandler","useBackButton","ref","useEffect","subscription","addEventListener","navigation","current","canGoBack","goBack","remove"],"sourceRoot":"../../src","sources":["useBackButton.native.tsx"],"mappings":";;AAIA,OAAO,KAAKA,KAAK,MAAM,OAAO;AAC9B,SAASC,WAAW,QAAQ,cAAc;AAE1C,OAAO,SAASC,aAAaA,CAC3BC,GAAkE,EAClE;EACAH,KAAK,CAACI,SAAS,CAAC,MAAM;IACpB;IACA,MAAMC,YAAY,GAAGJ,WAAW,CAACK,gBAAgB,CAC/C,mBAAmB;IACnB;IACA,MAAM;MACJ,MAAMC,UAAU,GAAGJ,GAAG,CAACK,OAAO;MAE9B,IAAID,UAAU,IAAI,IAAI,EAAE;QACtB,OAAO,KAAK;MACd;MAEA,IAAIA,UAAU,CAACE,SAAS,CAAC,CAAC,EAAE;QAC1BF,UAAU,CAACG,MAAM,CAAC,CAAC;QAEnB,OAAO,IAAI;MACb;MAEA,OAAO,KAAK;IACd,CACF,CAAC;IAED,OAAO,MAAML,YAAY,CAACM,MAAM,CAAC,CAAC;EACpC,CAAC,EAAE,CAACR,GAAG,CAAC,CAAC;AACX","ignoreList":[]}
|
package/lib/module/useLinking.js
CHANGED
|
@@ -5,6 +5,12 @@ import isEqual from 'fast-deep-equal';
|
|
|
5
5
|
import * as React from 'react';
|
|
6
6
|
import { createMemoryHistory } from "./createMemoryHistory.js";
|
|
7
7
|
import { ServerContext } from "./server/ServerContext.js";
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* History delta already applied by the browser when handling `popstate`
|
|
11
|
+
* The value 'replace' means the delta is unknown, so we can only replace
|
|
12
|
+
*/
|
|
13
|
+
|
|
8
14
|
const getRoutesUntilIndex = state => state.routes.slice(0, state.index + 1);
|
|
9
15
|
|
|
10
16
|
/**
|
|
@@ -84,7 +90,9 @@ export const series = cb => {
|
|
|
84
90
|
let queue = Promise.resolve();
|
|
85
91
|
const callback = () => {
|
|
86
92
|
// eslint-disable-next-line promise/no-callback-in-promise
|
|
87
|
-
queue = queue.then(cb)
|
|
93
|
+
queue = queue.then(cb).catch(e => {
|
|
94
|
+
console.error(e);
|
|
95
|
+
});
|
|
88
96
|
};
|
|
89
97
|
return callback;
|
|
90
98
|
};
|
|
@@ -169,7 +177,7 @@ export function useLinking(ref, {
|
|
|
169
177
|
}, []);
|
|
170
178
|
const previousIndexRef = React.useRef(undefined);
|
|
171
179
|
const previousStateRef = React.useRef(undefined);
|
|
172
|
-
const
|
|
180
|
+
const pendingPopStateDeltaRef = React.useRef(undefined);
|
|
173
181
|
React.useEffect(() => {
|
|
174
182
|
if (!history) {
|
|
175
183
|
return;
|
|
@@ -187,20 +195,20 @@ export function useLinking(ref, {
|
|
|
187
195
|
const index = history.index;
|
|
188
196
|
const previousIndex = previousIndexRef.current ?? 0;
|
|
189
197
|
previousIndexRef.current = index;
|
|
190
|
-
pendingPopStatePathRef.current = path;
|
|
191
198
|
const rollbackHistory = () => {
|
|
192
199
|
const delta = previousIndex - index;
|
|
193
200
|
if (delta === 0) {
|
|
194
201
|
return;
|
|
195
202
|
}
|
|
196
|
-
|
|
197
|
-
|
|
203
|
+
history.go(delta)
|
|
198
204
|
// eslint-disable-next-line promise/always-return
|
|
199
|
-
|
|
205
|
+
?.then(() => {
|
|
200
206
|
previousIndexRef.current = history.index;
|
|
207
|
+
}).catch(() => {
|
|
208
|
+
// The navigation was interrupted
|
|
201
209
|
});
|
|
202
210
|
};
|
|
203
|
-
const rollbackHistoryIfPrevented = callback => {
|
|
211
|
+
const rollbackHistoryIfPrevented = (callback, pendingDelta) => {
|
|
204
212
|
let removePrevented = false;
|
|
205
213
|
let actionChangedState = false;
|
|
206
214
|
const unsubscribeEvent = navigation.addListener('__unsafe_event__', e => {
|
|
@@ -223,15 +231,19 @@ export function useLinking(ref, {
|
|
|
223
231
|
unsubscribeEvent();
|
|
224
232
|
unsubscribeAction();
|
|
225
233
|
}
|
|
226
|
-
if (
|
|
234
|
+
if (actionChangedState) {
|
|
235
|
+
// The change may be committed later, e.g. with transitions
|
|
236
|
+
// Remember the delta so it can be subtracted when syncing the commit
|
|
237
|
+
pendingPopStateDeltaRef.current = pendingDelta;
|
|
238
|
+
} else if (removePrevented) {
|
|
227
239
|
rollbackHistory();
|
|
228
240
|
}
|
|
229
241
|
};
|
|
230
|
-
const dispatch = action => {
|
|
231
|
-
rollbackHistoryIfPrevented(() => navigation.dispatch(action));
|
|
242
|
+
const dispatch = (action, pendingDelta) => {
|
|
243
|
+
rollbackHistoryIfPrevented(() => navigation.dispatch(action), pendingDelta);
|
|
232
244
|
};
|
|
233
|
-
const resetRoot = state => {
|
|
234
|
-
rollbackHistoryIfPrevented(() => navigation.resetRoot(state));
|
|
245
|
+
const resetRoot = (state, pendingDelta) => {
|
|
246
|
+
rollbackHistoryIfPrevented(() => navigation.resetRoot(state), pendingDelta);
|
|
235
247
|
};
|
|
236
248
|
|
|
237
249
|
// When browser back/forward is clicked, we first need to check if state object for this index exists
|
|
@@ -242,12 +254,17 @@ export function useLinking(ref, {
|
|
|
242
254
|
const currentState = navigation.getRootState();
|
|
243
255
|
const [currentFocused, recordFocused] = findMatchingState(currentState, record.state);
|
|
244
256
|
if (previousIndex - index === 1 && currentFocused && recordFocused && isPoppingLastEntry(currentFocused, recordFocused)) {
|
|
257
|
+
const pending = pendingPopStateDeltaRef.current;
|
|
258
|
+
|
|
245
259
|
// If we detect that the state change is popping the last entry
|
|
246
260
|
// Dispatch a back action instead of resetting to the state
|
|
247
261
|
// This makes sure changes to history state since the entry was added don't get lost
|
|
248
|
-
dispatch(CommonActions.goBack()
|
|
262
|
+
dispatch(CommonActions.goBack(),
|
|
263
|
+
// Stack on any delta from a previous `popstate` that hasn't committed yet
|
|
264
|
+
pending === 'replace' ? 'replace' : (pending ?? 0) - 1);
|
|
249
265
|
} else {
|
|
250
|
-
|
|
266
|
+
// The browser already moved from the current state to the record's state
|
|
267
|
+
resetRoot(record.state, currentFocused && recordFocused ? getTotalHistoryLength(recordFocused) - getTotalHistoryLength(currentFocused) : 'replace');
|
|
251
268
|
}
|
|
252
269
|
return;
|
|
253
270
|
}
|
|
@@ -271,21 +288,21 @@ export function useLinking(ref, {
|
|
|
271
288
|
const action = getActionFromStateRef.current(state, configRef.current);
|
|
272
289
|
if (action !== undefined) {
|
|
273
290
|
try {
|
|
274
|
-
dispatch(action);
|
|
291
|
+
dispatch(action, 'replace');
|
|
275
292
|
} catch (e) {
|
|
276
293
|
// Ignore any errors from deep linking.
|
|
277
294
|
// This could happen in case of malformed links, navigation object not being initialized etc.
|
|
278
295
|
console.warn(`An error occurred when trying to handle the link '${path}': ${typeof e === 'object' && e != null && 'message' in e ? e.message : e}`);
|
|
279
296
|
}
|
|
280
297
|
} else {
|
|
281
|
-
resetRoot(state);
|
|
298
|
+
resetRoot(state, 'replace');
|
|
282
299
|
}
|
|
283
300
|
} else {
|
|
284
|
-
resetRoot(state);
|
|
301
|
+
resetRoot(state, 'replace');
|
|
285
302
|
}
|
|
286
303
|
} else {
|
|
287
304
|
// if current path didn't return any state, we should revert to initial state
|
|
288
|
-
resetRoot(state);
|
|
305
|
+
resetRoot(state, 'replace');
|
|
289
306
|
}
|
|
290
307
|
});
|
|
291
308
|
}, [enabled, history, ref, validateRoutesNotExistInRootState]);
|
|
@@ -341,7 +358,7 @@ export function useLinking(ref, {
|
|
|
341
358
|
previousIndexRef.current = history.index;
|
|
342
359
|
}
|
|
343
360
|
}
|
|
344
|
-
const
|
|
361
|
+
const onUpdate = async () => {
|
|
345
362
|
const navigation = ref.current;
|
|
346
363
|
if (!navigation || !enabled) {
|
|
347
364
|
return;
|
|
@@ -353,11 +370,16 @@ export function useLinking(ref, {
|
|
|
353
370
|
if (!state) {
|
|
354
371
|
return;
|
|
355
372
|
}
|
|
356
|
-
|
|
373
|
+
|
|
374
|
+
// Skip if the state hasn't changed since we last synced it
|
|
375
|
+
if (previousState === state) {
|
|
376
|
+
return;
|
|
377
|
+
}
|
|
357
378
|
const route = findFocusedRoute(state);
|
|
358
379
|
const path = getPathForRoute(route, state);
|
|
380
|
+
const pendingPopStateDelta = pendingPopStateDeltaRef.current;
|
|
359
381
|
previousStateRef.current = state;
|
|
360
|
-
|
|
382
|
+
pendingPopStateDeltaRef.current = undefined;
|
|
361
383
|
|
|
362
384
|
// To detect the kind of state change, we need to:
|
|
363
385
|
// - Find the common focused navigation state in previous and current state
|
|
@@ -365,10 +387,11 @@ export function useLinking(ref, {
|
|
|
365
387
|
// - If no common focused navigation state found, it's a replace
|
|
366
388
|
const [previousFocusedState, focusedState] = findMatchingState(previousState, state);
|
|
367
389
|
if (previousFocusedState && focusedState &&
|
|
368
|
-
//
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
390
|
+
// If the delta from `popstate` is unknown, we can only replace
|
|
391
|
+
pendingPopStateDelta !== 'replace') {
|
|
392
|
+
const historyDelta = getTotalHistoryLength(focusedState) - getTotalHistoryLength(previousFocusedState) - (
|
|
393
|
+
// Subtract the delta already applied by the browser to sync only the remaining changes
|
|
394
|
+
pendingPopStateDelta ?? 0);
|
|
372
395
|
if (historyDelta > 0) {
|
|
373
396
|
// If history length is increased, we should pushState
|
|
374
397
|
// Note that path might not actually change here, for example, drawer open should pushState
|
|
@@ -422,10 +445,11 @@ export function useLinking(ref, {
|
|
|
422
445
|
previousIndexRef.current = history.index;
|
|
423
446
|
};
|
|
424
447
|
|
|
425
|
-
// We debounce
|
|
448
|
+
// We debounce onUpdate coz we don't want multiple state changes to be handled at one time
|
|
426
449
|
// This could happen since `history.go(n)` is asynchronous
|
|
427
450
|
// If `pushState` or `replaceState` were called before `history.go(n)` completes, it'll mess stuff up
|
|
428
|
-
|
|
451
|
+
const handleUpdate = series(onUpdate);
|
|
452
|
+
return ref.current?.addListener('state', handleUpdate);
|
|
429
453
|
}, [enabled, history, ref]);
|
|
430
454
|
return {
|
|
431
455
|
getInitialState
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["CommonActions","findFocusedRoute","getActionFromState","getActionFromStateDefault","getPathFromState","getPathFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","isEqual","React","createMemoryHistory","ServerContext","getRoutesUntilIndex","state","routes","slice","index","getTotalHistoryLength","baseHistoryLength","history","length","routeHistoryLength","reduce","acc","r","findMatchingState","a","b","undefined","key","aHistoryLength","bHistoryLength","aRoute","bRoute","aChildState","bChildState","isPoppingLastEntry","current","record","currentRoute","recordRoute","currentRouteHistory","recordRouteHistory","currentRoutes","recordRoutes","every","route","i","series","cb","queue","Promise","resolve","callback","then","linkingHandlers","Set","useLinking","ref","enabled","config","independent","useEffect","process","env","NODE_ENV","size","console","error","join","trim","handler","Symbol","add","delete","server","use","useState","window","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","routeNames","includes","name","getInitialState","value","location","path","pathname","search","e","thenable","onfulfilled","previousIndexRef","previousStateRef","pendingPopStatePathRef","listen","previousIndex","rollbackHistory","delta","go","rollbackHistoryIfPrevented","removePrevented","actionChangedState","unsubscribeEvent","addListener","data","type","defaultPrevented","unsubscribeAction","noop","dispatch","action","resetRoot","get","currentState","currentFocused","recordFocused","goBack","warn","message","getPathForRoute","stateForPath","focusedRoute","params","previousRoute","hash","replace","onStateChange","previousState","pendingPath","previousFocusedState","focusedState","historyDelta","push","nextIndex","backIndex","currentIndex"],"sourceRoot":"../../src","sources":["useLinking.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["CommonActions","findFocusedRoute","getActionFromState","getActionFromStateDefault","getPathFromState","getPathFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","isEqual","React","createMemoryHistory","ServerContext","getRoutesUntilIndex","state","routes","slice","index","getTotalHistoryLength","baseHistoryLength","history","length","routeHistoryLength","reduce","acc","r","findMatchingState","a","b","undefined","key","aHistoryLength","bHistoryLength","aRoute","bRoute","aChildState","bChildState","isPoppingLastEntry","current","record","currentRoute","recordRoute","currentRouteHistory","recordRouteHistory","currentRoutes","recordRoutes","every","route","i","series","cb","queue","Promise","resolve","callback","then","catch","e","console","error","linkingHandlers","Set","useLinking","ref","enabled","config","independent","useEffect","process","env","NODE_ENV","size","join","trim","handler","Symbol","add","delete","server","use","useState","window","enabledRef","useRef","configRef","getStateFromPathRef","getPathFromStateRef","getActionFromStateRef","validateRoutesNotExistInRootState","useCallback","navigation","rootState","getRootState","some","routeNames","includes","name","getInitialState","value","location","path","pathname","search","thenable","onfulfilled","previousIndexRef","previousStateRef","pendingPopStateDeltaRef","listen","previousIndex","rollbackHistory","delta","go","rollbackHistoryIfPrevented","pendingDelta","removePrevented","actionChangedState","unsubscribeEvent","addListener","data","type","defaultPrevented","unsubscribeAction","noop","dispatch","action","resetRoot","get","currentState","currentFocused","recordFocused","pending","goBack","warn","message","getPathForRoute","stateForPath","focusedRoute","params","previousRoute","hash","replace","onUpdate","previousState","pendingPopStateDelta","previousFocusedState","focusedState","historyDelta","push","nextIndex","backIndex","currentIndex","handleUpdate"],"sourceRoot":"../../src","sources":["useLinking.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -72,7 +72,7 @@ type Props<ParamList extends {}> = NavigationContainerProps & {
|
|
|
72
72
|
/**
|
|
73
73
|
* Ref object which refers to the navigation object containing helper methods.
|
|
74
74
|
*/
|
|
75
|
-
ref?: React.Ref<NavigationContainerRef<ParamList
|
|
75
|
+
ref?: React.Ref<NavigationContainerRef<ParamList>> | undefined;
|
|
76
76
|
};
|
|
77
77
|
/**
|
|
78
78
|
* Container component that manages the navigation state.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NavigationContainer.d.ts","sourceRoot":"","sources":["../../../src/NavigationContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,wBAAwB,EAC7B,KAAK,sBAAsB,EAC3B,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,aAAa,EAGnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,eAAe,EACf,SAAS,EACV,MAAM,YAAS,CAAC;AAMjB,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,yBAAyB,EAAE,OAAO,CACpC,MAAM,EACN;QACE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,SAAS,EAAE,GAAG,CACrB,CAAC,IAAI,EAAE;YACL,IAAI,EAAE,MAAM,CAAC;YACb,GAAG,EAAE,MAAM,CAAC;YACZ,KAAK,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;SAClD,KAAK,IAAI,CACX,CAAC;KACH,CACF,CAAC;CACH;AAID,KAAK,KAAK,CAAC,SAAS,SAAS,EAAE,IAAI,wBAAwB,GAAG;IAC5D;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAAC;IACxD;;OAEG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACpC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IACrC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC;;OAEG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"NavigationContainer.d.ts","sourceRoot":"","sources":["../../../src/NavigationContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,wBAAwB,EAC7B,KAAK,sBAAsB,EAC3B,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,aAAa,EAGnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAM/B,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,eAAe,EACf,SAAS,EACV,MAAM,YAAS,CAAC;AAMjB,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,yBAAyB,EAAE,OAAO,CACpC,MAAM,EACN;QACE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;QACtC,QAAQ,CAAC,SAAS,EAAE,GAAG,CACrB,CAAC,IAAI,EAAE;YACL,IAAI,EAAE,MAAM,CAAC;YACb,GAAG,EAAE,MAAM,CAAC;YACZ,KAAK,EAAE,YAAY,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;SAClD,KAAK,IAAI,CACX,CAAC;KACH,CACF,CAAC;CACH;AAID,KAAK,KAAK,CAAC,SAAS,SAAS,EAAE,IAAI,wBAAwB,GAAG;IAC5D;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,wBAAwB,CAAC,cAAc,CAAC,CAAC;IACxD;;OAEG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACpC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IACrC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,oBAAoB,CAAC;IACrC;;OAEG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,GAAG,SAAS,CAAC;CAChE,CAAC;AAKF;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,SAAS,EAAE,GAAG,aAAa,EAAE,EACxE,SAA4D,EAC5D,KAAkB,EAClB,OAAO,EACP,SAAS,EACT,QAAe,EACf,aAAa,EACb,aAAa,EACb,GAAG,EACH,GAAG,IAAI,EACR,EAAE,KAAK,CAAC,SAAS,CAAC,qBAiJlB"}
|
|
@@ -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;
|
|
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"}
|
|
@@ -23,8 +23,10 @@ type StandardNavigationMapperProps<TypeBag extends StandardNavigationTypeBagBase
|
|
|
23
23
|
state: StandardNavigationTypeBagFor<TypeBag, ParamListBase>['State'];
|
|
24
24
|
navigation: StandardNavigationListFor<TypeBag, ParamListBase>[keyof StandardNavigationListFor<TypeBag, ParamListBase>];
|
|
25
25
|
};
|
|
26
|
-
export declare function createStandardNavigationFactories<TypeBag extends StandardNavigationTypeBagBase, NavigatorProps extends object = {}>(navigator: ReturnType<typeof createStandardNavigator<TypeBag['ScreenOptions'], StandardEventMap<TypeBag['EventMap']>, NavigatorProps>>, router: RouterFactory<StandardNavigationTypeBagFor<TypeBag, ParamListBase>['State'], NavigationAction, TypeBag['RouterOptions']>, mapper?: (props: StandardNavigationMapperProps<TypeBag>) =>
|
|
27
|
-
createNavigator: import("@react-navigation/core").TypedNavigatorFactory<TypeBag
|
|
26
|
+
export declare function createStandardNavigationFactories<TypeBag extends StandardNavigationTypeBagBase, NavigatorProps extends object = {}, MapperProps extends object = {}>(navigator: ReturnType<typeof createStandardNavigator<TypeBag['ScreenOptions'], StandardEventMap<TypeBag['EventMap']>, NavigatorProps & MapperProps>>, router: RouterFactory<StandardNavigationTypeBagFor<TypeBag, ParamListBase>['State'], NavigationAction, TypeBag['RouterOptions']>, mapper?: (props: StandardNavigationMapperProps<TypeBag>) => MapperProps): {
|
|
27
|
+
createNavigator: import("@react-navigation/core").TypedNavigatorFactory<TypeBag & {
|
|
28
|
+
Navigator: React.ComponentType<NavigatorProps>;
|
|
29
|
+
}>;
|
|
28
30
|
createScreen: import("@react-navigation/core").StaticScreenFactory<import("@react-navigation/core").NavigatorTypeBagFor<TypeBag, ParamListBase>>;
|
|
29
31
|
};
|
|
30
32
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createStandardNavigationFactories.d.ts","sourceRoot":"","sources":["../../../src/createStandardNavigationFactories.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,qBAAqB,CAAC;AAK7B,KAAK,gBAAgB,CAAC,QAAQ,SAAS,YAAY,IAAI;KACpD,SAAS,IAAI,MAAM,QAAQ,GAAG;QAC7B,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;SAAE,GACnD,IAAI,SAAS,MAAM,GAAG,SAAS,GAC7B,IAAI,GACJ,MAAM,GAAG,SAAS,GACpB,SAAS,CAAC;QACd,iBAAiB,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,iBAAiB,EAAE,IAAI,CAAA;SAAE,GACtE,IAAI,GACJ,KAAK,CAAC;KACX;CACF,CAAC;AAEF,MAAM,WAAW,6BAA8B,SAAQ,oBAAoB;IACzE,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;CACpC;AAED,KAAK,4BAA4B,CAC/B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,IAC7B,OAAO,GAAG;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAEvC,KAAK,yBAAyB,CAC5B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,IAC7B,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAAC;AAEvE,KAAK,6BAA6B,CAChC,OAAO,SAAS,6BAA6B,IAC3C;IACF,KAAK,EAAE,4BAA4B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC;IACrE,UAAU,EAAE,yBAAyB,CACnC,OAAO,EACP,aAAa,CACd,CAAC,MAAM,yBAAyB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF,wBAAgB,iCAAiC,CAC/C,OAAO,SAAS,6BAA6B,EAC7C,cAAc,SAAS,MAAM,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"createStandardNavigationFactories.d.ts","sourceRoot":"","sources":["../../../src/createStandardNavigationFactories.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,aAAa,EAClB,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EACV,uBAAuB,EAExB,MAAM,qBAAqB,CAAC;AAK7B,KAAK,gBAAgB,CAAC,QAAQ,SAAS,YAAY,IAAI;KACpD,SAAS,IAAI,MAAM,QAAQ,GAAG;QAC7B,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,IAAI,CAAC,EAAE,MAAM,IAAI,CAAA;SAAE,GACnD,IAAI,SAAS,MAAM,GAAG,SAAS,GAC7B,IAAI,GACJ,MAAM,GAAG,SAAS,GACpB,SAAS,CAAC;QACd,iBAAiB,EAAE,QAAQ,CAAC,SAAS,CAAC,SAAS;YAAE,iBAAiB,EAAE,IAAI,CAAA;SAAE,GACtE,IAAI,GACJ,KAAK,CAAC;KACX;CACF,CAAC;AAEF,MAAM,WAAW,6BAA8B,SAAQ,oBAAoB;IACzE,aAAa,EAAE,oBAAoB,CAAC;IACpC,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;CACpC;AAED,KAAK,4BAA4B,CAC/B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,IAC7B,OAAO,GAAG;IAAE,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC;AAEvC,KAAK,yBAAyB,CAC5B,OAAO,SAAS,6BAA6B,EAC7C,SAAS,SAAS,aAAa,IAC7B,4BAA4B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,gBAAgB,CAAC,CAAC;AAEvE,KAAK,6BAA6B,CAChC,OAAO,SAAS,6BAA6B,IAC3C;IACF,KAAK,EAAE,4BAA4B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC;IACrE,UAAU,EAAE,yBAAyB,CACnC,OAAO,EACP,aAAa,CACd,CAAC,MAAM,yBAAyB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;CAC5D,CAAC;AAEF,wBAAgB,iCAAiC,CAC/C,OAAO,SAAS,6BAA6B,EAC7C,cAAc,SAAS,MAAM,GAAG,EAAE,EAClC,WAAW,SAAS,MAAM,GAAG,EAAE,EAE/B,SAAS,EAAE,UAAU,CACnB,OAAO,uBAAuB,CAC5B,OAAO,CAAC,eAAe,CAAC,EACxB,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EACrC,cAAc,GAAG,WAAW,CAC7B,CACF,EACD,MAAM,EAAE,aAAa,CACnB,4BAA4B,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,EAC7D,gBAAgB,EAChB,OAAO,CAAC,eAAe,CAAC,CACzB,EACD,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,6BAA6B,CAAC,OAAO,CAAC,KAAK,WAAW;;mBAoIxD,KAAK,CAAC,aAAa,CAAC,cAAc,CAAC;;;EAUnD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CornerInset.ios.d.ts","sourceRoot":"","sources":["../../../../src/native/CornerInset.ios.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAmB,CAAC;AAK1E,KAAK,KAAK,GAAG,gBAAgB,GAAG;IAC9B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;CACjC,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"CornerInset.ios.d.ts","sourceRoot":"","sources":["../../../../src/native/CornerInset.ios.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAmB,CAAC;AAK1E,KAAK,KAAK,GAAG,gBAAgB,GAAG;IAC9B,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;CACjC,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,KAAK,qBAwElD"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { CodegenTypes, type ColorValue, type ViewProps } from 'react-native';
|
|
2
2
|
export interface NativeProps extends ViewProps {
|
|
3
3
|
name: string;
|
|
4
|
-
variant?: string;
|
|
4
|
+
variant?: string | undefined;
|
|
5
5
|
weight?: CodegenTypes.WithDefault<0 | 100 | 200 | 300 | 400 | 500 | 600 | 700, 0>;
|
|
6
6
|
size: CodegenTypes.Float;
|
|
7
|
-
color?: ColorValue;
|
|
7
|
+
color?: ColorValue | undefined;
|
|
8
8
|
}
|
|
9
9
|
declare const _default: import("react-native").HostComponent<NativeProps>;
|
|
10
10
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaterialSymbolViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/native/MaterialSymbolViewNativeComponent.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"MaterialSymbolViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/native/MaterialSymbolViewNativeComponent.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,MAAM,CAAC,EAAE,YAAY,CAAC,WAAW,CAC/B,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,EAC3C,CAAC,CACF,CAAC;IACF,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC;IACzB,KAAK,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CAChC;;AAED,wBAEE"}
|
|
@@ -2,16 +2,16 @@ import { CodegenTypes, type ColorValue, type ViewProps } from 'react-native';
|
|
|
2
2
|
export interface NativeProps extends ViewProps {
|
|
3
3
|
name: string;
|
|
4
4
|
size: CodegenTypes.Float;
|
|
5
|
-
color?: ColorValue;
|
|
5
|
+
color?: ColorValue | undefined;
|
|
6
6
|
weight: CodegenTypes.Int32;
|
|
7
7
|
scale: string;
|
|
8
8
|
variableValue: CodegenTypes.Float;
|
|
9
9
|
variableValueMode: string;
|
|
10
10
|
colorRenderingMode: string;
|
|
11
11
|
renderingMode: string;
|
|
12
|
-
colorPrimary?: ColorValue;
|
|
13
|
-
colorSecondary?: ColorValue;
|
|
14
|
-
colorTertiary?: ColorValue;
|
|
12
|
+
colorPrimary?: ColorValue | undefined;
|
|
13
|
+
colorSecondary?: ColorValue | undefined;
|
|
14
|
+
colorTertiary?: ColorValue | undefined;
|
|
15
15
|
effect: string;
|
|
16
16
|
effectRepeat: string;
|
|
17
17
|
effectRepeatCount: CodegenTypes.Int32;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SFSymbolViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/native/SFSymbolViewNativeComponent.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC;IACzB,KAAK,CAAC,EAAE,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"SFSymbolViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/native/SFSymbolViewNativeComponent.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EACZ,KAAK,UAAU,EACf,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC;IACzB,KAAK,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,YAAY,CAAC,KAAK,CAAC;IAClC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACtC,cAAc,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACxC,aAAa,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,YAAY,CAAC,KAAK,CAAC;IACtC,iBAAiB,EAAE,YAAY,CAAC,KAAK,CAAC;IACtC,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,YAAY,CAAC,KAAK,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC;IACzB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sBAAsB,EAAE,YAAY,CAAC,KAAK,CAAC;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;CACjC;;AAED,wBAEE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useBackButton.native.d.ts","sourceRoot":"","sources":["../../../src/useBackButton.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,wBAAgB,aAAa,CAC3B,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"useBackButton.native.d.ts","sourceRoot":"","sources":["../../../src/useBackButton.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,wBAAgB,aAAa,CAC3B,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,QA0BnE"}
|
|
@@ -2,16 +2,16 @@ import { type NavigationAction, type RootParamList } from '@react-navigation/cor
|
|
|
2
2
|
import * as React from 'react';
|
|
3
3
|
import { type GestureResponderEvent } from 'react-native';
|
|
4
4
|
export type LinkProps<ParamList extends {} = RootParamList, RouteName extends keyof ParamList = keyof ParamList> = ({
|
|
5
|
-
href?: string;
|
|
6
|
-
action?: NavigationAction;
|
|
5
|
+
href?: string | undefined;
|
|
6
|
+
action?: NavigationAction | undefined;
|
|
7
7
|
} & (RouteName extends unknown ? undefined extends ParamList[RouteName] ? {
|
|
8
8
|
screen: RouteName;
|
|
9
|
-
params?: ParamList[RouteName];
|
|
9
|
+
params?: ParamList[RouteName] | undefined;
|
|
10
10
|
} : {
|
|
11
11
|
screen: RouteName;
|
|
12
12
|
params: ParamList[RouteName];
|
|
13
13
|
} : never)) | {
|
|
14
|
-
href?: string;
|
|
14
|
+
href?: string | undefined;
|
|
15
15
|
action: NavigationAction;
|
|
16
16
|
screen?: undefined;
|
|
17
17
|
params?: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinkProps.d.ts","sourceRoot":"","sources":["../../../src/useLinkProps.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EAGrB,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,qBAAqB,EAAY,MAAM,cAAc,CAAC;AAIpE,MAAM,MAAM,SAAS,CACnB,SAAS,SAAS,EAAE,GAAG,aAAa,EACpC,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,SAAS,IAEjD,CAAC;IACC,IAAI,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"useLinkProps.d.ts","sourceRoot":"","sources":["../../../src/useLinkProps.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EAGrB,KAAK,aAAa,EACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,qBAAqB,EAAY,MAAM,cAAc,CAAC;AAIpE,MAAM,MAAM,SAAS,CACnB,SAAS,SAAS,EAAE,GAAG,aAAa,EACpC,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,SAAS,IAEjD,CAAC;IACC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACvC,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,GAAG,SAAS,CAAA;CAAE,GAChE;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,GACrD,KAAK,CAAC,CAAC,GACX;IACE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB,CAAC;AAEN;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,CAAC,SAAS,SAAS,EAAE,GAAG,aAAa,EAC1C,KAAK,CAAC,SAAS,SAAS,MAAM,SAAS,GAAG,MAAM,SAAS,EACzD,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;;;kBAM3D,KAAK,CAAC,UAAU,CAAC,iBAAiB,EAAE,UAAU,CAAC,GAAG,qBAAqB;EAuG9E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../../src/useLinking.tsx"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAS,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"useLinking.d.ts","sourceRoot":"","sources":["../../../src/useLinking.tsx"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAS,CAAC;AAC9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAe,CAAC;AAqH9C;;GAEG;AACH,eAAO,MAAM,MAAM,GAAI,IAAI,MAAM,OAAO,CAAC,IAAI,CAAC,eAW7C,CAAC;AAIF,wBAAgB,UAAU,CAAC,SAAS,SAAS,aAAa,EACxD,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,EAC9D,EACE,OAAc,EACd,MAAM,EACN,gBAA0C,EAC1C,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,cAAc,CAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqf7B"}
|
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": "8.0.0-alpha.
|
|
4
|
+
"version": "8.0.0-alpha.35",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react-native",
|
|
7
7
|
"react-navigation",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"clean": "del lib"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@react-navigation/core": "^8.0.0-alpha.
|
|
65
|
+
"@react-navigation/core": "^8.0.0-alpha.26",
|
|
66
66
|
"escape-string-regexp": "^5.0.0",
|
|
67
67
|
"fast-deep-equal": "^3.1.3",
|
|
68
68
|
"nanoid": "^5.1.11",
|
|
@@ -74,6 +74,7 @@
|
|
|
74
74
|
"@jest/globals": "^29.7.0",
|
|
75
75
|
"@testing-library/react-native": "^14.0.0",
|
|
76
76
|
"@types/react": "~19.2.17",
|
|
77
|
+
"@types/react-dom": "~19.2.3",
|
|
77
78
|
"del-cli": "^7.0.0",
|
|
78
79
|
"react": "19.2.0",
|
|
79
80
|
"react-dom": "19.2.0",
|
|
@@ -126,5 +127,5 @@
|
|
|
126
127
|
}
|
|
127
128
|
}
|
|
128
129
|
},
|
|
129
|
-
"gitHead": "
|
|
130
|
+
"gitHead": "2c512d18d9217cef850448d239427042e7ade382"
|
|
130
131
|
}
|
|
@@ -108,7 +108,7 @@ type Props<ParamList extends {}> = NavigationContainerProps & {
|
|
|
108
108
|
/**
|
|
109
109
|
* Ref object which refers to the navigation object containing helper methods.
|
|
110
110
|
*/
|
|
111
|
-
ref?: React.Ref<NavigationContainerRef<ParamList
|
|
111
|
+
ref?: React.Ref<NavigationContainerRef<ParamList>> | undefined;
|
|
112
112
|
};
|
|
113
113
|
|
|
114
114
|
const RESTORE_STATE_ERROR =
|
|
@@ -130,10 +130,6 @@ export function NavigationContainer<ParamList extends {} = RootParamList>({
|
|
|
130
130
|
ref,
|
|
131
131
|
...rest
|
|
132
132
|
}: Props<ParamList>) {
|
|
133
|
-
if (linking?.config) {
|
|
134
|
-
validatePathConfig(linking.config);
|
|
135
|
-
}
|
|
136
|
-
|
|
137
133
|
const refContainer = React.useRef<NavigationContainerRef<ParamList>>(null);
|
|
138
134
|
|
|
139
135
|
useBackButton(refContainer);
|
|
@@ -148,6 +144,10 @@ export function NavigationContainer<ParamList extends {} = RootParamList>({
|
|
|
148
144
|
};
|
|
149
145
|
}
|
|
150
146
|
|
|
147
|
+
if (linking?.config) {
|
|
148
|
+
validatePathConfig(linking.config);
|
|
149
|
+
}
|
|
150
|
+
|
|
151
151
|
return {
|
|
152
152
|
options: {
|
|
153
153
|
...linking,
|
|
@@ -151,6 +151,8 @@ export function createMemoryHistory() {
|
|
|
151
151
|
return;
|
|
152
152
|
}
|
|
153
153
|
|
|
154
|
+
const targetId = items[index]?.id;
|
|
155
|
+
|
|
154
156
|
// When we call `history.go`, `popstate` will fire when there's history to go back to
|
|
155
157
|
// So we need to somehow handle following cases:
|
|
156
158
|
// - There's history to go back, `history.go` is called, and `popstate` fires
|
|
@@ -160,7 +162,11 @@ export function createMemoryHistory() {
|
|
|
160
162
|
const done = (interrupted?: boolean) => {
|
|
161
163
|
clearTimeout(timer);
|
|
162
164
|
|
|
163
|
-
|
|
165
|
+
// The current entry may not be the one we intended to land on:
|
|
166
|
+
// - The traversal didn't happen yet, e.g. it took longer than the timeout
|
|
167
|
+
// - The user navigated in the browser while our traversal was in-flight
|
|
168
|
+
// So we treat it the same as the operation being interrupted
|
|
169
|
+
if (interrupted || window.history.state?.id !== targetId) {
|
|
164
170
|
reject(new Error('History was changed during navigation.'));
|
|
165
171
|
return;
|
|
166
172
|
}
|
|
@@ -60,12 +60,13 @@ type StandardNavigationMapperProps<
|
|
|
60
60
|
export function createStandardNavigationFactories<
|
|
61
61
|
TypeBag extends StandardNavigationTypeBagBase,
|
|
62
62
|
NavigatorProps extends object = {},
|
|
63
|
+
MapperProps extends object = {},
|
|
63
64
|
>(
|
|
64
65
|
navigator: ReturnType<
|
|
65
66
|
typeof createStandardNavigator<
|
|
66
67
|
TypeBag['ScreenOptions'],
|
|
67
68
|
StandardEventMap<TypeBag['EventMap']>,
|
|
68
|
-
NavigatorProps
|
|
69
|
+
NavigatorProps & MapperProps
|
|
69
70
|
>
|
|
70
71
|
>,
|
|
71
72
|
router: RouterFactory<
|
|
@@ -73,9 +74,7 @@ export function createStandardNavigationFactories<
|
|
|
73
74
|
NavigationAction,
|
|
74
75
|
TypeBag['RouterOptions']
|
|
75
76
|
>,
|
|
76
|
-
mapper?: (
|
|
77
|
-
props: StandardNavigationMapperProps<TypeBag>
|
|
78
|
-
) => Partial<NavigatorProps>
|
|
77
|
+
mapper?: (props: StandardNavigationMapperProps<TypeBag>) => MapperProps
|
|
79
78
|
) {
|
|
80
79
|
const { type, version, NavigatorContent } = navigator;
|
|
81
80
|
|
|
@@ -194,7 +193,7 @@ export function createStandardNavigationFactories<
|
|
|
194
193
|
return (
|
|
195
194
|
<builder.NavigationContent>
|
|
196
195
|
<NavigatorContent
|
|
197
|
-
{...(rest as NavigatorProps)}
|
|
196
|
+
{...(rest as NavigatorProps & MapperProps)}
|
|
198
197
|
{...mapped}
|
|
199
198
|
state={state}
|
|
200
199
|
descriptors={descriptors}
|
|
@@ -205,9 +204,11 @@ export function createStandardNavigationFactories<
|
|
|
205
204
|
);
|
|
206
205
|
}
|
|
207
206
|
|
|
208
|
-
const createNavigator = createNavigatorFactory<
|
|
209
|
-
|
|
210
|
-
|
|
207
|
+
const createNavigator = createNavigatorFactory<
|
|
208
|
+
TypeBag & {
|
|
209
|
+
Navigator: React.ComponentType<NavigatorProps>;
|
|
210
|
+
}
|
|
211
|
+
>(StandardNavigationNavigator);
|
|
211
212
|
|
|
212
213
|
const createScreen = createScreenFactory<TypeBag>();
|
|
213
214
|
|
|
@@ -36,8 +36,10 @@ export function CornerInset({ ref, ...rest }: Props) {
|
|
|
36
36
|
// We freeze the corner insets after initial measurements
|
|
37
37
|
// This is to avoid the insets getting out of sync during transitions
|
|
38
38
|
// We trigger a relayout explicitly on window resize and transition end
|
|
39
|
+
// eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener
|
|
39
40
|
const unsubscribeWindowResize = Dimensions.addEventListener(
|
|
40
41
|
'change',
|
|
42
|
+
// eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener
|
|
41
43
|
() => {
|
|
42
44
|
relayout();
|
|
43
45
|
|
|
@@ -9,13 +9,13 @@ import {
|
|
|
9
9
|
|
|
10
10
|
export interface NativeProps extends ViewProps {
|
|
11
11
|
name: string;
|
|
12
|
-
variant?: string;
|
|
12
|
+
variant?: string | undefined;
|
|
13
13
|
weight?: CodegenTypes.WithDefault<
|
|
14
14
|
0 | 100 | 200 | 300 | 400 | 500 | 600 | 700,
|
|
15
15
|
0
|
|
16
16
|
>;
|
|
17
17
|
size: CodegenTypes.Float;
|
|
18
|
-
color?: ColorValue;
|
|
18
|
+
color?: ColorValue | undefined;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
export default codegenNativeComponent<NativeProps>(
|
|
@@ -10,16 +10,16 @@ import {
|
|
|
10
10
|
export interface NativeProps extends ViewProps {
|
|
11
11
|
name: string;
|
|
12
12
|
size: CodegenTypes.Float;
|
|
13
|
-
color?: ColorValue;
|
|
13
|
+
color?: ColorValue | undefined;
|
|
14
14
|
weight: CodegenTypes.Int32;
|
|
15
15
|
scale: string;
|
|
16
16
|
variableValue: CodegenTypes.Float;
|
|
17
17
|
variableValueMode: string;
|
|
18
18
|
colorRenderingMode: string;
|
|
19
19
|
renderingMode: string;
|
|
20
|
-
colorPrimary?: ColorValue;
|
|
21
|
-
colorSecondary?: ColorValue;
|
|
22
|
-
colorTertiary?: ColorValue;
|
|
20
|
+
colorPrimary?: ColorValue | undefined;
|
|
21
|
+
colorSecondary?: ColorValue | undefined;
|
|
22
|
+
colorTertiary?: ColorValue | undefined;
|
|
23
23
|
effect: string;
|
|
24
24
|
effectRepeat: string;
|
|
25
25
|
effectRepeatCount: CodegenTypes.Int32;
|
|
@@ -9,8 +9,10 @@ export function useBackButton(
|
|
|
9
9
|
ref: React.RefObject<NavigationContainerRef<ParamListBase> | null>
|
|
10
10
|
) {
|
|
11
11
|
React.useEffect(() => {
|
|
12
|
+
// eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener
|
|
12
13
|
const subscription = BackHandler.addEventListener(
|
|
13
14
|
'hardwareBackPress',
|
|
15
|
+
// eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener
|
|
14
16
|
() => {
|
|
15
17
|
const navigation = ref.current;
|
|
16
18
|
|
package/src/useLinkProps.tsx
CHANGED
|
@@ -15,15 +15,15 @@ export type LinkProps<
|
|
|
15
15
|
RouteName extends keyof ParamList = keyof ParamList,
|
|
16
16
|
> =
|
|
17
17
|
| ({
|
|
18
|
-
href?: string;
|
|
19
|
-
action?: NavigationAction;
|
|
18
|
+
href?: string | undefined;
|
|
19
|
+
action?: NavigationAction | undefined;
|
|
20
20
|
} & (RouteName extends unknown
|
|
21
21
|
? undefined extends ParamList[RouteName]
|
|
22
|
-
? { screen: RouteName; params?: ParamList[RouteName] }
|
|
22
|
+
? { screen: RouteName; params?: ParamList[RouteName] | undefined }
|
|
23
23
|
: { screen: RouteName; params: ParamList[RouteName] }
|
|
24
24
|
: never))
|
|
25
25
|
| {
|
|
26
|
-
href?: string;
|
|
26
|
+
href?: string | undefined;
|
|
27
27
|
action: NavigationAction;
|
|
28
28
|
screen?: undefined;
|
|
29
29
|
params?: undefined;
|
package/src/useLinking.tsx
CHANGED
|
@@ -19,6 +19,12 @@ import type { Thenable } from './useThenable';
|
|
|
19
19
|
|
|
20
20
|
type ResultState = ReturnType<typeof getStateFromPathDefault>;
|
|
21
21
|
|
|
22
|
+
/**
|
|
23
|
+
* History delta already applied by the browser when handling `popstate`
|
|
24
|
+
* The value 'replace' means the delta is unknown, so we can only replace
|
|
25
|
+
*/
|
|
26
|
+
type PopStateDelta = number | 'replace';
|
|
27
|
+
|
|
22
28
|
const getRoutesUntilIndex = (state: NavigationState) =>
|
|
23
29
|
state.routes.slice(0, state.index + 1);
|
|
24
30
|
|
|
@@ -131,10 +137,14 @@ const isPoppingLastEntry = (
|
|
|
131
137
|
*/
|
|
132
138
|
export const series = (cb: () => Promise<void>) => {
|
|
133
139
|
let queue = Promise.resolve();
|
|
140
|
+
|
|
134
141
|
const callback = () => {
|
|
135
142
|
// eslint-disable-next-line promise/no-callback-in-promise
|
|
136
|
-
queue = queue.then(cb)
|
|
143
|
+
queue = queue.then(cb).catch((e) => {
|
|
144
|
+
console.error(e);
|
|
145
|
+
});
|
|
137
146
|
};
|
|
147
|
+
|
|
138
148
|
return callback;
|
|
139
149
|
};
|
|
140
150
|
|
|
@@ -257,7 +267,9 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
257
267
|
|
|
258
268
|
const previousIndexRef = React.useRef<number | undefined>(undefined);
|
|
259
269
|
const previousStateRef = React.useRef<NavigationState | undefined>(undefined);
|
|
260
|
-
const
|
|
270
|
+
const pendingPopStateDeltaRef = React.useRef<PopStateDelta | undefined>(
|
|
271
|
+
undefined
|
|
272
|
+
);
|
|
261
273
|
|
|
262
274
|
React.useEffect(() => {
|
|
263
275
|
if (!history) {
|
|
@@ -281,7 +293,6 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
281
293
|
const previousIndex = previousIndexRef.current ?? 0;
|
|
282
294
|
|
|
283
295
|
previousIndexRef.current = index;
|
|
284
|
-
pendingPopStatePathRef.current = path;
|
|
285
296
|
|
|
286
297
|
const rollbackHistory = () => {
|
|
287
298
|
const delta = previousIndex - index;
|
|
@@ -290,15 +301,21 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
290
301
|
return;
|
|
291
302
|
}
|
|
292
303
|
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
304
|
+
history
|
|
305
|
+
.go(delta)
|
|
306
|
+
// eslint-disable-next-line promise/always-return
|
|
307
|
+
?.then(() => {
|
|
308
|
+
previousIndexRef.current = history.index;
|
|
309
|
+
})
|
|
310
|
+
.catch(() => {
|
|
311
|
+
// The navigation was interrupted
|
|
312
|
+
});
|
|
299
313
|
};
|
|
300
314
|
|
|
301
|
-
const rollbackHistoryIfPrevented = (
|
|
315
|
+
const rollbackHistoryIfPrevented = (
|
|
316
|
+
callback: () => void,
|
|
317
|
+
pendingDelta: PopStateDelta
|
|
318
|
+
) => {
|
|
302
319
|
let removePrevented = false;
|
|
303
320
|
let actionChangedState = false;
|
|
304
321
|
|
|
@@ -330,17 +347,33 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
330
347
|
unsubscribeAction();
|
|
331
348
|
}
|
|
332
349
|
|
|
333
|
-
if (
|
|
350
|
+
if (actionChangedState) {
|
|
351
|
+
// The change may be committed later, e.g. with transitions
|
|
352
|
+
// Remember the delta so it can be subtracted when syncing the commit
|
|
353
|
+
pendingPopStateDeltaRef.current = pendingDelta;
|
|
354
|
+
} else if (removePrevented) {
|
|
334
355
|
rollbackHistory();
|
|
335
356
|
}
|
|
336
357
|
};
|
|
337
358
|
|
|
338
|
-
const dispatch = (
|
|
339
|
-
|
|
359
|
+
const dispatch = (
|
|
360
|
+
action: Parameters<typeof navigation.dispatch>[0],
|
|
361
|
+
pendingDelta: PopStateDelta
|
|
362
|
+
) => {
|
|
363
|
+
rollbackHistoryIfPrevented(
|
|
364
|
+
() => navigation.dispatch(action),
|
|
365
|
+
pendingDelta
|
|
366
|
+
);
|
|
340
367
|
};
|
|
341
368
|
|
|
342
|
-
const resetRoot = (
|
|
343
|
-
|
|
369
|
+
const resetRoot = (
|
|
370
|
+
state: Parameters<typeof navigation.resetRoot>[0],
|
|
371
|
+
pendingDelta: PopStateDelta
|
|
372
|
+
) => {
|
|
373
|
+
rollbackHistoryIfPrevented(
|
|
374
|
+
() => navigation.resetRoot(state),
|
|
375
|
+
pendingDelta
|
|
376
|
+
);
|
|
344
377
|
};
|
|
345
378
|
|
|
346
379
|
// When browser back/forward is clicked, we first need to check if state object for this index exists
|
|
@@ -362,12 +395,25 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
362
395
|
recordFocused &&
|
|
363
396
|
isPoppingLastEntry(currentFocused, recordFocused)
|
|
364
397
|
) {
|
|
398
|
+
const pending = pendingPopStateDeltaRef.current;
|
|
399
|
+
|
|
365
400
|
// If we detect that the state change is popping the last entry
|
|
366
401
|
// Dispatch a back action instead of resetting to the state
|
|
367
402
|
// This makes sure changes to history state since the entry was added don't get lost
|
|
368
|
-
dispatch(
|
|
403
|
+
dispatch(
|
|
404
|
+
CommonActions.goBack(),
|
|
405
|
+
// Stack on any delta from a previous `popstate` that hasn't committed yet
|
|
406
|
+
pending === 'replace' ? 'replace' : (pending ?? 0) - 1
|
|
407
|
+
);
|
|
369
408
|
} else {
|
|
370
|
-
|
|
409
|
+
// The browser already moved from the current state to the record's state
|
|
410
|
+
resetRoot(
|
|
411
|
+
record.state,
|
|
412
|
+
currentFocused && recordFocused
|
|
413
|
+
? getTotalHistoryLength(recordFocused) -
|
|
414
|
+
getTotalHistoryLength(currentFocused)
|
|
415
|
+
: 'replace'
|
|
416
|
+
);
|
|
371
417
|
}
|
|
372
418
|
|
|
373
419
|
return;
|
|
@@ -404,7 +450,7 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
404
450
|
|
|
405
451
|
if (action !== undefined) {
|
|
406
452
|
try {
|
|
407
|
-
dispatch(action);
|
|
453
|
+
dispatch(action, 'replace');
|
|
408
454
|
} catch (e) {
|
|
409
455
|
// Ignore any errors from deep linking.
|
|
410
456
|
// This could happen in case of malformed links, navigation object not being initialized etc.
|
|
@@ -417,14 +463,14 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
417
463
|
);
|
|
418
464
|
}
|
|
419
465
|
} else {
|
|
420
|
-
resetRoot(state);
|
|
466
|
+
resetRoot(state, 'replace');
|
|
421
467
|
}
|
|
422
468
|
} else {
|
|
423
|
-
resetRoot(state);
|
|
469
|
+
resetRoot(state, 'replace');
|
|
424
470
|
}
|
|
425
471
|
} else {
|
|
426
472
|
// if current path didn't return any state, we should revert to initial state
|
|
427
|
-
resetRoot(state);
|
|
473
|
+
resetRoot(state, 'replace');
|
|
428
474
|
}
|
|
429
475
|
});
|
|
430
476
|
}, [enabled, history, ref, validateRoutesNotExistInRootState]);
|
|
@@ -509,7 +555,7 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
509
555
|
}
|
|
510
556
|
}
|
|
511
557
|
|
|
512
|
-
const
|
|
558
|
+
const onUpdate = async () => {
|
|
513
559
|
const navigation = ref.current;
|
|
514
560
|
|
|
515
561
|
if (!navigation || !enabled) {
|
|
@@ -524,12 +570,18 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
524
570
|
return;
|
|
525
571
|
}
|
|
526
572
|
|
|
527
|
-
|
|
573
|
+
// Skip if the state hasn't changed since we last synced it
|
|
574
|
+
if (previousState === state) {
|
|
575
|
+
return;
|
|
576
|
+
}
|
|
577
|
+
|
|
528
578
|
const route = findFocusedRoute(state);
|
|
529
579
|
const path = getPathForRoute(route, state);
|
|
530
580
|
|
|
581
|
+
const pendingPopStateDelta = pendingPopStateDeltaRef.current;
|
|
582
|
+
|
|
531
583
|
previousStateRef.current = state;
|
|
532
|
-
|
|
584
|
+
pendingPopStateDeltaRef.current = undefined;
|
|
533
585
|
|
|
534
586
|
// To detect the kind of state change, we need to:
|
|
535
587
|
// - Find the common focused navigation state in previous and current state
|
|
@@ -543,13 +595,14 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
543
595
|
if (
|
|
544
596
|
previousFocusedState &&
|
|
545
597
|
focusedState &&
|
|
546
|
-
//
|
|
547
|
-
|
|
548
|
-
path !== pendingPath
|
|
598
|
+
// If the delta from `popstate` is unknown, we can only replace
|
|
599
|
+
pendingPopStateDelta !== 'replace'
|
|
549
600
|
) {
|
|
550
601
|
const historyDelta =
|
|
551
602
|
getTotalHistoryLength(focusedState) -
|
|
552
|
-
getTotalHistoryLength(previousFocusedState)
|
|
603
|
+
getTotalHistoryLength(previousFocusedState) -
|
|
604
|
+
// Subtract the delta already applied by the browser to sync only the remaining changes
|
|
605
|
+
(pendingPopStateDelta ?? 0);
|
|
553
606
|
|
|
554
607
|
if (historyDelta > 0) {
|
|
555
608
|
// If history length is increased, we should pushState
|
|
@@ -595,10 +648,12 @@ export function useLinking<ParamList extends ParamListBase>(
|
|
|
595
648
|
previousIndexRef.current = history.index;
|
|
596
649
|
};
|
|
597
650
|
|
|
598
|
-
// We debounce
|
|
651
|
+
// We debounce onUpdate coz we don't want multiple state changes to be handled at one time
|
|
599
652
|
// This could happen since `history.go(n)` is asynchronous
|
|
600
653
|
// If `pushState` or `replaceState` were called before `history.go(n)` completes, it'll mess stuff up
|
|
601
|
-
|
|
654
|
+
const handleUpdate = series(onUpdate);
|
|
655
|
+
|
|
656
|
+
return ref.current?.addListener('state', handleUpdate);
|
|
602
657
|
}, [enabled, history, ref]);
|
|
603
658
|
|
|
604
659
|
return {
|