@tamagui/core 1.112.23 → 1.112.25-1728362181133

package/dist/native.js

@@ -3732,7 +3732,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 +3775,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), themeManager.notify());
+      }
       if (import_constants2.isServer || (import_react3.default.useLayoutEffect(function() {
         themeManager && state && prevState && state !== prevState && themeManager.notify();
       }, [
@@ -3786,8 +3801,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 +3863,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, 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
           };
@@ -6578,10 +6593,8 @@ var require_propMapper_native = __commonJS({
         var _theme_value, val = (_theme_value = theme == null ? void 0 : theme[value]) !== null && _theme_value !== void 0 ? _theme_value : tokensParsed[customTokenAccept][value];
         val != null && (resolveAs = "value", valOrVar = val, hasSet = !0);
       }
-      if (theme && value in theme) {
-        if (valOrVar = theme[value], styleState.skipThemeTokenResolution && valOrVar != null && valOrVar.val) return process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.info(` - keep original value: ${value} for ${key} due to enableFlattenThemeOnNative: true`), value;
-        process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.info(` - resolving ${key} to theme value ${value}: ${valOrVar == null ? void 0 : valOrVar.val}`), hasSet = !0;
-      } else {
+      if (theme && value in theme) valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.info(` - resolving ${key} to theme value ${value}`, valOrVar), hasSet = !0;
+      else {
         if (value in conf.specificTokens) hasSet = !0, valOrVar = conf.specificTokens[value];
         else {
           switch (key) {
@@ -6861,7 +6874,7 @@ var require_getSplitStyles_native = __commonJS({
       var _staticConfig_accept, validStyleProps = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? import_helpers.stylePropsText : import_helpers.validStyles);
       return validStyleProps[key] || ((_staticConfig_accept = staticConfig.accept) === null || _staticConfig_accept === void 0 ? void 0 : _staticConfig_accept[key]);
     }
-    var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug, skipThemeTokenResolution) {
+    var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug) {
       conf = conf || (0, import_config.getConfig)(), import_constants2.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
       var { shorthands } = conf, { isHOC, isText, isInput, variants, isReactNative, inlineProps, inlineWhenUnflattened, parentStaticConfig, acceptsClassName } = staticConfig, viewProps = {}, mediaState2 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants2.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, styleState = {
         classNames,
@@ -6875,8 +6888,7 @@ var require_getSplitStyles_native = __commonJS({
         usedKeys,
         viewProps,
         context,
-        debug,
-        skipThemeTokenResolution
+        debug
       };
       process.env.NODE_ENV === "development" && debug && debug !== "profile" && import_constants2.isClient && (consoleGroupCollapsed("getSplitStyles (collapsed)"), (0, import_log.log)({
         props,
@@ -10862,9 +10874,9 @@ var require_useProps_native = __commonJS({
         componentName: staticConfig.componentName,
         name: "theme" in props ? props.theme : void 0,
         inverse: "themeInverse" in props ? props.themeInverse : void 0
-      }), componentContext = import_react3.default.useContext(import_ComponentContext.ComponentContext), { state, disabled, setStateShallow } = (0, import_useComponentState.useComponentState)(props, componentContext, staticConfig, (0, import_config.getConfig)()), media = (0, import_useMedia.useMedia)(), splitStyles = (0, import_getSplitStyles.useSplitStyles)(props, staticConfig, theme, ((_themeState_state = themeState.state) === null || _themeState_state === void 0 ? void 0 : _themeState_state.name) || "", state, {
+      }), componentContext = import_react3.default.useContext(import_ComponentContext.ComponentContext), { state, disabled, setStateShallow } = (0, import_useComponentState.useComponentState)(props, componentContext, staticConfig, (0, import_config.getConfig)()), mediaState2 = (0, import_useMedia.useMedia)(), splitStyles = (0, import_getSplitStyles.useSplitStyles)(props, staticConfig, theme, ((_themeState_state = themeState.state) === null || _themeState_state === void 0 ? void 0 : _themeState_state.name) || "", state, {
         isAnimated: !1,
-        mediaState: media,
+        mediaState: mediaState2,
         noSkip: !0,
         noMergeStyle: !0,
         noClassNames: !0,
@@ -10900,7 +10912,7 @@ var require_useProps_native = __commonJS({
         splitStyles.viewProps,
         splitStyles.style || {},
         theme,
-        media
+        mediaState2
       ];
     }
   }