bunnyquery 1.8.14 → 1.8.15

package/bunnyquery.js

@@ -2438,6 +2438,8 @@ Index the REMAINING windows - one record per row/item, looking at any page image
   // src/engine/scroll_anchor.ts
   var ROW_KEY_ATTR = "data-row-key";
   var ROW_POS_ATTR = "data-row-pos";
+  var MAX_ALTS = 2;
+  var ALT_SCAN_LIMIT = 64;
   var UNKNOWN_ROW_POS = "\0?";
   function createScrollAnchor(options) {
     var held = null;
@@ -2448,6 +2450,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       var boxTop = box.getBoundingClientRect().top;
       var kids = box.children;
       var fallback = null;
+      var fallbackAt = -1;
       for (var i = 0; i < kids.length; i++) {
         var el = kids[i];
         if (!el || typeof el.getAttribute !== "function") continue;
@@ -2466,10 +2469,20 @@ Index the REMAINING windows - one record per row/item, looking at any page image
           scrollHeight: box.scrollHeight,
           el
         };
-        if (rawPos === null) return cand;
-        if (!fallback) fallback = cand;
+        if (rawPos === null) {
+          cand.alts = collectAlts(box, boxTop, i + 1);
+          return cand;
+        }
+        if (!fallback) {
+          fallback = cand;
+          fallbackAt = i;
+        }
+      }
+      if (fallback) {
+        fallback.alts = collectAlts(box, boxTop, fallbackAt + 1, true);
+        return fallback;
       }
-      return fallback || {
+      return {
         key: null,
         top: 0,
         pos: null,
@@ -2478,6 +2491,26 @@ Index the REMAINING windows - one record per row/item, looking at any page image
         el: null
       };
     }
+    function collectAlts(box, boxTop, from, ordinaryOnly) {
+      var out = [];
+      var kids = box.children;
+      var stop = Math.min(kids.length, from + ALT_SCAN_LIMIT);
+      for (var i = from; i < stop && out.length < MAX_ALTS; i++) {
+        var el = kids[i];
+        if (!el || typeof el.getAttribute !== "function") continue;
+        var key = el.getAttribute(ROW_KEY_ATTR);
+        if (!key) continue;
+        var rawPos = el.getAttribute(ROW_POS_ATTR);
+        if (ordinaryOnly && rawPos !== null) continue;
+        out.push({
+          key,
+          top: el.getBoundingClientRect().top - boxTop,
+          pos: rawPos === null ? null : rawPos || UNKNOWN_ROW_POS,
+          el
+        });
+      }
+      return out.length ? out : void 0;
+    }
     function findRow(box, anchor) {
       var el = anchor.el;
       if (el && el.parentNode === box) return el;
@@ -2490,31 +2523,79 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       }
       return null;
     }
