57 lines
3.2 KiB
Diff
57 lines
3.2 KiB
Diff
|
diff --git a/node_modules/@react-navigation/native/lib/commonjs/useLinking.js b/node_modules/@react-navigation/native/lib/commonjs/useLinking.js
|
||
|
|
index ef4f368..2b0da35 100644
|
||
|
|
--- a/node_modules/@react-navigation/native/lib/commonjs/useLinking.js
|
||
|
|
+++ b/node_modules/@react-navigation/native/lib/commonjs/useLinking.js
|
||
|
|
@@ -273,8 +273,12 @@ function useLinking(ref, _ref) {
|
||
|
|
});
|
||
|
|
const currentIndex = history.index;
|
||
|
|
try {
|
||
|
|
- if (nextIndex !== -1 && nextIndex < currentIndex) {
|
||
|
|
- // An existing entry for this path exists and it's less than current index, go back to that
|
||
|
|
+ if (
|
||
|
|
+ nextIndex !== -1 &&
|
||
|
|
+ nextIndex < currentIndex &&
|
||
|
|
+ // We should only go back if the entry exists and it's less than current index
|
||
|
|
+ history.get(nextIndex - currentIndex)
|
||
|
|
+ ) { // An existing entry for this path exists and it's less than current index, go back to that
|
||
|
|
await history.go(nextIndex - currentIndex);
|
||
|
|
} else {
|
||
|
|
// We couldn't find an existing entry to go back to, so we'll go back by the delta
|
||
|
|
diff --git a/node_modules/@react-navigation/native/lib/module/useLinking.js b/node_modules/@react-navigation/native/lib/module/useLinking.js
|
||
|
|
index 62a3b43..11a5a28 100644
|
||
|
|
--- a/node_modules/@react-navigation/native/lib/module/useLinking.js
|
||
|
|
+++ b/node_modules/@react-navigation/native/lib/module/useLinking.js
|
||
|
|
@@ -264,8 +264,12 @@ export default function useLinking(ref, _ref) {
|
||
|
|
});
|
||
|
|
const currentIndex = history.index;
|
||
|
|
try {
|
||
|
|
- if (nextIndex !== -1 && nextIndex < currentIndex) {
|
||
|
|
- // An existing entry for this path exists and it's less than current index, go back to that
|
||
|
|
+ if (
|
||
|
|
+ nextIndex !== -1 &&
|
||
|
|
+ nextIndex < currentIndex &&
|
||
|
|
+ // We should only go back if the entry exists and it's less than current index
|
||
|
|
+ history.get(nextIndex - currentIndex)
|
||
|
|
+ ) { // An existing entry for this path exists and it's less than current index, go back to that
|
||
|
|
await history.go(nextIndex - currentIndex);
|
||
|
|
} else {
|
||
|
|
// We couldn't find an existing entry to go back to, so we'll go back by the delta
|
||
|
|
diff --git a/node_modules/@react-navigation/native/src/useLinking.tsx b/node_modules/@react-navigation/native/src/useLinking.tsx
|
||
|
|
index 3db40b7..9ba4ecd 100644
|
||
|
|
--- a/node_modules/@react-navigation/native/src/useLinking.tsx
|
||
|
|
+++ b/node_modules/@react-navigation/native/src/useLinking.tsx
|
||
|
|
@@ -381,7 +381,12 @@ export default function useLinking(
|
||
|
|
const currentIndex = history.index;
|
||
|
|
|
||
|
|
try {
|
||
|
|
- if (nextIndex !== -1 && nextIndex < currentIndex) {
|
||
|
|
+ if (
|
||
|
|
+ nextIndex !== -1 &&
|
||
|
|
+ nextIndex < currentIndex &&
|
||
|
|
+ // We should only go back if the entry exists and it's less than current index
|
||
|
|
+ history.get(nextIndex - currentIndex)
|
||
|
|
+ ) {
|
||
|
|
// An existing entry for this path exists and it's less than current index, go back to that
|
||
|
|
await history.go(nextIndex - currentIndex);
|
||
|
|
} else {
|