dce-reactkit 3.5.10 → 3.5.11

package/dist/cjs/index.js

@@ -40851,7 +40851,7 @@ const AutoscrollToBottomContainer = (props) => {
     // Initialize refs
     const lastItemIds = React.useRef([]);
     const container = React.useRef(null);
-    const wasScrolledToBottomBeforeItemsUpdate = React.useRef(true);
+    const wasLastScrolledToBottom = React.useRef(true);
     /*------------------------------------------------------------------------*/
     /* ------------------------- Component Functions ------------------------ */
     /*------------------------------------------------------------------------*/
@@ -40874,7 +40874,10 @@ const AutoscrollToBottomContainer = (props) => {
         const rootFontSizePx = Number.parseInt(getComputedStyle(document.documentElement).fontSize, 10);
         const distanceToBottomRems = Math.abs((scrollTop + clientHeight - scrollHeight) / rootFontSizePx);
         // Figure out if we're scrolled to the bottom
-        return (distanceToBottomRems < SCROLLED_TO_BOTTOM_THRESHOLD_REMS);
+        const atBottom = (distanceToBottomRems < SCROLLED_TO_BOTTOM_THRESHOLD_REMS);
+        // Remember if we scrolled to the bottom
+        wasLastScrolledToBottom.current = atBottom;
+        return atBottom;
     };
     /**
      * Scroll the user to the bottom of the container
@@ -40890,7 +40893,10 @@ const AutoscrollToBottomContainer = (props) => {
             type: ActionType.HideJumpToBottomButton,
         });
         // Scroll to bottom
-        container.current.scrollTop = container.current.scrollHeight;
+        container.current.scrollTop = (container.current.scrollHeight
+            - container.current.clientHeight);
+        // Remember that we scrolled to the bottom
+        wasLastScrolledToBottom.current = true;
     };
     /*----------------------------------------*/
     /* -------------- Handlers -------------- */
@@ -40904,8 +40910,9 @@ const AutoscrollToBottomContainer = (props) => {
         if (!container.current) {
             return;
         }
-        // If scrolled to bottom, hide the button
+        // If scrolled to bottom, hide the button and remember position
         if (isScrolledToBottom()) {
+            // Hide button
             dispatch({
                 type: ActionType.HideJumpToBottomButton,
             });
@@ -40930,17 +40937,19 @@ const AutoscrollToBottomContainer = (props) => {
         // Check if new content appeared
         const currentItemIds = getItemIds(items);
         // Check if new content appeared at bottom
-        const newContentAppeared = (currentItemIds.length > 0
-            && lastItemIds.current
-            && lastItemIds.current.length > 0
-            && (currentItemIds[currentItemIds.length - 1]
-                !== lastItemIds.current[lastItemIds.current.length - 1]));
+        const newContentAppeared = (
+        // There are items
+        currentItemIds.length > 0
+            // The last item is new
+            && !lastItemIds.current.includes(currentItemIds[currentItemIds.length - 1]));
+        // Update last item ids
+        lastItemIds.current = currentItemIds;
         // Do nothing if no new content
         if (!newContentAppeared) {
             return;
         }
         // Check if used to be scrolled to the bottom
-        if (wasScrolledToBottomBeforeItemsUpdate.current) {
+        if (wasLastScrolledToBottom.current) {
             // Was scrolled to the bottom! Autoscroll.
             scrollToBottom();
         }
@@ -40950,12 +40959,6 @@ const AutoscrollToBottomContainer = (props) => {
                 type: ActionType.ShowJumpToBottomButton,
             });
         }
-        // Update last item ids
-        lastItemIds.current = currentItemIds;
-        // Remember if we were scrolled to the bottom before the update
-        return () => {
-            wasScrolledToBottomBeforeItemsUpdate.current = isScrolledToBottom();
-        };
     }, [items]);
     /*------------------------------------------------------------------------*/
     /* ------------------------------- Render ------------------------------- */