tamagui 1.75.7 → 1.75.8

package/dist/native.js

@@ -1719,14 +1719,14 @@ var require_createMediaStyle_native = __commonJS({
             mediaKeys.map((k, index) => [k, new Array(index + 1).fill(":root").join("")])
           ));
         }
-        let mediaKey = groupMediaKey || mediaKeyIn, mediaSelector = selectors[mediaKey], mediaQuery = `${negate ? "not all and" : ""} ${mediaSelector}`, precedenceImportancePrefix = groupMediaKey ? "" : enableMediaPropOrder ? (
+        let mediaKey = groupMediaKey || mediaKeyIn, mediaSelector = selectors[mediaKey], mediaQuery = `${negate ? "not all and " : ""}${mediaSelector}`, precedenceImportancePrefix = groupMediaKey ? "" : enableMediaPropOrder ? (
           // this new array should be cached
           new Array(priority).fill(":root").join("")
         ) : (
           // @ts-ignore
           prefixes[mediaKey]
         ), prefix = groupMediaKey ? `@container ${containerName}` : "@media";
-        groupMediaKey && (styleInner = styleRule), styleInner.includes(prefix) ? styleRule = styleInner.replace("{", ` and ${mediaQuery} {`) : styleRule = `${prefix} ${mediaQuery}{${precedenceImportancePrefix}${styleInner}}`;
+        groupMediaKey && (styleInner = styleRule), styleInner.includes(prefix) ? styleRule = styleInner.replace("{", ` and ${mediaQuery} {`) : styleRule = `${prefix} ${mediaQuery}{${precedenceImportancePrefix}${styleInner}}`, groupMediaKey && (styleRule = `@supports (contain: inline-size) {${styleRule}}`);
       }
       return {
         property,
@@ -3246,12 +3246,13 @@ current`, {
       return styleProps.noNormalize || (0, import_expandStyles.fixStyles)(styleOut), styleOut;
     };
     function mergeStylePropIntoStyle(styleState, cur) {
-      if (cur)
-        if (cur.$$css)
-          Object.assign(styleState.classNames, cur);
-        else
-          for (let key in cur)
-            key in styleState.usedKeys || mergeStyle(styleState, key, cur[key]);
+      if (!cur)
+        return;
+      let styles = Array.isArray(cur) ? cur : [cur];
+      for (let style of styles) {
+        let isRNW = style.$$css;
+        Object.assign(isRNW ? styleState.classNames : styleState.style, style);
+      }
     }
     var useInsertEffectCompat = import_constants.isWeb ? import_react2.useInsertionEffect || import_constants.useIsomorphicLayoutEffect : () => {
     }, useSplitStyles = (...args) => {
@@ -7794,13 +7795,14 @@ var require_index_native15 = __commonJS({
     }, __reExport2 = (target, mod, secondTarget) => (__copyProps2(target, mod, "default"), secondTarget && __copyProps2(secondTarget, mod, "default")), __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), src_exports2 = {};
     __export2(src_exports2, {
       Stack: () => Stack3,
-      Text: () => Text3
+      Text: () => Text3,
+      View: () => View2
     });
     module2.exports = __toCommonJS2(src_exports2);
     var import_react_native_use_responder_events = require_index_native14(), import_web = require_index_native9(), import_react2 = require("react"), import_createOptimizedView = require_createOptimizedView_native(), import_getBaseViews = require_getBaseViews_native(), import_useElementLayout = require_useElementLayout_native(), import_usePlatformMethods = require_usePlatformMethods_native(), import_Pressability = require_Pressability_native();
     __reExport2(src_exports2, require_index_native9(), module2.exports);
     __reExport2(src_exports2, require_reactNativeTypes_native(), module2.exports);
-    var Stack3 = import_web.Stack, Text3 = import_web.Text, baseViews = (0, import_getBaseViews.getBaseViews)();
+    var View2 = import_web.View, Stack3 = import_web.Stack, Text3 = import_web.Text, baseViews = (0, import_getBaseViews.getBaseViews)();
     (0, import_web.setupHooks)({
       getBaseViews: import_getBaseViews.getBaseViews,
       usePropsTransform(elementType, propsIn, hostRef) {
@@ -10091,7 +10093,7 @@ var require_SheetImplementationCustom_native = __commonJS({
           },
           (0, import_react2.useCallback)(
             (value) => {
-              animationDriver.isReactNative && (at.current = value, scrollBridge.paneY = value);
+              at.current = value, scrollBridge.paneY = value;
             },
             [animationDriver]
           )
@@ -10126,18 +10128,18 @@ var require_SheetImplementationCustom_native = __commonJS({
         }, [hasntMeasured, screenSize]), (0, import_core13.useIsomorphicLayoutEffect)(() => {
           !frameSize || !screenSize || isHidden || hasntMeasured && !open || animateTo(position);
         }, [isHidden, frameSize, screenSize, open, position]);
-        let disableDrag = props.disableDrag ?? (controller == null ? void 0 : controller.disableDrag), themeName = (0, import_core13.useThemeName)(), panResponder = (0, import_react2.useMemo)(
+        let disableDrag = props.disableDrag ?? (controller == null ? void 0 : controller.disableDrag), themeName = (0, import_core13.useThemeName)(), [isDragging, setIsDragging] = (0, import_react2.useState)(!1), panResponder = (0, import_react2.useMemo)(
           () => {
             if (disableDrag || !frameSize || isShowingInnerSheet)
               return;
             let minY = positions[0];
             scrollBridge.paneMinY = minY;
             let startY = at.current;
-            function makeUnselectable(val) {
-              import_constants.SHEET_HIDDEN_STYLESHEET && (val ? import_constants.SHEET_HIDDEN_STYLESHEET.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : import_constants.SHEET_HIDDEN_STYLESHEET.innerText = "");
+            function setPanning(val) {
+              setIsDragging(val), import_constants.SHEET_HIDDEN_STYLESHEET && (val ? import_constants.SHEET_HIDDEN_STYLESHEET.innerText = ":root * { user-select: none !important; -webkit-user-select: none !important; }" : import_constants.SHEET_HIDDEN_STYLESHEET.innerText = "");
             }
             let release = ({ vy, dragAt }) => {
-              isExternalDrag = !1, previouslyScrolling = !1, makeUnselectable(!1);
+              isExternalDrag = !1, previouslyScrolling = !1, setPanning(!1);
               let end = dragAt + startY + frameSize * vy * 0.2, closestPoint = 0, dist = 1 / 0;
               for (let i = 0; i < positions.length; i++) {
                 let position2 = positions[i], curDist = end > position2 ? end - position2 : position2 - end;
@@ -10153,7 +10155,7 @@ var require_SheetImplementationCustom_native = __commonJS({
               let isScrolled = scrollBridge.y !== 0, isDraggingUp = dy < 0, isNearTop = scrollBridge.paneY - 5 <= scrollBridge.paneMinY;
               return isScrolled ? (previouslyScrolling = !0, !1) : isNearTop && !isScrolled && isDraggingUp ? !1 : Math.abs(dy) > 5;
             }, grant = () => {
-              makeUnselectable(!0), stopSpring(), startY = at.current;
+              setPanning(!0), stopSpring(), startY = at.current;
             }, isExternalDrag = !1;
             return scrollBridge.drag = (dy) => {
               isExternalDrag || (isExternalDrag = !0, grant());
@@ -10176,14 +10178,20 @@ var require_SheetImplementationCustom_native = __commonJS({
         ), handleAnimationViewLayout = (0, import_react2.useCallback)(
           (e) => {
             var _a;
-            let next = (_a = e.nativeEvent) == null ? void 0 : _a.layout.height;
+            let next = Math.min(
+              (_a = e.nativeEvent) == null ? void 0 : _a.layout.height,
+              import_react_native4.Dimensions.get("window").height
+            );
             next && setFrameSize(next);
           },
           [keyboardIsVisible]
         ), handleMaxContentViewLayout = (0, import_react2.useCallback)(
           (e) => {
             var _a;
-            let next = (_a = e.nativeEvent) == null ? void 0 : _a.layout.height;
+            let next = Math.min(
+              (_a = e.nativeEvent) == null ? void 0 : _a.layout.height,
+              import_react_native4.Dimensions.get("window").height
+            );
             next && setMaxContentSize(next);
           },
           [keyboardIsVisible]
@@ -10243,6 +10251,10 @@ var require_SheetImplementationCustom_native = __commonJS({
               ...panResponder == null ? void 0 : panResponder.panHandlers,
               onLayout: handleAnimationViewLayout,
               pointerEvents: open && !shouldHideParentSheet ? "auto" : "none",
+              ...!isDragging && {
+                // @ts-ignore for CSS driver this is necessary to attach the transition
+                animation
+              },
               style: [
                 {
                   position: "absolute",