From 255ed9490202adc37f10773df946b05314461805 Mon Sep 17 00:00:00 2001
From: Adam Grzybowski <adam.grzybowski@swmansion.com>
Date: Mon, 17 Apr 2023 17:28:00 +0200
Subject: [PATCH 1/2] fix: bug with out of sync index in createHistoryMemory

fix: index v2
---
 packages/native/src/createMemoryHistory.tsx | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/native/src/createMemoryHistory.tsx b/packages/native/src/createMemoryHistory.tsx
index 0f5927057a..f2110fd191 100644
--- a/packages/native/src/createMemoryHistory.tsx
+++ b/packages/native/src/createMemoryHistory.tsx
@@ -174,21 +174,20 @@ export function createMemoryHistory() {
         // But on Firefox, it seems to take much longer, around 50ms from our testing
         // We're using a hacky timeout since there doesn't seem to be way to know for sure
         const timer = setTimeout(() => {
-          const index = pending.findIndex((it) => it.ref === done);
+          const foundIndex = pending.findIndex((it) => it.ref === done);
 
-          if (index > -1) {
-            pending[index].cb();
-            pending.splice(index, 1);
+          if (foundIndex > -1) {
+            pending[foundIndex].cb();
+            pending.splice(foundIndex, 1);
           }
+
+          index = this.index;
         }, 100);
 
         const onPopState = () => {
-          const id = window.history.state?.id;
-          const currentIndex = items.findIndex((item) => item.id === id);
-
           // Fix createMemoryHistory.index variable's value
           // as it may go out of sync when navigating in the browser.
-          index = Math.max(currentIndex, 0);
+          index = this.index;
 
           const last = pending.pop();
 
@@ -206,6 +205,10 @@ export function createMemoryHistory() {
     // Here we normalize it so that only external changes (e.g. user pressing back/forward) trigger the listener
     listen(listener: () => void) {
       const onPopState = () => {
+        // Fix createMemoryHistory.index variable's value
+        // as it may go out of sync when navigating in the browser.
+        index = this.index;
+
         if (pending.length) {
           // This was triggered by `history.go(n)`, we shouldn't call the listener
           return;

From 90c8f45c2acbcc39af4a753c5cc01a4892a29ff3 Mon Sep 17 00:00:00 2001
From: Adam Grzybowski <adam.grzybowski@swmansion.com>
Date: Fri, 28 Jul 2023 17:11:11 +0200
Subject: [PATCH 2/2] feat: log createMemoryHistory items

---
 packages/native/src/createMemoryHistory.tsx | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/native/src/createMemoryHistory.tsx b/packages/native/src/createMemoryHistory.tsx
index f2110fd191..b3bd06a916 100644
--- a/packages/native/src/createMemoryHistory.tsx
+++ b/packages/native/src/createMemoryHistory.tsx
@@ -14,6 +14,26 @@ export function createMemoryHistory() {
   let index = 0;
   let items: HistoryRecord[] = [];
 
+  // @ts-ignore no-unused-vars
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const log = () => {
+    console.log(
+      JSON.stringify(
+        {
+          index,
+          indexGetter: history.index,
+          items: items.map((item, i) => ({
+            selected: history.index === i ? '<<<<<<<' : undefined,
+            path: item.path,
+            id: item.id,
+            state: item.state?.key || null,
+          })),
+        },
+        null,
+        4
+      )
+    );
+  };
   // Pending callbacks for `history.go(n)`
   // We might modify the callback stored if it was interrupted, so we have a ref to identify it
   const pending: { ref: unknown; cb: (interrupted?: boolean) => void }[] = [];
@@ -215,6 +235,7 @@ export function createMemoryHistory() {
         }
 
         listener();
+        // log();
       };
 
       window.addEventListener('popstate', onPopState);