@tamagui/core 1.106.0 → 1.108.0

package/dist/native.js

@@ -5340,18 +5340,26 @@ var require_createMediaStyle_native = __commonJS({
       press: "active"
     }, specifities = new Array(5).fill(0).map(function(_, i) {
       return new Array(i).fill(":root").join("");
-    }), createMediaStyle = function(styleObject, mediaKeyIn, mediaQueries, type, negate, priority) {
-      var _styleObject = _sliced_to_array(styleObject, 5), property = _styleObject[0], _value = _styleObject[1], identifier = _styleObject[2], _pseudo = _styleObject[3], rules = _styleObject[4], conf = (0, import_config.getConfig)(), enableMediaPropOrder = conf.settings.mediaPropOrder, isTheme = type === "theme", isPlatform = type === "platform", isGroup = type === "group", isNonWindowMedia = isTheme || isPlatform || isGroup, negKey = negate ? "0" : "", ogPrefix = identifier.slice(0, identifier.indexOf("-") + 1), id = "".concat(ogPrefix).concat(MEDIA_SEP).concat(mediaKeyIn.replace("-", "")).concat(negKey).concat(MEDIA_SEP), styleRule = "", groupPriority = "", groupMediaKey, containerName, nextIdentifier = identifier.replace(ogPrefix, id), styleInner = rules.map(function(rule) {
+    });
+    function getThemeOrGroupSelector(name, styleInner, isGroup, groupParts) {
+      var isTheme = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : !1, precedenceImportancePrefix = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : "", selectorStart = styleInner.indexOf(":root"), selectorEnd = styleInner.lastIndexOf("{"), selector = styleInner.slice(selectorStart, selectorEnd), precedenceSpace = (0, import_config.getSetting)("themeClassNameOnRoot") && isTheme ? "" : " ", pseudoSelectorName = groupParts.pseudo ? groupPseudoToPseudoCSSMap[groupParts.pseudo] || groupParts.pseudo : void 0, pseudoSelector = pseudoSelectorName ? ":".concat(pseudoSelectorName) : "", presedencePrefix = ":root".concat(precedenceImportancePrefix).concat(precedenceSpace), mediaSelector = ".t_".concat(isGroup ? "group_" : "").concat(name).concat(pseudoSelector);
+      return [
+        selector,
+        "".concat(presedencePrefix).concat(mediaSelector, " ").concat(selector.replace(":root", ""))
+      ];
+    }
+    var createMediaStyle = function(styleObject, mediaKeyIn, mediaQueries, type, negate, priority) {
+      var _styleObject = _sliced_to_array(styleObject, 5), property = _styleObject[0], identifier = _styleObject[2], rules = _styleObject[4], enableMediaPropOrder = (0, import_config.getSetting)("mediaPropOrder"), isTheme = type === "theme", isPlatform = type === "platform", isGroup = type === "group", isNonWindowMedia = isTheme || isPlatform || isGroup, negKey = negate ? "0" : "", ogPrefix = identifier.slice(0, identifier.indexOf("-") + 1), id = "".concat(ogPrefix).concat(MEDIA_SEP).concat(mediaKeyIn.replace("-", "")).concat(negKey).concat(MEDIA_SEP), styleRule = "", groupPriority = "", groupMediaKey, containerName, nextIdentifier = identifier.replace(ogPrefix, id), styleInner = rules.map(function(rule) {
         return rule.replace(identifier, nextIdentifier);
       }).join(";"), isHover = !1;
       if (isNonWindowMedia) {
-        var specificity = (priority || 0) + (isGroup ? 1 : 0);
+        var specificity = (priority || 0) + (isGroup || isPlatform ? 1 : 0);
         if (isTheme || isGroup) {
           var _getGroupPropParts = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyIn), name = _getGroupPropParts.name, media = _getGroupPropParts.media, pseudo = _getGroupPropParts.pseudo;
-          groupMediaKey = media, isGroup && (containerName = name);
-          var groupClassName = (isGroup ? "group_" : "") + name, selectorStart = styleInner.indexOf(":root"), selectorEnd = styleInner.lastIndexOf("{"), selector = styleInner.slice(selectorStart, selectorEnd), precedenceSpace = (0, import_config.getSetting)("themeClassNameOnRoot") && isTheme ? "" : " ", pseudoSelectorName = pseudo ? groupPseudoToPseudoCSSMap[pseudo] || pseudo : void 0;
-          pseudo === "press" && (specificity += 2), pseudo === "hover" && (isHover = !0);
-          var pseudoSelector = pseudoSelectorName ? ":".concat(pseudoSelectorName) : "", presedencePrefix = ":root".concat(specifities[specificity]).concat(precedenceSpace), mediaSelector = ".t_".concat(groupClassName).concat(pseudoSelector), nextSelector = "".concat(presedencePrefix).concat(mediaSelector, " ").concat(selector.replace(":root", ""));
+          groupMediaKey = media;
+          var groupParts = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyIn);
+          isGroup && (containerName = name), pseudo === "press" && (specificity += 2), pseudo === "hover" && (isHover = !0);
+          var _getThemeOrGroupSelector = _sliced_to_array(getThemeOrGroupSelector(name, styleInner, isGroup, groupParts, isTheme, specifities[specificity]), 2), selector = _getThemeOrGroupSelector[0], nextSelector = _getThemeOrGroupSelector[1];
           styleRule = styleInner.replace(selector, nextSelector);
         } else styleRule = "".concat(specifities[specificity]).concat(styleInner);
       }
@@ -5370,14 +5378,14 @@ var require_createMediaStyle_native = __commonJS({
             ];
           })));
         }
