@jsenv/navi 0.29.499 → 0.29.500

package/dist/dev/jsenv_navi.js

@@ -14962,7 +14962,21 @@ const setupBrowserIntegrationViaHistory = ({
   // asked for it (see navBack's `landOn`). Read by the popstate listener,
   // which is the one place the landing is applied.
   let landOnPending = null;
-  const navBack = ({ fallback, landOn } = {}) => {
+  // The back navBack asked for, from history.back() to the "popstate" that
+  // answers it. Meanwhile the document still reads the entry being left (see
+  // whenBackLanded).
+  let backInFlight = null;
+  const whenBackLanded = (callback) => {
+    if (backInFlight) {
+      return backInFlight.then(callback);
+    }
+    return callback();
+  };
+  // A second back asked before the first one landed (two popups closed in the
+  // same handler) waits for it: the browser would queue both, but the landing
+  // has one slot, and its `landOn` was read on the entry the first back leaves.
+  const navBack = (options) => whenBackLanded(() => navBackNow(options));
+  const navBackNow = ({ fallback, landOn } = {}) => {
     if (canNavBackSignal.peek()) {
       // Resolved once the back has landed: the "popstate" it is answered with
       // reaches the routing listener first (registered at setup, before this
@@ -14974,10 +14988,12 @@ const setupBrowserIntegrationViaHistory = ({
             return;
           }
           window.removeEventListener("popstate", onPopstate);
+          backInFlight = null;
           resolve(true);
         };
         window.addEventListener("popstate", onPopstate);
       });
+      backInFlight = landedPromise;
       landOnPending = landOn || null;
       window.history.back();
       return landedPromise;
@@ -15021,6 +15037,7 @@ const setupBrowserIntegrationViaHistory = ({
     stop,
     reload,
     navBack,
+    whenBackLanded,
     navForward,
     getDocumentState,
     carryByLinkNavigation,
@@ -15367,6 +15384,10 @@ const reload = browserIntegration.reload;
  *   current entry's place.
  */
 const navBack = browserIntegration.navBack;
+// Runs `callback` once the back navBack started has landed, at once when there
+// is none: until then the document reads the entry that back is leaving, and
+// a write made there is gone with it.
+const whenBackLanded = browserIntegration.whenBackLanded;
 const navForward = browserIntegration.navForward;
 const isVisited = browserIntegration.isVisited;
 const visitedUrlsSignal = browserIntegration.visitedUrlsSignal;
@@ -15617,7 +15638,14 @@ const useNavStateBasic = (
     }
     leaveEntry({ isBack, discard });
   };
+  // Read and written on the entry the document lands on: a leave asked while
+  // another one's back is in flight (a popup closed with the one under it)
+  // would otherwise carry that entry's url and state — the other key
+  // included — onto the wrong one.
   const leaveEntry = ({ isBack, discard }) => {
+    whenBackLanded(() => leaveLandedEntry({ isBack, discard }));
+  };
+  const leaveLandedEntry = ({ isBack, discard }) => {
     if (!Object.hasOwn(browserIntegration.getDocumentState() || {}, id)) {
       return;
     }
@@ -18921,7 +18949,14 @@ const writeInSignal = (signal, value, { history }) => {
 // `discard` empties what belongs to the popup alone (its `ownSignals`): before
 // a keep-close reads the url it lands on, and once a back has landed — the
 // entry behind may hold them too, written by an `onOpen` before the push.
-const writeOpenedInSignal = (
+//
+// Read and written on the entry the document lands on: a close asked while
+// another popup's back is in flight (a popup closed with the one under it)
+// would otherwise read the url that back is leaving, and write onto it.
+const writeOpenedInSignal = (...args) => {
+  whenBackLanded(() => writeOpenedInLandedSignal(...args));
+};
+const writeOpenedInLandedSignal = (
   signal,
   opened,
   event,