@tamagui/web - npm Package Compare versions

Comparing version 1.109.7 to 1.109.8

dist/cjs/helpers/getSplitStyles.native.js

@@ -118,23 +118,58 @@ "use strict";
 var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug, skipThemeTokenResolution) {
-  var _loop = function(keyOg2) {
-    var _loop2 = function(i3) {
+  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 = {}, mediaState = 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,
+    // as variants are resolved basically we go back and merge the results onto
+    // the curProps, so that each following variant function recieves the current
+    // "styles" with variants expanded. powerful, but i think too fancy
+    // there's some part of the ui kit that depends on it we'd have to find and fix
+    get curProps() {
+      return curPropsState || (curPropsState = {}), curPropsState;
+    },
+    classNames,
+    conf,
+    props,
+    styleProps,
+    componentState,
+    staticConfig,
+    style: null,
+    theme,
+    usedKeys,
+    viewProps,
+    context,
+    debug,
+    skipThemeTokenResolution
+  };
+  process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants.isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), (0, import_log.log)({
+    props,
+    staticConfig,
+    shouldDoClasses,
+    styleProps,
+    rulesToInsert,
+    componentState,
+    styleState,
+    theme: _object_spread({}, 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 _loop = function(i2) {
       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;
+        var _expanded_i = _sliced_to_array(expanded[i2], 2), k = _expanded_i[0], v = _expanded_i[1];
+        key = k, val = 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))) {
+      if (val == null || key in usedKeys) return "continue";
+      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[key4] = (_props_key = props[key4]) !== null && _props_key !== void 0 ? _props_key : val2;
+        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, key4, val2, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(" - passing down prop ".concat(key4)), (0, import_log.log)({
-          val: val2,
-          after: _object_spread({}, viewProps[key4])
+        return 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_spread({}, viewProps[key])
         }), 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 (!val) return "continue";
+        var pseudoStyleObject = getSubStyle(styleState, key, val, styleProps.noClassNames), descriptor = import_pseudoDescriptors.pseudoDescriptors[key], isEnter = key === "enterStyle", isExit = key === "exitStyle";
         if (!descriptor)
@@ -144,8 +179,8 @@ return "continue";
           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 (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static")
+            return 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)", key4), (0, import_log.log)({
+          process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key), (0, import_log.log)({
             pseudoStyleObject,
@@ -173,3 +208,3 @@ pseudoStyles
           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, {
+          isExit && (isDisabled = !styleProps.isExiting), isEnter && componentState.unmounted === !1 && (isDisabled = !0), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo", key, {
             isDisabled
@@ -191,3 +226,3 @@ }), (0, import_log.log)({
                 var _pseudos1, _key1;
-                pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key4] || (_pseudos1[_key1] = {}), pseudos[key4][pkey] = val12, mergeStyle(styleState, pkey, val12);
+                pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key] || (_pseudos1[_key1] = {}), pseudos[key][pkey] = val12, mergeStyle(styleState, pkey, val12);
               }
@@ -203,3 +238,3 @@ process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
           if (!isDisabled)
-            for (var key12 in val2) {
+            for (var key12 in val) {
               var k1 = shorthands[key12] || key12;
@@ -212,9 +247,9 @@ usedKeys[k1] = Math.max(importance, usedKeys[k1] || 0);
       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)) !== "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !(0, import_isActivePlatform.isActivePlatform)(key4))
+        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" && !(0, import_isActivePlatform.isActivePlatform)(key))
           return "continue";
-        if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} ".concat(key4), {
-          key: key4,
-          val: val2,
+        if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("  \u{1F4FA} ".concat(key), {
+          key,
+          val,
           props,
@@ -226,6 +261,6 @@ shouldDoClasses,
         }), shouldDoClasses) {
-          var mediaStyle = getSubStyle(styleState, key4, val2, !1);
+          var mediaStyle = getSubStyle(styleState, key, val, !1);
           if (hasSpace && (delete mediaStyle.space, mediaState[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, ")")));
+            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, ")")));
           }
@@ -267,3 +302,3 @@ var mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle), priority = mediaStylesSeen;
           }
