tamagui 1.90.13 → 1.90.15

package/dist/native.js

@@ -8099,24 +8099,36 @@ current`, _object_spread9({}, styleState.style)));
                 var rule;
             }
         }
-        if (props.style && !isHOC) {
-          var _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3;
+        if (!isReactNative && viewProps.tabIndex == null)
+          var _viewProps_focusable, isFocusable, role;
+      }
+      if (props.style)
+        if (isHOC)
+          viewProps.style = normalizeStyle(props.style);
+        else {
+          var _iteratorNormalCompletion3 = !0, _didIteratorError3 = !1, _iteratorError3 = void 0;
           try {
-            for (var _iterator3, _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) {
-              var style1;
-              if (style1 && !style1.$$css)
-                var _styleState4;
+            for (var _iterator3 = [].concat(props.style)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) {
+              var style1 = _step3.value;
+              if (style1)
+                if (style1.$$css)
+                  Object.assign(styleState.classNames, style1);
+                else {
+                  var _styleState4;
+                  (_styleState4 = styleState).style || (_styleState4.style = {}), Object.assign(styleState.style, normalizeStyle(style1));
+                }
             }
           } catch (err) {
+            _didIteratorError3 = !0, _iteratorError3 = err;
           } finally {
             try {
+              !_iteratorNormalCompletion3 && _iterator3.return != null && _iterator3.return();
             } finally {
+              if (_didIteratorError3)
+                throw _iteratorError3;
             }
           }
         }
-        if (import_constants4.isWeb && !isReactNative && viewProps.tabIndex == null)
-          var _viewProps_focusable, isFocusable, role;
-      }
       var result = {
         space,
         hasMedia,
@@ -8270,6 +8282,14 @@ current`, _object_spread9({}, styleState.style)));
       var importance = (0, import_useMedia.getMediaImportanceIfMoreImportant)(mediaKey, key, importancesUsed, isSizeMedia);
       return importanceBump && (importance = (importance || 0) + importanceBump), importance === null ? !1 : (importancesUsed[key] = importance, mergeStyle(styleState, key, value), !0);
     }
+    function normalizeStyle(style) {
+      var out = {};
+      for (var key in style) {
+        var val = style[key];
+        key in import_helpers.stylePropsTransform ? mergeTransform(out, key, val) : out[key] = (0, import_normalizeValueWithProperty.normalizeValueWithProperty)(val, key);
+      }
+      return import_constants4.isWeb && Array.isArray(out.transform) && (out.transform = (0, import_transformsToString.transformsToString)(out.transform)), (0, import_expandStyles.fixStyles)(out), out;
+    }
   }
 });
 
@@ -12404,14 +12424,7 @@ var require_Text_native = __commonJS({
       inlineWhenUnflattened: /* @__PURE__ */ new Set([
         "fontFamily"
       ]),
-      variants: _object_spread_props8(_object_spread9(_object_spread_props8(_object_spread9({}, !1), {
-        // ??
-        ellipsizeMode: {
-          "...": function() {
-            return null;
-          }
-        }
-      }), !1), {
+      variants: _object_spread_props8(_object_spread9({}, !1, !1), {
         /**
         * @deprecated Use ellipsis instead
         */