@tamagui/core 1.116.9 → 1.116.11

package/dist/native.js

@@ -3266,6 +3266,13 @@ var require_ThemeManager_native = __commonJS({
             if (nextState) return this.updateState(nextState, shouldNotify), nextState;
           }
         },
+        {
+          key: "getParents",
+          value: function() {
+            for (var parents = [], current = this; current; ) parents.push(current), current = current.parentManager;
+            return parents;
+          }
+        },
         {
           key: "updateState",
           value: function(nextState) {
@@ -3416,6 +3423,7 @@ var require_ThemeManager_native = __commonJS({
             theme: themes[found],
             className,
             isComponent,
+            isSchemeFixed: props.name === "light" || props.name === "dark",
             scheme
           };
           break;
@@ -3720,19 +3728,14 @@ If this is intended and you are using Tamagui without any themes, you can disabl
                 if (subkey === "val") globalThis.tamaguiAvoidTracking || (process.env.NODE_ENV === "development" && debug === "verbose" && console.info(" \u{1F3A8} useTheme() tracking new key because of .val access", new Error().stack), track(keyString));
                 else if (subkey === "get") return function(platform) {
                   var outVal = (0, import_createVariable.getVariable)(val);
-                  if (platform !== "web" && import_constants2.isIos && !deopt && (0, import_config.getSetting)("fastSchemeChange") && scheme) {
-                    var isInversed = getIsInversed(themeManager);
-                    isInversed && (scheme = scheme === "dark" ? "light" : "dark");
-                    var oppositeThemeName = name.replace(scheme === "dark" ? "dark" : "light", scheme === "dark" ? "light" : "dark"), oppositeTheme = config.themes[oppositeThemeName], oppositeVal = (0, import_createVariable.getVariable)(oppositeTheme == null ? void 0 : oppositeTheme[keyString]);
-                    if (oppositeVal) {
-                      var dynamicVal = {
-                        dynamic: {
-                          dark: scheme === "dark" ? outVal : oppositeVal,
-                          light: scheme === "light" ? outVal : oppositeVal
-                        }
-                      };
-                      return dynamicVal;
-                    }
+                  if (platform !== "web" && import_constants2.isIos && !deopt && (0, import_config.getSetting)("fastSchemeChange") && !hasFixedSchemeParent(themeManager) && scheme) {
+                    var _config_themes_name, _config_themes_oppositeName, oppositeName = name.replace(scheme === "dark" ? "dark" : "light", scheme === "dark" ? "light" : "dark"), colorLight = (0, import_createVariable.getVariable)((_config_themes_name = config.themes[name]) === null || _config_themes_name === void 0 ? void 0 : _config_themes_name[keyString]), colorDark = (0, import_createVariable.getVariable)((_config_themes_oppositeName = config.themes[oppositeName]) === null || _config_themes_oppositeName === void 0 ? void 0 : _config_themes_oppositeName[keyString]), dynamicVal = {
+                      dynamic: {
+                        light: colorLight,
+                        dark: colorDark
+                      }
+                    };
+                    return dynamicVal;
                   }
                   return process.env.NODE_ENV === "development" && debug && console.info(` \u{1F3A8} useTheme() tracking new key because of: 
                         not web: ${platform !== "web"}
@@ -3759,6 +3762,11 @@ If this is intended and you are using Tamagui without any themes, you can disabl
       }
       return !1;
     }
+    function hasFixedSchemeParent(manager) {
+      return manager == null ? void 0 : manager.getParents().some(function(x) {
+        return x.state.isSchemeFixed;
+      });
+    }
     var activeThemeManagers = /* @__PURE__ */ new Set(), _uidToManager = /* @__PURE__ */ new WeakMap(), _idToUID = {}, getId = function(id) {
       return _idToUID[id];
     }, getThemeManager = function(id) {
@@ -3782,7 +3790,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
         state: parentManager == null ? void 0 : parentManager.state,
         themeManager: parentManager
       };
-      var [themeState, setThemeState] = import_react3.default.useState(createState), { state, mounted, isNewTheme, themeManager, inversed, prevState } = themeState, isInversingOnMount = !!(!themeState.mounted && props.inverse);
+      var [themeState, setThemeState] = import_react3.default.useState(createState), { state, mounted, isNewTheme, themeManager, 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, 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)) {
@@ -3790,7 +3798,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
           if (forceShouldChange || next2 && !(forceUpdate !== !0 && !manager.getStateShouldChange(next2, prevState2))) return next2;
         }
       }
-      if (!import_constants2.isWeb && themeManager && getShouldUpdateTheme(themeManager)) {
+      if (themeManager && getShouldUpdateTheme(themeManager)) {
         var _next_state, _themeState_state, next = createState(themeState);
         ((_next_state = next.state) === null || _next_state === void 0 ? void 0 : _next_state.name) !== ((_themeState_state = themeState.state) === null || _themeState_state === void 0 ? void 0 : _themeState_state.name) && (setThemeState(next), console.error = preventWarnSetState, themeManager.notify(), console.error = ogLog);
       }
@@ -3861,7 +3869,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
       return {
         state,
         isNewTheme,
-        inversed,
+        inversed: !!props.inverse,
         themeManager
       };
       function createState(prev) {
@@ -3884,11 +3892,11 @@ If this is intended and you are using Tamagui without any themes, you can disabl
         isNewTheme2 && registerThemeManager(themeManager2);
         var isWebSSR = import_constants2.isWeb ? !(0, import_config.getSetting)("disableSSR") : !1, mounted2 = isWebSSR ? isRoot || (prev == null ? void 0 : prev.mounted) : !0;
         state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager));
-        var wasInversed = prev == null ? void 0 : prev.inversed, isInherentlyInversed = isNewTheme2 && state2.scheme !== (parentManager == null ? void 0 : parentManager.state.scheme), inversed2 = isRoot ? !1 : isInherentlyInversed ? !0 : isWebSSR ? wasInversed != null ? !1 : null : props.inverse, response = {
+        var response = {
           themeManager: themeManager2,
           isNewTheme: isNewTheme2,
           mounted: mounted2,
-          inversed: inversed2
+          inversed: props.inverse
         }, 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);
@@ -7278,7 +7286,7 @@ current`, {
           if (!styleState.style.$$css) {
             var atomic, _iteratorNormalCompletion, _didIteratorError, _iteratorError;
             try {
-              for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) var atomicStyle, _props_animateOnly, key3, value, identifier1, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
+              for (var _iterator, _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) var atomicStyle, _props_animateOnly, _props_animateOnly1, key3, value, identifier1, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
             } catch (err) {
             } finally {
               try {