cogsbox-state 0.5.374 → 0.5.376

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cogsbox-state",
-  "version": "0.5.374",
+  "version": "0.5.376",
   "description": "React state management library with form controls and server sync",
   "type": "module",
   "main": "./dist/index.js",

package/src/CogsState.tsx

@@ -1827,6 +1827,7 @@ function createProxyHandler<T>(
               const isProgrammaticScroll = useRef(false);
               const prevTotalCountRef = useRef(0);
               const prevDepsRef = useRef(dependencies);
+              const lastScrollTopRef = useRef(0);
 
               const [shadowUpdateTrigger, setShadowUpdateTrigger] = useState(0);
 
@@ -2000,39 +2001,71 @@ function createProxyHandler<T>(
                 const container = containerRef.current;
                 if (!container) return;
 
+                // We no longer need a manual threshold. The `positions` array is our threshold.
+
                 const handleUserScroll = () => {
-                  // This is the core logic you wanted.
+                  // Essential check to ignore our own programmatic scrolls.
                   if (isProgrammaticScroll.current) {
                     return;
                   }
+
+                  const { scrollTop, clientHeight } = container;
+
+                  // --- Part 1: Quick state update logic (still important) ---
                   const isAtBottom =
                     container.scrollHeight -
-                      container.scrollTop -
+                      scrollTop -
                       container.clientHeight <
                     1;
 
                   if (!isAtBottom) {
-                    console.log(
-                      "USER ACTION: Scrolled up -> IDLE_NOT_AT_BOTTOM"
-                    );
-                    shouldNotScroll.current = true;
-                    setStatus("IDLE_NOT_AT_BOTTOM");
+                    if (status !== "IDLE_NOT_AT_BOTTOM") {
+                      setStatus("IDLE_NOT_AT_BOTTOM");
+                    }
                   } else {
-                    shouldNotScroll.current = false;
+                    if (status === "IDLE_NOT_AT_BOTTOM") {
+                      setStatus("LOCKED_AT_BOTTOM");
+                    }
                   }
+                  // NOTE: We've removed `shouldNotScroll` as its purpose is now better
+                  // served by the state machine itself. The state `IDLE_NOT_AT_BOTTOM`
+                  // already tells us the user has scrolled up.
 
-                  // We always update the range, regardless of state.
-                  // This is the full, non-placeholder function.
-                  const { scrollTop, clientHeight } = container;
-                  let low = 0,
-                    high = totalCount - 1;
+                  // --- Part 2: Index-Based Invalidation (The real optimization) ---
+
+                  // Find the index of the item at the top of the viewport.
+                  // This binary search is extremely fast.
+                  let high = totalCount - 1;
+                  let low = 0;
+                  let potentialTopIndex = 0;
                   while (low <= high) {
                     const mid = Math.floor((low + high) / 2);
-                    if (positions[mid]! < scrollTop) low = mid + 1;
-                    else high = mid - 1;
+                    if (positions[mid]! < scrollTop) {
+                      potentialTopIndex = mid;
+                      low = mid + 1;
+                    } else {
+                      high = mid - 1;
+                    }
+                  }
+
+                  // Compare the potential new start index with the current one.
+                  // Remember to account for the overscan!
+                  const potentialStartIndex = Math.max(
+                    0,
+                    potentialTopIndex - overscan
+                  );
+                  if (potentialStartIndex === range.startIndex) {
+                    // The visible items haven't changed, so we do nothing.
+                    // This is the core of the optimization.
+                    return;
                   }
-                  const startIndex = Math.max(0, high - overscan);
-                  let endIndex = startIndex;
+
+                  // --- Part 3: If we're here, we MUST update the range ---
+                  console.log(
+                    `Index changed from ${range.startIndex} to ${potentialStartIndex}. Updating range.`
+                  );
+
+                  let endIndex = potentialStartIndex;
                   const visibleEnd = scrollTop + clientHeight;
                   while (
                     endIndex < totalCount &&
@@ -2040,8 +2073,9 @@ function createProxyHandler<T>(
                   ) {
                     endIndex++;
                   }
+
                   setRange({
-                    startIndex,
+                    startIndex: potentialStartIndex,
                     endIndex: Math.min(totalCount, endIndex + overscan),
                   });
                 };
@@ -2051,7 +2085,7 @@ function createProxyHandler<T>(
                 });
                 return () =>
                   container.removeEventListener("scroll", handleUserScroll);
-              }, [totalCount, positions, status]); // Depends on status to know if it should break the lock
+              }, [totalCount, positions, status, range.startIndex]); // Add range.startIndex!
 
               const scrollToBottom = useCallback(() => {
                 console.log(