@tamagui/core 1.112.25 → 1.113.0

package/dist/native.js

@@ -2208,6 +2208,7 @@ var require_createVariable_native = __commonJS({
     }
     function getVariable(nameOrVariable) {
       var group = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "size", _tokens_group;
+      if (nameOrVariable != null && nameOrVariable.dynamic) return nameOrVariable;
       if (setDidGetVariableValue(!0), isVariable(nameOrVariable)) return variableToString(nameOrVariable);
       var tokens = (0, import_config.getConfig)().tokensParsed, _tokens_group_nameOrVariable;
       return variableToString((_tokens_group_nameOrVariable = (_tokens_group = tokens[group]) === null || _tokens_group === void 0 ? void 0 : _tokens_group[nameOrVariable]) !== null && _tokens_group_nameOrVariable !== void 0 ? _tokens_group_nameOrVariable : nameOrVariable);
@@ -3732,7 +3733,18 @@ If this is intended and you are using Tamagui without any themes, you can disabl
     function someParentIsInversed(manager) {
       for (var cur = manager; cur; ) {
         if (!cur.parentManager) return !1;
-        if (cur.parentManager.state.scheme !== cur.state.scheme) return !0;
+        if (cur.parentManager.state.scheme !== cur.state.scheme) return process.env.NODE_ENV === "development" && !globalThis.TAMAGUI_DITW && !process.env.TAMAGUI_DISABLE_INVERSE_THEME_WARNING && console.info(` \u203C\uFE0F De-opted a theme value access due to an inversed parent.
+  
+  This means you've accessed a theme value without .get() in a child of an inversed theme.
+  
+  This isn't necessarily a bug, but can often be due to a mistaken inverse (for example,
+  you may have a Theme inside your TamaguiProvider with mis-matched theme values for light/dark).
+  
+  For this reason we've added this warning. If this is intentional, you can disable it with:
+  
+    process.env.TAMAGUI_DISABLE_INVERSE_THEME_WARNING === 1
+    or globalThis.TAMAGUI_DITW = true
+  `), !0;
         cur = cur.parentManager;
       }
       return !1;
@@ -3764,10 +3776,14 @@ If this is intended and you are using Tamagui without any themes, you can disabl
       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)) {
-          var next = nextState || manager.getState(props, parentManager);
-          if (forceShouldChange || next && !(forceUpdate !== !0 && !manager.getStateShouldChange(next, prevState2))) return next;
+          var next2 = nextState || manager.getState(props, parentManager);
+          if (forceShouldChange || next2 && !(forceUpdate !== !0 && !manager.getStateShouldChange(next2, prevState2))) return next2;
         }
       }
+      if (!import_constants2.isWeb && 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);
+      }
       if (import_constants2.isServer || (import_react3.default.useLayoutEffect(function() {
         themeManager && state && prevState && state !== prevState && themeManager.notify();
       }, [
@@ -3786,8 +3802,8 @@ If this is intended and you are using Tamagui without any themes, you can disabl
           (isNewTheme || getShouldUpdateTheme(themeManager)) && (activeThemeManagers.add(themeManager), setThemeState(createState));
           var selfListenerDispose = themeManager.onChangeTheme(function(_a, _b, forced) {
             forced && setThemeState(function(prev) {
-              var next = createState(prev, !!forced);
-              return next;
+              var next2 = createState(prev, forced !== "self");
+              return next2;
             });
           }, !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);
@@ -3848,8 +3864,8 @@ If this is intended and you are using Tamagui without any themes, you can disabl
           };
           if (prev != null && prev.themeManager) {
             themeManager2 = prev.themeManager;
-            var forceChange = force || !!(keys != null && keys.length), next = themeManager2.getState(props, parentManager), nextState = getShouldUpdateTheme(themeManager2, next, prev.state, forceChange);
-            nextState ? (state2 = nextState, !prev.isNewTheme && !isRoot ? themeManager2 = getNewThemeManager() : themeManager2.updateState(nextState)) : prev.isNewTheme && parentManager && !next && (themeManager2 = parentManager);
+            var forceChange = force || !!(keys != null && keys.length), next2 = themeManager2.getState(props, parentManager), nextState = getShouldUpdateTheme(themeManager2, next2, prev.state, forceChange);
+            nextState ? (state2 = nextState, !prev.isNewTheme && !isRoot ? themeManager2 = getNewThemeManager() : themeManager2.updateState(nextState)) : prev.isNewTheme && parentManager && !next2 && (themeManager2 = parentManager);
           } else themeManager2 = getNewThemeManager(), state2 = {
             ...themeManager2.state
           };