tamagui 1.84.1 → 1.84.2

package/dist/test.native.js

@@ -3761,10 +3761,10 @@ var require_ThemeManagerContext_native = __commonJS({
       return to;
     }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), ThemeManagerContext_exports = {};
     __export2(ThemeManagerContext_exports, {
-      ThemeManagerContext: () => ThemeManagerContext
+      ThemeManagerIDContext: () => ThemeManagerIDContext
     });
     module2.exports = __toCommonJS2(ThemeManagerContext_exports);
-    var import_react2 = require("react"), ThemeManagerContext = (0, import_react2.createContext)(null);
+    var import_react2 = require("react"), ThemeManagerIDContext = (0, import_react2.createContext)(1);
   }
 });
 
@@ -3793,7 +3793,7 @@ var require_ThemeManager_native = __commonJS({
     }
     var uid = 0, ThemeManager = class {
       constructor(props = {}, parentManager) {
-        if (this.props = props, this.id = uid++, this.themeListeners = /* @__PURE__ */ new Set(), this.parentManager = null, this.state = emptyState, this._allKeys = null, parentManager === "root") {
+        if (this.props = props, this.id = 0, this.themeListeners = /* @__PURE__ */ new Set(), this.parentManager = null, this.state = emptyState, this._allKeys = null, uid = (uid + 1) % Number.MAX_VALUE, this.id = uid, parentManager === "root") {
           this.updateStateFromProps(props, !1);
           return;
         }
@@ -3936,6 +3936,7 @@ var require_useTheme_native = __commonJS({
     }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), useTheme_exports = {};
     __export2(useTheme_exports, {
       activeThemeManagers: () => activeThemeManagers,
+      getThemeManager: () => getThemeManager,
       getThemeProxied: () => getThemeProxied,
       useChangeThemeEffect: () => useChangeThemeEffect,
       useTheme: () => useTheme4,
@@ -3961,9 +3962,7 @@ var require_useTheme_native = __commonJS({
           var _a, _b;
           return ((_a = props.shouldUpdate) == null ? void 0 : _a.call(props)) ?? (keys.current.length > 0 ? !0 : void 0);
         }
-      ), { themeManager, state } = changedThemeState;
-      state != null && state.theme;
-      let themeProxied = (0, import_react2.useMemo)(() => !themeManager || !(state != null && state.theme) ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug), [state == null ? void 0 : state.theme, themeManager, props.deopt, props.debug]);
+      ), { themeManager, state } = changedThemeState, themeProxied = (0, import_react2.useMemo)(() => !themeManager || !(state != null && state.theme) ? {} : getThemeProxied(state, props.deopt, themeManager, keys.current, props.debug), [state == null ? void 0 : state.theme, themeManager, props.deopt, props.debug]);
       return [changedThemeState, themeProxied];
     };
     function getThemeProxied({ theme, name, scheme }, deopt = !1, themeManager, keys, debug) {
@@ -4033,8 +4032,13 @@ var require_useTheme_native = __commonJS({
       }
       return !1;
     }
-    var activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (props, isRoot = !1, keys, shouldUpdate) => {
-      let { disable } = props, parentManager = (0, import_react2.useContext)(import_ThemeManagerContext.ThemeManagerContext);
+    var activeThemeManagers = /* @__PURE__ */ new Set(), _uidToManager = /* @__PURE__ */ new WeakMap(), _idToUID = {}, getId = (id) => _idToUID[id], getThemeManager = (id) => _uidToManager.get(getId(id)), registerThemeManager = (t) => {
+      if (!_idToUID[t.id]) {
+        let id = _idToUID[t.id] = {};
+        _uidToManager.set(id, t);
+      }
+    }, useChangeThemeEffect = (props, isRoot = !1, keys, shouldUpdate) => {
+      let { disable } = props, parentManagerId = (0, import_react2.useContext)(import_ThemeManagerContext.ThemeManagerIDContext), parentManager = getThemeManager(parentManagerId);
       if (!isRoot && !parentManager || disable)
         return {
           isNewTheme: !1,
@@ -4060,7 +4064,7 @@ var require_useTheme_native = __commonJS({
           }));
           return;
         }
-        isNewTheme && themeManager && activeThemeManagers.add(themeManager), (isNewTheme || getShouldUpdateTheme(themeManager)) && setThemeState(createState);
+        (isNewTheme || getShouldUpdateTheme(themeManager)) && (activeThemeManagers.add(themeManager), setThemeState(createState));
         let selfListenerDispose = themeManager.onChangeTheme((_a, _b, forced) => {
           forced && setThemeState((prev) => createState(prev, !0));
         }), disposeChangeListener = parentManager == null ? void 0 : parentManager.onChangeTheme(
@@ -4071,7 +4075,7 @@ var require_useTheme_native = __commonJS({
           themeManager.id
         );
         return () => {
-          selfListenerDispose(), disposeChangeListener == null || disposeChangeListener(), activeThemeManagers.delete(themeManager);
+          selfListenerDispose(), disposeChangeListener == null || disposeChangeListener(), isNewTheme && activeThemeManagers.delete(themeManager);
         };
       }, [
         themeManager,
@@ -4117,14 +4121,16 @@ var require_useTheme_native = __commonJS({
           } else
             themeManager2 = getNewThemeManager(), state2 = { ...themeManager2.state };
         }
-        let isNewTheme2 = !!(themeManager2 !== parentManager || props.inverse), mounted2 = props.inverse ? isRoot || (prev == null ? void 0 : prev.mounted) : !0;
+        let isNewTheme2 = !!(themeManager2 !== parentManager || props.inverse);
+        isNewTheme2 && registerThemeManager(themeManager2);
+        let mounted2 = props.inverse ? isRoot || (prev == null ? void 0 : prev.mounted) : !0;
         state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager));
         let wasInversed = prev == null ? void 0 : prev.inversed, inversed2 = isNewTheme2 && state2.scheme !== (parentManager == null ? void 0 : parentManager.state.scheme) ? !0 : wasInversed != null ? !1 : null, response = {
           themeManager: themeManager2,
           isNewTheme: isNewTheme2,
           mounted: mounted2,
           inversed: inversed2
-        }, shouldReturnPrev = !force && prev && // isEqualShallow uses the second arg as the keys so this should compare without state first...
+        }, shouldReturnPrev = prev && !force && // isEqualShallow uses the second arg as the keys so this should compare without state first...
         (0, import_createShallowSetState.isEqualShallow)(prev, response) && // ... and then compare just the state, because we make a new state obj but is likely the same
         (0, import_createShallowSetState.isEqualShallow)(prev.state, state2);
         return prev && shouldReturnPrev ? prev : (response.state = state2, response);
@@ -4205,7 +4211,7 @@ var require_Theme_native = __commonJS({
     function getThemedChildren(themeState, children, props, isRoot = !1) {
       let { themeManager, isNewTheme } = themeState;
       if (!themeManager)
-        throw "\u274C";
+        throw new Error("\u274C");
       let { shallow, forceClassName } = props, hasEverThemed = (0, import_react2.useRef)(!1), shouldRenderChildrenWithTheme = isNewTheme || props.inverse || hasEverThemed.current || forceClassName || isRoot;
       if (shouldRenderChildrenWithTheme && (hasEverThemed.current = !0), !shouldRenderChildrenWithTheme)
         return children;
@@ -4215,7 +4221,7 @@ var require_Theme_native = __commonJS({
         void 0,
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Theme2, { name: themeManager.state.parentName, children: child.props.children })
       ) : child));
-      let elementsWithContext = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_ThemeManagerContext.ThemeManagerContext.Provider, { value: themeManager, children: next });
+      let elementsWithContext = /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(import_ThemeManagerContext.ThemeManagerIDContext.Provider, { value: themeManager.id, children: next });
       return forceClassName === !1 ? elementsWithContext : import_constants4.isWeb ? wrapThemeElements({
         children: elementsWithContext,
         themeState,
@@ -5757,9 +5763,9 @@ var require_useThemeName_native = __commonJS({
       useThemeName: () => useThemeName2
     });
     module2.exports = __toCommonJS2(useThemeName_exports);
-    var import_constants4 = require_index_native(), import_react2 = require("react"), import_ThemeManagerContext = require_ThemeManagerContext_native();
+    var import_constants4 = require_index_native(), import_react2 = require("react"), import_ThemeManagerContext = require_ThemeManagerContext_native(), import_useTheme = require_useTheme_native();
     function useThemeName2(opts) {
-      let manager = (0, import_react2.useContext)(import_ThemeManagerContext.ThemeManagerContext), [name, setName] = (0, import_react2.useState)((manager == null ? void 0 : manager.state.name) || "");
+      let manager = (0, import_useTheme.getThemeManager)((0, import_react2.useContext)(import_ThemeManagerContext.ThemeManagerIDContext)), [name, setName] = (0, import_react2.useState)((manager == null ? void 0 : manager.state.name) || "");
       return (0, import_constants4.useIsomorphicLayoutEffect)(() => {
         if (manager)
           return setName(manager.state.name), manager.onChangeTheme((next, manager2) => {