tamagui 1.90.8 → 1.90.10

package/dist/native.js

@@ -6379,58 +6379,6 @@ var require_getStylesAtomic_native = __commonJS({
   }
 });
 
-// ../web/dist/cjs/helpers/isObj.native.js
-var require_isObj_native = __commonJS({
-  "../web/dist/cjs/helpers/isObj.native.js"(exports2, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
-      for (var name in all)
-        __defProp2(target, name, {
-          get: all[name],
-          enumerable: !0
-        });
-    }, __copyProps2 = function(to, from, except, desc) {
-      var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
-      if (from && typeof from == "object" || typeof from == "function")
-        try {
-          for (var _loop = function() {
-            var key = _step.value;
-            !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, {
-              get: function() {
-                return from[key];
-              },
-              enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
-            });
-          }, _iterator = __getOwnPropNames2(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0)
-            _loop();
-        } catch (err) {
-          _didIteratorError = !0, _iteratorError = err;
-        } finally {
-          try {
-            !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-          } finally {
-            if (_didIteratorError)
-              throw _iteratorError;
-          }
-        }
-      return to;
-    }, __toCommonJS2 = function(mod) {
-      return __copyProps2(__defProp2({}, "__esModule", {
-        value: !0
-      }), mod);
-    }, isObj_exports = {};
-    __export2(isObj_exports, {
-      isObj: function() {
-        return isObj;
-      }
-    });
-    module2.exports = __toCommonJS2(isObj_exports);
-    var isObj = function(x) {
-      return x && !Array.isArray(x) && typeof x == "object";
-    };
-  }
-});
-
 // ../web/dist/cjs/helpers/log.native.js
 var require_log_native = __commonJS({
   "../web/dist/cjs/helpers/log.native.js"(exports2, module2) {
@@ -6791,6 +6739,58 @@ var require_expandStyle_native = __commonJS({
   }
 });
 
+// ../web/dist/cjs/helpers/isObj.native.js
+var require_isObj_native = __commonJS({
+  "../web/dist/cjs/helpers/isObj.native.js"(exports2, module2) {
+    "use strict";
+    var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = function(target, all) {
+      for (var name in all)
+        __defProp2(target, name, {
+          get: all[name],
+          enumerable: !0
+        });
+    }, __copyProps2 = function(to, from, except, desc) {
+      var _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
+      if (from && typeof from == "object" || typeof from == "function")
+        try {
+          for (var _loop = function() {
+            var key = _step.value;
+            !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, {
+              get: function() {
+                return from[key];
+              },
+              enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable
+            });
+          }, _iterator = __getOwnPropNames2(from)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0)
+            _loop();
+        } catch (err) {
+          _didIteratorError = !0, _iteratorError = err;
+        } finally {
+          try {
+            !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+          } finally {
+            if (_didIteratorError)
+              throw _iteratorError;
+          }
+        }
+      return to;
+    }, __toCommonJS2 = function(mod) {
+      return __copyProps2(__defProp2({}, "__esModule", {
+        value: !0
+      }), mod);
+    }, isObj_exports = {};
+    __export2(isObj_exports, {
+      isObj: function() {
+        return isObj;
+      }
+    });
+    module2.exports = __toCommonJS2(isObj_exports);
+    var isObj = function(x) {
+      return x && !Array.isArray(x) && typeof x == "object";
+    };
+  }
+});
+
 // ../web/dist/cjs/helpers/normalizeStyle.native.js
 var require_normalizeStyle_native = __commonJS({
   "../web/dist/cjs/helpers/normalizeStyle.native.js"(exports2, module2) {
@@ -7428,24 +7428,20 @@ var require_propMapper_native = __commonJS({
       fontSize: "size",
       fontWeight: "weight"
     }, lastFontFamilyToken = null, getTokenForKey = function(key, value) {
-      var resolveAs = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "none", styleState = arguments.length > 3 ? arguments[3] : void 0;
+      var resolveAs = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "none", styleState = arguments.length > 3 ? arguments[3] : void 0, _staticConfig_acceptTokens;
       if (resolveAs === "none")
         return value;
-      var theme = styleState.theme, _styleState_conf = styleState.conf, conf = _styleState_conf === void 0 ? (0, import_config.getConfig)() : _styleState_conf, context = styleState.context, fontFamily = styleState.fontFamily, staticConfig = styleState.staticConfig, tokensParsed = conf.tokensParsed, valOrVar, hasSet = !1;
-      if (theme && value in theme) {
-        if (valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose") {
-          var _valOrVar_get;
-          console.info(" - resolving ".concat(key, " to theme value ").concat(value, ": ").concat(valOrVar == null || (_valOrVar_get = valOrVar.get) === null || _valOrVar_get === void 0 ? void 0 : _valOrVar_get.call(valOrVar)));
-        }
-        hasSet = !0;
-      } else if (value in conf.specificTokens)
-        hasSet = !0, valOrVar = conf.specificTokens[value];
+      var theme = styleState.theme, _styleState_conf = styleState.conf, conf = _styleState_conf === void 0 ? (0, import_config.getConfig)() : _styleState_conf, context = styleState.context, fontFamily = styleState.fontFamily, staticConfig = styleState.staticConfig, tokensParsed = conf.tokensParsed, valOrVar, hasSet = !1, customTokenAccept = staticConfig == null || (_staticConfig_acceptTokens = staticConfig.acceptTokens) === null || _staticConfig_acceptTokens === void 0 ? void 0 : _staticConfig_acceptTokens[key];
+      if (customTokenAccept) {
+        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)
+        valOrVar = theme[value], process.env.NODE_ENV === "development" && styleState.debug === "verbose" && console.info(" - resolving ".concat(key, " to theme value ").concat(value, ": ").concat(valOrVar == null ? void 0 : valOrVar.val)), hasSet = !0;
       else {
-        var _staticConfig_acceptTokens, customTokenAccept = staticConfig == null || (_staticConfig_acceptTokens = staticConfig.acceptTokens) === null || _staticConfig_acceptTokens === void 0 ? void 0 : _staticConfig_acceptTokens[key];
-        if (customTokenAccept) {
-          var val = tokensParsed[customTokenAccept][value];
-          val && (valOrVar = val, hasSet = !0);
-        } else {
+        if (value in conf.specificTokens)
+          hasSet = !0, valOrVar = conf.specificTokens[value];
+        else {
           switch (key) {
             case "fontFamily": {
               var _fontsParsed_value, fontsParsed = context != null && context.language ? (0, import_getVariantExtras.getFontsForLanguage)(conf.fontsParsed, context.language) : conf.fontsParsed;
@@ -7615,7 +7611,7 @@ var require_getSplitStyles_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(getSplitStyles_exports);
-    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_react2 = require("react"), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants22 = require_constants_native2(), 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_isObj = require_isObj_native(), import_log = require_log_native(), import_normalizeValueWithProperty = require_normalizeValueWithProperty_native(), import_propMapper = require_propMapper_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_skipProps = require_skipProps_native(), import_transformsToString = require_transformsToString_native();
+    var import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_react2 = require("react"), import_config = require_config_native(), import_accessibilityDirectMap = require_accessibilityDirectMap_native(), import_constants22 = require_constants_native2(), 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(), import_skipProps = require_skipProps_native(), import_transformsToString = require_transformsToString_native();
     function _array_like_to_array2(arr, len) {
       (len == null || len > arr.length) && (len = arr.length);
       for (var i = 0, arr2 = new Array(len); i < len; i++)
@@ -7776,11 +7772,6 @@ var require_getSplitStyles_native = __commonJS({
               viewProps["data-".concat(hyphenate(keyInit1))] = valInit[keyInit1];
             continue;
           }
-          if (!isValidStyleKeyInit && keyInit.startsWith("_style") && (0, import_isObj.isObj)(valInit)) {
-            var _styleState1;
-            (_styleState1 = styleState).style || (_styleState1.style = {}), Object.assign(styleState.style, valInit);
-            continue;
-          }
           if (0) {
             var didUseKeyInit;
             if (!isReactNative)
@@ -8026,12 +8017,12 @@ current`, _object_spread9({}, styleState.style)));
                       }
                     }
                     for (var subKey in mediaStyle1) {
-                      var _styleState2;
+                      var _styleState1;
                       if (subKey === "space") {
                         space = valInit.space;
                         continue;
                       }
-                      (_styleState2 = styleState).style || (_styleState2.style = {}), mergeMediaByImportance(styleState, mediaKeyShort, subKey, mediaStyle1[subKey], usedKeys, mediaState3[mediaKeyShort], importanceBump), key === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
+                      (_styleState1 = styleState).style || (_styleState1.style = {}), mergeMediaByImportance(styleState, mediaKeyShort, subKey, mediaStyle1[subKey], usedKeys, mediaState3[mediaKeyShort], importanceBump), key === "fontFamily" && (styleState.fontFamily = mediaStyle1.fontFamily);
                     }
                   }
                   continue;
@@ -8061,38 +8052,11 @@ current`, _object_spread9({}, styleState.style)));
           }
         }
       }
-      if (props.style)
-        if (isHOC)
-          viewProps.style = props.style;
-        else {
-          var _iteratorNormalCompletion2 = !0, _didIteratorError2 = !1, _iteratorError2 = void 0;
-          try {
-            for (var _iterator2 = [].concat(props.style)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
-              var style1 = _step2.value;
-              if (style1)
-                if (style1.$$css)
-                  Object.assign(styleState.classNames, style1);
-                else {
-                  var _styleState3;
-                  (_styleState3 = styleState).style || (_styleState3.style = {}), Object.assign(styleState.style, style1);
-                }
-            }
-          } catch (err) {
-            _didIteratorError2 = !0, _iteratorError2 = err;
-          } finally {
-            try {
-              !_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
-            } finally {
-              if (_didIteratorError2)
-                throw _iteratorError2;
-            }
-          }
-        }
       var avoidNormalize = styleProps.noNormalize === !1;
       if (!avoidNormalize) {
         if (styleState.style && ((0, import_expandStyles.fixStyles)(styleState.style), import_constants4.isWeb && !staticConfig.isReactNative && (0, import_getStylesAtomic.styleToCSS)(styleState.style)), styleState.flatTransforms) {
-          var _styleState4;
-          (_styleState4 = styleState).style || (_styleState4.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
+          var _styleState2;
+          (_styleState2 = styleState).style || (_styleState2.style = {}), Object.entries(styleState.flatTransforms).sort(function(param, param1) {
             var _param = _sliced_to_array(param, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
             return a.localeCompare(b);
           }).forEach(function(param) {
@@ -8106,8 +8070,8 @@ current`, _object_spread9({}, styleState.style)));
               var val2;
           if (!shouldDoClasses)
             for (var key3 in parentSplitStyles.style) {
-              var _styleState5;
-              key3 in classNames || styleState.style && key3 in styleState.style || ((_styleState5 = styleState).style || (_styleState5.style = {}), styleState.style[key3] = parentSplitStyles.style[key3]);
+              var _styleState3;
+              key3 in classNames || styleState.style && key3 in styleState.style || ((_styleState3 = styleState).style || (_styleState3.style = {}), styleState.style[key3] = parentSplitStyles.style[key3]);
             }
         }
       }
@@ -8117,9 +8081,9 @@ current`, _object_spread9({}, styleState.style)));
         if (styleState.style && shouldDoClasses) {
           var retainedStyles, shouldRetain;
           if (!styleState.style.$$css) {
-            var atomic, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3;
+            var atomic, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2;
             try {
-              for (var _iterator3, _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0)
+              for (var _iterator2, _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0)
                 var atomicStyle, _props_animateOnly, key4, isAnimatedAndAnimateOnly, nonAnimatedAnimateOnly;
             } catch (err) {
             } finally {
@@ -8135,6 +8099,21 @@ current`, _object_spread9({}, styleState.style)));
                 var rule;
             }
         }
+        if (props.style && !isHOC) {
+          var _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3;
+          try {
+            for (var _iterator3, _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) {
+              var style1;
+              if (style1 && !style1.$$css)
+                var _styleState4;
+            }
+          } catch (err) {
+          } finally {
+            try {
+            } finally {
+            }
+          }
+        }
         if (import_constants4.isWeb && !isReactNative && viewProps.tabIndex == null)
           var _viewProps_focusable, isFocusable, role;
       }
@@ -9011,7 +8990,7 @@ var require_createComponent_native = __commonJS({
       }
     });
     module2.exports = __toCommonJS2(createComponent_exports);
-    var import_jsx_runtime6 = require("react/jsx-runtime"), import_compose_refs = require_index_native10(), import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_use_did_finish_ssr = require_index_native11(), import_react2 = __toESM2(require("react")), import_config = require_config_native(), import_constants22 = require_constants_native2(), import_ComponentContext = require_ComponentContext_native(), import_createVariable = require_createVariable_native(), import_defaultComponentState = require_defaultComponentState_native(), import_createShallowSetState = require_createShallowSetState_native(), import_getSplitStyles = require_getSplitStyles_native(), import_isObj = require_isObj_native(), import_log = require_log_native(), import_mergeProps = require_mergeProps_native(), import_themeable = require_themeable_native(), import_useMedia = require_useMedia_native(), import_useTheme = require_useTheme_native(), import_setupHooks = require_setupHooks_native(), import_Slot = require_Slot_native(), import_Theme = require_Theme_native(), import_ThemeDebug = require_ThemeDebug_native();
+    var import_jsx_runtime6 = require("react/jsx-runtime"), import_compose_refs = require_index_native10(), import_constants4 = require_index_native6(), import_helpers = require_index_native7(), import_use_did_finish_ssr = require_index_native11(), import_react2 = __toESM2(require("react")), import_config = require_config_native(), import_constants22 = require_constants_native2(), import_ComponentContext = require_ComponentContext_native(), import_createVariable = require_createVariable_native(), import_defaultComponentState = require_defaultComponentState_native(), import_createShallowSetState = require_createShallowSetState_native(), import_getSplitStyles = require_getSplitStyles_native(), import_isObj = require_isObj_native(), import_log = require_log_native(), import_mergeProps = require_mergeProps_native(), import_themeable = require_themeable_native(), import_useMedia = require_useMedia_native(), import_useTheme = require_useTheme_native(), import_setupHooks = require_setupHooks_native(), import_Slot = require_Slot_native(), import_Theme = require_Theme_native(), import_ThemeDebug = require_ThemeDebug_native(), import_isDevTools = require_isDevTools_native();
     function _array_like_to_array2(arr, len) {
       (len == null || len > arr.length) && (len = arr.length);
       for (var i = 0, arr2 = new Array(len); i < len; i++)
@@ -9757,7 +9736,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
             children: content
           }));
         }
-        if (process.env.NODE_ENV === "development" && debugProp && debugProp !== "profile") {
+        if (viewProps.placeholderTextColor && console.warn("it is", internalID, viewProps.placeholderTextColor, viewProps), process.env.NODE_ENV === "development" && debugProp && debugProp !== "profile") {
           var element1 = typeof elementType == "string" ? elementType : "Component", title = "render <".concat(element1, " /> (").concat(internalID, ") with props");
           if (import_constants4.isWeb) {
             console.groupCollapsed(title);
@@ -9795,7 +9774,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
               console.groupEnd();
             }
           } else {
-            (0, import_log.log)(title), (0, import_log.log)("final styles:");
+            (0, import_log.log)(title), import_isDevTools.isDevTools && (0, import_log.log)("viewProps", viewProps), (0, import_log.log)("final styles:");
             for (var key2 in splitStylesStyle)
               (0, import_log.log)(key2, splitStylesStyle[key2]);
           }
@@ -11397,7 +11376,7 @@ var require_styled_native = __commonJS({
         }
       }(), component = (0, import_createComponent.createComponent)(staticConfigProps || {});
       for (var key in ComponentIn)
-        key in component || (component[key] = ComponentIn[key]);
+        key !== "propTypes" && (key in component || (component[key] = ComponentIn[key]));
       return component;
     }
   }