@tamagui/core 1.112.9 → 1.112.11

package/dist/test.native.js

@@ -3038,7 +3038,7 @@ var require_ThemeManager_native = __commonJS({
       "use strict";
       function ThemeManager2() {
         var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, parentManager = arguments.length > 1 ? arguments[1] : void 0;
-        if (_class_call_check(this, ThemeManager2), _define_property(this, "props", void 0), _define_property(this, "id", void 0), _define_property(this, "themeListeners", void 0), _define_property(this, "parentManager", void 0), _define_property(this, "state", void 0), _define_property(this, "_allKeys", void 0), 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") {
+        if (_class_call_check(this, ThemeManager2), _define_property(this, "props", void 0), _define_property(this, "id", void 0), _define_property(this, "themeListeners", void 0), _define_property(this, "parentManager", void 0), _define_property(this, "state", void 0), _define_property(this, "_allKeys", void 0), _define_property(this, "_selfListener", void 0), 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;
         }
@@ -3058,11 +3058,22 @@ var require_ThemeManager_native = __commonJS({
         {
           key: "updateState",
           value: function(nextState) {
-            var _this = this, shouldNotify = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0;
-            this.state = nextState, this._allKeys = null, shouldNotify && this.notify();
+            var shouldNotify = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !0;
+            this.state = nextState, this._allKeys = null;
           }
         },
         {
+          // if (shouldNotify) {
+          //   if (process.env.TAMAGUI_TARGET === 'native') {
+          //     // native is way slower with queueMicrotask
+          //     this.notify()
+          //   } else {
+          //     // web is way faster this way
+          //     queueMicrotask(() => {
+          //       this.notify()
+          //     })
+          //   }
+          // }
           key: "getStateIfChanged",
           value: function() {
             var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : this.props, state = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : this.state, parentManager = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : this.parentManager, _ = this.getState(props, parentManager);
@@ -3105,6 +3116,13 @@ var require_ThemeManager_native = __commonJS({
             (_this_ = this[_numChangeEventsSent = "_numChangeEventsSent"]) !== null && _this_ !== void 0 || (this[_numChangeEventsSent] = 0), this._numChangeEventsSent++;
           }
         },
+        {
+          key: "selfUpdate",
+          value: function() {
+            var _this__selfListener, _this;
+            (_this__selfListener = (_this = this)._selfListener) === null || _this__selfListener === void 0 || _this__selfListener.call(_this, this.state.name, this, "self");
+          }
+        },
         {
           key: "onChangeTheme",
           value: function(cb, debugId) {
@@ -3113,7 +3131,7 @@ var require_ThemeManager_native = __commonJS({
               var _this__listeningIds;
               (_this__listeningIds = this._listeningIds) !== null && _this__listeningIds !== void 0 || (this._listeningIds = /* @__PURE__ */ new Set()), this._listeningIds.add(debugId);
             }
-            return this.themeListeners.add(cb), function() {
+            return debugId === !0 && (this._selfListener = cb), this.themeListeners.add(cb), function() {
               _this.themeListeners.delete(cb);
             };
           }
@@ -3456,7 +3474,7 @@ var require_useTheme_native = __commonJS({
       if (!theme) return {};
       var config = (0, import_config.getConfig)();
       function track(key) {
-        keys && !keys.includes(key) && keys.push(key);
+        keys && !keys.includes(key) && (keys.length || themeManager == null || themeManager.selfUpdate(), keys.push(key));
       }
       return new Proxy(theme, {
         has(_, key) {
@@ -3516,29 +3534,26 @@ var require_useTheme_native = __commonJS({
         var id = _idToUID[t.id] = {};
         _uidToManager.set(id, t);
       }
-    }, ogLog = console.error, preventWarnSetState = (
-      // temporary fix for logs, they are harmless in that i've tried to rewrite this
-      // a few times using the "right" ways, but they are always slower. maybe skill issue
-      function(a) {
-        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) args[_key - 1] = arguments[_key];
-        if (!(typeof a == "string" && a.includes("Cannot update a component"))) return ogLog(a, ...args);
-      }
-    ), useChangeThemeEffect = function(props) {
+    }, useChangeThemeEffect = function(props) {
       var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1, keys = arguments.length > 2 ? arguments[2] : void 0, shouldUpdate = arguments.length > 3 ? arguments[3] : void 0, { disable } = props, parentManagerId = import_react3.default.useContext(import_ThemeManagerContext.ThemeManagerIDContext), parentManager = getThemeManager(parentManagerId);
       if (!isRoot && !parentManager || disable) return {
         isNewTheme: !1,
         state: parentManager == null ? void 0 : parentManager.state,
         themeManager: parentManager
       };
-      var [themeState, setThemeState] = import_react3.default.useState(createState), { state, mounted, isNewTheme, themeManager, inversed } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
+      var [themeState, setThemeState] = import_react3.default.useState(createState), { state, mounted, isNewTheme, themeManager, inversed, prevState } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
       function getShouldUpdateTheme() {
-        var manager = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : themeManager, nextState = arguments.length > 1 ? arguments[1] : void 0, prevState = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : state, forceShouldChange = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, forceUpdate = shouldUpdate == null ? void 0 : shouldUpdate();
+        var manager = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : themeManager, nextState = arguments.length > 1 ? arguments[1] : void 0, prevState2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : state, forceShouldChange = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, forceUpdate = shouldUpdate == null ? void 0 : shouldUpdate();
         if (!(!manager || !forceShouldChange && forceUpdate === !1)) {
           var next = nextState || manager.getState(props, parentManager);
-          if (forceShouldChange || next && !(forceUpdate !== !0 && !manager.getStateShouldChange(next, prevState))) return next;
+          if (forceShouldChange || next && !(forceUpdate !== !0 && !manager.getStateShouldChange(next, prevState2))) return next;
         }
       }
-      if (import_constants2.isServer || import_react3.default.useEffect(function() {
+      if (import_constants2.isServer || (import_react3.default.useLayoutEffect(function() {
+        themeManager && state && prevState && state !== prevState && themeManager.notify();
+      }, [
+        state
+      ]), import_react3.default.useEffect(function() {
         if (themeManager) {
           if (props.inverse && !mounted) {
             setThemeState(function(prev) {
@@ -3551,14 +3566,15 @@ var require_useTheme_native = __commonJS({
           }
           (isNewTheme || getShouldUpdateTheme(themeManager)) && (activeThemeManagers.add(themeManager), setThemeState(createState));
           var selfListenerDispose = themeManager.onChangeTheme(function(_a, _b, forced) {
-            forced && (console.error = preventWarnSetState, setThemeState(function(prev) {
-              return createState(prev, !0);
-            }), console.error = ogLog);
-          }), disposeChangeListener = parentManager == null ? void 0 : parentManager.onChangeTheme(function(name, manager, forced) {
+            forced && setThemeState(function(prev) {
+              var next = createState(prev, forced !== "self");
+              return next;
+            });
+          }, !0), disposeChangeListener = parentManager == null ? void 0 : parentManager.onChangeTheme(function(name, manager, forced) {
             var force = forced || (shouldUpdate == null ? void 0 : shouldUpdate()) || props.deopt || props["disable-child-theme"], shouldTryUpdate = force ?? !!(keys != null && keys.length || isNewTheme);
-            shouldTryUpdate && (console.error = preventWarnSetState, setThemeState(function(prev) {
+            shouldTryUpdate && setThemeState(function(prev) {
               return createState(prev, force);
-            }), console.error = ogLog);
+            });
           }, themeManager.id);
           return function() {
             selfListenerDispose(), disposeChangeListener == null || disposeChangeListener(), isNewTheme && activeThemeManagers.delete(themeManager);
@@ -3573,7 +3589,7 @@ var require_useTheme_native = __commonJS({
         props.name,
         props.reset,
         mounted
-      ]), import_constants2.isWeb && isInversingOnMount) return {
+      ])), import_constants2.isWeb && isInversingOnMount) return {
         isNewTheme: !1,
         inversed: !1,
         themeManager: parentManager,
@@ -3618,7 +3634,7 @@ var require_useTheme_native = __commonJS({
         (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);
         if (prev && shouldReturnPrev) return prev;
-        if (response.state = state2, !1)
+        if (response.state = state2, response.prevState = prev == null ? void 0 : prev.state, !1)
           var parentState, parentId, themeManagerState;
         return response;
       }