-    function restore(anchor) {
+    var sawFrozen = false;
+    var parked = null;
+    var parkedStuck = false;
+    var returning = false;
+    var wroteTop = -1;
+    var restoreExact = true;
+    var restorePinned = false;
+    function frozen() {
+      var f = !!options.isFrozen && options.isFrozen();
+      if (f) sawFrozen = true;
+      return f;
+    }
+    function restore(anchor, unbounded) {
+      if (frozen()) return;
       var box = options.getBox();
       if (!box || !anchor || options.isStuck()) return;
       var el = findRow(box, anchor);
       if (el) {
         var livePos = el.getAttribute(ROW_POS_ATTR) || UNKNOWN_ROW_POS;
-        if (anchor.pos !== null && anchor.pos !== UNKNOWN_ROW_POS && livePos !== UNKNOWN_ROW_POS && livePos !== anchor.pos) {
-          lost(box, anchor);
-          return;
-        }
+        if (anchor.pos !== null && anchor.pos !== UNKNOWN_ROW_POS && livePos !== UNKNOWN_ROW_POS && livePos !== anchor.pos) el = null;
+      }
+      if (el) {
         var boxTop = box.getBoundingClientRect().top;
         var delta = el.getBoundingClientRect().top - boxTop - anchor.top;
         var slack = Math.abs(box.scrollHeight - anchor.scrollHeight) + box.clientHeight;
-        if (delta > slack || delta < -slack) {
+        if (!unbounded && (delta > slack || delta < -slack)) {
           lost(box, anchor);
           return;
         }
+        var want = box.scrollTop + delta;
         if (delta >= 1 || delta <= -1) box.scrollTop += delta;
+        wroteTop = box.scrollTop;
+        restorePinned = true;
+        restoreExact = box.scrollTop >= want - 1 && box.scrollTop <= want + 1;
         held = {
           key: anchor.key,
           top: anchor.top,
           pos: anchor.pos,
           scrollTop: box.scrollTop,
           scrollHeight: box.scrollHeight,
-          el
+          el,
+          // Carried, not dropped: one successful restore used to disarm the
+          // standbys for every later hold.
+          alts: anchor.alts
+        };
+        return;
+      }
+      var alts = anchor.alts;
+      for (var ai = 0; alts && ai < alts.length; ai++) {
+        var alt = alts[ai];
+        var ael = findRow(box, { key: alt.key, top: alt.top, pos: alt.pos, scrollTop: anchor.scrollTop, scrollHeight: anchor.scrollHeight, el: alt.el });
+        if (!ael) continue;
+        if (alt.pos !== null && alt.pos !== UNKNOWN_ROW_POS) {
+          var altLive = ael.getAttribute(ROW_POS_ATTR) || UNKNOWN_ROW_POS;
+          if (altLive !== UNKNOWN_ROW_POS && altLive !== alt.pos) continue;
+        }
+        var aboxTop = box.getBoundingClientRect().top;
+        var adelta = ael.getBoundingClientRect().top - aboxTop - alt.top;
+        var aslack = Math.abs(box.scrollHeight - anchor.scrollHeight) + box.clientHeight;
+        if (!unbounded && (adelta > aslack || adelta < -aslack)) continue;
+        var awant = box.scrollTop + adelta;
+        if (adelta >= 1 || adelta <= -1) box.scrollTop += adelta;
+        wroteTop = box.scrollTop;
+        restorePinned = true;
+        restoreExact = box.scrollTop >= awant - 1 && box.scrollTop <= awant + 1;
+        held = {
+          key: alt.key,
+          top: alt.top,
+          pos: alt.pos,
+          scrollTop: box.scrollTop,
+          scrollHeight: box.scrollHeight,
+          el: ael,
+          alts: alts.slice(ai + 1)
         };
         return;
       }
@@ -2525,9 +2606,13 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       var grew = box.scrollHeight - anchor.scrollHeight;
       if (grew > 0) {
         box.scrollTop = anchor.scrollTop + grew;
+        wroteTop = box.scrollTop;
         return;
       }
-      if (options.rawFallback) box.scrollTop = anchor.scrollTop;
+      if (options.rawFallback) {
+        box.scrollTop = anchor.scrollTop;
+        wroteTop = box.scrollTop;
+      }
     }
     function preserve(mutate) {
       var anchor = capture();
@@ -2536,9 +2621,21 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       return result;
     }
     function remember() {
+      var b0 = options.getBox();
+      if (returning && b0 && b0.scrollTop !== wroteTop) {
+        parked = null;
+        parkedStuck = false;
+        returning = false;
+      }
+      if (frozen()) return;
       held = capture();
     }
     function hold() {
+      if (frozen()) return;
+      if (sawFrozen || returning) {
+        settleReturn();
+        return;
+      }
       var box = options.getBox();
       if (!box || options.isStuck()) {
         held = null;
@@ -2565,12 +2662,67 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       if (prev === void 0) prev = 0;
       var delta = h - prev;
       if (delta === 0) return;
+      if (frozen()) {
+        foldFrozenGrowth(box, el, delta);
+        return;
+      }
       if (el.getBoundingClientRect().top >= box.getBoundingClientRect().top) return;
       box.scrollTop += delta;
+      wroteTop = box.scrollTop;
       if (held) held = capture();
     }
+    function park() {
+      parked = capture();
+      parkedStuck = !!options.isStuck();
+      returning = true;
+    }
+    function pinBottom() {
+      var box = options.getBox();
+      if (!box) return;
+      box.scrollTop = box.scrollHeight;
+      wroteTop = box.scrollTop;
+    }
+    function settleReturn() {
+      if (frozen()) return false;
+      sawFrozen = false;
+      if (parkedStuck) {
+        pinBottom();
+        return true;
+      }
+      var target = parked || held;
+      restoreExact = true;
+      restorePinned = false;
+      restore(target, true);
+      parked = !restorePinned || !restoreExact ? target : null;
+      returning = !!parked;
+      return false;
+    }
+    function isReturning() {
+      return returning;
+    }
+    function thaw() {
+      settleReturn();
+    }
+    function foldFrozenGrowth(box, el, delta) {
+      var elTop = el.getBoundingClientRect().top;
+      foldInto(box, held, elTop, delta);
+      foldInto(box, parked, elTop, delta);
+    }
+    function foldInto(box, a, elTop, delta) {
+      if (!a || a.top >= 0) return;
+      var rowEl = findRow(box, a);
+      if (!rowEl) return;
+      var within = elTop - rowEl.getBoundingClientRect().top;
+      if (within < 0 || within >= rowEl.offsetHeight) return;
+      if (within >= -a.top) return;
+      a.top -= delta;
+      a.scrollHeight += delta;
+    }
     function forget() {
       held = null;
+      parked = null;
+      parkedStuck = false;
+      returning = false;
     }
     return {
       capture,
@@ -2578,6 +2730,12 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       preserve,
       remember,
       hold,
+      park,
+      settleReturn,
+      isReturning,
+      pinBottom,
+      isFrozen: frozen,
+      thaw,
       absorb,
       forget
     };
@@ -5680,6 +5838,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
             releaseBgFlag();
             self.updateHistoryCache();
             self.host.notify();
+            if (self.host.settleScroll) self.host.settleScroll();
           }, function() {
             releaseBgFlag();
             self.host.notify();
@@ -5761,7 +5920,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
           self.drainBgTaskQueue();
         }
         if (!fetchMore) self.refreshLiveIndexState();
-        if (!fetchMore) return self.host.scrollToBottomIfSticky();
+        if (!fetchMore) return self.host.settleScroll ? self.host.settleScroll() : self.host.scrollToBottomIfSticky();
       }).catch(function(err) {
         console.warn("[chat-engine] getChatHistory failed", err);
       }).then(function() {
@@ -8068,10 +8227,10 @@ Index the REMAINING windows - one record per row/item, looking at any page image
         refreshMessageBubble(i);
       },
       scrollToBottom: function(smooth) {
-        return scrollToBottom(smooth);
+        return scrollToBottom();
       },
       scrollToBottomIfSticky: function(smooth) {
-        return scrollToBottomIfSticky(smooth);
+        return scrollToBottomIfSticky();
       },
       // A first page can render shorter than the box (a file's every indexing
       // pass folds into ONE row), and a box that cannot scroll never fires the
@@ -8080,6 +8239,9 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       onHistoryLoaded: function(fetchMore, token) {
         if (!fetchMore) ensureHistoryFillsViewport(token);
       },
+      settleScroll: function() {
+        settleScrollAfterRefresh();
+      },
       cancelRequest: function(opts) {
         return S.skapi.cancelClientSecretRequest(opts);
       },
@@ -8271,7 +8433,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
         if (job.stageId) session.settleStagedMessage(job.stageId);
         CS.messages.push({ role: "assistant", content: "Something went wrong while uploading attachments. " + (err && err.message || ""), isError: true });
         renderMessages();
-        scrollToBottom(true);
+        scrollToBottomIfSticky();
         return null;
       });
     }
