@tamagui/web 1.121.12 → 1.122.0

package/dist/cjs/helpers/expandStyle.js

@@ -17,7 +17,7 @@ __export(expandStyle_exports, {
   expandStyle: () => expandStyle
 });
 module.exports = __toCommonJS(expandStyle_exports);
-var import_constants = require("@tamagui/constants"), import_webToNativeProps = require("../constants/webToNativeProps"), import_config = require("../config");
+var import_constants = require("@tamagui/constants"), import_config = require("../config"), import_webToNativeProps = require("../constants/webToNativeProps");
 const neg1Flex = [
   ["flexGrow", 0],
   ["flexShrink", 1],
@@ -28,7 +28,7 @@ function expandStyle(key, value) {
     return value === -1 ? neg1Flex : [
       ["flexGrow", value],
       ["flexShrink", 1],
-      ["flexBasis", (0, import_config.getConfig)().settings.styleCompat === "react-native" ? 0 : "auto"]
+      ["flexBasis", (0, import_config.getSetting)("styleCompat") === "react-native" ? 0 : "auto"]
     ];
   switch (key) {
     case "textAlignVertical":

package/dist/cjs/helpers/expandStyle.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyle.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,uBAAiC,+BAGjC,0BAGO,0CACP,gBAA0B;AAE1B,MAAM,WAAW;AAAA,EACf,CAAC,YAAY,CAAC;AAAA,EACd,CAAC,cAAc,CAAC;AAAA,EAChB,CAAC,aAAa,MAAM;AACtB;AAEO,SAAS,YAAY,KAAa,OAA6B;AAElE,MAAI,QAAQ;AACV,WAAI,UAAU,KACL,WAEF;AAAA,MACL,CAAC,YAAY,KAAK;AAAA,MAClB,CAAC,cAAc,CAAC;AAAA,MAChB,CAAC,iBAAa,yBAAU,EAAE,SAAS,gBAAgB,iBAAiB,IAAI,MAAM;AAAA,IAChF;AAIF,UAAQ,KAAK;AAAA,IACX,KAAK;AACH,aAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,IAElE,KAAK;AACH,aAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,EAEhC;AAWF,MAAI,OAAO;AACT,WAAO,WAAW,GAAG,EAAE,IAAI,CAACA,SACnB,CAACA,MAAK,KAAK,CACnB;AAGH,MAAI,OAAO;AACT,WAAO,6CAAqB,GAAG,EAAE,IAAI,CAACA,SAC7B,CAACA,MAAK,KAAK,CACnB;AAGH,MAAI,OAAO;AACT,WAAO,oDAA4B,GAAG,EAAE,KAAK;AAEjD;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM,GACvC,QAAQ,CAAC,SAAS,MAAM,GACxB,OAAO,CAAC,OAAO,QAAQ,GACvB,KAAK,CAAC,KAAK,GAAG,GAEd,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,0BAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,GAAG,QAAQ,KAAK,MAAM,GAAG,SAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;AACpE;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,uBAAiC,+BAEjC,gBAA2B,sBAC3B,0BAGO;AAGP,MAAM,WAAW;AAAA,EACf,CAAC,YAAY,CAAC;AAAA,EACd,CAAC,cAAc,CAAC;AAAA,EAChB,CAAC,aAAa,MAAM;AACtB;AAEO,SAAS,YAAY,KAAa,OAA6B;AAElE,MAAI,QAAQ;AACV,WAAI,UAAU,KACL,WAEF;AAAA,MACL,CAAC,YAAY,KAAK;AAAA,MAClB,CAAC,cAAc,CAAC;AAAA,MAChB,CAAC,iBAAa,0BAAW,aAAa,MAAM,iBAAiB,IAAI,MAAM;AAAA,IACzE;AAIF,UAAQ,KAAK;AAAA,IACX,KAAK;AACH,aAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,IAElE,KAAK;AACH,aAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,EAEhC;AAWF,MAAI,OAAO;AACT,WAAO,WAAW,GAAG,EAAE,IAAI,CAACA,SACnB,CAACA,MAAK,KAAK,CACnB;AAGH,MAAI,OAAO;AACT,WAAO,6CAAqB,GAAG,EAAE,IAAI,CAACA,SAC7B,CAACA,MAAK,KAAK,CACnB;AAGH,MAAI,OAAO;AACT,WAAO,oDAA4B,GAAG,EAAE,KAAK;AAEjD;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM,GACvC,QAAQ,CAAC,SAAS,MAAM,GACxB,OAAO,CAAC,OAAO,QAAQ,GACvB,KAAK,CAAC,KAAK,GAAG,GAEd,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,0BAAS;AAAA;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,GAAG,QAAQ,KAAK,MAAM,GAAG,SAAS,OAAO,MAAM;AAC3E,aAAW,MAAM,IAAI,WAAW,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE;AACpE;",
   "names": ["key"]
 }

package/dist/cjs/helpers/expandStyle.native.js

@@ -18,7 +18,7 @@ __export(expandStyle_exports, {
   expandStyle: () => expandStyle
 });
 module.exports = __toCommonJS(expandStyle_exports);
-var import_constants = require("@tamagui/constants"), import_webToNativeProps = require("../constants/webToNativeProps"), import_config = require("../config"), _loop = function(parent) {
+var import_constants = require("@tamagui/constants"), import_config = require("../config"), import_webToNativeProps = require("../constants/webToNativeProps"), _loop = function(parent) {
   var _exec, _exec_index, prefix = parent.slice(0, (_exec_index = (_exec = /[A-Z]/.exec(parent)) === null || _exec === void 0 ? void 0 : _exec.index) !== null && _exec_index !== void 0 ? _exec_index : parent.length);
   EXPANSIONS[parent] = EXPANSIONS[parent].map(function(k) {
     return `${prefix}${k}`;

package/dist/cjs/helpers/expandStyle.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/code/core/web/src/helpers/expandStyle.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAKA,uBAAiC,+BAGjC,0BAGO,0CACP,gBAA0B,sBATzB,QAAA,SAAA,QAAA;MAgGgC,OAAA,aAAzBA,SAASC,OAAOC,MAAM,IAAG,eAAA,QAAA,QAAQC,KAAKF,MAAAA,OAAAA,QAAb,UAAA,SAAA,SAAA,MAAsBG,WAAK,QAA3B,gBAAA,SAAA,cAA+BH,OAAOI,MAAM;AAC3EC,aAAWL,MAAAA,IAAUK,WAAWL,MAAAA,EAAQM,IAAI,SAACC,GAAAA;WAAM,GAAGR,MAAAA,GAASQ,CAAAA;;AACjE;AAjFO,SAASC,YAAYC,KAAaC,OAAU;AAwBjD,MAEEC,8BACAF,QAAQ;AAER,WAAO;MAAC;QAAC;QAAaC;;;AAGxB,MAAID,OAAOG;AACT,WAAOA,WAAWH,GAAAA,EAAKI,IAAI,SAACJ,MAAAA;AAC1B,aAAO;QAACA;QAAKC;;IACf,CAAA;AAGF,MAAID,OAAOK;AACT,WAAOA,6CAAqBL,GAAAA,EAAKI,IAAI,SAACJ,MAAAA;AACpC,aAAO;QAACA;QAAKC;;IACf,CAAA;AAGF,MAAID,OAAOM;AACT,WAAOA,oDAA4BN,GAAAA,EAAKC,KAAAA;AAE5C;AAEA,IAAMM,MAAM;EAAC;EAAO;EAAS;EAAU;GACjCC,QAAQ;EAAC;EAAS;GAClBC,OAAO;EAAC;EAAO;GACfC,KAAK;EAAC;EAAK;GAEXP,aAAuC;EAC3CQ,aAAa;IAAC;IAAY;IAAc;IAAe;;EACvDC,cAAc;IACZ;IACA;IACA;IACA;;EAEFC,aAAa;IAAC;IAAY;IAAc;IAAe;;EACvDC,QAAQP;EACRQ,kBAAkBP;EAClBQ,gBAAgBP;EAChBQ,oBAAoBP;EACpBQ,SAASX;EACTY,mBAAmBX;EACnBY,iBAAiBX;EACjB,GAAIY,0BAAS;;IAEXC,aAAa;MAAC;MAAY;MAAc;MAAe;;;IAEvDC,UAAUb;EACZ;AACF;AAEA,SAAWc,UAAUrB,WAAAA,OAAAA,MAAAA;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAKA,uBAAiC,+BAEjC,gBAA2B,sBAC3B,0BAGO,0CARN,QAAA,SAAA,QAAA;MAgGgC,OAAA,aAAzBA,SAASC,OAAOC,MAAM,IAAG,eAAA,QAAA,QAAQC,KAAKF,MAAAA,OAAAA,QAAb,UAAA,SAAA,SAAA,MAAsBG,WAAK,QAA3B,gBAAA,SAAA,cAA+BH,OAAOI,MAAM;AAC3EC,aAAWL,MAAAA,IAAUK,WAAWL,MAAAA,EAAQM,IAAI,SAACC,GAAAA;WAAM,GAAGR,MAAAA,GAASQ,CAAAA;;AACjE;AAjFO,SAASC,YAAYC,KAAaC,OAAU;AAwBjD,MAEEC,8BACAF,QAAQ;AAER,WAAO;MAAC;QAAC;QAAaC;;;AAGxB,MAAID,OAAOG;AACT,WAAOA,WAAWH,GAAAA,EAAKI,IAAI,SAACJ,MAAAA;AAC1B,aAAO;QAACA;QAAKC;;IACf,CAAA;AAGF,MAAID,OAAOK;AACT,WAAOA,6CAAqBL,GAAAA,EAAKI,IAAI,SAACJ,MAAAA;AACpC,aAAO;QAACA;QAAKC;;IACf,CAAA;AAGF,MAAID,OAAOM;AACT,WAAOA,oDAA4BN,GAAAA,EAAKC,KAAAA;AAE5C;AAEA,IAAMM,MAAM;EAAC;EAAO;EAAS;EAAU;GACjCC,QAAQ;EAAC;EAAS;GAClBC,OAAO;EAAC;EAAO;GACfC,KAAK;EAAC;EAAK;GAEXP,aAAuC;EAC3CQ,aAAa;IAAC;IAAY;IAAc;IAAe;;EACvDC,cAAc;IACZ;IACA;IACA;IACA;;EAEFC,aAAa;IAAC;IAAY;IAAc;IAAe;;EACvDC,QAAQP;EACRQ,kBAAkBP;EAClBQ,gBAAgBP;EAChBQ,oBAAoBP;EACpBQ,SAASX;EACTY,mBAAmBX;EACnBY,iBAAiBX;EACjB,GAAIY,0BAAS;;IAEXC,aAAa;MAAC;MAAY;MAAc;MAAe;;;IAEvDC,UAAUb;EACZ;AACF;AAEA,SAAWc,UAAUrB,WAAAA,OAAAA,MAAAA;",
   "names": ["prefix", "parent", "slice", "exec", "index", "length", "EXPANSIONS", "map", "k", "expandStyle", "key", "value", "isAndroid", "EXPANSIONS", "map", "webToNativeExpansion", "webToNativeDynamicExpansion", "all", "horiz", "vert", "xy", "borderColor", "borderRadius", "borderWidth", "margin", "marginHorizontal", "marginVertical", "overscrollBehavior", "padding", "paddingHorizontal", "paddingVertical", "isWeb", "borderStyle", "overflow", "parent"]
 }

package/dist/cjs/helpers/expandStyles.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyles.ts"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BAEtB,yBAAgC;AAEzB,SAAS,UAAU,OAA4B;AAWpD,GACE,MAAM,gBAAgB,QACtB,MAAM,eACN,MAAM,iBAAiB,QACvB,MAAM,iBAEN,OAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;AAGA,MAAM,cAAc,yBAAQ,OAAO,eAC7B,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AAAA;AAEnC;",
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAsB,+BACtB,yBAAgC;AAEzB,SAAS,UAAU,OAA4B;AAWpD,GACE,MAAM,gBAAgB,QACtB,MAAM,eACN,MAAM,iBAAiB,QACvB,MAAM,iBAEN,OAAO,OAAO,WAAO,wCAAgB,KAAK,CAAC;AAK7C,aAAW,OAAO;AAChB,IAAI,OAAO,UACT,MAAM,eAAe,GAAG,CAAC,MAAM;AAGrC;AAGA,MAAM,cAAc,yBAAQ,OAAO,eAC7B,iBAAiB;AAAA,EACrB,aAAa;AAAA,EACb,mBAAmB,eAAe;AAAA,EAClC,gBAAgB,eAAe;AAAA,EAC/B,iBAAiB,eAAe;AAAA,EAChC,kBAAkB,eAAe;AAAA;AAEnC;",
   "names": []
 }

package/dist/cjs/helpers/expandStyles.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/Users/n8/tamagui/code/core/web/src/helpers/expandStyles.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;uBAAsB,+BAEtB,yBAAgC;AAEzB,SAASA,UAAUC,OAA0B;AAEhD,EAAI,sBAAsBA,UAExBA,MAAM,YAAeA,MAAMC,kBAE3B,OAAOD,MAAMC,oBAMfD,MAAME,gBAAgB,QACtBF,MAAMG,eACNH,MAAMI,iBAAiB,QACvBJ,MAAMK,iBAENC,OAAOC,OAAOP,WAAOQ,wCAAgBR,KAAAA,CAAAA;AAKvC,WAAWS,OAAOC;AAChB,QAAID,OAAOT,OAAO;UAChBA,QAAMU;AAANV,OAAAA,SAAAA,OAAMU,sBAAAA,eAAeD,GAAAA,CAAI,MAAzBT,OAAMU,mBAAAA,IAAyB;IACjC;AAEJ;AAGA,IAAMC,cAAcC,yBAAQ,OAAO,eAC7BF,iBAAiB;EACrBG,aAAa;EACbC,mBAAmBH,eAAe;EAClCI,gBAAgBJ,eAAe;EAC/BK,iBAAiBL,eAAe;EAChCM,kBAAkBN,eAAe;AAEnC;",
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;uBAAsB,+BACtB,yBAAgC;AAEzB,SAASA,UAAUC,OAA0B;AAEhD,EAAI,sBAAsBA,UAExBA,MAAM,YAAeA,MAAMC,kBAE3B,OAAOD,MAAMC,oBAMfD,MAAME,gBAAgB,QACtBF,MAAMG,eACNH,MAAMI,iBAAiB,QACvBJ,MAAMK,iBAENC,OAAOC,OAAOP,WAAOQ,wCAAgBR,KAAAA,CAAAA;AAKvC,WAAWS,OAAOC;AAChB,QAAID,OAAOT,OAAO;UAChBA,QAAMU;AAANV,OAAAA,SAAAA,OAAMU,sBAAAA,eAAeD,GAAAA,CAAI,MAAzBT,OAAMU,mBAAAA,IAAyB;IACjC;AAEJ;AAGA,IAAMC,cAAcC,yBAAQ,OAAO,eAC7BF,iBAAiB;EACrBG,aAAa;EACbC,mBAAmBH,eAAe;EAClCI,gBAAgBJ,eAAe;EAC/BK,iBAAiBL,eAAe;EAChCM,kBAAkBN,eAAe;AAEnC;",
   "names": ["fixStyles", "style", "elevationAndroid", "shadowRadius", "shadowColor", "shadowOpacity", "shadowOffset", "Object", "assign", "normalizeShadow", "key", "borderDefaults", "nativeStyle", "isWeb", "borderWidth", "borderBottomWidth", "borderTopWidth", "borderLeftWidth", "borderRightWidth"]
 }

package/dist/cjs/helpers/getSplitStyles.cjs

@@ -62,11 +62,11 @@ var import_constants = require("@tamagui/constants"),
 const consoleGroupCollapsed = import_constants.isWeb ? console.groupCollapsed : console.info;
 let conf;
 const PROP_SPLIT = "-";
-function isValidStyleKey(key, staticConfig) {
-  return (staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles))[key] || staticConfig.accept?.[key];
+function isValidStyleKey(key, validStyles, accept) {
+  return key in validStyles ? !0 : accept && key in accept;
 }
 const getSplitStyles = (props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug) => {
-  conf = conf || (0, import_config.getConfig)(), import_constants.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
+  props.reddish && (debug = "verbose"), conf = conf || (0, import_config.getConfig)(), import_constants.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
   const {
       shorthands
     } = conf,
@@ -96,6 +96,8 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
     mediaGroups,
     className = props.className || "",
     mediaStylesSeen = 0;
+  const validStyles = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles);
+  process.env.NODE_ENV === "development" && debug === "profile" && time`split-styles-setup`;
   const styleState = {
     classNames,
     conf,
@@ -110,7 +112,17 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
     context,
     debug
   };
-  process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants.isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), (0, import_log.log)({
+  if (process.env.IS_STATIC === "is_static") {
+    const {
+      fallbackProps
+    } = styleProps;
+    fallbackProps && (styleState.props = new Proxy(props, {
+      get(_, key, val) {
+        return Reflect.has(props, key) ? Reflect.get(props, key) : Reflect.get(fallbackProps, key);
+      }
+    }));
+  }
+  process.env.NODE_ENV === "development" && debug === "profile" && time`style-state`, process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants.isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), (0, import_log.log)({
     props,
     staticConfig,
     shouldDoClasses,
@@ -140,8 +152,12 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
   for (const keyOg in props) {
     let keyInit = keyOg,
       valInit = props[keyInit];
-    if (process.env.NODE_ENV === "test" && keyInit === "jestAnimatedStyle") continue;
-    if (process.env.NODE_ENV === "development" && debug === "profile" && time`prop-${keyInit}`, accept) {
+    if (keyInit === "children") {
+      viewProps[keyInit] = valInit;
+      continue;
+    }
+    if (process.env.NODE_ENV === "development" && debug === "profile" && time`before-prop-${keyInit}`, process.env.NODE_ENV === "test" && keyInit === "jestAnimatedStyle") continue;
+    if (accept) {
       const accepted = accept[keyInit];
       if ((accepted === "style" || accepted === "textStyle") && valInit && typeof valInit == "object") {
         viewProps[keyInit] = getSubStyle(styleState, keyInit, valInit, styleProps.noClass);
@@ -157,18 +173,18 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       }
       continue;
     }
-    const valInitType = typeof valInit,
-      isValidStyleKeyInit = isValidStyleKey(keyInit, staticConfig);
+    const valInitType = typeof valInit;
+    let isValidStyleKeyInit = isValidStyleKey(keyInit, validStyles, accept);
     if (staticConfig.isReactNative && keyInit.startsWith("data-")) {
       keyInit = keyInit.replace("data-", ""), viewProps.dataSet ||= {}, viewProps.dataSet[keyInit] = valInit;
       continue;
     }
     if (isValidStyleKeyInit && valInitType === "string" && valInit[0] === "_") {
-      const isValidClassName = keyInit in import_helpers.validStyles,
+      const isValidClassName = keyInit in validStyles,
         isMediaOrPseudo2 = !isValidClassName &&
         // media are flattened for some reason to color-hover keys,
         // we should probably just leave them in place to avoid extra complexity
-        keyInit.includes(PROP_SPLIT) && import_helpers.validStyles[keyInit.split(PROP_SPLIT)[0]];
+        keyInit.includes(PROP_SPLIT) && validStyles[keyInit.split(PROP_SPLIT)[0]];
       if (isValidClassName || isMediaOrPseudo2) {
         shouldDoClasses ? (mergeClassName(transforms, classNames, keyInit, valInit, isMediaOrPseudo2), styleState.style && delete styleState.style[keyInit]) : (styleState.style ||= {}, styleState.style[keyInit] = (0, import_normalizeValueWithProperty.reverseMapClassNameToValue)(keyInit, valInit), delete classNames[keyInit]);
         continue;
@@ -239,9 +255,8 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       }
       if (didUseKeyInit) continue;
     }
-    const isShorthand = keyInit in shorthands;
     let isVariant = !isValidStyleKeyInit && variants && keyInit in variants;
-    const isStyleLikeKey = isShorthand || isValidStyleKeyInit || isVariant;
+    const isStyleLikeKey = isValidStyleKeyInit || isVariant;
     let isPseudo = keyInit in import_helpers.validPseudoKeys,
       isMedia = !isStyleLikeKey && !isPseudo && (0, import_useMedia.isMediaKey)(keyInit),
       isMediaOrPseudo = !!(isMedia || isPseudo);
@@ -254,13 +269,13 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
         context?.groups.subscribe && !context?.groups.state[name] && (keyInit = keyInit.replace("$group-", "$group-true-"));
       }
     }
-    const isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || isVariant && !noExpand || isShorthand;
+    const isStyleProp = isValidStyleKeyInit || isMediaOrPseudo || isVariant && !noExpand;
     if (isStyleProp && (asChild === "except-style" || asChild === "except-style-web")) continue;
     const shouldPassProp = !isStyleProp && isHOC ||
       // is in parent variants
       isHOC && parentVariants && keyInit in parentVariants || inlineProps?.has(keyInit),
       parentVariant = parentVariants?.[keyInit],
-      isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo || parentVariant || keyInit in import_skipProps.skipProps)),
+      isHOCShouldPassThrough = !!(isHOC && (isValidStyleKeyInit || isMediaOrPseudo || parentVariant || keyInit in import_skipProps.skipProps)),
       shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
     if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupEnd(), console.groupEnd(), consoleGroupCollapsed(`  \u{1F511} ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ""} ${shouldPassThrough ? "(pass)" : ""}`), (0, import_log.log)({
       isVariant,
@@ -272,75 +287,39 @@ const getSplitStyles = (props, staticConfig, theme, themeName, componentState, s
       isVariant,
       isHOCShouldPassThrough,
       parentStaticConfig
-    })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo), !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;
-    }
+    })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo), !isVariant) || !noSkip && keyInit in import_skipProps.skipProps) continue;
     (isText || isInput) && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit);