-        var mediaKey = groupMediaKey || mediaKeyIn, mediaSelector1 = selectors[mediaKey], screenStr = negate ? "not all and " : "", mediaQuery = "".concat(screenStr).concat(mediaSelector1), precedenceImportancePrefix = groupMediaKey ? groupPriority : enableMediaPropOrder && priority ? (
+        var mediaKey = groupMediaKey || mediaKeyIn, mediaSelector = selectors[mediaKey], screenStr = negate ? "not all and " : "", mediaQuery = "".concat(screenStr).concat(mediaSelector), precedenceImportancePrefix = groupMediaKey ? groupPriority : enableMediaPropOrder && priority ? (
           // this new array should be cached
           specifities[priority]
         ) : (
           // @ts-ignore
           prefixes[mediaKey]
         ), prefix = groupMediaKey ? "@container ".concat(containerName) : "@media";
-        groupMediaKey && (styleInner = styleRule), styleInner.includes(prefix) ? styleRule = styleInner.replace("{", " and ".concat(mediaQuery, " {")).replace("and screen and", "and") : styleRule = "".concat(prefix, " ").concat(mediaQuery, "{").concat(precedenceImportancePrefix).concat(styleInner, "}"), groupMediaKey && (styleRule = "@supports (contain: ".concat(conf.settings.webContainerType || "inline-size", ") {").concat(styleRule, "}"));
+        groupMediaKey && (styleInner = styleRule), styleInner.includes(prefix) ? styleRule = styleInner.replace("{", " and ".concat(mediaQuery, " {")).replace("and screen and", "and") : styleRule = "".concat(prefix, " ").concat(mediaQuery, "{").concat(precedenceImportancePrefix).concat(styleInner, "}"), groupMediaKey && (styleRule = "@supports (contain: ".concat((0, import_config.getSetting)("webContainerType") || "inline-size", ") {").concat(styleRule, "}"));
       }
       return isHover && (styleRule = "@media (hover:hover){".concat(styleRule, "}")), [
         property,
@@ -7674,6 +7682,65 @@ var require_transformsToString_native = __commonJS({
   }
 });
 
