@tamagui/core 2.0.0-rc.1 → 2.0.0-rc.1-1770183079077

package/dist/native.cjs

@@ -8382,8 +8382,8 @@ function loadAnimationDriver(name, driver) {
   };
 }
 function getGroupPropParts(groupProp) {
-  var mediaQueries = getMedia(), [_2, name, part3, part4] = groupProp.split("-"), pseudo, media = part3 in mediaQueries ? part3 : void 0;
-  return media ? pseudo = part4 : pseudo = part3, {
+  var m = getMedia(), [_2, name, a, b, c] = groupProp.split("-"), m2 = a && b ? `${a}-${b}` : "", media = m2 && m2 in m && m2 || a && a in m && a || void 0, pseudo = media ? media === m2 ? c : b ? `${b}${c ? `-${c}` : ""}` : void 0 : a ? `${a}${b ? `-${b}` : ""}${c ? `-${c}` : ""}` : void 0;
+  return {
     name,
     pseudo,
     media
@@ -8692,10 +8692,7 @@ var webOnlyStylePropsView = {
   textWrap: true,
   backdropFilter: true,
   WebkitBackdropFilter: true,
-  // These background-* props are web-only CSS, but NOT backgroundColor
   background: true,
-  // CSS border shorthand (e.g., "1px solid red") - RN only supports individual props
-  border: true,
   borderTop: true,
   borderRight: true,
   borderBottom: true,
@@ -8703,7 +8700,6 @@ var webOnlyStylePropsView = {
   backgroundAttachment: true,
   backgroundBlendMode: true,
   backgroundClip: true,
-  // backgroundImage: now cross-platform via experimental_backgroundImage in RN 0.76+
   backgroundOrigin: true,
   backgroundPosition: true,
   backgroundRepeat: true,
@@ -8713,13 +8709,11 @@ var webOnlyStylePropsView = {
   borderLeftStyle: true,
   borderRightStyle: true,
   borderTopStyle: true,
-  // boxSizing: now supported in RN 0.77+ (New Architecture)
   caretColor: true,
   clipPath: true,
   contain: true,
   containerType: true,
   content: true,
-  // cursor: now cross-platform - supported on iOS 17+ (trackpad/stylus) with limited values
   float: true,
   mask: true,
   maskBorder: true,
@@ -8738,10 +8732,8 @@ var webOnlyStylePropsView = {
   maskRepeat: true,
   maskSize: true,
   maskType: true,
-  // mixBlendMode: now supported in RN 0.77+ (New Architecture)
   objectFit: true,
   objectPosition: true,
-  // outline*: now supported in RN 0.77+ (New Architecture)
   overflowBlock: true,
   overflowInline: true,
   overflowX: true,
@@ -9674,6 +9666,31 @@ __spreadValues({}, stylePropsAll);
 function normalizeValueWithProperty(value) {
   return value;
 }
+var borderStyles = /* @__PURE__ */ new Set(["solid", "dashed", "dotted", "double", "groove", "ridge", "inset", "outset", "none", "hidden"]);
+function parseBorderShorthand(value) {
+  if (value === "none" || value === "0") return [["borderTopWidth", 0], ["borderRightWidth", 0], ["borderBottomWidth", 0], ["borderLeftWidth", 0], ["borderStyle", "solid"]];
+  var parts = value.trim().split(/\s+/), borderWidth, borderStyle, borderColor, _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = parts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var part = _step.value;
+      if (borderStyles.has(part)) borderStyle = part;
+      else if (/^[\d.]+(?:px|em|rem|%|pt|vw|vh)?$/.test(part)) {
+        var num = parseFloat(part);
+        borderWidth = part.endsWith("px") || !part.match(/[a-z%]/i) ? num : part;
+      } else borderColor = part;
+    }
+  } catch (err) {
+    _didIteratorError = true, _iteratorError = err;
+  } finally {
+    try {
+      !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+    } finally {
+      if (_didIteratorError) throw _iteratorError;
+    }
+  }
+  var result = [];
+  return borderWidth !== void 0 && (result.push(["borderTopWidth", borderWidth]), result.push(["borderRightWidth", borderWidth]), result.push(["borderBottomWidth", borderWidth]), result.push(["borderLeftWidth", borderWidth])), borderStyle !== void 0 && result.push(["borderStyle", borderStyle]), borderColor !== void 0 && (result.push(["borderTopColor", borderColor]), result.push(["borderRightColor", borderColor]), result.push(["borderBottomColor", borderColor]), result.push(["borderLeftColor", borderColor])), result.length > 0 ? result : void 0;
+}
 var _loop = function(parent) {
   var _exec, _exec_index, prefix = parent.slice(0, (_exec_index = (_exec = /[A-Z]/.exec(parent)) === null || _exec === void 0 ? void 0 : _exec.index) !== null && _exec_index !== void 0 ? _exec_index : parent.length);
   EXPANSIONS[parent] = EXPANSIONS[parent].map(function(k) {
@@ -9693,6 +9710,13 @@ function expandStyle(key, value) {
       return value === "fixed" || value === "sticky" ? [["position", "absolute"]] : void 0;
     case "backgroundImage":
       return [["experimental_backgroundImage", value]];
+    case "border": {
+      if (typeof value == "string") {
+        var parsed = parseBorderShorthand(value);
+        if (parsed) return parsed;
+      }
+      return;
+    }
   }
   if (key in nativeExpansions) return nativeExpansions[key].map(function(k) {
     return [k, value];
@@ -9932,7 +9956,7 @@ var propMapper = function(key, value, styleState, disabled, map) {
     }
     styleProps2.disableExpandShorthands || key in conf2.shorthands && (key = conf2.shorthands[key]);
     var originalValue = value;
-    if (value != null && (typeof value == "string" && value[0] === "$" ? value = getTokenForKey(key, value, styleProps2, styleState) : (key === "boxShadow" || key === "textShadow" || key === "filter" || key === "backgroundImage") && typeof value == "string" && value.includes("$") ? value = value.replace(/(\$[\w.-]+)/g, function(t) {
+    if (value != null && (typeof value == "string" && value[0] === "$" ? value = getTokenForKey(key, value, styleProps2, styleState) : (key === "boxShadow" || key === "textShadow" || key === "filter" || key === "backgroundImage" || key === "border") && typeof value == "string" && value.includes("$") ? value = value.replace(/(\$[\w.-]+)/g, function(t) {
       var r = getTokenForKey("size", t, styleProps2, styleState);
       return r == null && (r = getTokenForKey("color", t, styleProps2, styleState)), r != null ? String(r) : t;
     }) : isVariable(value) ? value = resolveVariableValue(key, value, styleProps2.resolveValues) : isRemValue(value) && (value = resolveRem(value))), value != null) {

package/dist/test.native.cjs

@@ -317,8 +317,8 @@ function loadAnimationDriver(name, driver) {
   };
 }
 function getGroupPropParts(groupProp) {
-  var mediaQueries = getMedia(), [_2, name, part3, part4] = groupProp.split("-"), pseudo, media = part3 in mediaQueries ? part3 : void 0;
-  return media ? pseudo = part4 : pseudo = part3, {
+  var m = getMedia(), [_2, name, a, b, c] = groupProp.split("-"), m2 = a && b ? `${a}-${b}` : "", media = m2 && m2 in m && m2 || a && a in m && a || void 0, pseudo = media ? media === m2 ? c : b ? `${b}${c ? `-${c}` : ""}` : void 0 : a ? `${a}${b ? `-${b}` : ""}${c ? `-${c}` : ""}` : void 0;
+  return {
     name,
     pseudo,
     media
@@ -627,10 +627,7 @@ var webOnlyStylePropsView = {
   textWrap: true,
   backdropFilter: true,
   WebkitBackdropFilter: true,
-  // These background-* props are web-only CSS, but NOT backgroundColor
   background: true,
-  // CSS border shorthand (e.g., "1px solid red") - RN only supports individual props
-  border: true,
   borderTop: true,
   borderRight: true,
   borderBottom: true,
@@ -638,7 +635,6 @@ var webOnlyStylePropsView = {
   backgroundAttachment: true,
   backgroundBlendMode: true,
   backgroundClip: true,
-  // backgroundImage: now cross-platform via experimental_backgroundImage in RN 0.76+
   backgroundOrigin: true,
   backgroundPosition: true,
   backgroundRepeat: true,
@@ -648,13 +644,11 @@ var webOnlyStylePropsView = {
   borderLeftStyle: true,
   borderRightStyle: true,
   borderTopStyle: true,
-  // boxSizing: now supported in RN 0.77+ (New Architecture)
   caretColor: true,
   clipPath: true,
   contain: true,
   containerType: true,
   content: true,
-  // cursor: now cross-platform - supported on iOS 17+ (trackpad/stylus) with limited values
   float: true,
   mask: true,
   maskBorder: true,
@@ -673,10 +667,8 @@ var webOnlyStylePropsView = {
   maskRepeat: true,
   maskSize: true,
   maskType: true,
-  // mixBlendMode: now supported in RN 0.77+ (New Architecture)
   objectFit: true,
   objectPosition: true,
-  // outline*: now supported in RN 0.77+ (New Architecture)
   overflowBlock: true,
   overflowInline: true,
   overflowX: true,
@@ -2153,6 +2145,31 @@ __spreadValues({}, stylePropsAll);
 function normalizeValueWithProperty(value) {
   return value;
 }
+var borderStyles = /* @__PURE__ */ new Set(["solid", "dashed", "dotted", "double", "groove", "ridge", "inset", "outset", "none", "hidden"]);
+function parseBorderShorthand(value) {
+  if (value === "none" || value === "0") return [["borderTopWidth", 0], ["borderRightWidth", 0], ["borderBottomWidth", 0], ["borderLeftWidth", 0], ["borderStyle", "solid"]];
+  var parts = value.trim().split(/\s+/), borderWidth, borderStyle, borderColor, _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = parts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var part = _step.value;
+      if (borderStyles.has(part)) borderStyle = part;
+      else if (/^[\d.]+(?:px|em|rem|%|pt|vw|vh)?$/.test(part)) {
+        var num = parseFloat(part);
+        borderWidth = part.endsWith("px") || !part.match(/[a-z%]/i) ? num : part;
+      } else borderColor = part;
+    }
+  } catch (err) {
+    _didIteratorError = true, _iteratorError = err;
+  } finally {
+    try {
+      !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+    } finally {
+      if (_didIteratorError) throw _iteratorError;
+    }
+  }
+  var result = [];
+  return borderWidth !== void 0 && (result.push(["borderTopWidth", borderWidth]), result.push(["borderRightWidth", borderWidth]), result.push(["borderBottomWidth", borderWidth]), result.push(["borderLeftWidth", borderWidth])), borderStyle !== void 0 && result.push(["borderStyle", borderStyle]), borderColor !== void 0 && (result.push(["borderTopColor", borderColor]), result.push(["borderRightColor", borderColor]), result.push(["borderBottomColor", borderColor]), result.push(["borderLeftColor", borderColor])), result.length > 0 ? result : void 0;
+}
 var _loop = function(parent) {
   var _exec, _exec_index, prefix = parent.slice(0, (_exec_index = (_exec = /[A-Z]/.exec(parent)) === null || _exec === void 0 ? void 0 : _exec.index) !== null && _exec_index !== void 0 ? _exec_index : parent.length);
   EXPANSIONS[parent] = EXPANSIONS[parent].map(function(k) {
@@ -2172,6 +2189,13 @@ function expandStyle(key, value) {
       return value === "fixed" || value === "sticky" ? [["position", "absolute"]] : void 0;
     case "backgroundImage":
       return [["experimental_backgroundImage", value]];
+    case "border": {
+      if (typeof value == "string") {
+        var parsed = parseBorderShorthand(value);
+        if (parsed) return parsed;
+      }
+      return;
+    }
   }
   if (key in nativeExpansions) return nativeExpansions[key].map(function(k) {
     return [k, value];
@@ -2412,7 +2436,7 @@ var propMapper = function(key, value, styleState, disabled, map) {
     }
     styleProps.disableExpandShorthands || key in conf2.shorthands && (key = conf2.shorthands[key]);
     var originalValue = value;
-    if (value != null && (typeof value == "string" && value[0] === "$" ? value = getTokenForKey(key, value, styleProps, styleState) : (key === "boxShadow" || key === "textShadow" || key === "filter" || key === "backgroundImage") && typeof value == "string" && value.includes("$") ? value = value.replace(/(\$[\w.-]+)/g, function(t) {
+    if (value != null && (typeof value == "string" && value[0] === "$" ? value = getTokenForKey(key, value, styleProps, styleState) : (key === "boxShadow" || key === "textShadow" || key === "filter" || key === "backgroundImage" || key === "border") && typeof value == "string" && value.includes("$") ? value = value.replace(/(\$[\w.-]+)/g, function(t) {
       var r = getTokenForKey("size", t, styleProps, styleState);
       return r == null && (r = getTokenForKey("color", t, styleProps, styleState)), r != null ? String(r) : t;
     }) : isVariable(value) ? value = resolveVariableValue(key, value, styleProps.resolveValues) : isRemValue(value) && (value = resolveRem(value))), value != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/core",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.1-1770183079077",
   "gitHead": "a49cc7ea6b93ba384e77a4880ae48ac4a5635c14",
   "license": "MIT",
   "author": {
@@ -82,17 +82,17 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/helpers": "2.0.0-rc.1",
-    "@tamagui/react-native-media-driver": "2.0.0-rc.1",
-    "@tamagui/react-native-use-pressable": "2.0.0-rc.1",
-    "@tamagui/use-element-layout": "2.0.0-rc.1",
-    "@tamagui/use-event": "2.0.0-rc.1",
-    "@tamagui/web": "2.0.0-rc.1"
+    "@tamagui/helpers": "2.0.0-rc.1-1770183079077",
+    "@tamagui/react-native-media-driver": "2.0.0-rc.1-1770183079077",
+    "@tamagui/react-native-use-pressable": "2.0.0-rc.1-1770183079077",
+    "@tamagui/use-element-layout": "2.0.0-rc.1-1770183079077",
+    "@tamagui/use-event": "2.0.0-rc.1-1770183079077",
+    "@tamagui/web": "2.0.0-rc.1-1770183079077"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-rc.1",
-    "@tamagui/native-bundle": "2.0.0-rc.1",
-    "@tamagui/react-native-web-lite": "2.0.0-rc.1",
+    "@tamagui/build": "2.0.0-rc.1-1770183079077",
+    "@tamagui/native-bundle": "2.0.0-rc.1-1770183079077",
+    "@tamagui/react-native-web-lite": "2.0.0-rc.1-1770183079077",
     "@testing-library/react": "^16.1.0",
     "csstype": "^3.0.10",
     "react": ">=19",