@tamagui/core 1.113.2 → 1.114.0

package/dist/native.js

@@ -2977,10 +2977,12 @@ var require_useMedia_native = __commonJS({
       }));
     }
     var States = /* @__PURE__ */ new WeakMap();
-    function setMediaShouldUpdate(ref, props) {
-      return States.set(ref, {
-        ...States.get(ref),
-        ...props
+    function setMediaShouldUpdate(ref, enabled, keys) {
+      var cur = States.get(ref);
+      (!cur || cur.enabled !== enabled || keys) && States.set(ref, {
+        ...cur,
+        enabled,
+        keys
       });
     }
     function subscribe(subscriber) {
@@ -3668,7 +3670,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
         props.deopt,
         props.debug
       ]);
-      return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed(`  \u{1F539} [${themeManager == null ? void 0 : themeManager.id}] useTheme =>`, state == null ? void 0 : state.name), console.info("returning state", changedThemeState, "from props", props), console.groupEnd()), [
+      return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed(`  \u{1F539} [${themeManager == null ? void 0 : themeManager.id}] useTheme =>`, state == null ? void 0 : state.name), console.info("returning state", changedThemeState.state, changedThemeState.isNewTheme, "from props", props), console.groupEnd()), [
         changedThemeState,
         themeProxied
       ];
@@ -3812,12 +3814,12 @@ If this is intended and you are using Tamagui without any themes, you can disabl
             });
           }, !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);
