@tamagui/web 1.137.2 → 1.138.0

package/dist/esm/hooks/useThemeState.native.js

@@ -208,27 +208,84 @@ function getNewThemeName() {
   var parentParts = parentName.split("_"),
     lastName = parentParts[parentParts.length - 1];
   lastName && lastName[0].toLowerCase() !== lastName[0] && parentParts.pop();
-  for (var subNames = [name && componentName ? `${name}_${componentName}` : void 0, name, componentName].filter(Boolean), found = null, max = parentParts.length, i = 0; i <= max; i++) {
+  var subNames = [name && componentName ? `${name}_${componentName}` : void 0, name, componentName].filter(Boolean),
+    found = null;
+  if (name) {
+    var nameHasScheme = getScheme(name);
+    if (nameHasScheme) {
+      var _iteratorNormalCompletion = !0,
+        _didIteratorError = !1,
+        _iteratorError = void 0;
+      try {
+        for (var _iterator = subNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
+          var subName = _step.value;
+          if (subName in themes2) {
+            found = subName;
+            break;
+          }
+        }
+      } catch (err) {
+        _didIteratorError = !0, _iteratorError = err;
+      } finally {
+        try {
+          !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        } finally {
+          if (_didIteratorError) throw _iteratorError;
+        }
+      }
+    }
+    if (!found && !nameHasScheme) {
+      var parentScheme = getScheme(parentName);
+      if (parentScheme) {
+        var parentBase = parentParts.join("_"),
+          withScheme = [componentName ? `${parentBase}_${name}_${componentName}` : void 0, `${parentBase}_${name}`, componentName ? `${parentScheme}_${name}_${componentName}` : void 0, `${parentScheme}_${name}`].filter(Boolean),
+          _iteratorNormalCompletion1 = !0,
+          _didIteratorError1 = !1,
+          _iteratorError1 = void 0;
+        try {
+          for (var _iterator1 = withScheme[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = !0) {
+            var potential = _step1.value;
+            if (potential in themes2) {
+              found = potential;
+              break;
+            }
+          }
+        } catch (err) {
+          _didIteratorError1 = !0, _iteratorError1 = err;
+        } finally {
+          try {
+            !_iteratorNormalCompletion1 && _iterator1.return != null && _iterator1.return();
+          } finally {
+            if (_didIteratorError1) throw _iteratorError1;
+          }
+        }
+      }
+    }
+  }
+  if (!found) if (!name && componentName) {
+    var potential1 = `${parentParts.join("_")}_${componentName}`;
+    potential1 in themes2 && (found = potential1);
+  } else for (var max = parentParts.length, i = 0; i <= max; i++) {
     var base = (i === 0 ? parentParts : parentParts.slice(0, -i)).join("_"),
-      _iteratorNormalCompletion = !0,
-      _didIteratorError = !1,
-      _iteratorError = void 0;
+      _iteratorNormalCompletion2 = !0,
+      _didIteratorError2 = !1,
+      _iteratorError2 = void 0;
     try {
-      for (var _iterator = subNames[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
-        var subName = _step.value,
-          potential = base ? `${base}_${subName}` : subName;
-        if (potential in themes2) {
-          found = potential;
+      for (var _iterator2 = subNames[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
+        var subName1 = _step2.value,
+          potential2 = base ? `${base}_${subName1}` : subName1;
+        if (potential2 in themes2) {
+          found = potential2;
           break;
         }
       }
     } catch (err) {
-      _didIteratorError = !0, _iteratorError = err;
+      _didIteratorError2 = !0, _iteratorError2 = err;
     } finally {
       try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+        !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
       } finally {
-        if (_didIteratorError) throw _iteratorError;
+        if (_didIteratorError2) throw _iteratorError2;
       }
     }
     if (found) break;

package/dist/esm/hooks/useThemeState.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["useIsomorphicLayoutEffect","createContext","useCallback","useContext","useId","useSyncExternalStore","getConfig","MISSING_THEME_MESSAGE","ThemeStateContext","allListeners","Map","listenersByParent","HasRenderedOnce","WeakMap","HadTheme","PendingUpdate","states","localStates","shouldForce","forceUpdateThemes","cacheVersion","forEach","cb","getThemeState","id","get","themes","rootThemeState","getRootThemeState","useThemeState","props","isRoot","arguments","length","keys","disable","parentId","Error","name","theme","light","inverses","subscribe","_listenersByParent","_parentId","Set","add","set","delete","propsKey","getPropsKey","getSnapshot","_keys_current","_props_needsUpdate","local","needsUpdate","passThrough","current","size","call","rerender","next","getNextState","process","env","NODE_ENV","debug","console","groupCollapsed","info","groupEnd","Object","assign","globalThis","time","state","scheduleUpdate","_states_get","warn","lastState","pendingUpdate","parentState","isNew","getNewThemeName","isSameAsParent","shouldRerender","message","updated","scheme","getScheme","_parentState_inverses","parentInverses","isInverse","nextState","parentName","shouldAvoidRerender","queue","visited","parent","shift","children","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","childId","value","has","push","err","return","childId2","validSchemes"],"sources":["../../../src/hooks/useThemeState.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useIsomorphicLayoutEffect","createContext","useCallback","useContext","useId","useSyncExternalStore","getConfig","MISSING_THEME_MESSAGE","ThemeStateContext","allListeners","Map","listenersByParent","HasRenderedOnce","WeakMap","HadTheme","PendingUpdate","states","localStates","shouldForce","forceUpdateThemes","cacheVersion","forEach","cb","getThemeState","id","get","themes","rootThemeState","getRootThemeState","useThemeState","props","isRoot","arguments","length","keys","disable","parentId","Error","name","theme","light","inverses","subscribe","_listenersByParent","_parentId","Set","add","set","delete","propsKey","getPropsKey","getSnapshot","_keys_current","_props_needsUpdate","local","needsUpdate","passThrough","current","size","call","rerender","next","getNextState","process","env","NODE_ENV","debug","console","groupCollapsed","info","groupEnd","Object","assign","globalThis","time","state","scheduleUpdate","_states_get","warn","lastState","pendingUpdate","parentState","isNew","getNewThemeName","isSameAsParent","shouldRerender","message","updated","scheme","getScheme","_parentState_inverses","parentInverses","isInverse","nextState","parentName","shouldAvoidRerender","queue","visited","parent","shift","children","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","childId","value","has","push","err","return","childId2","validSchemes","dark","split","reset","componentName","inverse","forceUpdate","themes2","isSchemeOnly","lastPartIndex","lastIndexOf","name1","slice","result","parentParts","lastName","toLowerCase","pop","subNames","filter","Boolean","found","nameHasScheme","subName"],"sources":["../../../src/hooks/useThemeState.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/views/Theme.js

@@ -90,7 +90,15 @@ const inertStyle = {
 function getThemeClassNameAndColor(themeState, props, isRoot = !1) {
   if (!themeState.isNew && !props.forceClassName)
     return empty;
-  const themeColor = themeState?.theme && themeState.isNew ? variableToString(themeState.theme.color) : "", maxInverses = getSetting("maxDarkLightNesting") || 3, themeClassName = themeState.inverses >= maxInverses ? themeState.name : themeState.name.replace(schemePrefix, ""), className = `${isRoot ? "" : "t_sub_theme"} t_${themeClassName}`;
+  const themeColor = themeState?.theme && themeState.isNew ? variableToString(themeState.theme.color) : "", maxInverses = getSetting("maxDarkLightNesting") || 3, themeClassName = themeState.inverses >= maxInverses ? themeState.name : themeState.name.replace(schemePrefix, ""), themeNameParts = themeClassName.split("_");
+  let themeClasses = `t_${themeClassName}`;
+  if (themeNameParts.length > 1) {
+    const hierarchyClasses = [];
+    for (let i = 1; i <= themeNameParts.length; i++)
+      hierarchyClasses.push(`t_${themeNameParts.slice(0, i).join("_")}`);
+    themeClasses = hierarchyClasses.join(" ");
+  }
+  const className = `${isRoot ? "" : "t_sub_theme"} ${themeClasses}`;
   return { color: themeColor, className };
 }
 const schemePrefix = /^(dark|light)_/;

package/dist/esm/views/Theme.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Theme.tsx"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["className"]
 }

package/dist/esm/views/Theme.mjs

@@ -107,7 +107,14 @@ function getThemeClassNameAndColor(themeState, props, isRoot = !1) {
   const themeColor = themeState?.theme && themeState.isNew ? variableToString(themeState.theme.color) : "",
     maxInverses = getSetting("maxDarkLightNesting") || 3,
     themeClassName = themeState.inverses >= maxInverses ? themeState.name : themeState.name.replace(schemePrefix, ""),
-    className = `${isRoot ? "" : "t_sub_theme"} t_${themeClassName}`;
+    themeNameParts = themeClassName.split("_");
+  let themeClasses = `t_${themeClassName}`;
+  if (themeNameParts.length > 1) {
+    const hierarchyClasses = [];
+    for (let i = 1; i <= themeNameParts.length; i++) hierarchyClasses.push(`t_${themeNameParts.slice(0, i).join("_")}`);
+    themeClasses = hierarchyClasses.join(" ");
+  }
+  const className = `${isRoot ? "" : "t_sub_theme"} ${themeClasses}`;
   return {
     color: themeColor,
     className

package/dist/esm/views/Theme.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["isWeb","React","Children","cloneElement","forwardRef","isValidElement","useRef","getSetting","variableToString","useThemeWithState","getThemeState","hasThemeUpdatingProps","ThemeStateContext","ThemeDebug","jsx","Theme","props","ref","disable","children","passThrough","isRoot","_isRoot","_","themeState","finalChildren","map","child","only","stateRef","hasEverThemed","getThemedChildren","avoidForwardRef","shallow","forceClassName","state","current","shouldRenderChildrenWithTheme","isNew","process","env","NODE_ENV","debug","themeProps","Provider","value","id","isInverse","name","requiresExtraWrapper","parentId","parentState","Error","toArray","console","warn","themeSpanProps","getThemeClassNameAndColor","baseStyle","contain","inertContainedStyle","inertStyle","className","color","style","className2","startsWith","display","empty","themeColor","theme","maxInverses","themeClassName","inverses","replace","schemePrefix"],"sources":["../../../src/views/Theme.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["isWeb","React","Children","cloneElement","forwardRef","isValidElement","useRef","getSetting","variableToString","useThemeWithState","getThemeState","hasThemeUpdatingProps","ThemeStateContext","ThemeDebug","jsx","Theme","props","ref","disable","children","passThrough","isRoot","_isRoot","_","themeState","finalChildren","map","child","only","stateRef","hasEverThemed","getThemedChildren","avoidForwardRef","shallow","forceClassName","state","current","shouldRenderChildrenWithTheme","isNew","process","env","NODE_ENV","debug","themeProps","Provider","value","id","isInverse","name","requiresExtraWrapper","parentId","parentState","Error","toArray","console","warn","themeSpanProps","getThemeClassNameAndColor","baseStyle","contain","inertContainedStyle","inertStyle","className","color","style","className2","startsWith","display","empty","themeColor","theme","maxInverses","themeClassName","inverses","replace","schemePrefix","themeNameParts","split","themeClasses","length","hierarchyClasses","i","push","slice","join"],"sources":["../../../src/views/Theme.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,KAAA,QAAa;AAEtB,OAAOC,KAAA,IAASC,QAAA,EAAUC,YAAA,EAAcC,UAAA,EAAYC,cAAA,EAAgBC,MAAA,QAAc;AAClF,SAASC,UAAA,QAAkB;AAC3B,SAASC,gBAAA,QAAwB;AACjC,SAASC,iBAAA,QAAyB;AAClC,SACEC,aAAA,EACAC,qBAAA,EACAC,iBAAA,QACK;AAEP,SAASC,UAAA,QAAkB;AAqErB,SAAAC,GAAA;AAjEC,MAAMC,KAAA,GAAQX,UAAA,CAAW,UAAeY,KAAA,EAAgCC,GAAA,EAAK;EAElF,IAAID,KAAA,CAAME,OAAA,EACR,OAAOF,KAAA,CAAMG,QAAA;EAGf,MAAM;MAAEC;IAAY,IAAIJ,KAAA;IAElBK,MAAA,GAAS,CAAC,CAACL,KAAA,CAAMM,OAAA;IAEjB,CAACC,CAAA,EAAGC,UAAU,IAAIf,iBAAA,CAAkBO,KAAA,EAAOK,MAAM;EAIvD,IAAII,aAAA,GAF4BT,KAAA,CAAM,qBAAqB,IAGvDd,QAAA,CAASwB,GAAA,CAAIV,KAAA,CAAMG,QAAA,EAAWQ,KAAA,IAC5BP,WAAA,GAAcO,KAAA,GAAQxB,YAAA,CAAawB,KAAA,EAAO;IAAG,sBAAuB;EAAK,CAAC,CAC5E,IACAX,KAAA,CAAMG,QAAA;EAEV,IAAIF,GAAA,EACF,IAAI;IACFhB,KAAA,CAAMC,QAAA,CAAS0B,IAAA,CAAKH,aAAa,GAEjCA,aAAA,GAAgBtB,YAAA,CAAasB,aAAA,EAAe;MAAER;IAAI,CAAC;EACrD,QAAQ,CAER;EAGF,MAAMY,QAAA,GAAWvB,MAAA,CAAO;IACtBwB,aAAA,EAAe;EACjB,CAAC;EAED,OAAOC,iBAAA,CACLP,UAAA,EACAC,aAAA,EACAT,KAAA,EACAK,MAAA,EACAQ,QAAA,EACAT,WACF;AACF,CAAC;AAEDL,KAAA,CAAMiB,eAAA,GAAqB;AAEpB,SAASD,kBACdP,UAAA,EACAL,QAAA,EACAH,KAAA,EACAK,MAAA,GAAS,IACTQ,QAAA,EACAT,WAAA,GAAc,IACd;EACA,MAAM;MAAEa,OAAA;MAASC;IAAe,IAAIlB,KAAA;IAG9BmB,KAAA,GAAQN,QAAA,CAASO,OAAA;EAGvB,IAAIC,6BAAA,GAFgBF,KAAA,CAAML,aAAA,IAGPN,UAAA,CAAWc,KAAA,IAASjB,MAAA,IAAUV,qBAAA,CAAsBK,KAAK;EAU5E,IARIuB,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAAiBzB,KAAA,CAAM0B,KAAA,KAAU,gBAC5DvB,QAAA,GACE,eAAAL,GAAA,CAACD,UAAA;IAAWW,UAAA;IAAwBmB,UAAA,EAAY3B,KAAA;IAC7CG;EAAA,CACH,IAIA,CAACkB,6BAAA,EACH,OAAOlB,QAAA;EAITA,QAAA,GACE,eAAAL,GAAA,CAACF,iBAAA,CAAkBgC,QAAA,EAAlB;IAA2BC,KAAA,EAAOrB,UAAA,CAAWsB,EAAA;IAC3C3B;EAAA,CACH;EAGF,MAAM;MAAE4B,SAAA;MAAWC;IAAK,IAAIxB,UAAA;IACtByB,oBAAA,GAAuBF,SAAA,IAAab,cAAA;EAiB1C,IAdKC,KAAA,CAAML,aAAA,KACTK,KAAA,CAAML,aAAA,GAAgB,MAGtBmB,oBAAA;EAAA;EAAA;EAGAzB,UAAA,CAAWwB,IAAA,KAAS,UACpBxB,UAAA,CAAWwB,IAAA,KAAS,aAEpBb,KAAA,CAAML,aAAA,GAAgB,YAIpBG,OAAA,IACGT,UAAA,CAAW0B,QAAA,EAET;IACL,MAAMC,WAAA,GAAczC,aAAA,CAClBc,UAAA,CAAWc,KAAA,GAAQd,UAAA,CAAWsB,EAAA,GAAKtB,UAAA,CAAW0B,QAChD;IACA,IAAI,CAACC,WAAA,EAAa,MAAM,IAAIC,KAAA,CAAM,iBAAO;IACzCjC,QAAA,GAAWjB,QAAA,CAASmD,OAAA,CAAQlC,QAAQ,EAAEO,GAAA,CAAKC,KAAA,IAClCtB,cAAA,CAAesB,KAAK,IACvBP,WAAA,GACEO,KAAA,GACAxB,YAAA,CACEwB,KAAA,EACA,QACA,eAAAb,GAAA,CAACC,KAAA;MAAMiC,IAAA,EAAMG,WAAA,CAAYH,IAAA;MAAQ7B,QAAA,EAAAQ,KAAA,CAAcX,KAAA,CAAMG;IAAA,CAAS,CAChE,IACFQ,KACL;EACH;EAeF,IAZIY,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBACvB,CAACrB,WAAA,IAAeJ,KAAA,CAAM0B,KAAA,IACxBY,OAAA,CAAQC,IAAA,CAAK,sBAAsB;IACjCN,oBAAA;IACAf,cAAA;IACAV,UAAA;IACAW,KAAA;IACAqB,cAAA,EAAgBC,yBAAA,CAA0BjC,UAAA,EAAYR,KAAA,EAAOK,MAAM;EACrE,CAAC,GAIDa,cAAA,KAAmB,IACrB,OAAOf,QAAA;EAGT,IAAInB,KAAA,EAAO;IACT,MAAM0D,SAAA,GAAY1C,KAAA,CAAM2C,OAAA,GAAUC,mBAAA,GAAsBC,UAAA;MAClD;QAAEC,SAAA,GAAY;QAAIC;MAAM,IAAI3C,WAAA,GAC9B,CAAC,IACDqC,yBAAA,CAA0BjC,UAAA,EAAYR,KAAA,EAAOK,MAAM;IAYvD,IAVAF,QAAA,GACE,eAAAL,GAAA,CAAC;MACCgD,SAAA,EAAW,GAAGA,SAAS;MACvBE,KAAA,EAAO5C,WAAA,GAAcsC,SAAA,GAAY;QAAEK,KAAA;QAAO,GAAGL;MAAU;MAEtDvC;IAAA,CACH,GAIEgB,KAAA,CAAML,aAAA,KAAkB,WAAW;MAErC,MAAMmC,UAAA,GACJ,CAAC7C,WAAA,IAAe6B,oBAAA,GACZ,GACEF,SAAA,GACIC,IAAA,CAAKkB,UAAA,CAAW,OAAO,IACrB,wBACAlB,IAAA,CAAKkB,UAAA,CAAW,MAAM,IACpB,uBACA,KACJ,EACN,MACA;MACN/C,QAAA,GACE,eAAAL,GAAA,CAAC;QAAKkD,KAAA,EAAON,SAAA;QAAWI,SAAA,EAAWG,UAAA;QAChC9C;MAAA,CACH;IAEJ;IAEA,OAAOA,QAAA;EACT;EAEA,OAAOA,QAAA;AACT;AAEA,MAAM0C,UAAA,GAAa;IACjBM,OAAA,EAAS;EACX;EAEMP,mBAAA,GAAsB;IAC1BO,OAAA,EAAS;IACTR,OAAA,EAAS;EACX;EAEMS,KAAA,GAAQ;IAAEN,SAAA,EAAW;IAAIC,KAAA,EAAO;EAAU;AAEhD,SAASN,0BACPjC,UAAA,EACAR,KAAA,EACAK,MAAA,GAAS,IACT;EACA,IAAI,CAACG,UAAA,CAAWc,KAAA,IAAS,CAACtB,KAAA,CAAMkB,cAAA,EAC9B,OAAOkC,KAAA;EAIT,MAAMC,UAAA,GACJ7C,UAAA,EAAY8C,KAAA,IAAS9C,UAAA,CAAWc,KAAA,GAAQ9B,gBAAA,CAAiBgB,UAAA,CAAW8C,KAAA,CAAMP,KAAK,IAAI;IAE/EQ,WAAA,GAAchE,UAAA,CAAW,qBAAqB,KAAK;IACnDiE,cAAA,GACJhD,UAAA,CAAWiD,QAAA,IAAYF,WAAA,GACnB/C,UAAA,CAAWwB,IAAA,GACXxB,UAAA,CAAWwB,IAAA,CAAK0B,OAAA,CAAQC,YAAA,EAAc,EAAE;IAMxCC,cAAA,GAAiBJ,cAAA,CAAeK,KAAA,CAAM,GAAG;EAC/C,IAAIC,YAAA,GAAe,KAAKN,cAAc;EAEtC,IAAII,cAAA,CAAeG,MAAA,GAAS,GAAG;IAG7B,MAAMC,gBAAA,GAA6B,EAAC;IACpC,SAASC,CAAA,GAAI,GAAGA,CAAA,IAAKL,cAAA,CAAeG,MAAA,EAAQE,CAAA,IAC1CD,gBAAA,CAAiBE,IAAA,CAAK,KAAKN,cAAA,CAAeO,KAAA,CAAM,GAAGF,CAAC,EAAEG,IAAA,CAAK,GAAG,CAAC,EAAE;IAEnEN,YAAA,GAAeE,gBAAA,CAAiBI,IAAA,CAAK,GAAG;EAC1C;EAEA,MAAMtB,SAAA,GAAY,GAAGzC,MAAA,GAAS,KAAK,aAAa,IAAIyD,YAAY;EAEhE,OAAO;IAAEf,KAAA,EAAOM,UAAA;IAAYP;EAAU;AACxC;AAEA,MAAMa,YAAA,GAAe","ignoreList":[]}

package/dist/esm/views/Theme.native.js

@@ -117,7 +117,13 @@ function getThemeClassNameAndColor(themeState, props) {
   var themeColor = themeState?.theme && themeState.isNew ? variableToString(themeState.theme.color) : "",
     maxInverses = getSetting("maxDarkLightNesting") || 3,
     themeClassName = themeState.inverses >= maxInverses ? themeState.name : themeState.name.replace(schemePrefix, ""),
-    className = `${isRoot ? "" : "t_sub_theme"} t_${themeClassName}`;
+    themeNameParts = themeClassName.split("_"),
+    themeClasses = `t_${themeClassName}`;
+  if (themeNameParts.length > 1) {
+    for (var hierarchyClasses = [], i = 1; i <= themeNameParts.length; i++) hierarchyClasses.push(`t_${themeNameParts.slice(0, i).join("_")}`);
+    themeClasses = hierarchyClasses.join(" ");
+  }
+  var className = `${isRoot ? "" : "t_sub_theme"} ${themeClasses}`;
   return {
     color: themeColor,
     className

package/dist/esm/views/Theme.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","isWeb","React","Children","cloneElement","forwardRef","isValidElement","useRef","getSetting","variableToString","useThemeWithState","getThemeState","hasThemeUpdatingProps","ThemeStateContext","ThemeDebug","Theme","props","ref","disable","children","passThrough","isRoot","_isRoot","_","themeState","disableDirectChildTheme","finalChildren","map","child","only","stateRef","hasEverThemed","getThemedChildren","avoidForwardRef","arguments","length","shallow","forceClassName","state","current","shouldRenderChildrenWithTheme","isNew","process","env","NODE_ENV","debug","themeProps","Provider","value","id","isInverse","name","requiresExtraWrapper","parentId","parentState","Error","toArray","console","warn","themeSpanProps","getThemeClassNameAndColor","baseStyle","contain","inertContainedStyle","inertStyle","className","color","style","className1","startsWith","display","empty"],"sources":["../../../src/views/Theme.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","isWeb","React","Children","cloneElement","forwardRef","isValidElement","useRef","getSetting","variableToString","useThemeWithState","getThemeState","hasThemeUpdatingProps","ThemeStateContext","ThemeDebug","Theme","props","ref","disable","children","passThrough","isRoot","_isRoot","_","themeState","disableDirectChildTheme","finalChildren","map","child","only","stateRef","hasEverThemed","getThemedChildren","avoidForwardRef","arguments","length","shallow","forceClassName","state","current","shouldRenderChildrenWithTheme","isNew","process","env","NODE_ENV","debug","themeProps","Provider","value","id","isInverse","name","requiresExtraWrapper","parentId","parentState","Error","toArray","console","warn","themeSpanProps","getThemeClassNameAndColor","baseStyle","contain","inertContainedStyle","inertStyle","className","color","style","className1","startsWith","display","empty","themeColor","theme","maxInverses","themeClassName","inverses","replace","schemePrefix","themeNameParts","split","themeClasses","hierarchyClasses","i","push","slice","join"],"sources":["../../../src/views/Theme.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.137.2",
+  "version": "1.138.0",
   "type": "module",
   "source": "src/index.ts",
   "main": "dist/cjs",
@@ -28,16 +28,16 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.137.2",
-    "@tamagui/constants": "1.137.2",
-    "@tamagui/helpers": "1.137.2",
-    "@tamagui/is-equal-shallow": "1.137.2",
-    "@tamagui/normalize-css-color": "1.137.2",
-    "@tamagui/timer": "1.137.2",
-    "@tamagui/types": "1.137.2",
-    "@tamagui/use-did-finish-ssr": "1.137.2",
-    "@tamagui/use-event": "1.137.2",
-    "@tamagui/use-force-update": "1.137.2"
+    "@tamagui/compose-refs": "1.138.0",
+    "@tamagui/constants": "1.138.0",
+    "@tamagui/helpers": "1.138.0",
+    "@tamagui/is-equal-shallow": "1.138.0",
+    "@tamagui/normalize-css-color": "1.138.0",
+    "@tamagui/timer": "1.138.0",
+    "@tamagui/types": "1.138.0",
+    "@tamagui/use-did-finish-ssr": "1.138.0",
+    "@tamagui/use-event": "1.138.0",
+    "@tamagui/use-force-update": "1.138.0"
   },
   "peerDependencies": {
     "react": "*",
@@ -45,13 +45,13 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.137.2",
+    "@tamagui/build": "1.138.0",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "*",
     "react-dom": "*",
-    "react-native": "^0.79.2",
-    "typescript": "^5.8.2",
+    "react-native": "0.81.5",
+    "typescript": "~5.9.2",
     "vitest": "^4.0.4"
   },
   "exports": {

package/src/createTamagui.ts

@@ -207,7 +207,11 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
     }
   })()
 
-  const shorthands = configIn.shorthands || {}
+  // Keep track of user-provided shorthands separately
+  const userShorthands = configIn.shorthands || {}
+
+  // Merge built-in shorthands with user shorthands (user takes precedence)
+  const shorthands = { ...builtinShorthands, ...userShorthands }
 
   let lastCSSInsertedRulesIndex = -1
 
@@ -289,6 +293,7 @@ export function createTamagui<Conf extends CreateTamaguiProps>(
     tokens: tokens as any,
     // vite made this into a function if it wasn't set
     shorthands,
+    userShorthands,
     inverseShorthands: shorthands
       ? Object.fromEntries(Object.entries(shorthands).map(([k, v]) => [v, k]))
       : {},
@@ -387,3 +392,44 @@ function getThemesDeduped(
 
   return dedupedThemes
 }
+
+// Built-in shorthands used internally for short classname generation
+const builtinShorthands = {
+  fd: 'flexDirection',
+  fb: 'flexBasis',
+  bblr: 'borderBottomLeftRadius',
+  bbrr: 'borderBottomRightRadius',
+  fwr: 'flexWrap',
+  col: 'color',
+  ff: 'fontFamily',
+  fst: 'fontStyle',
+  tr: 'transform',
+  tt: 'textTransform',
+  td: 'textDecorationLine',
+  va: 'verticalAlign',
+  ws: 'whiteSpace',
+  wb: 'wordBreak',
+  ww: 'wordWrap',
+  brc: 'borderRightColor',
+  brw: 'borderRightWidth',
+  bs: 'borderStyle',
+  btc: 'borderTopColor',
+  btlr: 'borderTopLeftRadius',
+  btrr: 'borderTopRightRadius',
+  btw: 'borderTopWidth',
+  bw: 'borderWidth',
+  o: 'opacity',
+  cur: 'cursor',
+  pe: 'pointerEvents',
+  ov: 'overflow',
+  pos: 'position',
+  dsp: 'display',
+  fw: 'fontWeight',
+  fs: 'fontSize',
+  ls: 'letterSpacing',
+  lh: 'lineHeight',
+  bxs: 'boxSizing',
+  bxsh: 'boxShadow',
+  ox: 'overflowX',
+  oy: 'overflowY',
+} as const

package/src/hooks/useThemeState.ts

@@ -372,21 +372,85 @@ function getNewThemeName(
 
   let found: string | null = null
 
-  const max = parentParts.length
-
-  for (let i = 0; i <= max; i++) {
-    const base = (i === 0 ? parentParts : parentParts.slice(0, -i)).join('_')
+  // If name is provided, try it as a standalone theme first (both with and without scheme)
+  // This allows explicit theme overrides like:
+  // - <Theme name="blue"><Button theme="dark_green"> → finds "dark_green_Button"
+  // - <Theme name="blue"><Button theme="green"> → finds "light_green_Button"
+  // - <Theme name="blue"><Button theme="green_active"> → finds "light_green_active_Button"
+  if (name) {
+    // First try the exact name as-is, but only if it already has a scheme prefix
+    // This prevents "green" from matching before we try "light_green_Button"
+    const nameHasScheme = getScheme(name)
+
+    if (nameHasScheme) {
+      // Name has scheme (like "dark_green"), try as-is with priority to component theme
+      for (const subName of subNames) {
+        if (subName in themes) {
+          found = subName
+          break
+        }
+      }
+    }
 
-    for (const subName of subNames) {
-      const potential = base ? `${base}_${subName}` : subName
+    // If not found and name doesn't have a scheme, try adding parent's scheme
+    if (!found && !nameHasScheme) {
+      const parentScheme = getScheme(parentName)
+
+      if (parentScheme) {
+        // Get the parent theme name without component part (already done in parentParts)
+        const parentBase = parentParts.join('_')
+
+        // Try combining with full parent context first, then just scheme
+        // Prioritize component themes: try with componentName first, then without
+        // For parent "light" + name "green" + componentName "Button":
+        //   Try: light_green_Button, light_green (in that order)
+        const withScheme = [
+          componentName ? `${parentBase}_${name}_${componentName}` : undefined,
+          `${parentBase}_${name}`,
+          componentName ? `${parentScheme}_${name}_${componentName}` : undefined,
+          `${parentScheme}_${name}`,
+        ].filter(Boolean) as string[]
+
+        for (const potential of withScheme) {
+          if (potential in themes) {
+            found = potential
+            break
+          }
+        }
+      }
+    }
+  }
 
+  // If not found, fall back to the original search algorithm combining with parent
+  if (!found) {
+    // If we're only adding componentName (no explicit name prop), don't backtrack through parent parts
+    // This preserves sub-themes like "light_red_alt1" when adding Button component
+    if (!name && componentName) {
+      // Just try adding component to full parent
+      const potential = `${parentParts.join('_')}_${componentName}`
       if (potential in themes) {
         found = potential
-        break
       }
-    }
+      // If not found, don't add component theme - return null to keep parent theme
+    } else {
+      // Original backtracking search for when explicit name is provided
+      const max = parentParts.length
+
+      for (let i = 0; i <= max; i++) {
+        const base = (i === 0 ? parentParts : parentParts.slice(0, -i)).join('_')
+
+        for (const subName of subNames) {
+          const potential = base ? `${base}_${subName}` : subName
 
-    if (found) break
+          if (potential in themes) {
+            found = potential
+            break
+          }
+        }
+
+        if (found) break
+      }
+    }
   }
 
   if (inverse) {

package/src/types.tsx

@@ -1206,6 +1206,7 @@ export type TamaguiInternalConfig<
     getNewCSS: GetCSS
     parsed: boolean
     inverseShorthands: Record<string, string>
+    userShorthands: C
     reactNative?: any
     fontSizeTokens: Set<string>
     specificTokens: Record<string, Variable>
@@ -2263,6 +2264,9 @@ export interface StackNonStyleProps
       | RNOnlyProps
       | keyof ExtendBaseStackProps
       | 'style'
+      // Event handlers that conflict between RN ViewProps and Web DivAttributes after RN 0.81.5
+      | 'onFocus'
+      | 'onBlur'
     >,
     ExtendBaseStackProps,
     TamaguiComponentPropsBase {

package/src/views/Theme.tsx

@@ -225,7 +225,24 @@ function getThemeClassNameAndColor(
       ? themeState.name
       : themeState.name.replace(schemePrefix, '')
 
-  const className = `${isRoot ? '' : 't_sub_theme'} t_${themeClassName}`
+  // Build full hierarchy of theme classes for CSS variable inheritance
+  // Examples:
+  // - "red_alt1" → "t_red t_red_alt1"
+  // - "green_active_Button" → "t_green t_green_active t_green_active_Button"
+  const themeNameParts = themeClassName.split('_')
+  let themeClasses = `t_${themeClassName}`
+
+  if (themeNameParts.length > 1) {
+    // Build full hierarchy for all multi-part themes (sub-themes, component themes, etc.)
+    // This enables CSS variable inheritance through all levels
+    const hierarchyClasses: string[] = []
+    for (let i = 1; i <= themeNameParts.length; i++) {
+      hierarchyClasses.push(`t_${themeNameParts.slice(0, i).join('_')}`)
+    }
+    themeClasses = hierarchyClasses.join(' ')
+  }
+
+  const className = `${isRoot ? '' : 't_sub_theme'} ${themeClasses}`
 
   return { color: themeColor, className }
 }

package/types/Tamagui.d.ts

@@ -1,14 +1,14 @@
 import * as Helpers from '@tamagui/helpers';
 export declare const Tamagui: {
     Helpers: typeof Helpers;
-    readonly mediaState: {
+    get mediaState(): {
         [x: string]: boolean;
         [x: number]: boolean;
     };
-    readonly config: import("./types").TamaguiInternalConfig;
-    readonly insertedRules: string[];
-    readonly allSelectors: Record<string, string>;
-    readonly identifierToValue: Map<string, any>;
+    get config(): import("./types").TamaguiInternalConfig;
+    get insertedRules(): string[];
+    get allSelectors(): Record<string, string>;
+    get identifierToValue(): Map<string, any>;
 } | undefined;
 export declare const getValueFromIdentifier: (identifier: string) => any;
 export declare const setIdentifierValue: (identifier: string, value: any) => void;

package/types/createTamagui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,kBAAkB,EAKlB,kBAAkB,EAOnB,MAAM,SAAS,CAAA;AAiBhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CA8R1B"}
+{"version":3,"file":"createTamagui.d.ts","sourceRoot":"","sources":["../src/createTamagui.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,kBAAkB,EAKlB,kBAAkB,EAOnB,MAAM,SAAS,CAAA;AAiBhB,wBAAgB,aAAa,CAAC,IAAI,SAAS,kBAAkB,EAC3D,QAAQ,EAAE,IAAI,GACb,kBAAkB,CAAC,IAAI,CAAC,CAmS1B"}

package/types/hooks/useThemeState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useThemeState.d.ts","sourceRoot":"","sources":["../../src/hooks/useThemeState.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,gBAAgB,EACtB,MAAM,OAAO,CAAA;AAGd,OAAO,KAAK,EAEV,UAAU,EACV,UAAU,EACV,sBAAsB,EACvB,MAAM,UAAU,CAAA;AAEjB,KAAK,EAAE,GAAG,MAAM,CAAA;AAEhB,eAAO,MAAM,iBAAiB,iCAAwB,CAAA;AAatD,eAAO,MAAM,iBAAiB,YAI7B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,IAAI,EAAE,2BAAmB,CAAA;AAQvD,eAAO,MAAM,iBAAiB,yBAAuB,CAAA;AAErD,eAAO,MAAM,aAAa,GACxB,OAAO,sBAAsB,EAC7B,2BAAc,EACd,MAAM,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KACzC,UA2HF,CAAA;AAmPD,eAAO,MAAM,qBAAqB,GAAI,OAAO,UAAU,YACiC,CAAA"}
+{"version":3,"file":"useThemeState.d.ts","sourceRoot":"","sources":["../../src/hooks/useThemeState.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,gBAAgB,EACtB,MAAM,OAAO,CAAA;AAGd,OAAO,KAAK,EAEV,UAAU,EACV,UAAU,EACV,sBAAsB,EACvB,MAAM,UAAU,CAAA;AAEjB,KAAK,EAAE,GAAG,MAAM,CAAA;AAEhB,eAAO,MAAM,iBAAiB,iCAAwB,CAAA;AAatD,eAAO,MAAM,iBAAiB,YAI7B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,IAAI,EAAE,2BAAmB,CAAA;AAQvD,eAAO,MAAM,iBAAiB,yBAAuB,CAAA;AAErD,eAAO,MAAM,aAAa,GACxB,OAAO,sBAAsB,EAC7B,2BAAc,EACd,MAAM,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KACzC,UA2HF,CAAA;AAmTD,eAAO,MAAM,qBAAqB,GAAI,OAAO,UAAU,YACiC,CAAA"}

package/types/types.d.ts

@@ -735,6 +735,7 @@ export type TamaguiInternalConfig<A extends GenericTokens = GenericTokens, B ext
     getNewCSS: GetCSS;
     parsed: boolean;
     inverseShorthands: Record<string, string>;
+    userShorthands: C;
     reactNative?: any;
     fontSizeTokens: Set<string>;
     specificTokens: Record<string, Variable>;
@@ -1408,7 +1409,7 @@ type A11yDeprecated = {
      */
     accessible?: ViewProps['accessible'];
 };
-export interface StackNonStyleProps extends A11yDeprecated, Omit<ViewProps, 'hitSlop' | 'pointerEvents' | 'display' | 'children' | keyof TamaguiComponentPropsBaseBase | RNOnlyProps | keyof ExtendBaseStackProps | 'style'>, ExtendBaseStackProps, TamaguiComponentPropsBase {
+export interface StackNonStyleProps extends A11yDeprecated, Omit<ViewProps, 'hitSlop' | 'pointerEvents' | 'display' | 'children' | keyof TamaguiComponentPropsBaseBase | RNOnlyProps | keyof ExtendBaseStackProps | 'style' | 'onFocus' | 'onBlur'>, ExtendBaseStackProps, TamaguiComponentPropsBase {
     style?: StyleProp<LooseCombinedObjects<React.CSSProperties, ViewStyle>>;
 }
 export type StackStyle = WithThemeShorthandsPseudosMedia<StackStyleBase>;