@hanzogui/web 4.4.0 → 7.3.0

package/dist/cjs/hooks/getThemeProxied.cjs

@@ -25,11 +25,11 @@ __export(getThemeProxied_exports, {
   getThemeProxied: () => getThemeProxied
 });
 module.exports = __toCommonJS(getThemeProxied_exports);
-var import_constants = require("@hanzogui/constants");
+require("@hanzogui/constants");
 var import_config = require("../config.cjs");
 var import_createVariable = require("../createVariable.cjs");
-var import_getDynamicVal = require("../helpers/getDynamicVal.cjs");
-var import_doesRootSchemeMatchSystem = require("./doesRootSchemeMatchSystem.cjs");
+require("../helpers/getDynamicVal.cjs");
+require("./doesRootSchemeMatchSystem.cjs");
 const cache = /* @__PURE__ */new Map();
 let curKeys;
 let curSchemeKeys;
@@ -37,41 +37,28 @@ let curProps;
 let curState;
 const emptyObject = {};
 function getThemeProxied(_props, _state, _keys, _schemeKeys) {
-  if (!_state?.theme) {
-    return emptyObject;
-  }
+  if (!_state?.theme) return emptyObject;
   curKeys = _keys;
   curSchemeKeys = _schemeKeys;
   curProps = _props;
   curState = _state;
-  if (cache.has(curState.theme)) {
-    const proxied2 = cache.get(curState.theme);
-    return proxied2;
-  }
-  const config = (0, import_config.getConfig)();
+  if (cache.has(curState.theme)) return cache.get(curState.theme);
+  (0, import_config.getConfig)();
   function track(key, schemeOptimized = false) {
     if (!curKeys) return;
-    if (!curKeys.current) {
-      curKeys.current = /* @__PURE__ */new Set();
-    }
+    if (!curKeys.current) curKeys.current = /* @__PURE__ */new Set();
     curKeys.current.add(key);
     if (schemeOptimized && curSchemeKeys) {
-      if (!curSchemeKeys.current) {
-        curSchemeKeys.current = /* @__PURE__ */new Set();
-      }
+      if (!curSchemeKeys.current) curSchemeKeys.current = /* @__PURE__ */new Set();
       curSchemeKeys.current.add(key);
     }
-    if (process.env.NODE_ENV === "development" && curProps.debug) {
-      console.info(` \u{1F3A8} useTheme() tracking key: ${key} schemeOptimized=${schemeOptimized}`);
-    }
+    if (process.env.NODE_ENV === "development" && curProps.debug) console.info(` \u{1F3A8} useTheme() tracking key: ${key} schemeOptimized=${schemeOptimized}`);
   }
   const proxied = Object.fromEntries(Object.entries(_state.theme).flatMap(([key, value]) => {
     const proxied2 = {
       ...value,
       get val() {
-        if (!globalThis.guiAvoidTracking) {
-          track(key, false);
-        }
+        if (!globalThis.guiAvoidTracking) track(key, false);
         return value.val;
       },
       get(platform) {
@@ -81,37 +68,6 @@ function getThemeProxied(_props, _state, _keys, _schemeKeys) {
           name,
           scheme
         } = curState;
-        if (false) {
-          const fastSchemeChange = getSetting("fastSchemeChange");
-          const rootMatchesSystem = doesRootSchemeMatchSystem();
-          const shouldOptimize = scheme && platform !== "web" && isIos && !curProps.deopt && !curState.isInverse && fastSchemeChange && rootMatchesSystem;
-          if (process.env.NODE_ENV === "development" && curProps.debug === "verbose") {
-            console.info(` \u{1F3A8} useTheme().get(${key}) theme=${name} scheme=${scheme}`, `
-   shouldOptimize=${shouldOptimize} (iOS=${isIos} deopt=${curProps.deopt} isInverse=${curState.isInverse} fastScheme=${fastSchemeChange} rootMatch=${rootMatchesSystem})`);
-          }
-          if (shouldOptimize) {
-            const oppositeScheme = scheme === "dark" ? "light" : "dark";
-            const oppositeName = name.replace(scheme, oppositeScheme);
-            const color = (0, import_createVariable.getVariable)(config.themes[name]?.[key]);
-            const oppositeColor = (0, import_createVariable.getVariable)(config.themes[oppositeName]?.[key]);
-            if (process.env.NODE_ENV === "development" && curProps.debug === "verbose") {
-              console.info(` \u{1F3A8} useTheme().get(${key}) using DynamicColorIOS`, `
-   color=${color} oppositeColor=${oppositeColor}`);
-            }
-            const dynamicVal = getDynamicVal({
-              scheme,
-              val: color,
-              oppositeVal: oppositeColor
-            });
-            track(key, true);
-            return dynamicVal;
-          }
-          if (process.env.NODE_ENV === "development" && curProps.debug) {
-            console.info(` \u{1F3A8} useTheme().get(${key}) tracking key (not optimizing)`, `
-   platform=${platform} isIOS=${isIos} deopt=${curProps.deopt} fastScheme=${fastSchemeChange}`);
-          }
-          track(key, false);
-        }
         return outVal;
       }
     };

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

@@ -39,43 +39,30 @@ var curProps;
 var curState;
 var emptyObject = {};
 function getThemeProxied(_props, _state, _keys, _schemeKeys) {
-  if (!(_state === null || _state === void 0 ? void 0 : _state.theme)) {
-    return emptyObject;
-  }
+  if (!(_state === null || _state === void 0 ? void 0 : _state.theme)) return emptyObject;
   curKeys = _keys;
   curSchemeKeys = _schemeKeys;
   curProps = _props;
   curState = _state;
-  if (cache.has(curState.theme)) {
-    var proxied = cache.get(curState.theme);
-    return proxied;
-  }
+  if (cache.has(curState.theme)) return cache.get(curState.theme);
   var config = (0, import_config.getConfig)();
   function track(key) {
     var schemeOptimized = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
     if (!curKeys) return;
-    if (!curKeys.current) {
-      curKeys.current = /* @__PURE__ */new Set();
-    }
+    if (!curKeys.current) curKeys.current = /* @__PURE__ */new Set();
     curKeys.current.add(key);
     if (schemeOptimized && curSchemeKeys) {
-      if (!curSchemeKeys.current) {
-        curSchemeKeys.current = /* @__PURE__ */new Set();
-      }
+      if (!curSchemeKeys.current) curSchemeKeys.current = /* @__PURE__ */new Set();
       curSchemeKeys.current.add(key);
     }
-    if (process.env.NODE_ENV === "development" && curProps.debug) {
-      console.info(` \u{1F3A8} useTheme() tracking key: ${key} schemeOptimized=${schemeOptimized}`);
-    }
+    if (process.env.NODE_ENV === "development" && curProps.debug) console.info(` \u{1F3A8} useTheme() tracking key: ${key} schemeOptimized=${schemeOptimized}`);
   }
   var proxied1 = Object.fromEntries(Object.entries(_state.theme).flatMap(function (param) {
     var [key, value] = param;
     var proxied2 = {
       ...value,
       get val() {
-        if (!globalThis.guiAvoidTracking) {
-          track(key, false);
-        }
+        if (!globalThis.guiAvoidTracking) track(key, false);
         return value.val;
       },
       get(platform) {
@@ -85,38 +72,30 @@ function getThemeProxied(_props, _state, _keys, _schemeKeys) {
           name,
           scheme
         } = curState;
-        if (true) {
-          var fastSchemeChange = (0, import_config.getSetting)("fastSchemeChange");
-          var rootMatchesSystem = (0, import_doesRootSchemeMatchSystem.doesRootSchemeMatchSystem)();
-          var shouldOptimize = scheme && platform !== "web" && import_constants.isIos && !curProps.deopt && !curState.isInverse && fastSchemeChange && rootMatchesSystem;
-          if (process.env.NODE_ENV === "development" && curProps.debug === "verbose") {
-            console.info(` \u{1F3A8} useTheme().get(${key}) theme=${name} scheme=${scheme}`, `
+        var fastSchemeChange = (0, import_config.getSetting)("fastSchemeChange");
+        var rootMatchesSystem = (0, import_doesRootSchemeMatchSystem.doesRootSchemeMatchSystem)();
+        var shouldOptimize = scheme && platform !== "web" && import_constants.isIos && !curProps.deopt && !curState.isInverse && fastSchemeChange && rootMatchesSystem;
+        if (process.env.NODE_ENV === "development" && curProps.debug === "verbose") console.info(` \u{1F3A8} useTheme().get(${key}) theme=${name} scheme=${scheme}`, `
    shouldOptimize=${shouldOptimize} (iOS=${import_constants.isIos} deopt=${curProps.deopt} isInverse=${curState.isInverse} fastScheme=${fastSchemeChange} rootMatch=${rootMatchesSystem})`);
-          }
-          if (shouldOptimize) {
-            var _config_themes_name, _config_themes_oppositeName;
-            var oppositeScheme = scheme === "dark" ? "light" : "dark";
-            var oppositeName = name.replace(scheme, oppositeScheme);
-            var color = (0, import_createVariable.getVariable)((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[key]);
-            var oppositeColor = (0, import_createVariable.getVariable)((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[key]);
-            if (process.env.NODE_ENV === "development" && curProps.debug === "verbose") {
-              console.info(` \u{1F3A8} useTheme().get(${key}) using DynamicColorIOS`, `
+        if (shouldOptimize) {
+          var _config_themes_name, _config_themes_oppositeName;
+          var oppositeScheme = scheme === "dark" ? "light" : "dark";
+          var oppositeName = name.replace(scheme, oppositeScheme);
+          var color = (0, import_createVariable.getVariable)((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[key]);
+          var oppositeColor = (0, import_createVariable.getVariable)((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[key]);
+          if (process.env.NODE_ENV === "development" && curProps.debug === "verbose") console.info(` \u{1F3A8} useTheme().get(${key}) using DynamicColorIOS`, `
    color=${color} oppositeColor=${oppositeColor}`);
-            }
-            var dynamicVal = (0, import_getDynamicVal.getDynamicVal)({
-              scheme,
-              val: color,
-              oppositeVal: oppositeColor
-            });
-            track(key, true);
-            return dynamicVal;
-          }
-          if (process.env.NODE_ENV === "development" && curProps.debug) {
-            console.info(` \u{1F3A8} useTheme().get(${key}) tracking key (not optimizing)`, `
-   platform=${platform} isIOS=${import_constants.isIos} deopt=${curProps.deopt} fastScheme=${fastSchemeChange}`);
-          }
-          track(key, false);
+          var dynamicVal = (0, import_getDynamicVal.getDynamicVal)({
+            scheme,
+            val: color,
+            oppositeVal: oppositeColor
+          });
+          track(key, true);
+          return dynamicVal;
         }
+        if (process.env.NODE_ENV === "development" && curProps.debug) console.info(` \u{1F3A8} useTheme().get(${key}) tracking key (not optimizing)`, `
+   platform=${platform} isIOS=${import_constants.isIos} deopt=${curProps.deopt} fastScheme=${fastSchemeChange}`);
+        track(key, false);
         return outVal;
       }
     };

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

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","getThemeProxied_exports","__export","getThemeProxied","module","exports","import_constants","require","import_config","import_createVariable","import_getDynamicVal","import_doesRootSchemeMatchSystem","cache","Map","curKeys","curSchemeKeys","curProps","curState","emptyObject","_props","_state","_keys","_schemeKeys","theme","has","proxied","get","config","getConfig","track","key","schemeOptimized","arguments","length","current","Set","add","process","env","NODE_ENV","debug","console","info","proxied1","Object","fromEntries","entries","flatMap","param","proxied2","val","globalThis","guiAvoidTracking","platform","outVal","getVariable","name","scheme","fastSchemeChange","getSetting","rootMatchesSystem","doesRootSchemeMatchSystem","shouldOptimize","isIos","deopt","isInverse","_config_themes_name","_config_themes_oppositeName","oppositeScheme","oppositeName","replace","color","themes","oppositeColor","dynamicVal","getDynamicVal","oppositeVal","set"],"sources":["../../../src/hooks/getThemeProxied.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["to","__toCommonJS","mod","__copyProps","__defProp","value","getThemeProxied_exports","__export","getThemeProxied","module","exports","import_constants","require","import_config","import_createVariable","import_getDynamicVal","import_doesRootSchemeMatchSystem","cache","Map","curKeys","curSchemeKeys","curProps","curState","emptyObject","_props","_state","_keys","_schemeKeys","theme","has","get","config","getConfig","track","proxied","key","schemeOptimized","arguments","length","current","Set","add","process","env","NODE_ENV","debug","console","info","proxied1","Object","fromEntries","entries","flatMap","param","proxied2","val","globalThis","guiAvoidTracking","platform","outVal","getVariable","name","scheme","fastSchemeChange","getSetting","rootMatchesSystem","doesRootSchemeMatchSystem","shouldOptimize","isIos","deopt","isInverse","_config_themes_name","_config_themes_oppositeName","oppositeScheme","oppositeName","replace","color","themes","oppositeColor","dynamicVal","getDynamicVal","oppositeVal","set"],"sources":["../../../src/hooks/getThemeProxied.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/hooks/useTheme.cjs

@@ -46,9 +46,9 @@ const useThemeWithState = (props, isRoot = false) => {
   if (process.env.NODE_ENV === "development") {
     if (!props.passThrough && !themeState?.theme) {
       if (process.env.GUI_DISABLE_NO_THEME_WARNING !== "1") {
-        console.error(`[hanzo-gui] No theme found, this could be due to an invalid theme name (given theme props ${JSON.stringify(props)}).
+        console.error(`[gui] No theme found, this could be due to an invalid theme name (given theme props ${JSON.stringify(props)}).
 
-If this is intended and you are using GUI without any themes, you can disable this warning by setting the environment variable GUI_DISABLE_NO_THEME_WARNING=1`);
+If this is intended and you are using Gui without any themes, you can disable this warning by setting the environment variable GUI_DISABLE_NO_THEME_WARNING=1`);
       }
     }
   }

package/dist/cjs/hooks/useTheme.native.js

@@ -49,9 +49,9 @@ var useThemeWithState = function (props) {
   if (process.env.NODE_ENV === "development") {
     if (!props.passThrough && !(themeState === null || themeState === void 0 ? void 0 : themeState.theme)) {
       if (process.env.GUI_DISABLE_NO_THEME_WARNING !== "1") {
-        console.error(`[hanzo-gui] No theme found, this could be due to an invalid theme name (given theme props ${JSON.stringify(props)}).
+        console.error(`[gui] No theme found, this could be due to an invalid theme name (given theme props ${JSON.stringify(props)}).
 
-If this is intended and you are using GUI without any themes, you can disable this warning by setting the environment variable GUI_DISABLE_NO_THEME_WARNING=1`);
+If this is intended and you are using Gui without any themes, you can disable this warning by setting the environment variable GUI_DISABLE_NO_THEME_WARNING=1`);
       }
     }
   }

package/dist/cjs/hooks/useTheme.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useTheme_exports","__export","useTheme","useThemeWithState","module","exports","import_react","require","import_getThemeProxied","import_useThemeState","EMPTY","theme","res","props","isRoot","arguments","length","keys","useRef","schemeKeys","themeState","useThemeState","process","env","NODE_ENV","passThrough","GUI_DISABLE_NO_THEME_WARNING","console","error","JSON","stringify","themeProxied","getThemeProxied"],"sources":["../../../src/hooks/useTheme.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,gBAAA;AAAAC,QAAA,CAAAD,gBAAA;EAAAE,QAAA,EAAAA,CAAA,KAAAA,QAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAAuB,CAAAK,gBAAA;AAEvB,IAAAM,YAAA,GAAAC,OAAA,QAAmD;AACnD,IAAAC,sBAAA,GAA8BD,OAAA;AAE9B,IAAAE,oBAAe,GAAAF,OAAA;AAER,IAAAG,KAAM;AACX,IAAAR,QAAA,YAAAA,CAAA;EAEA,aAAY;;EACZ,KAAAS,KAAM,IAAMR,iBAAA,CAAAO,KAAA;EACZ,IAAAE,GAAO,GAAAD,KAAA;EACT,OAAAC,GAAA;AAOO;AAIL,IAAAT,iBAAA,YAAAA,CAAAU,KAAA;EAEA,aAAM;;EACN,IAAAC,MAAM,GAAAC,SAAA,CAAaC,MAAA,QAAAD,SAA2B,EAAI,eAAAA,SAAA;EAClD,IAAAE,IAAM,OAAAX,YAAa,CAAAY,MAAA;EAEnB,IAAIC,UAAQ,GAAI,IAAAb,YAAa,CAAAY,MAAA,MAAe;EAC1C,IAAAE,UAAW,OAAAX,oBAA4B,CAAAY,aAAO,EAAAR,KAAA,EAAAC,MAAA,EAAAG,IAAA,EAAAE,UAAA;EAC5C,IAAAG,OAAI,CAAAC,GAAA,CAAQC,QAAI;IACd,KAAAX,KAAA,CAAAY,WAAQ,MAAAL,UAAA,aAAAA,UAAA,uBAAAA,UAAA,CAAAT,KAAA;MAAA,IACNW,OAAA,CAAAC,GAAA,CAAAG,4BAAA;QAAkGC,OAChG,CAAAC,KAAA,8FAAAC,IAAA,CAAAC,SAAA,CAAAjB,KAAA;AAAA;AACD;MAAA;IAAA;EACH;EACF,IACFkB,YAAA,GAAAlB,KAAA,CAAAY,WAAA,YAAAjB,sBAAA,CAAAwB,eAAA,EAAAnB,KAAA,EAAAO,UAAA,EAAAH,IAAA,EAAAE,UAAA;EACF,QAEAY,YAAM,EAINX,UAAQ,CACV","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","useTheme_exports","__export","useTheme","useThemeWithState","module","exports","import_react","require","import_getThemeProxied","import_useThemeState","EMPTY","theme","res","props","isRoot","arguments","length","keys","useRef","schemeKeys","themeState","useThemeState","process","env","NODE_ENV","passThrough","GUI_DISABLE_NO_THEME_WARNING","console","error","JSON","stringify","themeProxied","getThemeProxied"],"sources":["../../../src/hooks/useTheme.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,gBAAA;AAAAC,QAAA,CAAAD,gBAAA;EAAAE,QAAA,EAAAA,CAAA,KAAAA,QAAA;EAAAC,iBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAAuB,CAAAK,gBAAA;AAEvB,IAAAM,YAAA,GAAAC,OAAA,QAAmD;AACnD,IAAAC,sBAAA,GAA8BD,OAAA;AAE9B,IAAAE,oBAAe,GAAAF,OAAA;AAER,IAAAG,KAAM;AACX,IAAAR,QAAA,YAAAA,CAAA;EAEA,aAAY;;EACZ,KAAAS,KAAM,IAAMR,iBAAA,CAAAO,KAAA;EACZ,IAAAE,GAAO,GAAAD,KAAA;EACT,OAAAC,GAAA;AAOO;AAIL,IAAAT,iBAAA,YAAAA,CAAAU,KAAA;EAEA,aAAM;;EACN,IAAAC,MAAM,GAAAC,SAAA,CAAaC,MAAA,QAAAD,SAA2B,EAAI,eAAAA,SAAA;EAClD,IAAAE,IAAM,OAAAX,YAAa,CAAAY,MAAA;EAEnB,IAAIC,UAAQ,GAAI,IAAAb,YAAa,CAAAY,MAAA,MAAe;EAC1C,IAAAE,UAAW,OAAAX,oBAA4B,CAAAY,aAAO,EAAAR,KAAA,EAAAC,MAAA,EAAAG,IAAA,EAAAE,UAAA;EAC5C,IAAAG,OAAI,CAAAC,GAAA,CAAQC,QAAI;IACd,KAAAX,KAAA,CAAAY,WAAQ,MAAAL,UAAA,aAAAA,UAAA,uBAAAA,UAAA,CAAAT,KAAA;MAAA,IACNW,OAAA,CAAAC,GAAA,CAAAG,4BAAA;QAA4FC,OAC1F,CAAAC,KAAA,wFAAAC,IAAA,CAAAC,SAAA,CAAAjB,KAAA;AAAA;AACD;MAAA;IAAA;EACH;EACF,IACFkB,YAAA,GAAAlB,KAAA,CAAAY,WAAA,YAAAjB,sBAAA,CAAAwB,eAAA,EAAAnB,KAAA,EAAAO,UAAA,EAAAH,IAAA,EAAAE,UAAA;EACF,QAEAY,YAAM,EAINX,UAAQ,CACV","ignoreList":[]}

package/dist/cjs/hooks/useThemeState.cjs

@@ -30,7 +30,7 @@ __export(useThemeState_exports, {
   useThemeState: () => useThemeState
 });
 module.exports = __toCommonJS(useThemeState_exports);
-var import_constants = require("@hanzogui/constants");
+require("@hanzogui/constants");
 var import_constants2 = require("@hanzogui/constants");
 var import_react = require("react");
 var import_config = require("../config.cjs");
@@ -64,19 +64,14 @@ const useThemeState = (props, isRoot = false, keys, schemeKeys) => {
     disable
   } = props;
   const parentId = (0, import_react.useContext)(ThemeStateContext);
-  if (!parentId && !isRoot) {
-    throw new Error(process.env.NODE_ENV === "development" ? `${import_constants3.MISSING_THEME_MESSAGE}
+  if (!parentId && !isRoot) throw new Error(process.env.NODE_ENV === "development" ? `${import_constants3.MISSING_THEME_MESSAGE}
 
 Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? ` (component: ${props.componentName})` : ""}, but no parent theme context was found (parentId: ${parentId}).` : import_constants3.MISSING_THEME_MESSAGE);
-  }
-  if (disable) {
-    return states.get(parentId) || {
-      id: "",
-      name: "light",
-      theme: (0, import_config.getConfig)().themes.light
-      // inverses: 0,
-    };
-  }
+  if (disable) return states.get(parentId) || {
+    id: "",
+    name: "light",
+    theme: (0, import_config.getConfig)().themes.light
+  };
   const id = (0, import_react.useId)();
   const subscribe = (0, import_react.useCallback)(cb => {
     listenersByParent[parentId] = listenersByParent[parentId] || /* @__PURE__ */new Set();
@@ -98,16 +93,13 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? `
     let local = localStates.get(id);
     const parentState = states.get(parentId);
     if (local && !PendingUpdate.has(id)) {
-      if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) {
-        return local;
-      }
+      if (parentState && local._parentName === parentState.name && local._propsKey === propsKey) return local;
     }
     const isSchemeOnlyChange = false;
     const keysSize = keys?.current?.size ?? 0;
-    const schemeKeysSize = schemeKeys?.current?.size ?? 0;
-    const allKeysSchemeOptimized = schemeKeysSize === keysSize && keysSize > 0;
-    const canSkipForSchemeChange = isSchemeOnlyChange && allKeysSchemeOptimized;
-    const needsUpdate = props.passThrough ? false : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : canSkipForSchemeChange ? false : keys?.current?.size ? true : props.needsUpdate?.();
+    const allKeysSchemeOptimized = (schemeKeys?.current?.size ?? 0) === keysSize && keysSize > 0;
+    const canSkipForSchemeChange = isSchemeOnlyChange;
+    const needsUpdate = props.passThrough ? false : isRoot || props.name === "light" || props.name === "dark" || props.name === null ? true : !HasRenderedOnce.get(keys) ? true : keys?.current?.size ? true : props.needsUpdate?.();
     const [rerender, next] = getNextState(local, props, propsKey, isRoot, id, parentId, needsUpdate, PendingUpdate.get(id));
     PendingUpdate.delete(id);
     if (!local || rerender) {
@@ -136,7 +128,6 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? `
       Object.assign(local, next);
       local.id = id;
     }
-    ;
     local._parentName = parentState?.name;
     local._propsKey = propsKey;
     states.set(id, next);
@@ -150,15 +141,11 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? `
       return;
     }
     if (!propsKey) {
-      if (HadTheme.get(keys)) {
-        scheduleUpdate(id);
-      }
+      if (HadTheme.get(keys)) scheduleUpdate(id);
       HadTheme.set(keys, false);
       return;
     }
-    if (process.env.NODE_ENV === "development" && props.debug === "verbose") {
-      console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, states.get(id)?.name);
-    }
+    if (process.env.NODE_ENV === "development" && props.debug === "verbose") console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, states.get(id)?.name);
     scheduleUpdate(id);
     HadTheme.set(keys, true);
   }, [keys, propsKey]);
@@ -169,39 +156,29 @@ const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId,
     debug
   } = props;
   const parentState = states.get(parentId);
-  if (props.passThrough) {
-    return [false, lastState || parentState || {
-      name: ""
-    }];
-  }
-  if (!themes) {
-    themes = (0, import_config.getConfig)().themes;
-  }
+  if (props.passThrough) return [false, lastState || parentState || {
+    name: ""
+  }];
+  if (!themes) themes = (0, import_config.getConfig)().themes;
   const name = !propsKey && (!lastState || !lastState?.isNew) ? null : getNewThemeName(parentState?.name, props, pendingUpdate === "force" ? true : !!needsUpdate);
   const isSameAsParent = parentState && (!name || name === parentState.name);
   const shouldRerender = Boolean(pendingUpdate === "force" || needsUpdate && (pendingUpdate || lastState?.name !== parentState?.name));
   if (process.env.NODE_ENV === "development" && debug === "verbose") {
     const message = ` \xB7 useTheme(${id}) getNextState => ${name} needsUpdate ${needsUpdate} shouldRerender ${shouldRerender}`;
-    if (false) {
-      console.info(message);
-    } else {
-      console.groupCollapsed(message);
-      console.trace({
-        name,
-        lastState,
-        parentState,
-        props,
-        propsKey,
-        id,
-        isSameAsParent
-      });
-      console.groupEnd();
-    }
+    console.groupCollapsed(message);
+    console.trace({
+      name,
+      lastState,
+      parentState,
+      props,
+      propsKey,
+      id,
+      isSameAsParent
+    });
+    console.groupEnd();
   }
   if (isSameAsParent) {
-    if (!shouldRerender && lastState && lastState.name === parentState.name) {
-      return [false, lastState];
-    }
+    if (!shouldRerender && lastState && lastState.name === parentState.name) return [false, lastState];
     return [shouldRerender, {
       ...parentState,
       isNew: false
@@ -209,17 +186,12 @@ const getNextState = (lastState, props, propsKey, isRoot = false, id, parentId,
   }
   if (!name) {
     const next = lastState ?? parentState;
-    if (!next) {
-      throw new Error(process.env.NODE_ENV === "development" ? `${import_constants3.MISSING_THEME_MESSAGE}
+    if (!next) throw new Error(process.env.NODE_ENV === "development" ? `${import_constants3.MISSING_THEME_MESSAGE}
 
 Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? ` (component: ${props.componentName})` : ""}, but no theme state was resolved (parentId: ${parentId}, id: ${id}).` : import_constants3.MISSING_THEME_MESSAGE);
-    }
-    if (shouldRerender) {
-      const updated = {
-        ...(parentState || lastState)
-      };
-      return [true, updated];
-    }
+    if (shouldRerender) return [true, {
+      ...(parentState || lastState)
+    }];
     return [false, next];
   }
   const scheme = getScheme(name);
@@ -231,16 +203,11 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? `
     scheme,
     parentId,
     parentName: parentState?.name,
-    // inverses,
     isInverse,
     isNew: true
   };
-  if (isRoot) {
-    rootThemeState = nextState;
-  }
-  if (pendingUpdate !== "force" && lastState && lastState.name === name) {
-    return [false, nextState];
-  }
+  if (isRoot) rootThemeState = nextState;
+  if (pendingUpdate !== "force" && lastState && lastState.name === name) return [false, nextState];
   const shouldAvoidRerender = pendingUpdate !== "force" && lastState && !needsUpdate && nextState.name === lastState.name;
   if (process.env.NODE_ENV === "development" && debug === "verbose") {
     console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F ${name} shouldAvoidRerender: ${shouldAvoidRerender}`);
@@ -252,29 +219,23 @@ Looked for theme${props.name ? ` "${props.name}"` : ""}${props.componentName ? `
     });
     console.groupEnd();
   }
-  if (shouldAvoidRerender) {
-    return [false, nextState];
-  }
+  if (shouldAvoidRerender) return [false, nextState];
   return [true, nextState];
 };
 function scheduleUpdate(id) {
   const queue = [id];
   const visited = /* @__PURE__ */new Set();
   while (queue.length) {
-    const parent = queue.shift();
-    const children = listenersByParent[parent];
+    const children = listenersByParent[queue.shift()];
     if (children) {
-      for (const childId of children) {
-        if (!visited.has(childId)) {
-          visited.add(childId);
-          queue.push(childId);
-        }
+      for (const childId of children) if (!visited.has(childId)) {
+        visited.add(childId);
+        queue.push(childId);
       }
     }
   }
   visited.forEach(childId => {
-    const cb = allListeners.get(childId);
-    cb?.();
+    allListeners.get(childId)?.();
   });
 }
 const validSchemes = {
@@ -290,9 +251,7 @@ function getNewThemeName(parentName = "", props, forceUpdate = false) {
     reset
   } = props;
   const componentName = props.unstyled ? void 0 : props.componentName;
-  if (name && reset) {
-    throw new Error(process.env.NODE_ENV === "production" ? `\u274C004` : "Cannot reset and set a new name at the same time.");
-  }
+  if (name && reset) throw new Error(process.env.NODE_ENV === "production" ? `\u274C004` : "Cannot reset and set a new name at the same time.");
   const cacheKey = `${parentName}|${name || ""}|${componentName || ""}|${reset ? 1 : 0}|${forceUpdate ? 1 : 0}`;
   if (themeNameCacheVer !== cacheVersion) {
     themeNameCache.clear();
@@ -305,8 +264,7 @@ function getNewThemeName(parentName = "", props, forceUpdate = false) {
     themes: themes2
   } = (0, import_config.getConfig)();
   if (reset) {
-    const isSchemeOnly = parentName === "light" || parentName === "dark";
-    if (isSchemeOnly) {
+    if (parentName === "light" || parentName === "dark") {
       const result2 = parentName === "light" ? "dark" : "light";
       themeNameCache.set(cacheKey, result2);
       return result2;
@@ -320,65 +278,49 @@ function getNewThemeName(parentName = "", props, forceUpdate = false) {
   }
   const parentParts = parentName.split("_");
   const lastName = parentParts[parentParts.length - 1];
-  if (lastName && lastName[0].toLowerCase() !== lastName[0]) {
-    parentParts.pop();
-  }
+  if (lastName && lastName[0].toLowerCase() !== lastName[0]) parentParts.pop();
   const subNames = [name && componentName ? `${name}_${componentName}` : void 0, name, componentName].filter(Boolean);
   let found = null;
   if (name) {
     const nameHasScheme = getScheme(name);
     if (nameHasScheme) {
-      for (const subName of subNames) {
-        if (subName in themes2) {
-          found = subName;
-          break;
-        }
+      for (const subName of subNames) if (subName in themes2) {
+        found = subName;
+        break;
       }
     }
     if (!found && !nameHasScheme) {
-      const parentScheme = getScheme(parentName);
-      if (parentScheme) {
+      if (getScheme(parentName)) {
         const potentialBases = [];
-        for (let i = parentParts.length; i >= 1; i--) {
-          potentialBases.push(parentParts.slice(0, i).join("_"));
-        }
+        for (let i = parentParts.length; i >= 1; i--) potentialBases.push(parentParts.slice(0, i).join("_"));
         outer: for (const base of potentialBases) {
           const candidates = [componentName ? `${base}_${name}_${componentName}` : void 0, `${base}_${name}`].filter(Boolean);
-          for (const potential of candidates) {
-            if (potential in themes2) {
-              found = potential;
-              break outer;
-            }
+          for (const potential of candidates) if (potential in themes2) {
+            found = potential;
+            break outer;
           }
         }
       }
     }
   }
-  if (!found) {
-    if (!name && componentName) {
-      const potential = `${parentParts.join("_")}_${componentName}`;
-      if (potential in themes2) {
-        found = potential;
-      }
-    } else {
-      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 (potential in themes2) {
-            found = potential;
-            break;
-          }
+  if (!found) if (!name && componentName) {
+    const potential = `${parentParts.join("_")}_${componentName}`;
+    if (potential in themes2) found = potential;
+  } else {
+    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 (potential in themes2) {
+          found = potential;
+          break;
         }
-        if (found) break;
       }
+      if (found) break;
     }
   }
-  if (!forceUpdate && found === parentName &&
-  // if its a scheme only sub-theme, we always consider it "new" because it likely inverses
-  // and we want to avoid reparenting
-  !validSchemes[found]) {
+  if (!forceUpdate && found === parentName && !validSchemes[found]) {
     themeNameCache.set(cacheKey, null);
     return null;
   }