@tamagui/sheet 2.3.3 → 2.4.0-1783099846627

package/dist/cjs/useGestureHandlerPan.native.js

@@ -32,6 +32,7 @@ var import_react = require("react");
 var import_gestureState = require("./gestureState.native.js");
 var import_keyboardAvoidance = require("./keyboardAvoidance.native.js");
 var AT_TOP_THRESHOLD = 5;
+var SCROLL_HANDOFF_THRESHOLD = 160;
 function useGestureHandlerPan(config) {
   var {
     positions,
@@ -78,16 +79,45 @@ function useGestureHandlerPan(config) {
     frozenMinY: 0,
     frozenIsKeyboardVisible: false,
     // whether pan gesture actually started (vs just a tap in onBegin)
-    panStarted: false
+    panStarted: false,
+    startedBelowTop: false,
+    upwardDragAfterTop: 0,
+    scrollUnlockedAfterTop: false,
+    keepScrollLockedAfterEnd: false
   });
+  var unlockScrollTimer = (0, import_react.useRef)(null);
+  (0, import_react.useEffect)(function () {
+    return function () {
+      if (unlockScrollTimer.current) {
+        clearTimeout(unlockScrollTimer.current);
+        unlockScrollTimer.current = null;
+      }
+    };
+  }, []);
   var onStart = (0, import_react.useCallback)(function () {
     stopSpring();
   }, [stopSpring]);
   var onEnd = (0, import_react.useCallback)(function (closestPoint, animationOverride) {
-    var _scrollBridge_setScrollEnabled;
+    var keepScrollLocked = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : false;
+    if (unlockScrollTimer.current) {
+      clearTimeout(unlockScrollTimer.current);
+      unlockScrollTimer.current = null;
+    }
     setIsDragging(false);
     scrollBridge.setParentDragging(false);
-    (_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 ? void 0 : _scrollBridge_setScrollEnabled.call(scrollBridge, true);
+    scrollBridge.lockScrollAtTop = false;
+    if (keepScrollLocked) {
+      var _scrollBridge_setScrollEnabled;
+      (_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 ? void 0 : _scrollBridge_setScrollEnabled.call(scrollBridge, false, 0);
+      unlockScrollTimer.current = setTimeout(function () {
+        var _scrollBridge_setScrollEnabled2;
+        unlockScrollTimer.current = null;
+        (_scrollBridge_setScrollEnabled2 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled2 === void 0 ? void 0 : _scrollBridge_setScrollEnabled2.call(scrollBridge, true);
+      }, 160);
+    } else {
+      var _scrollBridge_setScrollEnabled1;
+      (_scrollBridge_setScrollEnabled1 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled1 === void 0 ? void 0 : _scrollBridge_setScrollEnabled1.call(scrollBridge, true);
+    }
     setPosition(closestPoint);
     animateTo(closestPoint, animationOverride);
   }, [setIsDragging, scrollBridge, setPosition, animateTo]);
@@ -119,6 +149,15 @@ function useGestureHandlerPan(config) {
       gs.frozenPositions = [...positions];
       gs.frozenMinY = minY;
       gs.frozenIsKeyboardVisible = releaseConfigRef.current.isKeyboardVisible;
+      gs.startedBelowTop = !atTop;
+      gs.upwardDragAfterTop = 0;
+      gs.scrollUnlockedAfterTop = false;
+      gs.keepScrollLockedAfterEnd = false;
+      scrollBridge.lockScrollAtTop = false;
+      if (unlockScrollTimer.current) {
+        clearTimeout(unlockScrollTimer.current);
+        unlockScrollTimer.current = null;
+      }
       if (!atTop) {
         var _scrollBridge_setScrollEnabled;
         (_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 ? void 0 : _scrollBridge_setScrollEnabled.call(scrollBridge, false, 0);
@@ -161,7 +200,17 @@ function useGestureHandlerPan(config) {
           }
         } else {
           if (hasScrollableContent) {
-            panHandles = false;
+            if (gs.startedBelowTop && !gs.scrollUnlockedAfterTop) {
+              gs.upwardDragAfterTop += Math.max(0, -deltaY);
+              if (gs.upwardDragAfterTop >= SCROLL_HANDOFF_THRESHOLD) {
+                gs.scrollUnlockedAfterTop = true;
+                panHandles = false;
+              } else {
+                panHandles = true;
+              }
+            } else {
+              panHandles = false;
+            }
           } else {
             panHandles = true;
           }
@@ -169,6 +218,7 @@ function useGestureHandlerPan(config) {
       }
       if (panHandles) {
         var _scrollBridge_setScrollEnabled;
+        scrollBridge.lockScrollAtTop = gs.startedBelowTop && !gs.scrollUnlockedAfterTop;
         var lockTo = isCurrentlyAtTop && isSwipingDown && gs.scrollEngaged ? void 0 : 0;
         (_scrollBridge_setScrollEnabled = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled === void 0 ? void 0 : _scrollBridge_setScrollEnabled.call(scrollBridge, false, lockTo);
         gs.accumulatedOffset += deltaY;
@@ -178,18 +228,23 @@ function useGestureHandlerPan(config) {
         scrollBridge.setParentDragging(newPosition > minY);
       } else {
         var _scrollBridge_setScrollEnabled1;
+        scrollBridge.lockScrollAtTop = false;
         (_scrollBridge_setScrollEnabled1 = scrollBridge.setScrollEnabled) === null || _scrollBridge_setScrollEnabled1 === void 0 ? void 0 : _scrollBridge_setScrollEnabled1.call(scrollBridge, true);
+        scrollBridge.setParentDragging(false);
       }
     }).onEnd(function (event) {
       var {
         velocityY
       } = event;
       var currentPos = gs.startY + gs.accumulatedOffset;
-      scrollBridge.scrollLockY = void 0;
+      var keepScrollLockedAfterEnd = gs.startedBelowTop && !gs.scrollUnlockedAfterTop;
+      scrollBridge.lockScrollAtTop = false;
+      scrollBridge.scrollLockY = keepScrollLockedAfterEnd ? 0 : void 0;
+      gs.keepScrollLockedAfterEnd = keepScrollLockedAfterEnd;
       var snapPositions = gs.frozenPositions.length > 0 ? gs.frozenPositions : positions;
       var snapMinY = gs.frozenPositions.length > 0 ? gs.frozenMinY : minY;
       if (currentPos <= snapMinY + AT_TOP_THRESHOLD && scrollBridge.y > 0) {
-        onEnd(0);
+        onEnd(0, void 0, keepScrollLockedAfterEnd);
         return;
       }
       var velocity = velocityY / 1e3;
@@ -205,9 +260,10 @@ function useGestureHandlerPan(config) {
         isKeyboardVisible: gs.frozenIsKeyboardVisible,
         isWeb: import_constants.isWeb
       });
-      onEnd(closestPoint);
+      onEnd(closestPoint, void 0, keepScrollLockedAfterEnd);
     }).onFinalize(function () {
-      scrollBridge.scrollLockY = void 0;
+      scrollBridge.lockScrollAtTop = false;
+      scrollBridge.scrollLockY = gs.keepScrollLockedAfterEnd ? 0 : void 0;
       if (gs.panStarted) {
         setIsDragging(false);
       } else {

package/dist/cjs/useGestureHandlerPan.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useGestureHandlerPan_exports","__export","useGestureHandlerPan","module","exports","import_constants","require","import_react","import_gestureState","import_keyboardAvoidance","AT_TOP_THRESHOLD","config","positions","frameSize","setPosition","animateTo","stopSpring","scrollBridge","setIsDragging","getCurrentPosition","resisted","disableDrag","isShowingInnerSheet","setAnimatedPosition","scrollGestureRef","gestureHandlerEnabled","isGestureHandlerEnabled","panGestureRef","useRef","_config_snapPointsMode","releaseConfigRef","dismissOnSnapToBottom","snapPointsMode","isKeyboardVisible","_config_snapPointsMode1","current","gestureStateRef","startY","lastPanTranslationY","accumulatedOffset","prevTranslationY","scrollEngaged","frozenPositions","frozenMinY","frozenIsKeyboardVisible","panStarted","onStart","useCallback","onEnd","closestPoint","animationOverride","_scrollBridge_setScrollEnabled","setParentDragging","setScrollEnabled","call","panGesture","useMemo","Gesture","getGestureHandlerState","minY","gs","gesture","Pan","withRef","activeOffsetY","failOffsetX","shouldCancelWhenOutside","onBegin","pauseKeyboardHandler","pos","atTop","currentScrollY","y","initialPosition","onChange","event","translationY","isSwipingDown","deltaY","scrollY","currentPos","isCurrentlyAtTop","nodeIsScrolling","panHandles","hasScrollableContent","lockTo","newPosition","paneY","_scrollBridge_setScrollEnabled1","velocityY","scrollLockY","snapPositions","length","snapMinY","velocity","projectedEnd","releaseConfig","getSheetReleasePosition","currentPosition","isWeb","onFinalize","runOnJS","simultaneousWithExternalGesture"],"sources":["../../src/useGestureHandlerPan.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useGestureHandlerPan_exports","__export","useGestureHandlerPan","module","exports","import_constants","require","import_react","import_gestureState","import_keyboardAvoidance","AT_TOP_THRESHOLD","SCROLL_HANDOFF_THRESHOLD","config","positions","frameSize","setPosition","animateTo","stopSpring","scrollBridge","setIsDragging","getCurrentPosition","resisted","disableDrag","isShowingInnerSheet","setAnimatedPosition","scrollGestureRef","gestureHandlerEnabled","isGestureHandlerEnabled","panGestureRef","useRef","_config_snapPointsMode","releaseConfigRef","dismissOnSnapToBottom","snapPointsMode","isKeyboardVisible","_config_snapPointsMode1","current","gestureStateRef","startY","lastPanTranslationY","accumulatedOffset","prevTranslationY","scrollEngaged","frozenPositions","frozenMinY","frozenIsKeyboardVisible","panStarted","startedBelowTop","upwardDragAfterTop","scrollUnlockedAfterTop","keepScrollLockedAfterEnd","unlockScrollTimer","useEffect","clearTimeout","onStart","useCallback","onEnd","closestPoint","animationOverride","keepScrollLocked","arguments","length","setParentDragging","lockScrollAtTop","_scrollBridge_setScrollEnabled","setScrollEnabled","call","setTimeout","_scrollBridge_setScrollEnabled2","_scrollBridge_setScrollEnabled1","panGesture","useMemo","Gesture","getGestureHandlerState","minY","gs","gesture","Pan","withRef","activeOffsetY","failOffsetX","shouldCancelWhenOutside","onBegin","pauseKeyboardHandler","pos","atTop","currentScrollY","y","initialPosition","onChange","event","translationY","isSwipingDown","deltaY","scrollY","currentPos","isCurrentlyAtTop","nodeIsScrolling","panHandles","hasScrollableContent","Math","max","lockTo","newPosition","paneY","velocityY","scrollLockY","snapPositions","snapMinY","velocity","projectedEnd","releaseConfig","getSheetReleasePosition","currentPosition","isWeb","onFinalize","runOnJS","simultaneousWithExternalGesture"],"sources":["../../src/useGestureHandlerPan.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/useSheetScrollViewGestures.cjs

@@ -29,7 +29,8 @@ var import_react = require("react");
 function useSheetScrollViewGestures({
   scrollRef,
   scrollBridge,
-  hasScrollableContent
+  hasScrollableContent,
+  onManualScroll
 }) {
   const state = (0, import_react.useRef)({
     startY: 0,
@@ -40,6 +41,10 @@ function useSheetScrollViewGestures({
     dys: [],
     scrollYAtGestureStart: 0
   });
+  const onManualScrollRef = (0, import_react.useRef)(onManualScroll);
+  (0, import_react.useEffect)(() => {
+    onManualScrollRef.current = onManualScroll;
+  }, [onManualScroll]);
   (0, import_react.useEffect)(() => {
     if (!scrollRef.current) return;
     const controller = new AbortController();
@@ -56,6 +61,11 @@ function useSheetScrollViewGestures({
     const enableScroll = () => {
       node.style.overflowY = originalOverflow;
     };
+    const setScrollTop = nextScrollY => {
+      if (node.scrollTop === nextScrollY) return;
+      node.scrollTop = nextScrollY;
+      onManualScrollRef.current?.(node, nextScrollY);
+    };
     const handleTouchStart = e => {
       const touch = e.touches[0];
       if (!touch) return;
@@ -84,7 +94,7 @@ function useSheetScrollViewGestures({
       if (dy === 0) return;
       const isDraggingDown = dy > 0;
       const currentScrollY = node.scrollTop;
-      const isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY + 5;
+      const isPaneAtTop = scrollBridge.isAtTop ?? scrollBridge.paneY <= scrollBridge.paneMinY + 5;
       scrollBridge.y = currentScrollY;
       let shouldPanOwn = false;
       if (!isPaneAtTop) {
@@ -124,7 +134,7 @@ function useSheetScrollViewGestures({
         const maxScrollY = node.scrollHeight - node.clientHeight;
         const newScrollY = Math.max(0, Math.min(maxScrollY, currentScrollY + scrollDelta));
         if (newScrollY !== currentScrollY) {
-          node.scrollTop = newScrollY;
+          setScrollTop(newScrollY);
           scrollBridge.y = newScrollY;
           if (newScrollY > 0) scrollBridge.scrollStartY = -1;
         }

package/dist/esm/SheetImplementationCustom.mjs

@@ -74,8 +74,7 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
   } = state;
   const openRef = React.useRef(open);
   openRef.current = open;
-  const sheetRef = React.useRef(void 0);
-  const ref = useComposedRefs(forwardedRef, sheetRef, providerProps.contentRef);
+  const ref = useComposedRefs(forwardedRef, React.useRef(void 0), providerProps.contentRef);
   const {
     animationDriver
   } = useConfiguration();
@@ -109,6 +108,11 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
     if (open && frameSize) stableFrameSize.current = frameSize;
   }, [open, frameSize]);
   const isWebKbSheet = isWeb && hasFit && moveOnKeyboardChange;
+  const isNativeKbFitSheet = !isWeb && hasFit && Boolean(moveOnKeyboardChange);
+  const preKeyboardFrameSize = React.useRef(0);
+  React.useEffect(() => {
+    if (isNativeKbFitSheet && open && !isKeyboardVisible && frameSize > 0) preKeyboardFrameSize.current = frameSize;
+  }, [isNativeKbFitSheet, open, isKeyboardVisible, frameSize]);
   const effScreenSize = isWebKbSheet ? getStableViewportHeight() : screenSize;
   const effectiveFrameSize = open ? frameSize : stableFrameSize.current || frameSize;
   const positions = React.useMemo(() => snapPoints.map(point => getYPositions(snapPointsMode, point, effScreenSize, effectiveFrameSize)), [effScreenSize, effectiveFrameSize, snapPoints, snapPointsMode]);
@@ -142,11 +146,10 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
     screenSize: effScreenSize,
     sheetY: position >= 0 ? activePositions[position] : void 0
   });
-  const keyboardStableFrameHeight = isWebKbSheet && isKeyboardVisible && frameSize > 0 ? frameSize : 0;
+  const keyboardStableFrameHeight = isWebKbSheet && isKeyboardVisible && frameSize > 0 ? frameSize : isNativeKbFitSheet && isKeyboardVisible && preKeyboardFrameSize.current > 0 ? preKeyboardFrameSize.current : 0;
   const {
     useAnimatedNumber,
-    useAnimatedNumberStyle,
-    useAnimatedNumberReaction
+    useAnimatedNumberStyle
   } = animationDriver;
   const AnimatedView = animationDriver.View ?? View;
   useIsomorphicLayoutEffect(() => {
@@ -168,30 +171,46 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
   if (controller?.skipNextAnimation) skipAdaptAnimation.current = true;
   const hasScrollView = React.useRef(false);
   const opacityFallbackTimer = React.useRef(null);
-  useAnimatedNumberReaction({
-    value: animatedNumber,
-    hostRef: sheetRef
-  }, React.useCallback(value => {
+  const syncAnimatedPosition = useEvent(value => {
     at.current = value;
     scrollBridge.paneY = value;
     const minY = activePositions[0];
     const wasAtTop = scrollBridge.isAtTop;
     const nowAtTop = value <= minY + 5;
-    if (wasAtTop !== nowAtTop) {
-      scrollBridge.isAtTop = nowAtTop;
-      if (nowAtTop) {
+    if (wasAtTop === nowAtTop) return;
+    scrollBridge.isAtTop = nowAtTop;
+    if (nowAtTop) {
+      if (scrollBridge.lockScrollAtTop) {
         if (scrollBridge.y > 0) {
           scrollBridge.forceScrollTo?.(0);
           scrollBridge.y = 0;
         }
-        scrollBridge.scrollLockY = void 0;
-        scrollBridge.setScrollEnabled?.(true);
-      } else {
         scrollBridge.scrollLockY = 0;
-        scrollBridge.setScrollEnabled?.(false);
+        scrollBridge.setScrollEnabled?.(false, 0);
+        return;
+      }
+      if (scrollBridge.y > 0) {
+        scrollBridge.forceScrollTo?.(0);
+        scrollBridge.y = 0;
       }
+      scrollBridge.scrollLockY = void 0;
+      scrollBridge.setScrollEnabled?.(true);
+    } else {
+      scrollBridge.scrollLockY = 0;
+      scrollBridge.setScrollEnabled?.(false);
     }
-  }, [animationDriver, activePositions]));
+  });
+  const setAnimatedPositionDirect = useEvent(value => {
+    syncAnimatedPosition(value);
+    animatedNumber.setValue(value, {
+      type: "direct"
+    });
+  });
+  const getAnimatedPosition = useEvent(() => {
+    const value = animatedNumber.getValue();
+    syncAnimatedPosition(value);
+    return value;
+  });
   function stopSpring() {
     animatedNumber.stop();
     if (scrollBridge.onFinishAnimate) {
@@ -212,6 +231,7 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
       opacityFallbackTimer.current = null;
     }
     const animationCompleteCallback = () => {
+      syncAnimatedPosition(toValue);
       if (opacityFallbackTimer.current) {
         clearTimeout(opacityFallbackTimer.current);
         opacityFallbackTimer.current = null;
@@ -248,6 +268,7 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
         type: "timing",
         duration: 0
       }, () => {
+        syncAnimatedPosition(screenSize);
         setTimeout(() => {
           setDisableAnimation(false);
         }, 10);
@@ -346,7 +367,7 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
     const grant = () => {
       setPanning(true);
       stopSpring();
-      startY = at.current;
+      startY = getAnimatedPosition();
     };
     let isExternalDrag = false;
     scrollBridge.startPanDrag = () => {
@@ -358,10 +379,7 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
         isExternalDrag = true;
         grant();
       }
-      const to = dy + startY;
-      animatedNumber.setValue(resisted(to, minY), {
-        type: "direct"
-      });
+      setAnimatedPositionDirect(resisted(dy + startY, minY));
     };
     scrollBridge.release = release;
     scrollBridge.snapToPosition = positionIndex => {
@@ -379,9 +397,7 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
       }) => {
         const to = resisted(dy + startY, minY);
         if (to <= minY) scrollBridge.setParentDragging(false);else scrollBridge.setParentDragging(true);
-        animatedNumber.setValue(to, {
-          type: "direct"
-        });
+        setAnimatedPositionDirect(to);
       },
       onPanResponderEnd: finish,
       onPanResponderTerminate: finish,
@@ -426,16 +442,11 @@ const SheetImplementationCustom = React.forwardRef(function SheetImplementationC
     stopSpring,
     scrollBridge,
     setIsDragging,
-    getCurrentPosition: () => at.current,
+    getCurrentPosition: getAnimatedPosition,
     resisted,
     disableDrag,
     isShowingInnerSheet,
-    setAnimatedPosition: val => {
-      at.current = val;
-      animatedNumber.setValue(val, {
-        type: "direct"
-      });
-    },
+    setAnimatedPosition: setAnimatedPositionDirect,
     dismissOnSnapToBottom,
     snapPointsMode,
     isKeyboardVisible,