tamagui 1.88.18 → 1.88.20

package/dist/native.js

@@ -2473,6 +2473,55 @@ var require_defaultComponentState_native = __commonJS({
   }
 });
 
+// ../web/dist/cjs/helpers/skipProps.native.js
+var require_skipProps_native = __commonJS({
+  "../web/dist/cjs/helpers/skipProps.native.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: !0 });
+    }, __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from == "object" || typeof from == "function")
+        for (let key of __getOwnPropNames2(from))
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      return to;
+    }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), skipProps_exports = {};
+    __export2(skipProps_exports, {
+      skipProps: () => skipProps
+    });
+    module2.exports = __toCommonJS2(skipProps_exports);
+    var skipProps = {
+      untilMeasured: 1,
+      animation: 1,
+      space: 1,
+      animateOnly: 1,
+      disableClassName: 1,
+      debug: 1,
+      componentName: 1,
+      disableOptimization: 1,
+      tag: 1,
+      style: 1,
+      // handled after loop so pseudos set usedKeys and override it if necessary
+      group: 1
+    };
+    process.env.NODE_ENV === "test" && (skipProps["data-test-renders"] = 1);
+    Object.assign(skipProps, {
+      whiteSpace: 1,
+      wordWrap: 1,
+      textOverflow: 1,
+      textDecorationDistance: 1,
+      cursor: 1,
+      contain: 1,
+      boxSizing: 1,
+      boxShadow: 1,
+      outlineStyle: 1,
+      outlineOffset: 1,
+      outlineWidth: 1,
+      outlineColor: 1
+    });
+  }
+});
+
 // ../web/dist/cjs/constants/accessibilityDirectMap.native.js
 var require_accessibilityDirectMap_native = __commonJS({
   "../web/dist/cjs/constants/accessibilityDirectMap.native.js"(exports2, module2) {
@@ -3577,7 +3626,7 @@ var require_propMapper_native = __commonJS({
       propMapper: () => propMapper
     });
     module2.exports = __toCommonJS2(propMapper_exports);
-    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_normalizeStyle = require_normalizeStyle_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), propMapper = (key, value, styleStateIn, subPropsIn) => {
+    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_normalizeStyle = require_normalizeStyle_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_skipProps = require_skipProps_native(), propMapper = (key, value, styleStateIn, subPropsIn) => {
       var _a;
       if (lastFontFamilyToken = null, !import_constants4.isAndroid && key === "elevationAndroid")
         return;
@@ -3671,43 +3720,45 @@ var require_propMapper_native = __commonJS({
       process.env.NODE_ENV === "development" && debug === "verbose" && console.info("   - resolveTokensAndVariants", key, value);
       for (let _key in value) {
         let subKey = conf.shorthands[_key] || _key, val = value[_key];
-        if (styleProps.noExpand)
-          res[subKey] = val;
-        else if (variants && subKey in variants) {
-          if (styleState.curProps[subKey] = val, parentVariantKey && parentVariantKey === key)
-            res[subKey] = // SYNC WITH *1
-            val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
-          else {
-            let variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
-            if (variantOut)
-              for (let [key2, val2] of variantOut)
-                val2 != null && (key2 in import_pseudoDescriptors.pseudoDescriptors ? (res[key2] ?? (res[key2] = {}), Object.assign(res[key2], val2)) : res[key2] = val2);
+        if (!(!styleProps.noSkip && subKey in import_skipProps.skipProps)) {
+          if (styleProps.noExpand)
+            res[subKey] = val;
+          else if (variants && subKey in variants) {
+            if (styleState.curProps[subKey] = val, parentVariantKey && parentVariantKey === key)
+              res[subKey] = // SYNC WITH *1
+              val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
+            else {
+              let variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
+              if (variantOut)
+                for (let [key2, val2] of variantOut)
+                  val2 != null && (key2 in import_pseudoDescriptors.pseudoDescriptors ? (res[key2] ?? (res[key2] = {}), Object.assign(res[key2], val2)) : res[key2] = val2);
+            }
+            continue;
           }
-          continue;
-        }
-        if ((0, import_createVariable.isVariable)(val)) {
-          res[subKey] = resolveVariableValue(subKey, val, styleProps.resolveValues), process.env.NODE_ENV === "development" && debug === "verbose" && console.info("variable", subKey, res[subKey]);
-          continue;
-        }
-        if (typeof val == "string") {
-          let fVal = (
-            // SYNC WITH *1
-            val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val
+          if ((0, import_createVariable.isVariable)(val)) {
+            res[subKey] = resolveVariableValue(subKey, val, styleProps.resolveValues), process.env.NODE_ENV === "development" && debug === "verbose" && console.info("variable", subKey, res[subKey]);
+            continue;
+          }
+          if (typeof val == "string") {
+            let fVal = (
+              // SYNC WITH *1
+              val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val
+            );
+            res[subKey] = fVal;
+            continue;
+          }
+          if ((0, import_isObj.isObj)(val)) {
+            let subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
+            process.env.NODE_ENV === "development" && debug === "verbose" && console.info("object", subKey, subObject), res[subKey] ?? (res[subKey] = {}), Object.assign(res[subKey], subObject);
+          } else
+            res[subKey] = val;
+          process.env.NODE_ENV === "development" && debug && ((_a = res[subKey]) == null ? void 0 : _a[0]) === "$" && console.warn(
+            `\u26A0\uFE0F Missing token in theme ${theme.name}:`,
+            subKey,
+            res[subKey],
+            theme
           );
-          res[subKey] = fVal;
-          continue;
         }
-        if ((0, import_isObj.isObj)(val)) {
-          let subObject = resolveTokensAndVariants(subKey, val, styleProps, styleState, key);
-          process.env.NODE_ENV === "development" && debug === "verbose" && console.info("object", subKey, subObject), res[subKey] ?? (res[subKey] = {}), Object.assign(res[subKey], subObject);
-        } else
-          res[subKey] = val;
-        process.env.NODE_ENV === "development" && debug && ((_a = res[subKey]) == null ? void 0 : _a[0]) === "$" && console.warn(
-          `\u26A0\uFE0F Missing token in theme ${theme.name}:`,
-          subKey,
-          res[subKey],
-          theme
-        );
       }
       return res;
     }, tokenCats = ["size", "color", "radius", "space", "zIndex"].map((name) => ({
@@ -3817,7 +3868,7 @@ var require_getSplitStyles_native = __commonJS({
       useSplitStyles: () => useSplitStyles
     });
     module2.exports = __toCommonJS2(getSplitStyles_exports);
-    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_react2 = require("react"), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants22 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_useMedia = require_useMedia_native(), import_createMediaStyle = require_createMediaStyle_native(), import_expandStyles = require_expandStyles_native(), import_getGroupPropParts = require_getGroupPropParts_native(), import_getStylesAtomic = require_getStylesAtomic_native(), import_insertStyleRule = require_insertStyleRule_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_isObj = require_isObj_native(), IS_STATIC = process.env.IS_STATIC === "is_static", conf, PROP_SPLIT = "-";
+    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_react2 = require("react"), import_config = require_config_native(), import_skipProps = require_skipProps_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants22 = require_constants_native2(), import_isDevTools = require_isDevTools_native(), import_useMedia = require_useMedia_native(), import_createMediaStyle = require_createMediaStyle_native(), import_expandStyles = require_expandStyles_native(), import_getGroupPropParts = require_getGroupPropParts_native(), import_getStylesAtomic = require_getStylesAtomic_native(), import_insertStyleRule = require_insertStyleRule_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_isObj = require_isObj_native(), IS_STATIC = process.env.IS_STATIC === "is_static", conf, PROP_SPLIT = "-";
     function isValidStyleKey(key, staticConfig) {
       var _a;
       return (staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles))[key] || ((_a = staticConfig.acceptTokens) == null ? void 0 : _a[key]);
@@ -3861,7 +3912,7 @@ var require_getSplitStyles_native = __commonJS({
       }), console.groupEnd());
       for (let keyOg in props) {
         let keyInit = keyOg, valInit = props[keyOg];
-        if (styleProps.disableExpandShorthands || keyInit in shorthands && (keyInit = shorthands[keyInit]), keyInit === "className" || keyInit in usedKeys || keyInit in skipProps && !styleProps.noSkip && !isHOC)
+        if (styleProps.disableExpandShorthands || keyInit in shorthands && (keyInit = shorthands[keyInit]), keyInit === "className" || keyInit in usedKeys || keyInit in import_skipProps.skipProps && !styleProps.noSkip && !isHOC)
           continue;
         let valInitType = typeof valInit, isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
         if (valInit !== props[keyInit] && (styleState.curProps[keyInit] = valInit), !isValidStyleKeyInit) {
@@ -3919,7 +3970,7 @@ var require_getSplitStyles_native = __commonJS({
         if (isStyleProp && (props.asChild === "except-style" || props.asChild === "except-style-web"))
           continue;
         let shouldPassProp = !isStyleProp || // is in parent variants
-        isHOC && (parentStaticConfig == null ? void 0 : parentStaticConfig.variants) && keyInit in parentStaticConfig.variants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), parentVariant = (_a = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _a[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo || parentVariant || keyInit in skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
+        isHOC && (parentStaticConfig == null ? void 0 : parentStaticConfig.variants) && keyInit in parentStaticConfig.variants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), parentVariant = (_a = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _a[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo || parentVariant || keyInit in import_skipProps.skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
         if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(
           `  \u{1F511} ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ""} ${shouldPassThrough ? "(pass)" : ""}`
         ), (0, import_log.log)({ isVariant, valInit, shouldPassProp }), import_constants4.isClient && (0, import_log.log)({
@@ -3929,14 +3980,20 @@ var require_getSplitStyles_native = __commonJS({
           isHOCShouldPassThrough,
           curProps: { ...styleState.curProps },
           parentStaticConfig
-        })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo), !isVariant) || !styleProps.noSkip && keyInit in skipProps)
+        })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo), !isVariant) || !styleProps.noSkip && keyInit in import_skipProps.skipProps)
           continue;
         if ((isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit), isValidStyleKeyInit && !variants && valInit !== "unset" && (valInitType === "number" || valInitType === "string" && valInit[0] !== "$")) {
           style[keyInit] = valInit;
           continue;
         }
-        let expanded = isMediaOrPseudo || !isVariant && !isValidStyleKeyInit ? [[keyInit, valInit]] : (0, import_propMapper.propMapper)(keyInit, valInit, styleState), next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
-        if (next && (styleState.fontFamily = next), process.env.NODE_ENV === "development" && debug === "verbose") {
+        let avoidPropMap = isMediaOrPseudo || !isVariant && !isValidStyleKeyInit, expanded = avoidPropMap ? null : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
+        if (!avoidPropMap) {
+          if (!expanded)
+            continue;
+          let next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
+          next && (styleState.fontFamily = next);
+        }
+        if (process.env.NODE_ENV === "development" && debug === "verbose") {
           console.groupCollapsed("  \u{1F4A0} expanded", keyInit, valInit);
           try {
             !import_constants4.isServer && import_isDevTools.isDevTools && ((0, import_log.log)({
@@ -3959,192 +4016,195 @@ current`, {
           }
           console.groupEnd();
         }
-        if (expanded) {
-          for (let [key, val] of expanded)
-            if (!(val == null || key in usedKeys)) {
-              if (isPseudo = key in import_helpers.validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && (0, import_useMedia.isMediaKey)(key), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key in variants, (inlineProps != null && inlineProps.has(key) || IS_STATIC && inlineWhenUnflattened != null && inlineWhenUnflattened.has(key)) && (viewProps[key] = props[key] ?? val), styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || ((_b = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _b[keyInit]))) {
-                passDownProp(viewProps, key, val, isMediaOrPseudo), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(` - passing down prop ${key}`), (0, import_log.log)({ val, after: { ...viewProps[key] } }), console.groupEnd());
+        let key = keyInit, val = valInit, max2 = expanded ? expanded.length : 1;
+        for (let i = 0; i < max2; i++) {
+          if (expanded) {
+            let [k, v] = expanded[i];
+            key = k, val = v;
+          }
+          if (!(val == null || key in usedKeys)) {
+            if (isPseudo = key in import_helpers.validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && (0, import_useMedia.isMediaKey)(key), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key in variants, (inlineProps != null && inlineProps.has(key) || IS_STATIC && inlineWhenUnflattened != null && inlineWhenUnflattened.has(key)) && (viewProps[key] = props[key] ?? val), styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || ((_b = parentStaticConfig == null ? void 0 : parentStaticConfig.variants) == null ? void 0 : _b[keyInit]))) {
+              passDownProp(viewProps, key, val, isMediaOrPseudo), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(` - passing down prop ${key}`), (0, import_log.log)({ val, after: { ...viewProps[key] } }), console.groupEnd());
+              continue;
+            }
+            if (isPseudo) {
+              if (!val)
+                continue;
+              let pseudoStyleObject = getSubStyle(
+                styleState,
+                key,
+                val,
+                styleProps.noClassNames
+              ), descriptor = import_pseudoDescriptors.pseudoDescriptors[key], isEnter = key === "enterStyle", isExit = key === "exitStyle";
+              if (!descriptor)
+                continue;
+              if ((!shouldDoClasses || IS_STATIC) && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), IS_STATIC)) {
+                Object.assign(pseudos[key], pseudoStyleObject);
                 continue;
               }
-              if (isPseudo) {
-                if (!val)
-                  continue;
-                let pseudoStyleObject = getSubStyle(
-                  styleState,
-                  key,
-                  val,
-                  styleProps.noClassNames
-                ), descriptor = import_pseudoDescriptors.pseudoDescriptors[key], isEnter = key === "enterStyle", isExit = key === "exitStyle";
-                if (!descriptor)
-                  continue;
-                if ((!shouldDoClasses || IS_STATIC) && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), IS_STATIC)) {
-                  Object.assign(pseudos[key], pseudoStyleObject);
-                  continue;
-                }
-                if (shouldDoClasses && !isExit) {
-                  let pseudoStyles = (0, import_getStylesAtomic.generateAtomicStyles)(pseudoStyleObject, descriptor);
-                  process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("pseudo (classes)", key), (0, import_log.log)({ pseudoStyleObject, pseudoStyles }), console.groupEnd());
-                  for (let psuedoStyle of pseudoStyles)
-                    `${psuedoStyle.property}${PROP_SPLIT}${descriptor.name}` in usedKeys || psuedoStyle.identifier;
-                }
-                if (!shouldDoClasses || isExit || isEnter) {
-                  let descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = componentState[descriptorKey] === !1;
-                  isExit && (isDisabled = !styleProps.isExiting), isEnter && (isDisabled = componentState.unmounted === "should-enter" ? !0 : !componentState.unmounted), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("pseudo", key, { isDisabled }), (0, import_log.log)({ pseudoStyleObject, isDisabled, descriptor, componentState }), console.groupEnd());
-                  let importance = descriptor.priority;
-                  for (let pkey in pseudoStyleObject) {
-                    let val2 = pseudoStyleObject[pkey];
-                    if (isDisabled) {
-                      let defaultValues = animatableDefaults[pkey];
-                      defaultValues != null && !(pkey in usedKeys) && !(pkey in styleState.style) && mergeStyle(styleState, pkey, defaultValues);
-                    } else {
-                      let curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
-                      shouldMerge && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
-                        importance,
-                        curImportance,
-                        pkey,
-                        val: val2,
-                        transforms: { ...styleState.transforms }
-                      });
-                    }
+              if (shouldDoClasses && !isExit) {
+                let pseudoStyles = (0, import_getStylesAtomic.generateAtomicStyles)(pseudoStyleObject, descriptor);
+                process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("pseudo (classes)", key), (0, import_log.log)({ pseudoStyleObject, pseudoStyles }), console.groupEnd());
+                for (let psuedoStyle of pseudoStyles)
+                  `${psuedoStyle.property}${PROP_SPLIT}${descriptor.name}` in usedKeys || psuedoStyle.identifier;
+              }
+              if (!shouldDoClasses || isExit || isEnter) {
+                let descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = componentState[descriptorKey] === !1;
+                isExit && (isDisabled = !styleProps.isExiting), isEnter && (isDisabled = componentState.unmounted === "should-enter" ? !0 : !componentState.unmounted), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed("pseudo", key, { isDisabled }), (0, import_log.log)({ pseudoStyleObject, isDisabled, descriptor, componentState }), console.groupEnd());
+                let importance = descriptor.priority;
+                for (let pkey in pseudoStyleObject) {
+                  let val2 = pseudoStyleObject[pkey];
+                  if (isDisabled) {
+                    let defaultValues = animatableDefaults[pkey];
+                    defaultValues != null && !(pkey in usedKeys) && !(pkey in styleState.style) && mergeStyle(styleState, pkey, defaultValues);
+                  } else {
+                    let curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
+                    shouldMerge && (pseudos || (pseudos = {}), pseudos[key] || (pseudos[key] = {}), pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
+                      importance,
+                      curImportance,
+                      pkey,
+                      val: val2,
+                      transforms: { ...styleState.transforms }
+                    });
                   }
-                  if (!isDisabled)
-                    for (let key2 in val) {
-                      let k = shorthands[key2] || key2;
-                      usedKeys[k] = Math.max(importance, usedKeys[k] || 0);
-                    }
                 }
+                if (!isDisabled)
+                  for (let key2 in val) {
+                    let k = shorthands[key2] || key2;
+                    usedKeys[k] = Math.max(importance, usedKeys[k] || 0);
+                  }
+              }
+              continue;
+            }
+            if (isMedia) {
+              if (!val)
                 continue;
+              if (isMedia === "platform") {
+                let platform = key.slice(10);
+                if (
+                  // supports web, ios, android
+                  platform !== import_constants4.currentPlatform && // supports web, native
+                  platform !== "native"
+                )
+                  continue;
               }
-              if (isMedia) {
-                if (!val)
+              hasMedia || (hasMedia = !0);
+              let mediaStyle = getSubStyle(
+                styleState,
+                key,
+                val,
+                // TODO try true like pseudo
+                !1
+              ), mediaKeyShort = key.slice(1);
+              process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`  \u{1F4FA} ${key}`, {
+                key,
+                val,
+                mediaStyle,
+                props,
+                shouldDoClasses,
+                componentState
+              });
+              let hasSpace = val.space;
+              if ((hasSpace || !shouldDoClasses) && (Array.isArray(hasMedia) || (hasMedia = []), hasMedia.push(mediaKeyShort)), shouldDoClasses) {
+                if (hasSpace && (delete mediaStyle.space, mediaState3[mediaKeyShort])) {
+                  let importance = (0, import_useMedia.getMediaImportanceIfMoreImportant)(
+                    mediaKeyShort,
+                    "space",
+                    usedKeys,
+                    !0
+                  );
+                  importance && (space = val.space, usedKeys.space = importance, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(
+                    `Found more important space for current media ${mediaKeyShort}: ${val} (importance: ${importance})`
+                  ));
+                }
+                let mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle, debug), priority = mediaStylesSeen;
+                mediaStylesSeen += 1;
+                for (let style2 of mediaStyles) {
+                  let out = (0, import_createMediaStyle.createMediaStyle)(
+                    style2,
+                    mediaKeyShort,
+                    import_useMedia.mediaQueryConfig,
+                    isMedia,
+                    !1,
+                    priority
+                  );
+                  process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out), `${style2.property}${PROP_SPLIT}${mediaKeyShort}` in usedKeys || out.identifier;
+                }
+              } else {
+                let isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group";
+                if (!isThemeMedia && isMedia !== "platform" && !isGroupMedia && !mediaState3[mediaKeyShort])
                   continue;
-                if (isMedia === "platform") {
-                  let platform = key.slice(10);
-                  if (
-                    // supports web, ios, android
-                    platform !== import_constants4.currentPlatform && // supports web, native
-                    platform !== "native"
-                  )
+                let importanceBump = 0;
+                if (isThemeMedia) {
+                  dynamicThemeAccess = !0;
+                  let mediaThemeName = mediaKeyShort.slice(6);
+                  if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName)))
                     continue;
-                }
-                hasMedia || (hasMedia = !0);
-                let mediaStyle = getSubStyle(
-                  styleState,
-                  key,
-                  val,
-                  // TODO try true like pseudo
-                  !1
-                ), mediaKeyShort = key.slice(1);
-                process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`  \u{1F4FA} ${key}`, {
-                  key,
-                  val,
-                  mediaStyle,
-                  props,
-                  shouldDoClasses,
-                  componentState
-                });
-                let hasSpace = val.space;
-                if ((hasSpace || !shouldDoClasses) && (Array.isArray(hasMedia) || (hasMedia = []), hasMedia.push(mediaKeyShort)), shouldDoClasses) {
-                  if (hasSpace && (delete mediaStyle.space, mediaState3[mediaKeyShort])) {
-                    let importance = (0, import_useMedia.getMediaImportanceIfMoreImportant)(
-                      mediaKeyShort,
-                      "space",
-                      usedKeys,
-                      !0
-                    );
-                    importance && (space = val.space, usedKeys.space = importance, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(
-                      `Found more important space for current media ${mediaKeyShort}: ${val} (importance: ${importance})`
-                    ));
-                  }
-                  let mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle, debug), priority = mediaStylesSeen;
-                  mediaStylesSeen += 1;
-                  for (let style2 of mediaStyles) {
-                    let out = (0, import_createMediaStyle.createMediaStyle)(
-                      style2,
-                      mediaKeyShort,
-                      import_useMedia.mediaQueryConfig,
-                      isMedia,
-                      !1,
-                      priority
-                    );
-                    process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out), `${style2.property}${PROP_SPLIT}${mediaKeyShort}` in usedKeys || out.identifier;
-                  }
-                } else {
-                  let isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group";
-                  if (!isThemeMedia && isMedia !== "platform" && !isGroupMedia && !mediaState3[mediaKeyShort])
+                } else if (isGroupMedia) {
+                  let groupInfo = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyShort), groupName = groupInfo.name, groupContext = context == null ? void 0 : context.groups.state[groupName];
+                  if (!groupContext) {
+                    process.env.NODE_ENV === "development" && debug && console.warn(`No parent with group prop, skipping styles: ${groupName}`);
                     continue;
-                  let importanceBump = 0;
-                  if (isThemeMedia) {
-                    dynamicThemeAccess = !0;
-                    let mediaThemeName = mediaKeyShort.slice(6);
-                    if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName)))
-                      continue;
-                  } else if (isGroupMedia) {
-                    let groupInfo = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyShort), groupName = groupInfo.name, groupContext = context == null ? void 0 : context.groups.state[groupName];
-                    if (!groupContext) {
-                      process.env.NODE_ENV === "development" && debug && console.warn(`No parent with group prop, skipping styles: ${groupName}`);
+                  }
+                  let groupPseudoKey = groupInfo.pseudo, groupMediaKey = groupInfo.media, componentGroupState = (_c = componentState.group) == null ? void 0 : _c[groupName];
+                  if (groupMediaKey) {
+                    mediaGroups || (mediaGroups = /* @__PURE__ */ new Set()), mediaGroups.add(groupMediaKey);
+                    let mediaState22 = componentGroupState == null ? void 0 : componentGroupState.media, isActive = mediaState22 == null ? void 0 : mediaState22[groupMediaKey];
+                    if (!mediaState22 && groupContext.layout && (isActive = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), !isActive)
                       continue;
-                    }
-                    let groupPseudoKey = groupInfo.pseudo, groupMediaKey = groupInfo.media, componentGroupState = (_c = componentState.group) == null ? void 0 : _c[groupName];
-                    if (groupMediaKey) {
-                      mediaGroups || (mediaGroups = /* @__PURE__ */ new Set()), mediaGroups.add(groupMediaKey);
-                      let mediaState22 = componentGroupState == null ? void 0 : componentGroupState.media, isActive = mediaState22 == null ? void 0 : mediaState22[groupMediaKey];
-                      if (!mediaState22 && groupContext.layout && (isActive = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), !isActive)
-                        continue;
-                      importanceBump = 2;
-                    }
-                    if (groupPseudoKey) {
-                      pseudoGroups || (pseudoGroups = /* @__PURE__ */ new Set()), pseudoGroups.add(groupName);
-                      let componentGroupPseudoState = (componentGroupState || // fallback to context initially
-                      context.groups.state[groupName]).pseudo;
-                      if (!(componentGroupPseudoState != null && componentGroupPseudoState[groupPseudoKey]))
-                        continue;
-                      importanceBump = import_pseudoDescriptors.pseudoPriorities[groupPseudoKey];
-                    }
+                    importanceBump = 2;
                   }
-                  for (let subKey in mediaStyle) {
-                    if (subKey === "space") {
-                      space = valInit.space;
+                  if (groupPseudoKey) {
+                    pseudoGroups || (pseudoGroups = /* @__PURE__ */ new Set()), pseudoGroups.add(groupName);
+                    let componentGroupPseudoState = (componentGroupState || // fallback to context initially
+                    context.groups.state[groupName]).pseudo;
+                    if (!(componentGroupPseudoState != null && componentGroupPseudoState[groupPseudoKey]))
                       continue;
-                    }
-                    (0, import_useMedia.mergeMediaByImportance)(
-                      style,
-                      mediaKeyShort,
-                      subKey,
-                      mediaStyle[subKey],
-                      usedKeys,
-                      mediaState3[mediaKeyShort],
-                      importanceBump
-                    ), key === "fontFamily" && (styleState.fontFamily = mediaStyle.fontFamily);
+                    importanceBump = import_pseudoDescriptors.pseudoPriorities[groupPseudoKey];
                   }
                 }
-                continue;
-              }
-              if (key === "pointerEvents") {
-                viewProps[key] = val;
-                continue;
-              }
-              if (
-                // is HOC we can just pass through the styles as props
-                // this fixes issues where style prop got merged with wrong priority
-                !isHOC && (isValidStyleKey(key, staticConfig) || import_constants4.isAndroid && key === "elevation")
-              ) {
-                mergeStyle(styleState, key, val);
-                continue;
+                for (let subKey in mediaStyle) {
+                  if (subKey === "space") {
+                    space = valInit.space;
+                    continue;
+                  }
+                  (0, import_useMedia.mergeMediaByImportance)(
+                    style,
+                    mediaKeyShort,
+                    subKey,
+                    mediaStyle[subKey],
+                    usedKeys,
+                    mediaState3[mediaKeyShort],
+                    importanceBump
+                  ), key === "fontFamily" && (styleState.fontFamily = mediaStyle.fontFamily);
+                }
               }
-              isVariant || (viewProps[key] = val);
+              continue;
             }
-          if (process.env.NODE_ENV === "development" && debug === "verbose") {
-            console.groupCollapsed(" \u2714\uFE0F expand complete", keyInit);
-            try {
-              (0, import_log.log)("style", { ...style }), (0, import_log.log)("transforms", { ...transforms }), (0, import_log.log)("viewProps", { ...viewProps });
-            } catch {
+            if (key === "pointerEvents") {
+              viewProps[key] = val;
+              continue;
             }
-            console.groupEnd();
+            if (
+              // is HOC we can just pass through the styles as props
+              // this fixes issues where style prop got merged with wrong priority
+              !isHOC && (isValidStyleKey(key, staticConfig) || import_constants4.isAndroid && key === "elevation")
+            ) {
+              mergeStyle(styleState, key, val);
+              continue;
+            }
+            isVariant || (viewProps[key] = val);
+          }
+        }
+        if (process.env.NODE_ENV === "development" && debug === "verbose") {
+          try {
+            (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", { ...style }), (0, import_log.log)("transforms", { ...transforms }), (0, import_log.log)("viewProps", { ...viewProps });
+          } catch {
           }
+          console.groupEnd();
         }
       }
-      if (process.env.NODE_ENV === "development" && console.groupEnd(), props.style)
+      if (props.style)
         if (isHOC)
           viewProps.style = props.style;
         else
@@ -4215,7 +4275,7 @@ current`, {
         let val = styleIn[key];
         key = conf2.shorthands[key] || key;
         let expanded = (0, import_propMapper.propMapper)(key, val, styleState, { ...props, ...props[subKey] });
-        if (!(!expanded || !staticConfig.isHOC && key in skipProps && !styleProps.noSkip))
+        if (!(!expanded || !staticConfig.isHOC && key in import_skipProps.skipProps && !styleProps.noSkip))
           for (let [skey, sval] of expanded)
             !avoidMergeTransform && skey in import_helpers.stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps.noNormalize ? sval : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(sval, key);
       }
@@ -4235,35 +4295,7 @@ current`, {
     }, mapTransformKeys = {
       x: "translateX",
       y: "translateY"
-    }, skipProps = {
-      untilMeasured: 1,
-      animation: 1,
-      space: 1,
-      animateOnly: 1,
-      disableClassName: 1,
-      debug: 1,
-      componentName: 1,
-      disableOptimization: 1,
-      tag: 1,
-      style: 1,
-      // handled after loop so pseudos set usedKeys and override it if necessary
-      group: 1
     };
-    process.env.NODE_ENV === "test" && (skipProps["data-test-renders"] = 1);
-    Object.assign(skipProps, {
-      whiteSpace: 1,
-      wordWrap: 1,
-      textOverflow: 1,
-      textDecorationDistance: 1,
-      cursor: 1,
-      contain: 1,
-      boxSizing: 1,
-      boxShadow: 1,
-      outlineStyle: 1,
-      outlineOffset: 1,
-      outlineWidth: 1,
-      outlineColor: 1
-    });
     function passDownProp(viewProps, key, val, shouldMergeObject = !1) {
       if (shouldMergeObject) {
         let next = {
@@ -5053,8 +5085,9 @@ If you meant to do this, you can disable this warning - either change untilMeasu
                 willBeAnimated
               }));
             } catch {
+            } finally {
+              console.groupEnd();
             }
-            console.groupEnd();
           } else {
             (0, import_log.log)(title), (0, import_log.log)("final styles:");
             for (let key in splitStylesStyle)
@@ -10936,10 +10969,21 @@ var require_Dialog_native = __commonJS({
           children: isShowing ? children : null
         }
       );
-      return useShowDialogSheet(context) ? children : context.modal ? isFullyHidden ? null : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogPortalItem, { __scopeDialog, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PortalProvider2, { scope: __scopeDialog, forceMount, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogPortalFrame, { pointerEvents: isShowing ? "auto" : "none", ...frameProps, children: contents }) }) }) : contents;
+      if (useShowDialogSheet(context))
+        return children;
+      if (context.modal) {
+        if (isFullyHidden)
+          return null;
+        let framedContents = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PortalProvider2, { scope: __scopeDialog, forceMount, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogPortalFrame, { pointerEvents: isShowing ? "auto" : "none", ...frameProps, children: contents }) });
+        return import_constants4.isWeb ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.Portal, { zIndex: props.zIndex ?? 1e5, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PassthroughTheme, { children: framedContents }) }) : /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(DialogPortalItem, { __scopeDialog, children: framedContents });
+      }
+      return contents;
     };
     DialogPortal.displayName = PORTAL_NAME;
-    var OVERLAY_NAME = "DialogOverlay", DialogOverlayFrame = (0, import_core12.styled)(import_sheet.Overlay, {
+    var PassthroughTheme = ({ children }) => {
+      let themeName = (0, import_core12.useThemeName)();
+      return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_core12.Theme, { name: themeName, forceClassName: !0, children });
+    }, OVERLAY_NAME = "DialogOverlay", DialogOverlayFrame = (0, import_core12.styled)(import_sheet.Overlay, {
       name: OVERLAY_NAME
     }), DialogOverlay = DialogOverlayFrame.extractable(
       React2.forwardRef(
@@ -17140,6 +17184,8 @@ var require_SelectTrigger_native = __commonJS({
           {
             componentName: TRIGGER_NAME,
             unstyled,
+            tag: "button",
+            id: itemParentContext.id,
             ...!unstyled && {
               backgrounded: !0,
               radiused: !0,
@@ -17151,9 +17197,9 @@ var require_SelectTrigger_native = __commonJS({
                 outlineWidth: 2,
                 outlineColor: "$outlineColor"
               },
-              borderWidth: 1
+              borderWidth: 1,
+              size: itemParentContext.size
             },
-            size: itemParentContext.size,
             "aria-expanded": context.open,
             "aria-autocomplete": "none",
             dir: context.dir,
@@ -17436,8 +17482,9 @@ var require_Select_native = __commonJS({
           disablePreventBodyScroll,
           size: sizeProp = "$true",
           onActiveChange,
-          dir
-        } = props, id = React2.useId(), scopeKey = __scopeSelect ? Object.keys(__scopeSelect)[0] ?? id : id, { when, AdaptProvider } = (0, import_adapt.useAdaptParent)({
+          dir,
+          id
+        } = props, internalId = React2.useId(), scopeKey = __scopeSelect ? Object.keys(__scopeSelect)[0] ?? internalId : internalId, { when, AdaptProvider } = (0, import_adapt.useAdaptParent)({
           Contents: React2.useCallback(
             () => /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_portal2.PortalHost, { name: `${scopeKey}SheetContents` }),
             [scopeKey]
@@ -17473,11 +17520,12 @@ var require_Select_native = __commonJS({
           import_context.SelectItemParentProvider,
           {
             scope: __scopeSelect,
-            initialValue: React2.useMemo(() => value, []),
+            initialValue: React2.useMemo(() => value, [open]),
             size: sizeProp,
             activeIndexSubscribe,
             valueSubscribe,
             setOpen,
+            id,
             onChange: React2.useCallback((val) => {
               setValue(val), emitValue(val);
             }, []),