@tamagui/web 1.124.4 → 1.124.6

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

@@ -1,15 +1,15 @@
 import { useIsomorphicLayoutEffect } from "@tamagui/constants";
 import { createContext, useCallback, useContext, useId, useSyncExternalStore } from "react";
 import { getConfig } from "../config";
-var ThemeStateContext = createContext(""), allListeners = /* @__PURE__ */ new Map(), listenersByParent = {}, states = /* @__PURE__ */ new Map(), forceUpdateThemes = function() {
-  allListeners.forEach(function(cb) {
+var ThemeStateContext = createContext(""), keysToId = /* @__PURE__ */ new WeakMap(), allListeners = /* @__PURE__ */ new Map(), listenersByParent = {}, hasRenderedOnce = /* @__PURE__ */ new WeakMap(), pendingUpdate = /* @__PURE__ */ new Map(), states = /* @__PURE__ */ new Map(), shouldForce = !1, forceUpdateThemes = function() {
+  cacheVersion++, shouldForce = !0, allListeners.forEach(function(cb) {
     return cb();
   });
 }, getThemeState = function(id) {
   return states.get(id);
-}, rootThemeState = null, getRootThemeState = function() {
+}, cache = /* @__PURE__ */ new Map(), cacheVersion = 0, themes = null, rootThemeState = null, getRootThemeState = function() {
   return rootThemeState;
-}, HasRenderedOnce = /* @__PURE__ */ new WeakMap(), useThemeState = function(props) {
+}, useThemeState = function(props) {
   var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1, keys = arguments.length > 2 ? arguments[2] : void 0, { disable } = props, parentId = useContext(ThemeStateContext);
   if (disable)
     return states.get(parentId) || {
@@ -20,24 +20,29 @@ var ThemeStateContext = createContext(""), allListeners = /* @__PURE__ */ new Ma
     };
   var id = useId(), subscribe = useCallback(function(cb) {
     var _listenersByParent, _parentId;
-    return (_listenersByParent = listenersByParent)[_parentId = parentId] || (_listenersByParent[_parentId] = /* @__PURE__ */ new Set()), listenersByParent[parentId].add(id), allListeners.set(id, cb), function() {
+    return (_listenersByParent = listenersByParent)[_parentId = parentId] || (_listenersByParent[_parentId] = /* @__PURE__ */ new Set()), listenersByParent[parentId].add(id), allListeners.set(id, function() {
+      pendingUpdate.set(id, shouldForce ? "force" : !0), cb();
+    }), function() {
       allListeners.delete(id), listenersByParent[parentId].delete(id);
     };
   }, [
     id,
-    parentId,
-    keys
+    parentId
   ]), propsKey = getPropsKey(props), getSnapshot = function() {
-    return getSnapshotFrom(props, propsKey, isRoot, id, parentId, keys);
+    var _keys_current, _props_needsUpdate, last = states.get(id), needsUpdate = props.name === "light" || props.name === "dark" ? !0 : hasRenderedOnce.get(keys) ? !(keys == null || (_keys_current = keys.current) === null || _keys_current === void 0) && _keys_current.size ? !0 : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props) : !0, parentState = states.get(parentId), cacheKey = `${cacheVersion}${id}${propsKey}${parentState?.name || ""}${isRoot}`;
+    if (!needsUpdate && cache.has(cacheKey))
+      return cache.get(cacheKey);
+    var 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`;
   var state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
   return useIsomorphicLayoutEffect(function() {
+    if (!hasRenderedOnce.get(keys)) {
+      hasRenderedOnce.set(keys, !0);
+      return;
+    }
     if (propsKey) {
-      if (!HasRenderedOnce.has(keys)) {
-        HasRenderedOnce.set(keys, !0);
-        return;
-      }
       if (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile") {
         var _states_get;
         console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, (_states_get = states.get(id)) === null || _states_get === void 0 ? void 0 : _states_get.name);
@@ -47,31 +52,31 @@ var ThemeStateContext = createContext(""), allListeners = /* @__PURE__ */ new Ma
   }, [
     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.id === id ? {
     ...state,
     isNew: !0
   } : state;
-}, themes = null, getSnapshotFrom = function(props, propsKey) {
-  var isRoot = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1, id = arguments.length > 3 ? arguments[3] : void 0, parentId = arguments.length > 4 ? arguments[4] : void 0, keys = arguments.length > 5 ? arguments[5] : void 0, _keys_current, _props_needsUpdate, needsUpdate = (keys == null || (_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) || ((_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props)), parentState = states.get(parentId);
+}, getSnapshotFrom = function(lastState, props, propsKey) {
+  var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, id = arguments.length > 4 ? arguments[4] : void 0, parentId = arguments.length > 5 ? arguments[5] : void 0, needsUpdate = arguments.length > 6 ? arguments[6] : void 0, pendingUpdate2 = arguments.length > 7 ? arguments[7] : void 0, parentState = states.get(parentId);
   themes || (themes = getConfig().themes);
-  var lastState = states.get(id), name = propsKey ? getNewThemeName(parentState?.name, props, !!needsUpdate) : null;
+  var 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") {
     var message = ` \xB7 useTheme(${id}) snapshot ${name}, parent ${parentState?.id} needsUpdate ${needsUpdate}`;
     console.info(message);
   }
-  var isSameAsParent = !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) {
+    var next = lastState ?? parentState;
+    if (needsUpdate && pendingUpdate2) {
+      var updated = {
+        ...parentState || lastState
+      };
+      return updated;
+    }
+    return next;
+  }
+  if (pendingUpdate2 !== "force" && lastState && lastState.name === name)
     return lastState;
   var scheme = getScheme(name), _parentState_inverses, parentInverses = (_parentState_inverses = parentState?.inverses) !== null && _parentState_inverses !== void 0 ? _parentState_inverses : 0, isInverse = parentState && scheme !== parentState.scheme, inverses = parentInverses + (isInverse ? 1 : 0), nextState = {
     id,
@@ -83,7 +88,7 @@ var ThemeStateContext = createContext(""), allListeners = /* @__PURE__ */ new Ma
     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) {
   for (var queue = [
@@ -122,7 +127,7 @@ function getScheme(name) {
   return validSchemes[name.split("_")[0]];
 }
 function getNewThemeName() {
-  var parentName = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", { name, reset, componentName, inverse } = arguments.length > 1 ? arguments[1] : void 0, forceUpdate = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1;
+  var parentName = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", { name, reset, componentName, inverse, debug } = arguments.length > 1 ? arguments[1] : void 0, forceUpdate = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !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) {
@@ -158,7 +163,8 @@ function getNewThemeName() {
     }
     if (found) break;
   }
-  if (found && inverse) {
+  if (inverse) {
+    found || (found = parentName);
     var scheme = found.split("_")[0];
     found = found.replace(new RegExp(`^${scheme}`), scheme === "light" ? "dark" : "light");
   }
@@ -178,6 +184,7 @@ export {
   getRootThemeState,
   getThemeState,
   hasThemeUpdatingProps,
+  keysToId,
   useThemeState
 };
 //# sourceMappingURL=useThemeState.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/Users/n8/tamagui/code/core/web/src/hooks/useThemeState.ts"],
-  "mappings": "AAAA,SAASA,iCAAiC;AAC1C,SACEC,eACAC,aACAC,YACAC,OACAC,4BAEK;AACP,SAASC,iBAAiB;AAiBnB,IAAMC,oBAAoBN,cAAkB,EAAA,GAE7CO,eAAe,oBAAIC,IAAAA,GACnBC,oBAAyC,CAAC,GAG1CC,SAA0C,oBAAIF,IAAAA,GAEvCG,oBAAoB,WAAA;AAC/BJ,eAAaK,QAAQ,SAACC,IAAAA;WAAOA,GAAAA;;AAC/B,GAEaC,gBAAgB,SAACC,IAAAA;SAAWL,OAAOM,IAAID,EAAAA;GAEhDE,iBAAoC,MAC3BC,oBAAoB,WAAA;SAAMD;GAEjCE,kBAAkB,oBAAIC,QAAAA,GAEfC,gBAAgB,SAC3BC,OAAAA;MACAC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS,IACTC,OAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QAEM,EAAEC,QAAO,IAAKH,OACdI,WAAWxB,WAAWI,iBAAAA;AAE5B,MAAImB;AACF,WACEf,OAAOM,IAAIU,QAAAA,KAAa;MACtBX,IAAI;MACJY,MAAM;MACNC,OAAOvB,UAAAA,EAAYwB,OAAOC;MAC1BC,UAAU;IACZ;AAIJ,MAAMhB,KAAKZ,MAAAA,GACL6B,YAAY/B,YAChB,SAACY,IAAAA;QACCJ,oBAAkBiB;AAAlBjB,YAAAA,qBAAAA,mBAAkBiB,YAAAA,QAAAA,MAAlBjB,mBAAkBiB,SAAAA,IAAc,oBAAIO,IAAAA,IACpCxB,kBAAkBiB,QAAAA,EAAUQ,IAAInB,EAAAA,GAChCR,aAAa4B,IAAIpB,IAAIF,EAAAA,GACd,WAAA;AACLN,mBAAa6B,OAAOrB,EAAAA,GACpBN,kBAAkBiB,QAAAA,EAAUU,OAAOrB,EAAAA;IACrC;EACF,GACA;IAACA;IAAIW;IAAUF;GAAK,GAGhBa,WAAWC,YAAYhB,KAAAA,GAEvBiB,cAAc,WAAA;AAClB,WAAOC,gBAAgBlB,OAAOe,UAAUd,QAAQR,IAAIW,UAAUF,IAAAA;EAChE;AAEA,EAAIiB,QAAQC,IAAIC,aAAa,iBAAiBC,WAAWC,QACvDD,WAAWC;AAEb,MAAMC,QAAQ1C,qBAAqB4B,WAAWO,aAAaA,WAAAA;AAE3DxC,mCAA0B,WAAA;AACxB,QAAKsC,UACL;UAAI,CAAClB,gBAAgB4B,IAAIvB,IAAAA,GAAO;AAC9BL,wBAAgBgB,IAAIX,MAAM,EAAA;AAC1B;MACF;AACA,UACEiB,QAAQC,IAAIC,aAAa,iBACzBrB,MAAM0B,SACN1B,MAAM0B,UAAU,WAChB;YAC4DtC;AAA5DuC,gBAAQC,KAAK,kBAAenC,EAAAA,oBAAsBsB,WAAU3B,cAAAA,OAAOM,IAAID,EAAAA,OAAAA,QAAXL,gBAAAA,SAAAA,SAAAA,YAAgBiB,IAAI;MAClF;AACAwB,qBAAepC,EAAAA;;EACjB,GAAG;IAACS;IAAMa;GAAS,GAEfI,QAAQC,IAAIC,aAAa,iBAAiBrB,MAAM0B,UAClDC,QAAQG,eACN,kBAAerC,EAAAA,QACf+B,MAAMnB,MACNZ,OAAO+B,MAAM/B,KAAK,cAAO,cAAA,GAE3BkC,QAAQI,KAAK;IACXP;IACApB;IACAJ;IACAe;IACAtB;IACAuC,aAAa5C,OAAOM,IAAIU,QAAAA;EAC1B,CAAA,GACAuB,QAAQM,SAAQ,IAGXT,MAAM/B,OAAOA,KAAK;IAAE,GAAG+B;IAAOU,OAAO;EAAK,IAAIV;AACvD,GAGIjB,SAA6C,MAE3CW,kBAAkB,SACtBlB,OACAe,UAAAA;MACAd,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS,IACTR,KAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QACAW,WAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QACAF,OAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QAEoBA,eAAuBF,oBAArCmC,eAAcjC,QAAAA,SAAAA,gBAAAA,KAAMkC,aAAO,QAAblC,kBAAAA,SAAAA,SAAAA,cAAemC,WAAQrC,qBAAAA,MAAMmC,iBAAW,QAAjBnC,uBAAAA,SAAAA,SAAAA,mBAAAA,KAAAA,KAAAA,IACrCgC,cAAc5C,OAAOM,IAAIU,QAAAA;AAO/B,EAAKG,WACHA,SAASxB,UAAAA,EAAYwB;AAGvB,MAAM+B,YAAYlD,OAAOM,IAAID,EAAAA,GAEvBY,OAAQU,WAAkBwB,gBAAgBP,aAAa3B,MAAML,OAAO,CAAC,CAACmC,WAAAA,IAAnD;AAEzB,MACEhB,QAAQC,IAAIC,aAAa,iBACzBrB,MAAM0B,SACN1B,MAAM0B,UAAU,WAChB;AACA,QAAMc,UAAU,kBAAe/C,EAAAA,cAAgBY,IAAAA,YAAgB2B,aAAavC,EAAE,gBAAgB0C,WAAAA;AAE5FR,YAAQI,KAAKS,OAAAA;EAMjB;AAEA,MAAMC,iBAAiB,CAACpC,QAAQU;AAChC,MAAIiB,eAAeS;AACjB,WAAOT;AAGT,MAAI,CAAC3B;AACH,WAAIiC,aAAa,CAACH,cACTG,aAETlD,OAAOyB,IAAIpB,IAAIuC,WAAAA,GAERA;AAGT,MACEM,aACAA,UAAUjC,SAASA;AAKnB,WAAOiC;AAGT,MAAMI,SAASC,UAAUtC,IAAAA,GACF2B,uBAAjBY,kBAAiBZ,wBAAAA,aAAavB,cAAQ,QAArBuB,0BAAAA,SAAAA,wBAAyB,GAC1Ca,YAAYb,eAAeU,WAAWV,YAAYU,QAClDjC,WAAWmC,kBAAkBC,YAAY,IAAI,IAE7CC,YAAY;IAChBrD;IACAY;IACAC,OAAOC,OAAOF,IAAAA;IACdqC;IACAtC;IACA2C,YAAYf,aAAa3B;IACzBI;IACAoC;EACF;AAEA,SACE1B,QAAQC,IAAIC,aAAa,iBACzBrB,MAAM0B,SACN1B,MAAM0B,UAAU,cAEhBC,QAAQG,eAAe,kBAAerC,EAAAA,kBAAUY,IAAAA,EAAM,GACtDsB,QAAQI,KAAK,SAASe,SAAAA,GACtBnB,QAAQM,SAAQ,IAGlB7C,OAAOyB,IAAIpB,IAAIqD,SAAAA,GAGX7C,WACFN,iBAAiBmD,YAGZA;AACT;AAEA,SAASjB,eAAepC,IAAU;AAIhC,WAHMuD,QAAQ;IAACvD;KACTwD,UAAU,oBAAItC,IAAAA,GAEbqC,MAAME,UAAQ;AACnB,QAAMC,SAASH,MAAMI,MAAK,GACpBC,WAAWlE,kBAAkBgE,MAAAA;AACnC,QAAIE,UAAU;UACP,4BAAA,IAAA,oBAAA,IAAA,iBAAA;;AAAL,iBAAK,YAAiBA,SAAAA,OAAAA,QAAAA,EAAAA,GAAjB,OAAA,EAAA,6BAAA,QAAA,UAAA,KAAA,GAAA,OAAA,4BAAA,IAA2B;AAA3B,cAAMC,UAAN,MAAA;AACH,UAAKL,QAAQxB,IAAI6B,OAAAA,MACfL,QAAQrC,IAAI0C,OAAAA,GACZN,MAAMO,KAAKD,OAAAA;QAEf;;AALK,4BAAA,IAAA,iBAAA;;;WAAA,6BAAA,UAAA,UAAA,QAAA,UAAA,OAAA;;cAAA;kBAAA;;;IAMP;EACF;AAEAL,UAAQ3D,QAAQ,SAACgE,UAAAA;AACf,QAAM/D,KAAKN,aAAaS,IAAI4D,QAAAA;AAC5B/D,IAAAA,KAAAA;EACF,CAAA;AACF;AAEA,IAAMiE,eAAe;EACnBhD,OAAO;EACPiD,MAAM;AACR;AAEA,SAASd,UAAUtC,MAAY;AAC7B,SAAOmD,aAAanD,KAAKqD,MAAM,GAAA,EAAK,CAAA,CAAE;AACxC;AAEA,SAASnB,kBAAAA;MACPQ,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAa,IACb,EAAE1C,MAAMsD,OAAOC,eAAeC,QAAO,IAA0B,UAAA,SAAA,IAAA,UAAA,CAAA,IAAA,QAC/DC,cAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAc;AAEd,MAAIzD,QAAQsD;AACV,UAAM,IAAII,MACR5C,QAAQC,IAAIC,aAAa,eACrB,cACA,mDAAA;AAIR,MAAIsC,OAAO;AACT,QAAI,CAACZ,WAAY,OAAM,IAAIgB,MAAM,cAAI;AACrC,QAAMC,gBAAgBjB,WAAWkB,YAAY,GAAA;AAC7C,WAAOD,iBAAiB,IAAIjB,aAAaA,WAAWmB,MAAMF,aAAAA;EAC5D;AAEA,MAAM,EAAEzD,QAAAA,QAAM,IAAKxB,UAAAA,GACboF,cAAcpB,WAAWW,MAAM,GAAA,GAG/BU,WAAWD,YAAYA,YAAYjB,SAAS,CAAA;AAClD,EAAIkB,YAAYA,SAAS,CAAA,EAAGC,YAAW,MAAOD,SAAS,CAAA,KACrDD,YAAYG,IAAG;AAajB,WAVMC,WAAW;IACflE,QAAQuD,gBAAgB,GAAGvD,IAAAA,IAAQuD,aAAAA,KAAkBY;IACrDnE;IACAuD;IACAa,OAAOC,OAAAA,GAELC,QAAuB,MAErBC,MAAMT,YAAYjB,QAEf2B,IAAI,GAAGA,KAAKD,KAAKC,KAAK;AAC7B,QAAMC,QAAQD,MAAM,IAAIV,cAAcA,YAAYD,MAAM,GAAG,CAACW,CAAAA,GAAIE,KAAK,GAAA,GAEhE,4BAAA,IAAA,oBAAA,IAAA,iBAAA;;AAAL,eAAK,YAAiBR,SAAAA,OAAAA,QAAAA,EAAAA,GAAjB,OAAA,EAAA,6BAAA,QAAA,UAAA,KAAA,GAAA,OAAA,4BAAA,IAA2B;AAA3B,YAAMS,UAAN,MAAA,OACGC,YAAYH,OAAO,GAAGA,IAAAA,IAAQE,OAAAA,KAAYA;AAEhD,YAAIC,aAAa1E,SAAQ;AACvBoE,kBAAQM;AACR;QACF;MACF;;AAPK,0BAAA,IAAA,iBAAA;;;SAAA,6BAAA,UAAA,UAAA,QAAA,UAAA,OAAA;;YAAA;gBAAA;;;AASL,QAAIN,MAAO;EACb;AAEA,MAAIA,SAASd,SAAS;AACpB,QAAMnB,SAASiC,MAAMjB,MAAM,GAAA,EAAK,CAAA;AAChCiB,YAAQA,MAAMO,QAAQ,IAAIC,OAAO,IAAIzC,MAAAA,EAAQ,GAAGA,WAAW,UAAU,SAAS,OAAA;EAChF;AAEA,SACE,CAACoB,eACDa,UAAU5B;;EAGV,CAACS,aAAamB,KAAAA,IAEP,OAGFA;AACT;AAEA,IAAM3D,cAAc,SAAA,OAAA;MAAC,EACnBX,MACAsD,OACAE,SACAuB,gBACAxB,cAAa,IACF;SACX,GAAGvD,QAAQ,EAAA,GAAKwD,WAAW,EAAA,GAAKF,SAAS,EAAA,GAAKyB,kBAAkB,EAAA,GAAKxB,iBAAiB,EAAA;GAE3EyB,wBAAwB,SAACrF,OAAAA;SACpC,aAAaA,SAAS,UAAUA,SAAS,WAAWA,SAAS,oBAAoBA;;",
-  "names": ["useIsomorphicLayoutEffect", "createContext", "useCallback", "useContext", "useId", "useSyncExternalStore", "getConfig", "ThemeStateContext", "allListeners", "Map", "listenersByParent", "states", "forceUpdateThemes", "forEach", "cb", "getThemeState", "id", "get", "rootThemeState", "getRootThemeState", "HasRenderedOnce", "WeakMap", "useThemeState", "props", "isRoot", "keys", "disable", "parentId", "name", "theme", "themes", "light", "inverses", "subscribe", "Set", "add", "set", "delete", "propsKey", "getPropsKey", "getSnapshot", "getSnapshotFrom", "process", "env", "NODE_ENV", "globalThis", "time", "state", "has", "debug", "console", "warn", "scheduleUpdate", "groupCollapsed", "info", "parentState", "groupEnd", "isNew", "needsUpdate", "current", "size", "lastState", "getNewThemeName", "message", "isSameAsParent", "scheme", "getScheme", "parentInverses", "isInverse", "nextState", "parentName", "queue", "visited", "length", "parent", "shift", "children", "childId", "push", "validSchemes", "dark", "split", "reset", "componentName", "inverse", "forceUpdate", "Error", "lastPartIndex", "lastIndexOf", "slice", "parentParts", "lastName", "toLowerCase", "pop", "subNames", "undefined", "filter", "Boolean", "found", "max", "i", "base", "join", "subName", "potential", "replace", "RegExp", "forceClassName", "hasThemeUpdatingProps"]
+  "mappings": "AAAA,SAASA,iCAAiC;AAC1C,SACEC,eACAC,aACAC,YACAC,OACAC,4BAEK;AACP,SAASC,iBAAiB;AAiBnB,IAAMC,oBAAoBN,cAAkB,EAAA,GAEtCO,WAAW,oBAAIC,QAAAA,GAEtBC,eAAe,oBAAIC,IAAAA,GACnBC,oBAAyC,CAAC,GAC1CC,kBAAkB,oBAAIJ,QAAAA,GACtBK,gBAAgB,oBAAIH,IAAAA,GAGpBI,SAA0C,oBAAIJ,IAAAA,GAEhDK,cAAc,IACLC,oBAAoB,WAAA;AAC/BC,kBACAF,cAAc,IACdN,aAAaS,QAAQ,SAACC,IAAAA;WAAOA,GAAAA;;AAC/B,GAEaC,gBAAgB,SAACC,IAAAA;SAAWP,OAAOQ,IAAID,EAAAA;GAE9CE,QAAQ,oBAAIb,IAAAA,GACdO,eAAe,GAEfO,SAA6C,MAE7CC,iBAAoC,MAC3BC,oBAAoB,WAAA;SAAMD;GAE1BE,gBAAgB,SAC3BC,OAAAA;MACAC,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS,IACTC,OAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QAEM,EAAEC,QAAO,IAAKH,OACdI,WAAW9B,WAAWI,iBAAAA;AAE5B,MAAIyB;AACF,WACEjB,OAAOQ,IAAIU,QAAAA,KAAa;MACtBX,IAAI;MACJY,MAAM;MACNC,OAAO7B,UAAAA,EAAYmB,OAAOW;MAC1BC,UAAU;IACZ;AAIJ,MAAMf,KAAKlB,MAAAA,GAELkC,YAAYpC,YAChB,SAACkB,IAAAA;QACCR,oBAAkBqB;AAAlBrB,YAAAA,qBAAAA,mBAAkBqB,YAAAA,QAAAA,MAAlBrB,mBAAkBqB,SAAAA,IAAc,oBAAIM,IAAAA,IACpC3B,kBAAkBqB,QAAAA,EAAUO,IAAIlB,EAAAA,GAChCZ,aAAa+B,IAAInB,IAAI,WAAA;AACnBR,oBAAc2B,IAAInB,IAAIN,cAAc,UAAU,EAAA,GAC9CI,GAAAA;IACF,CAAA,GACO,WAAA;AACLV,mBAAagC,OAAOpB,EAAAA,GACpBV,kBAAkBqB,QAAAA,EAAUS,OAAOpB,EAAAA;IACrC;EACF,GACA;IAACA;IAAIW;GAAS,GAGVU,WAAWC,YAAYf,KAAAA,GAEvBgB,cAAc,WAAA;QAOVd,eAEEF,oBARJiB,OAAO/B,OAAOQ,IAAID,EAAAA,GAClByB,cACJlB,MAAMK,SAAS,WAAWL,MAAMK,SAAS,SACrC,KACCrB,gBAAgBU,IAAIQ,IAAAA,IAEnBA,UAAAA,SAAAA,gBAAAA,KAAMiB,aAAO,QAAbjB,kBAAAA,WAAAA,cAAekB,OACb,MACApB,qBAAAA,MAAMkB,iBAAW,QAAjBlB,uBAAAA,SAAAA,SAAAA,mBAAAA,KAAAA,KAAAA,IAHF,IAKFqB,cAAcnC,OAAOQ,IAAIU,QAAAA,GACzBkB,WAAW,GAAGjC,YAAAA,GAAeI,EAAAA,GAAKqB,QAAAA,GAAWO,aAAahB,QAAQ,EAAA,GAAKJ,MAAAA;AAE7E,QAAI,CAACiB,eACCvB,MAAM4B,IAAID,QAAAA;AACZ,aAAO3B,MAAMD,IAAI4B,QAAAA;AAIrB,QAAME,OAAOC,gBACXR,MACAjB,OACAc,UACAb,QACAR,IACAW,UACAc,aACAjC,cAAcS,IAAID,EAAAA,CAAAA;AAGpB,WAAIwB,SAASO,SACXvC,cAAc4B,OAAOpB,EAAAA,GACrBP,OAAO0B,IAAInB,IAAI+B,IAAAA,GACf7B,MAAMiB,IAAInB,IAAI+B,IAAAA,GAEZE,QAAQC,IAAIC,aAAa,iBACzB5B,MAAM6B,SACN7B,MAAM6B,UAAU,aAEhBC,QAAQC,KAAK,kBAAetC,EAAAA,iBAAmBwB,MAAM,MAAMO,IAAAA,IAIxDA;EACT;AAEA,EAAIE,QAAQC,IAAIC,aAAa,iBAAiBI,WAAWC,QACvDD,WAAWC;AAEb,MAAMC,QAAQ1D,qBAAqBiC,WAAWO,aAAaA,WAAAA;AAE3D7C,mCAA0B,WAAA;AACxB,QAAI,CAACa,gBAAgBU,IAAIQ,IAAAA,GAAO;AAC9BlB,sBAAgB4B,IAAIV,MAAM,EAAA;AAC1B;IACF;AACA,QAAKY,UACL;UACEY,QAAQC,IAAIC,aAAa,iBACzB5B,MAAM6B,SACN7B,MAAM6B,UAAU,WAChB;YAC4D3C;AAA5D4C,gBAAQC,KAAK,kBAAetC,EAAAA,oBAAsBqB,WAAU5B,cAAAA,OAAOQ,IAAID,EAAAA,OAAAA,QAAXP,gBAAAA,SAAAA,SAAAA,YAAgBmB,IAAI;MAClF;AACA8B,qBAAe1C,EAAAA;;EACjB,GAAG;IAACS;IAAMY;GAAS,GAEZoB,MAAMzC,OAAOA,KAAK;IAAE,GAAGyC;IAAOE,OAAO;EAAK,IAAIF;AACvD,GAEMT,kBAAkB,SACtBY,WACArC,OACAc,UAAAA;MACAb,SAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAS,IACTR,KAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QACAW,WAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QACAc,cAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QACAjC,iBAAAA,UAAAA,SAAAA,IAAAA,UAAAA,CAAAA,IAAAA,QAEMoC,cAAcnC,OAAOQ,IAAIU,QAAAA;AAE/B,EAAKR,WACHA,SAASnB,UAAAA,EAAYmB;AAGvB,MAAMS,OACJ,CAACS,YAAY7B,mBAAkB,UAC3B,OACAqD,gBACEjB,aAAahB,MACbL,OACAf,mBAAkB,UAAU,KAAO,CAAC,CAACiC,WAAAA,GAGvCqB,iBAAiBC,GAAQ,CAACnC,QAAQS;AAExC,MACEY,QAAQC,IAAIC,aAAa,iBACzB5B,MAAM6B,SACN7B,MAAM6B,UAAU,WAChB;AACA,QAAMY,UAAU,kBAAehD,EAAAA,cAAgBY,IAAAA,YAAgBgB,aAAa5B,EAAE,gBAAgByB,WAAAA;AAE5FY,YAAQY,KAAKD,OAAAA;EAMjB;AAEA,MAAIpB,eAAekB;AACjB,WAAOlB;AAGT,MAAI,CAAChB,MAAM;AACT,QAAMmB,OAAOa,aAAahB;AAE1B,QAAIH,eAAejC,gBAAe;AAChC,UAAM0D,UAAU;QAAE,GAAItB,eAAegB;MAAY;AACjD,aAAOM;IACT;AAEA,WAAOnB;EACT;AAEA,MAAIvC,mBAAkB,WAAWoD,aAAaA,UAAUhC,SAASA;AAC/D,WAAOgC;AAGT,MAAMO,SAASC,UAAUxC,IAAAA,GACFgB,uBAAjByB,kBAAiBzB,wBAAAA,aAAab,cAAQ,QAArBa,0BAAAA,SAAAA,wBAAyB,GAC1C0B,YAAY1B,eAAeuB,WAAWvB,YAAYuB,QAClDpC,WAAWsC,kBAAkBC,YAAY,IAAI,IAE7CC,YAAY;IAChBvD;IACAY;IACAC,OAAOV,OAAOS,IAAAA;IACduC;IACAxC;IACA6C,YAAY5B,aAAahB;IACzBG;IACAuC;EACF;AAkBA,SAfErB,QAAQC,IAAIC,aAAa,iBACzB5B,MAAM6B,SACN7B,MAAM6B,UAAU,cAEhBC,QAAQoB,eAAe,kBAAezD,EAAAA,mBAAWY,IAAAA,EAAM,GACvDyB,QAAQY,KAAK,SAASM,SAAAA,GACtBlB,QAAQqB,SAAQ,IAGdlD,WACFJ,iBAAiBmD,YAKf/D,mBAAkB,WAChBoD,aAAa,CAACnB,eAChBkC,OAAOC,OAAOhB,WAAWW,SAAAA,GAClBX,aAIJW;AACT;AAEA,SAASb,eAAe1C,IAAU;AAIhC,WAHM6D,QAAQ;IAAC7D;KACT8D,UAAU,oBAAI7C,IAAAA,GAEb4C,MAAME,UAAQ;AACnB,QAAMC,SAASH,MAAMI,MAAK,GACpBC,WAAW5E,kBAAkB0E,MAAAA;AACnC,QAAIE,UAAU;UACP,4BAAA,IAAA,oBAAA,IAAA,iBAAA;;AAAL,iBAAK,YAAiBA,SAAAA,OAAAA,QAAAA,EAAAA,GAAjB,OAAA,EAAA,6BAAA,QAAA,UAAA,KAAA,GAAA,OAAA,4BAAA,IAA2B;AAA3B,cAAMC,UAAN,MAAA;AACH,UAAKL,QAAQhC,IAAIqC,OAAAA,MACfL,QAAQ5C,IAAIiD,OAAAA,GACZN,MAAMO,KAAKD,OAAAA;QAEf;;AALK,4BAAA,IAAA,iBAAA;;;WAAA,6BAAA,UAAA,UAAA,QAAA,UAAA,OAAA;;cAAA;kBAAA;;;IAMP;EACF;AAEAL,UAAQjE,QAAQ,SAACsE,UAAAA;AACf,QAAMrE,KAAKV,aAAaa,IAAIkE,QAAAA;AAC5BrE,IAAAA,KAAAA;EACF,CAAA;AACF;AAEA,IAAMuE,eAAe;EACnBvD,OAAO;EACPwD,MAAM;AACR;AAEA,SAASlB,UAAUxC,MAAY;AAC7B,SAAOyD,aAAazD,KAAK2D,MAAM,GAAA,EAAK,CAAA,CAAE;AACxC;AAEA,SAAS1B,kBAAAA;MACPW,aAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAa,IACb,EAAE5C,MAAM4D,OAAOC,eAAeC,SAAStC,MAAK,IAA0B,UAAA,SAAA,IAAA,UAAA,CAAA,IAAA,QACtEuC,cAAAA,UAAAA,SAAAA,KAAAA,UAAAA,CAAAA,MAAAA,SAAAA,UAAAA,CAAAA,IAAc;AAEd,MAAI/D,QAAQ4D;AACV,UAAM,IAAII,MACR3C,QAAQC,IAAIC,aAAa,eACrB,cACA,mDAAA;AAIR,MAAIqC,OAAO;AACT,QAAI,CAAChB,WAAY,OAAM,IAAIoB,MAAM,cAAI;AACrC,QAAMC,gBAAgBrB,WAAWsB,YAAY,GAAA;AAC7C,WAAOD,iBAAiB,IAAIrB,aAAaA,WAAWuB,MAAMF,aAAAA;EAC5D;AAEA,MAAM,EAAE1E,QAAAA,QAAM,IAAKnB,UAAAA,GACbgG,cAAcxB,WAAWe,MAAM,GAAA,GAG/BU,WAAWD,YAAYA,YAAYjB,SAAS,CAAA;AAClD,EAAIkB,YAAYA,SAAS,CAAA,EAAGC,YAAW,MAAOD,SAAS,CAAA,KACrDD,YAAYG,IAAG;AAajB,WAVMC,WAAW;IACfxE,QAAQ6D,gBAAgB,GAAG7D,IAAAA,IAAQ6D,aAAAA,KAAkBY;IACrDzE;IACA6D;IACAa,OAAOvC,OAAAA,GAELwC,QAAuB,MAErBC,MAAMR,YAAYjB,QAEf0B,IAAI,GAAGA,KAAKD,KAAKC,KAAK;AAC7B,QAAMC,QAAQD,MAAM,IAAIT,cAAcA,YAAYD,MAAM,GAAG,CAACU,CAAAA,GAAIE,KAAK,GAAA,GAEhE,4BAAA,IAAA,oBAAA,IAAA,iBAAA;;AAAL,eAAK,YAAiBP,SAAAA,OAAAA,QAAAA,EAAAA,GAAjB,OAAA,EAAA,6BAAA,QAAA,UAAA,KAAA,GAAA,OAAA,4BAAA,IAA2B;AAA3B,YAAMQ,UAAN,MAAA,OACGC,YAAYH,OAAO,GAAGA,IAAAA,IAAQE,OAAAA,KAAYA;AAEhD,YAAIC,aAAa1F,SAAQ;AACvBoF,kBAAQM;AACR;QACF;MACF;;AAPK,0BAAA,IAAA,iBAAA;;;SAAA,6BAAA,UAAA,UAAA,QAAA,UAAA,OAAA;;YAAA;gBAAA;;;AASL,QAAIN,MAAO;EACb;AAEA,MAAIb,SAAS;AACXa,cAAAA,QAAU/B;AACV,QAAML,SAASoC,MAAMhB,MAAM,GAAA,EAAK,CAAA;AAChCgB,YAAQA,MAAMO,QAAQ,IAAIC,OAAO,IAAI5C,MAAAA,EAAQ,GAAGA,WAAW,UAAU,SAAS,OAAA;EAChF;AAEA,SACE,CAACwB,eACDY,UAAU/B;;EAGV,CAACa,aAAakB,KAAAA,IAEP,OAGFA;AACT;AAEA,IAAMjE,cAAc,SAAA,OAAA;MAAC,EACnBV,MACA4D,OACAE,SACAsB,gBACAvB,cAAa,IACF;SACX,GAAG7D,QAAQ,EAAA,GAAK8D,WAAW,EAAA,GAAKF,SAAS,EAAA,GAAKwB,kBAAkB,EAAA,GAAKvB,iBAAiB,EAAA;GAE3EwB,wBAAwB,SAAC1F,OAAAA;SACpC,aAAaA,SAAS,UAAUA,SAAS,WAAWA,SAAS,oBAAoBA;;",
+  "names": ["useIsomorphicLayoutEffect", "createContext", "useCallback", "useContext", "useId", "useSyncExternalStore", "getConfig", "ThemeStateContext", "keysToId", "WeakMap", "allListeners", "Map", "listenersByParent", "hasRenderedOnce", "pendingUpdate", "states", "shouldForce", "forceUpdateThemes", "cacheVersion", "forEach", "cb", "getThemeState", "id", "get", "cache", "themes", "rootThemeState", "getRootThemeState", "useThemeState", "props", "isRoot", "keys", "disable", "parentId", "name", "theme", "light", "inverses", "subscribe", "Set", "add", "set", "delete", "propsKey", "getPropsKey", "getSnapshot", "last", "needsUpdate", "current", "size", "parentState", "cacheKey", "has", "next", "getSnapshotFrom", "process", "env", "NODE_ENV", "debug", "console", "warn", "globalThis", "time", "state", "scheduleUpdate", "isNew", "lastState", "getNewThemeName", "isSameAsParent", "Boolean", "message", "info", "updated", "scheme", "getScheme", "parentInverses", "isInverse", "nextState", "parentName", "groupCollapsed", "groupEnd", "Object", "assign", "queue", "visited", "length", "parent", "shift", "children", "childId", "push", "validSchemes", "dark", "split", "reset", "componentName", "inverse", "forceUpdate", "Error", "lastPartIndex", "lastIndexOf", "slice", "parentParts", "lastName", "toLowerCase", "pop", "subNames", "undefined", "filter", "found", "max", "i", "base", "join", "subName", "potential", "replace", "RegExp", "forceClassName", "hasThemeUpdatingProps"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/web",
-  "version": "1.124.4",
+  "version": "1.124.6",
   "source": "src/index.ts",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -27,22 +27,22 @@
     "reset.css"
   ],
   "dependencies": {
-    "@tamagui/compose-refs": "1.124.4",
-    "@tamagui/constants": "1.124.4",
-    "@tamagui/helpers": "1.124.4",
-    "@tamagui/normalize-css-color": "1.124.4",
-    "@tamagui/timer": "1.124.4",
-    "@tamagui/types": "1.124.4",
-    "@tamagui/use-did-finish-ssr": "1.124.4",
-    "@tamagui/use-event": "1.124.4",
-    "@tamagui/use-force-update": "1.124.4"
+    "@tamagui/compose-refs": "1.124.6",
+    "@tamagui/constants": "1.124.6",
+    "@tamagui/helpers": "1.124.6",
+    "@tamagui/normalize-css-color": "1.124.6",
+    "@tamagui/timer": "1.124.6",
+    "@tamagui/types": "1.124.6",
+    "@tamagui/use-did-finish-ssr": "1.124.6",
+    "@tamagui/use-event": "1.124.6",
+    "@tamagui/use-force-update": "1.124.6"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.124.4",
+    "@tamagui/build": "1.124.6",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": "*",

package/src/hooks/getThemeProxied.ts

@@ -11,7 +11,7 @@ import type {
   VariableValGeneric,
 } from '../types'
 import { doesRootSchemeMatchSystem } from './doesRootSchemeMatchSystem'
-import type { ThemeState } from './useThemeState'
+import { keysToId, type ThemeState } from './useThemeState'
 
 export type ThemeProxied = {
   [Key in keyof ThemeParsed | keyof Tokens['color']]: ThemeGettable<
@@ -52,34 +52,32 @@ const cache: Map<ThemeParsed, ThemeProxied> = new Map()
 
 let curKeys: MutableRefObject<Set<string> | null>
 let curProps: UseThemeWithStateProps
+let curState: ThemeState | null
 
 const emptyObject = {}
 
 export function getThemeProxied(
   // underscore to prevent accidental usage below
   _props: UseThemeWithStateProps,
-  state: ThemeState | null,
+  _state: ThemeState | null,
   _keys: MutableRefObject<Set<string> | null>
 ): ThemeProxied {
-  const theme = state?.theme
-
-  if (!theme) {
+  if (!_state?.theme) {
     return emptyObject
   }
 
   curKeys = _keys
   curProps = _props
+  curState = _state
 
-  if (cache.has(theme)) {
-    const proxied = cache.get(theme)!
+  if (cache.has(curState.theme)) {
+    const proxied = cache.get(curState.theme)!
     return proxied
   }
 
   // first time running on this theme, create:
   // from here on only use current*
 
-  const { name, scheme } = state
-
   const config = getConfig()
 
   function track(key: string) {
@@ -89,12 +87,17 @@ export function getThemeProxied(
     }
     curKeys.current.add(key)
     if (process.env.NODE_ENV === 'development' && curProps.debug) {
-      console.info(` 🎨 useTheme() tracking new key: ${key}`)
+      const realId = keysToId.get(curKeys)
+      console.info(
+        ` 🎨 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 proxied = {
         ...value,
         get val() {
@@ -106,7 +109,10 @@ export function getThemeProxied(
           return value.val
         },
         get(platform?: 'web') {
+          if (!curState) return
+
           const outVal = getVariable(value)
+          const { name, scheme, inverses } = curState
 
           if (process.env.TAMAGUI_TARGET === 'native') {
             // ios can avoid re-rendering in some cases when we are using a root light/dark
@@ -117,7 +123,7 @@ export function getThemeProxied(
               isIos &&
               !curProps.deopt &&
               getSetting('fastSchemeChange') &&
-              state.inverses === 0 &&
+              inverses === 0 &&
               doesRootSchemeMatchSystem()
 
             if (shouldOptimize) {
@@ -159,7 +165,7 @@ export function getThemeProxied(
     })
   ) as ThemeProxied
 
-  cache.set(theme, proxied)
+  cache.set(_state.theme, proxied)
 
   return proxied
 }

package/src/hooks/useThemeState.ts

@@ -26,23 +26,33 @@ export type ThemeState = {
 
 export const ThemeStateContext = createContext<ID>('')
 
+export const keysToId = new WeakMap()
+
 const allListeners = new Map<ID, Function>()
 const listenersByParent: Record<ID, Set<ID>> = {}
+const hasRenderedOnce = new WeakMap<any, boolean>()
+const pendingUpdate = new Map<any, boolean | 'force'>()
 
 // TODO this will gain memory over time but its not going to be a ton
 const states: Map<ID, ThemeState | undefined> = new Map()
 
+let shouldForce = false
 export const forceUpdateThemes = () => {
+  cacheVersion++
+  shouldForce = true
   allListeners.forEach((cb) => cb())
 }
 
 export const getThemeState = (id: ID) => states.get(id)
 
+const cache = new Map<string, ThemeState>()
+let cacheVersion = 0
+
+let themes: Record<string, ThemeParsed> | null = null
+
 let rootThemeState: ThemeState | null = null
 export const getRootThemeState = () => rootThemeState
 
-const HasRenderedOnce = new WeakMap<any, boolean>()
-
 export const useThemeState = (
   props: UseThemeWithStateProps,
   isRoot = false,
@@ -63,23 +73,70 @@ export const useThemeState = (
   }
 
   const id = useId()
+
   const subscribe = useCallback(
     (cb: Function) => {
       listenersByParent[parentId] ||= new Set()
       listenersByParent[parentId].add(id)
-      allListeners.set(id, cb)
+      allListeners.set(id, () => {
+        pendingUpdate.set(id, shouldForce ? 'force' : true)
+        cb()
+      })
       return () => {
         allListeners.delete(id)
         listenersByParent[parentId].delete(id)
       }
     },
-    [id, parentId, keys]
+    [id, parentId]
   )
 
   const propsKey = getPropsKey(props)
 
   const getSnapshot = () => {
-    return getSnapshotFrom(props, propsKey, isRoot, id, parentId, keys)
+    const last = states.get(id)
+    const needsUpdate =
+      props.name === 'light' || props.name === 'dark'
+        ? true
+        : !hasRenderedOnce.get(keys)
+          ? true
+          : keys?.current?.size
+            ? true
+            : props.needsUpdate?.()
+
+    const parentState = states.get(parentId)
+    const cacheKey = `${cacheVersion}${id}${propsKey}${parentState?.name || ''}${isRoot}`
+
+    if (!needsUpdate) {
+      if (cache.has(cacheKey)) {
+        return cache.get(cacheKey)!
+      }
+    }
+
+    const next = getSnapshotFrom(
+      last,
+      props,
+      propsKey,
+      isRoot,
+      id,
+      parentId,
+      needsUpdate,
+      pendingUpdate.get(id)
+    )
+
+    if (last !== next) {
+      pendingUpdate.delete(id)
+      states.set(id, next)
+      cache.set(id, next)
+      if (
+        process.env.NODE_ENV === 'development' &&
+        props.debug &&
+        props.debug !== 'profile'
+      ) {
+        console.warn(` · useTheme(${id}) UPDATE from`, last, 'to', next)
+      }
+    }
+
+    return next
   }
 
   if (process.env.NODE_ENV === 'development' && globalThis.time)
@@ -88,11 +145,11 @@ export const useThemeState = (
   const state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot)
 
   useIsomorphicLayoutEffect(() => {
-    if (!propsKey) return
-    if (!HasRenderedOnce.has(keys)) {
-      HasRenderedOnce.set(keys, true)
+    if (!hasRenderedOnce.get(keys)) {
+      hasRenderedOnce.set(keys, true)
       return
     }
+    if (!propsKey) return
     if (
       process.env.NODE_ENV === 'development' &&
       props.debug &&
@@ -103,52 +160,35 @@ export const useThemeState = (
     scheduleUpdate(id)
   }, [keys, propsKey])
 
-  if (process.env.NODE_ENV === 'development' && props.debug) {
-    console.groupCollapsed(
-      ` · useTheme(${id}) =>`,
-      state.name,
-      id === state.id ? '🎉' : '⏭️'
-    )
-    console.info({
-      state,
-      parentId,
-      props,
-      propsKey,
-      id,
-      parentState: states.get(parentId),
-    })
-    console.groupEnd()
-  }
-
   return state.id === id ? { ...state, isNew: true } : state
 }
 
-// const cache = new Map<string, ThemeState>()
-let themes: Record<string, ThemeParsed> | null = null
-
 const getSnapshotFrom = (
+  lastState: ThemeState | undefined,
   props: UseThemeWithStateProps,
   propsKey: string,
   isRoot = false,
   id: string,
   parentId: string,
-  keys: MutableRefObject<Set<string> | null> | undefined
+  needsUpdate: boolean | undefined,
+  pendingUpdate: boolean | 'force' | undefined
 ): ThemeState => {
-  const needsUpdate = keys?.current?.size || props.needsUpdate?.()
   const parentState = states.get(parentId)
 
-  // const cacheKey = `${id}${propsKey}${needsUpdate}${parentState?.name || ''}${isRoot}`
-  // if (cache.has(cacheKey)) {
-  //   return cache.get(cacheKey)!
-  // }
-
   if (!themes) {
     themes = getConfig().themes
   }
 
-  const lastState = states.get(id)
+  const name =
+    !propsKey && pendingUpdate !== 'force'
+      ? null
+      : getNewThemeName(
+          parentState?.name,
+          props,
+          pendingUpdate === 'force' ? true : !!needsUpdate
+        )
 
-  const name = !propsKey ? null : getNewThemeName(parentState?.name, props, !!needsUpdate)
+  const isSameAsParent = Boolean(!name && propsKey) // name = null if matching parent and has props
 
   if (
     process.env.NODE_ENV === 'development' &&
@@ -160,32 +200,27 @@ const getSnapshotFrom = (
       console.info(message)
     } else {
       console.groupCollapsed(message)
-      console.info({ lastState, parentState, props, propsKey, id, keys })
+      console.trace({ name, lastState, parentState, props, propsKey, id, isSameAsParent })
       console.groupEnd()
     }
   }
 
-  const isSameAsParent = !name && propsKey // name = null if matching parent and has props
   if (parentState && isSameAsParent) {
     return parentState
   }
 
   if (!name) {
-    if (lastState && !needsUpdate) {
-      return lastState
+    const next = lastState ?? parentState!
+
+    if (needsUpdate && pendingUpdate) {
+      const updated = { ...(parentState || lastState)! }
+      return updated
     }
-    states.set(id, parentState)
-    // cache.set(cacheKey, parentState!)
-    return parentState!
+
+    return next
   }
 
-  if (
-    lastState &&
-    lastState.name === name
-    //  &&
-    // (!parentState || parentState.name === lastState.parentName)
-  ) {
-    // cache.set(cacheKey, lastState!)
+  if (pendingUpdate !== 'force' && lastState && lastState.name === name) {
     return lastState
   }
 
@@ -210,18 +245,24 @@ const getSnapshotFrom = (
     props.debug &&
     props.debug !== 'profile'
   ) {
-    console.groupCollapsed(` · useTheme(${id}) ⏭️ ${name}`)
+    console.groupCollapsed(` · useTheme(${id}) ⏭️2 ${name}`)
     console.info('state', nextState)
     console.groupEnd()
   }
 
-  states.set(id, nextState)
-  // cache.set(cacheKey, nextState)
-
   if (isRoot) {
     rootThemeState = nextState
   }
 
+  // we still update the state (not changing identity), that way children can properly resolve the right state
+  // but this one wont trigger an update
+  if (pendingUpdate !== 'force') {
+    if (lastState && !needsUpdate) {
+      Object.assign(lastState, nextState)
+      return lastState
+    }
+  }
+
   return nextState
 }
 
@@ -259,7 +300,7 @@ function getScheme(name: string) {
 
 function getNewThemeName(
   parentName = '',
-  { name, reset, componentName, inverse }: UseThemeWithStateProps,
+  { name, reset, componentName, inverse, debug }: UseThemeWithStateProps,
   forceUpdate = false
 ): string | null {
   if (name && reset) {
@@ -310,7 +351,8 @@ function getNewThemeName(
     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')
   }

package/types/helpers/insertStyleRule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,8BAAqB,CAAA;AACjD,eAAO,MAAM,WAAW,gBAAgC,CAAA;AACxD,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AA8BxD,wBAAgB,qBAAqB,SAkBpC;AAID,wBAAgB,aAAa,CAC3B,aAAa,UAAQ,EACrB,MAAM,CAAC,EAAE,YAAY,GACpB,aAAa,GAAG,SAAS,CA8B3B;AAiOD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,uBAW9D;AAGD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,QAEjC;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,aAAa,QAqC5D;AAUD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,WAuBxD"}
+{"version":3,"file":"insertStyleRule.d.ts","sourceRoot":"","sources":["../../src/helpers/insertStyleRule.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,UAAU,CAAA;AAQjB,eAAO,MAAM,kBAAkB,IAAK,CAAA;AAEpC,eAAO,MAAM,eAAe,8BAAqB,CAAA;AACjD,eAAO,MAAM,WAAW,gBAAgC,CAAA;AACxD,eAAO,MAAM,gBAAgB,UAA2B,CAAA;AA8BxD,wBAAgB,qBAAqB,SAkBpC;AAID,wBAAgB,aAAa,CAC3B,aAAa,UAAQ,EACrB,MAAM,CAAC,EAAE,YAAY,GACpB,aAAa,GAAG,SAAS,CA8B3B;AAiOD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,uBAW9D;AAGD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,QAEjC;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,aAAa,QAqC5D;AAUD,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,WAsBxD"}

package/types/hooks/getThemeProxied.d.ts

@@ -1,7 +1,7 @@
 import type { MutableRefObject } from 'react';
 import type { Variable } from '../createVariable';
 import type { ThemeParsed, Tokens, UseThemeWithStateProps, VariableVal, VariableValGeneric } from '../types';
-import type { ThemeState } from './useThemeState';
+import { type ThemeState } from './useThemeState';
 export type ThemeProxied = {
     [Key in keyof ThemeParsed | keyof Tokens['color']]: ThemeGettable<Key extends keyof ThemeParsed ? ThemeParsed[Key] : Variable<any>>;
 } & {
@@ -20,6 +20,6 @@ type ThemeGettable<Val> = Val & {
      */
     get: (platform?: 'web') => string | (Val extends Variable<infer X> ? X extends VariableValGeneric ? any : Exclude<X, Variable> : Val extends VariableVal ? string | number : unknown);
 };
-export declare function getThemeProxied(_props: UseThemeWithStateProps, state: ThemeState | null, _keys: MutableRefObject<Set<string> | null>): ThemeProxied;
+export declare function getThemeProxied(_props: UseThemeWithStateProps, _state: ThemeState | null, _keys: MutableRefObject<Set<string> | null>): ThemeProxied;
 export {};
 //# sourceMappingURL=getThemeProxied.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getThemeProxied.d.ts","sourceRoot":"","sources":["../../src/hooks/getThemeProxied.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,EACV,WAAW,EACX,MAAM,EACN,sBAAsB,EACtB,WAAW,EACX,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAEjB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,MAAM,YAAY,GAAG;KACxB,GAAG,IAAI,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,aAAa,CAC/D,GAAG,SAAS,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CACjE;CACF,GAAG;KAED,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;CACpD,CAAA;AAED,KAAK,aAAa,CAAC,GAAG,IAAI,GAAG,GAAG;IAC9B;;;;;;;;;OASG;IACH,GAAG,EAAE,CACH,QAAQ,CAAC,EAAE,KAAK,KAEd,MAAM,GACN,CAAC,GAAG,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAC1B,CAAC,SAAS,kBAAkB,GAC1B,GAAG,GACH,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GACtB,GAAG,SAAS,WAAW,GACrB,MAAM,GAAG,MAAM,GACf,OAAO,CAAC,CAAA;CACnB,CAAA;AAWD,wBAAgB,eAAe,CAE7B,MAAM,EAAE,sBAAsB,EAC9B,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAC1C,YAAY,CAsGd"}
+{"version":3,"file":"getThemeProxied.d.ts","sourceRoot":"","sources":["../../src/hooks/getThemeProxied.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAA;AAE7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,EACV,WAAW,EACX,MAAM,EACN,sBAAsB,EACtB,WAAW,EACX,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAEjB,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE3D,MAAM,MAAM,YAAY,GAAG;KACxB,GAAG,IAAI,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,aAAa,CAC/D,GAAG,SAAS,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CACjE;CACF,GAAG;KAED,GAAG,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;CACpD,CAAA;AAED,KAAK,aAAa,CAAC,GAAG,IAAI,GAAG,GAAG;IAC9B;;;;;;;;;OASG;IACH,GAAG,EAAE,CACH,QAAQ,CAAC,EAAE,KAAK,KAEd,MAAM,GACN,CAAC,GAAG,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAC1B,CAAC,SAAS,kBAAkB,GAC1B,GAAG,GACH,OAAO,CAAC,CAAC,EAAE,QAAQ,CAAC,GACtB,GAAG,SAAS,WAAW,GACrB,MAAM,GAAG,MAAM,GACf,OAAO,CAAC,CAAA;CACnB,CAAA;AAYD,wBAAgB,eAAe,CAE7B,MAAM,EAAE,sBAAsB,EAC9B,MAAM,EAAE,UAAU,GAAG,IAAI,EACzB,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAC1C,YAAY,CA2Gd"}