infinity-ui-elements 1.14.4 → 1.14.5

package/dist/index.js

@@ -1566,32 +1566,55 @@ const BottomSheet = React__namespace.forwardRef(({ isOpen, onClose, title, descr
             document.body.style.right = "0";
             document.body.style.width = "100%";
         }
+        // Track touch position for scroll boundary detection
+        let lastTouchY = 0;
+        const handleTouchStartForScroll = (e) => {
+            lastTouchY = e.touches[0].clientY;
+        };
         // Prevent touchmove on overlay to stop iOS rubber-banding
+        // But always allow scrolling inside body content
         const preventTouchMove = (e) => {
             const target = e.target;
-            // Allow scrolling inside the body content
+            const currentTouchY = e.touches[0].clientY;
+            const touchDelta = currentTouchY - lastTouchY;
+            lastTouchY = currentTouchY;
+            // Always allow scrolling inside the body content
             if (bodyRef.current?.contains(target)) {
                 const scrollTop = bodyRef.current.scrollTop;
                 const scrollHeight = bodyRef.current.scrollHeight;
                 const clientHeight = bodyRef.current.clientHeight;
-                // Check if at scroll boundaries
-                const isAtTop = scrollTop <= 0;
-                const isAtBottom = scrollTop + clientHeight >= scrollHeight;
-                // Only prevent default if at boundaries and trying to scroll further
-                if ((isAtTop && e.touches[0].clientY > (touchStart || 0)) ||
-                    (isAtBottom && e.touches[0].clientY < (touchStart || 0))) {
-                    // Allow the swipe-to-close gesture
-                    if (!isDraggingFromHandle.current) {
+                const canScroll = scrollHeight > clientHeight;
+                // If content is scrollable, allow normal scrolling
+                if (canScroll) {
+                    const isAtTop = scrollTop <= 0;
+                    const isAtBottom = scrollTop + clientHeight >= scrollHeight - 1;
+                    const isScrollingDown = touchDelta > 0; // finger moving down = scrolling up
+                    const isScrollingUp = touchDelta < 0; // finger moving up = scrolling down
+                    // Only prevent at boundaries when trying to scroll beyond
+                    if ((isAtTop && isScrollingDown) || (isAtBottom && isScrollingUp)) {
+                        // At boundary, prevent overscroll but allow swipe-to-close from drag handle
+                        if (isDraggingFromHandle.current) {
+                            return; // Allow swipe gesture
+                        }
                         e.preventDefault();
                     }
+                    // Otherwise, allow normal scrolling
+                    return;
                 }
+                // Content not scrollable, allow touch events to pass through
+                return;
+            }
+            // Also allow scrolling in sticky content area
+            if (target.closest('[data-sticky-content]')) {
                 return;
             }
-            // Prevent scroll on overlay and other areas
+            // Prevent scroll on overlay and other areas (to prevent background scroll)
             e.preventDefault();
         };
+        document.addEventListener("touchstart", handleTouchStartForScroll, { passive: true });
         document.addEventListener("touchmove", preventTouchMove, { passive: false });
         return () => {
+            document.removeEventListener("touchstart", handleTouchStartForScroll);
             document.removeEventListener("touchmove", preventTouchMove);
             // Restore original styles
             if (originalBodyStyles.current) {