+// ../web/dist/cjs/helpers/isActivePlatform.native.js
+var require_isActivePlatform_native = __commonJS({
+  "../web/dist/cjs/helpers/isActivePlatform.native.js"(exports2, module2) {
+    "use strict";
+    function _type_of(obj) {
+      "@swc/helpers - typeof";
+      return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
+    }
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
+      for (var name in all) __defProp2(target, name, {
+        get: all[name],
+        enumerable: !0
+      });
+    }, __copyProps2 = function(to, from, except, desc) {
+      var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
+      if (from && (typeof from > "u" ? "undefined" : _type_of(from)) == "object" || typeof from == "function") try {
+        for (var _loop = function() {
+          var key = _step.value;
+          !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, {
+            get: function() {
+              return from[key];
+            },
+            enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
+          });
+        }, _iterator = __getOwnPropNames2(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) _loop();
+      } catch (err) {
+        _didIteratorError = !0, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError)
+            throw _iteratorError;
+        }
+      }
+      return to;
+    }, __toCommonJS2 = function(mod) {
+      return __copyProps2(__defProp2({}, "__esModule", {
+        value: !0
+      }), mod);
+    }, isActivePlatform_exports = {};
+    __export2(isActivePlatform_exports, {
+      isActivePlatform: function() {
+        return isActivePlatform;
+      }
+    });
+    module2.exports = __toCommonJS2(isActivePlatform_exports);
+    var import_constants = require_index_native3();
+    function isActivePlatform(key) {
+      var platform = key.slice(10);
+      return (
+        // web, ios, android
+        platform === import_constants.currentPlatform || // web, native
+        platform === "native"
+      );
+    }
+  }
+});
+
 // ../web/dist/cjs/helpers/getSplitStyles.native.js
 var require_getSplitStyles_native = __commonJS({
   "../web/dist/cjs/helpers/getSplitStyles.native.js"(exports2, module2) {
@@ -7730,7 +7797,7 @@ var require_getSplitStyles_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(getSplitStyles_exports);
-    var import_constants = require_index_native3(), import_helpers = require_index_native4(), import_react3 = require("react"), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants2 = 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_skipProps = require_skipProps_native(), import_transformsToString = require_transformsToString_native();
+    var import_constants = require_index_native3(), import_helpers = require_index_native4(), import_react3 = require("react"), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants2 = 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_skipProps = require_skipProps_native(), import_transformsToString = require_transformsToString_native(), import_isActivePlatform = require_isActivePlatform_native();
     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];
@@ -7815,6 +7882,270 @@ var require_getSplitStyles_native = __commonJS({
       return validStyleProps[key] || ((_staticConfig_accept = staticConfig.accept) === null || _staticConfig_accept === void 0 ? void 0 : _staticConfig_accept[key]);
     }
     var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug, skipThemeTokenResolution) {
+      var _loop = function(keyOg2) {
+        var _loop22 = function(i3) {
+          var _parentStaticConfig_variants;
+          if (expanded) {
+            var _expanded_i = _sliced_to_array(expanded[i3], 2), k = _expanded_i[0], v = _expanded_i[1];
+            key4 = k, val2 = v;
+          }
+          if (val2 == null || key4 in usedKeys) return "continue";
+          if (isPseudo = key4 in import_helpers.validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && (0, import_useMedia.isMediaKey)(key4), isMediaOrPseudo1 = !!(isMedia || isPseudo), isVariant = variants && key4 in variants, inlineProps != null && inlineProps.has(key4) || process.env.IS_STATIC === "is_static" && inlineWhenUnflattened != null && inlineWhenUnflattened.has(key4)) {
+            var _props_key;
+            viewProps[key4] = (_props_key = props[key4]) !== null && _props_key !== void 0 ? _props_key : val2;
+          }
+          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, key4, val2, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(" - passing down prop ".concat(key4)), (0, import_log.log)({
+            val: val2,
+            after: _object_spread2({}, viewProps[key4])
+          }), console.groupEnd()), "continue";
+          if (isPseudo) {
+            if (!val2) return "continue";
+            var pseudoStyleObject = getSubStyle(styleState, key4, val2, styleProps.noClassNames), descriptor = import_pseudoDescriptors.pseudoDescriptors[key4], isEnter = key4 === "enterStyle", isExit = key4 === "exitStyle";
+            if (!descriptor) return "continue";
+            if (!shouldDoClasses || process.env.IS_STATIC === "is_static") {
+              var _pseudos, _key;
+              if (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key4] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static") return Object.assign(pseudos[key4], pseudoStyleObject), "continue";
+            }
+            if (shouldDoClasses && !isExit) {
+              var pseudoStyles = (0, import_getStylesAtomic.getStyleAtomic)(pseudoStyleObject, descriptor);
+              process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key4), (0, import_log.log)({
+                pseudoStyleObject,
+                pseudoStyles
+              }), console.groupEnd());
+              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[import_helpers.StyleObjectProperty]).concat(PROP_SPLIT).concat(descriptor.name);
+                  fullKey in usedKeys || (addStyleToInsertRules(rulesToInsert, psuedoStyle), mergeClassName(transforms, classNames, fullKey, psuedoStyle[import_helpers.StyleObjectIdentifier], isMediaOrPseudo1, !0));
+                }
+              } catch (err) {
+                _didIteratorError2 = !0, _iteratorError2 = err;
+              } finally {
+                try {
+                  !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
+                } finally {
+                  if (_didIteratorError2) throw _iteratorError2;
+                }
+              }
+            }
+            if (!shouldDoClasses || isExit || isEnter) {
+              var descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = componentState[descriptorKey] === !1;
+              isExit && (isDisabled = !styleProps.isExiting), isEnter && componentState.unmounted === !1 && (isDisabled = !0), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo", key4, {
+                isDisabled
+              }), (0, import_log.log)({
+                pseudoStyleObject,
+                isDisabled,
+                descriptor,
+                componentState
+              }), console.groupEnd());
+              var importance = descriptor.priority;
+              for (var pkey in pseudoStyleObject) {
+                var val12 = pseudoStyleObject[pkey];
+                if (isDisabled) applyDefaultStyle(pkey, styleState);
+                else {
+                  var curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
+                  if (shouldMerge) {
+                    var _pseudos1, _key1;
+                    pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key4] || (_pseudos1[_key1] = {}), pseudos[key4][pkey] = val12, mergeStyle(styleState, pkey, val12);
+                  }
+                  process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
+                    importance,
+                    curImportance,
+                    pkey,
+                    val: val12
+                  });
+                }
+              }
+              if (!isDisabled) for (var key12 in val2) {
+                var k1 = shorthands[key12] || key12;
+                usedKeys[k1] = Math.max(importance, usedKeys[k1] || 0);
+              }
+            }
+            return "continue";
+          }
+          if (isMedia) {
+            if (!val2) return "continue";
+            var hasSpace = val2.space, mediaKeyShort = key4.slice(1);
+            if (hasMedia || (hasMedia = !0), (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && (((typeof hasMedia > "u" ? "undefined" : _type_of(hasMedia)) > "u" ? "undefined" : _type_of1(hasMedia)) !== "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !(0, import_isActivePlatform.isActivePlatform)(key4)) return "continue";
+            if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} ".concat(key4), {
+              key: key4,
+              val: val2,
+              props,
+              shouldDoClasses,
+              acceptsClassName,
+              componentState,
+              mediaState: mediaState2
+            }), shouldDoClasses) {
+              var mediaStyle = getSubStyle(styleState, key4, val2, !1);
+              if (hasSpace && (delete mediaStyle.space, mediaState2[mediaKeyShort])) {
+                var importance1 = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKeyShort, "space", usedKeys, !0);
+                importance1 && (space = val2.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("Found more important space for current media ".concat(mediaKeyShort, ": ").concat(val2, " (importance: ").concat(importance1, ")")));
+              }
+              var mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle), priority = mediaStylesSeen;
+              mediaStylesSeen += 1;
+              var _iteratorNormalCompletion12 = !0, _didIteratorError12 = !1, _iteratorError12 = void 0;
+              try {
+                for (var _iterator12 = mediaStyles[Symbol.iterator](), _step12; !(_iteratorNormalCompletion12 = (_step12 = _iterator12.next()).done); _iteratorNormalCompletion12 = !0) {
+                  var style3 = _step12.value, property = style3[0];
+                  if (!(property[0] === "$" && property.startsWith("$platform") && !(0, import_isActivePlatform.isActivePlatform)(property))) {
+                    var out = (0, import_createMediaStyle.createMediaStyle)(style3, mediaKeyShort, import_useMedia.mediaQueryConfig, isMedia, !1, priority);
+                    process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out);
+                    var fullKey1 = "".concat(style3[import_helpers.StyleObjectProperty]).concat(PROP_SPLIT).concat(mediaKeyShort).concat(style3[import_helpers.StyleObjectPseudo] || "");
+                    fullKey1 in usedKeys || (addStyleToInsertRules(rulesToInsert, out), mergeClassName(transforms, classNames, fullKey1, out[import_helpers.StyleObjectIdentifier], !0, !0));
+                  }
+                }
+              } catch (err) {
+                _didIteratorError12 = !0, _iteratorError12 = err;
+              } finally {
+                try {
+                  !_iteratorNormalCompletion12 && _iterator12.return != null && _iterator12.return();
+                } finally {
+                  if (_didIteratorError12) throw _iteratorError12;
+                }
+              }
+            } else {
+              var mergeMediaStyle = function(key5, val3) {
+                var _styleState4;
+                (_styleState4 = styleState).style || (_styleState4.style = {});
+                var didMerge = mergeMediaByImportance(styleState, mediaKeyShort, key5, val3, usedKeys, mediaState2[mediaKeyShort], importanceBump, debug);
+                didMerge && key5 === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
+              }, isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
+              if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
+                if (!mediaState2[mediaKeyShort]) return process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} \u274C DISABLED ".concat(mediaKeyShort)), "continue";
+                process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} \u2705 ENABLED ".concat(mediaKeyShort));
+              }
+              var mediaStyle1 = getSubStyle(styleState, key4, val2, !0), importanceBump = 0;
+              if (isThemeMedia) {
+                dynamicThemeAccess = !0;
+                var mediaThemeName = mediaKeyShort.slice(6);
+                if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName))) return "continue";
+              } else if (isGroupMedia) {
+                var _componentState_group, groupInfo = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyShort), groupName = groupInfo.name, groupContext = context == null ? void 0 : context.groups.state[groupName];
+                if (!groupContext) return process.env.NODE_ENV === "development" && debug && (0, import_log.log)("No parent with group prop, skipping styles: ".concat(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 = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(" \u{1F3D8}\uFE0F GROUP media ".concat(groupMediaKey, " active? ").concat(isActive)), !isActive) {
+                    for (var pkey1 in mediaStyle1) applyDefaultStyle(pkey1, styleState);
+                    return "continue";
+                  }
+                  importanceBump = 2;
+                }
+                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 = import_pseudoDescriptors.pseudoPriorities[groupPseudoKey];
+                  if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(" \u{1F3D8}\uFE0F GROUP pseudo ".concat(groupMediaKey, " active? ").concat(isActive1, ", priority ").concat(priority1)), !isActive1) {
+                    for (var pkey2 in mediaStyle1) applyDefaultStyle(pkey2, styleState);
+                    return "continue";
+                  }
+                  importanceBump = priority1;
+                }
+              }
+              for (var subKey in mediaStyle1) {
+                if (subKey === "space") {
+                  space = valInit.space;
+                  continue;
+                }
+                if (subKey[0] === "$") {
+                  if (!(0, import_isActivePlatform.isActivePlatform)(subKey)) continue;
+                  for (var subSubKey in mediaStyle1[subKey]) mergeMediaStyle(subSubKey, mediaStyle1[subKey][subSubKey]);
+                } else mergeMediaStyle(subKey, mediaStyle1[subKey]);
+              }
+            }
+            return "continue";
+          }
+          if (key4 === "pointerEvents") return viewProps[key4] = val2, "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(key4, staticConfig) || import_constants.isAndroid && key4 === "elevation")
+          ) return mergeStyle(styleState, key4, val2), "continue";
+          isVariant || (viewProps[key4] = val2);
+        }, keyInit = keyOg2, valInit = props[keyInit];
+        if (accept) {
+          var accepted = accept[keyInit];
+          if ((accepted === "style" || accepted === "textStyle") && valInit && ((typeof valInit > "u" ? "undefined" : _type_of(valInit)) > "u" ? "undefined" : _type_of1(valInit)) === "object") return viewProps[keyInit] = getSubStyle(styleState, keyInit, valInit, styleProps.noClassNames), "continue";
+        }
+        if (process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd(), disableExpandShorthands || keyInit in shorthands && (keyInit = shorthands[keyInit]), keyInit === "className" || keyInit in usedKeys) return "continue";
+        if (keyInit in import_skipProps.skipProps && !noSkip && !isHOC) {
+          if (keyInit === "group" && !1) var identifier2, containerType, containerCSS;
+          return "continue";
+        }
+        var valInitType = (typeof valInit > "u" ? "undefined" : _type_of(valInit)) > "u" ? "undefined" : _type_of1(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
+        if (0) {
+          var isValidClassName, isMediaOrPseudo;
+          if ((isValidClassName || isMediaOrPseudo) && !shouldDoClasses) var _styleState3;
+        }
+        if (!isValidStyleKeyInit) {
+          if (!import_constants.isAndroid && keyInit === "elevationAndroid") return "continue";
+          if (keyInit === "userSelect") keyInit = "selectable", valInit = valInit !== "none";
+          else if (keyInit.startsWith("data-")) return "continue";
+        }
+        if (keyInit === "dataSet") {
+          for (var keyInit1 in valInit) viewProps["data-".concat(hyphenate(keyInit1))] = valInit[keyInit1];
+          return "continue";
+        }
+        if (0) var didUseKeyInit;
+        var isShorthand = keyInit in shorthands, isVariant = !isValidStyleKeyInit && variants && keyInit in variants, isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant, isPseudo = keyInit in import_helpers.validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.isMediaKey)(keyInit), isMediaOrPseudo1 = !!(isMedia || isPseudo);
+        if (isMediaOrPseudo1 && keyInit.startsWith("$group-")) {
+          var name2 = keyInit.split("-")[1];
+          context != null && context.groups.subscribe && !(context != null && context.groups.state[name2]) && (keyInit = keyInit.replace("$group-", "$group-true-"));
+        }
+        var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo1 || isVariant && !noExpand || isShorthand;
+        if (isStyleProp && (asChild === "except-style" || asChild === "except-style-web")) return "continue";
+        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 import_skipProps.skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
+        if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupEnd(), console.groupEnd(), consoleGroupCollapsed("  \u{1F511} ".concat(keyOg2).concat(keyInit !== keyOg2 ? " (shorthand for ".concat(keyInit, ")") : "", " ").concat(shouldPassThrough ? "(pass)" : "")), (0, import_log.log)({
+          isVariant,
+          valInit,
+          shouldPassProp
+        }), import_constants.isClient && (0, import_log.log)({
+          variants,
+          variant: variants == null ? void 0 : variants[keyInit],
+          isVariant,
+          isHOCShouldPassThrough,
+          curProps: _object_spread2({}, styleState.curProps),
+          parentStaticConfig
+        })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo1), !isVariant) || !noSkip && keyInit in import_skipProps.skipProps) return process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd(), "continue";
+        (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
+        var avoidPropMap = isMediaOrPseudo1 || !isVariant && !isValidStyleKeyInit, expanded = avoidPropMap ? null : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
+        if (!avoidPropMap) {
+          if (!expanded) return "continue";
+          var next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
+          next && (styleState.fontFamily = next);
+        }
+        if (process.env.NODE_ENV === "development" && debug === "verbose") {
+          consoleGroupCollapsed("  \u{1F4A0} expanded", keyInit, valInit);
+          try {
+            !import_constants.isServer && import_isDevTools.isDevTools && ((0, import_log.log)({
+              expanded,
+              styleProps,
+              componentState,
+              isVariant,
+              variant: variants == null ? void 0 : variants[keyInit],
+              shouldPassProp,
+              isHOCShouldPassThrough,
+              usedKeys: _object_spread2({}, usedKeys),
+              curProps: _object_spread2({}, styleState.curProps)
+            }), (0, import_log.log)("expanded", expanded, `
+usedKeys`, _object_spread2({}, usedKeys), `
+current`, _object_spread2({}, styleState.style)));
+          } catch {
+          }
+          console.groupEnd();
+        }
+        for (var key4 = keyInit, val2 = valInit, max = expanded ? expanded.length : 1, i2 = 0; i2 < max; i2++) _loop22(i2);
+        if (process.env.NODE_ENV === "development" && debug === "verbose") {
+          try {
+            (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", _object_spread2({}, styleState.style)), (0, import_log.log)("transforms", _object_spread2({}, transforms)), (0, import_log.log)("viewProps", _object_spread2({}, viewProps));
+          } catch {
+          }
+          console.groupEnd();
+        }
+      };
       conf = conf || (0, import_config.getConfig)(), import_constants.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 = {}, mediaState2 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, curPropsState, styleState = {
         // this should go away, right now we're doing really crazy cumulative props,
@@ -7850,311 +8181,24 @@ var require_getSplitStyles_native = __commonJS({
         theme: _object_spread2({}, 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;
-      for (var keyOg in props) {
-        var keyInit = keyOg, valInit = props[keyInit];
-        if (accept) {
-          var accepted = accept[keyInit];
-          if ((accepted === "style" || accepted === "textStyle") && valInit && ((typeof valInit > "u" ? "undefined" : _type_of(valInit)) > "u" ? "undefined" : _type_of1(valInit)) === "object") {
-            viewProps[keyInit] = getSubStyle(styleState, keyInit, valInit, styleProps.noClassNames);
-            continue;
-          }
-        }
-        if (process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd(), disableExpandShorthands || keyInit in shorthands && (keyInit = shorthands[keyInit]), keyInit !== "className" && !(keyInit in usedKeys)) {
-          if (keyInit in import_skipProps.skipProps && !noSkip && !isHOC) {
-            if (keyInit === "group" && !1) var identifier, containerType, containerCSS;
-            continue;
-          }
-          var valInitType = (typeof valInit > "u" ? "undefined" : _type_of(valInit)) > "u" ? "undefined" : _type_of1(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
-          if (0) {
-            var isValidClassName, isMediaOrPseudo;
-            if ((isValidClassName || isMediaOrPseudo) && !shouldDoClasses) var _styleState;
-          }
-          if (!isValidStyleKeyInit) {
-            if (!import_constants.isAndroid && keyInit === "elevationAndroid") continue;
-            if (keyInit === "userSelect") keyInit = "selectable", valInit = valInit !== "none";
-            else if (keyInit.startsWith("data-")) continue;
-          }
-          if (keyInit === "dataSet") {
-            for (var keyInit1 in valInit) viewProps["data-".concat(hyphenate(keyInit1))] = valInit[keyInit1];
-            continue;
-          }
-          if (0) var didUseKeyInit;
-          var isShorthand = keyInit in shorthands, isVariant = !isValidStyleKeyInit && variants && keyInit in variants, isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant, isPseudo = keyInit in import_helpers.validPseudoKeys, isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.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-"));
-          }
-          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 import_skipProps.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)" : "")), (0, import_log.log)({
-              isVariant,
-              valInit,
-              shouldPassProp
-            }), import_constants.isClient && (0, import_log.log)({
-              variants,
-              variant: variants == null ? void 0 : variants[keyInit],
-              isVariant,
-              isHOCShouldPassThrough,
-              curProps: _object_spread2({}, styleState.curProps),
-              parentStaticConfig
-            })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo1), !isVariant)) {
-              process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd();
-              continue;
-            }
-            if (!noSkip && keyInit in import_skipProps.skipProps) {
-              process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd();
-              continue;
-            }
-            (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
-            var avoidPropMap = isMediaOrPseudo1 || !isVariant && !isValidStyleKeyInit, expanded = avoidPropMap ? null : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
-            if (!avoidPropMap) {
-              if (!expanded) continue;
-              var next = (0, import_propMapper.getPropMappedFontFamily)(expanded);
-              next && (styleState.fontFamily = next);
-            }
-            if (process.env.NODE_ENV === "development" && debug === "verbose") {
-              consoleGroupCollapsed("  \u{1F4A0} expanded", keyInit, valInit);
-              try {
-                !import_constants.isServer && import_isDevTools.isDevTools && ((0, import_log.log)({
-                  expanded,
-                  styleProps,
-                  componentState,
-                  isVariant,
-                  variant: variants == null ? void 0 : variants[keyInit],
-                  shouldPassProp,
-                  isHOCShouldPassThrough,
-                  usedKeys: _object_spread2({}, usedKeys),
-                  curProps: _object_spread2({}, styleState.curProps)
-                }), (0, import_log.log)("expanded", expanded, `
-usedKeys`, _object_spread2({}, usedKeys), `
-current`, _object_spread2({}, styleState.style)));
-              } catch {
-              }
-              console.groupEnd();
-            }
-            for (var key = keyInit, val = valInit, max = expanded ? expanded.length : 1, i = 0; i < max; i++) {
-              var _parentStaticConfig_variants;
-              if (expanded) {
-                var _expanded_i = _sliced_to_array(expanded[i], 2), k = _expanded_i[0], v = _expanded_i[1];
-                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), isMediaOrPseudo1 = !!(isMedia || isPseudo), isVariant = variants && key in variants, inlineProps != null && inlineProps.has(key) || process.env.IS_STATIC === "is_static" && inlineWhenUnflattened != null && inlineWhenUnflattened.has(key)) {
-                  var _props_key;
-                  viewProps[key] = (_props_key = props[key]) !== null && _props_key !== void 0 ? _props_key : val;
-                }
-                var shouldPassThrough1 = styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo1 || (parentStaticConfig == null || (_parentStaticConfig_variants = parentStaticConfig.variants) === null || _parentStaticConfig_variants === void 0 ? void 0 : _parentStaticConfig_variants[keyInit]));
-                if (shouldPassThrough1) {
-                  passDownProp(viewProps, key, val, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(" - passing down prop ".concat(key)), (0, import_log.log)({
-                    val,
-                    after: _object_spread2({}, viewProps[key])
-                  }), console.groupEnd());
-                  continue;
-                }
-                if (isPseudo) {
-                  if (!val) continue;
-                  var pseudoStyleObject = getSubStyle(styleState, key, val, styleProps.noClassNames), descriptor = import_pseudoDescriptors.pseudoDescriptors[key], isEnter = key === "enterStyle", isExit = key === "exitStyle";
-                  if (!descriptor) continue;
-                  if (!shouldDoClasses || process.env.IS_STATIC === "is_static") {
-                    var _pseudos, _key;
-                    if (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static") {
-                      Object.assign(pseudos[key], pseudoStyleObject);
-                      continue;
-                    }
-                  }
-                  if (shouldDoClasses && !isExit) {
-                    var pseudoStyles = (0, import_getStylesAtomic.getStyleAtomic)(pseudoStyleObject, descriptor);
-                    process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key), (0, import_log.log)({
-                      pseudoStyleObject,
-                      pseudoStyles
-                    }), console.groupEnd());
-                    var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
-                    try {
-                      for (var _iterator = pseudoStyles[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-                        var psuedoStyle = _step.value, fullKey = "".concat(psuedoStyle[import_helpers.StyleObjectProperty]).concat(PROP_SPLIT).concat(descriptor.name);
-                        fullKey in usedKeys || (addStyleToInsertRules(rulesToInsert, psuedoStyle), mergeClassName(transforms, classNames, fullKey, psuedoStyle[import_helpers.StyleObjectIdentifier], isMediaOrPseudo1, !0));
-                      }
-                    } catch (err) {
-                      _didIteratorError = !0, _iteratorError = err;
-                    } finally {
-                      try {
-                        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-                      } finally {
-                        if (_didIteratorError) throw _iteratorError;
-                      }
-                    }
-                  }
-                  if (!shouldDoClasses || isExit || isEnter) {
-                    var descriptorKey = descriptor.stateKey || descriptor.name, isDisabled = componentState[descriptorKey] === !1;
-                    isExit && (isDisabled = !styleProps.isExiting), isEnter && componentState.unmounted === !1 && (isDisabled = !0), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo", key, {
-                      isDisabled
-                    }), (0, import_log.log)({
-                      pseudoStyleObject,
-                      isDisabled,
-                      descriptor,
-                      componentState
-                    }), console.groupEnd());
-                    var importance = descriptor.priority;
-                    for (var pkey in pseudoStyleObject) {
-                      var val1 = pseudoStyleObject[pkey];
-                      if (isDisabled) {
-                        var defaultValues = animatableDefaults[pkey];
-                        defaultValues != null && !(pkey in usedKeys) && (!styleState.style || !(pkey in styleState.style)) && mergeStyle(styleState, pkey, defaultValues);
-                      } else {
-                        var curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
-                        if (shouldMerge) {
-                          var _pseudos1, _key1;
-                          pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key] || (_pseudos1[_key1] = {}), pseudos[key][pkey] = val1, mergeStyle(styleState, pkey, val1);
-                        }
-                        process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
-                          importance,
-                          curImportance,
-                          pkey,
-                          val: val1
-                        });
-                      }
-                    }
-                    if (!isDisabled) for (var key1 in val) {
-                      var k1 = shorthands[key1] || key1;
-                      usedKeys[k1] = Math.max(importance, usedKeys[k1] || 0);
-                    }
-                  }
-                  continue;
-                }
-                if (isMedia) {
-                  if (!val) continue;
-                  var hasSpace = val.space, mediaKeyShort = key.slice(1);
-                  if (hasMedia || (hasMedia = !0), (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && (((typeof hasMedia > "u" ? "undefined" : _type_of(hasMedia)) > "u" ? "undefined" : _type_of1(hasMedia)) !== "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform") {
-                    var platform = key.slice(10);
-                    if (
-                      // supports web, ios, android
-                      platform !== import_constants.currentPlatform && // supports web, native
-                      platform !== "native"
-                    ) continue;
-                  }
-                  if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} ".concat(key), {
-                    key,
-                    val,
-                    props,
-                    shouldDoClasses,
-                    acceptsClassName,
-                    componentState,
-                    mediaState: mediaState2
-                  }), shouldDoClasses) {
-                    var mediaStyle = getSubStyle(styleState, key, val, !1);
-                    if (hasSpace && (delete mediaStyle.space, mediaState2[mediaKeyShort])) {
-                      var importance1 = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKeyShort, "space", usedKeys, !0);
-                      importance1 && (space = val.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("Found more important space for current media ".concat(mediaKeyShort, ": ").concat(val, " (importance: ").concat(importance1, ")")));
-                    }
-                    var mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle), priority = mediaStylesSeen;
-                    mediaStylesSeen += 1;
-                    var _iteratorNormalCompletion1 = !0, _didIteratorError1 = !1, _iteratorError1 = void 0;
-                    try {
-                      for (var _iterator1 = mediaStyles[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
-                        var style = _step1.value, out = (0, import_createMediaStyle.createMediaStyle)(style, mediaKeyShort, import_useMedia.mediaQueryConfig, isMedia, !1, priority);
-                        process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("\u{1F4FA} media style:", out);
-                        var fullKey1 = "".concat(style[import_helpers.StyleObjectProperty]).concat(PROP_SPLIT).concat(mediaKeyShort).concat(style[import_helpers.StyleObjectPseudo] || "");
-                        fullKey1 in usedKeys || (addStyleToInsertRules(rulesToInsert, out), mergeClassName(transforms, classNames, fullKey1, out[import_helpers.StyleObjectIdentifier], !0, !0));
-                      }
-                    } catch (err) {
-                      _didIteratorError1 = !0, _iteratorError1 = err;
-                    } finally {
-                      try {
-                        !_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
-                      } finally {
-                        if (_didIteratorError1) throw _iteratorError1;
-                      }
-                    }
-                  } else {
-                    var isThemeMedia = isMedia === "theme", isGroupMedia = isMedia === "group", isPlatformMedia = isMedia === "platform";
-                    if (!isThemeMedia && !isPlatformMedia && !isGroupMedia) {
-                      if (!mediaState2[mediaKeyShort]) {
-                        process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} \u274C DISABLED ".concat(mediaKeyShort));
-                        continue;
-                      }
-                      process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} \u2705 ENABLED ".concat(mediaKeyShort));
-                    }
-                    var mediaStyle1 = getSubStyle(styleState, key, val, !0), importanceBump = 0;
-                    if (isThemeMedia) {
-                      dynamicThemeAccess = !0;
-                      var mediaThemeName = mediaKeyShort.slice(6);
-                      if (!(themeName === mediaThemeName || themeName.startsWith(mediaThemeName))) continue;
-                    } else if (isGroupMedia) {
-                      var _componentState_group, 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 && (0, import_log.log)("No parent with group prop, skipping styles: ".concat(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 = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(" \u{1F3D8}\uFE0F GROUP media ".concat(groupMediaKey, " active? ").concat(isActive)), !isActive) continue;
-                        importanceBump = 2;
-                      }
-                      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 = import_pseudoDescriptors.pseudoPriorities[groupPseudoKey];
-                        if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(" \u{1F3D8}\uFE0F GROUP pseudo ".concat(groupMediaKey, " active? ").concat(isActive1, ", priority ").concat(priority1)), !isActive1) continue;
-                        importanceBump = priority1;
-                      }
-                    }
-                    for (var subKey in mediaStyle1) {
-                      var _styleState1;
-                      if (subKey === "space") {
-                        space = valInit.space;
-                        continue;
-                      }
-                      (_styleState1 = styleState).style || (_styleState1.style = {}), mergeMediaByImportance(styleState, mediaKeyShort, subKey, mediaStyle1[subKey], usedKeys, mediaState2[mediaKeyShort], importanceBump, debug), key === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
-                    }
-                  }
-                  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_constants.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", _object_spread2({}, styleState.style)), (0, import_log.log)("transforms", _object_spread2({}, transforms)), (0, import_log.log)("viewProps", _object_spread2({}, viewProps));
-              } catch {
-              }
-              console.groupEnd();
-            }
-          }
-        }
-      }
+      for (var keyOg in props) _loop(keyOg);
       var avoidNormalize = styleProps.noNormalize === !1;
       if (!avoidNormalize) {
         if (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), import_constants.isWeb && !isReactNative && (0, import_getStylesAtomic.styleToCSS)(styleState.style)), styleState.flatTransforms) {
-          var _styleState2;
-          (_styleState2 = styleState).style || (_styleState2.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
+          var _styleState;
+          (_styleState = styleState).style || (_styleState.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];
             return a.localeCompare(b);
           }).forEach(function(param) {
-            var _param = _sliced_to_array(param, 2), key6 = _param[0], val4 = _param[1];
-            mergeTransform(styleState.style, key6, val4, !0);
+            var _param = _sliced_to_array(param, 2), key4 = _param[0], val2 = _param[1];
+            mergeTransform(styleState.style, key4, val2, !0);
           });
         }
         if (parentSplitStyles) {
-          if (0) for (var key2 in parentSplitStyles.classNames) var val2;
-          if (!shouldDoClasses) for (var key3 in parentSplitStyles.style) {
-            var _styleState3;
-            key3 in classNames || styleState.style && key3 in styleState.style || ((_styleState3 = styleState).style || (_styleState3.style = {}), styleState.style[key3] = parentSplitStyles.style[key3]);
+          if (0) for (var key in parentSplitStyles.classNames) var val;
+          if (!shouldDoClasses) for (var key1 in parentSplitStyles.style) {
+            var _styleState1;
+            key1 in classNames || styleState.style && key1 in styleState.style || ((_styleState1 = styleState).style || (_styleState1.style = {}), styleState.style[key1] = parentSplitStyles.style[key1]);
           }
         }
       }
