@tamagui/web 1.124.3 → 1.124.5

package/dist/esm/hooks/getThemeProxied.js

@@ -2,28 +2,37 @@ import "@tamagui/constants";
 import { getConfig } from "../config";
 import { getVariable } from "../createVariable";
 import "./doesRootSchemeMatchSystem";
+import { keysToId } from "./useThemeState";
 const cache = /* @__PURE__ */ new Map();
-let curKeys, curProps;
+let curKeys, curProps, curState;
 const emptyObject = {};
-function getThemeProxied(_props, state, _keys) {
-  const theme = state?.theme;
-  if (!theme)
+function getThemeProxied(_props, _state, _keys) {
+  if (!_state?.theme)
     return emptyObject;
-  if (curKeys = _keys, curProps = _props, cache.has(theme))
-    return cache.get(theme);
-  const { name, scheme } = state, config = getConfig();
+  if (curKeys = _keys, curProps = _props, curState = _state, cache.has(curState.theme))
+    return cache.get(curState.theme);
+  const config = getConfig();
   function track(key) {
-    curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */ new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
+    if (curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */ new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug)) {
+      const realId = keysToId.get(curKeys);
+      console.info(
+        ` \u{1F3A8} useTheme(${realId}) tracking new key: ${key}`,
+        curKeys,
+        globalThis.states?.get(realId + 1)
+      );
+    }
   }
   const proxied = Object.fromEntries(
-    Object.entries(theme).flatMap(([key, value]) => {
+    Object.entries(_state.theme).flatMap(([key, value]) => {
       const proxied2 = {
         ...value,
         get val() {
           return globalThis.tamaguiAvoidTracking || track(key), value.val;
         },
         get(platform) {
-          return getVariable(value);
+          if (!curState) return;
+          const outVal = getVariable(value), { name, scheme, inverses } = curState;
+          return outVal;
         }
       };
       return [
@@ -32,7 +41,7 @@ function getThemeProxied(_props, state, _keys) {
       ];
     })
   );
-  return cache.set(theme, proxied), proxied;
+  return cache.set(_state.theme, proxied), proxied;
 }
 export {
   getThemeProxied

package/dist/esm/hooks/getThemeProxied.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/getThemeProxied.ts"],
-  "mappings": "AAAA,OAAsB;AAEtB,SAAS,iBAA6B;AAEtC,SAAS,mBAAmB;AAQ5B,OAA0C;AAsC1C,MAAM,QAAwC,oBAAI,IAAI;AAEtD,IAAI,SACA;AAEJ,MAAM,cAAc,CAAC;AAEd,SAAS,gBAEd,QACA,OACA,OACc;AACd,QAAM,QAAQ,OAAO;AAErB,MAAI,CAAC;AACH,WAAO;AAMT,MAHA,UAAU,OACV,WAAW,QAEP,MAAM,IAAI,KAAK;AAEjB,WADgB,MAAM,IAAI,KAAK;AAOjC,QAAM,EAAE,MAAM,OAAO,IAAI,OAEnB,SAAS,UAAU;AAEzB,WAAS,MAAM,KAAa;AAC1B,IAAK,YACA,QAAQ,YACX,QAAQ,UAAU,oBAAI,IAAI,IAE5B,QAAQ,QAAQ,IAAI,GAAG,GACnB,QAAQ,IAAI,aAAa,iBAAiB,SAAS,SACrD,QAAQ,KAAK,2CAAoC,GAAG,EAAE;AAAA,EAE1D;AAEA,QAAM,UAAU,OAAO;AAAA,IACrB,OAAO,QAAQ,KAAK,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AAC9C,YAAMA,WAAU;AAAA,QACd,GAAG;AAAA,QACH,IAAI,MAAM;AAER,iBAAK,WAAW,wBAEd,MAAM,GAAG,GAEJ,MAAM;AAAA,QACf;AAAA,QACA,IAAI,UAAkB;AA2CpB,iBA1Ce,YAAY,KAAK;AAAA,QA2ClC;AAAA,MACF;AAEA,aAAO;AAAA,QACL,CAAC,KAAKA,QAAO;AAAA,QACb,CAAC,IAAI,GAAG,IAAIA,QAAO;AAAA,MACrB;AAAA,IACF,CAAC;AAAA,EACH;AAEA,eAAM,IAAI,OAAO,OAAO,GAEjB;AACT;",
+  "mappings": "AAAA,OAAsB;AAEtB,SAAS,iBAA6B;AAEtC,SAAS,mBAAmB;AAQ5B,OAA0C;AAC1C,SAAS,gBAAiC;AAqC1C,MAAM,QAAwC,oBAAI,IAAI;AAEtD,IAAI,SACA,UACA;AAEJ,MAAM,cAAc,CAAC;AAEd,SAAS,gBAEd,QACA,QACA,OACc;AACd,MAAI,CAAC,QAAQ;AACX,WAAO;AAOT,MAJA,UAAU,OACV,WAAW,QACX,WAAW,QAEP,MAAM,IAAI,SAAS,KAAK;AAE1B,WADgB,MAAM,IAAI,SAAS,KAAK;AAO1C,QAAM,SAAS,UAAU;AAEzB,WAAS,MAAM,KAAa;AAC1B,QAAK,YACA,QAAQ,YACX,QAAQ,UAAU,oBAAI,IAAI,IAE5B,QAAQ,QAAQ,IAAI,GAAG,GACnB,QAAQ,IAAI,aAAa,iBAAiB,SAAS,QAAO;AAC5D,YAAM,SAAS,SAAS,IAAI,OAAO;AACnC,cAAQ;AAAA,QACN,uBAAgB,MAAM,uBAAuB,GAAG;AAAA,QAChD;AAAA,QACA,WAAW,QAAW,IAAI,SAAS,CAAC;AAAA,MACtC;AAAA,IACF;AAAA,EACF;AAEA,QAAM,UAAU,OAAO;AAAA,IACrB,OAAO,QAAQ,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AACrD,YAAMA,WAAU;AAAA,QACd,GAAG;AAAA,QACH,IAAI,MAAM;AAER,iBAAK,WAAW,wBAEd,MAAM,GAAG,GAEJ,MAAM;AAAA,QACf;AAAA,QACA,IAAI,UAAkB;AACpB,cAAI,CAAC,SAAU;AAEf,gBAAM,SAAS,YAAY,KAAK,GAC1B,EAAE,MAAM,QAAQ,SAAS,IAAI;AA0CnC,iBAAO;AAAA,QACT;AAAA,MACF;AAEA,aAAO;AAAA,QACL,CAAC,KAAKA,QAAO;AAAA,QACb,CAAC,IAAI,GAAG,IAAIA,QAAO;AAAA,MACrB;AAAA,IACF,CAAC;AAAA,EACH;AAEA,eAAM,IAAI,OAAO,OAAO,OAAO,GAExB;AACT;",
   "names": ["proxied"]
 }

package/dist/esm/hooks/getThemeProxied.mjs

@@ -2,34 +2,40 @@ import "@tamagui/constants";
 import { getConfig } from "../config.mjs";
 import { getVariable } from "../createVariable.mjs";
 import "./doesRootSchemeMatchSystem.mjs";
+import { keysToId } from "./useThemeState.mjs";
 const cache = /* @__PURE__ */new Map();
-let curKeys, curProps;
+let curKeys, curProps, curState;
 const emptyObject = {};
-function getThemeProxied(_props, state, _keys) {
-  const theme = state?.theme;
-  if (!theme) return emptyObject;
-  if (curKeys = _keys, curProps = _props, cache.has(theme)) return cache.get(theme);
-  const {
-      name,
-      scheme
-    } = state,
-    config = getConfig();
+function getThemeProxied(_props, _state, _keys) {
+  if (!_state?.theme) return emptyObject;
+  if (curKeys = _keys, curProps = _props, curState = _state, cache.has(curState.theme)) return cache.get(curState.theme);
+  const config = getConfig();
   function track(key) {
-    curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
+    if (curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug)) {
+      const realId = keysToId.get(curKeys);
+      console.info(` \u{1F3A8} useTheme(${realId}) tracking new key: ${key}`, curKeys, globalThis.states?.get(realId + 1));
+    }
   }
-  const proxied = Object.fromEntries(Object.entries(theme).flatMap(([key, value]) => {
+  const proxied = Object.fromEntries(Object.entries(_state.theme).flatMap(([key, value]) => {
     const proxied2 = {
       ...value,
       get val() {
         return globalThis.tamaguiAvoidTracking || track(key), value.val;
       },
       get(platform) {
-        return getVariable(value);
+        if (!curState) return;
+        const outVal = getVariable(value),
+          {
+            name,
+            scheme,
+            inverses
+          } = curState;
+        return outVal;
       }
     };
     return [[key, proxied2], [`$${key}`, proxied2]];
   }));
-  return cache.set(theme, proxied), proxied;
+  return cache.set(_state.theme, proxied), proxied;
 }
 export { getThemeProxied };
 //# sourceMappingURL=getThemeProxied.mjs.map

package/dist/esm/hooks/getThemeProxied.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getConfig","getVariable","cache","Map","curKeys","curProps","emptyObject","getThemeProxied","_props","state","_keys","theme","has","get","name","scheme","config","track","key","current","Set","add","process","env","NODE_ENV","debug","console","info","proxied","Object","fromEntries","entries","flatMap","value","proxied2","val","globalThis","tamaguiAvoidTracking","platform","set"],"sources":["../../../src/hooks/getThemeProxied.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAsB;AAEtB,SAASA,SAAA,QAA6B;AAEtC,SAASC,WAAA,QAAmB;AAQ5B,OAA0C;AAsC1C,MAAMC,KAAA,GAAwC,mBAAIC,GAAA,CAAI;AAEtD,IAAIC,OAAA,EACAC,QAAA;AAEJ,MAAMC,WAAA,GAAc,CAAC;AAEd,SAASC,gBAEdC,MAAA,EACAC,KAAA,EACAC,KAAA,EACc;EACd,MAAMC,KAAA,GAAQF,KAAA,EAAOE,KAAA;EAErB,IAAI,CAACA,KAAA,EACH,OAAOL,WAAA;EAMT,IAHAF,OAAA,GAAUM,KAAA,EACVL,QAAA,GAAWG,MAAA,EAEPN,KAAA,CAAMU,GAAA,CAAID,KAAK,GAEjB,OADgBT,KAAA,CAAMW,GAAA,CAAIF,KAAK;EAOjC,MAAM;MAAEG,IAAA;MAAMC;IAAO,IAAIN,KAAA;IAEnBO,MAAA,GAAShB,SAAA,CAAU;EAEzB,SAASiB,MAAMC,GAAA,EAAa;IACrBd,OAAA,KACAA,OAAA,CAAQe,OAAA,KACXf,OAAA,CAAQe,OAAA,GAAU,mBAAIC,GAAA,CAAI,IAE5BhB,OAAA,CAAQe,OAAA,CAAQE,GAAA,CAAIH,GAAG,GACnBI,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAAiBnB,QAAA,CAASoB,KAAA,IACrDC,OAAA,CAAQC,IAAA,CAAK,2CAAoCT,GAAG,EAAE;EAE1D;EAEA,MAAMU,OAAA,GAAUC,MAAA,CAAOC,WAAA,CACrBD,MAAA,CAAOE,OAAA,CAAQpB,KAAK,EAAEqB,OAAA,CAAQ,CAAC,CAACd,GAAA,EAAKe,KAAK,MAAM;IAC9C,MAAMC,QAAA,GAAU;MACd,GAAGD,KAAA;MACH,IAAIE,IAAA,EAAM;QAER,OAAKC,UAAA,CAAWC,oBAAA,IAEdpB,KAAA,CAAMC,GAAG,GAEJe,KAAA,CAAME,GAAA;MACf;MACAtB,IAAIyB,QAAA,EAAkB;QA2CpB,OA1CerC,WAAA,CAAYgC,KAAK;MA2ClC;IACF;IAEA,OAAO,CACL,CAACf,GAAA,EAAKgB,QAAO,GACb,CAAC,IAAIhB,GAAG,IAAIgB,QAAO,EACrB;EACF,CAAC,CACH;EAEA,OAAAhC,KAAA,CAAMqC,GAAA,CAAI5B,KAAA,EAAOiB,OAAO,GAEjBA,OAAA;AACT","ignoreList":[]}
+{"version":3,"names":["getConfig","getVariable","keysToId","cache","Map","curKeys","curProps","curState","emptyObject","getThemeProxied","_props","_state","_keys","theme","has","get","config","track","key","current","Set","add","process","env","NODE_ENV","debug","realId","console","info","globalThis","states","proxied","Object","fromEntries","entries","flatMap","value","proxied2","val","tamaguiAvoidTracking","platform","outVal","name","scheme","inverses","set"],"sources":["../../../src/hooks/getThemeProxied.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAsB;AAEtB,SAASA,SAAA,QAA6B;AAEtC,SAASC,WAAA,QAAmB;AAQ5B,OAA0C;AAC1C,SAASC,QAAA,QAAiC;AAqC1C,MAAMC,KAAA,GAAwC,mBAAIC,GAAA,CAAI;AAEtD,IAAIC,OAAA,EACAC,QAAA,EACAC,QAAA;AAEJ,MAAMC,WAAA,GAAc,CAAC;AAEd,SAASC,gBAEdC,MAAA,EACAC,MAAA,EACAC,KAAA,EACc;EACd,IAAI,CAACD,MAAA,EAAQE,KAAA,EACX,OAAOL,WAAA;EAOT,IAJAH,OAAA,GAAUO,KAAA,EACVN,QAAA,GAAWI,MAAA,EACXH,QAAA,GAAWI,MAAA,EAEPR,KAAA,CAAMW,GAAA,CAAIP,QAAA,CAASM,KAAK,GAE1B,OADgBV,KAAA,CAAMY,GAAA,CAAIR,QAAA,CAASM,KAAK;EAO1C,MAAMG,MAAA,GAAShB,SAAA,CAAU;EAEzB,SAASiB,MAAMC,GAAA,EAAa;IAC1B,IAAKb,OAAA,KACAA,OAAA,CAAQc,OAAA,KACXd,OAAA,CAAQc,OAAA,GAAU,mBAAIC,GAAA,CAAI,IAE5Bf,OAAA,CAAQc,OAAA,CAAQE,GAAA,CAAIH,GAAG,GACnBI,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAAiBlB,QAAA,CAASmB,KAAA,GAAO;MAC5D,MAAMC,MAAA,GAASxB,QAAA,CAASa,GAAA,CAAIV,OAAO;MACnCsB,OAAA,CAAQC,IAAA,CACN,uBAAgBF,MAAM,uBAAuBR,GAAG,IAChDb,OAAA,EACAwB,UAAA,CAAWC,MAAA,EAAWf,GAAA,CAAIW,MAAA,GAAS,CAAC,CACtC;IACF;EACF;EAEA,MAAMK,OAAA,GAAUC,MAAA,CAAOC,WAAA,CACrBD,MAAA,CAAOE,OAAA,CAAQvB,MAAA,CAAOE,KAAK,EAAEsB,OAAA,CAAQ,CAAC,CAACjB,GAAA,EAAKkB,KAAK,MAAM;IACrD,MAAMC,QAAA,GAAU;MACd,GAAGD,KAAA;MACH,IAAIE,IAAA,EAAM;QAER,OAAKT,UAAA,CAAWU,oBAAA,IAEdtB,KAAA,CAAMC,GAAG,GAEJkB,KAAA,CAAME,GAAA;MACf;MACAvB,IAAIyB,QAAA,EAAkB;QACpB,IAAI,CAACjC,QAAA,EAAU;QAEf,MAAMkC,MAAA,GAASxC,WAAA,CAAYmC,KAAK;UAC1B;YAAEM,IAAA;YAAMC,MAAA;YAAQC;UAAS,IAAIrC,QAAA;QA0CnC,OAAOkC,MAAA;MACT;IACF;IAEA,OAAO,CACL,CAACvB,GAAA,EAAKmB,QAAO,GACb,CAAC,IAAInB,GAAG,IAAImB,QAAO,EACrB;EACF,CAAC,CACH;EAEA,OAAAlC,KAAA,CAAM0C,GAAA,CAAIlC,MAAA,CAAOE,KAAA,EAAOkB,OAAO,GAExBA,OAAA;AACT","ignoreList":[]}

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

@@ -2,42 +2,47 @@ import { isIos } from "@tamagui/constants";
 import { getConfig, getSetting } from "../config";
 import { getVariable } from "../createVariable";
 import { doesRootSchemeMatchSystem } from "./doesRootSchemeMatchSystem";
-var cache = /* @__PURE__ */ new Map(), curKeys, curProps, emptyObject = {};
-function getThemeProxied(_props, state, _keys) {
-  var theme = state?.theme;
-  if (!theme)
+import { keysToId } from "./useThemeState";
+var cache = /* @__PURE__ */ new Map(), curKeys, curProps, curState, emptyObject = {};
+function getThemeProxied(_props, _state, _keys) {
+  if (!_state?.theme)
     return emptyObject;
-  if (curKeys = _keys, curProps = _props, cache.has(theme)) {
-    var proxied = cache.get(theme);
+  if (curKeys = _keys, curProps = _props, curState = _state, cache.has(curState.theme)) {
+    var proxied = cache.get(curState.theme);
     return proxied;
   }
-  var { name, scheme } = state, config = getConfig();
+  var config = getConfig();
   function track(key) {
-    curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */ new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
+    if (curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */ new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug)) {
+      var _globalThis_states, realId = keysToId.get(curKeys);
+      console.info(` \u{1F3A8} useTheme(${realId}) tracking new key: ${key}`, curKeys, (_globalThis_states = globalThis.states) === null || _globalThis_states === void 0 ? void 0 : _globalThis_states.get(realId + 1));
+    }
   }
-  var proxied1 = Object.fromEntries(Object.entries(theme).flatMap(function(param) {
+  var proxied1 = Object.fromEntries(Object.entries(_state.theme).flatMap(function(param) {
     var [key, value] = param, proxied2 = {
       ...value,
       get val() {
         return globalThis.tamaguiAvoidTracking || track(key), value.val;
       },
       get(platform) {
-        var outVal = getVariable(value), shouldOptimize = scheme && platform !== "web" && isIos && !curProps.deopt && getSetting("fastSchemeChange") && state.inverses === 0 && doesRootSchemeMatchSystem();
-        if (shouldOptimize) {
-          var _config_themes_name, _config_themes_oppositeName, oppositeScheme = scheme === "dark" ? "light" : "dark", oppositeName = name.replace(scheme, oppositeScheme), color = getVariable((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[key]), oppositeColor = getVariable((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[key]), dynamicVal = {
-            dynamic: {
-              [scheme]: color,
-              [oppositeScheme]: oppositeColor
-            }
-          };
-          return dynamicVal;
-        }
-        return process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key because of: 
+        if (curState) {
+          var outVal = getVariable(value), { name, scheme, inverses } = curState, shouldOptimize = scheme && platform !== "web" && isIos && !curProps.deopt && getSetting("fastSchemeChange") && inverses === 0 && doesRootSchemeMatchSystem();
+          if (shouldOptimize) {
+            var _config_themes_name, _config_themes_oppositeName, oppositeScheme = scheme === "dark" ? "light" : "dark", oppositeName = name.replace(scheme, oppositeScheme), color = getVariable((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[key]), oppositeColor = getVariable((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[key]), dynamicVal = {
+              dynamic: {
+                [scheme]: color,
+                [oppositeScheme]: oppositeColor
+              }
+            };
+            return dynamicVal;
+          }
+          return process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key because of: 
                 not web: ${platform !== "web"}
                 isIOS: ${isIos}
                 deopt: ${curProps.deopt}
                 fastScheme: ${getSetting("fastSchemeChange")}
               `), track(key), outVal;
+        }
       }
     };
     return [
@@ -51,7 +56,7 @@ function getThemeProxied(_props, state, _keys) {
       ]
     ];
   }));
-  return cache.set(theme, proxied1), proxied1;
+  return cache.set(_state.theme, proxied1), proxied1;
 }
 export {
   getThemeProxied

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/Users/n8/tamagui/code/core/web/src/hooks/getThemeProxied.ts"],
-  "mappings": "AAAA,SAASA,aAAa;AAEtB,SAASC,WAAWC,kBAAkB;AAEtC,SAASC,mBAAmB;AAQ5B,SAASC,iCAAiC;AAsC1C,IAAMC,QAAwC,oBAAIC,IAAAA,GAE9CC,SACAC,UAEEC,cAAc,CAAC;AAEd,SAASC,gBAEdC,QACAC,OACAC,OAA2C;AAE3C,MAAMC,QAAQF,OAAOE;AAErB,MAAI,CAACA;AACH,WAAOL;AAMT,MAHAF,UAAUM,OACVL,WAAWG,QAEPN,MAAMU,IAAID,KAAAA,GAAQ;AACpB,QAAME,UAAUX,MAAMY,IAAIH,KAAAA;AAC1B,WAAOE;EACT;AAKA,MAAM,EAAEE,MAAMC,OAAM,IAAKP,OAEnBQ,SAASnB,UAAAA;AAEf,WAASoB,MAAMC,KAAW;AACxB,IAAKf,YACAA,QAAQgB,YACXhB,QAAQgB,UAAU,oBAAIC,IAAAA,IAExBjB,QAAQgB,QAAQE,IAAIH,GAAAA,GAChBI,QAAQC,IAAIC,aAAa,iBAAiBpB,SAASqB,SACrDC,QAAQC,KAAK,2CAAoCT,GAAAA,EAAK;EAE1D;AAEA,MAAMN,WAAUgB,OAAOC,YACrBD,OAAOE,QAAQpB,KAAAA,EAAOqB,QAAQ,SAAA,OAAA;QAAC,CAACb,KAAKc,KAAAA,IAAM,OACnCpB,WAAU;MACd,GAAGoB;MACH,IAAIC,MAAM;AAER,eAAKC,WAAWC,wBAEdlB,MAAMC,GAAAA,GAEDc,MAAMC;MACf;MACApB,IAAIuB,UAAgB;AAClB,YAAMC,SAAStC,YAAYiC,KAAAA,GAKnBM,iBACJvB,UACAqB,aAAa,SACbxC,SACA,CAACQ,SAASmC,SACVzC,WAAW,kBAAA,KACXU,MAAMgC,aAAa,KACnBxC,0BAAAA;AAEF,YAAIsC,gBAAgB;cAGQtB,qBACQA,6BAH5ByB,iBAAiB1B,WAAW,SAAS,UAAU,QAC/C2B,eAAe5B,KAAK6B,QAAQ5B,QAAQ0B,cAAAA,GACpCG,QAAQ7C,aAAYiB,sBAAAA,OAAO6B,OAAO/B,IAAAA,OAAK,QAAnBE,wBAAAA,SAAAA,SAAAA,oBAAsBE,GAAAA,CAAI,GAC9C4B,gBAAgB/C,aAAYiB,8BAAAA,OAAO6B,OAAOH,YAAAA,OAAa,QAA3B1B,gCAAAA,SAAAA,SAAAA,4BAA8BE,GAAAA,CAAI,GAE9D6B,aAAa;YACjBC,SAAS;cACP,CAACjC,MAAAA,GAAS6B;cACV,CAACH,cAAAA,GAAiBK;YACpB;UACF;AAEA,iBAAOC;QACT;AAEA,eAAIzB,QAAQC,IAAIC,aAAa,iBAAiBpB,SAASqB,SACrDC,QAAQC,KAAK;2BACAS,aAAa,KAAA;yBACfxC,KAAAA;yBACAQ,SAASmC,KAAK;8BACTzC,WAAW,kBAAA,CAAA;eAC1B,GAGHmB,MAAMC,GAAAA,GAGDmB;MACT;IACF;AAEA,WAAO;MACL;QAACnB;QAAKN;;MACN;QAAC,IAAIM,GAAAA;QAAON;;;EAEhB,CAAA,CAAA;AAGFX,eAAMgD,IAAIvC,OAAOE,QAAAA,GAEVA;AACT;",
-  "names": ["isIos", "getConfig", "getSetting", "getVariable", "doesRootSchemeMatchSystem", "cache", "Map", "curKeys", "curProps", "emptyObject", "getThemeProxied", "_props", "state", "_keys", "theme", "has", "proxied", "get", "name", "scheme", "config", "track", "key", "current", "Set", "add", "process", "env", "NODE_ENV", "debug", "console", "info", "Object", "fromEntries", "entries", "flatMap", "value", "val", "globalThis", "tamaguiAvoidTracking", "platform", "outVal", "shouldOptimize", "deopt", "inverses", "oppositeScheme", "oppositeName", "replace", "color", "themes", "oppositeColor", "dynamicVal", "dynamic", "set"]
+  "mappings": "AAAA,SAASA,aAAa;AAEtB,SAASC,WAAWC,kBAAkB;AAEtC,SAASC,mBAAmB;AAQ5B,SAASC,iCAAiC;AAC1C,SAASC,gBAAiC;AAqC1C,IAAMC,QAAwC,oBAAIC,IAAAA,GAE9CC,SACAC,UACAC,UAEEC,cAAc,CAAC;AAEd,SAASC,gBAEdC,QACAC,QACAC,OAA2C;AAE3C,MAAI,CAACD,QAAQE;AACX,WAAOL;AAOT,MAJAH,UAAUO,OACVN,WAAWI,QACXH,WAAWI,QAEPR,MAAMW,IAAIP,SAASM,KAAK,GAAG;AAC7B,QAAME,UAAUZ,MAAMa,IAAIT,SAASM,KAAK;AACxC,WAAOE;EACT;AAKA,MAAME,SAASnB,UAAAA;AAEf,WAASoB,MAAMC,KAAW;AACxB,QAAKd,YACAA,QAAQe,YACXf,QAAQe,UAAU,oBAAIC,IAAAA,IAExBhB,QAAQe,QAAQE,IAAIH,GAAAA,GAChBI,QAAQC,IAAIC,aAAa,iBAAiBnB,SAASoB,QAAO;UAK1DC,oBAJIC,SAAS1B,SAASc,IAAIX,OAAAA;AAC5BwB,cAAQC,KACN,uBAAgBF,MAAAA,uBAA6BT,GAAAA,IAC7Cd,UACAsB,qBAAAA,WAAW,YAAS,QAApBA,uBAAAA,SAAAA,SAAAA,mBAAsBX,IAAIY,SAAS,CAAA,CAAA;IAEvC;EACF;AAEA,MAAMb,WAAUgB,OAAOC,YACrBD,OAAOE,QAAQtB,OAAOE,KAAK,EAAEqB,QAAQ,SAAA,OAAA;QAAC,CAACf,KAAKgB,KAAAA,IAAM,OAC1CpB,WAAU;MACd,GAAGoB;MACH,IAAIC,MAAM;AAER,eAAKT,WAAWU,wBAEdnB,MAAMC,GAAAA,GAEDgB,MAAMC;MACf;MACApB,IAAIsB,UAAgB;AAClB,YAAK/B,UAEL;cAAMgC,SAASvC,YAAYmC,KAAAA,GACrB,EAAEK,MAAMC,QAAQC,SAAQ,IAAKnC,UAK3BoC,iBACJF,UACAH,aAAa,SACbzC,SACA,CAACS,SAASsC,SACV7C,WAAW,kBAAA,KACX2C,aAAa,KACbzC,0BAAAA;AAEF,cAAI0C,gBAAgB;gBAGQ1B,qBACQA,6BAH5B4B,iBAAiBJ,WAAW,SAAS,UAAU,QAC/CK,eAAeN,KAAKO,QAAQN,QAAQI,cAAAA,GACpCG,QAAQhD,aAAYiB,sBAAAA,OAAOgC,OAAOT,IAAAA,OAAK,QAAnBvB,wBAAAA,SAAAA,SAAAA,oBAAsBE,GAAAA,CAAI,GAC9C+B,gBAAgBlD,aAAYiB,8BAAAA,OAAOgC,OAAOH,YAAAA,OAAa,QAA3B7B,gCAAAA,SAAAA,SAAAA,4BAA8BE,GAAAA,CAAI,GAE9DgC,aAAa;cACjBC,SAAS;gBACP,CAACX,MAAAA,GAASO;gBACV,CAACH,cAAAA,GAAiBK;cACpB;YACF;AAEA,mBAAOC;UACT;AAEA,iBAAI5B,QAAQC,IAAIC,aAAa,iBAAiBnB,SAASoB,SACrDG,QAAQC,KAAK;2BACAQ,aAAa,KAAA;yBACfzC,KAAAA;yBACAS,SAASsC,KAAK;8BACT7C,WAAW,kBAAA,CAAA;eAC1B,GAGHmB,MAAMC,GAAAA,GAGDoB;;MACT;IACF;AAEA,WAAO;MACL;QAACpB;QAAKJ;;MACN;QAAC,IAAII,GAAAA;QAAOJ;;;EAEhB,CAAA,CAAA;AAGFZ,eAAMkD,IAAI1C,OAAOE,OAAOE,QAAAA,GAEjBA;AACT;",
+  "names": ["isIos", "getConfig", "getSetting", "getVariable", "doesRootSchemeMatchSystem", "keysToId", "cache", "Map", "curKeys", "curProps", "curState", "emptyObject", "getThemeProxied", "_props", "_state", "_keys", "theme", "has", "proxied", "get", "config", "track", "key", "current", "Set", "add", "process", "env", "NODE_ENV", "debug", "globalThis", "realId", "console", "info", "Object", "fromEntries", "entries", "flatMap", "value", "val", "tamaguiAvoidTracking", "platform", "outVal", "name", "scheme", "inverses", "shouldOptimize", "deopt", "oppositeScheme", "oppositeName", "replace", "color", "themes", "oppositeColor", "dynamicVal", "dynamic", "set"]
 }

package/dist/esm/hooks/useThemeState.js

@@ -7,11 +7,13 @@ import {
   useSyncExternalStore
 } from "react";
 import { getConfig } from "../config";
-const ThemeStateContext = createContext(""), allListeners = /* @__PURE__ */ new Map(), listenersByParent = {}, states = /* @__PURE__ */ new Map(), forceUpdateThemes = () => {
-  allListeners.forEach((cb) => cb());
-}, getThemeState = (id) => states.get(id);
-let rootThemeState = null;
-const getRootThemeState = () => rootThemeState, HasRenderedOnce = /* @__PURE__ */ new WeakMap(), useThemeState = (props, isRoot = !1, keys) => {
+const ThemeStateContext = createContext(""), keysToId = /* @__PURE__ */ new WeakMap(), allListeners = /* @__PURE__ */ new Map(), listenersByParent = {}, hasRenderedOnce = /* @__PURE__ */ new WeakMap(), pendingUpdate = /* @__PURE__ */ new Map(), states = /* @__PURE__ */ new Map();
+let shouldForce = !1;
+const forceUpdateThemes = () => {
+  cacheVersion++, shouldForce = !0, allListeners.forEach((cb) => cb());
+}, getThemeState = (id) => states.get(id), cache = /* @__PURE__ */ new Map();
+let cacheVersion = 0, themes = null, rootThemeState = null;
+const getRootThemeState = () => rootThemeState, useThemeState = (props, isRoot = !1, keys) => {
   const { disable } = props, parentId = useContext(ThemeStateContext);
   if (disable)
     return states.get(parentId) || {
@@ -21,48 +23,56 @@ const getRootThemeState = () => rootThemeState, HasRenderedOnce = /* @__PURE__ *
       inverses: 0
     };
   const id = useId(), subscribe = useCallback(
-    (cb) => (listenersByParent[parentId] ||= /* @__PURE__ */ new Set(), listenersByParent[parentId].add(id), allListeners.set(id, cb), () => {
+    (cb) => (listenersByParent[parentId] ||= /* @__PURE__ */ new Set(), listenersByParent[parentId].add(id), allListeners.set(id, () => {
+      pendingUpdate.set(id, shouldForce ? "force" : !0), cb();
+    }), () => {
       allListeners.delete(id), listenersByParent[parentId].delete(id);
     }),
-    [id, parentId, keys]
-  ), propsKey = getPropsKey(props), getSnapshot = () => getSnapshotFrom(props, propsKey, isRoot, id, parentId, keys);
+    [id, parentId]
+  ), propsKey = getPropsKey(props), getSnapshot = () => {
+    const last = states.get(id), needsUpdate = props.name === "light" || props.name === "dark" ? !0 : hasRenderedOnce.get(keys) ? keys?.current?.size ? !0 : props.needsUpdate?.() : !0, parentState = states.get(parentId), cacheKey = `${cacheVersion}${id}${propsKey}${parentState?.name || ""}${isRoot}`;
+    if (!needsUpdate && cache.has(cacheKey))
+      return cache.get(cacheKey);
+    const next = getSnapshotFrom(
+      last,
+      props,
+      propsKey,
+      isRoot,
+      id,
+      parentId,
+      needsUpdate,
+      pendingUpdate.get(id)
+    );
+    return last !== next && (pendingUpdate.delete(id), states.set(id, next), cache.set(id, next), process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && console.warn(` \xB7 useTheme(${id}) UPDATE from`, last, "to", next)), next;
+  };
   process.env.NODE_ENV === "development" && globalThis.time && globalThis.time`theme-prep-uses`;
   const state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
   return useIsomorphicLayoutEffect(() => {
-    if (propsKey) {
-      if (!HasRenderedOnce.has(keys)) {
-        HasRenderedOnce.set(keys, !0);
-        return;
-      }
-      process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, states.get(id)?.name), scheduleUpdate(id);
+    if (!hasRenderedOnce.get(keys)) {
+      hasRenderedOnce.set(keys, !0);
+      return;
     }
-  }, [keys, propsKey]), process.env.NODE_ENV === "development" && props.debug && (console.groupCollapsed(
-    ` \xB7 useTheme(${id}) =>`,
-    state.name,
-    id === state.id ? "\u{1F389}" : "\u23ED\uFE0F"
-  ), console.info({
-    state,
-    parentId,
-    props,
-    propsKey,
-    id,
-    parentState: states.get(parentId)
-  }), console.groupEnd()), state.id === id ? { ...state, isNew: !0 } : state;
-};
-let themes = null;
-const getSnapshotFrom = (props, propsKey, isRoot = !1, id, parentId, keys) => {
-  const needsUpdate = keys?.current?.size || props.needsUpdate?.(), parentState = states.get(parentId);
+    propsKey && (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, states.get(id)?.name), scheduleUpdate(id));
+  }, [keys, propsKey]), state.id === id ? { ...state, isNew: !0 } : state;
+}, getSnapshotFrom = (lastState, props, propsKey, isRoot = !1, id, parentId, needsUpdate, pendingUpdate2) => {
+  const parentState = states.get(parentId);
   themes || (themes = getConfig().themes);
-  const lastState = states.get(id), name = propsKey ? getNewThemeName(parentState?.name, props, !!needsUpdate) : null;
+  const name = !propsKey && pendingUpdate2 !== "force" ? null : getNewThemeName(
+    parentState?.name,
+    props,
+    pendingUpdate2 === "force" ? !0 : !!needsUpdate
+  ), isSameAsParent = !!(!name && propsKey);
   if (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile") {
     const message = ` \xB7 useTheme(${id}) snapshot ${name}, parent ${parentState?.id} needsUpdate ${needsUpdate}`;
-    console.groupCollapsed(message), console.info({ lastState, parentState, props, propsKey, id, keys }), console.groupEnd();
+    console.groupCollapsed(message), console.trace({ name, lastState, parentState, props, propsKey, id, isSameAsParent }), console.groupEnd();
   }
-  if (parentState && (!name && propsKey))
+  if (parentState && isSameAsParent)
     return parentState;
-  if (!name)
-    return lastState && !needsUpdate ? lastState : (states.set(id, parentState), parentState);
-  if (lastState && lastState.name === name)
+  if (!name) {
+    const next = lastState ?? parentState;
+    return needsUpdate && pendingUpdate2 ? { ...parentState || lastState } : next;
+  }
+  if (pendingUpdate2 !== "force" && lastState && lastState.name === name)
     return lastState;
   const scheme = getScheme(name), parentInverses = parentState?.inverses ?? 0, isInverse = parentState && scheme !== parentState.scheme, inverses = parentInverses + (isInverse ? 1 : 0), nextState = {
     id,
@@ -74,7 +84,7 @@ const getSnapshotFrom = (props, propsKey, isRoot = !1, id, parentId, keys) => {
     inverses,
     isInverse
   };
-  return process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && (console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F ${name}`), console.info("state", nextState), console.groupEnd()), states.set(id, nextState), isRoot && (rootThemeState = nextState), nextState;
+  return process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && (console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F2 ${name}`), console.info("state", nextState), console.groupEnd()), isRoot && (rootThemeState = nextState), pendingUpdate2 !== "force" && lastState && !needsUpdate ? (Object.assign(lastState, nextState), lastState) : nextState;
 };
 function scheduleUpdate(id) {
   const queue = [id], visited = /* @__PURE__ */ new Set();
@@ -95,7 +105,7 @@ const validSchemes = {
 function getScheme(name) {
   return validSchemes[name.split("_")[0]];
 }
-function getNewThemeName(parentName = "", { name, reset, componentName, inverse }, forceUpdate = !1) {
+function getNewThemeName(parentName = "", { name, reset, componentName, inverse, debug }, forceUpdate = !1) {
   if (name && reset)
     throw new Error(
       process.env.NODE_ENV === "production" ? "\u274C004" : "Cannot reset and set a new name at the same time."
@@ -125,7 +135,8 @@ function getNewThemeName(parentName = "", { name, reset, componentName, inverse
     }
     if (found) break;
   }
-  if (found && inverse) {
+  if (inverse) {
+    found ||= parentName;
     const scheme = found.split("_")[0];
     found = found.replace(new RegExp(`^${scheme}`), scheme === "light" ? "dark" : "light");
   }
@@ -146,6 +157,7 @@ export {
   getRootThemeState,
   getThemeState,
   hasThemeUpdatingProps,
+  keysToId,
   useThemeState
 };
 //# sourceMappingURL=useThemeState.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useThemeState.ts"],
-  "mappings": "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",
-  "names": ["themes"]
+  "mappings": "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",
+  "names": ["pendingUpdate", "themes"]
 }

package/dist/esm/hooks/useThemeState.mjs

@@ -2,16 +2,22 @@ import { useIsomorphicLayoutEffect } from "@tamagui/constants";
 import { createContext, useCallback, useContext, useId, useSyncExternalStore } from "react";
 import { getConfig } from "../config.mjs";
 const ThemeStateContext = createContext(""),
+  keysToId = /* @__PURE__ */new WeakMap(),
   allListeners = /* @__PURE__ */new Map(),
   listenersByParent = {},
-  states = /* @__PURE__ */new Map(),
-  forceUpdateThemes = () => {
-    allListeners.forEach(cb => cb());
+  hasRenderedOnce = /* @__PURE__ */new WeakMap(),
+  pendingUpdate = /* @__PURE__ */new Map(),
+  states = /* @__PURE__ */new Map();
+let shouldForce = !1;
+const forceUpdateThemes = () => {
+    cacheVersion++, shouldForce = !0, allListeners.forEach(cb => cb());
   },
-  getThemeState = id => states.get(id);
-let rootThemeState = null;
+  getThemeState = id => states.get(id),
+  cache = /* @__PURE__ */new Map();
+let cacheVersion = 0,
+  themes = null,
+  rootThemeState = null;
 const getRootThemeState = () => rootThemeState,
-  HasRenderedOnce = /* @__PURE__ */new WeakMap(),
   useThemeState = (props, isRoot = !1, keys) => {
     const {
         disable
@@ -24,70 +30,75 @@ const getRootThemeState = () => rootThemeState,
       inverses: 0
     };
     const id = useId(),
-      subscribe = useCallback(cb => (listenersByParent[parentId] ||= /* @__PURE__ */new Set(), listenersByParent[parentId].add(id), allListeners.set(id, cb), () => {
+      subscribe = useCallback(cb => (listenersByParent[parentId] ||= /* @__PURE__ */new Set(), listenersByParent[parentId].add(id), allListeners.set(id, () => {
+        pendingUpdate.set(id, shouldForce ? "force" : !0), cb();
+      }), () => {
         allListeners.delete(id), listenersByParent[parentId].delete(id);
-      }), [id, parentId, keys]),
+      }), [id, parentId]),
       propsKey = getPropsKey(props),
-      getSnapshot = () => getSnapshotFrom(props, propsKey, isRoot, id, parentId, keys);
+      getSnapshot = () => {
+        const last = states.get(id),
+          needsUpdate = props.name === "light" || props.name === "dark" ? !0 : hasRenderedOnce.get(keys) ? keys?.current?.size ? !0 : props.needsUpdate?.() : !0,
+          parentState = states.get(parentId),
+          cacheKey = `${cacheVersion}${id}${propsKey}${parentState?.name || ""}${isRoot}`;
+        if (!needsUpdate && cache.has(cacheKey)) return cache.get(cacheKey);
+        const next = getSnapshotFrom(last, props, propsKey, isRoot, id, parentId, needsUpdate, pendingUpdate.get(id));
+        return last !== next && (pendingUpdate.delete(id), states.set(id, next), cache.set(id, next), process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && console.warn(` \xB7 useTheme(${id}) UPDATE from`, last, "to", next)), next;
+      };
     process.env.NODE_ENV === "development" && globalThis.time && globalThis.time`theme-prep-uses`;
     const state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
     return useIsomorphicLayoutEffect(() => {
-      if (propsKey) {
-        if (!HasRenderedOnce.has(keys)) {
-          HasRenderedOnce.set(keys, !0);
-          return;
-        }
-        process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, states.get(id)?.name), scheduleUpdate(id);
+      if (!hasRenderedOnce.get(keys)) {
+        hasRenderedOnce.set(keys, !0);
+        return;
       }
-    }, [keys, propsKey]), process.env.NODE_ENV === "development" && props.debug && (console.groupCollapsed(` \xB7 useTheme(${id}) =>`, state.name, id === state.id ? "\u{1F389}" : "\u23ED\uFE0F"), console.info({
-      state,
-      parentId,
-      props,
-      propsKey,
-      id,
-      parentState: states.get(parentId)
-    }), console.groupEnd()), state.id === id ? {
+      propsKey && (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, states.get(id)?.name), scheduleUpdate(id));
+    }, [keys, propsKey]), state.id === id ? {
       ...state,
       isNew: !0
     } : state;
+  },
+  getSnapshotFrom = (lastState, props, propsKey, isRoot = !1, id, parentId, needsUpdate, pendingUpdate2) => {
+    const parentState = states.get(parentId);
+    themes || (themes = getConfig().themes);
+    const name = !propsKey && pendingUpdate2 !== "force" ? null : getNewThemeName(parentState?.name, props, pendingUpdate2 === "force" ? !0 : !!needsUpdate),
+      isSameAsParent = !!(!name && propsKey);
+    if (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile") {
+      const message = ` \xB7 useTheme(${id}) snapshot ${name}, parent ${parentState?.id} needsUpdate ${needsUpdate}`;
+      console.groupCollapsed(message), console.trace({
+        name,
+        lastState,
+        parentState,
+        props,
+        propsKey,
+        id,
+        isSameAsParent
+      }), console.groupEnd();
+    }
+    if (parentState && isSameAsParent) return parentState;
+    if (!name) {
+      const next = lastState ?? parentState;
+      return needsUpdate && pendingUpdate2 ? {
+        ...(parentState || lastState)
+      } : next;
+    }
+    if (pendingUpdate2 !== "force" && lastState && lastState.name === name) return lastState;
+    const scheme = getScheme(name),
+      parentInverses = parentState?.inverses ?? 0,
+      isInverse = parentState && scheme !== parentState.scheme,
+      inverses = parentInverses + (isInverse ? 1 : 0),
+      nextState = {
+        id,
+        name,
+        theme: themes[name],
+        scheme,
+        parentId,
+        parentName: parentState?.name,
+        inverses,
+        isInverse
+      };
+    return process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && (console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F2 ${name}`), console.info("state", nextState), console.groupEnd()), isRoot && (rootThemeState = nextState), pendingUpdate2 !== "force" && lastState && !needsUpdate ? (Object.assign(lastState, nextState), lastState) : nextState;
   };
-let themes = null;
-const getSnapshotFrom = (props, propsKey, isRoot = !1, id, parentId, keys) => {
-  const needsUpdate = keys?.current?.size || props.needsUpdate?.(),
-    parentState = states.get(parentId);
-  themes || (themes = getConfig().themes);
-  const lastState = states.get(id),
-    name = propsKey ? getNewThemeName(parentState?.name, props, !!needsUpdate) : null;
-  if (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile") {
-    const message = ` \xB7 useTheme(${id}) snapshot ${name}, parent ${parentState?.id} needsUpdate ${needsUpdate}`;
-    console.groupCollapsed(message), console.info({
-      lastState,
-      parentState,
-      props,
-      propsKey,
-      id,
-      keys
-    }), console.groupEnd();
-  }
-  if (parentState && !name && propsKey) return parentState;
-  if (!name) return lastState && !needsUpdate ? lastState : (states.set(id, parentState), parentState);
-  if (lastState && lastState.name === name) return lastState;
-  const scheme = getScheme(name),
-    parentInverses = parentState?.inverses ?? 0,
-    isInverse = parentState && scheme !== parentState.scheme,
-    inverses = parentInverses + (isInverse ? 1 : 0),
-    nextState = {
-      id,
-      name,
-      theme: themes[name],
-      scheme,
-      parentId,
-      parentName: parentState?.name,
-      inverses,
-      isInverse
-    };
-  return process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && (console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F ${name}`), console.info("state", nextState), console.groupEnd()), states.set(id, nextState), isRoot && (rootThemeState = nextState), nextState;
-};
 function scheduleUpdate(id) {
   const queue = [id],
     visited = /* @__PURE__ */new Set();
@@ -111,7 +122,8 @@ function getNewThemeName(parentName = "", {
   name,
   reset,
   componentName,
-  inverse
+  inverse,
+  debug
 }, forceUpdate = !1) {
   if (name && reset) throw new Error(process.env.NODE_ENV === "production" ? "\u274C004" : "Cannot reset and set a new name at the same time.");
   if (reset) {
@@ -139,7 +151,8 @@ function getNewThemeName(parentName = "", {
     }
     if (found) break;
   }
-  if (found && inverse) {
+  if (inverse) {
+    found ||= parentName;
     const scheme = found.split("_")[0];
     found = found.replace(new RegExp(`^${scheme}`), scheme === "light" ? "dark" : "light");
   }
@@ -156,5 +169,5 @@ const getPropsKey = ({
     componentName
   }) => `${name || ""}${inverse || ""}${reset || ""}${forceClassName || ""}${componentName || ""}`,
   hasThemeUpdatingProps = props => "inverse" in props || "name" in props || "reset" in props || "forceClassName" in props;
-export { ThemeStateContext, forceUpdateThemes, getRootThemeState, getThemeState, hasThemeUpdatingProps, useThemeState };
+export { ThemeStateContext, forceUpdateThemes, getRootThemeState, getThemeState, hasThemeUpdatingProps, keysToId, useThemeState };
 //# sourceMappingURL=useThemeState.mjs.map