cogsbox-state 0.5.305 → 0.5.307

package/package.json

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

package/src/CogsState.tsx

@@ -1814,10 +1814,21 @@ function createProxyHandler<T>(
                 endIndex: 10,
               });
 
+              // Force re-render when heights change
+              const [, forceUpdate] = useState({});
+
               const isAtBottomRef = useRef(stickToBottom);
               const previousTotalCountRef = useRef(0);
               const isInitialMountRef = useRef(true);
-              const hasMeasurementsRef = useRef(false);
+              const previousTotalHeightRef = useRef(0);
+
+              // Subscribe to shadow state changes
+              useEffect(() => {
+                const unsubscribe = getGlobalStore
+                  .getState()
+                  .subscribeToShadowState(stateKey, () => forceUpdate({}));
+                return unsubscribe;
+              }, [stateKey]);
 
               const sourceArray = getGlobalStore().getNestedState(
                 stateKey,
@@ -1832,20 +1843,39 @@ function createProxyHandler<T>(
                   [];
                 let height = 0;
                 const pos: number[] = [];
-                let hasMeasurements = false;
 
                 for (let i = 0; i < totalCount; i++) {
                   pos[i] = height;
                   const measuredHeight =
                     shadowArray[i]?.virtualizer?.itemHeight;
-                  if (measuredHeight) hasMeasurements = true;
                   height += measuredHeight || itemHeight;
                 }
 
-                hasMeasurementsRef.current = hasMeasurements;
                 return { totalHeight: height, positions: pos };
               }, [totalCount, stateKey, path.join("."), itemHeight]);
 
+              // Adjust scroll when height changes while at bottom
+              useLayoutEffect(() => {
+                const container = containerRef.current;
+                if (!container) return;
+
+                const heightChanged =
+                  totalHeight !== previousTotalHeightRef.current;
+                previousTotalHeightRef.current = totalHeight;
+
+                // If we're at bottom and height changed, maintain bottom position
+                if (
+                  heightChanged &&
+                  isAtBottomRef.current &&
+                  !isInitialMountRef.current
+                ) {
+                  container.scrollTo({
+                    top: container.scrollHeight,
+                    behavior: "auto",
+                  });
+                }
+              }, [totalHeight]);
+
               const virtualState = useMemo(() => {
                 const start = Math.max(0, range.startIndex);
                 const end = Math.min(totalCount, range.endIndex);
@@ -1912,17 +1942,36 @@ function createProxyHandler<T>(
                   passive: true,
                 });
 
-                // Handle stick to bottom
-                if (stickToBottom && !isInitialMountRef.current) {
-                  // Only auto-scroll for new items after initial mount
-                  if (wasAtBottom && listGrew) {
-                    requestAnimationFrame(() => {
-                      container.scrollTo({
-                        top: container.scrollHeight,
-                        behavior: "smooth",
+                // Handle stick to bottom for initial mount only
+                if (
+                  stickToBottom &&
+                  isInitialMountRef.current &&
+                  totalCount > 0
+                ) {
+                  // Set flag first to prevent height adjustment from interfering
+                  isAtBottomRef.current = true;
+                  // Wait for next frame to ensure everything is rendered
+                  requestAnimationFrame(() => {
+                    if (containerRef.current) {
+                      containerRef.current.scrollTo({
+                        top: containerRef.current.scrollHeight,
+                        behavior: "auto",
                       });
+                      isInitialMountRef.current = false;
+                    }
+                  });
+                } else if (
+                  !isInitialMountRef.current &&
+                  wasAtBottom &&
+                  listGrew
+                ) {
+                  // New items added and we were at bottom - stay at bottom
+                  requestAnimationFrame(() => {
+                    container.scrollTo({
+                      top: container.scrollHeight,
+                      behavior: "smooth",
                     });
-                  }
+                  });
                 }
 
                 // Run handleScroll once to set initial range
@@ -1932,30 +1981,6 @@ function createProxyHandler<T>(
                   container.removeEventListener("scroll", handleScroll);
               }, [totalCount, positions, overscan, stickToBottom]);
 
-              // Separate effect for initial scroll to bottom
-              useEffect(() => {
-                if (
-                  stickToBottom &&
-                  isInitialMountRef.current &&
-                  totalCount > 0 &&
-                  hasMeasurementsRef.current
-                ) {
-                  const container = containerRef.current;
-                  if (container) {
-                    // Use rAF to ensure DOM is updated
-                    requestAnimationFrame(() => {
-                      requestAnimationFrame(() => {
-                        container.scrollTo({
-                          top: container.scrollHeight,
-                          behavior: "auto",
-                        });
-                        isInitialMountRef.current = false;
-                      });
-                    });
-                  }
-                }
-              }, [stickToBottom, totalCount, positions]); // positions change triggers this when measurements come in
-
               const scrollToBottom = useCallback(
                 (behavior: ScrollBehavior = "smooth") => {
                   if (containerRef.current) {