-          var mediaStyle1 = getSubStyle(styleState, key4, val2, !0), importanceBump = 0;
+          var mediaStyle1 = getSubStyle(styleState, key, val, !0), importanceBump = 0;
           if (isThemeMedia) {
@@ -317,149 +352,122 @@ dynamicThemeAccess = !0;
       }
-      if (key4 === "pointerEvents")
-        return viewProps[key4] = val2, "continue";
+      if (key === "pointerEvents")
+        return 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(key4, staticConfig) || import_constants.isAndroid && key4 === "elevation")
+        !isHOC && (isValidStyleKey(key, staticConfig) || import_constants.isAndroid && key === "elevation")
       )
-        return mergeStyle(styleState, key4, val2), "continue";
-      isVariant || (viewProps[key4] = val2);
-    }, keyInit = keyOg2, valInit = props[keyInit];
+        return mergeStyle(styleState, key, val), "continue";
+      isVariant || (viewProps[key] = val);
+    }, 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")
-        return viewProps[keyInit] = getSubStyle(styleState, keyInit, valInit, styleProps.noClassNames), "continue";
+      if ((accepted === "style" || accepted === "textStyle") && valInit && (typeof valInit > "u" ? "undefined" : _type_of(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) return "continue";
-    if (keyInit in import_skipProps.skipProps && !noSkip && !isHOC) {
-      if (keyInit === "group" && 0)
-        var identifier2, containerType, containerCSS;
-      return "continue";
-    }
-    var valInitType = typeof valInit > "u" ? "undefined" : _type_of(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
-    if (0 && isValidStyleKeyInit && valInitType === "string" && valInit[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 && !noExpand)
-      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_spread({}, 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,
+    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" && 0)
+          var identifier, containerType, containerCSS;
+        continue;
+      }
+      var valInitType = typeof valInit > "u" ? "undefined" : _type_of(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
+      if (0 && isValidStyleKeyInit && valInitType === "string" && valInit[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 && !noExpand)
+        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],
-          shouldPassProp,
+          isVariant,
           isHOCShouldPassThrough,
-          usedKeys: _object_spread({}, usedKeys),
-          curProps: _object_spread({}, styleState.curProps)
-        }), (0, import_log.log)("expanded", expanded, `
+          curProps: _object_spread({}, 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_spread({}, usedKeys),
+              curProps: _object_spread({}, styleState.curProps)
+            }), (0, import_log.log)("expanded", expanded, `
 usedKeys`, _object_spread({}, usedKeys), `
 current`, _object_spread({}, styleState.style)));
-      } catch {
+          } catch {
+          }
+          console.groupEnd();
+        }
+        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 {
+            (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", _object_spread({}, styleState.style)), (0, import_log.log)("transforms", _object_spread({}, transforms)), (0, import_log.log)("viewProps", _object_spread({}, viewProps));
+          } catch {
+          }
+          console.groupEnd();
+        }
       }
-      console.groupEnd();
     }
-    for (var key4 = keyInit, val2 = valInit, max = expanded ? expanded.length : 1, i2 = 0; i2 < max; i2++) _loop2(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_spread({}, styleState.style)), (0, import_log.log)("transforms", _object_spread({}, transforms)), (0, import_log.log)("viewProps", _object_spread({}, 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 = {}, mediaState = 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,
-    // as variants are resolved basically we go back and merge the results onto
-    // the curProps, so that each following variant function recieves the current
-    // "styles" with variants expanded. powerful, but i think too fancy
-    // there's some part of the ui kit that depends on it we'd have to find and fix
-    get curProps() {
-      return curPropsState || (curPropsState = {}), curPropsState;
-    },
-    classNames,
-    conf,
-    props,
-    styleProps,
-    componentState,
-    staticConfig,
-    style: null,
-    theme,
-    usedKeys,
-    viewProps,
-    context,
-    debug,
-    skipThemeTokenResolution
-  };
-  process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants.isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), (0, import_log.log)({
-    props,
-    staticConfig,
-    shouldDoClasses,
-    styleProps,
-    rulesToInsert,
-    componentState,
-    styleState,
-    theme: _object_spread({}, 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) _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 _styleState;
-      (_styleState = styleState).style || (_styleState.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
+      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];
         return a.localeCompare(b);
       }).forEach(function(param) {
-        var _param = _sliced_to_array(param, 2), key4 = _param[0], val2 = _param[1];
-        mergeTransform(styleState.style, key4, val2, !0);
+        var _param = _sliced_to_array(param, 2), key5 = _param[0], val3 = _param[1];
+        mergeTransform(styleState.style, key5, val3, !0);
       });
@@ -469,8 +477,8 @@ }
       if (0 && shouldDoClasses)
-        for (var key in parentSplitStyles.classNames)
-          var val;
+        for (var key1 in parentSplitStyles.classNames)
+          var val1;
       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]);
+        for (var key2 in parentSplitStyles.style) {
+          var _styleState2;
+          key2 in classNames || styleState.style && key2 in styleState.style || ((_styleState2 = styleState).style || (_styleState2.style = {}), styleState.style[key2] = parentSplitStyles.style[key2]);
         }
@@ -488,3 +496,3 @@ }
           for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0)
-            var atomicStyle, _props_animateOnly, _atomicStyle, key2, value, identifier, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
+            var atomicStyle, _props_animateOnly, _atomicStyle, key3, value, identifier1, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
         } catch (err) {
@@ -499,4 +507,4 @@ } finally {
         for (var namespace in transforms) {
-          var _transforms_namespace, hash, val1, identifier1;
-          if (import_constants.isClient && !insertedTransforms[identifier1])
+          var _transforms_namespace, hash, val2, identifier2;
+          if (import_constants.isClient && !insertedTransforms[identifier2])
             var rule;
@@ -516,4 +524,4 @@ }
     else
-      for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i = 0; i < len; i++) {
-        var style = isArray ? styleProp[i] : styleProp;
+      for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i1 = 0; i1 < len; i1++) {
+        var style = isArray ? styleProp[i1] : styleProp;
         if (style)
@@ -523,4 +531,4 @@ if (style.$$css)
           else {
-            var _styleState2;
-            (_styleState2 = styleState).style || (_styleState2.style = {}), Object.assign(styleState.style, normalizeStyle(style));
+            var _styleState3;
+            (_styleState3 = styleState).style || (_styleState3.style = {}), Object.assign(styleState.style, normalizeStyle(style));
           }
@@ -560,3 +568,3 @@ }
               for (var _iterator1, _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0)
-                var name;
+                var name1;
             } catch (err) {
@@ -585,4 +593,4 @@ } finally {
       });
-      for (var key3 in logs)
-        (0, import_log.log)(key3, logs[key3]);
+      for (var key4 in logs)
+        (0, import_log.log)(key4, logs[key4]);
     } catch {
@@ -589,0 +597,0 @@ }

dist/esm/helpers/getSplitStyles.native.js

@@ -106,23 +106,58 @@ import React from "react";
 var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug, skipThemeTokenResolution) {
-  var _loop = function(keyOg2) {
-    var _loop2 = function(i3) {
+  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, curPropsState, styleState = {
+    // this should go away, right now we're doing really crazy cumulative props,
+    // as variants are resolved basically we go back and merge the results onto
+    // the curProps, so that each following variant function recieves the current
+    // "styles" with variants expanded. powerful, but i think too fancy
+    // there's some part of the ui kit that depends on it we'd have to find and fix
+    get curProps() {
+      return curPropsState || (curPropsState = {}), curPropsState;
+    },
+    classNames,
+    conf,
+    props,
+    styleProps,
+    componentState,
+    staticConfig,
+    style: null,
+    theme,
+    usedKeys,
+    viewProps,
+    context,
+    debug,
+    skipThemeTokenResolution
+  };
+  process.env.NODE_ENV === "development" && debug && debug !== "profile" && isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), log({
+    props,
+    staticConfig,
+    shouldDoClasses,
+    styleProps,
+    rulesToInsert,
+    componentState,
+    styleState,
+    theme: _object_spread({}, 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 _loop = function(i2) {
       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;
+        var _expanded_i = _sliced_to_array(expanded[i2], 2), k = _expanded_i[0], v = _expanded_i[1];
+        key = k, val = v;
       }
-      if (val2 == null || key4 in usedKeys) return "continue";
-      if (isPseudo = key4 in validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && 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))) {
+      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))) {
         var _props_key;
-        viewProps[key4] = (_props_key = props[key4]) !== null && _props_key !== void 0 ? _props_key : val2;
+        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, key4, val2, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(" - passing down prop ".concat(key4)), log({
-          val: val2,
-          after: _object_spread({}, viewProps[key4])
+        return passDownProp(viewProps, key, val, isMediaOrPseudo1), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(" - passing down prop ".concat(key)), log({
+          val,
+          after: _object_spread({}, viewProps[key])
         }), console.groupEnd()), "continue";
       if (isPseudo) {
-        if (!val2) return "continue";
-        var pseudoStyleObject = getSubStyle(styleState, key4, val2, styleProps.noClassNames), descriptor = pseudoDescriptors[key4], isEnter = key4 === "enterStyle", isExit = key4 === "exitStyle";
+        if (!val) return "continue";
+        var pseudoStyleObject = getSubStyle(styleState, key, val, styleProps.noClassNames), descriptor = pseudoDescriptors[key], isEnter = key === "enterStyle", isExit = key === "exitStyle";
         if (!descriptor)
@@ -132,8 +167,8 @@ return "continue";
           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 (pseudos || (pseudos = {}), (_pseudos = pseudos)[_key = key] || (_pseudos[_key] = {}), process.env.IS_STATIC === "is_static")
+            return Object.assign(pseudos[key], pseudoStyleObject), "continue";
         }
         if (shouldDoClasses && !isExit) {
           var pseudoStyles = getStyleAtomic(pseudoStyleObject, descriptor);
-          process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key4), log({
+          process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key), log({
             pseudoStyleObject,
@@ -161,3 +196,3 @@ pseudoStyles
           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, {
+          isExit && (isDisabled = !styleProps.isExiting), isEnter && componentState.unmounted === !1 && (isDisabled = !0), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo", key, {
             isDisabled
@@ -179,3 +214,3 @@ }), log({
                 var _pseudos1, _key1;
-                pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key4] || (_pseudos1[_key1] = {}), pseudos[key4][pkey] = val12, mergeStyle(styleState, pkey, val12);
+                pseudos || (pseudos = {}), (_pseudos1 = pseudos)[_key1 = key] || (_pseudos1[_key1] = {}), pseudos[key][pkey] = val12, mergeStyle(styleState, pkey, val12);
               }
@@ -191,3 +226,3 @@ process.env.NODE_ENV === "development" && debug === "verbose" && log("    subKey", pkey, shouldMerge, {
           if (!isDisabled)
-            for (var key12 in val2) {
+            for (var key12 in val) {
               var k1 = shorthands[key12] || key12;
@@ -200,9 +235,9 @@ usedKeys[k1] = Math.max(importance, usedKeys[k1] || 0);
       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)) !== "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !isActivePlatform(key4))
+        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))
           return "continue";
-        if (process.env.NODE_ENV === "development" && debug === "verbose" && log("  \u{1F4FA} ".concat(key4), {
-          key: key4,
-          val: val2,
+        if (process.env.NODE_ENV === "development" && debug === "verbose" && log("  \u{1F4FA} ".concat(key), {
+          key,
+          val,
           props,
@@ -214,6 +249,6 @@ shouldDoClasses,
         }), shouldDoClasses) {
-          var mediaStyle = getSubStyle(styleState, key4, val2, !1);
+          var mediaStyle = getSubStyle(styleState, key, val, !1);
           if (hasSpace && (delete mediaStyle.space, mediaState[mediaKeyShort])) {
             var importance1 = getMediaImportanceIfMoreImportant(mediaKeyShort, "space", usedKeys, !0);
-            importance1 && (space = val2.space, usedKeys.space = importance1, process.env.NODE_ENV === "development" && debug === "verbose" && log("Found more important space for current media ".concat(mediaKeyShort, ": ").concat(val2, " (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 ".concat(mediaKeyShort, ": ").concat(val, " (importance: ").concat(importance1, ")")));
           }
@@ -255,3 +290,3 @@ var mediaStyles = getStylesAtomic(mediaStyle), priority = mediaStylesSeen;
           }
-          var mediaStyle1 = getSubStyle(styleState, key4, val2, !0), importanceBump = 0;
+          var mediaStyle1 = getSubStyle(styleState, key, val, !0), importanceBump = 0;
           if (isThemeMedia) {
@@ -305,149 +340,122 @@ dynamicThemeAccess = !0;
       }
-      if (key4 === "pointerEvents")
-        return viewProps[key4] = val2, "continue";
+      if (key === "pointerEvents")
+        return 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(key4, staticConfig) || isAndroid && key4 === "elevation")
+        !isHOC && (isValidStyleKey(key, staticConfig) || isAndroid && key === "elevation")
       )
-        return mergeStyle(styleState, key4, val2), "continue";
-      isVariant || (viewProps[key4] = val2);
-    }, keyInit = keyOg2, valInit = props[keyInit];
+        return mergeStyle(styleState, key, val), "continue";
+      isVariant || (viewProps[key] = val);
+    }, 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")
-        return viewProps[keyInit] = getSubStyle(styleState, keyInit, valInit, styleProps.noClassNames), "continue";
+      if ((accepted === "style" || accepted === "textStyle") && valInit && (typeof valInit > "u" ? "undefined" : _type_of(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) return "continue";
-    if (keyInit in skipProps && !noSkip && !isHOC) {
-      if (keyInit === "group" && 0)
-        var identifier2, containerType, containerCSS;
-      return "continue";
-    }
-    var valInitType = typeof valInit > "u" ? "undefined" : _type_of(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
-    if (0 && isValidStyleKeyInit && valInitType === "string" && valInit[0] === "_") {
-      var isValidClassName, isMediaOrPseudo;
-      if ((isValidClassName || isMediaOrPseudo) && !shouldDoClasses)
-        var _styleState3;
-    }
-    if (!isValidStyleKeyInit) {
-      if (!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 && !noExpand)
-      var didUseKeyInit;
-    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 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 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)" : "")), log({
-      isVariant,
-      valInit,
-      shouldPassProp
-    }), isClient && log({
-      variants,
-      variant: variants == null ? void 0 : variants[keyInit],
-      isVariant,
-      isHOCShouldPassThrough,
-      curProps: _object_spread({}, styleState.curProps),
-      parentStaticConfig
-    })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo1), !isVariant) || !noSkip && keyInit in 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 : propMapper(keyInit, valInit, styleState);
-    if (!avoidPropMap) {
-      if (!expanded) return "continue";
-      var next = getPropMappedFontFamily(expanded);
-      next && (styleState.fontFamily = next);
-    }
-    if (process.env.NODE_ENV === "development" && debug === "verbose") {
-      consoleGroupCollapsed("  \u{1F4A0} expanded", keyInit, valInit);
-      try {
-        !isServer && isDevTools && (log({
-          expanded,
-          styleProps,
-          componentState,
+    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 skipProps && !noSkip && !isHOC) {
+        if (keyInit === "group" && 0)
+          var identifier, containerType, containerCSS;
+        continue;
+      }
+      var valInitType = typeof valInit > "u" ? "undefined" : _type_of(valInit), isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
+      if (0 && isValidStyleKeyInit && valInitType === "string" && valInit[0] === "_") {
+        var isValidClassName, isMediaOrPseudo;
+        if ((isValidClassName || isMediaOrPseudo) && !shouldDoClasses)
+          var _styleState;
+      }
+      if (!isValidStyleKeyInit) {
+        if (!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 && !noExpand)
+        var didUseKeyInit;
+      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-"));
+      }
+      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({
           isVariant,
+          valInit,
+          shouldPassProp
+        }), isClient && log({
+          variants,
           variant: variants == null ? void 0 : variants[keyInit],
-          shouldPassProp,
+          isVariant,
           isHOCShouldPassThrough,
-          usedKeys: _object_spread({}, usedKeys),
-          curProps: _object_spread({}, styleState.curProps)
-        }), log("expanded", expanded, `
+          curProps: _object_spread({}, styleState.curProps),
+          parentStaticConfig
+        })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo1), !isVariant)) {
+          process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd();
+          continue;
+        }
+        if (!noSkip && keyInit in 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 : propMapper(keyInit, valInit, styleState);
+        if (!avoidPropMap) {
+          if (!expanded) continue;
+          var next = getPropMappedFontFamily(expanded);
+          next && (styleState.fontFamily = next);
+        }
+        if (process.env.NODE_ENV === "development" && debug === "verbose") {
+          consoleGroupCollapsed("  \u{1F4A0} expanded", keyInit, valInit);
+          try {
+            !isServer && isDevTools && (log({
+              expanded,
+              styleProps,
+              componentState,
+              isVariant,
+              variant: variants == null ? void 0 : variants[keyInit],
+              shouldPassProp,
+              isHOCShouldPassThrough,
+              usedKeys: _object_spread({}, usedKeys),
+              curProps: _object_spread({}, styleState.curProps)
+            }), log("expanded", expanded, `
 usedKeys`, _object_spread({}, usedKeys), `
 current`, _object_spread({}, styleState.style)));
-      } catch {
+          } catch {
+          }
+          console.groupEnd();
+        }
+        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));
+          } catch {
+          }
+          console.groupEnd();
+        }
       }
