tamagui 1.109.9 → 1.110.1

package/dist/native.js

@@ -7370,32 +7370,19 @@ var require_getVariantExtras_native = __commonJS({
     }
     var cache = /* @__PURE__ */ new WeakMap(), getVariantExtras = function(styleState) {
       if (cache.has(styleState)) return cache.get(styleState);
-      var curProps = styleState.curProps, props = styleState.props, conf = styleState.conf, context = styleState.context, theme = styleState.theme, fonts = conf.fontsParsed;
+      var props = styleState.props, conf = styleState.conf, context = styleState.context, theme = styleState.theme, fonts = conf.fontsParsed;
       context != null && context.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
       var next = {
         fonts,
         tokens: conf.tokensParsed,
         theme,
         get fontFamily() {
-          return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.curProps.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
+          return (0, import_createVariable.getVariableValue)(styleState.fontFamily || styleState.props.fontFamily) || props.fontFamily || (0, import_createVariable.getVariableValue)(styleState.conf.defaultFont);
         },
         get font() {
           return fonts[this.fontFamily] || (!props.fontFamily || props.fontFamily[0] === "$" ? fonts[styleState.conf.defaultFont] : void 0);
         },
-        // TODO do this in splitstlye
-        // we avoid passing in default props for media queries because that would confuse things like SizableText.size:
-        props: new Proxy(props, {
-          // handles shorthands
-          get: function(target, key) {
-            for (var _i = 0, _iter = [
-              key,
-              conf.inverseShorthands[key]
-            ]; _i < _iter.length; _i++) {
-              var tryKey = _iter[_i];
-              if (tryKey) return Reflect.has(curProps, tryKey) ? Reflect.get(curProps, tryKey) : Reflect.get(target, tryKey);
-            }
-          }
-        })
+        props
       };
       return cache.set(styleState, next), next;
     }, fontLanguageCache = /* @__PURE__ */ new WeakMap();
@@ -7652,14 +7639,6 @@ var require_propMapper_native = __commonJS({
     function _array_with_holes(arr) {
       if (Array.isArray(arr)) return arr;
     }
-    function _define_property9(obj, key, value) {
-      return key in obj ? Object.defineProperty(obj, key, {
-        value,
-        enumerable: !0,
-        configurable: !0,
-        writable: !0
-      }) : obj[key] = value, obj;
-    }
     function _iterable_to_array_limit(arr, i) {
       var _i = arr == null ? null : (typeof Symbol > "u" ? "undefined" : _type_of3(Symbol)) < "u" && arr[Symbol.iterator] || arr["@@iterator"];
       if (_i != null) {
@@ -7681,17 +7660,6 @@ var require_propMapper_native = __commonJS({
     function _non_iterable_rest() {
       throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
     }
-    function _object_spread9(target) {
-      for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i] != null ? arguments[i] : {}, ownKeys8 = Object.keys(source);
-        typeof Object.getOwnPropertySymbols == "function" && (ownKeys8 = ownKeys8.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-          return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-        }))), ownKeys8.forEach(function(key) {
-          _define_property9(target, key, source[key]);
-        });
-      }
-      return target;
-    }
     function _sliced_to_array(arr, i) {
       return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array2(arr, i) || _non_iterable_rest();
     }
@@ -7707,21 +7675,17 @@ var require_propMapper_native = __commonJS({
         if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array2(o, minLen);
       }
     }
-    var propMapper = function(key, value, styleStateIn, subPropsIn) {
+    var propMapper = function(key, value, styleState) {
       if (lastFontFamilyToken = null, !(!import_constants4.isAndroid && key === "elevationAndroid")) {
-        var conf = styleStateIn.conf, styleProps = styleStateIn.styleProps, fontFamily = styleStateIn.fontFamily, staticConfig = styleStateIn.staticConfig;
+        var conf = styleState.conf, styleProps = styleState.styleProps, fontFamily = styleState.fontFamily, staticConfig = styleState.staticConfig;
         if (value === "unset") {
           var _conf_unset, unsetVal = (_conf_unset = conf.unset) === null || _conf_unset === void 0 ? void 0 : _conf_unset[key];
           if (unsetVal != null) value = unsetVal;
           else return;
         }
-        var subProps = styleProps.fallbackProps || subPropsIn, styleState = subProps ? new Proxy(styleStateIn, {
-          get: function(_, k) {
-            return k === "curProps" ? subProps : Reflect.get(_, k);
-          }
-        }) : styleStateIn, variants = staticConfig.variants;
+        styleProps.fallbackProps && (styleState.props = styleProps.fallbackProps);
+        var variants = staticConfig.variants;
         if (process.env.NODE_ENV === "development" && fontFamily && fontFamily[0] === "$" && !(fontFamily in conf.fontsParsed) && console.warn('Warning: no fontFamily "'.concat(fontFamily, '" found in config: ').concat(Object.keys(conf.fontsParsed).join(", "))), !styleProps.noExpand && variants && key in variants) {
-          styleState.curProps[key] = value;
           var variantValue = resolveVariants(key, value, styleProps, styleState, "");
           if (variantValue) return variantValue;
         }
@@ -7743,8 +7707,7 @@ var require_propMapper_native = __commonJS({
           key,
           value,
           variantValue,
-          variants,
-          curProps: _object_spread9({}, styleState.curProps)
+          variants
         }), console.groupEnd()), !variantValue) {
           if (process.env.TAMAGUI_WARN_ON_MISSING_VARIANT === "1" && typeof value != "boolean") {
             var name = staticConfig.componentName || "[UnnamedComponent]";
@@ -7793,7 +7756,7 @@ var require_propMapper_native = __commonJS({
         if (!(!styleProps.noSkip && subKey in import_skipProps.skipProps)) {
           if (styleProps.noExpand) res[subKey] = val;
           else if (variants && subKey in variants) {
-            if (styleState.curProps[subKey] = val, parentVariantKey && parentVariantKey === key) res[subKey] = // SYNC WITH *1
+            if (parentVariantKey && parentVariantKey === key) res[subKey] = // SYNC WITH *1
             val[0] === "$" ? getTokenForKey(subKey, val, styleProps.resolveValues, styleState) : val;
             else {
               var variantOut = resolveVariants(subKey, val, styleProps, styleState, key);
@@ -8220,15 +8183,7 @@ var require_getSplitStyles_native = __commonJS({
     }
     var getSplitStyles = function(props, staticConfig, theme, themeName, componentState, styleProps, parentSplitStyles, context, elementType, debug, skipThemeTokenResolution) {
       conf = conf || (0, import_config.getConfig)(), import_constants4.isWeb && styleProps.isAnimated && conf.animations.isReactNative && !styleProps.noNormalize && (styleProps.noNormalize = "values");
-      var shorthands = conf.shorthands, isHOC = staticConfig.isHOC, isText = staticConfig.isText, isInput = staticConfig.isInput, variants = staticConfig.variants, isReactNative = staticConfig.isReactNative, inlineProps = staticConfig.inlineProps, inlineWhenUnflattened = staticConfig.inlineWhenUnflattened, parentStaticConfig = staticConfig.parentStaticConfig, acceptsClassName = staticConfig.acceptsClassName, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.isWeb && !styleProps.noClassNames, rulesToInsert = void 0, classNames = {}, transforms = {}, pseudos = null, space = props.space, hasMedia = !1, dynamicThemeAccess, pseudoGroups, mediaGroups, className = props.className || "", mediaStylesSeen = 0, curPropsState, styleState = {
-        // this should go away, right now we're doing really crazy cumulative props,
-        // as variants are resolved basically we go back and merge the results onto
-        // the curProps, so that each following variant function recieves the current
-        // "styles" with variants expanded. powerful, but i think too fancy
-        // there's some part of the ui kit that depends on it we'd have to find and fix
-        get curProps() {
-          return curPropsState || (curPropsState = {}), curPropsState;
-        },
+      var shorthands = conf.shorthands, isHOC = staticConfig.isHOC, isText = staticConfig.isText, isInput = staticConfig.isInput, variants = staticConfig.variants, isReactNative = staticConfig.isReactNative, inlineProps = staticConfig.inlineProps, inlineWhenUnflattened = staticConfig.inlineWhenUnflattened, parentStaticConfig = staticConfig.parentStaticConfig, acceptsClassName = staticConfig.acceptsClassName, viewProps = {}, mediaState3 = styleProps.mediaState || import_useMedia.mediaState, usedKeys = {}, shouldDoClasses = acceptsClassName && import_constants4.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,
         conf,
         props,
@@ -8482,7 +8437,6 @@ var require_getSplitStyles_native = __commonJS({
               variant: variants == null ? void 0 : variants[keyInit],
               isVariant,
               isHOCShouldPassThrough,
-              curProps: _object_spread9({}, styleState.curProps),
               parentStaticConfig
             })), shouldPassThrough && (passDownProp(viewProps, keyInit, valInit, isMediaOrPseudo1), !isVariant)) {
               process.env.NODE_ENV === "development" && debug === "verbose" && console.groupEnd();
@@ -8510,8 +8464,7 @@ var require_getSplitStyles_native = __commonJS({
                   variant: variants == null ? void 0 : variants[keyInit],
                   shouldPassProp,
                   isHOCShouldPassThrough,
-                  usedKeys: _object_spread9({}, usedKeys),
-                  curProps: _object_spread9({}, styleState.curProps)
+                  usedKeys: _object_spread9({}, usedKeys)
                 }), (0, import_log.log)("expanded", expanded, `
 usedKeys`, _object_spread9({}, usedKeys), `
 current`, _object_spread9({}, styleState.style)));
@@ -8666,11 +8619,11 @@ current`, _object_spread9({}, styleState.style)));
       }
     }
     var getSubStyle = function(styleState, subKey, styleIn, avoidMergeTransform) {
-      var staticConfig = styleState.staticConfig, props = styleState.props, conf2 = styleState.conf, styleProps = styleState.styleProps, styleOut = {};
+      var staticConfig = styleState.staticConfig, conf2 = styleState.conf, styleProps = styleState.styleProps, styleOut = {};
       for (var key in styleIn) {
         var val = styleIn[key];
         key = conf2.shorthands[key] || key;
-        var expanded = (0, import_propMapper.propMapper)(key, val, styleState, _object_spread9({}, props, props[subKey]));
+        var expanded = (0, import_propMapper.propMapper)(key, val, styleState);
         if (!(!expanded || !staticConfig.isHOC && key in import_skipProps.skipProps && !styleProps.noSkip)) {
           var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
           try {
@@ -10065,12 +10018,7 @@ var require_createComponent_native = __commonJS({
           var inverseShorthands = (0, import_config.getConfig)().inverseShorthands;
           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]];
-            if (propVal === void 0) {
-              if (contextValue) {
-                var isValidValue = key in _$validStyles || key in variants;
-                isValidValue && (styledContextProps || (styledContextProps = {}), styledContextProps[key] = contextValue[key]);
-              }
-            } else overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = propVal;
+            propVal === void 0 ? contextValue && (styledContextProps || (styledContextProps = {}), styledContextProps[key] = contextValue[key]) : (overriddenContextProps || (overriddenContextProps = {}), overriddenContextProps[key] = propVal);
           }
         }
         var curDefaultProps = styledContextProps ? _object_spread9({}, defaultProps, styledContextProps) : defaultProps, props = propsIn;