tamagui 1.130.6 → 1.130.7

package/dist/native.js

@@ -18278,6 +18278,7 @@ var require_useSheetProviderProps_native = __commonJS({
       if (!animationDriver) throw new Error(process.env.NODE_ENV === "production" ? "\u274C 008" : "Must set animations in tamagui.config.ts");
       var scrollBridge = (0, import_use_constant.useConstant)(function() {
         var parentDragListeners = /* @__PURE__ */ new Set(), bridge = {
+          hasScrollableContent: !1,
           enabled: !1,
           y: 0,
           paneY: 0,
@@ -18692,7 +18693,7 @@ var require_SheetImplementationCustom_native = __commonJS({
         screenSize,
         frameSize
       ]), (0, import_constants4.useIsomorphicLayoutEffect)(function() {
-        isAbleToPosition && animateTo(position);
+        isAbleToPosition && (animateTo(position), position === -1 && (scrollBridge.scrollLock = !1, scrollBridge.scrollStartY = -1));
       }, [
         isAbleToPosition,
         position
@@ -18724,9 +18725,13 @@ var require_SheetImplementationCustom_native = __commonJS({
           var { dy } = param;
           function getShouldSet() {
             if (e.target === providerProps.handleRef.current) return !0;
-            if (scrollBridge.scrollLock) return !1;
-            var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
-            return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
+            if (scrollBridge.hasScrollableContent === !0) {
+              if (scrollBridge.scrollLock) return !1;
+              var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
+              if (isScrolled) return previouslyScrolling = !0, !1;
+              if (isNearTop && hasScrollView.current && isDraggingUp) return !1;
+            }
+            return Math.abs(dy) > 5;
           }
           var granted = getShouldSet();
           return granted && scrollBridge.setParentDragging(!0), granted;
@@ -19147,9 +19152,13 @@ var require_SheetScrollView_native = __commonJS({
         var [hasScrollableContent, setHasScrollableContent] = (0, import_react3.useState)(!0), parentHeight = (0, import_react3.useRef)(0), contentHeight = (0, import_react3.useRef)(0), setIsScrollable = function() {
           parentHeight.current && contentHeight.current && setHasScrollableContent(contentHeight.current > parentHeight.current);
         };
-        return /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_scroll_view.ScrollView, {
+        return (0, import_react3.useEffect)(function() {
+          scrollBridge.hasScrollableContent = hasScrollableContent;
+        }, [
+          hasScrollableContent
+        ]), /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_scroll_view.ScrollView, {
           onLayout: function(e) {
-            parentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+            parentHeight.current = Math.ceil(e.nativeEvent.layout.height), setIsScrollable();
           },
           ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
           flex: 1,
@@ -19204,7 +19213,7 @@ var require_SheetScrollView_native = __commonJS({
               pointerEvents: "none",
               zIndex: -1,
               onLayout: function(e) {
-                contentHeight.current = e.nativeEvent.layout.height, setIsScrollable();
+                contentHeight.current = Math.floor(e.nativeEvent.layout.height), setIsScrollable();
               }
             }),
             children