-      console.groupEnd();
     }
-    for (var key4 = keyInit, val2 = valInit, max = expanded ? expanded.length : 1, i2 = 0; i2 < max; i2++) _loop2(i2);
-    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));
-      } catch {
-      }
-      console.groupEnd();
-    }
-  };
-  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, curPropsState, styleState = {
-    // this should go away, right now we're doing really crazy cumulative props,
-    // as variants are resolved basically we go back and merge the results onto
-    // the curProps, so that each following variant function recieves the current
-    // "styles" with variants expanded. powerful, but i think too fancy
-    // there's some part of the ui kit that depends on it we'd have to find and fix
-    get curProps() {
-      return curPropsState || (curPropsState = {}), curPropsState;
-    },
-    classNames,
-    conf,
-    props,
-    styleProps,
-    componentState,
-    staticConfig,
-    style: null,
-    theme,
-    usedKeys,
-    viewProps,
-    context,
-    debug,
-    skipThemeTokenResolution
-  };
-  process.env.NODE_ENV === "development" && debug && debug !== "profile" && isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), log({
-    props,
-    staticConfig,
-    shouldDoClasses,
-    styleProps,
-    rulesToInsert,
-    componentState,
-    styleState,
-    theme: _object_spread({}, 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) _loop(keyOg);
+  }
   var avoidNormalize = styleProps.noNormalize === !1;
   if (!avoidNormalize) {
     if (styleState.style && (fixStyles(styleState.style), isWeb && !isReactNative && styleToCSS(styleState.style)), styleState.flatTransforms) {
-      var _styleState;
-      (_styleState = styleState).style || (_styleState.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
+      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];
         return a.localeCompare(b);
       }).forEach(function(param) {
-        var _param = _sliced_to_array(param, 2), key4 = _param[0], val2 = _param[1];
-        mergeTransform(styleState.style, key4, val2, !0);
+        var _param = _sliced_to_array(param, 2), key5 = _param[0], val3 = _param[1];
+        mergeTransform(styleState.style, key5, val3, !0);
       });
@@ -457,8 +465,8 @@ }
       if (0 && shouldDoClasses)
