@tamagui/sheet 2.0.0-rc.8 → 2.0.0

package/dist/cjs/types.native.js

@@ -5,14 +5,16 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
-    get: () => from[key],
-    enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-  });
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
   return to;
 };
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","types_exports"],"sources":["../../src/types.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,aAAA","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","types_exports"],"sources":["../../src/types.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,aAAA","ignoreList":[]}

package/dist/cjs/useGestureHandlerPan.cjs

@@ -3,133 +3,203 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var useGestureHandlerPan_exports = {};
 __export(useGestureHandlerPan_exports, {
   useGestureHandlerPan: () => useGestureHandlerPan
 });
 module.exports = __toCommonJS(useGestureHandlerPan_exports);
-var import_react = require("react"),
-  import_gestureState = require("./gestureState.cjs");
+var import_react = require("react");
+var import_gestureState = require("./gestureState.cjs");
 const AT_TOP_THRESHOLD = 5;
 function useGestureHandlerPan(config) {
   const {
-      positions,
-      frameSize,
-      setPosition,
-      animateTo,
-      stopSpring,
-      scrollBridge,
-      setIsDragging,
-      getCurrentPosition,
-      resisted,
-      disableDrag,
-      isShowingInnerSheet,
-      setAnimatedPosition,
-      scrollGestureRef
-    } = config,
-    gestureHandlerEnabled = (0, import_gestureState.isGestureHandlerEnabled)(),
-    panGestureRef = (0, import_react.useRef)(null),
-    gestureStateRef = (0, import_react.useRef)({
-      startY: 0,
-      // track last translation when pan was active (for position calculation after handoff)
-      lastPanTranslationY: 0,
-      // accumulated position offset from all pan movements
-      accumulatedOffset: 0,
-      // track previous translation for direction detection (like actions-sheet)
-      prevTranslationY: 0,
-      // track if scroll was engaged (scrollY > 0) at some point
-      scrollEngaged: !1,
-      // positions frozen at gesture start — keyboard may dismiss during drag (input blur),
-      // causing positions to revert. Frozen positions ensure stable snap calculation.
-      frozenPositions: [],
-      frozenMinY: 0,
-      // whether pan gesture actually started (vs just a tap in onBegin)
-      panStarted: !1
-    }),
-    onStart = (0, import_react.useCallback)(() => {
-      stopSpring();
-    }, [stopSpring]),
-    onEnd = (0, import_react.useCallback)((closestPoint, animationOverride) => {
-      setIsDragging(!1), scrollBridge.setParentDragging(!1), scrollBridge.setScrollEnabled?.(!0), setPosition(closestPoint), animateTo(closestPoint, animationOverride);
-    }, [setIsDragging, scrollBridge, setPosition, animateTo]);
-  return {
-    panGesture: (0, import_react.useMemo)(() => {
-      if (!gestureHandlerEnabled || disableDrag || isShowingInnerSheet || !frameSize) return null;
+    positions,
+    frameSize,
+    setPosition,
+    animateTo,
+    stopSpring,
+    scrollBridge,
+    setIsDragging,
+    getCurrentPosition,
+    resisted,
+    disableDrag,
+    isShowingInnerSheet,
+    setAnimatedPosition,
+    scrollGestureRef
+  } = config;
+  const gestureHandlerEnabled = (0, import_gestureState.isGestureHandlerEnabled)();
+  const panGestureRef = (0, import_react.useRef)(null);
+  const gestureStateRef = (0, import_react.useRef)({
+    startY: 0,
+    // track last translation when pan was active (for position calculation after handoff)
+    lastPanTranslationY: 0,
+    // accumulated position offset from all pan movements
+    accumulatedOffset: 0,
+    // track previous translation for direction detection (like actions-sheet)
+    prevTranslationY: 0,
+    // track if scroll was engaged (scrollY > 0) at some point
+    scrollEngaged: false,
+    // positions frozen at gesture start — keyboard may dismiss during drag (input blur),
+    // causing positions to revert. Frozen positions ensure stable snap calculation.
+    frozenPositions: [],
+    frozenMinY: 0,
+    // whether pan gesture actually started (vs just a tap in onBegin)
+    panStarted: false
+  });
+  const onStart = (0, import_react.useCallback)(() => {
+    stopSpring();
+  }, [stopSpring]);
+  const onEnd = (0, import_react.useCallback)((closestPoint, animationOverride) => {
+    setIsDragging(false);
+    scrollBridge.setParentDragging(false);
+    scrollBridge.setScrollEnabled?.(true);
+    setPosition(closestPoint);
+    animateTo(closestPoint, animationOverride);
+  }, [setIsDragging, scrollBridge, setPosition, animateTo]);
+  const panGesture = (0, import_react.useMemo)(() => {
+    if (!gestureHandlerEnabled || disableDrag || isShowingInnerSheet || !frameSize) {
+      return null;
+    }
+    const {
+      Gesture
+    } = (0, import_gestureState.getGestureHandlerState)();
+    if (!Gesture) {
+      return null;
+    }
+    const minY = positions[0];
+    const gs = gestureStateRef.current;
+    const gesture = Gesture.Pan().withRef(panGestureRef).activeOffsetY([-10, 10]).failOffsetX([-20, 20]).shouldCancelWhenOutside(false).onBegin(() => {
+      gs.panStarted = false;
+      if (config.pauseKeyboardHandler) {
+        config.pauseKeyboardHandler.current = true;
+      }
+      const pos = getCurrentPosition();
+      const atTop = pos <= minY + AT_TOP_THRESHOLD;
+      const currentScrollY = scrollBridge.y;
+      gs.startY = pos;
+      gs.lastPanTranslationY = 0;
+      gs.accumulatedOffset = 0;
+      gs.prevTranslationY = 0;
+      gs.scrollEngaged = currentScrollY > 0;
+      gs.frozenPositions = [...positions];
+      gs.frozenMinY = minY;
+      if (!atTop) {
+        scrollBridge.setScrollEnabled?.(false, 0);
+      }
+    }).onStart(() => {
+      gs.panStarted = true;
+      setIsDragging(true);
+      scrollBridge.initialPosition = gs.startY;
+      onStart();
+    }).onChange(event => {
       const {
-        Gesture
-      } = (0, import_gestureState.getGestureHandlerState)();
-      if (!Gesture) return null;
-      const minY = positions[0],
-        gs = gestureStateRef.current,
-        gesture = Gesture.Pan().withRef(panGestureRef).activeOffsetY([-10, 10]).failOffsetX([-20, 20]).shouldCancelWhenOutside(!1).onBegin(() => {
-          gs.panStarted = !1, config.pauseKeyboardHandler && (config.pauseKeyboardHandler.current = !0);
-          const pos = getCurrentPosition(),
-            atTop = pos <= minY + AT_TOP_THRESHOLD,
-            currentScrollY = scrollBridge.y;
-          gs.startY = pos, gs.lastPanTranslationY = 0, gs.accumulatedOffset = 0, gs.prevTranslationY = 0, gs.scrollEngaged = currentScrollY > 0, gs.frozenPositions = [...positions], gs.frozenMinY = minY, atTop || scrollBridge.setScrollEnabled?.(!1, 0);
-        }).onStart(() => {
-          gs.panStarted = !0, setIsDragging(!0), scrollBridge.initialPosition = gs.startY, onStart();
-        }).onChange(event => {
-          const {
-              translationY
-            } = event,
-            isSwipingDown = gs.prevTranslationY < translationY,
-            deltaY = translationY - gs.prevTranslationY;
-          gs.prevTranslationY = translationY;
-          const scrollY = scrollBridge.y;
-          scrollY > 0 && (gs.scrollEngaged = !0);
-          const isCurrentlyAtTop = gs.startY + gs.accumulatedOffset <= minY + AT_TOP_THRESHOLD,
-            nodeIsScrolling = scrollY > 0;
-          let panHandles = !1;
-          const hasScrollableContent = scrollBridge.hasScrollableContent !== !1;
-          if (isCurrentlyAtTop ? isSwipingDown ? nodeIsScrolling && hasScrollableContent ? panHandles = !1 : (gs.scrollEngaged, panHandles = !0) : hasScrollableContent ? panHandles = !1 : panHandles = !0 : isSwipingDown ? panHandles = !nodeIsScrolling || !hasScrollableContent : panHandles = !0, panHandles) {
-            const lockTo = isCurrentlyAtTop ? void 0 : 0;
-            scrollBridge.setScrollEnabled?.(!1, lockTo), gs.accumulatedOffset += deltaY;
-            const newPosition = resisted(gs.startY + gs.accumulatedOffset, minY);
-            scrollBridge.paneY = newPosition, setAnimatedPosition(newPosition), scrollBridge.setParentDragging(newPosition > minY);
-          } else scrollBridge.setScrollEnabled?.(!0);
-        }).onEnd(event => {
-          const {
-              velocityY
-            } = event,
-            currentPos = gs.startY + gs.accumulatedOffset;
-          scrollBridge.scrollLockY = void 0;
-          const snapPositions = gs.frozenPositions.length > 0 ? gs.frozenPositions : positions,
-            snapMinY = gs.frozenPositions.length > 0 ? gs.frozenMinY : minY;
-          if (currentPos <= snapMinY + AT_TOP_THRESHOLD && scrollBridge.y > 0) {
-            onEnd(0);
-            return;
+        translationY
+      } = event;
+      const isSwipingDown = gs.prevTranslationY < translationY;
+      const deltaY = translationY - gs.prevTranslationY;
+      gs.prevTranslationY = translationY;
+      const scrollY = scrollBridge.y;
+      if (scrollY > 0) {
+        gs.scrollEngaged = true;
+      }
+      const currentPos = gs.startY + gs.accumulatedOffset;
+      const isCurrentlyAtTop = currentPos <= minY + AT_TOP_THRESHOLD;
+      const nodeIsScrolling = scrollY > 0;
+      let panHandles = false;
+      const hasScrollableContent = scrollBridge.hasScrollableContent !== false;
+      if (!isCurrentlyAtTop) {
+        if (isSwipingDown) {
+          panHandles = !nodeIsScrolling || !hasScrollableContent;
+        } else {
+          panHandles = true;
+        }
+      } else {
+        if (isSwipingDown) {
+          if (nodeIsScrolling && hasScrollableContent) {
+            panHandles = false;
+          } else if (gs.scrollEngaged && hasScrollableContent) {
+            panHandles = true;
+          } else {
+            panHandles = true;
           }
-          const velocity = velocityY / 1e3,
-            projectedEnd = currentPos + frameSize * velocity * 0.2;
-          let closestPoint = 0,
-            minDist = Number.POSITIVE_INFINITY;
-          for (let i = 0; i < snapPositions.length; i++) {
-            const pos = snapPositions[i],
-              dist = Math.abs(projectedEnd - pos);
-            dist < minDist && (minDist = dist, closestPoint = i);
+        } else {
+          if (hasScrollableContent) {
+            panHandles = false;
+          } else {
+            panHandles = true;
           }
-          onEnd(closestPoint);
-        }).onFinalize(() => {
-          scrollBridge.scrollLockY = void 0, gs.panStarted ? setIsDragging(!1) : config.pauseKeyboardHandler && (config.pauseKeyboardHandler.current = !1);
-        }).runOnJS(!0);
-      return scrollGestureRef?.current ? gesture.simultaneousWithExternalGesture(scrollGestureRef.current) : gesture;
-    }, [gestureHandlerEnabled, disableDrag, isShowingInnerSheet, frameSize, positions, scrollBridge, getCurrentPosition, resisted, onStart, onEnd, setIsDragging, setAnimatedPosition]),
+        }
+      }
+      if (panHandles) {
+        const lockTo = isCurrentlyAtTop && isSwipingDown && gs.scrollEngaged ? void 0 : 0;
+        scrollBridge.setScrollEnabled?.(false, lockTo);
+        gs.accumulatedOffset += deltaY;
+        const newPosition = resisted(gs.startY + gs.accumulatedOffset, minY);
+        scrollBridge.paneY = newPosition;
+        setAnimatedPosition(newPosition);
+        scrollBridge.setParentDragging(newPosition > minY);
+      } else {
+        scrollBridge.setScrollEnabled?.(true);
+      }
+    }).onEnd(event => {
+      const {
+        velocityY
+      } = event;
+      const currentPos = gs.startY + gs.accumulatedOffset;
+      scrollBridge.scrollLockY = void 0;
+      const snapPositions = gs.frozenPositions.length > 0 ? gs.frozenPositions : positions;
+      const snapMinY = gs.frozenPositions.length > 0 ? gs.frozenMinY : minY;
+      if (currentPos <= snapMinY + AT_TOP_THRESHOLD && scrollBridge.y > 0) {
+        onEnd(0);
+        return;
+      }
+      const velocity = velocityY / 1e3;
+      const projectedEnd = currentPos + frameSize * velocity * 0.2;
+      let closestPoint = 0;
+      let minDist = Number.POSITIVE_INFINITY;
+      for (let i = 0; i < snapPositions.length; i++) {
+        const pos = snapPositions[i];
+        const dist = Math.abs(projectedEnd - pos);
+        if (dist < minDist) {
+          minDist = dist;
+          closestPoint = i;
+        }
+      }
+      onEnd(closestPoint);
+    }).onFinalize(() => {
+      scrollBridge.scrollLockY = void 0;
+      if (gs.panStarted) {
+        setIsDragging(false);
+      } else {
+        if (config.pauseKeyboardHandler) {
+          config.pauseKeyboardHandler.current = false;
+        }
+      }
+    }).runOnJS(true);
+    if (scrollGestureRef?.current) {
+      return gesture.simultaneousWithExternalGesture(scrollGestureRef.current);
+    }
+    return gesture;
+  }, [gestureHandlerEnabled, disableDrag, isShowingInnerSheet, frameSize, positions, scrollBridge, getCurrentPosition, resisted, onStart, onEnd, setIsDragging, setAnimatedPosition]);
+  return {
+    panGesture,
     panGestureRef,
     gestureHandlerEnabled
   };