@jsenv/navi 0.29.463 → 0.29.464

package/dist/jsenv_navi.js

@@ -11409,6 +11409,8 @@ const keptNameWeakMap = new WeakMap();
 const getRouteActionKeptName = (routeAction) => {
   return keptNameWeakMap.get(routeAction);
 };
+// Shared by every route action without a `when`.
+const NOT_GATED_SIGNAL = signal(false);
 let activeRouteActionsPrevious = new Set();
 /**
  * The route actions asking something for the page on screen: their route
@@ -11435,19 +11437,17 @@ const activeRouteActionsSignal = computed(() => {
 });
 
 /**
- * Whether a route action of the page on screen asks nothing yet: its route
- * matches and its params (or `when`) say no. Gated on app state not there yet,
- * or never meant to ask on this page — nothing tells one from the other before
- * it asks. Read by the scroll restoration, which stays ready for it.
+ * Whether a route action of the page on screen waits for app state to ask: its
+ * route matches and its `when` says no. Params that say no are not waiting:
+ * they read the address, and this one asks nothing of the action — a later ask
+ * is the page changing under the reader (a search typed), not arriving. Read
+ * by the scroll restoration, which stays ready for it.
  *
  * @type {import("@preact/signals").ReadonlySignal<boolean>}
  */
 const routeActionYetToAskSignal = computed(() => {
-  for (const {
-    routeMatchingSignal,
-    askingSignal,
-  } of routeActionEntriesSignal.value) {
-    if (routeMatchingSignal.value && !askingSignal.value) {
+  for (const { gatedSignal } of routeActionEntriesSignal.value) {
+    if (gatedSignal.value) {
       return true;
     }
   }
@@ -11520,7 +11520,9 @@ const activeRouteReadsSignal = computed(() => {
  *   params when the condition holds at that moment — a page's code only some
  *   readers may download (`() => meIsAdminSignal.value`). A condition reading
  *   the address belongs in the params: a link reads `when` as it is, not as
- *   the address it leads to will make it.
+ *   the address it leads to will make it. It is also what a reload's scroll
+ *   position waits for: the page is not whole while a `when` says no, whereas
+ *   params that say no ask nothing on this page (see scroll_restoration.js).
  * @param {boolean} [options.prefetch=true] - `false` keeps the action from
  *   being prerun ahead of what asks for it, when the read is not worth a
  *   hover or a press that may not end in an opening.
@@ -11567,8 +11569,10 @@ const routeAction = (
     ...routeActionEntriesSignal.peek(),
     {
       routeAction: actionBoundToRoute,
-      routeMatchingSignal,
       askingSignal: computed(() => Boolean(readParamsAsked())),
+      gatedSignal: when
+        ? computed(() => Boolean(routeMatchingSignal.value) && !when())
+        : NOT_GATED_SIGNAL,
     },
   ];
   for (const route of routes) {
@@ -11726,8 +11730,8 @@ const haveSameMembers = (setA, setB) => {
  * mount="after-paint">` is built before the offset that shows it is written
  * (see mount_after_paint.jsx), and a reload or a return waits for the route
  * actions the page has nothing to draw for — its code among them — including
- * one that starts asking after the position is written (see
- * putBackOnceAnswered). Anything else only the page knows, and it says so
+ * one whose `when` lets it ask after the position is written (see
+ * stayForLateAsks). Anything else only the page knows, and it says so
  * (useHoldScrollRestoration). A wait can be long, so the reader reaching for
  * the page during it cancels the position: moved afterwards, they would lose
  * whatever they had started on.
@@ -11932,7 +11936,7 @@ const holdScrollRestoration = () => {
  * meantime (a finger, a click, a wheel, a key), or gone elsewhere.
  *
  * The page's route actions are waited for without this — its code, a read
- * with no answer yet, one gated on app state that asks later. This is for
+ * with no answer yet, one whose `when` holds later. This is for
  * what navi cannot see: a read the page starts itself, content whose height
  * arrives late.
  *
@@ -12073,14 +12077,15 @@ const readUnansweredRouteActions = () => {
   return unanswered;
 };
 
-// A page can start asking after the position is written: an action gated on
-// app state not there yet (`when`, or params reading an app-wide read), and
-// nothing tells "not yet" from "never" before it asks (see
-// routeActionYetToAskSignal). So a written position stays pending while a
-// route action of the page has not asked: the next one that starts without an
-// answer is waited for like the first ones, and the position put back once it
-// is drawn. Not told when the restoration is dropped (pendingRestoration is no
-// signal): it notices at its next run.
+// A page can still be arriving after the position is written: an action whose
+// `when` waits for app state not there yet (see routeActionYetToAskSignal). So
+// a written position stays pending while one does: the next one that starts
+// without an answer is waited for like the first ones, and the position put
+// back once it is drawn. Params that say no are not waited for: the address
+// asks nothing of the action, and one that asks later — a search typed — is
+// the page moving on under the reader, not arriving. Not told when the
+// restoration is dropped (pendingRestoration is no signal): it notices at its
+// next run.
 const stayForLateAsks = (restoration) => {
   effect(function () {
     let running = false;
@@ -82835,6 +82840,24 @@ const PickerButton = props => {
     clearConfirm,
     requestValue
   };
+  // `--navi-select`/`--navi-unselect` about one entry of the list the picker
+  // holds — a chip on the façade, a suggestion beside the field. Answered here
+  // rather than by the control drawing that list in the popup, even though rows
+  // are what such a control owns: a picker given its own value builds its popup
+  // only on first open (see popup_content_mount.js), so before that there is no
+  // such control at all — and building the whole popup to have someone to talk
+  // to, for a cross, is the wrong price. The picker holds the value in the first
+  // place and hands it down whenever the popup is built.
+  //
+  // Heard on both elements, like every request a control answers: a chip inside
+  // the picker aims at its root (the parent control), one standing elsewhere
+  // names it with `commandFor`, and the picker's id is on its input.
+  const onRequestSelect = e => {
+    requestPickerListEntry(ref.current, inputRef.current, e, "select");
+  };
+  const onRequestUnselect = e => {
+    requestPickerListEntry(ref.current, inputRef.current, e, "unselect");
+  };
   return (
     /* Read-only crosses into everything the picker is made of: what it really
        holds is drawn by controls of their own — in the popup, and on the façade
@@ -82895,23 +82918,9 @@ const PickerButton = props => {
         ,
         onnavi_request_open: inputProps.onnavi_request_open,
         onnavi_request_close: inputProps.onnavi_request_close,
-        onnavi_open_press: inputProps.onnavi_open_press
-        // `--navi-select`/`--navi-unselect` about one entry of the list the
-        // picker holds — a chip on the façade, a suggestion beside the field.
-        // Answered here rather than by the control drawing that list in the
-        // popup, even though rows are what such a control owns: a picker given
-        // its own value builds its popup only on first open (see
-        // popup_content_mount.js), so before that there is no such control at
-        // all — and building the whole popup to have someone to talk to, for a
-        // cross, is the wrong price. The picker holds the value in the first
-        // place and hands it down whenever the popup is built.
-        ,
-        onnavi_request_select: e => {
-          requestPickerListEntry(ref.current, inputRef.current, e, "select");
-        },
-        onnavi_request_unselect: e => {
-          requestPickerListEntry(ref.current, inputRef.current, e, "unselect");
-        },
+        onnavi_open_press: inputProps.onnavi_open_press,
+        onnavi_request_select: onRequestSelect,
+        onnavi_request_unselect: onRequestUnselect,
         children: [jsx("span", {
           className: "navi_picker_box",
           style: hangingChevronSize === undefined ? undefined : {
@@ -82933,6 +82942,8 @@ const PickerButton = props => {
               children: undefined // we will render children into the div
               ,
               ui: ui,
+              onnavi_request_select: onRequestSelect,
+              onnavi_request_unselect: onRequestUnselect,
               onCopy: e => {
                 const pickerEl = ref.current;
                 if (isWithinPickerContent(e.target, pickerEl)) {