@jsenv/navi 0.29.360 → 0.29.362

package/dist/dev/jsenv_navi.js

@@ -4635,9 +4635,12 @@ const findControlHost = (el) => {
  * `findControlHost` above answers for a control's own DOM (itself, or the native
  * element it wraps). This one is for something that is not part of a control but
  * has to reach one — an interaction declared on a box (see
- * interaction/interactions.js), which may be the control, may hold it, or may sit
- * inside it. Nearest wins in that order, and the answer is null when there is no
- * control anywhere: not every box lives in one.
+ * interaction/interactions.js), which may be the control, may sit inside it, or
+ * may be a wrapper around exactly one. Nearest wins in that order, and the answer
+ * is null when there is no control the box belongs to: not every box lives in
+ * one, and a box laying out several controls (a row of badges, a toolbar) is
+ * held by none of them — its interactions are its own, and a press on its empty
+ * part is not a press on the first control it happens to contain.
  */
 const findNearestControlHost = (el) => {
   // Itself, then upwards — the box is inside a button, or is one.
@@ -4645,8 +4648,22 @@ const findNearestControlHost = (el) => {
   if (selfOrAncestor) {
     return selfOrAncestor;
   }
-  // …then downwards: the box holds the control rather than being held by it.
-  return el.querySelector("[navi-control-host]");
+  // …then downwards, only when the box wraps a single control. Counted by
+  // control, not by host: a picker holds the hosts of its popup content, and a
+  // box around that one picker is still around one control.
+  let single = null;
+  for (const host of el.querySelectorAll("[navi-control-host]")) {
+    const controlRoot = host.closest("[navi-control]") || host;
+    const controlAbove = controlRoot.parentElement.closest("[navi-control]");
+    if (controlAbove && el.contains(controlAbove)) {
+      continue;
+    }
+    if (single && single !== controlRoot) {
+      return null;
+    }
+    single = controlRoot;
+  }
+  return single ? findControlHost(single) : null;
 };
 const isControlRoot = (el) => {
   return el.hasAttribute("navi-control");
@@ -10957,9 +10974,10 @@ const interactionsDisputeThePress = (interactions) => {
  *
  * The control is not passed in: it is found from the element, which is what lets
  * `interactions` live on a Box rather than on the control itself. A Box that IS a
- * control (a Button) is its own; a Box around one or inside one reaches it; a Box
- * with no control anywhere near it can still answer with a callback of the
- * caller's, and only "request_action" has nothing to ask.
+ * control (a Button) is its own; a Box inside one, or wrapping exactly one,
+ * reaches it; a Box with no control anywhere near it — or laying out several,
+ * which belongs to none of them — still answers with a callback of the caller's,
+ * and only "request_action" has nothing to ask.
  *
  * Set up once per element rather than on every render, which is what lets a
  * detector be a plain `setup`/teardown pair. So the interactions themselves are
@@ -11007,7 +11025,7 @@ const useInteractionsEffect = (ref, interactionsRef) => {
         if (!controlHost) {
           {
             console.warn(
-              `interactions: "${type}" asks for an action, but there is no control around it to ask. Put the interaction on a control (or on a box that holds one), or give it a callback.`,
+              `interactions: "${type}" asks for an action, but there is no control around it to ask. Put the interaction on a control (or on a box that wraps exactly one), or give it a callback.`,
             );
           }
           return null;
@@ -27715,6 +27733,18 @@ const takeoverRoutingRenderingHold = () => {
  * to a reader. Kept in the session too, so a reload lands where the browser
  * would have landed — the flag above is a promise to do the whole job.
  *
+ * The document is not the only scrollport of a page. A list scrolling itself
+ * (a `<List expandY>` under a search field that stays put) is left and come
+ * back to the same way, and the browser never knew it was a scrollport at
+ * all: those say where they are by name (rememberScrollerPosition), under the
+ * same URL and for the same session, and ask it back when they mount again
+ * (recallScrollerPosition). What a push means for them is what it means for
+ * the document — an arrival opens at the top (see startAtTop): the page
+ * arrived at has its named positions dropped before its lists render, so a
+ * list recalls only on the way back. A scroller that goes while its page
+ * stays — a popup closing over the same address — has nothing to come back
+ * to, and says so as it leaves (forgetScrollerUnlessPageLeft).
+ *
  * What is NOT covered, and cannot be from here: a page whose height depends on
  * something still loading. Its content is not there at the moment it is put
  * back, so a position beyond what has arrived is clamped as before. Only the
@@ -27732,7 +27762,23 @@ const takeoverRoutingRenderingHold = () => {
 const STORAGE_KEY = "navi_scroll_positions";
 
 const positionByUrl = new Map();
-const readStoredPositions = () => {
+// url -> (scroller name -> position). The position is whatever the scroller
+// handed in: what it can put itself back on, in its own terms.
+const scrollerPositionsByUrl = new Map();
+// The url each named scroller last spoke under: what tells a scroller leaving
+// a page that stays from one leaving with its page.
+const urlByScrollerName = new Map();
+
+// Read once, the first time anyone needs the positions: the document's
+// restoration is installed by the routing, and a list remembering itself may
+// mount in an app that never routes.
+let storeLoaded = false;
+const loadStore = () => {
+  if (storeLoaded) {
+    return;
+  }
+  storeLoaded = true;
+  window.addEventListener("pagehide", storePositions);
   let stored;
   try {
     stored = window.sessionStorage.getItem(STORAGE_KEY);
@@ -27745,18 +27791,31 @@ const readStoredPositions = () => {
     return;
   }
   try {
-    for (const [url, position] of Object.entries(JSON.parse(stored))) {
+    const { document: documentPositions, scrollers } = JSON.parse(stored);
+    for (const [url, position] of Object.entries(documentPositions || {})) {
       positionByUrl.set(url, position);
     }
+    for (const [url, positionByName] of Object.entries(scrollers || {})) {
+      scrollerPositionsByUrl.set(url, new Map(Object.entries(positionByName)));
+    }
   } catch {
     // Something else wrote there, or it was truncated.
   }
 };
 const storePositions = () => {
+  const scrollers = {};
+  for (const [url, positionByName] of scrollerPositionsByUrl) {
+    if (positionByName.size > 0) {
+      scrollers[url] = Object.fromEntries(positionByName);
+    }
+  }
   try {
     window.sessionStorage.setItem(
       STORAGE_KEY,
-      JSON.stringify(Object.fromEntries(positionByUrl)),
+      JSON.stringify({
+        document: Object.fromEntries(positionByUrl),
+        scrollers,
+      }),
     );
   } catch {
     // Full, or refused: the session is the only thing lost.
@@ -27796,7 +27855,7 @@ const installScrollRestoration = () => {
     return;
   }
   window.history.scrollRestoration = "manual";
-  readStoredPositions();
+  loadStore();
   // Read as it happens rather than when leaving: a traverse changes the url
   // before anything here is told, so a position read then would be read for
   // the wrong page.
@@ -27813,7 +27872,6 @@ const installScrollRestoration = () => {
     },
     { passive: true },
   );
-  window.addEventListener("pagehide", storePositions);
   // What a reload asks for, now that the browser has been told not to do it.
   // Once, and at the first render of a route: the position is only meaningful
   // once there is a page under it.
@@ -27856,18 +27914,35 @@ const restoreScrollPosition = (url) => {
 // The document, because the document is the scrollport in the common case. An
 // app that scrolls an element of its own scrolls it itself.
 const startAtTop = (url, { from } = {}) => {
+  if (!isArrival(url, { from })) {
+    return;
+  }
+  window.scrollTo({ top: 0, left: 0, behavior: "instant" });
+};
+const isArrival = (url, { from }) => {
   const urlObject = new URL(url, window.location.href);
   // A fragment names where to land, and the browser is the one that finds it.
   if (urlObject.hash) {
-    return;
+    return false;
   }
   if (
     from !== undefined &&
     new URL(from, window.location.href).pathname === urlObject.pathname
   ) {
+    return false;
+  }
+  return true;
+};
+
+// The same arrival, for the page's own scrollers. The document is scrolled to
+// its top once the page is there; a list opens where it decides to in its
+// first render, so what it must not find is dropped before the routing
+// renders anything.
+const forgetScrollersOnArrival = (url, { from } = {}) => {
+  if (!isArrival(url, { from })) {
     return;
   }
-  window.scrollTo({ top: 0, left: 0, behavior: "instant" });
+  scrollerPositionsByUrl.delete(new URL(url, window.location.href).href);
 };
 
 // An arrival at a page whose scrollport is already showing another one: the
@@ -27886,6 +27961,49 @@ const scrollTo = ({ x, y }) => {
   window.scrollTo({ top: y, left: x, behavior: "instant" });
 };
 
+const rememberScrollerPosition = (name, position) => {
+  loadStore();
+  const url = window.location.href;
+  let positionByName = scrollerPositionsByUrl.get(url);
+  if (!positionByName) {
+    positionByName = new Map();
+    scrollerPositionsByUrl.set(url, positionByName);
+  }
+  positionByName.set(name, position);
+  urlByScrollerName.set(name, url);
+};
+
+const recallScrollerPosition = (name) => {
+  loadStore();
+  const positionByName = scrollerPositionsByUrl.get(window.location.href);
+  if (!positionByName) {
+    return undefined;
+  }
+  return positionByName.get(name);
+};
+
+// Said by a scroller as it unmounts. Its page is being left when the url is
+// already another one — the history is written before the page it names is
+// taken down — and then its position is kept for the way back. The url still
+// being the one it spoke under means the page stays and the scroller alone
+// goes (a popup closing, a section folding): there is no coming back to a
+// place that was not left, and a position kept would greet the next mount
+// under this address as a return.
+const forgetScrollerUnlessPageLeft = (name) => {
+  const url = urlByScrollerName.get(name);
+  if (url === undefined) {
+    return;
+  }
+  urlByScrollerName.delete(name);
+  if (url !== window.location.href) {
+    return;
+  }
+  const positionByName = scrollerPositionsByUrl.get(url);
+  if (positionByName) {
+    positionByName.delete(name);
+  }
+};
+
 /**
  * A navigation is ABOUT to be applied — said before its very first write.
  *
@@ -28248,6 +28366,13 @@ const setupBrowserIntegrationViaHistory = ({
       return undefined;
     }
 
+    // The page's own scrollers are told of an arrival before the routing
+    // renders anything: a list arriving decides where it opens in its first
+    // render (see scroll_restoration.js). The document itself is moved once
+    // the page is there, below.
+    if (navigationType === "push") {
+      forgetScrollersOnArrival(url, { from: urlLeft });
+    }
     if (abortController) {
       abortController.abort(`navigating to ${url}`);
     }
@@ -68495,10 +68620,11 @@ const ListUI = props => {
     onListVisibleItemsChange,
     virtualItemSize,
     scrolled,
-    defaultScrolled = "start",
+    defaultScrolled: defaultScrolledProp = "start",
     onScrolledChange,
     scroller = "self",
     hoverWhileScrolling = false,
+    scrollResetOnNavigation = false,
     lockSize,
     columns,
     itemColumns,
@@ -68517,6 +68643,20 @@ const ListUI = props => {
     listRows,
     ...rest
   } = props;
+  // Remembered by name, and a name made up at render (see ListFirstResolver)
+  // names no list a later mount would recognize.
+  const rememberScroll = !scrollResetOnNavigation && !isLikelyPreactGeneratedId(rest.id);
+  // Where the list was when its screen was left, when this is the way back
+  // (see scroll_restoration.js). Read once: `defaultScrolled` is held by
+  // reference, and a place read again each render would be a list moved each
+  // render. A list held by its caller (`scrolled`) is where the caller says.
+  const [scrolledRemembered] = useState(() => {
+    if (!rememberScroll || scrolled !== undefined && scrolled !== null) {
+      return undefined;
+    }
+    return recallScrollerPosition(rest.id);
+  });
+  const defaultScrolled = scrolledRemembered || defaultScrolledProp;
   const scrollBoxPaddingProps = {};
   for (const name of LIST_PADDING_PROP_SET) {
     if (name in rest) {
@@ -68611,6 +68751,8 @@ const ListUI = props => {
     scrolled,
     defaultScrolled,
     onScrolledChange,
+    rememberScroll,
+    listId: rest.id,
     scroller,
     searchText,
     horizontal
@@ -68643,7 +68785,7 @@ const ListUI = props => {
   // locator). Both answer here, so a row is reachable whether or not the
   // window happens to frame it.
   const getItemById = itemId => {
-    const itemDrawn = listRows.itemsSignal.peek().find(item => item.id === itemId);
+    const itemDrawn = listRows.itemsSignal.peek().find(item => item.itemId === itemId);
     if (itemDrawn) {
       return itemDrawn;
     }
@@ -68653,6 +68795,7 @@ const ListUI = props => {
     }
     return {
       id: itemId,
+      itemId,
       index: rowIndex
     };
   };
@@ -68935,6 +69078,8 @@ const useListScrollSync = ({
   scrolled,
   defaultScrolled,
   onScrolledChange,
+  rememberScroll,
+  listId,
   scroller,
   searchText,
   horizontal
@@ -69148,16 +69293,19 @@ const useListScrollSync = ({
       const trigger = `"${event.type}" on ${getElementSignature(event.target)} (${reason})`;
       // When we display the list we prefer to have selected item at the center
       // otherwise, usually when focused by arrow nav, we want to keep it into view close to the nearest edge
-      const block = blockRequested || (event.type === "navi_displayed" ? "center" : "nearest");
-      const scrollToItemCall = `${getElementSignature(itemEl)}.scrollIntoView({ block: "${block}", container: "nearest" })`;
+      const align = blockRequested || (event.type === "navi_displayed" ? "center" : "nearest");
+      const scrollToItemCall = `${getElementSignature(itemEl)}.scrollIntoView({ block: "${align}", inline: "${align}", container: "nearest" })`;
       debugScroll(`${trigger} -> ${scrollToItemCall}`);
       // The list is going somewhere on purpose, so there is no view to hold
       // still any more: an anchor captured before this drop it, or it would
       // put the list back where it was the moment the rows move under it.
       anchorRef.current = null;
+      // One alignment, said on both axes: the axis the list scrolls on is the
+      // one that reads it, and the other has nothing to move.
       scrollIntoViewScoped(itemEl, {
         container: getScroller(),
-        block
+        block: align,
+        inline: align
       });
       const listEl = getListEl();
       dispatchPublicCustomEvent(listEl, "navi_scroll", {
@@ -69169,7 +69317,7 @@ const useListScrollSync = ({
     // Whether the row is drawn is asked of the dom, not of the render window:
     // the window says what a run draws, and a list whose rows are declared one
     // by one has them all in the dom whatever the window says.
-    const itemEl = findRowElement(getListEl(), item.id);
+    const itemEl = findRowElement(getListEl(), item.itemId);
     if (itemEl) {
       scrollItemIntoView(itemEl);
       return;
@@ -69177,7 +69325,7 @@ const useListScrollSync = ({
     // Not in DOM — shift the render window. The item will read
     // pendingScrollRef on mount and scroll into view.
     pendingScrollRef.current = {
-      id: item.id,
+      id: item.itemId,
       resolve: itemEl => {
         pendingScrollRef.current = null;
         scrollItemIntoView(itemEl);
@@ -69529,6 +69677,8 @@ const useListScrollSync = ({
   // one was looking at is then somewhere else.
   const onScrolledChangeRef = useRef(null);
   onScrolledChangeRef.current = onScrolledChange;
+  const rememberScrollRef = useRef(false);
+  rememberScrollRef.current = rememberScroll;
   // Where the list was at the last thing that moved it. Kept whether anyone
   // asked for it or not: it is what a resize needs to put things back.
   const positionRef = useRef(null);
@@ -69546,16 +69696,32 @@ const useListScrollSync = ({
       return;
     }
     positionRef.current = position;
-    if (!onScrolledChangeRef.current) {
+    const remember = rememberScrollRef.current;
+    const onScrolledChange = onScrolledChangeRef.current;
+    if (!remember && !onScrolledChange) {
       return;
     }
     const rowEl = findRowElement(getListEl(), position.id);
-    onScrolledChangeRef.current({
+    const scrolledNow = {
       id: position.id,
       index: position.index,
       offset: position.offset - getRowScrollInset(getScroller(), rowEl, horizontal)
-    });
+    };
+    if (remember) {
+      rememberScrollerPosition(listId, scrolledNow);
+    }
+    if (onScrolledChange) {
+      onScrolledChange(scrolledNow);
+    }
   };
+  // Leaving: with its page, or alone (see forgetScrollerUnlessPageLeft).
+  useLayoutEffect(() => {
+    return () => {
+      if (rememberScrollRef.current) {
+        forgetScrollerUnlessPageLeft(listId);
+      }
+    };
+  }, []);
 
   // A list that gets narrower rewraps every row it holds, so everything below
   // moves and the reader loses their place — the very thing scrolling a long
@@ -69628,7 +69794,7 @@ const useListScrollSync = ({
       return;
     }
     const items = listRows.visibleItemsSignal.peek();
-    const itemNow = items.find(i => i.id === anchor.id);
+    const itemNow = items.find(i => i.itemId === anchor.id);
     if (!itemNow) {
       anchorRef.current = null;
       return;
@@ -70327,17 +70493,22 @@ const resolveScrollInset = (value, viewportSize) => {
   return number;
 };
 
-// The row with that id, IN THIS LIST. Not document.getElementById: an id is
-// only ever unique within a list — two lists on the same page can be showing
-// the same collection — and a list acting on a row that belongs to another one
-// is a spectacular kind of wrong (it scrolls to hold still something it is not
-// even showing).
+// The row of that name, IN THIS LIST — by the name the list knows it under
+// (see ListItemUI), not the element's id. Not document.getElementById either:
+// a name is only ever unique within a list — two lists on the same page can be
+// showing the same collection — and a list acting on a row that belongs to
+// another one is a spectacular kind of wrong (it scrolls to hold still
+// something it is not even showing).
 const findRowElement = (listEl, id) => {
-  return listEl.querySelector(`[id="${CSS.escape(id)}"]`);
+  return listEl.querySelector(`[navi-list-item-real="${CSS.escape(id)}"]`);
 };
+const getRowName = rowEl => rowEl.getAttribute("navi-list-item-real");
 
 // The row the user is looking at, and where it sits: what must not move when
-// the list is rebuilt around it.
+// the list is rebuilt around it. Read off the rows' own boxes, not by
+// hit-testing the screen: a scrolling list takes its rows out of hit-testing
+// (see the navi-scrolling rule in the css above), and the scroll event is
+// precisely when this is asked.
 const captureScrollAnchor = ({
   scrollerEl,
   listEl,
@@ -70349,30 +70520,31 @@ const captureScrollAnchor = ({
   }
   const viewportRect = getScrollerViewportRect(scrollerEl);
   const listRect = listEl.getBoundingClientRect();
-  const scanRange = getListVisibleScanRange(viewportRect, listRect, horizontal);
-  if (!scanRange) {
+  const range = getListVisibleRange(viewportRect, listRect, horizontal);
+  if (!range) {
     return null;
   }
+  const viewportFrom = horizontal ? viewportRect.left : viewportRect.top;
+  const {
+    rowEls,
+    index
+  } = findRowsFrom(listEl, range.from, horizontal);
   let fallbackAnchor = null;
-  for (let pos = scanRange.from + 1; pos < scanRange.to; pos += 8) {
-    const x = horizontal ? pos : scanRange.crossPos;
-    const y = horizontal ? scanRange.crossPos : pos;
-    const el = document.elementFromPoint(x, y);
-    if (!el || !listEl.contains(el)) {
-      continue;
-    }
-    const itemEl = el.closest(REAL_LIST_ITEM_SELECTOR);
-    if (!itemEl) {
-      continue;
+  for (let i = index; i < rowEls.length; i++) {
+    const rowEl = rowEls[i];
+    const rowRect = rowEl.getBoundingClientRect();
+    const rowStart = horizontal ? rowRect.left : rowRect.top;
+    if (rowStart >= range.to) {
+      break;
     }
-    const item = items.find(i => i.id === itemEl.id);
+    const rowName = getRowName(rowEl);
+    const item = items.find(i => i.itemId === rowName);
     if (!item) {
       continue;
     }
-    const itemRect = itemEl.getBoundingClientRect();
-    const offset = horizontal ? itemRect.left - viewportRect.left : itemRect.top - viewportRect.top;
+    const offset = rowStart - viewportFrom;
     const anchor = {
-      id: item.id,
+      id: item.itemId,
       index: item.index,
       offset
     };
@@ -70392,43 +70564,61 @@ const captureScrollAnchor = ({
 // The part of the list that is on screen, along the scrolling axis. Both edges
 // matter: the scroller may be larger than the list (scroller="parent") as well
 // as smaller (the list scrolls inside its own box).
-const getListVisibleScanRange = (viewportRect, listRect, horizontal) => {
-  // The screen has a say too: what is asked here is answered by
-  // elementFromPoint, which only knows about points that are actually on it. A
-  // list whose scroll box hangs below the fold of the page would otherwise be
-  // probed where nothing can be hit — and would silently stop keeping its rows
-  // still, which is exactly when it matters.
-  const screenTo = horizontal ? document.documentElement.clientWidth : document.documentElement.clientHeight;
+const getListVisibleRange = (viewportRect, listRect, horizontal) => {
   const viewportFrom = horizontal ? viewportRect.left : viewportRect.top;
   const viewportTo = horizontal ? viewportRect.right : viewportRect.bottom;
   const listFrom = horizontal ? listRect.left : listRect.top;
   const listTo = horizontal ? listRect.right : listRect.bottom;
-  let from = listFrom > viewportFrom ? listFrom : viewportFrom;
-  let to = listTo < viewportTo ? listTo : viewportTo;
-  if (from < 0) {
-    from = 0;
-  }
-  if (to > screenTo) {
-    to = screenTo;
-  }
+  const from = listFrom > viewportFrom ? listFrom : viewportFrom;
+  const to = listTo < viewportTo ? listTo : viewportTo;
   if (to - from < 2) {
     return null;
   }
-  // Where to put the probe on the other axis: inside the list, inside the
-  // viewport.
-  const crossFrom = horizontal ? listRect.top : listRect.left;
-  const crossViewportFrom = horizontal ? viewportRect.top : viewportRect.left;
-  const crossPos = (crossFrom > crossViewportFrom ? crossFrom : crossViewportFrom) + 1;
   return {
     from,
-    to,
-    crossPos
+    to
   };
 };
+// The real rows of the list, and the first of them reaching past `from` along
+// the scroll axis. A binary search over their boxes: the rows stand in
+// document order along that axis, so their far edges only grow.
+const findRowsFrom = (listEl, from, horizontal) => {
+  const rowEls = listEl.querySelectorAll(REAL_LIST_ITEM_SELECTOR);
+  let low = 0;
+  let high = rowEls.length;
+  while (low < high) {
+    const mid = low + high >> 1;
+    const rect = rowEls[mid].getBoundingClientRect();
+    const end = horizontal ? rect.right : rect.bottom;
+    if (end > from) {
+      high = mid;
+    } else {
+      low = mid + 1;
+    }
+  }
+  return {
+    rowEls,
+    index: low
+  };
+};
+// Whether a filler (the room held for rows outside the window) is what stands
+// at that position along the scroll axis.
+const isFillerAt = (listEl, position, horizontal) => {
+  for (const fillerEl of listEl.querySelectorAll("[navi-virtual-filler]")) {
+    const rect = fillerEl.getBoundingClientRect();
+    const from = horizontal ? rect.left : rect.top;
+    const to = horizontal ? rect.right : rect.bottom;
+    if (position >= from && position < to) {
+      return true;
+    }
+  }
+  return false;
+};
 
-// Which row of the collection sits at the current scroll position. Uses DOM
-// hit-testing when a real row is there to be hit, and the row size when what is
-// on screen is only reserved room.
+// Which row of the collection sits at the current scroll position. Read off
+// the rows' boxes when a real row is there (see captureScrollAnchor for why
+// not hit-testing), and from the row size when what is on screen is only
+// reserved room.
 // Returns { index, item, reason } or null if nothing can be determined.
 const getScrollInfo = ({
   scrollValues,
@@ -70442,34 +70632,31 @@ const getScrollInfo = ({
   const items = listRows.itemsSignal.peek();
   const viewportRect = getScrollerViewportRect(scrollerEl);
   const listRect = listEl.getBoundingClientRect();
-  let hitEl = null;
-  let hitFiller = null;
-  const scanRange = getListVisibleScanRange(viewportRect, listRect, horizontal);
-  if (!scanRange) {
+  const range = getListVisibleRange(viewportRect, listRect, horizontal);
+  if (!range) {
     return null;
   }
-  // Start scanning from the center of the visible part of the list along the
-  // main axis. The render window places half its budget before and half after
-  // the hit index. Anchoring to the center maximises how many rendered items
-  // fall within the visible area.
-  const scanStart = (scanRange.from + scanRange.to) / 2;
-  const scanEnd = scanRange.to;
-  for (let pos = scanStart; pos < scanEnd; pos += 4) {
-    const x = horizontal ? pos : scanRange.crossPos;
-    const y = horizontal ? scanRange.crossPos : pos;
-    const el = document.elementFromPoint(x, y);
-    if (!el || !listEl.contains(el)) {
-      continue;
-    }
-    const realItem = el.closest(REAL_LIST_ITEM_SELECTOR);
-    if (realItem) {
-      hitEl = realItem;
-      break;
-    }
-    const filler = el.closest("[navi-virtual-filler]");
-    if (filler) {
-      hitFiller = filler;
-      break;
+  // Read from the center of the visible part of the list along the main axis.
+  // The render window places half its budget before and half after the hit
+  // index. Anchoring to the center maximises how many rendered items fall
+  // within the visible area.
+  const scanStart = (range.from + range.to) / 2;
+  let hitEl = null;
+  const hitFiller = isFillerAt(listEl, scanStart, horizontal);
+  if (!hitFiller) {
+    // The first real row from the center down, the way a probe walking down
+    // from it would meet one — past a separator or a group label in between.
+    const {
+      rowEls,
+      index
+    } = findRowsFrom(listEl, scanStart, horizontal);
+    const rowEl = rowEls[index];
+    if (rowEl) {
+      const rowRect = rowEl.getBoundingClientRect();
+      const rowStart = horizontal ? rowRect.left : rowRect.top;
+      if (rowStart < range.to) {
+        hitEl = rowEl;
+      }
     }
   }
   // Shared by the "hit a filler" and "hit nothing at all" cases below: both
@@ -70500,8 +70687,8 @@ const getScrollInfo = ({
     return estimateFromScrollPos("hit filler");
   }
   if (hitEl) {
-    const hitId = hitEl.id;
-    const item = items.find(i => i.id === hitId);
+    const hitName = getRowName(hitEl);
+    const item = items.find(i => i.itemId === hitName);
     if (!item) {
       return null;
     }
@@ -70511,13 +70698,11 @@ const getScrollInfo = ({
       reason: `hit item at ${item.index} (${item.value})`
     };
   }
-  // Neither a real item nor a filler was hit within listEl — e.g. part of
-  // the scan range fell outside the page's actually reachable viewport
-  // (docked devtools shrinks it, for one). Keeping the stale renderWindow
-  // here means the DOM never gets asked to catch up with a scrollTop that may
-  // have jumped far away — the user ends up staring at filler space. Same
-  // estimate as the hitFiller case is a safe fallback: it only needs the
-  // scroll position, not a successful hit-test.
+  // No real row stands between the center and the end of what is visible.
+  // Keeping the stale renderWindow here means the DOM never gets asked to
+  // catch up with a scrollTop that may have jumped far away — the user ends
+  // up staring at blank space. Same estimate as the hitFiller case is a safe
+  // fallback: it only needs the scroll position.
   const estimated = estimateFromScrollPos("no hit");
   if (estimated) {
     return estimated;
@@ -70952,6 +71137,12 @@ const ListItemUI = props => {
   // gave the row its place and decided it is inside the render window.
   const row = useContext(ListRowContext);
   const slotId = useContext(ListSlotContext);
+  // What the row is called in the list — the run's name for a row it draws,
+  // whatever `id` the caller put on the element (a run row may need a DOM id of
+  // its own, to keep clear of another element's). A position names a row by
+  // this (see captureScrollAnchor), and a row asked for by name is found by
+  // this (locateRow, findRowElement); the DOM id is the caller's.
+  props.itemId = row ? row.id : props.id;
   // There is no standalone match/matchScore/highlight prop — participation
   // in a matching system (search, filter…) only goes through `matchInfo`
   // (e.g. useSearchText's getItemMatchInfo(item): { match, matchScore,
@@ -71032,6 +71223,7 @@ const ListItemReal = props => {
   const {
     ref,
     id,
+    itemId,
     hidden,
     muted,
     loading,
@@ -71051,7 +71243,7 @@ const ListItemReal = props => {
   // see the state change, which only the caller can arrange).
   const pendingScrollRef = useContext(PendingScrollRefContext);
   const pendingScroll = pendingScrollRef.current;
-  const needScrollOnMount = pendingScroll && pendingScroll.id === id;
+  const needScrollOnMount = pendingScroll && pendingScroll.id === itemId;
   useLayoutEffect(() => {
     if (!needScrollOnMount) {
       return;
@@ -71150,7 +71342,7 @@ const ListItemReal = props => {
     baseClassName: "navi_list_item",
     styleCSSVars: LIST_ITEM_STYLE_CSS_VARS,
     id: id,
-    "navi-list-item-real": "",
+    "navi-list-item-real": itemId,
     ...rest,
     ...itemColumnsOverrideProps,
     index: undefined,
@@ -72531,6 +72723,7 @@ const ListResolved = /*#__PURE__*/createComponentResolver([ListFirstResolver, Li
  *   onScrolledChange?: (scrolled: {id: string, index: number, offset: number}) => void,
  *   scroller?: "self" | "parent" | "document" | Element | {current: Element},
  *   hoverWhileScrolling?: boolean,
+ *   scrollResetOnNavigation?: boolean,
  *   fallback?: import("ignore:preact").ComponentChildren,
  *   searchFallback?: import("ignore:preact").ComponentChildren,
  *   searchText?: string,
@@ -72622,7 +72815,8 @@ const ListResolved = /*#__PURE__*/createComponentResolver([ListFirstResolver, Li
  *   list is already known to be empty: the empty `fallback` shows right away
  *   rather than an empty frame, so nothing moves when the response arrives.
  * @param {"start"|"end"|number|{id: string, offset?: number}} [props.defaultScrolled="start"]
- *   Where the list opens, after which the user owns the scroll. `"end"` is a
+ *   Where the list opens, after which the user owns the scroll — unless it is
+ *   being come back to (see `scrollResetOnNavigation`). `"end"` is a
  *   thread read backwards — the last rows are the ones to show, and the ones
  *   asked for first. A number opens on that row of the collection. `{id,
  *   offset}` — what `onScrolledChange` hands out — opens on a NAMED row,
@@ -72705,6 +72899,15 @@ const ListResolved = /*#__PURE__*/createComponentResolver([ListFirstResolver, Li
  *   Pass `true` for a list whose rows must stay live under the pointer while
  *   it scrolls. The trade of the default is the mirror one: right after a
  *   scroll, the row under the pointer lights up only once the pointer moves.
+ * @param {boolean} [props.scrollResetOnNavigation=false]
+ *   A list that opens the same way every time. Without it the list comes back
+ *   where it was when its screen is left and come back to — the way the page
+ *   does, and for a list that scrolls itself the page's own restoration cannot
+ *   see. The position is kept under the list's `id` and the page's url, for
+ *   the session (a reload comes back too); a list without an `id` of its own
+ *   has nothing to be remembered by. A fresh arrival at the page opens at
+ *   `defaultScrolled` either way, and so does a list the caller holds through
+ *   `scrolled`.
  * @param {boolean} [props.deselectable]
  *   A single-select list allowed to hold nothing: the selected row, pressed
  *   again, lets go. Without it the list is a radio group — a choice, once