tamagui 1.125.25 → 1.125.27

package/dist/native.js

@@ -7787,9 +7787,6 @@ var require_Theme_native = __commonJS({
       if (import_constants4.isWeb) {
         var { className, style } = getThemeClassNameAndStyle(themeState, props, isRoot);
         if (children = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)("span", {
-          ...process.env.NODE_ENV === "development" && {
-            "data-theme-id": themeState.id
-          },
           className: `${className} _dsp_contents is_Theme`,
           style,
           children
@@ -13331,7 +13328,12 @@ var require_getBaseViews_native = __commonJS({
     module2.exports = __toCommonJS2(getBaseViews_native_exports);
     function getBaseViews() {
       var native = require("react-native"), View2, TextAncestor;
-      return process.env.NODE_ENV !== "test" && (View2 = require("react-native/Libraries/Components/View/ViewNativeComponent").default, TextAncestor = require("react-native/Libraries/Text/TextAncestor")), View2 || (View2 = native.View || native.default.View), {
+      if (process.env.NODE_ENV !== "test") {
+        View2 = require("react-native/Libraries/Components/View/ViewNativeComponent").default;
+        var TextAncestorModule = require("react-native/Libraries/Text/TextAncestor"), _TextAncestorModule_default;
+        TextAncestor = (_TextAncestorModule_default = TextAncestorModule.default) !== null && _TextAncestorModule_default !== void 0 ? _TextAncestorModule_default : TextAncestor;
+      }
+      return View2 || (View2 = native.View || native.default.View), {
         View: View2,
         Text: native.Text || native.default.Text,
         StyleSheet: native.StyleSheet || native.default.StyleSheet,
@@ -16560,12 +16562,14 @@ var require_Portal_native = __commonJS({
     module2.exports = __toCommonJS2(Portal_native_exports);
     var import_jsx_runtime6 = require("react/jsx-runtime"), import_stacks3 = require_index_native22(), import_z_index_stack2 = require_index_native27(), React4 = __toESM2(require("react")), import_react_native4 = require("react-native"), import_constants4 = require_constants_native3(), import_GorhomPortalItem = require_GorhomPortalItem_native(), import_helpers = require_helpers_native(), createPortal = function() {
       if (import_constants4.IS_FABRIC) try {
-        return require("react-native/Libraries/Renderer/shims/ReactFabric").createPortal;
+        var _ReactFabricShimModule_default, ReactFabricShimModule = require("react-native/Libraries/Renderer/shims/ReactFabric"), _ReactFabricShimModule_default_createPortal;
+        return (_ReactFabricShimModule_default_createPortal = (_ReactFabricShimModule_default = ReactFabricShimModule.default) === null || _ReactFabricShimModule_default === void 0 ? void 0 : _ReactFabricShimModule_default.createPortal) !== null && _ReactFabricShimModule_default_createPortal !== void 0 ? _ReactFabricShimModule_default_createPortal : ReactFabricShimModule.createPortal;
       } catch (err) {
         return console.info("Note: error importing portal, defaulting to non-native portals", err), null;
       }
       try {
-        return require("react-native/Libraries/Renderer/shims/ReactNative").createPortal;
+        var _ReactNativeShimModule_default, ReactNativeShimModule = require("react-native/Libraries/Renderer/shims/ReactNative").createPortal, _ReactNativeShimModule_default_createPortal;
+        return (_ReactNativeShimModule_default_createPortal = (_ReactNativeShimModule_default = ReactNativeShimModule.default) === null || _ReactNativeShimModule_default === void 0 ? void 0 : _ReactNativeShimModule_default.createPortal) !== null && _ReactNativeShimModule_default_createPortal !== void 0 ? _ReactNativeShimModule_default_createPortal : ReactNativeShimModule.createPortal;
       } catch (err) {
         return console.info("Note: error importing portal, defaulting to non-native portals", err), null;
       }
@@ -17962,6 +17966,8 @@ 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,
             children: [
@@ -17994,6 +18000,8 @@ var require_nativeSheet_native = __commonJS({
         });
       });
     }
+    var emptyFn = function() {
+    };
   }
 });
 
@@ -18106,11 +18114,9 @@ var require_helpers_native2 = __commonJS({
     module2.exports = __toCommonJS2(helpers_exports);
     function resisted(y, minY) {
       var maxOverflow = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : 25;
-      if (y < minY) {
-        var past = minY - y, pctPast = Math.min(maxOverflow, past) / maxOverflow, diminishBy = 1.1 - Math.pow(0.15, pctPast), extra = -diminishBy * maxOverflow;
-        return minY + extra;
-      }
-      return y;
+      if (y >= minY) return y;
+      var pastBoundary = minY - y, resistedDistance = Math.sqrt(pastBoundary) * 2;
+      return minY - resistedDistance;
     }
   }
 });
@@ -18209,7 +18215,7 @@ var require_SheetImplementationCustom_native = __commonJS({
         };
       }, [
         zIndex
-      ]), isMounted = (0, import_core12.useDidFinishSSR)(), startPosition = isMounted && screenSize ? screenSize : hiddenSize, animatedNumber = useAnimatedNumber(startPosition), at = import_react3.default.useRef(startPosition), hasntMeasured = at.current === hiddenSize, [disableAnimation, setDisableAnimation] = (0, import_react3.useState)(hasntMeasured);
+      ]), isMounted = (0, import_core12.useDidFinishSSR)(), startPosition = isMounted && screenSize ? screenSize : hiddenSize, animatedNumber = useAnimatedNumber(startPosition), at = import_react3.default.useRef(startPosition), hasntMeasured = at.current === hiddenSize, [disableAnimation, setDisableAnimation] = (0, import_react3.useState)(hasntMeasured), hasScrollView = import_react3.default.useRef(!1);
       useAnimatedNumberReaction({
         value: animatedNumber,
         hostRef: sheetRef
@@ -18252,7 +18258,9 @@ var require_SheetImplementationCustom_native = __commonJS({
         open,
         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), 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), scrollEnabled = (0, import_react3.useRef)(!0), setScrollEnabled = import_react3.default.useCallback(function(val) {
+        scrollEnabled.current = val;
+      }, []), panResponder = import_react3.default.useMemo(function() {
         if (disableDrag || !frameSize || isShowingInnerSheet) return;
         var minY = positions[0];
         scrollBridge.paneMinY = minY;
@@ -18267,7 +18275,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);
+          setPosition(closestPoint), animateTo(closestPoint), setScrollEnabled(closestPoint === 0 && dragAt <= 0);
         }, finish = function(_e, state2) {
           release({
             vy: state2.vy,
@@ -18275,11 +18283,11 @@ var require_SheetImplementationCustom_native = __commonJS({
           });
         }, previouslyScrolling = !1, onMoveShouldSet = function(e, param) {
           var { dy } = param;
-          if (e.target === providerProps.handleRef.current) return !0;
+          if (e.target === providerProps.handleRef.current || !scrollEnabled.current || !hasScrollView.current) return !0;
           var isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
-          return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && !isScrolled && isDraggingUp && !import_constants4.isWeb ? !1 : Math.abs(dy) > 5;
+          return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && scrollEnabled.current && isDraggingUp ? !1 : Math.abs(dy) > 5;
         }, grant = function() {
-          setPanning(!0), stopSpring(), startY = at.current;
+          setScrollEnabled(!1), setPanning(!0), stopSpring(), startY = at.current;
         }, isExternalDrag = !1;
         return scrollBridge.drag = function(dy) {
           isExternalDrag || (isExternalDrag = !0, grant());
@@ -18360,10 +18368,14 @@ var require_SheetImplementationCustom_native = __commonJS({
       }, [
         open
       ]);
-      var forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}${import_constants4.isWeb ? "dvh" : "%"}` : maxSnapPoint, contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_contexts.ParentSheetContext.Provider, {
+      var forcedContentHeight = hasFit ? void 0 : snapPointsMode === "percent" ? `${maxSnapPoint}${import_constants4.isWeb ? "dvh" : "%"}` : maxSnapPoint, setHasScrollView = import_react3.default.useCallback(function(val) {
+        hasScrollView.current = val;
+      }, []), contents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_contexts.ParentSheetContext.Provider, {
         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, {
               custom: {
@@ -18620,14 +18632,20 @@ var require_SheetScrollView_native = __commonJS({
     });
     module2.exports = __toCommonJS2(SheetScrollView_exports);
     var import_jsx_runtime6 = require("react/jsx-runtime"), import_react3 = __toESM2(require("react")), import_compose_refs = require_index_native11(), import_scroll_view = require_index_native35(), import_SheetContext = require_SheetContext_native(), SHEET_SCROLL_VIEW_NAME = "SheetScrollView", SheetScrollView = /* @__PURE__ */ import_react3.default.forwardRef(function(param, ref) {
-      var { __scopeSheet, children, onScroll, ...props } = param, context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge } = context, scrollRef = import_react3.default.useRef(null), state = import_react3.default.useRef({
+      var { __scopeSheet, children, onScroll, scrollEnabled, ...props } = param, context = (0, import_SheetContext.useSheetContext)(SHEET_SCROLL_VIEW_NAME, __scopeSheet), { scrollBridge, scrollEnabled: scrollEnabled_, setHasScrollView } = context, scrollRef = import_react3.default.useRef(null), state = import_react3.default.useRef({
         lastPageY: 0,
         dragAt: 0,
         dys: [],
         // store a few recent dys to get velocity on release
         isScrolling: !1,
         isDragging: !1
-      }), release = function() {
+      });
+      (0, import_react3.useEffect)(function() {
+        return setHasScrollView(!0), function() {
+          setHasScrollView(!1);
+        };
+      }, []);
+      var release = function() {
         if (state.current.isDragging) {
           state.current.isDragging = !1, scrollBridge.scrollStartY = -1, state.current.isScrolling = !1;
           var vy = 0;
@@ -18642,14 +18660,17 @@ var require_SheetScrollView_native = __commonJS({
             vy
           });
         }
-      };
+      }, scrollable = scrollEnabled ?? scrollEnabled_;
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_scroll_view.ScrollView, {
         ref: (0, import_compose_refs.composeRefs)(scrollRef, ref),
         flex: 1,
         scrollEventThrottle: 8,
         onResponderRelease: release,
         className: "_ovs-contain",
-        // scrollEnabled={scrollEnabled}
+        scrollEnabled: scrollable,
+        // {...(Platform.OS === 'android' && {
+        //   pointerEvents: scrollable ? undefined : 'none',
+        // })}
         onScroll: function(e) {
           var { y } = e.nativeEvent.contentOffset;
           scrollBridge.y = y, y > 0 && (scrollBridge.scrollStartY = -1), onScroll == null || onScroll(e);
@@ -18661,11 +18682,11 @@ var require_SheetScrollView_native = __commonJS({
         // renderScrollComponent={Sheet.ScrollView}
         // ```
         onStartShouldSetResponder: function() {
-          return scrollBridge.scrollStartY = -1, state.current.isDragging = !0, !0;
+          return scrollBridge.scrollStartY = -1, state.current.isDragging = !0, scrollable;
         },
         // setting to false while onResponderMove is disabled
         onMoveShouldSetResponder: function() {
-          return !1;
+          return scrollable;
         },
         // somehow disabling works better, regression, no more nice drag continue scroll
         // onResponderMove={(e) => {
@@ -23087,9 +23108,7 @@ var require_Group_native = __commonJS({
             disable: disablePassBorderRadius
           }), _$props = {
             disabled,
-            ...(0, import_core12.isTamaguiElement)(child) ? radiusStyles : {
-              style: radiusStyles
-            }
+            ...radiusStyles
           };
           return cloneElementWithPropOrder(child, _$props);
         }), indexedChildren = (0, import_useIndexedChildren.useIndexedChildren)((0, import_core12.spacedChildren)({
@@ -23132,15 +23151,10 @@ var require_Group_native = __commonJS({
       });
     }
     var GroupItem = /* @__PURE__ */ import_react3.default.forwardRef(function(props, _ref) {
-      var _children_props, { __scopeGroup, children, forcePlacement } = props, groupItemProps = useGroupItem({
+      var { __scopeGroup, children, forcePlacement } = props, groupItemProps = useGroupItem({
         disabled: /* @__PURE__ */ import_react3.default.isValidElement(children) ? children.props.disabled : void 0
       }, forcePlacement, __scopeGroup);
-      return !/* @__PURE__ */ import_react3.default.isValidElement(children) || children.type === import_react3.default.Fragment ? children : (0, import_core12.isTamaguiElement)(children) ? /* @__PURE__ */ import_react3.default.cloneElement(children, groupItemProps) : /* @__PURE__ */ import_react3.default.cloneElement(children, {
-        style: {
-          ...(_children_props = children.props) === null || _children_props === void 0 ? void 0 : _children_props.style,
-          ...groupItemProps
-        }
-      });
+      return !/* @__PURE__ */ import_react3.default.isValidElement(children) || children.type === import_react3.default.Fragment ? children : /* @__PURE__ */ import_react3.default.cloneElement(children, groupItemProps);
     }), useGroupItem = function(childrenProps, forcePlacement, __scopeGroup) {
       var treeIndex = (0, import_useIndexedChildren.useIndex)(), context = useGroupContext("GroupItem", __scopeGroup);
       if (import_react3.default.useEffect(function() {
@@ -23186,11 +23200,13 @@ var require_Group_native = __commonJS({
         borderBottomRightRadius: isLast && disable !== "bottom" && disable !== "end" ? radius : 0
       };
     }, cloneElementWithPropOrder = function(child, props) {
-      var next = (0, import_core12.mergeProps)(child.props, props, (0, import_core12.getConfig)().shorthands);
       return /* @__PURE__ */ import_react3.default.cloneElement({
         ...child,
         props: null
-      }, next);
+      }, {
+        ...child.props,
+        ...props
+      });
     };
   }
 });