tamagui 1.77.0 → 1.78.0

package/dist/native.js

@@ -2649,8 +2649,13 @@ var require_propMapper_native = __commonJS({
     });
     module2.exports = __toCommonJS2(propMapper_exports);
     var import_constants = require_index_native2(), import_helpers = require_index_native4(), import_config = require_config_native(), import_isDevTools = require_isDevTools_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_expandStylesAndRemoveNullishValues = require_expandStylesAndRemoveNullishValues_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), propMapper = (key, value, styleStateIn, subPropsIn) => {
+      var _a;
       if (!import_constants.isAndroid && key === "elevationAndroid")
         return;
+      if (value === "unset") {
+        let unsetVal = (_a = styleStateIn.conf.unset) == null ? void 0 : _a[key];
+        unsetVal != null && (value = unsetVal);
+      }
       let subProps = styleStateIn.styleProps.fallbackProps || subPropsIn, styleState = subProps ? new Proxy(styleStateIn, {
         get(_, k) {
           return k === "curProps" ? subProps : Reflect.get(_, k);
@@ -2667,8 +2672,12 @@ var require_propMapper_native = __commonJS({
           return variantValue;
       }
       let shouldReturn = !1;
-      if (styleProps.disableExpandShorthands || key in conf.shorthands && (shouldReturn = !0, key = conf.shorthands[key]), value && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps.resolveValues, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), shouldReturn || value != null)
-        return (styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value)) || [[key, value]];
+      if (styleProps.disableExpandShorthands || key in conf.shorthands && (shouldReturn = !0, key = conf.shorthands[key]), value && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps.resolveValues, styleState) : (0, import_createVariable.isVariable)(value) && (value = resolveVariableValue(key, value, styleProps.resolveValues))), shouldReturn || value != null) {
+        let result = (styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value)) || [
+          [key, value]
+        ];
+        return key === "fontFamily" && fontFamilyCache.set(result, lastFontFamilyToken), result;
+      }
     }, resolveVariants = (key, value, styleProps, styleState, parentVariantKey) => {
       let { staticConfig, conf, debug } = styleState, { variants } = staticConfig;
       if (!variants)
@@ -2794,7 +2803,7 @@ var require_propMapper_native = __commonJS({
     var fontShorthand = {
       fontSize: "size",
       fontWeight: "weight"
-    }, getTokenForKey = (key, value, resolveAs = "none", styleState) => {
+    }, lastFontFamilyToken = null, getTokenForKey = (key, value, resolveAs = "none", styleState) => {
       var _a, _b;
       if (resolveAs === "none")
         return value;
@@ -2806,7 +2815,7 @@ var require_propMapper_native = __commonJS({
       else {
         switch (key) {
           case "fontFamily": {
-            valOrVar = ((_a = (context != null && context.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed)[value]) == null ? void 0 : _a.family) || value, hasSet = !0;
+            valOrVar = ((_a = (context != null && context.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed)[value]) == null ? void 0 : _a.family) || value, lastFontFamilyToken = value, hasSet = !0;
             break;
           }
           case "fontSize":
@@ -2871,7 +2880,7 @@ var require_getSplitStyles_native = __commonJS({
       useSplitStyles: () => useSplitStyles
     });
     module2.exports = __toCommonJS2(getSplitStyles_exports);
-    var import_constants = require_index_native2(), import_helpers = require_index_native4(), import_react2 = require("react"), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_isDevTools = require_isDevTools_native(), import_useMedia = require_useMedia_native(), import_createMediaStyle = require_createMediaStyle_native(), import_expandStyles = require_expandStyles_native(), import_getGroupPropParts = require_getGroupPropParts_native(), import_getStylesAtomic = require_getStylesAtomic_native(), import_insertStyleRule = require_insertStyleRule_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), fontFamilyKey = "fontFamily", IS_STATIC = process.env.IS_STATIC === "is_static", conf, PROP_SPLIT = "-", getSplitStyles = (props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug) => {
+    var import_constants = require_index_native2(), import_helpers = require_index_native4(), import_react2 = require("react"), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_isDevTools = require_isDevTools_native(), import_useMedia = require_useMedia_native(), import_createMediaStyle = require_createMediaStyle_native(), import_expandStyles = require_expandStyles_native(), import_getGroupPropParts = require_getGroupPropParts_native(), import_getStylesAtomic = require_getStylesAtomic_native(), import_insertStyleRule = require_insertStyleRule_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), IS_STATIC = process.env.IS_STATIC === "is_static", conf, PROP_SPLIT = "-", getSplitStyles = (props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug) => {
       var _a, _b, _c, _e, _f, _g;
       conf = conf || (0, import_config.getConfig)(), import_constants.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
       let { shorthands } = conf, {
@@ -2884,7 +2893,7 @@ var require_getSplitStyles_native = __commonJS({
         parentStaticConfig,
         acceptsClassName
       } = staticConfig, validStyleProps = isText ? import_helpers.stylePropsText : import_helpers.validStyles, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants.isWeb && !styleProps.noClassNames, rulesToInsert = [], classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, style = {}, className = "", mediaStylesSeen = 0, styleState = {
-        curProps: Object.assign({}, props),
+        curProps: { ...props },
         classNames,
         conf,
         props,
@@ -2976,7 +2985,7 @@ var require_getSplitStyles_native = __commonJS({
           parentStaticConfig
         }), console.groupEnd()), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo), !isVariant) || !styleProps.noSkip && keyInit in skipProps)
           continue;
-        if (isText && valInit && (keyInit === fontFamilyKey || keyInit === shorthands[fontFamilyKey]) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit), isValidStyleKeyInit && !variants && (valInitType === "number" || valInitType === "string" && valInit[0] !== "$")) {
+        if (isText && valInit && (keyInit === "fontFamily" || keyInit === shorthands.fontFamily) && valInit in conf.fontsParsed && (styleState.fontFamily = valInit), isValidStyleKeyInit && !variants && (valInitType === "number" || valInitType === "string" && valInit[0] !== "$")) {
           style[keyInit] = valInit;
           continue;
         }
@@ -3169,7 +3178,7 @@ current`, {
                       usedKeys,
                       mediaState3[mediaKeyShort],
                       importanceBump
-                    ), key === fontFamilyKey && (styleState.fontFamily = mediaStyle.fontFamily);
+                    ), key === "fontFamily" && (styleState.fontFamily = mediaStyle.fontFamily);
                   }
                 }
                 continue;
@@ -5224,6 +5233,10 @@ ${runtimeStyles}`;
         animations: {},
         media: {},
         ...configIn,
+        unset: {
+          fontFamily: configIn.defaultFont ? defaultFont : void 0,
+          ...configIn.unset
+        },
         settings: {
           webContainerType: "size",
           ...configIn.settings
@@ -5810,6 +5823,7 @@ var require_Text_native = __commonJS({
       acceptsClassName: !0,
       isText: !0,
       defaultProps: {
+        fontFamily: "unset",
         suppressHighlighting: !0
       },
       inlineWhenUnflattened: /* @__PURE__ */ new Set(["fontFamily"]),
@@ -17876,7 +17890,11 @@ var require_createSwitch_native = __commonJS({
             nativeProps,
             children,
             ...switchProps
-          } = props, native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !import_core13.isWeb && nativeProp === !0 || !import_core13.isWeb && native.includes("mobile") || native.includes("android") && import_react_native4.Platform.OS === "android" || native.includes("ios") && import_react_native4.Platform.OS === "ios", [button, setButton] = React2.useState(null), composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, (node) => setButton(node)), labelId = (0, import_label.useLabelContext)(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React2.useRef(!1), isFormControl = import_core13.isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React2.useState(0), [checked = !1, setChecked] = (0, import_use_controllable_state.useControllableState)({
+          } = props, native = Array.isArray(nativeProp) ? nativeProp : [nativeProp], shouldRenderMobileNative = !import_core13.isWeb && nativeProp === !0 || !import_core13.isWeb && native.includes("mobile") || native.includes("android") && import_react_native4.Platform.OS === "android" || native.includes("ios") && import_react_native4.Platform.OS === "ios", [button, setButton] = React2.useState(null), composedRefs = (0, import_compose_refs.useComposedRefs)(
+            forwardedRef,
+            // @ts-expect-error
+            setButton
+          ), labelId = (0, import_label.useLabelContext)(button), labelledBy = ariaLabelledby || labelId, hasConsumerStoppedPropagationRef = React2.useRef(!1), isFormControl = import_core13.isWeb ? button ? !!button.closest("form") : !0 : !1, [frameWidth, setFrameWidth] = React2.useState(0), [checked = !1, setChecked] = (0, import_use_controllable_state.useControllableState)({
             prop: checkedProp,
             defaultProp: defaultChecked || !1,
             onChange: onCheckedChange,
@@ -17900,6 +17918,7 @@ var require_createSwitch_native = __commonJS({
             /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
               Frame,
               {
+                tag: "button",
                 unstyled,
                 size: size2,
                 checked,