@tamagui/core 1.0.1-beta.21 → 1.0.1-beta.210

package/dist/cjs/helpers/getSplitStyles.js

@@ -1,22 +1,8 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -32,181 +18,348 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var getSplitStyles_exports = {};
 __export(getSplitStyles_exports, {
+  PROP_SPLIT: () => PROP_SPLIT,
   getSplitStyles: () => getSplitStyles,
   getSubStyle: () => getSubStyle,
   insertSplitStyles: () => insertSplitStyles,
-  normalizeStyleObject: () => normalizeStyleObject,
   useSplitStyles: () => useSplitStyles
 });
 module.exports = __toCommonJS(getSplitStyles_exports);
+var import_constants = require("@tamagui/constants");
 var import_helpers = require("@tamagui/helpers");
 var import_react = require("react");
-var import_conf = require("../conf");
-var import_platform = require("../constants/platform");
+var import_config = require("../config");
+var import_isDevTools = require("../constants/isDevTools");
 var import_useMedia = require("../hooks/useMedia");
 var import_createMediaStyle = require("./createMediaStyle");
-var import_fixNativeShadow = require("./fixNativeShadow");
+var import_createPropMapper = require("./createPropMapper");
+var import_createProxy = require("./createProxy");
+var import_expandStyles = require("./expandStyles");
 var import_getStylesAtomic = require("./getStylesAtomic");
 var import_insertStyleRule = require("./insertStyleRule");
