@tamagui/web 1.123.17 → 1.124.0

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

@@ -1,20 +1,22 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { isWeb } from "@tamagui/constants";
 import React, { Children, cloneElement, forwardRef, isValidElement, useRef } from "react";
+import { getSetting } from "../config";
 import { variableToString } from "../createVariable";
-import { log } from "../helpers/log";
-import { ThemeManagerContext } from "../helpers/ThemeManagerContext";
-import { useChangeThemeEffect } from "../hooks/useTheme";
+import { useThemeWithState } from "../hooks/useTheme";
+import { getThemeState, hasThemeUpdatingProps, ThemeStateContext } from "../hooks/useThemeState";
 import { ThemeDebug } from "./ThemeDebug";
-var Theme = /* @__PURE__ */ forwardRef(function(param, ref) {
-  var { children, ...props } = param;
+var empty = {
+  className: "",
+  style: {}
+}, Theme = /* @__PURE__ */ forwardRef(function(props, ref) {
   if (props.disable)
-    return children;
-  var isRoot = !!props._isRoot, themeState = useChangeThemeEffect(props, isRoot), disableDirectChildTheme = props["disable-child-theme"], finalChildren = disableDirectChildTheme ? Children.map(children, function(child) {
+    return props.children;
+  var isRoot = !!props._isRoot, [_, themeState] = useThemeWithState(props, isRoot), disableDirectChildTheme = props["disable-child-theme"], finalChildren = disableDirectChildTheme ? Children.map(props.children, function(child) {
     return /* @__PURE__ */ cloneElement(child, {
       "data-disable-theme": !0
     });
-  }) : children;
+  }) : props.children;
   if (ref)
     try {
       React.Children.only(finalChildren), finalChildren = /* @__PURE__ */ cloneElement(finalChildren, {
@@ -22,11 +24,6 @@ var Theme = /* @__PURE__ */ forwardRef(function(param, ref) {
       });
     } catch {
     }
-  process.env.NODE_ENV === "development" && props.debug === "visualize" && (finalChildren = /* @__PURE__ */ _jsx(ThemeDebug, {
-    themeState,
-    themeProps: props,
-    children: finalChildren
-  }));
   var stateRef = useRef({
     hasEverThemed: !1
   });
@@ -34,65 +31,68 @@ var Theme = /* @__PURE__ */ forwardRef(function(param, ref) {
 });
 Theme.avoidForwardRef = !0;
 function getThemedChildren(themeState, children, props) {
-  var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, stateRef = arguments.length > 4 ? arguments[4] : void 0, { themeManager, isNewTheme } = themeState;
-  if (!themeManager)
-    return children;
-  var { shallow, forceClassName } = props, shouldRenderChildrenWithTheme = isNewTheme || isRoot || "inverse" in props || "name" in props || "reset" in props || "forceClassName" in props || stateRef.current.hasEverThemed;
-  if (shouldRenderChildrenWithTheme && (stateRef.current.hasEverThemed = !0), !shouldRenderChildrenWithTheme)
-    return children;
-  process.env.NODE_ENV === "development" && shouldRenderChildrenWithTheme && props.debug === "verbose" && log(`adding theme: isRoot ${isRoot}, inverse ${"inverse" in props}, isNewTheme ${isNewTheme}, hasEver ${stateRef.current.hasEverThemed}`, props);
-  var next = children;
-  shallow && (next = Children.toArray(children).map(function(child) {
-    return /* @__PURE__ */ isValidElement(child) ? /* @__PURE__ */ cloneElement(child, void 0, /* @__PURE__ */ _jsx(Theme, {
-      name: themeManager.state.parentName,
-      children: child.props.children
-    })) : child;
-  }));
-  var elementsWithContext = /* @__PURE__ */ _jsx(ThemeManagerContext.Provider, {
-    value: themeManager,
-    children: next
-  });
-  return forceClassName === !1 ? elementsWithContext : isWeb ? wrapThemeElements({
-    children: elementsWithContext,
-    themeState,
-    forceClassName,
-    isRoot
-  }) : elementsWithContext;
-}
-function wrapThemeElements(param) {
-  var { children, themeState, forceClassName, isRoot } = param;
-  if (isRoot && forceClassName === !1)
+  var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, stateRef = arguments.length > 4 ? arguments[4] : void 0, { shallow, forceClassName } = props, state = stateRef.current, hasEverThemed = state.hasEverThemed, shouldRenderChildrenWithTheme = hasEverThemed || themeState.isNew || isRoot || hasThemeUpdatingProps(props);
+  if (!shouldRenderChildrenWithTheme)
     return children;
-  var inverse = themeState.inversed, requiresExtraWrapper = typeof inverse == "boolean" || forceClassName, { className, style } = getThemeClassNameAndStyle(themeState, isRoot), themedChildren = /* @__PURE__ */ _jsx("span", {
-    className: `${className} _dsp_contents is_Theme`,
-    style,
+  children = /* @__PURE__ */ _jsx(ThemeStateContext.Provider, {
+    value: themeState.id,
     children
   });
-  if (requiresExtraWrapper) {
-    var _themeState_state, name = ((_themeState_state = themeState.state) === null || _themeState_state === void 0 ? void 0 : _themeState_state.name) || "", inverseClassName = name.startsWith("light") ? "t_light is_inversed" : name.startsWith("dark") ? "t_dark is_inversed" : "";
-    themedChildren = /* @__PURE__ */ _jsx("span", {
-      className: `${inverse ? inverseClassName : ""} _dsp_contents`,
-      children: themedChildren
+  var { isInverse, name } = themeState, requiresExtraWrapper = isInverse || forceClassName;
+  if (state.hasEverThemed || (state.hasEverThemed = !0), (requiresExtraWrapper || // if the theme is exactly dark or light, its likely to change between dark/light
+  // and that would require wrapping which would re-parent, so to avoid re-parenting do this
+  themeState.name === "dark" || themeState.name === "light") && (state.hasEverThemed = "wrapped"), shallow && themeState.parentId) {
+    var parentState = getThemeState(themeState.isNew ? themeState.id : themeState.parentId);
+    if (!parentState) throw new Error("\u203C\uFE0F010");
+    children = Children.toArray(children).map(function(child) {
+      return /* @__PURE__ */ isValidElement(child) ? /* @__PURE__ */ cloneElement(child, void 0, /* @__PURE__ */ _jsx(Theme, {
+        name: parentState.name,
+        children: child.props.children
+      })) : child;
     });
   }
-  return themedChildren;
+  if (process.env.NODE_ENV === "development" && props.debug && (console.warn(" getThemedChildren", {
+    requiresExtraWrapper,
+    forceClassName,
+    themeState,
+    state,
+    ...getThemeClassNameAndStyle(themeState, props, isRoot)
+  }), children = /* @__PURE__ */ _jsx(ThemeDebug, {
+    themeState,
+    themeProps: props,
+    children
+  })), forceClassName === !1)
+    return children;
+  if (isWeb) {
+    var { className, style } = getThemeClassNameAndStyle(themeState, props, isRoot);
+    if (children = /* @__PURE__ */ _jsx("span", {
+      className: `${className} _dsp_contents is_Theme`,
+      style,
+      children
+    }), state.hasEverThemed === "wrapped") {
+      var className1 = requiresExtraWrapper ? `${isInverse ? name.startsWith("light") ? "t_light is_inversed" : name.startsWith("dark") ? "t_dark is_inversed" : "" : ""} _dsp_contents` : "_dsp_contents";
+      children = /* @__PURE__ */ _jsx("span", {
+        className: className1,
+        children
+      });
+    }
+    return children;
+  }
+  return children;
 }
-var emptyObj = {};
-function getThemeClassNameAndStyle(themeState) {
-  var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1, _themeState_state, _themeState_state1;
-  if (!themeState.isNewTheme)
-    return {
-      className: "",
-      style: emptyObj
-    };
-  var themeColor = !((_themeState_state = themeState.state) === null || _themeState_state === void 0) && _themeState_state.theme && themeState.isNewTheme ? variableToString(themeState.state.theme.color) : "", style = themeColor ? {
+function getThemeClassNameAndStyle(themeState, props) {
+  var isRoot = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1;
+  if (!themeState.isNew && !props.forceClassName)
+    return empty;
+  var themeColor = themeState?.theme && themeState.isNew ? variableToString(themeState.theme.color) : "", style = themeColor ? {
     color: themeColor
-  } : void 0, className = ((_themeState_state1 = themeState.state) === null || _themeState_state1 === void 0 ? void 0 : _themeState_state1.className) || "";
-  return isRoot && (className = className.replace("t_sub_theme", "")), {
+  } : void 0, maxInverses = getSetting("maxDarkLightNesting") || 3, themeClassName = themeState.inverses >= maxInverses ? themeState.name : themeState.name.replace(schemePrefix, ""), className = `${isRoot ? "" : "t_sub_theme"} t_${themeClassName}`;
+  return {
     style,
     className
   };
 }
+var schemePrefix = /^(dark|light)_/;
 export {
   Theme,
   getThemedChildren

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/Theme.tsx"],
-  "mappings": "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",
-  "names": ["isWeb", "React", "Children", "cloneElement", "forwardRef", "isValidElement", "useRef", "variableToString", "log", "ThemeManagerContext", "useChangeThemeEffect", "ThemeDebug", "Theme", "ref", "children", "props", "disable", "isRoot", "themeState", "disableDirectChildTheme", "finalChildren", "map", "child", "only", "process", "env", "NODE_ENV", "debug", "themeProps", "stateRef", "hasEverThemed", "getThemedChildren", "themeManager", "isNewTheme", "shallow", "forceClassName", "shouldRenderChildrenWithTheme", "current", "next", "toArray", "undefined", "name", "state", "parentName", "elementsWithContext", "Provider", "value", "wrapThemeElements", "inverse", "inversed", "requiresExtraWrapper", "className", "style", "getThemeClassNameAndStyle", "themedChildren", "span", "inverseClassName", "startsWith", "emptyObj", "themeColor", "theme", "color", "replace"]
+  "mappings": "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",
+  "names": ["isWeb", "React", "Children", "cloneElement", "forwardRef", "isValidElement", "useRef", "getSetting", "variableToString", "useThemeWithState", "getThemeState", "hasThemeUpdatingProps", "ThemeStateContext", "ThemeDebug", "empty", "className", "style", "Theme", "props", "ref", "disable", "children", "isRoot", "_", "themeState", "disableDirectChildTheme", "finalChildren", "map", "child", "only", "stateRef", "hasEverThemed", "getThemedChildren", "shallow", "forceClassName", "state", "current", "shouldRenderChildrenWithTheme", "isNew", "Provider", "value", "id", "isInverse", "name", "requiresExtraWrapper", "parentId", "parentState", "Error", "toArray", "undefined", "process", "env", "NODE_ENV", "debug", "console", "warn", "getThemeClassNameAndStyle", "themeProps", "span", "startsWith", "themeColor", "theme", "color", "maxInverses", "themeClassName", "inverses", "replace", "schemePrefix"]
 }

package/dist/esm/views/ThemeDebug.js

@@ -1,6 +1,5 @@
-import React from "react";
 import { useDidFinishSSR } from "@tamagui/use-did-finish-ssr";
-import { useForceUpdate } from "@tamagui/use-force-update";
+import { useEffect } from "react";
 import { createPortal } from "react-dom";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 let node;
@@ -10,17 +9,9 @@ function ThemeDebug({
   children
 }) {
   if (process.env.NODE_ENV === "development") {
-    const isHydrated = useDidFinishSSR(), [onChangeCount, setOnChangeCount] = React.useState(0), rerender = useForceUpdate(), id = React.useId();
-    return process.env.NODE_ENV === "development" && typeof document < "u" && (node || (node = document.createElement("div"), node.style.height = "200px", node.style.overflowY = "scroll", node.style.position = "fixed", node.style.zIndex = 1e7, node.style.bottom = "30px", node.style.left = "30px", node.style.right = "30px", node.style.display = "flex", node.style.border = "1px solid #888", node.style.flexDirection = "row", node.style.background = "var(--background)", document.body.appendChild(node))), React.useEffect(() => {
-      themeState.themeManager?.parentManager?.onChangeTheme((name, manager) => {
-        setOnChangeCount((p) => ++p), console.warn(
-          `theme changed for ${themeState.themeManager?.id} from parent ${themeState.themeManager?.parentManager?.id} to new name`,
-          name
-        );
-      });
-    }, [themeState.themeManager]), React.useEffect(() => {
-      const tm = setInterval(rerender, 1e3);
-      return () => clearTimeout(tm);
+    const isHydrated = useDidFinishSSR();
+    return process.env.NODE_ENV === "development" && typeof document < "u" && (node || (node = document.createElement("div"), node.style.height = "200px", node.style.overflowY = "scroll", node.style.position = "fixed", node.style.zIndex = 1e7, node.style.bottom = "30px", node.style.left = "30px", node.style.right = "30px", node.style.display = "flex", node.style.border = "1px solid #888", node.style.flexDirection = "row", node.style.background = "var(--background)")), useEffect(() => {
+      document.body.appendChild(node);
     }, []), themeProps["disable-child-theme"] || !isHydrated ? children : /* @__PURE__ */ jsxs(Fragment, { children: [
       createPortal(
         /* @__PURE__ */ jsxs(
@@ -34,24 +25,20 @@ function ThemeDebug({
             },
             children: [
               "<Theme ",
-              id,
+              themeState.id,
               " />\xA0",
               JSON.stringify(
                 {
-                  propsName: themeProps.name,
-                  name: themeState?.state?.name,
-                  className: themeState?.state?.className,
-                  inverse: themeProps.inverse,
-                  forceClassName: themeProps.forceClassName,
-                  parent: themeState.themeManager?.state.parentName,
-                  id: themeState.themeManager?.id,
-                  parentId: themeState.themeManager?.parentManager?.id,
-                  isNew: themeState.isNewTheme,
-                  onChangeCount,
-                  listening: [...themeState.themeManager?._listeningIds || []].join(
-                    ","
-                  ),
-                  _numChangeEventsSent: themeState.themeManager?._numChangeEventsSent
+                  name: themeState.name,
+                  parentId: themeState.parentId,
+                  inverses: themeState.inverses,
+                  isNew: themeState.isNew,
+                  themeProps: {
+                    name: themeProps.name,
+                    componentName: themeProps.componentName,
+                    reset: themeProps.reset,
+                    inverse: themeProps.inverse
+                  }
                 },
                 null,
                 2
@@ -61,7 +48,7 @@ function ThemeDebug({
         ),
         node
       ),
-      /* @__PURE__ */ jsx("div", { style: { color: "red" }, children: id }),
+      /* @__PURE__ */ jsx("div", { style: { color: "red" }, children: themeState.id }),
       children
     ] });
   }

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/ThemeDebug.tsx"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,uBAAuB;AAChC,SAAS,sBAAsB;AAC/B,SAAS,oBAAoB;AAyDvB,mBAmCE,KAjCE,YAFJ;AApDN,IAAI;AAEG,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAAgF;AAC9E,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,aAAa,gBAAgB,GAC7B,CAAC,eAAe,gBAAgB,IAAI,MAAM,SAAS,CAAC,GACpD,WAAW,eAAe,GAC1B,KAAK,MAAM,MAAM;AAoCvB,WAlCI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,WAAa,QAC3D,SACH,OAAO,SAAS,cAAc,KAAK,GACnC,KAAK,MAAM,SAAS,SACpB,KAAK,MAAM,YAAY,UACvB,KAAK,MAAM,WAAW,SACtB,KAAK,MAAM,SAAS,KACpB,KAAK,MAAM,SAAS,QACpB,KAAK,MAAM,OAAO,QAClB,KAAK,MAAM,QAAQ,QACnB,KAAK,MAAM,UAAU,QACrB,KAAK,MAAM,SAAS,kBACpB,KAAK,MAAM,gBAAgB,OAC3B,KAAK,MAAM,aAAa,qBACxB,SAAS,KAAK,YAAY,IAAI,KAIlC,MAAM,UAAU,MAAM;AACpB,iBAAW,cAAc,eAAe,cAAc,CAAC,MAAM,YAAY;AACvE,yBAAiB,CAAC,MAAM,EAAE,CAAC,GAC3B,QAAQ;AAAA,UACN,qBAAqB,WAAW,cAAc,EAAE,gBAAgB,WAAW,cAAc,eAAe,EAAE;AAAA,UAC1G;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH,GAAG,CAAC,WAAW,YAAY,CAAC,GAE5B,MAAM,UAAU,MAAM;AAEpB,YAAM,KAAK,YAAY,UAAU,GAAI;AACrC,aAAO,MAAM,aAAa,EAAS;AAAA,IACrC,GAAG,CAAC,CAAC,GAED,WAAW,qBAAqB,KAAK,CAAC,aACjC,WAIP,iCACG;AAAA;AAAA,QACC;AAAA,UAAC;AAAA;AAAA,YACC,OAAO;AAAA,cACL,YAAY;AAAA,cACZ,UAAU;AAAA,cACV,UAAU;AAAA,cACV,SAAS;AAAA,YACX;AAAA,YACD;AAAA;AAAA,cACY;AAAA,cAAG;AAAA,cACb,KAAK;AAAA,gBACJ;AAAA,kBACE,WAAW,WAAW;AAAA,kBACtB,MAAM,YAAY,OAAO;AAAA,kBACzB,WAAW,YAAY,OAAO;AAAA,kBAC9B,SAAS,WAAW;AAAA,kBACpB,gBAAgB,WAAW;AAAA,kBAC3B,QAAQ,WAAW,cAAc,MAAM;AAAA,kBACvC,IAAI,WAAW,cAAc;AAAA,kBAC7B,UAAU,WAAW,cAAc,eAAe;AAAA,kBAClD,OAAO,WAAW;AAAA,kBAClB;AAAA,kBACA,WAAW,CAAC,GAAI,WAAW,cAAe,iBAAoB,CAAC,CAAE,EAAE;AAAA,oBACjE;AAAA,kBACF;AAAA,kBACA,sBAAsB,WAAW,cAAe;AAAA,gBAClD;AAAA,gBACA;AAAA,gBACA;AAAA,cACF;AAAA;AAAA;AAAA,QACF;AAAA,QACA;AAAA,MACF;AAAA,MAEA,oBAAC,SAAI,OAAO,EAAE,OAAO,MAAM,GAAI,cAAG;AAAA,MAEjC;AAAA,OACH;AAAA,EAEJ;AACA,SAAO;AACT;AAEA,WAAW,cAAiB;",
+  "mappings": "AAAA,SAAS,uBAAuB;AAChC,SAAS,iBAAiB;AAC1B,SAAS,oBAAoB;AAwCvB,mBA+BE,KA7BE,YAFJ;AApCN,IAAI;AAEG,SAAS,WAAW;AAAA,EACzB;AAAA,EACA;AAAA,EACA;AACF,GAAsE;AACpE,MAAI,QAAQ,IAAI,aAAa,eAAe;AAC1C,UAAM,aAAa,gBAAgB;AAuBnC,WArBI,QAAQ,IAAI,aAAa,iBAAiB,OAAO,WAAa,QAC3D,SACH,OAAO,SAAS,cAAc,KAAK,GACnC,KAAK,MAAM,SAAS,SACpB,KAAK,MAAM,YAAY,UACvB,KAAK,MAAM,WAAW,SACtB,KAAK,MAAM,SAAS,KACpB,KAAK,MAAM,SAAS,QACpB,KAAK,MAAM,OAAO,QAClB,KAAK,MAAM,QAAQ,QACnB,KAAK,MAAM,UAAU,QACrB,KAAK,MAAM,SAAS,kBACpB,KAAK,MAAM,gBAAgB,OAC3B,KAAK,MAAM,aAAa,uBAI5B,UAAU,MAAM;AACd,eAAS,KAAK,YAAY,IAAI;AAAA,IAChC,GAAG,CAAC,CAAC,GAED,WAAW,qBAAqB,KAAK,CAAC,aACjC,WAIP,iCACG;AAAA;AAAA,QACC;AAAA,UAAC;AAAA;AAAA,YACC,OAAO;AAAA,cACL,YAAY;AAAA,cACZ,UAAU;AAAA,cACV,UAAU;AAAA,cACV,SAAS;AAAA,YACX;AAAA,YACD;AAAA;AAAA,cACY,WAAW;AAAA,cAAG;AAAA,cACxB,KAAK;AAAA,gBACJ;AAAA,kBACE,MAAM,WAAW;AAAA,kBACjB,UAAU,WAAW;AAAA,kBACrB,UAAU,WAAW;AAAA,kBACrB,OAAO,WAAW;AAAA,kBAClB,YAAY;AAAA,oBACV,MAAM,WAAW;AAAA,oBACjB,eAAe,WAAW;AAAA,oBAC1B,OAAO,WAAW;AAAA,oBAClB,SAAS,WAAW;AAAA,kBACtB;AAAA,gBACF;AAAA,gBACA;AAAA,gBACA;AAAA,cACF;AAAA;AAAA;AAAA,QACF;AAAA,QACA;AAAA,MACF;AAAA,MAEA,oBAAC,SAAI,OAAO,EAAE,OAAO,MAAM,GAAI,qBAAW,IAAG;AAAA,MAE5C;AAAA,OACH;AAAA,EAEJ;AACA,SAAO;AACT;AAEA,WAAW,cAAiB;",
   "names": []
 }

package/dist/esm/views/ThemeDebug.mjs

@@ -1,6 +1,5 @@
-import React from "react";
 import { useDidFinishSSR } from "@tamagui/use-did-finish-ssr";
-import { useForceUpdate } from "@tamagui/use-force-update";
+import { useEffect } from "react";
 import { createPortal } from "react-dom";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 let node;
@@ -10,17 +9,9 @@ function ThemeDebug({
   children
 }) {
   if (process.env.NODE_ENV === "development") {
-    const isHydrated = useDidFinishSSR(),
-      [onChangeCount, setOnChangeCount] = React.useState(0),
-      rerender = useForceUpdate(),
-      id = React.useId();
-    return process.env.NODE_ENV === "development" && typeof document < "u" && (node || (node = document.createElement("div"), node.style.height = "200px", node.style.overflowY = "scroll", node.style.position = "fixed", node.style.zIndex = 1e7, node.style.bottom = "30px", node.style.left = "30px", node.style.right = "30px", node.style.display = "flex", node.style.border = "1px solid #888", node.style.flexDirection = "row", node.style.background = "var(--background)", document.body.appendChild(node))), React.useEffect(() => {
-      themeState.themeManager?.parentManager?.onChangeTheme((name, manager) => {
-        setOnChangeCount(p => ++p), console.warn(`theme changed for ${themeState.themeManager?.id} from parent ${themeState.themeManager?.parentManager?.id} to new name`, name);
-      });
-    }, [themeState.themeManager]), React.useEffect(() => {
-      const tm = setInterval(rerender, 1e3);
-      return () => clearTimeout(tm);
+    const isHydrated = useDidFinishSSR();
+    return process.env.NODE_ENV === "development" && typeof document < "u" && (node || (node = document.createElement("div"), node.style.height = "200px", node.style.overflowY = "scroll", node.style.position = "fixed", node.style.zIndex = 1e7, node.style.bottom = "30px", node.style.left = "30px", node.style.right = "30px", node.style.display = "flex", node.style.border = "1px solid #888", node.style.flexDirection = "row", node.style.background = "var(--background)")), useEffect(() => {
+      document.body.appendChild(node);
     }, []), themeProps["disable-child-theme"] || !isHydrated ? children : /* @__PURE__ */jsxs(Fragment, {
       children: [createPortal(/* @__PURE__ */jsxs("code", {
         style: {
@@ -29,25 +20,23 @@ function ThemeDebug({
           overflow: "auto",
           padding: 5
         },
-        children: ["<Theme ", id, " />\xA0", JSON.stringify({
-          propsName: themeProps.name,
-          name: themeState?.state?.name,
-          className: themeState?.state?.className,
-          inverse: themeProps.inverse,
-          forceClassName: themeProps.forceClassName,
-          parent: themeState.themeManager?.state.parentName,
-          id: themeState.themeManager?.id,
-          parentId: themeState.themeManager?.parentManager?.id,
-          isNew: themeState.isNewTheme,
-          onChangeCount,
-          listening: [...(themeState.themeManager?._listeningIds || [])].join(","),
-          _numChangeEventsSent: themeState.themeManager?._numChangeEventsSent
+        children: ["<Theme ", themeState.id, " />\xA0", JSON.stringify({
+          name: themeState.name,
+          parentId: themeState.parentId,
+          inverses: themeState.inverses,
+          isNew: themeState.isNew,
+          themeProps: {
+            name: themeProps.name,
+            componentName: themeProps.componentName,
+            reset: themeProps.reset,
+            inverse: themeProps.inverse
+          }
         }, null, 2)]
       }), node), /* @__PURE__ */jsx("div", {
         style: {
           color: "red"
         },
-        children: id
+        children: themeState.id
       }), children]
     });
   }

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

@@ -1 +1 @@
-{"version":3,"names":["React","useDidFinishSSR","useForceUpdate","createPortal","Fragment","jsx","jsxs","node","ThemeDebug","themeState","themeProps","children","process","env","NODE_ENV","isHydrated","onChangeCount","setOnChangeCount","useState","rerender","id","useId","document","createElement","style","height","overflowY","position","zIndex","bottom","left","right","display","border","flexDirection","background","body","appendChild","useEffect","themeManager","parentManager","onChangeTheme","name","manager","p","console","warn","tm","setInterval","clearTimeout","whiteSpace","maxWidth","overflow","padding","JSON","stringify","propsName","state","className","inverse","forceClassName","parent","parentName","parentId","isNew","isNewTheme","listening","_listeningIds","join","_numChangeEventsSent","color","displayName"],"sources":["../../../src/views/ThemeDebug.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useDidFinishSSR","useEffect","createPortal","Fragment","jsx","jsxs","node","ThemeDebug","themeState","themeProps","children","process","env","NODE_ENV","isHydrated","document","createElement","style","height","overflowY","position","zIndex","bottom","left","right","display","border","flexDirection","background","body","appendChild","whiteSpace","maxWidth","overflow","padding","id","JSON","stringify","name","parentId","inverses","isNew","componentName","reset","inverse","color","displayName"],"sources":["../../../src/views/ThemeDebug.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,eAAA,QAAuB;AAChC,SAASC,SAAA,QAAiB;AAC1B,SAASC,YAAA,QAAoB;AAwCvB,SAAAC,QAAA,EA+BEC,GAAA,EA7BEC,IAAA,QAFJ;AApCN,IAAIC,IAAA;AAEG,SAASC,WAAW;EACzBC,UAAA;EACAC,UAAA;EACAC;AACF,GAAsE;EACpE,IAAIC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,eAAe;IAC1C,MAAMC,UAAA,GAAad,eAAA,CAAgB;IAuBnC,OArBIW,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAAiB,OAAOE,QAAA,GAAa,QAC3DT,IAAA,KACHA,IAAA,GAAOS,QAAA,CAASC,aAAA,CAAc,KAAK,GACnCV,IAAA,CAAKW,KAAA,CAAMC,MAAA,GAAS,SACpBZ,IAAA,CAAKW,KAAA,CAAME,SAAA,GAAY,UACvBb,IAAA,CAAKW,KAAA,CAAMG,QAAA,GAAW,SACtBd,IAAA,CAAKW,KAAA,CAAMI,MAAA,GAAS,KACpBf,IAAA,CAAKW,KAAA,CAAMK,MAAA,GAAS,QACpBhB,IAAA,CAAKW,KAAA,CAAMM,IAAA,GAAO,QAClBjB,IAAA,CAAKW,KAAA,CAAMO,KAAA,GAAQ,QACnBlB,IAAA,CAAKW,KAAA,CAAMQ,OAAA,GAAU,QACrBnB,IAAA,CAAKW,KAAA,CAAMS,MAAA,GAAS,kBACpBpB,IAAA,CAAKW,KAAA,CAAMU,aAAA,GAAgB,OAC3BrB,IAAA,CAAKW,KAAA,CAAMW,UAAA,GAAa,uBAI5B3B,SAAA,CAAU,MAAM;MACdc,QAAA,CAASc,IAAA,CAAKC,WAAA,CAAYxB,IAAI;IAChC,GAAG,EAAE,GAEDG,UAAA,CAAW,qBAAqB,KAAK,CAACK,UAAA,GACjCJ,QAAA,GAIP,eAAAL,IAAA,CAAAF,QAAA;MACGO,QAAA,GAAAR,YAAA,CACC,eAAAG,IAAA,CAAC;QACCY,KAAA,EAAO;UACLc,UAAA,EAAY;UACZC,QAAA,EAAU;UACVC,QAAA,EAAU;UACVC,OAAA,EAAS;QACX;QACDxB,QAAA,cACYF,UAAA,CAAW2B,EAAA,EAAG,WACxBC,IAAA,CAAKC,SAAA,CACJ;UACEC,IAAA,EAAM9B,UAAA,CAAW8B,IAAA;UACjBC,QAAA,EAAU/B,UAAA,CAAW+B,QAAA;UACrBC,QAAA,EAAUhC,UAAA,CAAWgC,QAAA;UACrBC,KAAA,EAAOjC,UAAA,CAAWiC,KAAA;UAClBhC,UAAA,EAAY;YACV6B,IAAA,EAAM7B,UAAA,CAAW6B,IAAA;YACjBI,aAAA,EAAejC,UAAA,CAAWiC,aAAA;YAC1BC,KAAA,EAAOlC,UAAA,CAAWkC,KAAA;YAClBC,OAAA,EAASnC,UAAA,CAAWmC;UACtB;QACF,GACA,MACA,CACF;MAAA,CACF,GACAtC,IACF,GAEA,eAAAF,GAAA,CAAC;QAAIa,KAAA,EAAO;UAAE4B,KAAA,EAAO;QAAM;QAAInC,QAAA,EAAAF,UAAA,CAAW2B;MAAA,CAAG,GAE5CzB,QAAA;IAAA,CACH;EAEJ;EACA,OAAOA,QAAA;AACT;AAEAH,UAAA,CAAWuC,WAAA,GAAiB","ignoreList":[]}

package/dist/esm/views/ThemeProvider.js

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useId } from "react";
 import { isClient } from "@tamagui/constants";
 import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
 import { Theme } from "./Theme";
@@ -18,7 +18,7 @@ const ThemeProvider = (props) => {
       className: props.className,
       name: props.defaultTheme,
       forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
-      _isRoot: !0,
+      _isRoot: useId,
       children: props.children
     }
   );

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/ThemeProvider.tsx"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,gBAAgB;AAEzB,SAAS,8BAA8B;AACvC,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAiCvB;AApBG,MAAM,gBAAgB,CAAC,UAA8B;AAC1D,QAAM,wBACJ,MAAM,yBAAyB,WAAW,uBAAuB,GAC7D,uBACJ,MAAM,wBAAwB,WAAW,sBAAsB;AAGjE,SAAI,YACF,MAAM,gBAAgB,MAAM;AAC1B,QAAI,sBAAuB;AAC3B,UAAM,KAAK,GAAG,sBAAsB,GAAG,MAAM,YAAY,IACnD,SAAS,uBAAuB,SAAS,kBAAkB,SAAS;AAC1E,kBAAO,UAAU,IAAI,EAAE,GAChB,MAAM;AACX,aAAO,UAAU,OAAO,EAAE;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,MAAM,cAAc,uBAAuB,oBAAoB,CAAC,GAIpE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,MAAM;AAAA,MACjB,MAAM,MAAM;AAAA,MAEZ,gBAAgB,CAAC,yBAAyB,CAAC;AAAA,MAE3C,SAAO;AAAA,MAEN,gBAAM;AAAA;AAAA,EACT;AAEJ;",
+  "mappings": "AAAA,OAAO,SAAS,aAAa;AAC7B,SAAS,gBAAgB;AAEzB,SAAS,8BAA8B;AACvC,SAAS,aAAa;AACtB,SAAS,kBAAkB;AAiCvB;AApBG,MAAM,gBAAgB,CAAC,UAA8B;AAC1D,QAAM,wBACJ,MAAM,yBAAyB,WAAW,uBAAuB,GAC7D,uBACJ,MAAM,wBAAwB,WAAW,sBAAsB;AAGjE,SAAI,YACF,MAAM,gBAAgB,MAAM;AAC1B,QAAI,sBAAuB;AAC3B,UAAM,KAAK,GAAG,sBAAsB,GAAG,MAAM,YAAY,IACnD,SAAS,uBAAuB,SAAS,kBAAkB,SAAS;AAC1E,kBAAO,UAAU,IAAI,EAAE,GAChB,MAAM;AACX,aAAO,UAAU,OAAO,EAAE;AAAA,IAC5B;AAAA,EACF,GAAG,CAAC,MAAM,cAAc,uBAAuB,oBAAoB,CAAC,GAIpE;AAAA,IAAC;AAAA;AAAA,MACC,WAAW,MAAM;AAAA,MACjB,MAAM,MAAM;AAAA,MAEZ,gBAAgB,CAAC,yBAAyB,CAAC;AAAA,MAE3C,SAAS;AAAA,MAER,gBAAM;AAAA;AAAA,EACT;AAEJ;",
   "names": []
 }

package/dist/esm/views/ThemeProvider.mjs

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useId } from "react";
 import { isClient } from "@tamagui/constants";
 import { THEME_CLASSNAME_PREFIX } from "../constants/constants.mjs";
 import { Theme } from "./Theme.mjs";
@@ -18,7 +18,7 @@ const ThemeProvider = props => {
     className: props.className,
     name: props.defaultTheme,
     forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
-    _isRoot: !0,
+    _isRoot: useId,
     children: props.children
   });
 };

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

@@ -1 +1 @@
-{"version":3,"names":["React","isClient","THEME_CLASSNAME_PREFIX","Theme","getSetting","jsx","ThemeProvider","props","disableRootThemeClass","themeClassNameOnRoot","useLayoutEffect","cn","defaultTheme","target","document","documentElement","body","classList","add","remove","className","name","forceClassName","_isRoot","children"],"sources":["../../../src/views/ThemeProvider.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAClB,SAASC,QAAA,QAAgB;AAEzB,SAASC,sBAAA,QAA8B;AACvC,SAASC,KAAA,QAAa;AACtB,SAASC,UAAA,QAAkB;AAiCvB,SAAAC,GAAA;AApBG,MAAMC,aAAA,GAAiBC,KAAA,IAA8B;EAC1D,MAAMC,qBAAA,GACJD,KAAA,CAAMC,qBAAA,IAAyBJ,UAAA,CAAW,uBAAuB;IAC7DK,oBAAA,GACJF,KAAA,CAAME,oBAAA,IAAwBL,UAAA,CAAW,sBAAsB;EAGjE,OAAIH,QAAA,IACFD,KAAA,CAAMU,eAAA,CAAgB,MAAM;IAC1B,IAAIF,qBAAA,EAAuB;IAC3B,MAAMG,EAAA,GAAK,GAAGT,sBAAsB,GAAGK,KAAA,CAAMK,YAAY;MACnDC,MAAA,GAASJ,oBAAA,GAAuBK,QAAA,CAASC,eAAA,GAAkBD,QAAA,CAASE,IAAA;IAC1E,OAAAH,MAAA,CAAOI,SAAA,CAAUC,GAAA,CAAIP,EAAE,GAChB,MAAM;MACXE,MAAA,CAAOI,SAAA,CAAUE,MAAA,CAAOR,EAAE;IAC5B;EACF,GAAG,CAACJ,KAAA,CAAMK,YAAA,EAAcJ,qBAAA,EAAuBC,oBAAoB,CAAC,GAIpE,eAAAJ,GAAA,CAACF,KAAA;IACCiB,SAAA,EAAWb,KAAA,CAAMa,SAAA;IACjBC,IAAA,EAAMd,KAAA,CAAMK,YAAA;IAEZU,cAAA,EAAgB,CAACd,qBAAA,IAAyB,CAACC,oBAAA;IAE3Cc,OAAA,EAAO;IAENC,QAAA,EAAAjB,KAAA,CAAMiB;EAAA,CACT;AAEJ","ignoreList":[]}
+{"version":3,"names":["React","useId","isClient","THEME_CLASSNAME_PREFIX","Theme","getSetting","jsx","ThemeProvider","props","disableRootThemeClass","themeClassNameOnRoot","useLayoutEffect","cn","defaultTheme","target","document","documentElement","body","classList","add","remove","className","name","forceClassName","_isRoot","children"],"sources":["../../../src/views/ThemeProvider.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,IAASC,KAAA,QAAa;AAC7B,SAASC,QAAA,QAAgB;AAEzB,SAASC,sBAAA,QAA8B;AACvC,SAASC,KAAA,QAAa;AACtB,SAASC,UAAA,QAAkB;AAiCvB,SAAAC,GAAA;AApBG,MAAMC,aAAA,GAAiBC,KAAA,IAA8B;EAC1D,MAAMC,qBAAA,GACJD,KAAA,CAAMC,qBAAA,IAAyBJ,UAAA,CAAW,uBAAuB;IAC7DK,oBAAA,GACJF,KAAA,CAAME,oBAAA,IAAwBL,UAAA,CAAW,sBAAsB;EAGjE,OAAIH,QAAA,IACFF,KAAA,CAAMW,eAAA,CAAgB,MAAM;IAC1B,IAAIF,qBAAA,EAAuB;IAC3B,MAAMG,EAAA,GAAK,GAAGT,sBAAsB,GAAGK,KAAA,CAAMK,YAAY;MACnDC,MAAA,GAASJ,oBAAA,GAAuBK,QAAA,CAASC,eAAA,GAAkBD,QAAA,CAASE,IAAA;IAC1E,OAAAH,MAAA,CAAOI,SAAA,CAAUC,GAAA,CAAIP,EAAE,GAChB,MAAM;MACXE,MAAA,CAAOI,SAAA,CAAUE,MAAA,CAAOR,EAAE;IAC5B;EACF,GAAG,CAACJ,KAAA,CAAMK,YAAA,EAAcJ,qBAAA,EAAuBC,oBAAoB,CAAC,GAIpE,eAAAJ,GAAA,CAACF,KAAA;IACCiB,SAAA,EAAWb,KAAA,CAAMa,SAAA;IACjBC,IAAA,EAAMd,KAAA,CAAMK,YAAA;IAEZU,cAAA,EAAgB,CAACd,qBAAA,IAAyB,CAACC,oBAAA;IAE3Cc,OAAA,EAASvB,KAAA;IAERwB,QAAA,EAAAjB,KAAA,CAAMiB;EAAA,CACT;AAEJ","ignoreList":[]}

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React from "react";
+import React, { useId } from "react";
 import { isClient } from "@tamagui/constants";
 import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
 import { Theme } from "./Theme";
@@ -23,7 +23,7 @@ var ThemeProvider = function(props) {
     // if root class disabled, force class here
     forceClassName: !disableRootThemeClass && !themeClassNameOnRoot,
     // @ts-expect-error
-    _isRoot: !0,
+    _isRoot: useId,
     children: props.children
   });
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/tamagui/code/core/web/src/views/ThemeProvider.tsx"],
-  "mappings": ";AAAA,OAAOA,WAAW;AAClB,SAASC,gBAAgB;AAEzB,SAASC,8BAA8B;AACvC,SAASC,aAAa;AACtB,SAASC,kBAAkB;AAapB,IAAMC,gBAAgB,SAACC,OAAAA;MAE1BA,8BADIC,yBACJD,+BAAAA,MAAMC,2BAAqB,QAA3BD,iCAAAA,SAAAA,+BAA+BF,WAAW,uBAAA,GAE1CE,6BADIE,wBACJF,8BAAAA,MAAME,0BAAoB,QAA1BF,gCAAAA,SAAAA,8BAA8BF,WAAW,sBAAA;AAG3C,SAAIH,YACFD,MAAMS,gBAAgB,WAAA;AACpB,QAAIF,wBACJ;UAAMG,KAAK,GAAGR,sBAAAA,GAAyBI,MAAMK,YAAY,IACnDC,SAASJ,uBAAuBK,SAASC,kBAAkBD,SAASE;AAC1EH,oBAAOI,UAAUC,IAAIP,EAAAA,GACd,WAAA;AACLE,eAAOI,UAAUE,OAAOR,EAAAA;MAC1B;;EACF,GAAG;IAACJ,MAAMK;IAAcJ;IAAuBC;GAAqB,GAIpE,qBAACL,OAAAA;IACCgB,WAAWb,MAAMa;IACjBC,MAAMd,MAAMK;;IAEZU,gBAAgB,CAACd,yBAAyB,CAACC;;IAE3Cc,SAAO;cAENhB,MAAMiB;;AAGb;",
-  "names": ["React", "isClient", "THEME_CLASSNAME_PREFIX", "Theme", "getSetting", "ThemeProvider", "props", "disableRootThemeClass", "themeClassNameOnRoot", "useLayoutEffect", "cn", "defaultTheme", "target", "document", "documentElement", "body", "classList", "add", "remove", "className", "name", "forceClassName", "_isRoot", "children"]
+  "mappings": ";AAAA,OAAOA,SAASC,aAAa;AAC7B,SAASC,gBAAgB;AAEzB,SAASC,8BAA8B;AACvC,SAASC,aAAa;AACtB,SAASC,kBAAkB;AAapB,IAAMC,gBAAgB,SAACC,OAAAA;MAE1BA,8BADIC,yBACJD,+BAAAA,MAAMC,2BAAqB,QAA3BD,iCAAAA,SAAAA,+BAA+BF,WAAW,uBAAA,GAE1CE,6BADIE,wBACJF,8BAAAA,MAAME,0BAAoB,QAA1BF,gCAAAA,SAAAA,8BAA8BF,WAAW,sBAAA;AAG3C,SAAIH,YACFF,MAAMU,gBAAgB,WAAA;AACpB,QAAIF,wBACJ;UAAMG,KAAK,GAAGR,sBAAAA,GAAyBI,MAAMK,YAAY,IACnDC,SAASJ,uBAAuBK,SAASC,kBAAkBD,SAASE;AAC1EH,oBAAOI,UAAUC,IAAIP,EAAAA,GACd,WAAA;AACLE,eAAOI,UAAUE,OAAOR,EAAAA;MAC1B;;EACF,GAAG;IAACJ,MAAMK;IAAcJ;IAAuBC;GAAqB,GAIpE,qBAACL,OAAAA;IACCgB,WAAWb,MAAMa;IACjBC,MAAMd,MAAMK;;IAEZU,gBAAgB,CAACd,yBAAyB,CAACC;;IAE3Cc,SAAStB;cAERM,MAAMiB;;AAGb;",
+  "names": ["React", "useId", "isClient", "THEME_CLASSNAME_PREFIX", "Theme", "getSetting", "ThemeProvider", "props", "disableRootThemeClass", "themeClassNameOnRoot", "useLayoutEffect", "cn", "defaultTheme", "target", "document", "documentElement", "body", "classList", "add", "remove", "className", "name", "forceClassName", "_isRoot", "children"]
 }

package/package.json

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

package/src/Tamagui.ts

@@ -3,7 +3,6 @@ import * as Helpers from '@tamagui/helpers'
 import { getConfig } from './config'
 import { getAllRules, getAllSelectors, getAllTransforms } from './helpers/insertStyleRule'
 import { mediaState } from './hooks/useMedia'
-import { activeThemeManagers, getThemeManager } from './hooks/useTheme'
 
 // easy introspection
 // only included in dev mode
@@ -12,11 +11,6 @@ export const Tamagui = (() => {
   if (process.env.NODE_ENV === 'development') {
     class TamaguiManager {
       Helpers = Helpers
-      getThemeManager = getThemeManager
-
-      get activeThemeManagers() {
-        return activeThemeManagers
-      }
 
       get mediaState() {
         return { ...mediaState }