@@ -8324,26 +8486,45 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       };
       enqueueAttachmentSend({ text, batchId, stageId, pinned });
     }
-    function scrollToBottom(smooth) {
+    function scrollToBottom() {
+      if (chatScrollAnchor.isFrozen()) {
+        CS.stickToBottom = true;
+        chatScrollAnchor.pinBottom();
+        return Promise.resolve();
+      }
       return raf2().then(function() {
         if (!CS.messagesBox) return;
         CS.stickToBottom = true;
-        if (smooth) CS.messagesBox.scrollTo({ top: CS.messagesBox.scrollHeight, behavior: "smooth" });
-        else CS.messagesBox.scrollTop = CS.messagesBox.scrollHeight;
+        chatScrollAnchor.pinBottom();
       });
     }
-    function scrollToBottomIfSticky(smooth) {
+    function scrollToBottomIfSticky() {
       if (!CS.stickToBottom) return Promise.resolve();
+      if (chatScrollAnchor.isFrozen()) {
+        chatScrollAnchor.pinBottom();
+        return Promise.resolve();
+      }
       return raf2().then(function() {
         if (!CS.stickToBottom || !CS.messagesBox) return;
-        if (smooth) CS.messagesBox.scrollTo({ top: CS.messagesBox.scrollHeight, behavior: "smooth" });
-        else CS.messagesBox.scrollTop = CS.messagesBox.scrollHeight;
+        chatScrollAnchor.pinBottom();
       });
     }
+    function settleScrollAfterRefresh(afterAbsence) {
+      if (afterAbsence || chatScrollAnchor.isReturning()) {
+        if (chatScrollAnchor.settleReturn()) CS.stickToBottom = true;
+        return;
+      }
+      if (CS.stickToBottom) scrollToBottomIfSticky();
+      else chatScrollAnchor.hold();
+    }
     var lastHistoryScrollTop = 0;
     function onHistoryScroll() {
       if (!CS.messagesBox || CS.chatSettingsOpen) return;
       var el = CS.messagesBox;
+      if (chatScrollAnchor.isFrozen()) {
+        lastHistoryScrollTop = el.scrollTop;
+        return;
+      }
       var atBottom = el.scrollHeight - el.scrollTop - el.clientHeight <= 16;
       if (!atBottom) CS.stickToBottom = false;
       else if (el.scrollTop >= lastHistoryScrollTop) CS.stickToBottom = true;
@@ -9245,7 +9426,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
         // earlier failure left on this file's chips.
         onLoad: function(path) {
           clearLinkUnavailable(linkUnavailableKeysForPath(path));
-          scrollToBottomIfSticky(false);
+          scrollToBottomIfSticky();
         },
         // The resizes an <img> makes with no event of its own to announce
         // them: the src landing, and the src being dropped for a retry (which
@@ -10034,6 +10215,13 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       isStuck: function() {
         return !!CS.stickToBottom;
       },
+      // A hidden tab keeps mutating this list - a resumed poll, the head refresh
+      // and its deferred background batch, a settling request - and every one of
+      // those would otherwise move a scroll position nobody is looking at. Freeze
+      // instead, and put the reader back once they can see it (settleScroll).
+      isFrozen: function() {
+        return typeof document !== "undefined" && !!document.hidden;
+      },
       rawFallback: true
     });
     function captureScrollAnchor() {
@@ -10043,7 +10231,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
       var box = CS.messagesBox;
       if (!box) return;
       if (CS.stickToBottom) {
-        box.scrollTop = box.scrollHeight;
+        chatScrollAnchor.pinBottom();
         return;
       }
       chatScrollAnchor.restore(anchor);
@@ -10285,7 +10473,7 @@ Index the REMAINING windows - one record per row/item, looking at any page image
           if (drafting !== CS.drafting) {
             CS.drafting = drafting;
             syncDraftingIndicator();
-            scrollToBottomIfSticky(false);
+            scrollToBottomIfSticky();
           }
         });
         input.addEventListener("keydown", function(e) {
@@ -10639,18 +10827,26 @@ Index the REMAINING windows - one record per row/item, looking at any page image
         S._resizeBound = true;
         window.addEventListener("resize", function() {
           scheduleAttachmentOverflowRecompute();
-          scrollToBottomIfSticky(false);
+          scrollToBottomIfSticky();
           ensureHistoryFillsViewport();
         });
       }
       if (!S._visBound && typeof document !== "undefined" && document.addEventListener) {
         S._visBound = true;
+        window.addEventListener("blur", function() {
+          chatScrollAnchor.park();
+        });
+        window.addEventListener("focus", function() {
+          settleScrollAfterRefresh(true);
+        });
         document.addEventListener("visibilitychange", function() {
           if (document.visibilityState === "hidden") {
+            chatScrollAnchor.park();
             if (session && session.pausePolling) session.pausePolling("hidden");
             return;
           }
           if (document.visibilityState === "visible") {
+            settleScrollAfterRefresh(true);
             var refreshed = S.user ? ensureMcpGrantFresh() : null;
             Promise.resolve(refreshed).catch(function() {
             }).then(function() {