-const skipProps = __spreadValues({
+var import_mergeTransform = require("./mergeTransform");
+var import_normalizeValueWithProperty = require("./normalizeValueWithProperty.js");
+var import_pseudoDescriptors = require("./pseudoDescriptors");
+const skipProps = {
   animation: true,
   animateOnly: true,
-  debug: true
-}, !import_platform.isWeb && {
-  tag: true,
-  whiteSpace: true,
-  wordWrap: true,
-  textOverflow: true,
-  textDecorationDistance: true,
-  userSelect: true,
-  selectable: true,
-  cursor: true,
-  contain: true,
-  pointerEvents: true,
-  boxSizing: true,
-  boxShadow: true
-});
-let conf;
-const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state, defaultClassNames) => {
-  var _a;
-  if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
-    console.log("  \xBB getSplitStyles", { props, state, defaultClassNames });
+  debug: true,
+  componentName: true,
+  role: true,
+  tag: true
+};
+const emptyObject = {};
+const IS_STATIC = process.env.IS_STATIC === "is_static";
+if (process.env.TAMAGUI_TARGET === "native") {
+  Object.assign(skipProps, {
+    whiteSpace: true,
+    wordWrap: true,
+    textOverflow: true,
+    textDecorationDistance: true,
+    userSelect: true,
+    selectable: true,
+    cursor: true,
+    contain: true,
+    boxSizing: true,
+    boxShadow: true
+  });
+}
+const accessibilityDirectMap = {};
+if (process.env.TAMAGUI_TARGET === "web") {
+  const items = {
+    Hidden: true,
+    ActiveDescendant: true,
+    Atomic: true,
+    AutoComplete: true,
+    Busy: true,
+    Checked: true,
+    ColumnCount: "colcount",
+    ColumnIndex: "colindex",
+    ColumnSpan: "colspan",
+    Current: true,
+    Details: true,
+    ErrorMessage: true,
+    Expanded: true,
+    HasPopup: true,
+    Invalid: true,
+    Label: true,
+    Level: true,
+    Modal: true,
+    Multiline: true,
+    MultiSelectable: true,
+    Orientation: true,
+    Owns: true,
+    Placeholder: true,
+    PosInSet: true,
+    Pressed: true,
+    RoleDescription: true,
+    RowCount: true,
+    RowIndex: true,
+    RowSpan: true,
+    Selected: true,
+    SetSize: true,
+    Sort: true,
+    ValueMax: true,
+    ValueMin: true,
+    ValueNow: true,
+    ValueText: true
+  };
+  for (const key in items) {
+    let val = items[key];
+    if (val === true) {
+      val = key.toLowerCase();
+    }
+    accessibilityDirectMap[`accessibility${key}`] = `aria-${val}`;
   }
-  conf = conf || (0, import_conf.getConfig)();
+}
+let conf;
+const PROP_SPLIT = "-";
+const accessibilityRoleToWebRole = {
+  adjustable: "slider",
+  header: "heading",
+  image: "img",
+  link: "link",
+  none: "presentation",
+  summary: "region"
+};
+const isMediaKey = (key) => Boolean(key[0] === "$" && import_useMedia.mediaQueryConfig[key.slice(1)]);
+const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, languageContext, elementType, debug) => {
+  var _a, _b, _c, _d, _e, _f;
+  conf = conf || (0, import_config.getConfig)();
   const validStyleProps = staticConfig.isText ? import_helpers.stylePropsText : import_helpers.validStyles;
+  const mediaKeys = [];
   const viewProps = {};
-  const style = {};
-  const classNames = __spreadValues({}, defaultClassNames);
   const pseudos = {};
+  let psuedosUsed = null;
   const medias = {};
+  const mediaState = state.mediaState || import_useMedia.mediaState;
+  const usedKeys = {};
+  const propKeys = Object.keys(props);
+  const shouldDoClasses = staticConfig.acceptsClassName && (import_constants.isWeb || IS_STATIC) && !state.noClassNames;
+  let style = {};
+  const len = propKeys.length;
   const rulesToInsert = [];
-  function addStyle(prop, rule) {
-    rulesToInsert.push([prop, rule]);
-    (0, import_insertStyleRule.updateInsertedCache)(prop, rule);
-  }
-  __name(addStyle, "addStyle");
-  let cur = null;
-  let transforms = {};
-  function mergeClassName(key, val) {
-    if (!val) {
-      return;
+  const classNames = {};
+  const transforms = {};
+  let fontFamily;
+  for (let i = len - 1; i >= 0; i--) {
+    let keyInit = propKeys[i];
+    const valInit = props[keyInit];
+    const expandedKey = conf.shorthands[keyInit];
+    if (expandedKey) {
+      keyInit = expandedKey;
     }
-    if (val.startsWith("_transform-")) {
-      const isMediaOrPseudo = key !== "transform";
-      const isMedia = isMediaOrPseudo && key[11] === "_";
-      const isPsuedo = isMediaOrPseudo && key[11] === "0" || key.endsWith("Style");
-      const namespace = isMedia ? key.split("_")[2] : isPsuedo ? key.split("-")[1] : "transform";
-      let transform = import_insertStyleRule.insertedTransforms[val];
-      if (import_platform.isClient) {
-        if (!transform) {
-          (0, import_insertStyleRule.updateInserted)();
-          transform = import_insertStyleRule.insertedTransforms[val];
-        }
-        if (!transform) {
-          if (import_platform.isWeb && val[0] !== "_") {
-            transform = val;
-          } else {
-            console.trace("?", key, val, cur, props, state);
-          }
+    if (usedKeys[keyInit])
+      continue;
+    if (skipProps[keyInit])
+      continue;
+    if (!import_constants.isWeb && keyInit.startsWith("data-"))
+      continue;
+    if (keyInit === "style" || keyInit.startsWith("_style")) {
+      if (!valInit)
+        continue;
+      const styles = Array.isArray(valInit) ? valInit : [valInit];
+      const styleLen = styles.length;
+      for (let j = styleLen; j >= 0; j--) {
+        const cur = styles[j];
+        if (!cur)
+          continue;
+        for (const key in cur) {
+          if (usedKeys[key])
+            continue;
+          usedKeys[key] = 1;
+          style[key] = cur[key];
         }
-        if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
-          console.log("  \xBB getSplitStyles mergeClassName transform", { key, val, namespace, transform, insertedTransforms: import_insertStyleRule.insertedTransforms });
+      }
+      continue;
+    }
+    if (process.env.TAMAGUI_TARGET === "web") {
+      if (keyInit === "disabled" && valInit === true) {
+        usedKeys[keyInit] = 1;
+        viewProps["aria-disabled"] = true;
+        if (elementType === "button" || elementType === "form" || elementType === "input" || elementType === "select" || elementType === "textarea") {
+          viewProps.disabled = true;
         }
-        if (process.env.NODE_ENV === "development") {
-          if (!transform) {
-            console.trace("NO TRANSFORM?", { key, val, transform });
-          }
+        if (!((_a = staticConfig.variants) == null ? void 0 : _a.disabled)) {
+          continue;
         }
       }
-      transforms[namespace] = transforms[namespace] || ["", ""];
-      const identifier = val.replace("_transform", "");
-      transforms[namespace][0] += identifier;
-      if (transform) {
-        transforms[namespace][1] += transform;
+      if (keyInit === "testID") {
+        usedKeys[keyInit] = 1;
+        viewProps["data-testid"] = valInit;
+        continue;
       }
-    } else {
-      classNames[key] = val;
-    }
-  }
-  __name(mergeClassName, "mergeClassName");
-  function push() {
-    if (!cur)
-      return;
-    normalizeStyleObject(cur);
-    if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
-      console.log("  \xBB getSplitStyles push", cur, state);
-    }
-    if (import_platform.isWeb && !state.noClassNames) {
-      const atomic = (0, import_getStylesAtomic.getStylesAtomic)(cur);
-      for (const atomicStyle of atomic) {
-        if (!state.noClassNames) {
-          addStyle(atomicStyle.identifier, atomicStyle.rules[0]);
-          mergeClassName(atomicStyle.property, atomicStyle.identifier);
+      if (keyInit === "id" || keyInit === "nativeID") {
+        usedKeys[keyInit] = 1;
+        if (staticConfig.isReactNative) {
+          viewProps.nativeID = valInit;
         } else {
-          style[atomicStyle.property] = atomicStyle.value;
+          viewProps.id = valInit;
         }
+        continue;
       }
-    }
-    if (!import_platform.isWeb || state.noClassNames || state.resolveVariablesAs === "value" || state.resolveVariablesAs === "both") {
-      for (const key in cur) {
-        if (skipProps[key]) {
+      let didUseKeyInit = true;
+      if (staticConfig.isReactNative) {
+        didUseKeyInit = false;
+        if (accessibilityDirectMap[keyInit] || keyInit.startsWith("accessibility")) {
+          viewProps[keyInit] = valInit;
+          usedKeys[keyInit] = 1;
           continue;
         }
-        if (key in import_helpers.stylePropsTransform) {
-          (0, import_helpers.mergeTransform)(style, key, cur[key]);
-        } else {
-          style[key] = cur[key];
+      } else {
+        if (accessibilityDirectMap[keyInit]) {
+          viewProps[accessibilityDirectMap[keyInit]] = valInit;
+          usedKeys[keyInit] = 1;
+          continue;
+        }
+        switch (keyInit) {
+          case "accessibilityRole": {
+            if (valInit === "none") {
+              viewProps.role = "presentation";
+            } else {
+              viewProps.role = accessibilityRoleToWebRole[valInit] || valInit;
+            }
+            break;
+          }
+          case "accessibilityControls": {
+            viewProps["aria-controls"] = processIDRefList(valInit);
+            break;
+          }
+          case "accessibilityDescribedBy": {
+            viewProps["aria-describedby"] = processIDRefList(valInit);
+            break;
+          }
+          case "accessibilityFlowTo": {
+            viewProps["aria-flowto"] = processIDRefList(valInit);
+            break;
+          }
+          case "accessibilityLabelledBy": {
+            viewProps["aria-labelledby"] = processIDRefList(valInit);
+            break;
+          }
+          case "accessibilityKeyShortcuts": {
+            if (Array.isArray(valInit)) {
+              viewProps["aria-keyshortcuts"] = valInit.join(" ");
+            }
+            break;
+          }
+          case "accessibilityLiveRegion": {
+            viewProps["aria-live"] = valInit === "none" ? "off" : valInit;
+            break;
+          }
+          case "accessibilityReadOnly": {
+            viewProps["aria-readonly"] = valInit;
+            if (elementType === "input" || elementType === "select" || elementType === "textarea") {
+              viewProps.readOnly = true;
+            }
+            break;
+          }
+          case "accessibilityRequired": {
+            viewProps["aria-required"] = valInit;
+            if (elementType === "input" || elementType === "select" || elementType === "textarea") {
+              viewProps.required = true;
+            }
+            break;
+          }
+          default: {
+            didUseKeyInit = false;
+          }
+        }
+      }
+      if (didUseKeyInit) {
+        usedKeys[keyInit] = 1;
+        continue;
+      }
+      if (keyInit === "className") {
+        let nonTamaguis = "";
+        if (!valInit)
+          continue;
+        for (const cn of valInit.split(" ")) {
+          if (cn[0] === "_") {
+            const [shorthand, mediaOrPseudo] = cn.slice(1).split("-");
+            const isMedia2 = mediaOrPseudo[0] === "_";
+            const isPseudo2 = mediaOrPseudo[0] === "0";
+            const isMediaOrPseudo = isMedia2 || isPseudo2;
+            let fullKey = conf.shorthands[shorthand];
+            if (isMedia2) {
+              let mediaShortKey = mediaOrPseudo.slice(1);
+              mediaShortKey = mediaShortKey.slice(0, mediaShortKey.indexOf("_"));
+              fullKey += `${PROP_SPLIT}${mediaShortKey}`;
+            } else if (isPseudo2) {
+              const pseudoShortKey = mediaOrPseudo.slice(1);
+              fullKey += `${PROP_SPLIT}${pseudoShortKey}`;
+            }
+            usedKeys[fullKey] = 1;
+            mergeClassName(transforms, classNames, fullKey, cn, isMediaOrPseudo);
+          } else {
+            nonTamaguis += " " + cn;
+          }
+        }
+        if (nonTamaguis) {
+          usedKeys[keyInit] = 1;
+          mergeClassName(transforms, classNames, keyInit, nonTamaguis);
+        }
+        continue;
+      }
+      if (valInit && valInit[0] === "_") {
+        const isValidClassName = import_helpers.validStyles[keyInit];
+        const isMediaOrPseudo = !isValidClassName && keyInit.includes(PROP_SPLIT) && import_helpers.validStyles[keyInit.split(PROP_SPLIT)[0]];
+        if (isValidClassName || isMediaOrPseudo) {
+          usedKeys[keyInit] = 1;
+          mergeClassName(transforms, classNames, keyInit, valInit, isMediaOrPseudo);
+          continue;
         }
       }
     }
-    cur = null;
-  }
-  __name(push, "push");
-  for (const keyInit in props) {
-    if (skipProps[keyInit]) {
-      continue;
+    if (state.keepVariantsAsProps) {
+      if (staticConfig.defaultVariants && keyInit in staticConfig.defaultVariants || staticConfig.variants && keyInit in staticConfig.variants) {
+        viewProps[keyInit] = valInit;
+      }
     }
-    if (!import_platform.isWeb && keyInit.startsWith("data-")) {
+    let isMedia = isMediaKey(keyInit);
+    let isPseudo = import_helpers.validPseudoKeys[keyInit];
+    if (!isMedia && !isPseudo && !((_b = staticConfig.variants) == null ? void 0 : _b[keyInit]) && !validStyleProps[keyInit] && !conf.shorthands[keyInit]) {
+      usedKeys[keyInit] = 1;
+      viewProps[keyInit] = valInit;
       continue;
     }
-    const valInit = props[keyInit];
-    if (keyInit === "style" || keyInit.startsWith("_style")) {
-      push();
-      cur = valInit;
-      push();
-      continue;
+    if (process.env.NODE_ENV === "development" && debug === "verbose") {
+      console.groupCollapsed("  \u{1F539} styles", keyInit, valInit);
     }
-    if (keyInit === "className" || validStyleProps[keyInit] && valInit && valInit[0] === "_") {
-      push();
-      mergeClassName(keyInit, valInit);
-      continue;
+    const expanded = isMedia || isPseudo ? [[keyInit, valInit]] : staticConfig.propMapper(
+      keyInit,
+      valInit,
+      theme,
+      props,
+      state,
+      languageContext,
+      void 0,
+      debug
+    );
+    if (!fontFamily) {
+      fontFamily = (0, import_createPropMapper.getPropMappedFontFamily)(expanded);
     }
-    if (state.keepVariantsAsProps && staticConfig.defaultVariants && keyInit in staticConfig.defaultVariants) {
-      viewProps[keyInit] = valInit;
+    if (process.env.NODE_ENV === "development" && debug === "verbose") {
+      if (import_constants.isClient) {
+        console.log("expanded", expanded);
+        console.log("usedKeys", usedKeys);
+      }
+      console.groupEnd();
     }
-    let isMedia = keyInit[0] === "$";
-    let isPseudo = import_helpers.validPseudoKeys[keyInit];
-    if (!isMedia && !isPseudo && !((_a = staticConfig.variants) == null ? void 0 : _a[keyInit]) && !validStyleProps[keyInit] && !conf.shorthands[keyInit]) {
-      viewProps[keyInit] = valInit;
+    if (!expanded)
       continue;
-    }
-    const out = isMedia || isPseudo ? true : staticConfig.propMapper(keyInit, valInit, theme, state.fallbackProps || props, state.resolveVariablesAs);
-    const expanded = out === true || !out ? [[keyInit, valInit]] : Object.entries(out);
-    if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
-      console.log("  \xBB getSplitStyles", keyInit, expanded);
-    }
     for (const [key, val] of expanded) {
-      if (val === void 0) {
+      if (val === void 0)
         continue;
-      }
-      if (key !== "target" && val && val[0] === "_") {
-        mergeClassName(key, val);
+      isMedia = isMediaKey(key);
+      isPseudo = import_helpers.validPseudoKeys[key];
+      const isMediaOrPseudo = isMedia || isPseudo;
+      if (!isMediaOrPseudo && usedKeys[key]) {
         continue;
       }
-      isMedia = key[0] === "$";
-      isPseudo = import_helpers.validPseudoKeys[key];
-      if (staticConfig.deoptProps && staticConfig.deoptProps.has(key) || staticConfig.inlineProps && staticConfig.inlineProps.has(key)) {
-        viewProps[key] = val;
+      if (((_c = staticConfig.deoptProps) == null ? void 0 : _c.has(key)) || ((_d = staticConfig.inlineProps) == null ? void 0 : _d.has(key)) || ((_e = staticConfig.inlineWhenUnflattened) == null ? void 0 : _e.has(key))) {
+        usedKeys[key] = 1;
+        viewProps[key] = props[key] ?? val;
       }
       if (isPseudo) {
         if (!val)
@@ -214,13 +367,55 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
         if (key === "enterStyle" && state.mounted) {
           continue;
         }
-        pseudos[key] = pseudos[key] || {};
-        pseudos[key] = getSubStyle(val, staticConfig, theme, props, state, true);
-        if (import_platform.isWeb && !state.noClassNames) {
-          const pseudoStyles = (0, import_getStylesAtomic.getStylesAtomic)({ [key]: pseudos[key] });
-          for (const style2 of pseudoStyles) {
-            addStyle(style2.identifier, style2.rules[0]);
-            mergeClassName(`${style2.property}-${key}`, style2.identifier);
+        pseudos[key] ?? (pseudos[key] = {});
+        const pseudoStyleObject = getSubStyle(
+          key,
+          val,
+          staticConfig,
+          theme,
+          props,
+          state,
+          conf,
+          languageContext,
+          true
+        );
+        pseudos[key] = {
+          ...pseudoStyleObject,
+          ...pseudos[key]
+        };
+        if (key === "enterStyle" || key === "exitStyle") {
+          continue;
+        }
+        if (shouldDoClasses) {
+          const pseudoStyles = (0, import_getStylesAtomic.getAtomicStyle)(pseudoStyleObject, import_pseudoDescriptors.pseudoDescriptors[key]);
+          for (const psuedoStyle of pseudoStyles) {
+            const postfix = ((_f = import_pseudoDescriptors.pseudoDescriptors[key]) == null ? void 0 : _f.name) || key;
+            const fullKey = `${psuedoStyle.property}${PROP_SPLIT}${postfix}`;
+            if (!usedKeys[fullKey]) {
+              usedKeys[fullKey] = 1;
+              if (shouldDoClasses) {
+                addStyleToInsertRules(rulesToInsert, psuedoStyle);
+                mergeClassName(
+                  transforms,
+                  classNames,
+                  fullKey,
+                  psuedoStyle.identifier,
+                  isMediaOrPseudo
+                );
+              }
+            }
+          }
+        } else {
+          psuedosUsed ?? (psuedosUsed = {});
+          const importance = import_pseudoDescriptors.pseudoDescriptors[key].priority;
+          for (const pkey in pseudoStyleObject) {
+            const curImportance = psuedosUsed[importance];
+            psuedosUsed[pkey] = importance;
+            const val2 = pseudoStyleObject[pkey];
+            if (curImportance <= importance) {
+              psuedosUsed[pkey] = importance;
+              style[pkey] = val2;
+            }
           }
         }
         continue;
@@ -228,122 +423,271 @@ const getSplitStyles = /* @__PURE__ */ __name((props, staticConfig, theme, state
       if (isMedia) {
         const mediaKey = key;
         const mediaKeyShort = mediaKey.slice(1);
-        if (!import_useMedia.mediaQueryConfig[mediaKeyShort]) {
-          viewProps[key] = val;
-          continue;
+        mediaKeys.push(mediaKeyShort);
+        const mediaStyle = getSubStyle(
+          key,
+          val,
+          staticConfig,
+          theme,
+          props,
+          state,
+          conf,
+          languageContext
+        );
+        if (process.env.NODE_ENV === "development" && debug === "verbose") {
+          console.log(`  \u{1F4FA} ${mediaKey}`, mediaState[mediaKeyShort], { mediaKey, mediaStyle, props, shouldDoClasses, mediaState: { ...mediaState } });
         }
-        const mediaStyle = getSubStyle(val, staticConfig, theme, props, state);
-        if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
-          console.log("  \xBB getSplitStyles mediaStyle", mediaKey, mediaStyle, props);
-        }
-        const shouldDoClasses = import_platform.isWeb && !state.noClassNames;
         if (shouldDoClasses) {
           const mediaStyles = (0, import_getStylesAtomic.getStylesAtomic)(mediaStyle);
           for (const style2 of mediaStyles) {
-            const out2 = (0, import_createMediaStyle.createMediaStyle)(style2, mediaKeyShort, import_useMedia.mediaQueryConfig);
-            addStyle(out2.identifier, out2.styleRule);
-            mergeClassName(`${out2.identifier}-${mediaKey}`, out2.identifier);
+            const out = (0, import_createMediaStyle.createMediaStyle)(style2, mediaKeyShort, import_useMedia.mediaQueryConfig);
+            const fullKey = `${style2.property}${PROP_SPLIT}${mediaKeyShort}`;
+            if (!usedKeys[fullKey]) {
+              usedKeys[fullKey] = 1;
+              addStyleToInsertRules(rulesToInsert, out);
+              mergeClassName(transforms, classNames, fullKey, out.identifier, true);
+            }
           }
-        } else {
-          if (import_useMedia.mediaState[mediaKey]) {
-            push();
-            if (process.env.NODE_ENV === "development" && props["debug"]) {
-              console.log("apply media style", mediaKey, import_useMedia.mediaState);
+        } else if (mediaState[mediaKeyShort]) {
+          for (const key2 in mediaStyle) {
+            const didMerge = (0, import_useMedia.mergeMediaByImportance)(style, key2, mediaStyle[key2], usedKeys);
+            if (didMerge && key2 === "fontFamily") {
+              fontFamily = mediaStyle[key2];
             }
-            Object.assign(shouldDoClasses ? medias : style, mediaStyle);
           }
         }
         continue;
       }
-      if (!import_platform.isWeb && key === "pointerEvents") {
+      if (!import_constants.isWeb && key === "pointerEvents") {
+        usedKeys[key] = 1;
         viewProps[key] = val;
         continue;
       }
+      if (key === "fontFamily" && !fontFamily && valInit && val) {
+        fontFamily = valInit[0] === "$" ? valInit : val;
+      }
       if (validStyleProps[key]) {
-        cur = cur || {};
-        cur[key] = val;
+        usedKeys[key] = 1;
+        if (val && val[0] === "_") {
+          classNames[key] = val;
+        } else if (key in import_helpers.stylePropsTransform) {
+          (0, import_mergeTransform.mergeTransform)(style, key, val, true);
+        } else {
+          style[key] = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key);
+        }
         continue;
       }
       if (!staticConfig.variants || !(key in staticConfig.variants)) {
         if (!skipProps[key]) {
-          push();
           viewProps[key] = val;
+          usedKeys[key] = 1;
         }
       }
     }
   }
-  push();
-  if (transforms) {
-    for (const namespace in transforms) {
-      const [hash, val] = transforms[namespace];
-      const identifier = `_transform${hash}`;
-      if (import_platform.isClient) {
-        if (!import_insertStyleRule.insertedTransforms[identifier]) {
-          const rule = `.${identifier} { transform: ${val}; }`;
-          addStyle(identifier, rule);
+  (0, import_expandStyles.fixStyles)(style);
+  if (import_constants.isWeb) {
+    (0, import_getStylesAtomic.styleToCSS)(style);
+  }
+  if (parentSplitStyles) {
+    if (process.env.TAMAGUI_TARGET === "web") {
+      for (const key in parentSplitStyles.classNames) {
+        if (key in classNames)
+          continue;
+        if (key in style)
+          continue;
+        const val = parentSplitStyles.classNames[key];
+        if (!shouldDoClasses) {
+          style[key] = (0, import_normalizeValueWithProperty.reverseMapClassNameToValue)(key, val);
+        } else {
+          classNames[key] = val;
         }
       }
-      classNames[namespace] = identifier;
+    }
+    if (!shouldDoClasses) {
+      for (const key in parentSplitStyles.style) {
+        if (key in classNames)
+          continue;
+        if (key in style)
+          continue;
+        style[key] = parentSplitStyles.style[key];
+      }
     }
   }
-  if (process.env.NODE_ENV === "development" && props["debug"] === "verbose") {
-    console.log("  \xBB getSplitStyles out", { style, pseudos, medias, classNames, viewProps, state });
+  if (process.env.TAMAGUI_TARGET === "web") {
+    if (shouldDoClasses) {
+      if (style["$$css"]) {
+      } else {
+        const atomic = (0, import_getStylesAtomic.getStylesAtomic)(style);
+        for (const atomicStyle of atomic) {
+          const key = atomicStyle.property;
+          addStyleToInsertRules(rulesToInsert, atomicStyle);
+          mergeClassName(transforms, classNames, key, atomicStyle.identifier);
+        }
+        if (!IS_STATIC) {
+          style = emptyObject;
+        }
+      }
+    }
+    if (transforms) {
+      for (const namespace in transforms) {
+        if (!transforms[namespace]) {
+          if (process.env.NODE_ENV === "development") {
+            console.warn("Error no transform", transforms, namespace);
+          }
+          continue;
+        }
+        const [hash, val] = transforms[namespace];
+        const identifier = `_transform${hash}`;
+        if (import_constants.isClient) {
+          if (!import_insertStyleRule.insertedTransforms[identifier]) {
+            const rule = `.${identifier} { transform: ${val}; }`;
+            addStyleToInsertRules(rulesToInsert, {
+              identifier,
+              rules: [rule],
+              property: namespace
+            });
+          }
+        }
+        classNames[namespace] = identifier;
+      }
+    }
+  }
+  if (process.env.NODE_ENV === "development" && debug === "verbose") {
+    if (import_isDevTools.isDevTools) {
+      console.groupCollapsed("  \u{1F539} styles =>");
+      const logs = { style, pseudos, medias, classNames, viewProps, state, rulesToInsert };
+      for (const key in logs) {
+        console.log(key, logs[key]);
+      }
+      console.groupEnd();
+    }
   }
   return {
+    fontFamily,
     viewProps,
     style,
     medias,
+    mediaKeys,
     pseudos,
     classNames,
     rulesToInsert
   };
-}, "getSplitStyles");
-const insertSplitStyles = /* @__PURE__ */ __name((...args) => {
-  const res = getSplitStyles(...args);
-  for (const [prop, rule] of res.rulesToInsert) {
-    (0, import_insertStyleRule.insertStyleRule)(prop, rule);
+};
+function mergeClassName(transforms, classNames, key, val, isMediaOrPseudo = false) {
+  if (process.env.TAMAGUI_TARGET === "web") {
+    if (!val)
+      return;
+    if (val.startsWith("_transform-")) {
+      const namespace = isMediaOrPseudo ? key : "transform";
+      let transform = import_insertStyleRule.insertedTransforms[val];
+      if (import_constants.isClient) {
+        if (!transform) {
+          (0, import_insertStyleRule.updateInserted)();
+          transform = import_insertStyleRule.insertedTransforms[val];
+          if (process.env.NODE_ENV === "development") {
+            if (!transform) {
+              console.warn("no transform found", { insertedTransforms: import_insertStyleRule.insertedTransforms, val });
+            }
+          }
+        }
+        if (!transform) {
+          if (import_constants.isWeb && val[0] !== "_") {
+            transform = val;
+          }
+        }
+      }
+      transforms[namespace] = transforms[namespace] || ["", ""];
+      const identifier = val.replace("_transform", "");
+      transforms[namespace][0] += identifier;
+      if (transform) {
+        transforms[namespace][1] += transform;
+      }
+    } else {
+      classNames[key] = val;
+    }
   }
-  return res;
-}, "insertSplitStyles");
-const effect = import_react.useInsertionEffect || import_platform.useIsomorphicLayoutEffect;
-const useSplitStyles = /* @__PURE__ */ __name((...args) => {
-  const res = getSplitStyles(...args);
-  effect(() => {
-    for (const [prop, rule] of res.rulesToInsert) {
-      (0, import_insertStyleRule.insertStyleRule)(prop, rule);
+}
+const propProxies = /* @__PURE__ */ new WeakMap();
+function getSubStyleProxiedProps(defaultProps, baseProps, specificProps) {
+  if (!specificProps) {
+    return baseProps;
+  }
+  if (propProxies.has(specificProps)) {
+    return propProxies.get(specificProps);
+  }
+  const next = (0, import_createProxy.createProxy)(specificProps, {
+    has(_, key) {
+      return key in defaultProps || key in specificProps || key in baseProps;
+    },
+    get(_, key) {
+      return defaultProps[key] ?? specificProps[key] ?? baseProps[key];
     }
   });
-  return res;
-}, "useSplitStyles");
-const getSubStyle = /* @__PURE__ */ __name((styleIn, staticConfig, theme, props, state, avoidDefaultProps) => {
+  propProxies.set(specificProps, next);
+  return next;
+}
+const getSubStyle = (subKey, styleIn, staticConfig, theme, props, state, conf2, languageContext, avoidDefaultProps) => {
   const styleOut = {};
-  for (const key in styleIn) {
+  for (let key in styleIn) {
     const val = styleIn[key];
-    const out = staticConfig.propMapper(key, val, theme, state.fallbackProps || props, state.resolveVariablesAs, avoidDefaultProps);
-    const expanded = out === true || !out ? [[key, val]] : Object.entries(out);
+    key = conf2.shorthands[key] || key;
+    const expanded = staticConfig.propMapper(
+      key,
+      val,
+      theme,
+      getSubStyleProxiedProps(staticConfig.defaultProps, props, props[subKey]),
+      state,
+      languageContext,
+      avoidDefaultProps
+    );
+    if (!expanded)
+      continue;
     for (const [skey, sval] of expanded) {
       if (skey in import_helpers.stylePropsTransform) {
-        (0, import_helpers.mergeTransform)(styleOut, skey, sval);
+        (0, import_mergeTransform.mergeTransform)(styleOut, skey, sval);
       } else {
-        styleOut[skey] = sval;
+        styleOut[skey] = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(sval, key);
       }
     }
   }
-  normalizeStyleObject(styleOut);
+  (0, import_expandStyles.fixStyles)(styleOut);
   return styleOut;
-}, "getSubStyle");
-function normalizeStyleObject(style) {
-  if (!import_platform.isWeb) {
-    (0, import_fixNativeShadow.fixNativeShadow)(style);
+};
+const insertSplitStyles = (...args) => {
+  const res = getSplitStyles(...args);
+  (0, import_insertStyleRule.insertStyleRules)(res.rulesToInsert);
+  return res;
+};
+const useInsertEffectCompat = import_constants.isWeb ? import_react.useInsertionEffect || import_constants.useIsomorphicLayoutEffect : () => {
+};
+const useSplitStyles = (...args) => {
+  const res = getSplitStyles(...args);
+  if (!import_constants.isRSC) {
+    useInsertEffectCompat(() => {
+      (0, import_insertStyleRule.insertStyleRules)(res.rulesToInsert);
+    }, [res.rulesToInsert]);
   }
+  return res;
+};
+function addStyleToInsertRules(rulesToInsert, styleObject) {
+  if (process.env.TAMAGUI_TARGET === "web") {
+    if (!(0, import_insertStyleRule.shouldInsertStyleRules)(styleObject)) {
+      return;
+    }
+    (0, import_insertStyleRule.updateRules)(styleObject.identifier, styleObject.rules);
+    rulesToInsert.push(styleObject);
+  }
+}
+function processIDRefList(idRefList) {
+  return Array.isArray(idRefList) ? idRefList.join(" ") : idRefList;
 }
-__name(normalizeStyleObject, "normalizeStyleObject");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  PROP_SPLIT,
   getSplitStyles,
   getSubStyle,
   insertSplitStyles,
-  normalizeStyleObject,
   useSplitStyles
 });
 //# sourceMappingURL=getSplitStyles.js.map