tamagui 1.130.2 → 1.130.3

package/dist/native.js

@@ -13446,7 +13446,7 @@ var require_index_native19 = __commonJS({
         rAF(layoutOnAnimationFrame);
       }, layoutOnAnimationFrame2 = layoutOnAnimationFrame, supportsCheckVisibility = "checkVisibility" in document.body, lastFrameAt = Date.now();
       async function updateLayoutIfChanged(node, frameId) {
-        if (!(supportsCheckVisibility && !node.checkVisibility()) && IntersectionState.get(node) !== !1) {
+        if (IntersectionState.get(node) !== !1 && !(process.env.TAMAGUI_ONLAYOUT_VISIBILITY_CHECK === "1" && supportsCheckVisibility && !node.checkVisibility())) {
           var onLayout = LayoutHandlers.get(node);
           if (typeof onLayout == "function") {
             var parentNode = node.parentElement;
@@ -17811,11 +17811,15 @@ var require_RemoveScroll_native = __commonJS({
     __export2(RemoveScroll_native_exports, {
       RemoveScroll: function() {
         return RemoveScroll;
+      },
+      getAllowedScrollableNode: function() {
+        return getAllowedScrollableNode;
       }
     });
     module2.exports = __toCommonJS2(RemoveScroll_native_exports);
     var RemoveScroll = function(props) {
       return props.children;
+    }, getAllowedScrollableNode = function() {
     };
   }
 });
@@ -18088,11 +18092,11 @@ var require_useSheetOpenState_native = __commonJS({
       var { isHidden, controller } = (0, import_useSheetController.useSheetController)(), onOpenChangeInternal = function(val) {
         var _controller_onOpenChange, _props_onOpenChange;
         controller == null || (_controller_onOpenChange = controller.onOpenChange) === null || _controller_onOpenChange === void 0 || _controller_onOpenChange.call(controller, val), (_props_onOpenChange = props.onOpenChange) === null || _props_onOpenChange === void 0 || _props_onOpenChange.call(props, val);
-      }, _controller_open, propVal = (_controller_open = controller == null ? void 0 : controller.open) !== null && _controller_open !== void 0 ? _controller_open : props.open, _props_defaultOpen, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
+      }, _controller_open, _props_open, propVal = props.preferAdaptParentOpenState ? (_controller_open = controller == null ? void 0 : controller.open) !== null && _controller_open !== void 0 ? _controller_open : props.open : (_props_open = props.open) !== null && _props_open !== void 0 ? _props_open : controller == null ? void 0 : controller.open, _props_defaultOpen, [open, setOpen] = (0, import_use_controllable_state.useControllableState)({
         prop: propVal,
         defaultProp: (_props_defaultOpen = props.defaultOpen) !== null && _props_defaultOpen !== void 0 ? _props_defaultOpen : !1,
         onChange: onOpenChangeInternal,
-        strategy: "prop-wins"
+        strategy: "most-recent-wins"
       });
       return {
         open,
@@ -18179,7 +18183,7 @@ var require_useSheetProviderProps_native = __commonJS({
         prop: props.position,
         defaultProp: props.defaultPosition || (state.open ? 0 : -1),
         onChange: props.onPositionChange,
-        strategy: "prop-wins"
+        strategy: "most-recent-wins"
       }), position = state.open === !1 ? -1 : position_, { open } = state, setPosition = import_react3.default.useCallback(function(next) {
         props.dismissOnSnapToBottom && next === snapPoints.length - 1 ? state.setOpen(!1) : setPositionImmediate(next);
       }, [
@@ -18213,7 +18217,7 @@ var require_useSheetProviderProps_native = __commonJS({
       var { animationDriver } = (0, import_core12.useConfiguration)();
       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() {
-        return {
+        var parentDragListeners = /* @__PURE__ */ new Set(), bridge = {
           enabled: !1,
           y: 0,
           paneY: 0,
@@ -18223,8 +18227,20 @@ var require_useSheetProviderProps_native = __commonJS({
           },
           release: function() {
           },
-          scrollLock: !1
+          scrollLock: !1,
+          isParentDragging: !1,
+          onParentDragging: function(cb) {
+            return parentDragListeners.add(cb), function() {
+              parentDragListeners.delete(cb);
+            };
+          },
+          setParentDragging: function(val) {
+            val !== bridge.isParentDragging && (bridge.isParentDragging = val, parentDragListeners.forEach(function(cb) {
+              return cb(val);
+            }));
+          }
         };
+        return bridge;
       }), _props_forceRemoveScrollEnabled, removeScrollEnabled = (_props_forceRemoveScrollEnabled = props.forceRemoveScrollEnabled) !== null && _props_forceRemoveScrollEnabled !== void 0 ? _props_forceRemoveScrollEnabled : open && props.modal, maxSnapPoint = snapPoints[0], screenSize = snapPointsMode === "percent" ? frameSize / ((typeof maxSnapPoint == "number" ? maxSnapPoint : 100) / 100) : maxContentSize, _props_dismissOnOverlayPress, _props_dismissOnSnapToBottom, providerProps = {
         screenSize,
         maxSnapPoint,
@@ -18329,7 +18345,6 @@ var require_nativeSheet_native = __commonJS({
         }
         return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_jsx_runtime6.Fragment, {
           children: /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_SheetContext.SheetProvider, {
-            scrollEnabled: !0,
             setHasScrollView: emptyFn,
             ...providerProps,
             onlyShowFrame: !0,
@@ -18622,15 +18637,13 @@ var require_SheetImplementationCustom_native = __commonJS({
         isAbleToPosition,
         position
       ]);
-      var _props_disableDrag, disableDrag = (_props_disableDrag = props.disableDrag) !== null && _props_disableDrag !== void 0 ? _props_disableDrag : controller == null ? void 0 : controller.disableDrag, themeName = (0, import_core12.useThemeName)(), [isDragging, setIsDragging] = import_react3.default.useState(!1), scrollEnabled = (0, import_react3.useRef)(!0), setScrollEnabled = import_react3.default.useCallback(function(val) {
-        scrollEnabled.current = val;
-      }, []), panResponder = import_react3.default.useMemo(function() {
+      var _props_disableDrag, disableDrag = (_props_disableDrag = props.disableDrag) !== null && _props_disableDrag !== void 0 ? _props_disableDrag : controller == null ? void 0 : controller.disableDrag, themeName = (0, import_core12.useThemeName)(), [isDragging, setIsDragging] = import_react3.default.useState(!1), panResponder = import_react3.default.useMemo(function() {
         if (disableDrag || !frameSize || isShowingInnerSheet) return;
         var minY = positions[0];
         scrollBridge.paneMinY = minY;
         var startY = at.current;
         function setPanning(val) {
-          setIsDragging(val), import_constants4.isClient && (sheetHiddenStyleSheet || (sheetHiddenStyleSheet = document.createElement("style"), typeof document.head < "u" && document.head.appendChild(sheetHiddenStyleSheet)), val ? sheetHiddenStyleSheet.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : sheetHiddenStyleSheet.innerText = "");
+          setIsDragging(val), scrollBridge.setParentDragging(!1), import_constants4.isClient && (sheetHiddenStyleSheet || (sheetHiddenStyleSheet = document.createElement("style"), typeof document.head < "u" && document.head.appendChild(sheetHiddenStyleSheet)), val ? sheetHiddenStyleSheet.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : sheetHiddenStyleSheet.innerText = "");
         }
         var release = function(param) {
           var { vy, dragAt } = param;
@@ -18640,7 +18653,7 @@ var require_SheetImplementationCustom_native = __commonJS({
               var position2 = positions[i], curDist = end > position2 ? end - position2 : position2 - end;
               curDist < dist && (dist = curDist, closestPoint = i);
             }
-            setPosition(closestPoint), animateTo(closestPoint), setScrollEnabled(closestPoint === 0);
+            setPosition(closestPoint), animateTo(closestPoint);
           }
         }, finish = function(_e, state2) {
           release({
@@ -18653,11 +18666,12 @@ var require_SheetImplementationCustom_native = __commonJS({
             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) > 10;
+            return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && hasScrollView.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
           }
-          return getShouldSet();
+          var granted = getShouldSet();
+          return granted && scrollBridge.setParentDragging(!0), granted;
         }, grant = function() {
-          setScrollEnabled(!1), setPanning(!0), stopSpring(), startY = at.current;
+          setPanning(!0), stopSpring(), startY = at.current;
         }, isExternalDrag = !1;
         return scrollBridge.drag = function(dy) {
           isExternalDrag || (isExternalDrag = !0, grant());
@@ -18669,8 +18683,8 @@ var require_SheetImplementationCustom_native = __commonJS({
           onMoveShouldSetPanResponder: onMoveShouldSet,
           onPanResponderGrant: grant,
           onPanResponderMove: function(_e, param) {
-            var { dy } = param, toFull = dy + startY, to = (0, import_helpers.resisted)(toFull, minY);
-            animatedNumber.setValue(to, {
+            var { dy } = param, toFull = dy + startY, to = (0, import_helpers.resisted)(toFull, minY), isAtTop = to <= minY;
+            isAtTop ? scrollBridge.setParentDragging(!1) : scrollBridge.setParentDragging(!0), animatedNumber.setValue(to, {
               type: "direct"
             });
           },
@@ -18744,7 +18758,6 @@ var require_SheetImplementationCustom_native = __commonJS({
         value: nextParentContext,
         children: /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(import_SheetContext.SheetProvider, {
           ...providerProps,
-          scrollEnabled: scrollEnabled.current,
           setHasScrollView,
           children: [
             /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_animate_presence.AnimatePresence, {
@@ -19001,7 +19014,7 @@ var require_SheetScrollView_native = __commonJS({
     });
     module2.exports = __toCommonJS2(SheetScrollView_exports);
     var import_jsx_runtime6 = require("react/jsx-runtime"), import_compose_refs = require_index_native11(), import_core12 = require_index_native20(), import_scroll_view = require_index_native37(), import_use_controllable_state = require_index_native10(), import_react3 = __toESM2(require("react")), import_SheetContext = require_SheetContext_native(), SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ */ import_react3.default.forwardRef(function(param, ref) {
-      var { __scopeSheet, children, onScroll, scrollEnabled: scrollEnabledProp, ...props } = param, context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, scrollEnabled: scrollEnabled_, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
+      var { __scopeSheet, children, onScroll, scrollEnabled: scrollEnabledProp, ...props } = param, context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, setHasScrollView } = context, [scrollEnabled, setScrollEnabled_] = (0, import_use_controllable_state.useControllableState)({
         prop: scrollEnabledProp,
         defaultProp: !0
       }), scrollRef = import_react3.default.useRef(null), setScrollEnabled = function(next) {
@@ -19015,7 +19028,7 @@ var require_SheetScrollView_native = __commonJS({
         dys: [],
         // store a few recent dys to get velocity on release
         isScrolling: !1,
-        isDragging: !1
+        isDraggingScrollArea: !1
       });
       (0, import_react3.useEffect)(function() {
         return setHasScrollView(!0), function() {
@@ -19023,8 +19036,8 @@ var require_SheetScrollView_native = __commonJS({
         };
       }, []);
       var release = function() {
-        if (state.current.isDragging) {
-          state.current.isDragging = !1, scrollBridge.scrollStartY = -1, scrollBridge.scrollLock = !1, state.current.isScrolling = !1, setScrollEnabled(!0);
+        if (state.current.isDraggingScrollArea) {
+          state.current.isDraggingScrollArea = !1, scrollBridge.scrollStartY = -1, scrollBridge.scrollLock = !1, state.current.isScrolling = !1, setScrollEnabled(!0);
           var vy = 0;
           if (state.current.dys.length) {
             var recentDys = state.current.dys.slice(-10), dist = recentDys.length ? recentDys.reduce(function(a, b) {
@@ -19037,8 +19050,31 @@ var require_SheetScrollView_native = __commonJS({
             vy
           });
         }
-      }, scrollable = scrollEnabled ?? scrollEnabled_;
-      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_scroll_view.ScrollView, {
+      }, scrollable = scrollEnabled;
+      return (0, import_react3.useEffect)(function() {
+        if (!(typeof window > "u") && scrollRef.current) {
+          var controller = new AbortController(), node = scrollRef.current.getScrollableNode();
+          node.addEventListener(
+            "touchmove",
+            function(e) {
+              scrollBridge.isParentDragging && node.scrollTo({
+                top: scrollBridge.y,
+                behavior: "instant"
+              });
+            },
+            // can't preventdefault its not cancellable
+            {
+              signal: controller.signal,
+              passive: !1
+            }
+          );
+          var disposeBridgeListen = scrollBridge.onParentDragging(function(val) {
+          });
+          return function() {
+            disposeBridgeListen(), controller.abort();
+          };
+        }
+      }, []), /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_scroll_view.ScrollView, {
         ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
         flex: 1,
         scrollEventThrottle: 8,
@@ -19059,7 +19095,7 @@ var require_SheetScrollView_native = __commonJS({
         // renderScrollComponent={Sheet.ScrollView}
         // ```
         onStartShouldSetResponder: function() {
-          return scrollBridge.scrollStartY = -1, state.current.isDragging = !0, scrollable;
+          return scrollBridge.scrollStartY = -1, state.current.isDraggingScrollArea = !0, scrollable;
         },
         // setting to false while onResponderMove is disabled
         onMoveShouldSetResponder: function(e) {
@@ -19071,15 +19107,15 @@ var require_SheetScrollView_native = __commonJS({
         onResponderMove: function(e) {
           if (import_core12.isWeb) {
             var { pageY } = e.nativeEvent;
-            if (state.current.isScrolling) return;
-            scrollBridge.scrollStartY === -1 && (scrollBridge.scrollStartY = pageY, state.current.lastPageY = pageY);
+            state.current.isScrolling || scrollBridge.scrollStartY === -1 && (scrollBridge.scrollStartY = pageY, state.current.lastPageY = pageY);
             var dragAt = pageY - scrollBridge.scrollStartY, dy = pageY - state.current.lastPageY;
             state.current.lastPageY = pageY;
             var isDraggingUp = dy < 0, isPaneAtTop = scrollBridge.paneY <= scrollBridge.paneMinY, shouldScrollLock = (dy === 0 || isDraggingUp) && isPaneAtTop;
-            if (shouldScrollLock) {
+            if (shouldScrollLock && !state.current.isScrolling) {
               state.current.isScrolling = !0, scrollBridge.scrollLock = !0, setScrollEnabled(!0);
               return;
             }
+            if (scrollBridge.y >= 0) return;
             setScrollEnabled(!1), scrollBridge.drag(dragAt), state.current.dragAt = dragAt, state.current.dys.push(dy), state.current.dys.length > 100 && (state.current.dys = state.current.dys.slice(-10));
           }
         },