@jsenv/navi 0.29.414 → 0.29.415

package/dist/dev/jsenv_navi.js

@@ -14697,6 +14697,31 @@ const moveFocusTo = (
   });
 };
 
+/**
+ * Gives the focus back to `target` once the commit a close is part of is over:
+ * for a close caused by an unmount (UNMOUNT_EVENT_TYPE in
+ * layout/open_controller.js), which runs from a cleanup while the tree leaving
+ * with it is still in the document. Only its end tells a target leaving with
+ * it — disconnected by then, and skipped — from one staying, and a focused
+ * element that leaves makes the removal of its whole subtree restyle it.
+ *
+ * And only into a void: the close took the focus with it, so something holding
+ * the focus by then — a page arriving that focused a field of its own — took it
+ * after, and keeps it.
+ */
+const giveFocusBackAfterCommit = (target, giveFocus) => {
+  queueMicrotask(() => {
+    if (!target || !target.isConnected) {
+      return;
+    }
+    const focusedNow = document.activeElement;
+    if (focusedNow && focusedNow !== document.body) {
+      return;
+    }
+    giveFocus();
+  });
+};
+
 const focusTransferTarget = (target, focusVisible) => {
   moveFocusTo(target, { focusVisible });
   if (target.hasAttribute("navi-autofocus-select")) {
@@ -15251,6 +15276,12 @@ const createOpenController = (
               closeEvent,
               `closed by focusout -> let focus go away`,
             );
+          } else if (findEvent(closeEvent, UNMOUNT_EVENT_TYPE)) {
+            // Left the tree: what held the focus before the opening may be
+            // leaving with it (see giveFocusBackAfterCommit).
+            giveFocusBackAfterCommit(focusTransfer.focusedElement, () => {
+              focusTransfer.restoreFocus(closeEvent);
+            });
           } else {
             // Only the mousedown, deliberately: a popup with no backdrop is
             // closed by a `pointerdown` that belongs to the page (see
@@ -18119,14 +18150,8 @@ const createCalloutManager = (
           };
           if (findEvent(closeEvent, UNMOUNT_EVENT_TYPE)) {
             // Closed by a popup leaving the tree: the control may be leaving
-            // in the same commit, which only its end tells. A leaving control
-            // must not get the focus — the removal of a subtree holding it
-            // restyles the whole subtree.
-            queueMicrotask(() => {
-              if (focusTarget.isConnected) {
-                giveFocusBack();
-              }
-            });
+            // with it (see giveFocusBackAfterCommit).
+            giveFocusBackAfterCommit(focusTarget, giveFocusBack);
           } else {
             // Given before the callout leaves the document: removed while it
             // holds the focus, it sends a focusout with nowhere to go up
@@ -32251,7 +32276,11 @@ const useContentKeepingLeavingPages = branch => {
     // mounted with, or it would be mounted again.
     key = shown.key;
     page = shown.page;
-  } else if (shown && leavingPagesHold) {
+  } else if (shown && leavingPagesHold && !document.querySelector(":modal")) {
+    // Never while a modal dialog is open: it keeps everything but itself out
+    // of reach — the page arriving could not even take the focus — for as long
+    // as it is open, and one in a page kept while leaving stays open for the
+    // whole movement. The page is then taken down at once, as without one.
     leavingRef.current.push({
       vnode: shown.vnode,
       page: shown.page,
@@ -32298,10 +32327,17 @@ const useContentKeepingLeavingPages = branch => {
       }
       entry.hidden = true;
       entry.page.leavingSignal.value = true;
+      const focusedElement = document.activeElement;
       let node = start.nextSibling;
       while (node && node !== end) {
         if (node.nodeType === Node.ELEMENT_NODE) {
           node.setAttribute(LEAVING_ATTRIBUTE, "");
+          // What the keyboard held in it goes where the page's removal would
+          // have sent it: a hidden element keeps the focus, and would go on
+          // receiving the keys pressed during the movement.
+          if (node.contains(focusedElement)) {
+            focusedElement.blur();
+          }
         }
         node = node.nextSibling;
       }
@@ -45138,8 +45174,12 @@ const useInteractiveProps = (props, {
     }
     // Read by READONLY_CONSTRAINT to say how many runs are already out, and by
     // the action handlers below, which are where a run joins and leaves the
-    // count (a labelled block away, hence through the controller).
-    uiStateController.parallelGuard = parallelGuard;
+    // count (a labelled block away, hence through the controller). None for a
+    // control without an action of its own, by the same rule as being held
+    // back: what it runs (the noop every such control has, a link's
+    // navigation) is nothing the guard counts, and would hold a slot for its
+    // length.
+    uiStateController.parallelGuard = props.action ? parallelGuard : null;
     if (heldByParallelGuard) {
       controlHostProps["data-readonly-reason"] = "parallel-guard";
     }
@@ -45414,7 +45454,11 @@ const useInteractiveProps = (props, {
         // carried by every navi_action_* event of that run).
         uiStateController.pendingActionEvent = e.detail.event;
         uiStateController.actionInFlight = true;
-        uiStateController.parallelGuard?.claim(uiStateController);
+        // Given back to the guard it was counted in, whatever the control
+        // holds by then: one that lost its action mid-run has no guard left
+        // to name, and the slot would stay taken.
+        const countedIn = uiStateController.parallelGuard;
+        countedIn?.claim(uiStateController);
         if (optimistic) {
           syncOptimisticAttribute(true);
         }
@@ -45432,7 +45476,7 @@ const useInteractiveProps = (props, {
         e.detail.addSideEffect((outcome, outcomeEvent) => {
           uiStateController.actionInFlight = false;
           uiStateController.runningActionSignal.value = null;
-          uiStateController.parallelGuard?.release(uiStateController);
+          countedIn?.release(uiStateController);
           // The outcome callbacks are told from here, the run's side effect,
           // and not from the onnavi_action_* handlers below: the run can
           // outlive this control (its own answer, written to a store the
@@ -48965,6 +49009,90 @@ const BinderItemContext = createContext(null);
  */
 const NavContext = createContext(null);
 
+/**
+ * Whether the page one is on is `route` with `params` — what a link or a button
+ * pointing at a route shows as current.
+ *
+ * Read through a computed of that one answer, so the component reading it
+ * re-renders when the answer flips, and not whenever the route's status moves:
+ * a page arriving on the route with other params — one profile opening, under a
+ * list of links to a hundred other profiles — starts the route matching and
+ * changes its params, and leaves every one of those links exactly as it was.
+ *
+ * `except`: routes whose matching vetoes the answer — a route named there is
+ * somewhere else, whatever the rest of the reading says. `also`: routes whose
+ * matching grants it. Both take a route or a list of routes.
+ */
+const useRouteCurrent = (route, params, { except, also } = {}) => {
+  const exceptRoutes = toRouteList(except);
+  const alsoRoutes = toRouteList(also);
+  const paramsKey = getParamsCacheKey(params);
+  const exceptKey = routeListKey(exceptRoutes);
+  const alsoKey = routeListKey(alsoRoutes);
+  const currentSignal = useMemo(() => {
+    if (paramsKey === null) {
+      return null;
+    }
+    return computed(() =>
+      readRouteCurrent(route, params, exceptRoutes, alsoRoutes),
+    );
+  }, [route, paramsKey, exceptKey, alsoKey]);
+  if (!currentSignal) {
+    // Params no key can be made of (a date, an object): read on the spot, the
+    // component then re-renders with the status of every route it reads.
+    return readRouteCurrent(route, params, exceptRoutes, alsoRoutes);
+  }
+  return currentSignal.value;
+};
+
+// Every signal is read even once the answer is known: reading is what
+// subscribes, and a route skipped today is the one whose change has to be heard
+// tomorrow.
+const readRouteCurrent = (route, params, exceptRoutes, alsoRoutes) => {
+  const matching = route.matchingSignal.value;
+  const paramsMatching = route.matchesParams(params);
+  let someExceptMatching = false;
+  for (const exceptRoute of exceptRoutes) {
+    if (exceptRoute.matchingSignal.value) {
+      someExceptMatching = true;
+    }
+  }
+  let someAlsoMatching = false;
+  for (const alsoRoute of alsoRoutes) {
+    if (alsoRoute.matchingSignal.value) {
+      someAlsoMatching = true;
+    }
+  }
+  if (someExceptMatching) {
+    return false;
+  }
+  return (matching && paramsMatching) || someAlsoMatching;
+};
+
+const toRouteList = (routes) => {
+  if (!routes) {
+    return [];
+  }
+  return Array.isArray(routes) ? routes : [routes];
+};
+
+// A list of routes as a key, since an inline `currentAlso={[A, B]}` is a new
+// array at every render of the parent.
+const routeIdByRoute = new WeakMap();
+let routeIdCount = 0;
+const routeListKey = (routes) => {
+  let key = "";
+  for (const route of routes) {
+    let id = routeIdByRoute.get(route);
+    if (id === undefined) {
+      id = ++routeIdCount;
+      routeIdByRoute.set(route, id);
+    }
+    key += `${id},`;
+  }
+  return key;
+};
+
 /*
  * Custom hook to apply semi-transparent color when an element should be dimmed.
  *
@@ -49514,15 +49642,17 @@ const LinkWithRoute = ({
     assertRoute(route);
   }
   const url = route.buildUrl(routeParams);
-  const {
-    matching
-  } = useRouteStatus(route);
-  const paramsAreMatching = route.matchesParams(routeParams);
-  const someExceptedRouteMatching = useSomeRouteMatching(currentExcept);
-  const someAlsoRouteMatching = useSomeRouteMatching(currentAlso);
-  // "Except" is a veto: a route named there is somewhere else, whatever the
-  // rest of the reading says.
-  const linkMatching = !someExceptedRouteMatching && (matching && paramsAreMatching || someAlsoRouteMatching);
+  {
+    for (const amendingRoute of [currentExcept, currentAlso].flat()) {
+      if (amendingRoute) {
+        assertRoute(amendingRoute);
+      }
+    }
+  }
+  const linkMatching = useRouteCurrent(route, routeParams, {
+    except: currentExcept,
+    also: currentAlso
+  });
   const innerCurrent = current || linkMatching;
   return jsx(Link, {
     href: url,
@@ -49531,25 +49661,6 @@ const LinkWithRoute = ({
     children: children || route.buildRelativeUrl(routeParams)
   });
 };
-// A route, or a list of them, read as one answer: does any of them match.
-// Reading matchingSignal during the render is what subscribes the component to
-// it, so every route is read even once one has answered yes — stopping early
-// would leave the component deaf to the ones it skipped.
-const useSomeRouteMatching = routes => {
-  if (!routes) {
-    return false;
-  }
-  let someMatching = false;
-  for (const route of Array.isArray(routes) ? routes : [routes]) {
-    {
-      assertRoute(route);
-    }
-    if (route.matchingSignal.value) {
-      someMatching = true;
-    }
-  }
-  return someMatching;
-};
 const LinkPlain = props => {
   const defaultRef = useRef();
   props.ref = props.ref || defaultRef;
@@ -54636,11 +54747,7 @@ const ButtonWithRoute = props => {
     assertRoute(route);
   }
   const url = route.buildUrl(routeParams);
-  const {
-    matching
-  } = useRouteStatus(route);
-  const paramsAreMatching = route.matchesParams(routeParams);
-  const linkMatching = matching && paramsAreMatching;
+  const linkMatching = useRouteCurrent(route, routeParams);
 
   // Merged into whatever the caller already holds: a button can be forced into
   // a state for a demo and still learn its own current-ness from its route.
@@ -66073,10 +66180,24 @@ const useDialogProps = props => {
       // whichever show call ran, not just when a stray authored display
       // property is actually present — harmless the rest of the time.
       dialogEl.setAttribute("navi-hidden", "");
-      if (isTopLayerPopover) {
-        dialogEl.hidePopover();
+      const hideNatively = () => {
+        if (isTopLayerPopover) {
+          dialogEl.hidePopover();
+        } else {
+          dialogEl.close();
+        }
+      };
+      if (findEvent(closeEvent, UNMOUNT_EVENT_TYPE)) {
+        // Leaving the tree: hidden natively once the commit is over. Its
+        // removal takes it out of the top layer and hands the focus to
+        // nobody, where closing it now hands the focus to whatever held it
+        // before the opening — often a trigger leaving in the same commit
+        // (see giveFocusBackAfterCommit). What is left to close then is its
+        // state: a <dialog> removed while open keeps its `open` attribute, and
+        // a subtree <Suspense> parks and puts back would show it again.
+        queueMicrotask(hideNatively);
       } else {
-        dialogEl.close();
+        hideNatively();
       }
       // Held at the size it has right now, for the whole way out. cleanup()
       // below already stops the JS repositioning, but the size is CSS-driven
@@ -67781,7 +67902,13 @@ const usePopoverProps = props => {
       // reliably sufficient once a consumer's own CSS also sets display.
       popoverEl.setAttribute("navi-hidden", "");
       if (isTopLayer) {
-        popoverEl.hidePopover();
+        // Left to its removal when the popover leaves the tree: that hides it
+        // and hands the focus to nobody, where hidePopover() hands the focus
+        // to whatever held it before the opening — often a trigger leaving in
+        // the same commit (see giveFocusBackAfterCommit).
+        if (!findEvent(closeEvent, UNMOUNT_EVENT_TYPE)) {
+          popoverEl.hidePopover();
+        }
       } else {
         openLocalPopoverCount = Math.max(0, openLocalPopoverCount - 1);
       }