react-native-css 3.0.0-preview.1 → 3.0.0-preview.3

package/dist/commonjs/compiler/declarations.js

@@ -80,6 +80,7 @@ exports.reduceParseUnparsed = reduceParseUnparsed;
 exports.round = round;
 exports.unparsedFunction = unparsedFunction;
 var _colorjs = _interopRequireDefault(require("colorjs.io"));
+var _index = require("../utilities/index.js");
 var _keyframes = require("./keyframes.js");
 var _selectors = require("./selectors.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -89,9 +90,7 @@ const CommaSeparator = Symbol("CommaSeparator");
 const propertyRename = {
   "background-image": "experimental_backgroundImage"
 };
-
-// TODO: We need a better way to handle this
-const unparsedRuntimeParsing = new Set(["animation", "border", "box-shadow", "text-shadow", "transform", "scale", "rotate", "translate"]);
+const unparsedRuntimeParsing = new Set(["animation", "border", "box-shadow", "line-height", "rotate", "scale", "text-shadow", "transform", "translate"]);
 const parsers = {
   "align-content": parseAlignContent,
   "align-items": parseAlignItems,
@@ -197,8 +196,8 @@ const parsers = {
   "font-variant-caps": parseFontVariantCapsDeclaration,
   "font-weight": parseFontWeightDeclaration,
   "gap": parseGap,
-  "height": parseSizeDeclaration,
-  "inline-size": parseSizeDeclaration,
+  "height": parseSizeWithAutoDeclaration,
+  "inline-size": parseSizeWithAutoDeclaration,
   "inset": parseInset,
   "inset-block": parseInsetBlock,
   "inset-block-end": parseLengthPercentageDeclaration,
@@ -274,7 +273,7 @@ const parsers = {
   "user-select": parseUserSelect,
   "vertical-align": parseVerticalAlign,
   "visibility": parseVisibility,
-  "width": parseSizeDeclaration,
+  "width": parseSizeWithAutoDeclaration,
   "z-index": parseZIndex
 };
 
@@ -346,23 +345,25 @@ function parseBorderRadius({
   });
 }
 function parseBorderColor(declaration, builder) {
-  switch (declaration.property) {
-    case "border-color":
-      builder.addShorthand("border-color", {
-        "border-top-color": parseColor(declaration.value.top, builder),
-        "border-bottom-color": parseColor(declaration.value.bottom, builder),
-        "border-left-color": parseColor(declaration.value.left, builder),
-        "border-right-color": parseColor(declaration.value.right, builder)
-      });
-      break;
-    case "border-block-color":
-      builder.addDescriptor("border-top-color", parseColor(declaration.value.start, builder));
-      builder.addDescriptor("border-bottom-color", parseColor(declaration.value.end, builder));
-      break;
-    case "border-inline-color":
-      builder.addDescriptor("border-left-color", parseColor(declaration.value.start, builder));
-      builder.addDescriptor("border-right-color", parseColor(declaration.value.end, builder));
-      break;
+  if (declaration.property === "border-color") {
+    builder.addShorthand("border-color", {
+      "border-top-color": parseColor(declaration.value.top, builder),
+      "border-bottom-color": parseColor(declaration.value.bottom, builder),
+      "border-left-color": parseColor(declaration.value.left, builder),
+      "border-right-color": parseColor(declaration.value.right, builder)
+    });
+  } else {
+    const start = parseColor(declaration.value.start, builder);
+    const end = parseColor(declaration.value.end, builder);
+    if (start === end) {
+      builder.addDescriptor(declaration.property, start);
+    } else if (declaration.property === "border-block-color") {
+      builder.addDescriptor("border-top-color", start);
+      builder.addDescriptor("border-bottom-color", end);
+    } else {
+      builder.addDescriptor("border-left-color", start);
+      builder.addDescriptor("border-right-color", end);
+    }
   }
 }
 function parseBorderWidth({
@@ -617,11 +618,7 @@ function parseLetterSpacing({
   if (value.type === "normal") {
     return;
   }
-  const descriptor = parseLength(value.value, builder);
-  if (Array.isArray(descriptor) && descriptor[1] === "em" && typeof descriptor[2] === "number") {
-    return descriptor[2];
-  }
-  return descriptor;
+  return parseLength(value.value, builder);
 }
 function parseTextDecoration({
   value
@@ -689,7 +686,9 @@ function parseUnparsedDeclaration(declaration, builder) {
       builder.addDescriptor("--__rn-css-em", value);
     }
     if (property === "color") {
-      builder.addDescriptor("--__rn-css-current-color", value);
+      if (!(0, _index.isStyleFunction)(value) || value[1] !== "var" || value[2] !== "-css-color") {
+        builder.addDescriptor("--__rn-css-color", value);
+      }
     }
   }
 }
@@ -698,7 +697,13 @@ function parseCustomDeclaration(declaration, builder) {
   if (property === "-webkit-line-clamp") {
     builder.addDescriptor(property, parseUnparsed(declaration.value.value, builder, property));
   } else if (property === "-rn-ripple-style") {
-    builder.addDescriptor(property, parseUnparsed(declaration.value.value, builder, property) === "borderless");
+    if (parseUnparsed(declaration.value.value, builder, property) === "borderless") {
+      builder.addDescriptor(property, true);
+    }
+  } else if (property === "-rn-ripple-layer") {
+    if (parseUnparsed(declaration.value.value, builder, property) === "foreground") {
+      builder.addDescriptor(property, true);
+    }
   } else if (property === "object-fit") {
     // https://github.com/parcel-bundler/lightningcss/issues/1046
     parseObjectFit(declaration.value, builder);
@@ -776,7 +781,7 @@ function parseUnparsed(tokenOrValue, builder, property, allowAuto = allowAutoPro
     } else if (tokenOrValue === "false") {
       return false;
     } else if (tokenOrValue === "currentcolor") {
-      return [{}, "var", "__rn-css-current-color"];
+      return [{}, "var", "__rn-css-color"];
     } else {
       return tokenOrValue;
     }
@@ -787,8 +792,13 @@ function parseUnparsed(tokenOrValue, builder, property, allowAuto = allowAutoPro
   if (Array.isArray(tokenOrValue)) {
     const args = reduceParseUnparsed(tokenOrValue, builder, property, allowAuto);
     if (!args) return;
-    if (Array.isArray(args) && args.length === 1) return args[0];
-    return args;
+    if (Array.isArray(args) && args.length === 1) {
+      return args[0];
+    } else if ((property === "filter" || property === "transform") && (0, _index.isStyleFunction)(args)) {
+      return [args];
+    } else {
+      return args;
+    }
   }
   switch (tokenOrValue.type) {
     case "unresolved-color":
@@ -877,7 +887,7 @@ function parseUnparsed(tokenOrValue, builder, property, allowAuto = allowAutoPro
               builder.addWarning("value", value);
               return;
             } else if (value === "currentcolor") {
-              return [{}, "var", "__rn-css-current-color"];
+              return [{}, "var", "__rn-css-color"];
             }
             if (value === "true") {
               return true;
@@ -972,9 +982,9 @@ function parseLength(length, builder) {
       case "px":
         {
           if (length.value === Infinity) {
-            return 9999;
+            return Number.MAX_SAFE_INTEGER;
           } else if (length.value === -Infinity) {
-            return -9999;
+            return Number.MIN_SAFE_INTEGER;
           } else {
             // Normalize large values to safe integers, e.g. `calc(infinity * 1px)`
             const value = Math.max(Math.min(length.value, Number.MAX_SAFE_INTEGER), Number.MIN_SAFE_INTEGER);
@@ -1150,7 +1160,9 @@ function parseColorOrAutoDeclaration({
 }
 function parseFontColorDeclaration(declaration, builder) {
   parseColorDeclaration(declaration, builder);
-  builder.addDescriptor("--__rn-css-color", parseColor(declaration.value, builder));
+  if (typeof declaration.value !== "object" || declaration.value.type !== "currentcolor") {
+    builder.addDescriptor("--__rn-css-color", parseColor(declaration.value, builder));
+  }
 }
 function parseColorDeclaration(declaration, builder) {
   builder.addDescriptor(declaration.property, parseColor(declaration.value, builder));
@@ -1169,7 +1181,7 @@ function parseColor(cssColor, builder) {
   } = builder.getOptions();
   switch (cssColor.type) {
     case "currentcolor":
-      return [{}, "var", "__rn-css-current-color"];
+      return [{}, "var", "__rn-css-color"];
     case "light-dark":
       {
         const extraRule = {
@@ -1355,7 +1367,7 @@ function parseJustifyContent(declaration, builder) {
   return value;
 }
 function parseAlignContent(declaration, builder) {
-  const allowed = new Set(["flex-start", "flex-end", "center", "stretch", "space-between", "space-around"]);
+  const allowed = new Set(["flex-start", "flex-end", "center", "stretch", "space-between", "space-around", "space-evenly"]);
   let value;
   switch (declaration.value.type) {
     case "normal":
@@ -1439,7 +1451,7 @@ function parseFontWeight(fontWeight, builder) {
   switch (fontWeight.type) {
     case "absolute":
       if (fontWeight.value.type === "weight") {
-        return fontWeight.value.value.toString();
+        return fontWeight.value.value;
       } else {
         return fontWeight.value.type;
       }
@@ -1460,8 +1472,8 @@ function parseTextShadow(declaration, builder) {
     return;
   }
   builder.addDescriptor("textShadowColor", parseColor(textShadow.color, builder));
-  builder.addDescriptor("textShadowOffset.width", parseLength(textShadow.xOffset, builder));
-  builder.addDescriptor("textShadowOffset.height", parseLength(textShadow.yOffset, builder));
+  builder.addDescriptor("*.textShadowOffset.width", parseLength(textShadow.xOffset, builder));
+  builder.addDescriptor("*.textShadowOffset.height", parseLength(textShadow.yOffset, builder));
   builder.addDescriptor("textShadowRadius", parseLength(textShadow.blur, builder));
 }
 function parseTextDecorationStyle(declaration, builder) {
@@ -1499,7 +1511,7 @@ function parseTextDecorationLine(value, builder) {
 function parsePosition({
   value
 }, builder) {
-  if (value.type === "absolute" || value.type === "relative") {
+  if (value.type === "absolute" || value.type === "relative" || value.type === "static") {
     return value.type;
   }
   builder.addWarning("value", value.type);
@@ -1583,7 +1595,7 @@ function parseFontFamily({
   return value[0];
 }
 function parseLineHeightDeclaration(declaration, builder) {
-  return parseLineHeight(declaration.value, builder);
+  builder.addDescriptor("line-height", [{}, "lineHeight", [parseLineHeight(declaration.value, builder)], 1]);
 }
 function parseLineHeight(value, builder) {
   switch (value.type) {
@@ -1669,16 +1681,20 @@ function parseLengthOrCoercePercentageToRuntime(value, builder) {
 }
 function parseGap(declaration, builder) {
   if ("column" in declaration.value) {
-    builder.addDescriptor("row-gap", parseGapValue(declaration.value.row, builder));
-    builder.addDescriptor("column-gap", parseGapValue(declaration.value.column, builder));
-    return;
-  } else {
-    if (declaration.value.type === "normal") {
-      builder.addWarning("value", declaration.value.type);
-      return;
+    const row = parseGapValue(declaration.value.row, builder);
+    const column = parseGapValue(declaration.value.column, builder);
+    if (row !== column) {
+      builder.addDescriptor("row-gap", row);
+      builder.addDescriptor("column-gap", column);
+    } else {
+      builder.addDescriptor("gap", row);
     }
+  } else if (declaration.value.type === "normal") {
+    builder.addWarning("value", declaration.value.type);
+  } else {
     return parseLength(declaration.value.value, builder);
   }
+  return;
 }
 function parseGapValue(value, builder) {
   if (value.type === "normal") {
@@ -1701,12 +1717,12 @@ function parseBoxShadow({
   value
 }, builder) {
   for (const [index, shadow] of value.entries()) {
-    builder.addDescriptor(`boxShadow.[${index}].color`, parseColor(shadow.color, builder));
-    builder.addDescriptor(`boxShadow.[${index}].offsetX`, parseLength(shadow.xOffset, builder));
-    builder.addDescriptor(`boxShadow.[${index}].offsetY`, parseLength(shadow.yOffset, builder));
-    builder.addDescriptor(`boxShadow.[${index}].blurRadius`, parseLength(shadow.blur, builder));
-    builder.addDescriptor(`boxShadow.[${index}].spreadDistance`, parseLength(shadow.spread, builder));
-    builder.addDescriptor(`boxShadow.[${index}].inset`, shadow.inset ? true : undefined);
+    builder.addDescriptor(`*.boxShadow.[${index}].color`, parseColor(shadow.color, builder));
+    builder.addDescriptor(`*.boxShadow.[${index}].offsetX`, parseLength(shadow.xOffset, builder));
+    builder.addDescriptor(`*.boxShadow.[${index}].offsetY`, parseLength(shadow.yOffset, builder));
+    builder.addDescriptor(`*.boxShadow.[${index}].blurRadius`, parseLength(shadow.blur, builder));
+    builder.addDescriptor(`*.boxShadow.[${index}].spreadDistance`, parseLength(shadow.spread, builder));
+    builder.addDescriptor(`*.boxShadow.[${index}].inset`, shadow.inset ? true : undefined);
   }
 }
 function parseBoxSizing(declaration, builder) {
@@ -1720,7 +1736,7 @@ function parseDisplay({
   value
 }, builder) {
   if (value.type === "keyword") {
-    if (value.value === "none") {
+    if (value.value === "none" || value.value === "contents") {
       return value.value;
     } else {
       builder.addWarning("value", value.value);
@@ -1874,7 +1890,10 @@ function parseEnv(value, builder) {
         case "safe-area-inset-right":
         case "safe-area-inset-bottom":
         case "safe-area-inset-left":
-          return [{}, "var", [`--react-native-css-${value.name.value}`, parseUnparsed(value.fallback, builder, value.name.value)], 1];
+          {
+            const fallback = parseUnparsed(value.fallback, builder, value.name.value);
+            return fallback ? [{}, "var", [`react-native-css-${value.name.value}`, fallback], 1] : [{}, "var", [`react-native-css-${value.name.value}`], 1];
+          }
         case "viewport-segment-width":
         case "viewport-segment-height":
         case "viewport-segment-top":
@@ -2041,7 +2060,7 @@ function equal(a, b) {
   return false;
 }
 function parseTime(time) {
-  return time.type === "milliseconds" ? time.value : time.value * 1000;
+  return round(time.type === "milliseconds" ? time.value : time.value * 1000);
 }
 function parseSize2DDimensionPercentageDeclaration(declaration, builder) {
   return parseSize2DDimensionPercentage(declaration.value, builder);