@tamagui/core 1.124.4 → 1.124.5

package/dist/native.js

@@ -6209,20 +6209,23 @@ var require_useThemeState_native = __commonJS({
       hasThemeUpdatingProps: function() {
         return hasThemeUpdatingProps;
       },
+      keysToId: function() {
+        return keysToId;
+      },
       useThemeState: function() {
         return useThemeState;
       }
     });
     module2.exports = __toCommonJS2(useThemeState_exports);
-    var import_constants2 = require_index_native2(), import_react3 = require("react"), import_config = require_config_native(), ThemeStateContext = (0, import_react3.createContext)(""), allListeners = /* @__PURE__ */ new Map(), listenersByParent = {}, states = /* @__PURE__ */ new Map(), forceUpdateThemes2 = function() {
-      allListeners.forEach(function(cb) {
+    var import_constants2 = require_index_native2(), import_react3 = require("react"), import_config = require_config_native(), ThemeStateContext = (0, import_react3.createContext)(""), keysToId = /* @__PURE__ */ new WeakMap(), allListeners = /* @__PURE__ */ new Map(), listenersByParent = {}, hasRenderedOnce = /* @__PURE__ */ new WeakMap(), pendingUpdate = /* @__PURE__ */ new Map(), states = /* @__PURE__ */ new Map(), shouldForce = !1, forceUpdateThemes2 = function() {
+      cacheVersion++, shouldForce = !0, allListeners.forEach(function(cb) {
         return cb();
       });
     }, getThemeState = function(id) {
       return states.get(id);
-    }, rootThemeState = null, getRootThemeState = function() {
+    }, cache2 = /* @__PURE__ */ new Map(), cacheVersion = 0, themes = null, rootThemeState = null, getRootThemeState = function() {
       return rootThemeState;
-    }, HasRenderedOnce = /* @__PURE__ */ new WeakMap(), useThemeState = function(props) {
+    }, useThemeState = function(props) {
       var isRoot = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : !1, keys = arguments.length > 2 ? arguments[2] : void 0, { disable } = props, parentId = (0, import_react3.useContext)(ThemeStateContext);
       if (disable) return states.get(parentId) || {
         id: "",
@@ -6232,24 +6235,28 @@ var require_useThemeState_native = __commonJS({
       };
       var id = (0, import_react3.useId)(), subscribe = (0, import_react3.useCallback)(function(cb) {
         var _listenersByParent, _parentId;
-        return (_listenersByParent = listenersByParent)[_parentId = parentId] || (_listenersByParent[_parentId] = /* @__PURE__ */ new Set()), listenersByParent[parentId].add(id), allListeners.set(id, cb), function() {
+        return (_listenersByParent = listenersByParent)[_parentId = parentId] || (_listenersByParent[_parentId] = /* @__PURE__ */ new Set()), listenersByParent[parentId].add(id), allListeners.set(id, function() {
+          pendingUpdate.set(id, shouldForce ? "force" : !0), cb();
+        }), function() {
           allListeners.delete(id), listenersByParent[parentId].delete(id);
         };
       }, [
         id,
-        parentId,
-        keys
+        parentId
       ]), propsKey = getPropsKey(props), getSnapshot = function() {
-        return getSnapshotFrom(props, propsKey, isRoot, id, parentId, keys);
+        var _keys_current, _props_needsUpdate, last = states.get(id), needsUpdate = props.name === "light" || props.name === "dark" ? !0 : hasRenderedOnce.get(keys) ? !(keys == null || (_keys_current = keys.current) === null || _keys_current === void 0) && _keys_current.size ? !0 : (_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props) : !0, parentState = states.get(parentId), cacheKey = `${cacheVersion}${id}${propsKey}${(parentState == null ? void 0 : parentState.name) || ""}${isRoot}`;
+        if (!needsUpdate && cache2.has(cacheKey)) return cache2.get(cacheKey);
+        var next = getSnapshotFrom(last, props, propsKey, isRoot, id, parentId, needsUpdate, pendingUpdate.get(id));
+        return last !== next && (pendingUpdate.delete(id), states.set(id, next), cache2.set(id, next), process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && console.warn(` \xB7 useTheme(${id}) UPDATE from`, last, "to", next)), next;
       };
       process.env.NODE_ENV === "development" && globalThis.time && globalThis.time`theme-prep-uses`;
       var state = (0, import_react3.useSyncExternalStore)(subscribe, getSnapshot, getSnapshot);
       return (0, import_constants2.useIsomorphicLayoutEffect)(function() {
+        if (!hasRenderedOnce.get(keys)) {
+          hasRenderedOnce.set(keys, !0);
+          return;
+        }
         if (propsKey) {
-          if (!HasRenderedOnce.has(keys)) {
-            HasRenderedOnce.set(keys, !0);
-            return;
-          }
           if (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile") {
             var _states_get;
             console.warn(` \xB7 useTheme(${id}) scheduleUpdate`, propsKey, (_states_get = states.get(id)) === null || _states_get === void 0 ? void 0 : _states_get.name);
@@ -6259,29 +6266,30 @@ var require_useThemeState_native = __commonJS({
       }, [
         keys,
         propsKey
-      ]), process.env.NODE_ENV === "development" && props.debug && (console.groupCollapsed(` \xB7 useTheme(${id}) =>`, state.name, id === state.id ? "\u{1F389}" : "\u23ED\uFE0F"), console.info({
-        state,
-        parentId,
-        props,
-        propsKey,
-        id,
-        parentState: states.get(parentId)
-      }), console.groupEnd()), state.id === id ? {
+      ]), state.id === id ? {
         ...state,
         isNew: !0
       } : state;
-    }, themes = null, getSnapshotFrom = function(props, propsKey) {
-      var isRoot = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1, id = arguments.length > 3 ? arguments[3] : void 0, parentId = arguments.length > 4 ? arguments[4] : void 0, keys = arguments.length > 5 ? arguments[5] : void 0, _keys_current, _props_needsUpdate, needsUpdate = (keys == null || (_keys_current = keys.current) === null || _keys_current === void 0 ? void 0 : _keys_current.size) || ((_props_needsUpdate = props.needsUpdate) === null || _props_needsUpdate === void 0 ? void 0 : _props_needsUpdate.call(props)), parentState = states.get(parentId);
+    }, getSnapshotFrom = function(lastState, props, propsKey) {
+      var isRoot = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : !1, id = arguments.length > 4 ? arguments[4] : void 0, parentId = arguments.length > 5 ? arguments[5] : void 0, needsUpdate = arguments.length > 6 ? arguments[6] : void 0, pendingUpdate2 = arguments.length > 7 ? arguments[7] : void 0, parentState = states.get(parentId);
       themes || (themes = (0, import_config.getConfig)().themes);
-      var lastState = states.get(id), name = propsKey ? getNewThemeName(parentState == null ? void 0 : parentState.name, props, !!needsUpdate) : null;
+      var name = !propsKey && pendingUpdate2 !== "force" ? null : getNewThemeName(parentState == null ? void 0 : parentState.name, props, pendingUpdate2 === "force" ? !0 : !!needsUpdate), isSameAsParent = !!(!name && propsKey);
       if (process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile") {
         var message = ` \xB7 useTheme(${id}) snapshot ${name}, parent ${parentState == null ? void 0 : parentState.id} needsUpdate ${needsUpdate}`;
         console.info(message);
       }
-      var isSameAsParent = !name && propsKey;
       if (parentState && isSameAsParent) return parentState;
-      if (!name) return lastState && !needsUpdate ? lastState : (states.set(id, parentState), parentState);
-      if (lastState && lastState.name === name) return lastState;
+      if (!name) {
+        var next = lastState ?? parentState;
+        if (needsUpdate && pendingUpdate2) {
+          var updated = {
+            ...parentState || lastState
+          };
+          return updated;
+        }
+        return next;
+      }
+      if (pendingUpdate2 !== "force" && lastState && lastState.name === name) return lastState;
       var scheme = getScheme(name), _parentState_inverses, parentInverses = (_parentState_inverses = parentState == null ? void 0 : parentState.inverses) !== null && _parentState_inverses !== void 0 ? _parentState_inverses : 0, isInverse = parentState && scheme !== parentState.scheme, inverses = parentInverses + (isInverse ? 1 : 0), nextState = {
         id,
         name,
@@ -6292,7 +6300,7 @@ var require_useThemeState_native = __commonJS({
         inverses,
         isInverse
       };
-      return process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && (console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F ${name}`), console.info("state", nextState), console.groupEnd()), states.set(id, nextState), isRoot && (rootThemeState = nextState), nextState;
+      return process.env.NODE_ENV === "development" && props.debug && props.debug !== "profile" && (console.groupCollapsed(` \xB7 useTheme(${id}) \u23ED\uFE0F2 ${name}`), console.info("state", nextState), console.groupEnd()), isRoot && (rootThemeState = nextState), pendingUpdate2 !== "force" && lastState && !needsUpdate ? (Object.assign(lastState, nextState), lastState) : nextState;
     };
     function scheduleUpdate(id) {
       for (var queue = [
@@ -6330,7 +6338,7 @@ var require_useThemeState_native = __commonJS({
       return validSchemes[name.split("_")[0]];
     }
     function getNewThemeName() {
-      var parentName = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", { name, reset, componentName, inverse } = arguments.length > 1 ? arguments[1] : void 0, forceUpdate = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1;
+      var parentName = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "", { name, reset, componentName, inverse, debug } = arguments.length > 1 ? arguments[1] : void 0, forceUpdate = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : !1;
       if (name && reset) throw new Error(process.env.NODE_ENV === "production" ? "\u274C004" : "Cannot reset and set a new name at the same time.");
       if (reset) {
         if (!parentName) throw new Error("\u203C\uFE0F");
@@ -6364,7 +6372,8 @@ var require_useThemeState_native = __commonJS({
         }
         if (found) break;
       }
-      if (found && inverse) {
+      if (inverse) {
+        found || (found = parentName);
         var scheme = found.split("_")[0];
         found = found.replace(new RegExp(`^${scheme}`), scheme === "light" ? "dark" : "light");
       }
@@ -6475,41 +6484,45 @@ var require_getThemeProxied_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(getThemeProxied_exports);
-    var import_constants2 = require_index_native2(), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_doesRootSchemeMatchSystem = require_doesRootSchemeMatchSystem_native(), cache2 = /* @__PURE__ */ new Map(), curKeys, curProps, emptyObject = {};
-    function getThemeProxied(_props, state, _keys) {
-      var theme = state == null ? void 0 : state.theme;
-      if (!theme) return emptyObject;
-      if (curKeys = _keys, curProps = _props, cache2.has(theme)) {
-        var proxied = cache2.get(theme);
+    var import_constants2 = require_index_native2(), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_doesRootSchemeMatchSystem = require_doesRootSchemeMatchSystem_native(), import_useThemeState = require_useThemeState_native(), cache2 = /* @__PURE__ */ new Map(), curKeys, curProps, curState, emptyObject = {};
+    function getThemeProxied(_props, _state, _keys) {
+      if (!(_state != null && _state.theme)) return emptyObject;
+      if (curKeys = _keys, curProps = _props, curState = _state, cache2.has(curState.theme)) {
+        var proxied = cache2.get(curState.theme);
         return proxied;
       }
-      var { name, scheme } = state, config = (0, import_config.getConfig)();
+      var config = (0, import_config.getConfig)();
       function track(key) {
-        curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */ new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
+        if (curKeys && (curKeys.current || (curKeys.current = /* @__PURE__ */ new Set()), curKeys.current.add(key), process.env.NODE_ENV === "development" && curProps.debug)) {
+          var _globalThis_states, realId = import_useThemeState.keysToId.get(curKeys);
+          console.info(` \u{1F3A8} useTheme(${realId}) tracking new key: ${key}`, curKeys, (_globalThis_states = globalThis.states) === null || _globalThis_states === void 0 ? void 0 : _globalThis_states.get(realId + 1));
+        }
       }
-      var proxied1 = Object.fromEntries(Object.entries(theme).flatMap(function(param) {
+      var proxied1 = Object.fromEntries(Object.entries(_state.theme).flatMap(function(param) {
         var [key, value] = param, proxied2 = {
           ...value,
           get val() {
             return globalThis.tamaguiAvoidTracking || track(key), value.val;
           },
           get(platform) {
-            var outVal = (0, import_createVariable.getVariable)(value), shouldOptimize = scheme && platform !== "web" && import_constants2.isIos && !curProps.deopt && (0, import_config.getSetting)("fastSchemeChange") && state.inverses === 0 && (0, import_doesRootSchemeMatchSystem.doesRootSchemeMatchSystem)();
-            if (shouldOptimize) {
-              var _config_themes_name, _config_themes_oppositeName, oppositeScheme = scheme === "dark" ? "light" : "dark", oppositeName = name.replace(scheme, oppositeScheme), color = (0, import_createVariable.getVariable)((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[key]), oppositeColor = (0, import_createVariable.getVariable)((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[key]), dynamicVal = {
-                dynamic: {
-                  [scheme]: color,
-                  [oppositeScheme]: oppositeColor
-                }
-              };
-              return dynamicVal;
-            }
-            return process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key because of: 
+            if (curState) {
+              var outVal = (0, import_createVariable.getVariable)(value), { name, scheme, inverses } = curState, shouldOptimize = scheme && platform !== "web" && import_constants2.isIos && !curProps.deopt && (0, import_config.getSetting)("fastSchemeChange") && inverses === 0 && (0, import_doesRootSchemeMatchSystem.doesRootSchemeMatchSystem)();
+              if (shouldOptimize) {
+                var _config_themes_name, _config_themes_oppositeName, oppositeScheme = scheme === "dark" ? "light" : "dark", oppositeName = name.replace(scheme, oppositeScheme), color = (0, import_createVariable.getVariable)((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[key]), oppositeColor = (0, import_createVariable.getVariable)((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[key]), dynamicVal = {
+                  dynamic: {
+                    [scheme]: color,
+                    [oppositeScheme]: oppositeColor
+                  }
+                };
+                return dynamicVal;
+              }
+              return process.env.NODE_ENV === "development" && curProps.debug && console.info(` \u{1F3A8} useTheme() tracking new key because of: 
                 not web: ${platform !== "web"}
                 isIOS: ${import_constants2.isIos}
                 deopt: ${curProps.deopt}
                 fastScheme: ${(0, import_config.getSetting)("fastSchemeChange")}
               `), track(key), outVal;
+            }
           }
         };
         return [
@@ -6523,7 +6536,7 @@ var require_getThemeProxied_native = __commonJS({
           ]
         ];
       }));
-      return cache2.set(theme, proxied1), proxied1;
+      return cache2.set(_state.theme, proxied1), proxied1;
     }
   }
 });