-            process.env.NODE_ENV === "development" && props.debug === "verbose" && console.info(" \u{1F538} onChange", themeManager.id, {
+            process.env.NODE_ENV === "development" && props.debug === "verbose" && console.info(" \u{1F538} onChange", {
+              id: themeManager.id,
               force,
               shouldTryUpdate,
               props,
               name,
-              manager,
               keys
             }), shouldTryUpdate && setThemeState(function(prev) {
               return createState(prev, force);
@@ -7134,7 +7136,7 @@ var require_getSplitStyles_native = __commonJS({
           }
           var isStyleProp = isValidStyleKeyInit || isMediaOrPseudo1 || isVariant && !noExpand || isShorthand;
           if (!(isStyleProp && (asChild === "except-style" || asChild === "except-style-web"))) {
-            var shouldPassProp = !isStyleProp || // is in parent variants
+            var shouldPassProp = !isStyleProp && isHOC || // is in parent variants
             isHOC && parentVariants && keyInit in parentVariants || (inlineProps == null ? void 0 : inlineProps.has(keyInit)), parentVariant = parentVariants == null ? void 0 : parentVariants[keyInit], isHOCShouldPassThrough = !!(isHOC && (isShorthand || isValidStyleKeyInit || isMediaOrPseudo1 || parentVariant || keyInit in import_skipProps.skipProps)), shouldPassThrough = shouldPassProp || isHOCShouldPassThrough;
             if (process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupEnd(), console.groupEnd(), consoleGroupCollapsed(`  \u{1F511} ${keyOg}${keyInit !== keyOg ? ` (shorthand for ${keyInit})` : ""} ${shouldPassThrough ? "(pass)" : ""}`), (0, import_log.log)({
               isVariant,
@@ -7875,7 +7877,12 @@ var require_themeable_native = __commonJS({
     var import_jsx_runtime = require("react/jsx-runtime"), import_react3 = __toESM2(require("react")), import_Theme = require_Theme_native();
     function themeable(Component, staticConfig) {
       var withThemeComponent = /* @__PURE__ */ import_react3.default.forwardRef(function(props, ref) {
-        var { themeInverse, theme, componentName, themeReset, ...rest } = props, element = (
+        var { themeInverse, theme, componentName, themeReset, ...rest } = props, overriddenContextProps, context = staticConfig == null ? void 0 : staticConfig.context;
+        if (context) for (var key in context.props) {
+          var val = props[key];
+          val !== void 0 && (overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = val);
+        }
+        var element = (
           // @ts-expect-error its ok
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, {
             ref,
@@ -7891,6 +7898,14 @@ var require_themeable_native = __commonJS({
           reset: themeReset,
           children: element
         });
+        if (context) {
+          var Provider = context.Provider, contextValue = import_react3.default.useContext(context);
+          contents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Provider, {
+            ...contextValue,
+            ...overriddenContextProps,
+            children: contents
+          });
+        }
         return contents;
       }), withTheme = withThemeComponent;
       return withTheme.displayName = `Themed(${(Component == null ? void 0 : Component.displayName) || (Component == null ? void 0 : Component.name) || "Anonymous"})`, withTheme;
@@ -8406,15 +8421,16 @@ var require_createComponent_native = __commonJS({
           (_ = (_propsIn_datatestrenders = propsIn["data-test-renders"])[_current = "current"]) !== null && _ !== void 0 || (_propsIn_datatestrenders[_current] = 0), propsIn["data-test-renders"].current += 1;
         }
         var componentContext = import_react3.default.useContext(import_ComponentContext.ComponentContext), styledContextProps, overriddenContextProps, contextValue, { context, isReactNative } = staticConfig;
-        if (context) {
-          contextValue = import_react3.default.useContext(context);
-          var { inverseShorthands } = (0, import_config.getConfig)();
+        if (context && (contextValue = import_react3.default.useContext(context), contextValue)) {
+          process.env.NODE_ENV === "development" && (propsIn.debug || defaultProps != null && defaultProps.debug) && (0, import_log.log)(" \u{1F447} contextValue", contextValue);
           for (var key in context.props) {
-            var _propsIn_key, _ref, _ref1, propVal = (_ref1 = (_ref = (_propsIn_key = propsIn[key]) !== null && _propsIn_key !== void 0 ? _propsIn_key : propsIn[inverseShorthands[key]]) !== null && _ref !== void 0 ? _ref : defaultProps == null ? void 0 : defaultProps[key]) !== null && _ref1 !== void 0 ? _ref1 : defaultProps == null ? void 0 : defaultProps[inverseShorthands[key]];
+            var propVal = propsIn[key];
             if (propVal === void 0) {
               var val = contextValue == null ? void 0 : contextValue[key];
               val !== void 0 && (styledContextProps || (styledContextProps = {}), styledContextProps[key] = val);
-            } else overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = propVal;
+            }
+            var finalVal = propVal ?? (defaultProps == null ? void 0 : defaultProps[key]);
+            finalVal !== void 0 && (overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = finalVal);
           }
         }
         var curDefaultProps = styledContextProps ? {
@@ -8510,10 +8526,7 @@ var require_createComponent_native = __commonJS({
         }
         process.env.NODE_ENV === "development" && time && time`split-styles`, curStateRef.isListeningToTheme = splitStyles.dynamicThemeAccess;
         var hasRuntimeMediaKeys = splitStyles.hasMedia && splitStyles.hasMedia !== !0, shouldListenForMedia = (0, import_createVariable.didGetVariableValue)() || hasRuntimeMediaKeys || noClassNames && splitStyles.hasMedia === !0, mediaListeningKeys = hasRuntimeMediaKeys ? splitStyles.hasMedia : null;
-        process.env.NODE_ENV === "development" && debugProp === "verbose" && console.info("useMedia() createComponent", shouldListenForMedia, mediaListeningKeys), (0, import_useMedia.setMediaShouldUpdate)(stateRef, {
-          enabled: shouldListenForMedia,
-          keys: mediaListeningKeys
-        });
+        process.env.NODE_ENV === "development" && debugProp === "verbose" && console.info("useMedia() createComponent", shouldListenForMedia, mediaListeningKeys), (0, import_useMedia.setMediaShouldUpdate)(stateRef, shouldListenForMedia, mediaListeningKeys);
         var { viewProps: viewPropsIn, pseudos, style: splitStylesStyle, classNames, space } = splitStyles, propsWithAnimation = props, {
           asChild,
           children,
@@ -8539,7 +8552,7 @@ var require_createComponent_native = __commonJS({
           theme: _themeProp,
           ...nonTamaguiProps
         } = viewPropsIn, viewProps = nonTamaguiProps;
-        !isTaggable && props.forceStyle && (viewProps.forceStyle = props.forceStyle), isHOC && _themeProp && (viewProps.theme = _themeProp), elementType.acceptTagProp && (viewProps.tag = tagProp);
+        !isTaggable && props.forceStyle && (viewProps.forceStyle = props.forceStyle), isHOC && _themeProp && (viewProps.theme = _themeProp), tagProp && elementType.acceptTagProp && (viewProps.tag = tagProp);
         var animationStyles, shouldUseAnimation = (
           // if it supports css vars we run it on server too to get matching initial style
           (supportsCSSVars ? willBeAnimatedClient : willBeAnimated) && useAnimations && !isHOC
@@ -9787,20 +9800,20 @@ ${runtimeStyles}`;
           sinceLastCall: !0
         });
       }, _configIn_settings_defaultFont, defaultFontSetting = (_configIn_settings_defaultFont = (_configIn_settings = configIn.settings) === null || _configIn_settings === void 0 ? void 0 : _configIn_settings.defaultFont) !== null && _configIn_settings_defaultFont !== void 0 ? _configIn_settings_defaultFont : configIn.defaultFont, defaultFont = function() {
-        var val2 = defaultFontSetting || // uses font named "body" if present for compat
-        configIn.fonts && ("body" in configIn.fonts ? "body" : "");
-        return !val2 && configIn.fonts && (val2 = Object.keys(configIn.fonts)[0]), (val2 == null ? void 0 : val2[0]) === "$" && (val2 = val2.slice(1)), val2;
-      }(), defaultFontToken = `$${defaultFont}`, config = {
+        var val2 = defaultFontSetting;
+        return (val2 == null ? void 0 : val2[0]) === "$" && (val2 = val2.slice(1)), val2;
+      }(), defaultFontToken = defaultFont ? `$${defaultFont}` : "", unset = {
+        ...configIn.unset
+      };
+      !unset.fontFamily && defaultFont && (unset.fontFamily = defaultFontToken);
+      var config = {
         fonts: {},
         onlyAllowShorthands: !1,
         fontLanguages: [],
         animations: {},
         media: {},
         ...configIn,
-        unset: {
-          fontFamily: defaultFont ? defaultFontToken : void 0,
-          ...configIn.unset
-        },
+        unset,
         settings: {
           // move deprecated settings here so we can reference them all using `getSetting`
           // TODO remove this on v2