@tamagui/web 1.74.15 → 1.74.17

package/dist/esm/helpers/ThemeManager.native.js

@@ -7,25 +7,23 @@ function getHasThemeUpdatingProps(props) {
 }
 let uid = 0;
 class ThemeManager {
-  constructor(props = {}, parentManagerIn) {
+  constructor(props = {}, parentManager) {
     this.props = props;
     this.id = uid++;
-    this.isComponent = !1;
     this.themeListeners = /* @__PURE__ */ new Set();
     this.parentManager = null;
     this.state = emptyState;
-    this.scheme = null;
     this._allKeys = null;
-    if (parentManagerIn === "root") {
+    if (parentManager === "root") {
       this.updateStateFromProps(props, !1);
       return;
     }
-    if (!parentManagerIn)
+    if (!parentManager)
       throw process.env.NODE_ENV !== "production" ? new Error(
         "No parent manager given, this is likely due to duplicated Tamagui dependencies. Check your lockfile for mis-matched versions. It could also be from an error somewhere else in your stack causing Tamagui to recieve undefined context, you can try putting some ErrorBoundary components around other areas of your app, or a Suspense boundary."
       ) : "\u274C 0";
-    if (this.parentManager = parentManagerIn, !this.updateStateFromProps(props, !1))
-      return parentManagerIn || this;
+    if (this.parentManager = parentManager, !this.updateStateFromProps(props, !1))
+      return parentManager;
   }
   updateStateFromProps(props = this.props || {}, shouldNotify = !0) {
     if (this.props = props, props.forceTheme)
@@ -35,9 +33,7 @@ class ThemeManager {
       return this.updateState(nextState, shouldNotify), nextState;
   }
   updateState(nextState, shouldNotify = !0) {
-    this.state = nextState;
-    const names = this.state.name.split("_"), lastName = names[names.length - 1][0];
-    this.isComponent = lastName[0] === lastName[0].toUpperCase(), this._allKeys = null, this.scheme = names[0] === "light" ? "light" : names[0] === "dark" ? "dark" : null, process.env.NODE_ENV === "development" && (this._numChangeEventsSent ??= 0, this._numChangeEventsSent++), shouldNotify && queueMicrotask(() => {
+    this.state = nextState, this._allKeys = null, process.env.NODE_ENV !== "production" && (this._numChangeEventsSent ??= 0, this._numChangeEventsSent++), shouldNotify && queueMicrotask(() => {
       this.notify();
     });
   }
@@ -64,51 +60,38 @@ class ThemeManager {
     this.themeListeners.forEach((cb) => cb(this.state.name, this, forced));
   }
   onChangeTheme(cb, debugId) {
-    return process.env.NODE_ENV === "development" && debugId && (this._listeningIds ??= /* @__PURE__ */ new Set(), this._listeningIds.add(debugId)), this.themeListeners.add(cb), () => {
+    return process.env.NODE_ENV !== "production" && debugId && (this._listeningIds ??= /* @__PURE__ */ new Set(), this._listeningIds.add(debugId)), this.themeListeners.add(cb), () => {
       this.themeListeners.delete(cb);
     };
   }
 }
-function getNextThemeClassName(name) {
-  return `t_sub_theme ${THEME_CLASSNAME_PREFIX}${name}`.replace("light_", "").replace("dark_", "");
-}
-function getState(props, parentManager) {
-  const validManagerAndAllComponentThemes = getNonComponentParentManager(parentManager);
-  parentManager = validManagerAndAllComponentThemes[0];
-  const allComponentThemes = validManagerAndAllComponentThemes[1], themes = getThemes(), isDirectParentAComponentTheme = allComponentThemes.length > 0;
+function getState(props, manager) {
   if (props.name && props.reset)
-    throw new Error("Cannot reset + set new name");
-  if (!props.name && !props.inverse && !props.reset && !props.componentName)
+    throw new Error(
+      process.env.NODE_ENV === "production" ? "\u274C004" : "Cannot reset and set a new name at the same time."
+    );
+  if (!getHasThemeUpdatingProps(props))
     return null;
-  if (props.reset && !isDirectParentAComponentTheme && !parentManager?.parentManager)
-    return process.env.NODE_ENV === "development" && console.warn("Cannot reset no grandparent exists"), null;
-  let result = null;
-  const nextName = props.reset ? isDirectParentAComponentTheme ? parentManager?.state?.name || "" : parentManager?.parentManager?.state?.name || "" : props.name || "", { componentName } = props, parentName = props.reset ? isDirectParentAComponentTheme ? (
-    // here because parentManager already skipped componentTheme so we have to only go up once
-    parentManager?.parentManager?.state.name || ""
-  ) : parentManager?.parentManager?.parentManager?.state.name || "" : isDirectParentAComponentTheme ? allComponentThemes[0] || "" : parentManager?.state.name || "";
-  props.reset && isDirectParentAComponentTheme && allComponentThemes.shift();
-  const base = parentName.split(THEME_NAME_SEPARATOR), lastSegment = base[base.length - 1], isParentComponentTheme = parentName && lastSegment[0].toUpperCase() === lastSegment[0];
-  isParentComponentTheme && base.pop();
-  const parentBaseTheme = isParentComponentTheme ? base.slice(0, base.length).join(THEME_NAME_SEPARATOR) : parentName, max = base.length, min = componentName && !nextName ? max : 0;
-  process.env.NODE_ENV === "development" && typeof props.debug == "string" && (console.groupCollapsed("ThemeManager.getState()"), console.info({
-    props,
-    parentName,
-    parentBaseTheme,
-    base,
-    min,
-    max,
-    isParentComponentTheme
-  }));
+  const themes = getThemes(), [allManagers, componentManagers] = getManagers(manager), isDirectParentAComponentTheme = !!manager?.state.isComponent, startIndex = props.reset && !isDirectParentAComponentTheme ? 1 : 0;
+  let baseManager = allManagers[startIndex], parentManager = allManagers[startIndex + 1];
+  if (!baseManager && props.reset)
+    return process.env.NODE_ENV !== "production" && console.warn("Cannot reset, no parent theme exists"), null;
+  const { componentName } = props;
+  let result = null, baseName = baseManager?.state.name || "";
+  baseManager?.state.isComponent && (baseName = baseName.replace(/_[A-Z][a-z]+/, ""));
+  const nextName = props.reset ? baseName : props.name || "", allComponentThemes = componentManagers.map((x) => x?.state.name || "");
+  isDirectParentAComponentTheme && allComponentThemes.shift();
+  const base = baseName.split(THEME_NAME_SEPARATOR), max = base.length, min = props.componentName && !nextName ? max : 0;
+  process.env.NODE_ENV !== "production" && typeof props.debug == "string" && (console.groupCollapsed("ThemeManager.getState()"), console.info({ props, baseName, base, min, max }));
   for (let i = max; i >= min; i--) {
     let prefix = base.slice(0, i).join(THEME_NAME_SEPARATOR);
     props.inverse && (prefix = inverseThemeName(prefix));
     let potentials = [];
-    if (prefix && prefix !== parentBaseTheme && potentials.push(prefix), nextName && potentials.unshift(prefix ? `${prefix}_${nextName}` : nextName), i === 1) {
-      const lastSegment2 = potentials.findIndex((x) => !x.includes("_"));
-      lastSegment2 > 0 && potentials.splice(lastSegment2, 0, nextName);
+    if (prefix && prefix !== baseName && potentials.push(prefix), nextName && potentials.unshift(prefix ? `${prefix}_${nextName}` : nextName), i === 1) {
+      const lastSegment = potentials.findIndex((x) => !x.includes("_"));
+      lastSegment > 0 && potentials.splice(lastSegment, 0, nextName);
     }
-    if (componentName) {
+    if (componentName && !props.reset) {
       let componentPotentials = [];
       if (nextName) {
         const beforeSeparator = prefix.slice(0, prefix.indexOf(THEME_NAME_SEPARATOR));
@@ -126,32 +109,32 @@ function getState(props, parentManager) {
       potentials = [...componentPotentials, ...potentials, ...allComponentThemes];
     }
     const found = potentials.find((t) => t in themes);
-    if (process.env.NODE_ENV === "development" && typeof props.debug == "string" && console.info(" - ", { found, potentials, parentManager }), found) {
+    if (process.env.NODE_ENV !== "production" && typeof props.debug == "string" && console.info(" - ", { found, potentials, baseManager, nextName, baseName, prefix }), found) {
+      const names = found.split("_"), [firstName, ...restNames] = names, lastName = names[names.length - 1], isComponent = lastName[0] === lastName[0].toUpperCase(), scheme = firstName === "light" ? "light" : firstName === "dark" ? "dark" : void 0, pre = THEME_CLASSNAME_PREFIX, className = isWeb ? `${pre}sub_theme ${pre}${!scheme || !restNames.length ? firstName : restNames.join("_")}` : "", parentName = (baseManager || parentManager)?.state?.name;
       result = {
         name: found,
-        theme: themes[found],
-        className: isWeb ? getNextThemeClassName(found) : "",
         parentName,
-        componentName,
-        inverse: props.inverse
+        theme: themes[found],
+        className,
+        isComponent,
+        scheme
       };
       break;
     }
   }
-  return process.env.NODE_ENV === "development" && typeof props.debug == "string" && typeof window < "u" && (console.warn("ThemeManager.getState():", {
-    result
-  }), console.trace(), console.groupEnd()), result;
+  return process.env.NODE_ENV !== "production" && typeof props.debug == "string" && typeof window < "u" && (console.warn("ThemeManager.getState():", { result }), console.trace(), console.groupEnd()), result;
 }
 const inverseThemeName = (themeName) => themeName.startsWith("light") ? themeName.replace(/^light/, "dark") : themeName.replace(/^dark/, "light");
-function getNonComponentParentManager(themeManager) {
-  let res = themeManager, componentThemeNames = [];
-  for (; res && res?.isComponent; )
-    componentThemeNames.push(res?.state?.name), res = res.parentManager;
-  return [res || null, componentThemeNames];
+function getManagers(themeManager) {
+  const comp = [], all = [];
+  let cur = themeManager;
+  for (; cur; )
+    all.push(cur), cur.state.isComponent && comp.push(cur), cur = cur.parentManager;
+  return [all, comp];
 }
 export {
   ThemeManager,
   getHasThemeUpdatingProps,
-  getNonComponentParentManager
+  getManagers
 };
 //# sourceMappingURL=ThemeManager.js.map

package/dist/esm/helpers/ThemeManager.native.js.map

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

package/dist/esm/helpers/createShallowSetState.js

@@ -2,13 +2,17 @@ function createShallowSetState(setter) {
   return (next) => setter((prev) => mergeIfNotShallowEqual(prev, next));
 }
 function mergeIfNotShallowEqual(prev, next) {
+  return isEqualShallow(prev, next) ? prev : { ...prev, ...next };
+}
+function isEqualShallow(prev, next) {
   for (const key in next)
     if (prev[key] !== next[key])
-      return { ...prev, ...next };
-  return prev;
+      return !1;
+  return !0;
 }
 export {
   createShallowSetState,
+  isEqualShallow,
   mergeIfNotShallowEqual
 };
 //# sourceMappingURL=createShallowSetState.js.map

package/dist/esm/helpers/createShallowSetState.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/createShallowSetState.tsx"],
-  "mappings": "AAIO,SAAS,sBACd,QACA;AACA,SAAO,CAAC,SAAyB,OAAO,CAAC,SAAS,uBAAuB,MAAM,IAAI,CAAC;AACtF;AAEO,SAAS,uBAAuB,MAAM,MAAM;AACjD,aAAW,OAAO;AAChB,QAAI,KAAK,GAAG,MAAM,KAAK,GAAG;AACxB,aAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAG9B,SAAO;AACT;",
+  "mappings": "AAEO,SAAS,sBACd,QACA;AACA,SAAO,CAAC,SAAyB,OAAO,CAAC,SAAS,uBAAuB,MAAM,IAAI,CAAC;AACtF;AAEO,SAAS,uBAAuB,MAAW,MAAW;AAC3D,SAAO,eAAe,MAAM,IAAI,IAAI,OAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAChE;AAEO,SAAS,eAAe,MAAM,MAAM;AACzC,aAAW,OAAO;AAChB,QAAI,KAAK,GAAG,MAAM,KAAK,GAAG;AACxB,aAAO;AAGX,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/createShallowSetState.native.js

@@ -2,13 +2,17 @@ function createShallowSetState(setter) {
   return (next) => setter((prev) => mergeIfNotShallowEqual(prev, next));
 }
 function mergeIfNotShallowEqual(prev, next) {
+  return isEqualShallow(prev, next) ? prev : { ...prev, ...next };
+}
+function isEqualShallow(prev, next) {
   for (const key in next)
     if (prev[key] !== next[key])
-      return { ...prev, ...next };
-  return prev;
+      return !1;
+  return !0;
 }
 export {
   createShallowSetState,
+  isEqualShallow,
   mergeIfNotShallowEqual
 };
 //# sourceMappingURL=createShallowSetState.js.map

package/dist/esm/helpers/createShallowSetState.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/createShallowSetState.tsx"],
-  "mappings": "AAIO,SAAS,sBACd,QACA;AACA,SAAO,CAAC,SAAyB,OAAO,CAAC,SAAS,uBAAuB,MAAM,IAAI,CAAC;AACtF;AAEO,SAAS,uBAAuB,MAAM,MAAM;AACjD,aAAW,OAAO;AAChB,QAAI,KAAK,GAAG,MAAM,KAAK,GAAG;AACxB,aAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAG9B,SAAO;AACT;",
+  "mappings": "AAEO,SAAS,sBACd,QACA;AACA,SAAO,CAAC,SAAyB,OAAO,CAAC,SAAS,uBAAuB,MAAM,IAAI,CAAC;AACtF;AAEO,SAAS,uBAAuB,MAAW,MAAW;AAC3D,SAAO,eAAe,MAAM,IAAI,IAAI,OAAO,EAAE,GAAG,MAAM,GAAG,KAAK;AAChE;AAEO,SAAS,eAAe,MAAM,MAAM;AACzC,aAAW,OAAO;AAChB,QAAI,KAAK,GAAG,MAAM,KAAK,GAAG;AACxB,aAAO;AAGX,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/scheme.js

@@ -0,0 +1 @@
+//# sourceMappingURL=scheme.js.map

package/dist/esm/helpers/scheme.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": [],
+  "mappings": "",
+  "names": []
+}

package/dist/esm/helpers/scheme.native.js

@@ -0,0 +1 @@
+//# sourceMappingURL=scheme.js.map

package/dist/esm/helpers/scheme.native.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": [],
+  "mappings": "",
+  "names": []
+}

package/dist/esm/helpers/themeable.js

@@ -8,7 +8,7 @@ function themeable(Component, staticConfig) {
       Theme,
       {
         componentName: componentName || staticConfig?.componentName,
-        name: theme || null,
+        name: theme,
         "disable-child-theme": !0,
         debug: props.debug,
         inverse: themeInverse,

package/dist/esm/helpers/themeable.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/themeable.tsx"],
-  "mappings": "AAAA,SAAgB,kBAAkB;AAGlC,SAAS,aAAa;AAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,YAtBqB,WAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,oBAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,iBAAiB,cAAc;AAAA,QAC9C,MAAM,SAAS;AAAA,QACf,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAAA,EAIJ,CAAC;AAGD,mBAAU,cAAc,UACrB,WAAmB,eAAgB,WAAmB,QAAQ,WACjE,KAEO;AAGT;",
+  "mappings": "AAAA,SAAgB,kBAAkB;AAGlC,SAAS,aAAa;AAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,YAtBqB,WAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,oBAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,iBAAiB,cAAc;AAAA,QAC9C,MAAM;AAAA,QACN,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAAA,EAIJ,CAAC;AAGD,mBAAU,cAAc,UACrB,WAAmB,eAAgB,WAAmB,QAAQ,WACjE,KAEO;AAGT;",
   "names": []
 }

package/dist/esm/helpers/themeable.native.js

@@ -8,7 +8,7 @@ function themeable(Component, staticConfig) {
       Theme,
       {
         componentName: componentName || staticConfig?.componentName,
-        name: theme || null,
+        name: theme,
         "disable-child-theme": !0,
         debug: props.debug,
         inverse: themeInverse,

package/dist/esm/helpers/themeable.native.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/themeable.tsx"],
-  "mappings": "AAAA,SAAgB,kBAAkB;AAGlC,SAAS,aAAa;AAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,YAtBqB,WAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,oBAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,iBAAiB,cAAc;AAAA,QAC9C,MAAM,SAAS;AAAA,QACf,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAAA,EAIJ,CAAC;AAGD,mBAAU,cAAc,UACrB,WAAmB,eAAgB,WAAmB,QAAQ,WACjE,KAEO;AAGT;",
+  "mappings": "AAAA,SAAgB,kBAAkB;AAGlC,SAAS,aAAa;AAUF;AARb,SAAS,UACd,WACA,cACA;AAuBA,QAAM,YAtBqB,WAAW,SAAmB,OAAuB,KAAK;AACnF,UAAM,EAAE,cAAc,OAAO,eAAe,YAAY,GAAG,KAAK,IAAI,OAG9D,UAAU,oBAAC,aAAU,KAAW,GAAG,MAAM,sBAAkB,IAAC;AAelE,WAZE;AAAA,MAAC;AAAA;AAAA,QACC,eAAe,iBAAiB,cAAc;AAAA,QAC9C,MAAM;AAAA,QACN,uBAAmB;AAAA,QACnB,OAAO,MAAM;AAAA,QACb,SAAS;AAAA,QACT,OAAO;AAAA,QAEN;AAAA;AAAA,IACH;AAAA,EAIJ,CAAC;AAGD,mBAAU,cAAc,UACrB,WAAmB,eAAgB,WAAmB,QAAQ,WACjE,KAEO;AAGT;",
   "names": []
 }

package/dist/esm/hooks/useTheme.js

@@ -1,8 +1,16 @@
 import { isClient, isServer } from "@tamagui/constants";
-import { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import {
+  useContext,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState
+} from "react";
 import { getConfig } from "../config";
 import { getVariable } from "../createVariable";
 import { createProxy } from "../helpers/createProxy";
+import { isEqualShallow } from "../helpers/createShallowSetState";
 import {
   ThemeManager,
   getHasThemeUpdatingProps
@@ -43,7 +51,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
   const themeProxied = useMemo(() => !themeManager || !state?.theme ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug), [state, themeManager, props.deopt, props.debug]);
   return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed("  \u{1F539} useTheme =>", state?.name), console.info("returning state", changedThemeState, "from props", props), console.groupEnd()), [changedThemeState, themeProxied];
 };
-function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug) {
+function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys, debug) {
   if (!theme)
     return {};
   const config = getConfig();
@@ -91,7 +99,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
       state: parentManager?.state,
       themeManager: parentManager
     };
-  const [themeState, setThemeState] = useState(createState), { state, mounted, isNewTheme, themeManager } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
+  const [themeState, setThemeState] = useState(createState), { state, mounted, isNewTheme, themeManager, inversed } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
   function getShouldUpdateTheme(manager = themeManager, nextState, prevState = state, forceShouldChange = !1) {
     const forceUpdate = shouldUpdate?.();
     if (!manager || !forceShouldChange && forceUpdate === !1)
@@ -106,7 +114,10 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
     if (!themeManager)
       return;
     if (props.inverse && !mounted) {
-      setThemeState({ ...themeState, mounted: !0 });
+      setThemeState((prev) => createState({
+        ...prev,
+        mounted: !0
+      }));
       return;
     }
     isNewTheme && themeManager && activeThemeManagers.add(themeManager), (isNewTheme || getShouldUpdateTheme(themeManager)) && setThemeState(createState);
@@ -140,6 +151,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
   }), [themeManager])), isInversingOnMount)
     return {
       isNewTheme: !1,
+      inversed: !1,
       themeManager: parentManager,
       state: {
         name: "",
@@ -150,6 +162,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
   return {
     state,
     isNewTheme,
+    inversed,
     themeManager
   };
   function createState(prev, force = !1) {
@@ -171,15 +184,18 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
         themeManager2 = getNewThemeManager(), state2 = { ...themeManager2.state };
     }
     const isNewTheme2 = !!(themeManager2 !== parentManager || props.inverse), mounted2 = props.inverse ? isRoot || prev?.mounted : !0;
-    if (state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager)), !force && state2?.name === prev?.state?.name)
-      return prev;
-    const response = {
-      state: state2,
+    state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager));
+    const wasInversed = prev?.inversed, inversed2 = isNewTheme2 && state2.scheme !== parentManager?.state.scheme ? !0 : wasInversed ? !1 : null, response = {
       themeManager: themeManager2,
       isNewTheme: isNewTheme2,
-      mounted: mounted2
-    };
-    if (process.env.NODE_ENV === "development" && props.debug && isClient) {
+      mounted: mounted2,
+      inversed: inversed2
+    }, shouldReturnPrev = !force && prev && // isEqualShallow uses the second arg as the keys so this should compare without state first...
+    isEqualShallow(prev, response) && // ... and then compare just the state, because we make a new state obj but is likely the same
+    isEqualShallow(prev.state, state2);
+    if (prev && shouldReturnPrev)
+      return prev;
+    if (response.state = state2, process.env.NODE_ENV === "development" && props.debug && isClient) {
       console.groupCollapsed(` \u{1F537} ${themeManager2.id} useChangeThemeEffect createState`);
       const parentState = { ...parentManager?.state }, parentId = parentManager?.id, themeManagerState = { ...themeManager2.state };
       console.info({

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useTheme.tsx"],
-  "mappings": "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",
-  "names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
+  "mappings": "AAAA,SAAS,UAAiB,gBAAgB;AAC1C;AAAA,EACE;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,iBAAiB;AAC1B,SAAmB,mBAAmB;AACtC,SAAS,mBAAmB;AAC5B,SAAS,sBAAsB;AAC/B;AAAA,EACE;AAAA,EAEA;AAAA,OACK;AACP,SAAS,2BAA2B;AASpC,SAAS,yBAAyB;AAYlC,MAAM,aAAa,EAAE,MAAM,KAAK;AAEhC,IAAI;AACJ,SAAS,yBAAyB;AAChC,MAAI;AAAQ,WAAO;AACnB,QAAM,SAAS,UAAU,GACnB,OAAO,OAAO,OAAO,QAAQ,UAAU,OAAO,KAAK,OAAO,MAAM,EAAE,CAAC,GACnE,eAAe,OAAO,OAAO,IAAI;AACvC,kBAAS,gBAAgB,EAAE,OAAO,cAAc,KAAK,CAAC,GAC/C;AACT;AA8BO,MAAM,WAAW,CAAC,QAAoB,eAAe;AAC1D,QAAM,CAAC,GAAG,KAAK,IAAI,kBAAkB,KAAK;AAE1C,SADY,SAAS,uBAAuB;AAE9C,GAEa,oBAAoB,CAC/B,UACwC;AACxC,QAAM,OAAO,OAAiB,CAAC,CAAC,GAE1B,oBAAoB;AAAA,IACxB;AAAA,IACA;AAAA,IACA,KAAK;AAAA,IACJ,WAiBG,SAhBA,MAAM;AACJ,YAAM,OACJ,MAAM,eAAe,MAAM,KAAK,QAAQ,SAAS,IAAI,KAAO;AAE9D,aACE,QAAQ,IAAI,aAAa,iBACzB,MAAM,SACN,MAAM,UAAU,aAEhB,QAAQ,KAAK,wCAAiC,MAAM;AAAA,QAClD,kBAAkB,MAAM,eAAe;AAAA,QACvC,MAAM,CAAC,GAAG,KAAK,OAAO;AAAA,MACxB,CAAC,GAEI;AAAA,IACT;AAAA,EAEN,GAEM,EAAE,cAAc,MAAM,IAAI;AAEhC,EAAK,OAAO,SACN,QAAQ,IAAI,aAAa,iBACvB,QAAQ,IAAI,qCAAqC,OACnD,QAAQ;AAAA,IACN,2FAA2F,KAAK;AAAA,MAC9F;AAAA,IACF,CAAC;AAAA;AAAA;AAAA,EACH;AAKN,QAAM,eAAe,QAAQ,MACvB,CAAC,gBAAgB,CAAC,OAAO,QACpB,CAAC,IAEH,gBAAgB,OAAO,MAAM,OAAO,cAAc,KAAK,SAAS,MAAM,KAAK,GACjF,CAAC,OAAO,cAAc,MAAM,OAAO,MAAM,KAAK,CAAC;AAElD,SAAI,QAAQ,IAAI,aAAa,iBAAiB,MAAM,UAAU,cAC5D,QAAQ,eAAe,2BAAoB,OAAO,IAAI,GACtD,QAAQ,KAAK,mBAAmB,mBAAmB,cAAc,KAAK,GACtE,QAAQ,SAAS,IAGZ,CAAC,mBAAmB,YAAY;AACzC;AAEO,SAAS,gBACd,EAAE,OAAO,MAAM,OAAO,GACtB,QAAQ,IACR,cACA,MACA,OACgB;AAChB,MAAI,CAAC;AAAO,WAAO,CAAC;AAEpB,QAAM,SAAS,UAAU;AAEzB,WAAS,MAAM,KAAa;AAC1B,IAAI,QAAQ,CAAC,KAAK,SAAS,GAAG,MAC5B,KAAK,KAAK,GAAG,GACT,QAAQ,IAAI,aAAa,iBAAiB,SAC5C,QAAQ,KAAK,2CAAoC,GAAG,EAAE;AAAA,EAG5D;AAEA,SAAO,YAAY,OAAO;AAAA,IACxB,IAAI,GAAG,KAAK;AACV,UAAI,QAAQ,IAAI,OAAO,GAAG;AACxB,eAAO;AAET,UAAI,OAAO,OAAQ;AACjB,eAAI,IAAI,CAAC,MAAM,QAAK,MAAM,IAAI,MAAM,CAAC,IAC9B,cAAc,QAAQ,IAAI,GAAG;AAAA,IAExC;AAAA,IACA,IAAI,GAAG,KAAK;AACV,UAAI,QAAQ;AACV,eAAO;AAGT;AAAA;AAAA;AAAA,QAGE,QAAQ,eACR,OAAO,OAAQ;AAAA,QACf;AAEA,cAAM,YAAY,IAAI,CAAC,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,KAC5C,MAAM,MAAM,SAAS;AAE3B,YAAI,OAAO,OAAO,OAAQ;AAGxB,iBAAO,IAAI,MAAM,KAAY;AAAA;AAAA;AAAA,YAG3B,IAAIA,IAAG,QAAQ;AACb,kBAAI,WAAW;AAEb,sBAAM,SAAS;AAAA,uBACN,WAAW;AACpB,uBAAO,CAAC,aACS,YAAY,GAAG;AAuClC,qBAAO,QAAQ,IAAI,KAAY,MAAM;AAAA,YACvC;AAAA,UACF,CAAC;AAAA,MAEL;AAEA,aAAO,QAAQ,IAAI,GAAG,GAAG;AAAA,IAC3B;AAAA,EACF,CAAC;AACH;AAeO,MAAM,sBAAsB,oBAAI,IAAkB,GAE5C,uBAAuB,CAClC,OACA,SAAS,IACT,MACA,iBACyB;AACzB,QAAM,EAAE,QAAQ,IAAI,OAEd,gBAAgB,WAAW,mBAAmB;AAEpD,MAAK,CAAC,UAAU,CAAC,iBAAkB;AACjC,WAAO;AAAA,MACL,YAAY;AAAA,MACZ,OAAO,eAAe;AAAA,MACtB,cAAc;AAAA,IAChB;AAgBF,QAAM,CAAC,YAAY,aAAa,IAAI,SAA+B,WAAW,GAExE,EAAE,OAAO,SAAS,YAAY,cAAc,SAAS,IAAI,YACzD,qBAAqB,GAAQ,CAAC,WAAW,WAAW,MAAM;AAEhE,WAAS,qBACP,UAAU,cACV,WACA,YAA2C,OAC3C,oBAAoB,IACpB;AACA,UAAM,cAAc,eAAe;AACnC,QAAI,CAAC,WAAY,CAAC,qBAAqB,gBAAgB;AAAQ;AAC/D,UAAM,OAAO,aAAa,QAAQ,SAAS,OAAO,aAAa;AAC/D,QAAI;AAAmB,aAAO;AAC9B,QAAK,QACD,kBAAgB,MAAQ,CAAC,QAAQ,qBAAqB,MAAM,SAAS;AAIzE,aAAO;AAAA,EACT;AAyFA,MAvFK,aAEH,gBAAgB,MAAM;AACpB,QAAI,CAAC;AAAc;AAKnB,QAAI,MAAM,WAAW,CAAC,SAAS;AAC7B,oBAAc,CAAC,SACN,YAAY;AAAA,QACjB,GAAG;AAAA,QACH,SAAS;AAAA,MACX,CAAC,CACF;AACD;AAAA,IACF;AAEA,IAAI,cAAc,gBAChB,oBAAoB,IAAI,YAAY,IAGlC,cAAc,qBAAqB,YAAY,MACjD,cAAc,WAAW;AAI3B,UAAM,sBAAsB,aAAa,cAAc,CAAC,IAAI,IAAI,WAAW;AACzE,MAAI,UACF,cAAc,CAAC,SAAS,YAAY,MAAM,EAAI,CAAC;AAAA,IAEnD,CAAC,GAEK,wBAAwB,eAAe,cAAc,CAAC,MAAM,YAAY;AAC5E,YAAM,QACJ,eAAe,KACf,MAAM,SAIF,QAEA,kBAAkB,SAAS,GAAQ,MAAM,UAAU;AAEzD,MAAI,QAAQ,IAAI,aAAa,iBAAiB,MAAM,SAClD,QAAQ,KAAK,uBAAgB,aAAa,IAAI;AAAA,QAC5C;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC,GAGC,mBACF,cAAc,WAAW;AAAA,IAE7B,GAAG,aAAa,EAAE;AAElB,WAAO,MAAM;AACX,0BAAoB,GACpB,wBAAwB,GACxB,oBAAoB,OAAO,YAAY;AAAA,IACzC;AAAA,EACF,GAAG;AAAA,IACD;AAAA,IACA;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN;AAAA,EACF,CAAC,GAEG,QAAQ,IAAI,aAAa,iBAAiB,MAAM,UAAU,aAC5D,UAAU,OACR,WAAW,yBAA4B,oBAAI,IAAI,GAC/C,WAAW,qBAAwB,IAAI,YAAY,GAC5C,MAAM;AACX,eAAW,qBAAwB,OAAO,YAAY;AAAA,EACxD,IACC,CAAC,YAAY,CAAC,IAIjB;AACF,WAAO;AAAA,MACL,YAAY;AAAA,MACZ,UAAU;AAAA,MACV,cAAc;AAAA,MACd,OAAO;AAAA,QACL,MAAM;AAAA,QACN,GAAG,eAAe;AAAA,QAClB,WAAW;AAAA,MACb;AAAA,IACF;AAGF,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,WAAS,YAAY,MAA6B,QAAQ,IAA6B;AACrF,QAAI,QAAQ,eAAe,MAAM;AAC/B,aAAO;AAIT,QAAIC,gBAA6B,eAC7BC;AAGJ,QAF8B,yBAAyB,KAAK,GAEjC;AACzB,YAAM,qBAAqB,MAClB,IAAI,aAAa,OAAO,SAAS,SAAS,aAAa;AAGhE,UAAI,MAAM,cAAc;AACtB,QAAAD,gBAAe,KAAK;AAQpB,cAAM,cAAc,EAAQ,MAAM,QAC5B,OAAOA,cAAa,SAAS,OAAO,aAAa,GACjD,YAAY;AAAA,UAChBA;AAAA,UACA;AAAA,UACA,KAAK;AAAA,UACL;AAAA,QACF;AAEA,QAAI,aACFC,SAAQ,WAEH,KAAK,aAGRD,cAAa,YAAY,SAAS,IAFlCA,gBAAe,mBAAmB,KAKhC,KAAK,cAEH,iBAAiB,CAAC,SACpBA,gBAAe;AAAA,MAIvB;AACE,QAAAA,gBAAe,mBAAmB,GAClCC,SAAQ,EAAE,GAAGD,cAAa,MAAM;AAAA,IAEpC;AAEA,UAAME,cAAa,GAAQF,kBAAiB,iBAAiB,MAAM,UAG7DG,WAAW,MAAM,UAAiB,UAAU,MAAM,UAAvB;AAEjC,IAAKF,WACCC,cACFD,SAAQD,cAAa,SAErBC,SAAQ,cAAe,OACvBD,gBAAe;AAInB,UAAM,cAAc,MAAM,UAEpBI,YADeF,eAAcD,OAAM,WAAW,eAAe,MAAM,SACzC,KAAO,cAAc,KAAQ,MAEvD,WAAiC;AAAA,MACrC,cAAAD;AAAA,MACA,YAAAE;AAAA,MACA,SAAAC;AAAA,MACA,UAAAC;AAAA,IACF,GAEM,mBACJ,CAAC,SACD;AAAA,IAEA,eAAe,MAAM,QAAQ;AAAA,IAE7B,eAAe,KAAK,OAAOH,MAAK;AAElC,QAAI,QAAQ;AACV,aAAO;AAMT,QAFA,SAAS,QAAQA,QAEb,QAAQ,IAAI,aAAa,iBAAiB,MAAM,SAAY,UAAU;AACxE,cAAQ,eAAe,cAAOD,cAAa,EAAE,mCAAmC;AAChF,YAAM,cAAc,EAAE,GAAG,eAAe,MAAM,GACxC,WAAW,eAAe,IAC1B,oBAAoB,EAAE,GAAGA,cAAa,MAAM;AAClD,cAAQ,KAAK;AAAA,QACX;AAAA,QACA;AAAA,QACA;AAAA,QACA,cAAAA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF,CAAC,GACD,QAAQ,SAAS;AAAA,IACnB;AAEA,WAAO;AAAA,EACT;AACF;",
+  "names": ["_", "themeManager", "state", "isNewTheme", "mounted", "inversed"]
 }

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

@@ -1,8 +1,16 @@
 import { isClient, isIos, isServer } from "@tamagui/constants";
-import { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import {
+  useContext,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState
+} from "react";
 import { getConfig } from "../config";
 import { getVariable } from "../createVariable";
 import { createProxy } from "../helpers/createProxy";
+import { isEqualShallow } from "../helpers/createShallowSetState";
 import {
   ThemeManager,
   getHasThemeUpdatingProps
@@ -43,7 +51,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
   const themeProxied = useMemo(() => !themeManager || !state?.theme ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug), [state, themeManager, props.deopt, props.debug]);
   return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed("  \u{1F539} useTheme =>", state?.name), console.info("returning state", changedThemeState, "from props", props), console.groupEnd()), [changedThemeState, themeProxied];
 };
-function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug) {
+function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys, debug) {
   if (!theme)
     return {};
   const config = getConfig();
@@ -76,21 +84,18 @@ function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug)
               else if (subkey === "get")
                 return (platform) => {
                   const outVal = getVariable(val);
-                  if (platform !== "web" && isIos && !deopt && config.settings.fastSchemeChange) {
-                    const isDark = name.startsWith("dark"), isLight = !isDark && name.startsWith("light");
-                    if (isDark || isLight) {
-                      const oppositeThemeName = name.replace(
-                        isDark ? "dark" : "light",
-                        isDark ? "light" : "dark"
-                      ), oppositeTheme = config.themes[oppositeThemeName], oppositeVal = getVariable(oppositeTheme?.[keyString]);
-                      if (oppositeVal)
-                        return {
-                          dynamic: {
-                            dark: isDark ? outVal : oppositeVal,
-                            light: isLight ? outVal : oppositeVal
-                          }
-                        };
-                    }
+                  if (platform !== "web" && isIos && !deopt && config.settings.fastSchemeChange && !someParentIsInversed(themeManager) && scheme) {
+                    const oppositeThemeName = name.replace(
+                      scheme === "dark" ? "dark" : "light",
+                      scheme === "dark" ? "light" : "dark"
+                    ), oppositeTheme = config.themes[oppositeThemeName], oppositeVal = getVariable(oppositeTheme?.[keyString]);
+                    if (oppositeVal)
+                      return {
+                        dynamic: {
+                          dark: scheme === "dark" ? outVal : oppositeVal,
+                          light: scheme === "light" ? outVal : oppositeVal
+                        }
+                      };
                   }
                   return track(keyString), outVal;
                 };
@@ -102,6 +107,19 @@ function getThemeProxied({ theme, name }, deopt = !1, themeManager, keys, debug)
     }
   });
 }
+function someParentIsInversed(manager) {
+  {
+    let cur = manager;
+    for (; cur; ) {
+      if (!cur.parentManager)
+        return !0;
+      if (cur.parentManager.state.scheme !== cur.state.scheme)
+        return !1;
+      cur = cur.parentManager;
+    }
+  }
+  return !1;
+}
 const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (props, isRoot = !1, keys, shouldUpdate) => {
   const { disable } = props, parentManager = useContext(ThemeManagerContext);
   if (!isRoot && !parentManager || disable)
@@ -110,7 +128,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
       state: parentManager?.state,
       themeManager: parentManager
     };
-  const [themeState, setThemeState] = useState(createState), { state, mounted, isNewTheme, themeManager } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
+  const [themeState, setThemeState] = useState(createState), { state, mounted, isNewTheme, themeManager, inversed } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
   function getShouldUpdateTheme(manager = themeManager, nextState, prevState = state, forceShouldChange = !1) {
     const forceUpdate = shouldUpdate?.();
     if (!manager || !forceShouldChange && forceUpdate === !1)
@@ -125,7 +143,10 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
     if (!themeManager)
       return;
     if (props.inverse && !mounted) {
-      setThemeState({ ...themeState, mounted: !0 });
+      setThemeState((prev) => createState({
+        ...prev,
+        mounted: !0
+      }));
       return;
     }
     isNewTheme && themeManager && activeThemeManagers.add(themeManager), (isNewTheme || getShouldUpdateTheme(themeManager)) && setThemeState(createState);
@@ -159,6 +180,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
   }), [themeManager])), isInversingOnMount)
     return {
       isNewTheme: !1,
+      inversed: !1,
       themeManager: parentManager,
       state: {
         name: "",
@@ -169,6 +191,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
   return {
     state,
     isNewTheme,
+    inversed,
     themeManager
   };
   function createState(prev, force = !1) {
@@ -190,15 +213,18 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
         themeManager2 = getNewThemeManager(), state2 = { ...themeManager2.state };
     }
     const isNewTheme2 = !!(themeManager2 !== parentManager || props.inverse), mounted2 = props.inverse ? isRoot || prev?.mounted : !0;
-    if (state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager)), !force && state2?.name === prev?.state?.name)
-      return prev;
-    const response = {
-      state: state2,
+    state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager));
+    const wasInversed = prev?.inversed, inversed2 = isNewTheme2 && state2.scheme !== parentManager?.state.scheme ? !0 : wasInversed ? !1 : null, response = {
       themeManager: themeManager2,
       isNewTheme: isNewTheme2,
-      mounted: mounted2
-    };
-    if (process.env.NODE_ENV === "development" && props.debug && isClient) {
+      mounted: mounted2,
+      inversed: inversed2
+    }, shouldReturnPrev = !force && prev && // isEqualShallow uses the second arg as the keys so this should compare without state first...
+    isEqualShallow(prev, response) && // ... and then compare just the state, because we make a new state obj but is likely the same
+    isEqualShallow(prev.state, state2);
+    if (prev && shouldReturnPrev)
+      return prev;
+    if (response.state = state2, process.env.NODE_ENV === "development" && props.debug && isClient) {
       console.groupCollapsed(` \u{1F537} ${themeManager2.id} useChangeThemeEffect createState`);
       const parentState = { ...parentManager?.state }, parentId = parentManager?.id, themeManagerState = { ...themeManager2.state };
       console.info({