-    const avoidPropMap = isMediaOrPseudo || !isVariant && !isValidStyleKeyInit,
-      expanded = avoidPropMap ? null : (0, import_propMapper.propMapper)(keyInit, valInit, styleState);
-    if (!avoidPropMap) {
-      if (!expanded) continue;
-      const 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?.[keyInit],
-          shouldPassProp,
-          isHOCShouldPassThrough,
-          usedKeys: {
-            ...usedKeys
-          }
-        }), globalThis.tamaguiAvoidTracking = !0, (0, import_log.log)("expanded", expanded, `
-usedKeys`, {
-          ...usedKeys
-        }, `
-current`, {
-          ...styleState.style
-        }), globalThis.tamaguiAvoidTracking = !1);
-      } catch {}
-      console.groupEnd();
-    }
-    let key = keyInit,
-      val = valInit;
-    const max = expanded ? expanded.length : 1;
-    for (let i = 0; i < max; i++) {
-      if (expanded) {
-        const [k, v] = expanded[i];
-        key = k, val = v;
+    const disablePropMap = isMediaOrPseudo || !isStyleLikeKey;
+    if ((0, import_propMapper.propMapper)(keyInit, valInit, styleState, disablePropMap, (key, val) => {
+      if (!isHOC && disablePropMap && !isMediaOrPseudo) {
+        viewProps[key] = val;
+        return;
+      }
+      if (process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("  \u{1F4A0} expanded", keyInit, "=>", key), (0, import_log.log)(val), console.groupEnd()), val == null || key in usedKeys) return;
+      if (!isHOC && isValidStyleKey(key, validStyles, accept)) {
+        mergeStyle(styleState, key, val);
+        return;
       }
-      if (val == null || key in usedKeys) continue;
-      if (isPseudo = key in import_helpers.validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && (0, import_useMedia.isMediaKey)(key), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key in variants, (inlineProps?.has(key) || process.env.IS_STATIC === "is_static" && inlineWhenUnflattened?.has(key)) && (viewProps[key] = props[key] ?? val), styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || parentStaticConfig?.variants?.[keyInit])) {
+      if (isPseudo = key in import_helpers.validPseudoKeys, isMedia = !isPseudo && (0, import_useMedia.isMediaKey)(key), isMediaOrPseudo = !!(isMedia || isPseudo), isVariant = variants && key in variants, (inlineProps?.has(key) || process.env.IS_STATIC === "is_static" && inlineWhenUnflattened?.has(key)) && (viewProps[key] = props[key] ?? val), styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || parentStaticConfig?.variants?.[keyInit])) {
         passDownProp(viewProps, key, val, isMediaOrPseudo), process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed(` - passing down prop ${key}`), (0, import_log.log)({
           val,
           after: {
             ...viewProps[key]
           }
         }), console.groupEnd());
-        continue;
+        return;
       }
       if (isPseudo) {
-        if (!val) continue;
-        const pseudoStyleObject = getSubStyle(styleState, key, val, styleProps.noClass),
-          descriptor = import_pseudoDescriptors.pseudoDescriptors[key],
-          isEnter = key === "enterStyle",
-          isExit = key === "exitStyle";
-        if (!descriptor) continue;
+        if (!val) return;
+        const pseudoStyleObject = getSubStyle(styleState, key, val, styleProps.noClass);
         if ((!shouldDoClasses || process.env.IS_STATIC === "is_static") && (pseudos ||= {}, pseudos[key] ||= {}, process.env.IS_STATIC === "is_static")) {
           Object.assign(pseudos[key], pseudoStyleObject);
-          continue;
+          return;
         }
+        const descriptor = import_pseudoDescriptors.pseudoDescriptors[key],
+          isEnter = key === "enterStyle",
+          isExit = key === "exitStyle";
+        if (!descriptor) return;
         if (shouldDoClasses && !isExit) {
           const pseudoStyles = (0, import_getStylesAtomic.getStyleAtomic)(pseudoStyleObject, descriptor);
           process.env.NODE_ENV === "development" && debug === "verbose" && (consoleGroupCollapsed("pseudo (classes)", key), (0, import_log.log)({
@@ -369,7 +348,7 @@ current`, {
             if (isDisabled) applyDefaultStyle(pkey, styleState);else {
               const curImportance = usedKeys[pkey] || 0,
                 shouldMerge = importance >= curImportance;
-              shouldMerge && (pseudos ||= {}, pseudos[key] ||= {}, pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
+              shouldMerge && (process.env.IS_STATIC === "is_static" && (pseudos ||= {}, pseudos[key] ||= {}, pseudos[key][pkey] = val2), mergeStyle(styleState, pkey, val2)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)("    subKey", pkey, shouldMerge, {
                 importance,
                 curImportance,
                 pkey,
@@ -382,13 +361,13 @@ current`, {
             usedKeys[k] = Math.max(importance, usedKeys[k] || 0);
           }
         }
-        continue;
+        return;
       }
       if (isMedia) {
-        if (!val) continue;
+        if (!val) return;
         const hasSpace = val.space,
           mediaKeyShort = key.slice(isMedia == "theme" ? 7 : 1);
-        if (hasMedia ||= !0, (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && (typeof hasMedia != "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !(0, import_isActivePlatform.isActivePlatform)(key)) continue;
+        if (hasMedia ||= !0, (hasSpace || !shouldDoClasses || styleProps.willBeAnimated) && (typeof hasMedia != "object" && (hasMedia = {}), hasMedia[mediaKeyShort] = !0), isMedia === "platform" && !(0, import_isActivePlatform.isActivePlatform)(key)) return;
         if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`  \u{1F4FA} ${key}`, {
           key,
           val,
@@ -425,21 +404,21 @@ current`, {
           if (!isThemeMedia && !(isMedia === "platform") && !isGroupMedia) {
             if (!mediaState[mediaKeyShort]) {
               process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`  \u{1F4FA} \u274C DISABLED ${mediaKeyShort}`);
-              continue;
+              return;
             }
             process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(`  \u{1F4FA} \u2705 ENABLED ${mediaKeyShort}`);
           }
           const mediaStyle = getSubStyle(styleState, key, val, !0);
           let importanceBump = 0;
           if (isThemeMedia) {
-            if (dynamicThemeAccess = !0, !(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) continue;
+            if (dynamicThemeAccess = !0, !(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
           } else if (isGroupMedia) {
             const groupInfo = (0, import_getGroupPropParts.getGroupPropParts)(mediaKeyShort),
               groupName = groupInfo.name,
               groupContext = context?.groups.state[groupName];
             if (!groupContext) {
               process.env.NODE_ENV === "development" && debug && (0, import_log.log)(`No parent with group prop, skipping styles: ${groupName}`);
-              continue;
+              return;
             }
             const groupPseudoKey = groupInfo.pseudo,
               groupMediaKey = groupInfo.media,
@@ -450,7 +429,7 @@ current`, {
               let isActive = mediaState2?.[groupMediaKey];
               if (!mediaState2 && groupContext.layout && (isActive = (0, import_useMedia.mediaKeyMatch)(groupMediaKey, groupContext.layout)), process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(` \u{1F3D8}\uFE0F GROUP media ${groupMediaKey} active? ${isActive}`), !isActive) {
                 for (const pkey in mediaStyle) applyDefaultStyle(pkey, styleState);
-                continue;
+                return;
               }
               importanceBump = 2;
             }
@@ -462,7 +441,7 @@ current`, {
                 priority = import_pseudoDescriptors.pseudoPriorities[groupPseudoKey];
               if (process.env.NODE_ENV === "development" && debug === "verbose" && (0, import_log.log)(` \u{1F3D8}\uFE0F GROUP pseudo ${groupMediaKey} active? ${isActive}, priority ${priority}`), !isActive) {
                 for (const pkey in mediaStyle) applyDefaultStyle(pkey, styleState);
-                continue;
+                return;
               }
               importanceBump = priority;
             }
@@ -478,21 +457,13 @@ current`, {
             } else mergeMediaStyle(subKey, mediaStyle[subKey]);
           }
         }
-        continue;
-      }
-      if (
-      // is HOC we can just pass through the styles as props
-      // this fixes issues where style prop got merged with wrong priority
-      !isHOC && isValidStyleKey(key, staticConfig)) {
-        mergeStyle(styleState, key, val);
-        continue;
+        return;
       }
       if (!isVariant) {
-        if (styleProps.styledContextProps && key in styleProps.styledContextProps) continue;
+        if (styleProps.styledContextProps && key in styleProps.styledContextProps) return;
         viewProps[key] = val;
       }
-    }
-    if (process.env.NODE_ENV === "development" && debug === "verbose") {
+    }), process.env.NODE_ENV === "development" && debug === "verbose") {
       try {
         (0, import_log.log)(" \u2714\uFE0F expand complete", keyInit), (0, import_log.log)("style", {
           ...styleState.style
@@ -645,9 +616,9 @@ const getSubStyle = (styleState, subKey, styleIn, avoidMergeTransform) => {
       styleOut = {};
     for (let key in styleIn) {
       const val = styleIn[key];
-      key = conf2.shorthands[key] || key;
-      const expanded = (0, import_propMapper.propMapper)(key, val, styleState);
-      if (!(!expanded || !staticConfig.isHOC && key in import_skipProps.skipProps && !styleProps.noSkip)) for (let [skey, sval] of expanded) skey in import_helpers.validPseudoKeys && (sval = getSubStyle(styleState, skey, sval, avoidMergeTransform)), !avoidMergeTransform && skey in import_helpers.stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps.noNormalize ? sval : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(sval, key);
+      key = conf2.shorthands[key] || key, !(!staticConfig.isHOC && key in import_skipProps.skipProps && !styleProps.noSkip) && (0, import_propMapper.propMapper)(key, val, styleState, !1, (skey, sval) => {
+        skey in import_helpers.validPseudoKeys && (sval = getSubStyle(styleState, skey, sval, avoidMergeTransform)), !avoidMergeTransform && skey in import_helpers.stylePropsTransform ? mergeTransform(styleOut, skey, sval) : styleOut[skey] = styleProps.noNormalize ? sval : (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(sval, key);
+      });
     }
     return styleProps.noNormalize || (0, import_expandStyles.fixStyles)(styleOut), styleOut;
   },