-        for (var key in parentSplitStyles.classNames)
-          var val;
+        for (var key1 in parentSplitStyles.classNames)
+          var val1;
       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]);
+        for (var key2 in parentSplitStyles.style) {
+          var _styleState2;
+          key2 in classNames || styleState.style && key2 in styleState.style || ((_styleState2 = styleState).style || (_styleState2.style = {}), styleState.style[key2] = parentSplitStyles.style[key2]);
         }
@@ -476,3 +484,3 @@ }
           for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0)
-            var atomicStyle, _props_animateOnly, _atomicStyle, key2, value, identifier, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
+            var atomicStyle, _props_animateOnly, _atomicStyle, key3, value, identifier1, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
         } catch (err) {
@@ -487,4 +495,4 @@ } finally {
         for (var namespace in transforms) {
-          var _transforms_namespace, hash, val1, identifier1;
-          if (isClient && !insertedTransforms[identifier1])
+          var _transforms_namespace, hash, val2, identifier2;
+          if (isClient && !insertedTransforms[identifier2])
             var rule;
@@ -504,4 +512,4 @@ }
     else
-      for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i = 0; i < len; i++) {
-        var style = isArray ? styleProp[i] : styleProp;
+      for (var isArray = Array.isArray(styleProp), len = isArray ? styleProp.length : 1, i1 = 0; i1 < len; i1++) {
+        var style = isArray ? styleProp[i1] : styleProp;
         if (style)
@@ -511,4 +519,4 @@ if (style.$$css)
           else {
-            var _styleState2;
-            (_styleState2 = styleState).style || (_styleState2.style = {}), Object.assign(styleState.style, normalizeStyle(style));
+            var _styleState3;
+            (_styleState3 = styleState).style || (_styleState3.style = {}), Object.assign(styleState.style, normalizeStyle(style));
           }
@@ -548,3 +556,3 @@ }
               for (var _iterator1, _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0)
-                var name;
+                var name1;
             } catch (err) {
@@ -573,4 +581,4 @@ } finally {
       });