@@ -8163,9 +8207,9 @@ current`, _object_spread2({}, styleState.style)));
         if (styleState.style && shouldDoClasses) {
           var retainedStyles, shouldRetain;
           if (!styleState.style.$$css) {
-            var atomic, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2;
+            var atomic, _iteratorNormalCompletion, _didIteratorError, _iteratorError;
             try {
-              for (var _iterator2, _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) var atomicStyle, _props_animateOnly, _atomicStyle, key4, value, identifier1, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
+              for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) var atomicStyle, _props_animateOnly, _atomicStyle, key2, value, identifier, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
             } catch (err) {
             } finally {
               try {
@@ -8174,8 +8218,8 @@ current`, _object_spread2({}, styleState.style)));
             }
           }
           if (transforms) for (var namespace in transforms) {
-            var _transforms_namespace, hash, val3, identifier2;
-            if (import_constants.isClient && !insertedTransforms[identifier2]) var rule;
+            var _transforms_namespace, hash, val1, identifier1;
+            if (import_constants.isClient && !insertedTransforms[identifier1]) var rule;
           }
         }
         if (isReactNative) {
@@ -8184,22 +8228,22 @@ current`, _object_spread2({}, styleState.style)));
       }
       var styleProp = props.style;
       if (styleProp) if (isHOC) viewProps.style = normalizeStyle(styleProp);
-      else for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i1 = 0; i1 < len; i1++) {
-        var style1 = isArray ? styleProp[i1] : styleProp;
-        if (style1) if (style1.$$css) Object.assign(styleState.classNames, style1);
+      else for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i = 0; i < len; i++) {
+        var style = isArray ? styleProp[i] : styleProp;
+        if (style) if (style.$$css) Object.assign(styleState.classNames, style);
         else {
-          var _styleState4;
-          (_styleState4 = styleState).style || (_styleState4.style = {}), Object.assign(styleState.style, normalizeStyle(style1));
+          var _styleState2;
+          (_styleState2 = styleState).style || (_styleState2.style = {}), Object.assign(styleState.style, normalizeStyle(style));
         }
       }
-      var style2 = styleState.style;
-      if (style2 != null && style2.fontFamily) {
-        var _getFont, faceInfo = (_getFont = (0, import_config.getFont)(style2.fontFamily)) === null || _getFont === void 0 ? void 0 : _getFont.face;
+      var style1 = styleState.style;
+      if (style1 != null && style1.fontFamily) {
+        var _getFont, faceInfo = (_getFont = (0, import_config.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[style2.fontWeight]) === null || _faceInfo_style_fontWeight === void 0 || (_faceInfo_style_fontWeight_ = _faceInfo_style_fontWeight[style2.fontStyle || "normal"]) === null || _faceInfo_style_fontWeight_ === void 0 ? void 0 : _faceInfo_style_fontWeight_.val;
-          overrideFace && (style2.fontFamily = overrideFace, styleState.fontFamily = overrideFace, delete style2.fontWeight, delete style2.fontStyle);
+          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" && (0, import_log.log)("Found fontFamily native: ".concat(style2.fontFamily), faceInfo);
+        process.env.NODE_ENV === "development" && debug && debug !== "profile" && (0, import_log.log)("Found fontFamily native: ".concat(style1.fontFamily), faceInfo);
       }
       var result = {
         space,
@@ -8215,13 +8259,13 @@ current`, _object_spread2({}, styleState.style)));
         mediaGroups
       }, asChildExceptStyleLike = asChild === "except-style" || asChild === "except-style-web";
       if (!asChildExceptStyleLike) {
-        var style3 = styleState.style;
+        var style2 = styleState.style;
         if (0) {
           var _staticConfig_defaultProps, fontFamily, fontFamilyClassName, groupClassName, componentNameFinal, componentClassName, classList, finalClassName;
           if (!styleProps.noMergeStyle && !(styleProps.isAnimated && !conf.animations.supportsCSSVars && isReactNative) && isReactNative) {
-            var cnStyles, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3;
+            var cnStyles, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1;
             try {
-              for (var _iterator3, _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) var name1;
+              for (var _iterator1, _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) var name;
             } catch (err) {
             } finally {
               try {
@@ -8229,7 +8273,7 @@ current`, _object_spread2({}, styleState.style)));
               }
             }
           }
-        } else style3 && !styleProps.noMergeStyle && (viewProps.style = style3);
+        } else style2 && !styleProps.noMergeStyle && (viewProps.style = style2);
       }
       if (process.env.NODE_ENV === "development" && debug === "verbose" && import_isDevTools.isDevTools) {
         consoleGroupCollapsed("\u{1F539} getSplitStyles ===>");
@@ -8242,7 +8286,7 @@ current`, _object_spread2({}, styleState.style)));
             rulesToInsert,
             parentSplitStyles
           });
-          for (var key5 in logs) (0, import_log.log)(key5, logs[key5]);
+          for (var key3 in logs) (0, import_log.log)(key3, logs[key3]);
         } catch {
         }
         console.groupEnd();
