@tamagui/web 1.110.5 → 1.111.1

package/dist/esm/helpers/getGroupPropParts.native.js

@@ -1,47 +1,6 @@
 import { getMedia } from "../hooks/useMedia";
-function _array_like_to_array(arr, len) {
-  (len == null || len > arr.length) && (len = arr.length);
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _array_with_holes(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-function _iterable_to_array_limit(arr, i) {
-  var _i = arr == null ? null : typeof Symbol < "u" && arr[Symbol.iterator] || arr["@@iterator"];
-  if (_i != null) {
-    var _arr = [], _n = !0, _d = !1, _s, _e;
-    try {
-      for (_i = _i.call(arr); !(_n = (_s = _i.next()).done) && (_arr.push(_s.value), !(i && _arr.length === i)); _n = !0)
-        ;
-    } catch (err) {
-      _d = !0, _e = err;
-    } finally {
-      try {
-        !_n && _i.return != null && _i.return();
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-    return _arr;
-  }
-}
-function _non_iterable_rest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _sliced_to_array(arr, i) {
-  return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-  if (o) {
-    if (typeof o == "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor && (n = o.constructor.name), n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-  }
-}
 function getGroupPropParts(groupProp) {
-  var mediaQueries = getMedia(), _groupProp_split = _sliced_to_array(groupProp.split("-"), 4), _ = _groupProp_split[0], name = _groupProp_split[1], part3 = _groupProp_split[2], part4 = _groupProp_split[3], pseudo, media = part3 in mediaQueries ? part3 : void 0;
+  var mediaQueries = getMedia(), [_, name, part3, part4] = groupProp.split("-"), pseudo, media = part3 in mediaQueries ? part3 : void 0;
   return media ? pseudo = part4 : pseudo = part3, {
     name,
     pseudo,

package/dist/esm/helpers/getGroupPropParts.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/code/core/web/src/helpers/getGroupPropParts.ts"],
-  "mappings": "AAAA,SAASA,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIlB,SAASC,kBAAkBC,WAAiB;AACjD,MAAMC,eAAeH,SAAAA,GACWE,mBAAAA,iBAAAA,UAAUE,MAAM,GAAA,GAAA,CAAA,GAAzCC,IAAyBH,iBAAAA,CAAAA,GAAtBI,OAAsBJ,iBAAAA,CAAAA,GAAhBK,QAAgBL,iBAAAA,CAAAA,GAATM,QAASN,iBAAAA,CAAAA,GAC5BO,QACEC,QAAQH,SAASJ,eAAeI,QAAQI;AAC9C,SAAKD,QAGHD,SAASD,QAFTC,SAASF,OAIJ;IAAED;IAAMG;IAAQC;EAAM;AAC/B;",
-  "names": ["getMedia", "getGroupPropParts", "groupProp", "mediaQueries", "split", "_", "name", "part3", "part4", "pseudo", "media", "undefined"]
+  "mappings": "AAAA,SAASA,gBAAgB;AAIlB,SAASC,kBAAkBC,WAAiB;AACjD,MAAMC,eAAeH,SAAAA,GACf,CAACI,GAAGC,MAAMC,OAAOC,KAAAA,IAASL,UAAUM,MAAM,GAAA,GAC5CC,QACEC,QAAQJ,SAASH,eAAeG,QAAQK;AAC9C,SAAKD,QAGHD,SAASF,QAFTE,SAASH,OAIJ;IAAED;IAAMI;IAAQC;EAAM;AAC/B;",
+  "names": ["getMedia", "getGroupPropParts", "groupProp", "mediaQueries", "_", "name", "part3", "part4", "split", "pseudo", "media", "undefined"]
 }

package/dist/esm/helpers/getGroupPropParts.native.mjs

@@ -0,0 +1,14 @@
+import { getMedia } from "../hooks/useMedia.mjs";
+function getGroupPropParts(groupProp) {
+  var mediaQueries = getMedia(),
+    [_, name, part3, part4] = groupProp.split("-"),
+    pseudo,
+    media = part3 in mediaQueries ? part3 : void 0;
+  return media ? pseudo = part4 : pseudo = part3, {
+    name,
+    pseudo,
+    media
+  };
+}
+export { getGroupPropParts };
+//# sourceMappingURL=getGroupPropParts.native.mjs.map

package/dist/esm/helpers/getGroupPropParts.native.mjs.map

@@ -0,0 +1 @@
+{"version":3,"names":["getMedia","getGroupPropParts","groupProp","mediaQueries","_","name","part3","part4","split","pseudo","media"],"sources":["../../../src/helpers/getGroupPropParts.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,QAAgB;AAIlB,SAASC,kBAAkBC,SAAA,EAA+B;EAC/D,IAAAC,YAAM,GAAAH,QAAe;IAAS,CAAAI,CACxB,EAACC,IAAG,EAAAC,KAAM,EAAAC,KAAO,IAAKL,SAAI,CAAAM,KAAU,IAAM;IAAGC,MAAA;IAAAC,KAAA,GAAAJ,KAAA,IAAAH,YAAA,GAAAG,KAAA;EACnD,OAAII,KAAA,GAAAD,MAAA,GAAAF,KAAA,GAAAE,MAAA,GAAAH,KAAA;IACJD,IAAM;IACNI,MAAK;IAMPC","ignoreList":[]}

package/dist/esm/helpers/getSplitStyles.native.js

@@ -18,85 +18,6 @@ import { pseudoDescriptors, pseudoPriorities } from "./pseudoDescriptors";
 import { skipProps } from "./skipProps";
 import { transformsToString } from "./transformsToString";
 import { isActivePlatform } from "./isActivePlatform";
-function _array_like_to_array(arr, len) {
-  (len == null || len > arr.length) && (len = arr.length);
-  for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-  return arr2;
-}
-function _array_with_holes(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-function _define_property(obj, key, value) {
-  return key in obj ? Object.defineProperty(obj, key, {
-    value,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
-  }) : obj[key] = value, obj;
-}
-function _iterable_to_array_limit(arr, i) {
-  var _i = arr == null ? null : typeof Symbol < "u" && arr[Symbol.iterator] || arr["@@iterator"];
-  if (_i != null) {
-    var _arr = [], _n = !0, _d = !1, _s, _e;
-    try {
-      for (_i = _i.call(arr); !(_n = (_s = _i.next()).done) && (_arr.push(_s.value), !(i && _arr.length === i)); _n = !0)
-        ;
-    } catch (err) {
-      _d = !0, _e = err;
-    } finally {
-      try {
-        !_n && _i.return != null && _i.return();
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-    return _arr;
-  }
-}
-function _non_iterable_rest() {
-  throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _object_spread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {}, ownKeys2 = Object.keys(source);
-    typeof Object.getOwnPropertySymbols == "function" && (ownKeys2 = ownKeys2.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-    }))), ownKeys2.forEach(function(key) {
-      _define_property(target, key, source[key]);
-    });
-  }
-  return target;
-}
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function(sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-  return keys;
-}
-function _object_spread_props(target, source) {
-  return source = source ?? {}, Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function(key) {
-    Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-  }), target;
-}
-function _sliced_to_array(arr, i) {
-  return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
-}
-function _type_of(obj) {
-  "@swc/helpers - typeof";
-  return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-function _unsupported_iterable_to_array(o, minLen) {
-  if (o) {
-    if (typeof o == "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor && (n = o.constructor.name), n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-  }
-}
 var consoleGroupCollapsed = isWeb ? console.groupCollapsed : console.info, conf, PROP_SPLIT = "-";
 function isValidStyleKey(key, staticConfig) {
   var _staticConfig_accept, validStyleProps = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? stylePropsText : validStyles);
@@ -104,7 +25,7 @@ function isValidStyleKey(key, staticConfig) {
 }
 var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug, skipThemeTokenResolution) {
   conf = conf || getConfig(), isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
-  var shorthands = conf.shorthands, isHOC = staticConfig.isHOC, isText = staticConfig.isText, isInput = staticConfig.isInput, variants = staticConfig.variants, isReactNative = staticConfig.isReactNative, inlineProps = staticConfig.inlineProps, inlineWhenUnflattened = staticConfig.inlineWhenUnflattened, parentStaticConfig = staticConfig.parentStaticConfig, acceptsClassName = staticConfig.acceptsClassName, viewProps = {}, mediaState = styleProps.mediaState || globalMediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, styleState = {
+  var { shorthands } = conf, { isHOC, isText, isInput, variants, isReactNative, inlineProps, inlineWhenUnflattened, parentStaticConfig, acceptsClassName } = staticConfig, viewProps = {}, mediaState = styleProps.mediaState || globalMediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, styleState = {
     classNames,
     conf,
     props,
@@ -127,26 +48,30 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     rulesToInsert,
     componentState,
     styleState,
-    theme: _object_spread({}, theme)
+    theme: {
+      ...theme
+    }
   }), console.groupEnd());
-  var asChild = props.asChild, accept = staticConfig.accept, noSkip = styleProps.noSkip, disableExpandShorthands = styleProps.disableExpandShorthands, noExpand = styleProps.noExpand, webContainerType = conf.settings.webContainerType, parentVariants = parentStaticConfig == null ? void 0 : parentStaticConfig.variants;
+  var { asChild } = props, { accept } = staticConfig, { noSkip, disableExpandShorthands, noExpand } = styleProps, { webContainerType } = conf.settings, parentVariants = parentStaticConfig?.variants;
   for (var keyOg in props) {
     var _loop = function(i2) {
       var _parentStaticConfig_variants;
       if (expanded) {
-        var _expanded_i = _sliced_to_array(expanded[i2], 2), k = _expanded_i[0], v = _expanded_i[1];
+        var [k, v] = expanded[i2];
         key = k, val = v;
       }
       if (val == null || key in usedKeys) return "continue";
-      if (isPseudo = key in validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && isMediaKey(key), isMediaOrPseudo1 = !!(isMedia || isPseudo), isVariant = variants && key in variants, inlineProps != null && inlineProps.has(key) || process.env.IS_STATIC === "is_static" && (inlineWhenUnflattened != null && inlineWhenUnflattened.has(key))) {
+      if (isPseudo = key in validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && isMediaKey(key), isMediaOrPseudo1 = !!(isMedia || isPseudo), isVariant = variants && key in variants, inlineProps?.has(key) || process.env.IS_STATIC === "is_static" && inlineWhenUnflattened?.has(key)) {
         var _props_key;
         viewProps[key] = (_props_key = props[key]) !== null && _props_key !== void 0 ? _props_key : val;
       }
       var shouldPassThrough2 = styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo1 || (parentStaticConfig == null || (_parentStaticConfig_variants = parentStaticConfig.variants) === null || _parentStaticConfig_variants === void 0 ? void 0 : _parentStaticConfig_variants[keyInit]));
       if (shouldPassThrough2)
-        return passDownProp(viewProps, key, val, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(" - passing down prop ".concat(key)), log({
+        return passDownProp(viewProps, key, val, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(` - passing down prop ${key}`), log({
           val,
-          after: _object_spread({}, viewProps[key])
+          after: {
+            ...viewProps[key]
+          }
         }), console.groupEnd()), "continue";
       if (isPseudo) {
         if (!val) return "continue";
@@ -167,7 +92,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           var _iteratorNormalCompletion2 = !0, _didIteratorError2 = !1, _iteratorError2 = void 0;
           try {
             for (var _iterator2 = pseudoStyles[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
-              var psuedoStyle = _step2.value, fullKey = "".concat(psuedoStyle[StyleObjectProperty]).concat(PROP_SPLIT).concat(descriptor.name);
+              var psuedoStyle = _step2.value, fullKey = `${psuedoStyle[StyleObjectProperty]}${PROP_SPLIT}${descriptor.name}`;
               fullKey in usedKeys || (addStyleToInsertRules(rulesToInsert, psuedoStyle), mergeClassName(transforms, classNames, fullKey, psuedoStyle[StyleObjectIdentifier], isMediaOrPseudo1, !0));
             }
           } catch (err) {
@@ -221,9 +146,9 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       if (isMedia) {
         if (!val) return "continue";
         var hasSpace = val.space, mediaKeyShort = key.slice(1);
-        if (hasMedia || (hasMedia = !0), (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && ((typeof hasMedia > "u" ? "undefined" : _type_of(hasMedia)) !== "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !isActivePlatform(key))
+        if (hasMedia || (hasMedia = !0), (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && (typeof hasMedia != "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !isActivePlatform(key))
           return "continue";
-        if (process.env.NODE_ENV === "development" && debug === "verbose" && log("  \u{1F4FA} ".concat(key), {
+        if (process.env.NODE_ENV === "development" && debug === "verbose" && log(`  \u{1F4FA} ${key}`, {
           key,
           val,
           props,
@@ -235,7 +160,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           var mediaStyle = getSubStyle(styleState, key, val, !1);
           if (hasSpace && (delete mediaStyle.space, mediaState[mediaKeyShort])) {
             var importance1 = getMediaImportanceIfMoreImportant(mediaKeyShort, "space", usedKeys, !0);
-            importance1 && (space = val.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && log("Found more important space for current media ".concat(mediaKeyShort, ": ").concat(val, " (importance: ").concat(importance1, ")")));
+            importance1 && (space = val.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && log(`Found more important space for current media ${mediaKeyShort}: ${val} (importance: ${importance1})`));
           }
           var mediaStyles = getStylesAtomic(mediaStyle), priority = mediaStylesSeen;
           mediaStylesSeen += 1;
@@ -246,7 +171,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               if (!(property[0] === "$" && property.startsWith("$platform") && !isActivePlatform(property))) {
                 var out = createMediaStyle(style3, mediaKeyShort, mediaQueryConfig, isMedia, !1, priority);
                 process.env.NODE_ENV === "development" && debug === "verbose" && log("\u{1F4FA} media style:", out);
-                var fullKey1 = "".concat(style3[StyleObjectProperty]).concat(PROP_SPLIT).concat(mediaKeyShort).concat(style3[StyleObjectPseudo] || "");
+                var fullKey1 = `${style3[StyleObjectProperty]}${PROP_SPLIT}${mediaKeyShort}${style3[StyleObjectPseudo] || ""}`;
                 fullKey1 in usedKeys || (addStyleToInsertRules(rulesToInsert, out), mergeClassName(transforms, classNames, fullKey1, out[StyleObjectIdentifier], !0, !0));
               }
             }
@@ -261,16 +186,17 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
             }
           }
         } else {
-          var mergeMediaStyle = function(key5, val3) {
+          let mergeMediaStyle2 = function(key5, val3) {
             var _styleState4;
             (_styleState4 = styleState).style || (_styleState4.style = {});
             var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, usedKeys, mediaState[mediaKeyShort], importanceBump, debug);
             didMerge && key5 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
-          }, isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
+          };
+          var mergeMediaStyle = mergeMediaStyle2, isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
           if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
             if (!mediaState[mediaKeyShort])
-              return process.env.NODE_ENV === "development" && debug === "verbose" && log("  \u{1F4FA} \u274C DISABLED ".concat(mediaKeyShort)), "continue";
-            process.env.NODE_ENV === "development" && debug === "verbose" && log("  \u{1F4FA} \u2705 ENABLED ".concat(mediaKeyShort));
+              return process.env.NODE_ENV === "development" && debug === "verbose" && log(`  \u{1F4FA} \u274C DISABLED ${mediaKeyShort}`), "continue";
+            process.env.NODE_ENV === "development" && debug === "verbose" && log(`  \u{1F4FA} \u2705 ENABLED ${mediaKeyShort}`);
           }
           var mediaStyle1 = getSubStyle(styleState, key, val, !0), importanceBump = 0;
           if (isThemeMedia) {
@@ -279,14 +205,14 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
             if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName)))
               return "continue";
           } else if (isGroupMedia) {
-            var _componentState_group, groupInfo = getGroupPropParts(mediaKeyShort), groupName = groupInfo.name, groupContext = context == null ? void 0 : context.groups.state[groupName];
+            var _componentState_group, groupInfo = getGroupPropParts(mediaKeyShort), groupName = groupInfo.name, groupContext = context?.groups.state[groupName];
             if (!groupContext)
-              return process.env.NODE_ENV === "development" && debug && log("No parent with group prop, skipping styles: ".concat(groupName)), "continue";
+              return process.env.NODE_ENV === "development" && debug && log(`No parent with group prop, skipping styles: ${groupName}`), "continue";
             var groupPseudoKey = groupInfo.pseudo, groupMediaKey = groupInfo.media, componentGroupState = (_componentState_group = componentState.group) === null || _componentState_group === void 0 ? void 0 : _componentState_group[groupName];
             if (groupMediaKey) {
               mediaGroups || (mediaGroups = /* @__PURE__ */ new Set()), mediaGroups.add(groupMediaKey);
-              var mediaState1 = componentGroupState == null ? void 0 : componentGroupState.media, isActive = mediaState1 == null ? void 0 : mediaState1[groupMediaKey];
-              if (!mediaState1 && groupContext.layout && (isActive = mediaKeyMatch(groupMediaKey, groupContext.layout)), process.env.NODE_ENV === "development" && debug === "verbose" && log(" \u{1F3D8}\uFE0F GROUP media ".concat(groupMediaKey, " active? ").concat(isActive)), !isActive) {
+              var mediaState1 = componentGroupState?.media, isActive = mediaState1?.[groupMediaKey];
+              if (!mediaState1 && groupContext.layout && (isActive = mediaKeyMatch(groupMediaKey, groupContext.layout)), process.env.NODE_ENV === "development" && debug === "verbose" && log(` \u{1F3D8}\uFE0F GROUP media ${groupMediaKey} active? ${isActive}`), !isActive) {
                 for (var pkey1 in mediaStyle1)
                   applyDefaultStyle(pkey1, styleState);
                 return "continue";
@@ -296,8 +222,8 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
             if (groupPseudoKey) {
               pseudoGroups || (pseudoGroups = /* @__PURE__ */ new Set()), pseudoGroups.add(groupName);
               var componentGroupPseudoState = (componentGroupState || // fallback to context initially
-              context.groups.state[groupName]).pseudo, isActive1 = componentGroupPseudoState == null ? void 0 : componentGroupPseudoState[groupPseudoKey], priority1 = pseudoPriorities[groupPseudoKey];
-              if (process.env.NODE_ENV === "development" && debug === "verbose" && log(" \u{1F3D8}\uFE0F GROUP pseudo ".concat(groupMediaKey, " active? ").concat(isActive1, ", priority ").concat(priority1)), !isActive1) {
+              context.groups.state[groupName]).pseudo, isActive1 = componentGroupPseudoState?.[groupPseudoKey], priority1 = pseudoPriorities[groupPseudoKey];
+              if (process.env.NODE_ENV === "development" && debug === "verbose" && log(` \u{1F3D8}\uFE0F GROUP pseudo ${groupMediaKey} active? ${isActive1}, priority ${priority1}`), !isActive1) {
                 for (var pkey2 in mediaStyle1)
                   applyDefaultStyle(pkey2, styleState);
                 return "continue";
@@ -314,9 +240,9 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               if (!isActivePlatform(subKey))
                 continue;
               for (var subSubKey in mediaStyle1[subKey])
-                mergeMediaStyle(subSubKey, mediaStyle1[subKey][subSubKey]);
+                mergeMediaStyle2(subSubKey, mediaStyle1[subKey][subSubKey]);
             } else
-              mergeMediaStyle(subKey, mediaStyle1[subKey]);
+              mergeMediaStyle2(subKey, mediaStyle1[subKey]);
           }
         }
         return "continue";
@@ -337,7 +263,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     }, keyInit = keyOg, valInit = props[keyInit];
     if (accept) {
       var accepted = accept[keyInit];
-      if ((accepted === "style" || accepted === "textStyle") && valInit && (typeof valInit > "u" ? "undefined" : _type_of(valInit)) === "object") {
+      if ((accepted === "style" || accepted === "textStyle") && valInit && typeof valInit == "object") {
         viewProps[keyInit] = getSubStyle(styleState, keyInit, valInit, styleProps.noClassNames);
         continue;
       }
@@ -348,7 +274,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
           var identifier, containerType, containerCSS;
         continue;
       }
-      var valInitType = typeof valInit > "u" ? "undefined" : _type_of(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
+      var valInitType = typeof valInit, isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
       if (0) {
         if (staticConfig.isReactNative && keyInit.startsWith("data-"))
           var _viewProps, _dataSet;
@@ -368,7 +294,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       }
       if (keyInit === "dataSet") {
         for (var keyInit1 in valInit)
-          viewProps["data-".concat(hyphenate(keyInit1))] = valInit[keyInit1];
+          viewProps[`data-${hyphenate(keyInit1)}`] = valInit[keyInit1];
         continue;
       }
       if (0 && !noExpand)
@@ -376,19 +302,19 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
       var isShorthand = keyInit in shorthands, isVariant = !isValidStyleKeyInit && variants && keyInit in variants, isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant, isPseudo = keyInit in validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && isMediaKey(keyInit), isMediaOrPseudo1 = !!(isMedia || isPseudo);
       if (isMediaOrPseudo1 && keyInit.startsWith("$group-")) {
         var name = keyInit.split("-")[1];
-        context != null && context.groups.subscribe && !(context != null && context.groups.state[name]) && (keyInit = keyInit.replace("$group-", "$group-true-"));
+        context?.groups.subscribe && !context?.groups.state[name] && (keyInit = keyInit.replace("$group-", "$group-true-"));
       }
       var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo1 || isVariant && !noExpand || isShorthand;
       if (!(isStyleProp && (asChild === "except-style" || asChild === "except-style-web"))) {
         var shouldPassProp = !isStyleProp || // is in parent variants
-        isHOC && parentVariants && keyInit in parentVariants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), parentVariant = parentVariants == null ? void 0 : parentVariants[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo1 || parentVariant || keyInit in skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
-        if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupEnd(), console.groupEnd(), consoleGroupCollapsed("  \u{1F511} ".concat(keyOg).concat(keyInit !== keyOg ? " (shorthand for ".concat(keyInit, ")") : "", " ").concat(shouldPassThrough ? "(pass)" : "")), log({
+        isHOC && parentVariants && keyInit in parentVariants || inlineProps?.has(keyInit), parentVariant = parentVariants?.[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo1 || parentVariant || keyInit in skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
+        if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupEnd(), console.groupEnd(), consoleGroupCollapsed(`  \u{1F511} ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ""} ${shouldPassThrough ? "(pass)" : ""}`), log({
           isVariant,
           valInit,
           shouldPassProp
         }), isClient && log({
           variants,
-          variant: variants == null ? void 0 : variants[keyInit],
+          variant: variants?.[keyInit],
           isVariant,
           isHOCShouldPassThrough,
           parentStaticConfig
@@ -415,13 +341,19 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
               styleProps,
               componentState,
               isVariant,
-              variant: variants == null ? void 0 : variants[keyInit],
+              variant: variants?.[keyInit],
               shouldPassProp,
               isHOCShouldPassThrough,
-              usedKeys: _object_spread({}, usedKeys)
+              usedKeys: {
+                ...usedKeys
+              }
             }), log("expanded", expanded, `
-usedKeys`, _object_spread({}, usedKeys), `
-current`, _object_spread({}, styleState.style)));
+usedKeys`, {
+              ...usedKeys
+            }, `
+current`, {
+              ...styleState.style
+            }));
           } catch {
           }
           console.groupEnd();
@@ -429,7 +361,13 @@ current`, _object_spread({}, styleState.style)));
         for (var key = keyInit, val = valInit, max = expanded ? expanded.length : 1, i = 0; i < max; i++) _loop(i);
         if (process.env.NODE_ENV === "development" && debug === "verbose") {
           try {
-            log(" \u2714\uFE0F expand complete", keyInit), log("style", _object_spread({}, styleState.style)), log("transforms", _object_spread({}, transforms)), log("viewProps", _object_spread({}, viewProps));
+            log(" \u2714\uFE0F expand complete", keyInit), log("style", {
+              ...styleState.style
+            }), log("transforms", {
+              ...transforms
+            }), log("viewProps", {
+              ...viewProps
+            });
           } catch {
           }
           console.groupEnd();
@@ -442,10 +380,10 @@ current`, _object_spread({}, styleState.style)));
     if (styleState.style && (fixStyles(styleState.style), isWeb && !isReactNative && styleToCSS(styleState.style)), styleState.flatTransforms) {
       var _styleState1;
       (_styleState1 = styleState).style || (_styleState1.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
-        var _param = _sliced_to_array(param, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
+        var [a] = param, [b] = param1;
         return a.localeCompare(b);
       }).forEach(function(param) {
-        var _param = _sliced_to_array(param, 2), key5 = _param[0], val3 = _param[1];
+        var [key5, val3] = param;
         mergeTransform(styleState.style, key5, val3, !0);
       });
     }
@@ -469,7 +407,7 @@ current`, _object_spread({}, styleState.style)));
         var atomic, _iteratorNormalCompletion, _didIteratorError, _iteratorError;
         try {
           for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0)
-            var atomicStyle, _props_animateOnly, _atomicStyle, key3, value, identifier1, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
+            var atomicStyle, _props_animateOnly, key3, value, identifier1, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
         } catch (err) {
         } finally {
           try {
@@ -479,7 +417,7 @@ current`, _object_spread({}, styleState.style)));
       }
       if (transforms)
         for (var namespace in transforms) {
-          var _transforms_namespace, hash, val2, identifier2;
+          var hash, val2, identifier2;
           if (isClient && !insertedTransforms[identifier2])
             var rule;
         }
@@ -506,13 +444,13 @@ current`, _object_spread({}, styleState.style)));
           }
       }
   var style1 = styleState.style;
-  if (style1 != null && style1.fontFamily) {
+  if (style1?.fontFamily) {
     var _getFont, faceInfo = (_getFont = getFont(style1.fontFamily)) === null || _getFont === void 0 ? void 0 : _getFont.face;
     if (faceInfo) {
       var _faceInfo_style_fontWeight_, _faceInfo_style_fontWeight, overrideFace = (_faceInfo_style_fontWeight = faceInfo[style1.fontWeight]) === null || _faceInfo_style_fontWeight === void 0 || (_faceInfo_style_fontWeight_ = _faceInfo_style_fontWeight[style1.fontStyle || "normal"]) === null || _faceInfo_style_fontWeight_ === void 0 ? void 0 : _faceInfo_style_fontWeight_.val;
       overrideFace && (style1.fontFamily = overrideFace, styleState.fontFamily = overrideFace, delete style1.fontWeight, delete style1.fontStyle);
     }
-    process.env.NODE_ENV === "development" && debug && debug !== "profile" && log("Found fontFamily native: ".concat(style1.fontFamily), faceInfo);
+    process.env.NODE_ENV === "development" && debug && debug !== "profile" && log(`Found fontFamily native: ${style1.fontFamily}`, faceInfo);
   }
   var result = {
     space,
@@ -553,14 +491,15 @@ current`, _object_spread({}, styleState.style)));
   if (process.env.NODE_ENV === "development" && debug === "verbose" && isDevTools) {
     consoleGroupCollapsed("\u{1F539} getSplitStyles ===>");
     try {
-      var logs = _object_spread_props(_object_spread({}, result), {
+      var logs = {
+        ...result,
         className,
         componentState,
         transforms,
         viewProps,
         rulesToInsert,
         parentSplitStyles
-      });
+      };
       for (var key4 in logs)
         log(key4, logs[key4]);
     } catch {
@@ -575,8 +514,8 @@ function mergeClassName(transforms, classNames, key, val) {
     var _transforms, _ns, ns, transform;
 }
 function mergeStyle(styleState, key, val) {
-  var disableNormalize = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, classNames = styleState.classNames, viewProps = styleState.viewProps, usedKeys = styleState.usedKeys, styleProps = styleState.styleProps, staticConfig = styleState.staticConfig;
-  if (isWeb && (val == null ? void 0 : val[0]) === "_") {
+  var disableNormalize = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, { classNames, viewProps, usedKeys, styleProps, staticConfig } = styleState;
+  if (isWeb && val?.[0] === "_") {
     var _usedKeys, _key;
     classNames[key] = val, (_usedKeys = usedKeys)[_key = key] || (_usedKeys[_key] = 1);
   } else if (key in stylePropsTransform) {
@@ -596,7 +535,7 @@ function mergeStyle(styleState, key, val) {
   }
 }
 var getSubStyle = function(styleState, subKey, styleIn, avoidMergeTransform) {
-  var staticConfig = styleState.staticConfig, conf2 = styleState.conf, styleProps = styleState.styleProps, styleOut = {};
+  var { staticConfig, conf: conf2, styleProps } = styleState, styleOut = {};
   for (var key in styleIn) {
     var val = styleIn[key];
     key = conf2.shorthands[key] || key;
@@ -605,7 +544,7 @@ var getSubStyle = function(styleState, subKey, styleIn, avoidMergeTransform) {
       var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
       try {
         for (var _iterator = expanded[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-          var _step_value = _sliced_to_array(_step.value, 2), skey = _step_value[0], sval = _step_value[1];
+          var [skey, sval] = _step.value;
           !avoidMergeTransform && skey in stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps.noNormalize ? sval : normalizeValueWithProperty(sval, key);
         }
       } catch (err) {
@@ -631,13 +570,14 @@ function addStyleToInsertRules(rulesToInsert, styleObject) {
   if (0)
     var identifier;
 }
-var defaultColor = process.env.TAMAGUI_DEFAULT_COLOR || "rgba(0,0,0,0)", animatableDefaults = _object_spread_props(_object_spread({}, Object.fromEntries(Object.entries(tokenCategories.color).map(function(param) {
-  var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
-  return [
-    k,
-    defaultColor
-  ];
-}))), {
+var defaultColor = process.env.TAMAGUI_DEFAULT_COLOR || "rgba(0,0,0,0)", animatableDefaults = {
+  ...Object.fromEntries(Object.entries(tokenCategories.color).map(function(param) {
+    var [k, v] = param;
+    return [
+      k,
+      defaultColor
+    ];
+  })),
   opacity: 1,
   scale: 1,
   rotate: "0deg",
@@ -646,13 +586,15 @@ var defaultColor = process.env.TAMAGUI_DEFAULT_COLOR || "rgba(0,0,0,0)", animata
   x: 0,
   y: 0,
   borderRadius: 0
-}), lowercaseHyphenate = function(match) {
-  return "-".concat(match.toLowerCase());
+}, lowercaseHyphenate = function(match) {
+  return `-${match.toLowerCase()}`;
 }, hyphenate = function(str) {
   return str.replace(/[A-Z]/g, lowercaseHyphenate);
 }, mergeTransform = function(obj, key, val) {
   var backwards = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, _obj;
-  typeof obj.transform != "string" && ((_obj = obj).transform || (_obj.transform = []), obj.transform[backwards ? "unshift" : "push"](_define_property({}, mapTransformKeys[key] || key, val)));
+  typeof obj.transform != "string" && ((_obj = obj).transform || (_obj.transform = []), obj.transform[backwards ? "unshift" : "push"]({
+    [mapTransformKeys[key] || key]: val
+  }));
 }, mapTransformKeys = {
   x: "translateX",
   y: "translateY"
@@ -660,14 +602,17 @@ var defaultColor = process.env.TAMAGUI_DEFAULT_COLOR || "rgba(0,0,0,0)", animata
 function passDownProp(viewProps, key, val) {
   var shouldMergeObject = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1;
   if (shouldMergeObject) {
-    var next = _object_spread({}, viewProps[key], val);
+    var next = {
+      ...viewProps[key],
+      ...val
+    };
     delete viewProps[key], viewProps[key] = next;
   } else
     viewProps[key] = val;
 }
 function mergeMediaByImportance(styleState, mediaKey, key, value, importancesUsed, isSizeMedia, importanceBump, debugProp) {
   var importance = getMediaImportanceIfMoreImportant(mediaKey, key, importancesUsed, isSizeMedia);
-  if (importanceBump && (importance = (importance || 0) + importanceBump), process.env.NODE_ENV === "development" && debugProp === "verbose" && log("mergeMediaByImportance ".concat(key, " importance existing ").concat(importancesUsed[key], " next ").concat(importance)), importance === null)
+  if (importanceBump && (importance = (importance || 0) + importanceBump), process.env.NODE_ENV === "development" && debugProp === "verbose" && log(`mergeMediaByImportance ${key} importance existing ${importancesUsed[key]} next ${importance}`), importance === null)
     return !1;
   if (importancesUsed[key] = importance, key in pseudoDescriptors) {
     var descriptor = pseudoDescriptors[key], descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = styleState.componentState[descriptorKey] === !1;