-      for (var key3 in logs)
-        log(key3, logs[key3]);
+      for (var key4 in logs)
+        log(key4, logs[key4]);
     } catch {
@@ -577,0 +585,0 @@ }

package.json

 {
   "name": "@tamagui/web",
-  "version": "1.109.7",
+  "version": "1.109.8",
   "source": "src/index.ts",
@@ -30,14 +30,14 @@ "main": "dist/cjs",
   "dependencies": {
-    "@tamagui/compose-refs": "1.109.7",
-    "@tamagui/constants": "1.109.7",
-    "@tamagui/helpers": "1.109.7",
-    "@tamagui/normalize-css-color": "1.109.7",
-    "@tamagui/timer": "1.109.7",
-    "@tamagui/types": "1.109.7",
-    "@tamagui/use-did-finish-ssr": "1.109.7",
-    "@tamagui/use-event": "1.109.7",
-    "@tamagui/use-force-update": "1.109.7"
+    "@tamagui/compose-refs": "1.109.8",
+    "@tamagui/constants": "1.109.8",
+    "@tamagui/helpers": "1.109.8",
+    "@tamagui/normalize-css-color": "1.109.8",
+    "@tamagui/timer": "1.109.8",
+    "@tamagui/types": "1.109.8",
+    "@tamagui/use-did-finish-ssr": "1.109.8",
+    "@tamagui/use-event": "1.109.8",
+    "@tamagui/use-force-update": "1.109.8"
   },
   "devDependencies": {
-    "@tamagui/build": "1.109.7",
+    "@tamagui/build": "1.109.8",
     "@testing-library/react": "^16.0.0",
@@ -44,0 +44,0 @@ "csstype": "^3.0.10",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

3007166

decreased by-3.01%

Number of package files

1269

decreased by-1.7%

Lines of code

47760

decreased by-2.74%

Number of low supply chain risk alerts

768

increased by0.26%

Dependency changes

• + Added@tamagui/compose-refs@1.109.8(transitive)

• + Added@tamagui/constants@1.109.8(transitive)

• + Added@tamagui/helpers@1.109.8(transitive)

• + Added@tamagui/normalize-css-color@1.109.8(transitive)

• + Added@tamagui/simple-hash@1.109.8(transitive)

• + Added@tamagui/timer@1.109.8(transitive)

• + Added@tamagui/types@1.109.8(transitive)

• + Added@tamagui/use-did-finish-ssr@1.109.8(transitive)

• + Added@tamagui/use-event@1.109.8(transitive)

• + Added@tamagui/use-force-update@1.109.8(transitive)

• - Removed@tamagui/compose-refs@1.109.7(transitive)

• - Removed@tamagui/constants@1.109.7(transitive)

• - Removed@tamagui/helpers@1.109.7(transitive)

• - Removed@tamagui/normalize-css-color@1.109.7(transitive)

• - Removed@tamagui/simple-hash@1.109.7(transitive)

• - Removed@tamagui/timer@1.109.7(transitive)

• - Removed@tamagui/types@1.109.7(transitive)

• - Removed@tamagui/use-did-finish-ssr@1.109.7(transitive)

• - Removed@tamagui/use-event@1.109.7(transitive)

• - Removed@tamagui/use-force-update@1.109.7(transitive)

• Updated@tamagui/compose-refs@1.109.8

• Updated@tamagui/constants@1.109.8

• Updated@tamagui/helpers@1.109.8

• Updated@tamagui/normalize-css-color@1.109.8

• Updated@tamagui/timer@1.109.8

• Updated@tamagui/types@1.109.8

• Updated@tamagui/use-did-finish-ssr@1.109.8

• Updated@tamagui/use-event@1.109.8

• Updated@tamagui/use-force-update@1.109.8