@@ -8357,6 +8401,10 @@ current`, _object_spread2({}, styleState.style)));
       }
       return import_constants.isWeb && Array.isArray(out.transform) && (out.transform = (0, import_transformsToString.transformsToString)(out.transform)), (0, import_expandStyles.fixStyles)(out), out;
     }
+    function applyDefaultStyle(pkey, styleState) {
+      var defaultValues = animatableDefaults[pkey];
+      defaultValues != null && !(pkey in styleState.usedKeys) && (!styleState.style || !(pkey in styleState.style)) && mergeStyle(styleState, pkey, defaultValues);
+    }
   }
 });
 
@@ -10182,11 +10230,11 @@ If you meant to do this, you can disable this warning - either change untilMeasu
     }, subscribeToContextGroup = function(param) {
       var _param_disabled = param.disabled, disabled = _param_disabled === void 0 ? !1 : _param_disabled, setStateShallow = param.setStateShallow, pseudoGroups = param.pseudoGroups, mediaGroups = param.mediaGroups, componentContext = param.componentContext, state = param.state;
       if (pseudoGroups || mediaGroups) {
-        var _componentContext_groups, current = {
+        var _componentContext_groups_subscribe, _componentContext_groups, current = {
           pseudo: {},
           media: {}
         };
-        return process.env.NODE_ENV === "development" && !componentContext.groups && console.debug("No context group found"), (_componentContext_groups = componentContext.groups) === null || _componentContext_groups === void 0 ? void 0 : _componentContext_groups.subscribe(function(name, param2) {
+        return process.env.NODE_ENV === "development" && !componentContext.groups && console.debug("No context group found"), (_componentContext_groups = componentContext.groups) === null || _componentContext_groups === void 0 || (_componentContext_groups_subscribe = _componentContext_groups.subscribe) === null || _componentContext_groups_subscribe === void 0 ? void 0 : _componentContext_groups_subscribe.call(_componentContext_groups, function(name, param2) {
           var layout = param2.layout, pseudo = param2.pseudo, persist = function() {
             var group = _object_spread_props(_object_spread2({}, state.group), _define_property2({}, name, current));
             setStateShallow({