react-native-css 3.0.0-nightly.26b272f → 3.0.0-nightly.46bc0ab

package/src/compiler/declarations.ts

@@ -62,12 +62,16 @@ const propertyRename: Record<string, string> = {
   "background-image": "experimental_backgroundImage",
 };
 
+// TODO: We need a better way to handle this
 const unparsedRuntimeParsing = new Set([
   "animation",
+  "border",
+  "box-shadow",
   "text-shadow",
   "transform",
-  "box-shadow",
-  "border",
+  "scale",
+  "rotate",
+  "translate",
 ]);
 
 const parsers: {
@@ -142,7 +146,7 @@ const parsers: {
   "border-width": parseBorderWidth,
   "bottom": parseSizeDeclaration,
   "box-shadow": parseBoxShadow,
-  "caret-color": parseColorOrAuto,
+  "caret-color": parseColorOrAutoDeclaration,
   "color": parseFontColorDeclaration,
   "column-gap": parseGap,
   "container": parseContainer,
@@ -263,9 +267,9 @@ export function parseDeclaration(
   }
 
   if (declaration.property === "unparsed") {
-    parseDeclarationUnparsed(declaration, builder);
+    parseUnparsedDeclaration(declaration, builder);
   } else if (declaration.property === "custom") {
-    parseDeclarationCustom(declaration, builder);
+    parseCustomDeclaration(declaration, builder);
   } else {
     parseWithParser(declaration, builder);
   }
@@ -666,22 +670,22 @@ function parseTransform(
 ) {
   builder.addDescriptor("transform", [
     {},
-    "@transform",
+    "transform",
     value.flatMap((t): StyleDescriptor[] => {
       switch (t.type) {
         case "perspective":
-          return [[{}, "@perspective", parseLength(t.value, builder)]];
+          return [[{}, "perspective", parseLength(t.value, builder)]];
         case "translate":
           return [
             [
               {},
-              "@translateX",
+              "translateX",
               parseLengthOrCoercePercentageToRuntime(t.value[0], builder),
             ],
             [
               [
                 {},
-                "@translateY",
+                "translateY",
                 parseLengthOrCoercePercentageToRuntime(t.value[1], builder),
               ],
             ],
@@ -690,7 +694,7 @@ function parseTransform(
           return [
             [
               {},
-              "@translateX",
+              "translateX",
               parseLengthOrCoercePercentageToRuntime(t.value, builder),
             ],
           ];
@@ -698,22 +702,22 @@ function parseTransform(
           return [
             [
               {},
-              "@translateY",
+              "translateY",
               parseLengthOrCoercePercentageToRuntime(t.value, builder),
             ],
           ];
         case "rotate":
-          return [[{}, "@rotate", parseAngle(t.value, builder)]];
+          return [[{}, "rotate", parseAngle(t.value, builder)]];
         case "rotateX":
-          return [[{}, "@rotateX", parseAngle(t.value, builder)]];
+          return [[{}, "rotateX", parseAngle(t.value, builder)]];
         case "rotateY":
-          return [[{}, "@rotateY", parseAngle(t.value, builder)]];
+          return [[{}, "rotateY", parseAngle(t.value, builder)]];
         case "rotateZ":
-          return [[{}, "@rotateZ", parseAngle(t.value, builder)]];
+          return [[{}, "rotateZ", parseAngle(t.value, builder)]];
         case "scale":
           return [
-            [{}, "@scaleX", parseLength(t.value[0], builder)],
-            [{}, "@scaleY", parseLength(t.value[1], builder)],
+            [{}, "scaleX", parseLength(t.value[0], builder)],
+            [{}, "scaleY", parseLength(t.value[1], builder)],
           ];
         case "scaleX":
           return [[{}, "scaleX", parseLength(t.value, builder)]];
@@ -762,21 +766,29 @@ function parseRotate(
   { value }: DeclarationType<"rotate">,
   builder: StylesheetBuilder,
 ) {
-  builder.addDescriptor("rotateX", [
-    {},
-    "rotateX",
-    parseAngle(value.x, builder),
-  ]);
-  builder.addDescriptor("rotateY", [
-    {},
-    "rotateY",
-    parseAngle(value.y, builder),
-  ]);
-  builder.addDescriptor("rotateZ", [
-    {},
-    "rotateZ",
-    parseAngle(value.z, builder),
-  ]);
+  if (value.x) {
+    builder.addDescriptor("rotateX", [
+      {},
+      "rotateX",
+      parseAngle(value.angle, builder),
+    ]);
+  }
+
+  if (value.y) {
+    builder.addDescriptor("rotateY", [
+      {},
+      "rotateY",
+      parseAngle(value.angle, builder),
+    ]);
+  }
+
+  if (value.z) {
+    builder.addDescriptor("rotateZ", [
+      {},
+      "rotateZ",
+      parseAngle(value.angle, builder),
+    ]);
+  }
 }
 
 function parseScale(
@@ -853,7 +865,11 @@ function parseZIndex(
   }
 }
 
-function parseContainerType(_value: unknown, _builder: StylesheetBuilder) {
+function parseContainerType(
+  _declaration: DeclarationType<"container-type">,
+  builder: StylesheetBuilder,
+) {
+  builder.addContainer(["___default___"]);
   return;
 }
 
@@ -873,7 +889,7 @@ function parseContainer(
   return;
 }
 
-export function parseDeclarationUnparsed(
+export function parseUnparsedDeclaration(
   declaration: Extract<Declaration, { property: "unparsed" }>,
   builder: StylesheetBuilder,
 ) {
@@ -900,24 +916,15 @@ export function parseDeclarationUnparsed(
   builder.descriptorProperty = property;
 
   if (unparsedRuntimeParsing.has(property)) {
-    const args = parseUnparsed(declaration.value.value, builder);
+    const args = parseUnparsed(declaration.value.value, builder, property);
 
     if (property === "animation") {
-      builder.addDescriptor("animation", [
-        {},
-        `@${toRNProperty(property)}`,
-        args,
-      ]);
+      builder.addDescriptor("animation", [{}, property, args]);
     } else {
-      builder.addDescriptor(property, [
-        {},
-        `@${toRNProperty(property)}`,
-        args,
-        1,
-      ]);
+      builder.addDescriptor(property, [{}, toRNProperty(property), args, 1]);
     }
   } else {
-    const value = parseUnparsed(declaration.value.value, builder);
+    const value = parseUnparsed(declaration.value.value, builder, property);
 
     builder.addDescriptor(property, value);
 
@@ -931,26 +938,31 @@ export function parseDeclarationUnparsed(
   }
 }
 
-export function parseDeclarationCustom(
+export function parseCustomDeclaration(
   declaration: Extract<Declaration, { property: "custom" }>,
   builder: StylesheetBuilder,
 ) {
   const property = declaration.value.name;
-  if (
+
+  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",
+    );
+  } else if (
     validProperties.has(property) ||
     property.startsWith("--") ||
     property.startsWith("-rn-")
   ) {
-    builder.setWarningProperty(property);
     builder.addDescriptor(
       property,
-      parseUnparsed(declaration.value.value, builder, allowAuto.has(property)),
-    );
-  } else if (property === "-webkit-line-clamp") {
-    builder.addMapping({ [property]: ["numberOfLines"] });
-    builder.addDescriptor(
-      property,
-      parseUnparsed(declaration.value.value, builder, allowAuto.has(property)),
+      parseUnparsed(declaration.value.value, builder, property),
     );
   } else {
     builder.addWarning("property", declaration.value.name);
@@ -960,9 +972,13 @@ export function parseDeclarationCustom(
 export function reduceParseUnparsed(
   tokenOrValues: TokenOrValue[],
   builder: StylesheetBuilder,
+  property: string,
+  allowAuto: boolean,
 ): StyleDescriptor {
   const result = tokenOrValues
-    .map((tokenOrValue) => parseUnparsed(tokenOrValue, builder))
+    .map((tokenOrValue) =>
+      parseUnparsed(tokenOrValue, builder, property, allowAuto),
+    )
     .filter((v) => v !== undefined);
 
   if (result.length === 0) {
@@ -981,6 +997,8 @@ export function reduceParseUnparsed(
     }
   }
 
+  // Groups are the tokens grouped together by comma location
+  // If a group only has 1 item, it shouldn't be an array
   groups = groups.flatMap((group): StyleDescriptor[] => {
     if (!Array.isArray(group)) {
       return [];
@@ -996,6 +1014,17 @@ export function reduceParseUnparsed(
       } else {
         return [first];
       }
+    } else if (
+      // This is a special case for <ratio> values
+      group.includes("/") &&
+      group.every((item) =>
+        typeof item === "string" && item === "/"
+          ? item
+          : typeof item === "number",
+      )
+    ) {
+      // eslint-disable-next-line @typescript-eslint/no-base-to-string
+      return [group.join(" ")];
     } else {
       return [group];
     }
@@ -1007,11 +1036,13 @@ export function reduceParseUnparsed(
 export function unparsedFunction(
   token: Extract<TokenOrValue, { type: "function" }>,
   builder: StylesheetBuilder,
+  property: string,
+  allowAuto: boolean,
 ): StyleFunction {
   return [
     {},
-    token.value.name,
-    reduceParseUnparsed(token.value.arguments, builder),
+    toRNProperty(token.value.name),
+    reduceParseUnparsed(token.value.arguments, builder, property, allowAuto),
   ];
 }
 
@@ -1028,7 +1059,8 @@ export function parseUnparsed(
     | undefined
     | null,
   builder: StylesheetBuilder,
-  allowAuto = false,
+  property: string,
+  allowAuto = allowAutoProperties.has(property),
 ): StyleDescriptor {
   if (tokenOrValue === undefined || tokenOrValue === null) {
     return;
@@ -1051,7 +1083,12 @@ export function parseUnparsed(
   }
 
   if (Array.isArray(tokenOrValue)) {
-    const args = reduceParseUnparsed(tokenOrValue, builder);
+    const args = reduceParseUnparsed(
+      tokenOrValue,
+      builder,
+      property,
+      allowAuto,
+    );
     if (!args) return;
     if (Array.isArray(args) && args.length === 1) return args[0];
     return args;
@@ -1059,11 +1096,21 @@ export function parseUnparsed(
 
   switch (tokenOrValue.type) {
     case "unresolved-color": {
-      return parseUnresolvedColor(tokenOrValue.value, builder);
+      return parseUnresolvedColor(
+        tokenOrValue.value,
+        builder,
+        property,
+        allowAuto,
+      );
     }
     case "var": {
       let args: StyleDescriptor = tokenOrValue.value.name.ident.slice(2);
-      const fallback = parseUnparsed(tokenOrValue.value.fallback, builder);
+      const fallback = parseUnparsed(
+        tokenOrValue.value.fallback,
+        builder,
+        property,
+        allowAuto,
+      );
       if (fallback !== undefined) {
         args = [args, fallback];
       }
@@ -1072,44 +1119,53 @@ export function parseUnparsed(
     }
     case "function": {
       switch (tokenOrValue.value.name) {
-        case "translate":
-        case "rotate":
-        case "rotateX":
-        case "rotateY":
-        case "skewX":
-        case "skewY":
-        case "scale":
-        case "scaleX":
-        case "scaleY":
-        case "translateX":
-        case "translateY":
-          tokenOrValue.value.name = `@${tokenOrValue.value.name}`;
-          return unparsedFunction(tokenOrValue, builder);
         case "blur":
         case "brightness":
         case "contrast":
         case "cubic-bezier":
         case "drop-shadow":
         case "fontScale":
+        case "getPixelSizeForLayoutSize":
         case "grayscale":
         case "hsl":
         case "hsla":
         case "hue-rotate":
         case "invert":
-        case "linear-gradient":
         case "opacity":
         case "pixelScale":
-        case "pixelSizeForLayoutSize":
         case "platformColor":
-        case "radial-gradient":
         case "rgb":
         case "rgba":
+        case "rotate":
+        case "rotateX":
+        case "rotateY":
         case "roundToNearestPixel":
         case "saturate":
+        case "scale":
+        case "scaleX":
+        case "scaleY":
         case "sepia":
         case "shadow":
+        case "skewX":
+        case "skewY":
         case "steps":
-          return unparsedFunction(tokenOrValue, builder);
+        case "translate":
+        case "translateX":
+        case "translateY":
+          return unparsedFunction(tokenOrValue, builder, property, allowAuto);
+        case "linear-gradient":
+        case "radial-gradient":
+          // These are special as React Native requires the '-' in their name
+          return [
+            {},
+            tokenOrValue.value.name,
+            reduceParseUnparsed(
+              tokenOrValue.value.arguments,
+              builder,
+              property,
+              allowAuto,
+            ),
+          ];
         case "hairlineWidth":
           return [{}, tokenOrValue.value.name, []];
         case "calc":
@@ -1120,6 +1176,7 @@ export function parseUnparsed(
             tokenOrValue.value.name,
             tokenOrValue.value.arguments,
             builder,
+            property,
           );
         default: {
           builder.addWarning("value", `${tokenOrValue.value.name}()`);
@@ -1152,6 +1209,8 @@ export function parseUnparsed(
             return true;
           } else if (value === "false") {
             return false;
+          } else if (value === "infinity") {
+            return Number.MAX_SAFE_INTEGER;
           } else {
             return value;
           }
@@ -1168,11 +1227,16 @@ export function parseUnparsed(
           return parseDimension(tokenOrValue.value, builder);
         case "comma":
           return CommaSeparator as unknown as StyleDescriptor;
+        case "delim": {
+          if (tokenOrValue.value.value === "/") {
+            return tokenOrValue.value.value;
+          }
+          return;
+        }
         case "at-keyword":
         case "hash":
         case "id-hash":
         case "unquoted-url":
-        case "delim":
         case "white-space":
         case "comment":
         case "colon":
@@ -1254,7 +1318,12 @@ export function parseLength(
         } else if (length.value === -Infinity) {
           return -9999;
         } else {
-          return round(length.value);
+          // 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,
+          );
+          return round(value);
         }
       }
       case "rem":
@@ -1432,7 +1501,7 @@ export function parseSize(
   return;
 }
 
-export function parseColorOrAuto(
+export function parseColorOrAutoDeclaration(
   { value }: { value: ColorOrAuto },
   builder: StylesheetBuilder,
 ) {
@@ -2399,7 +2468,6 @@ export function parseSVGPaint(
     return;
   }
 
-  builder.addMapping({ [property]: [property] });
   builder.addDescriptor(property, parsedValue);
 }
 
@@ -2420,7 +2488,7 @@ export function parseDimensionPercentageFor_LengthValue(
   }
 }
 
-const allowAuto = new Set(["pointer-events"]);
+const allowAutoProperties = new Set(["pointer-events"]);
 
 export function parseEnv(
   value: EnvironmentVariable,
@@ -2438,7 +2506,7 @@ export function parseEnv(
             "var",
             [
               `--react-native-css-${value.name.value}`,
-              parseUnparsed(value.fallback, builder),
+              parseUnparsed(value.fallback, builder, value.name.value),
             ],
             1,
           ];
@@ -2461,8 +2529,9 @@ export function parseCalcFn(
   name: string,
   tokens: TokenOrValue[],
   builder: StylesheetBuilder,
+  property: string,
 ): StyleDescriptor {
-  const args = parseCalcArguments(tokens, builder);
+  const args = parseCalcArguments(tokens, builder, property);
   if (args) {
     return [{}, name, args];
   }
@@ -2473,6 +2542,7 @@ export function parseCalcFn(
 export function parseCalcArguments(
   [...args]: TokenOrValue[],
   builder: StylesheetBuilder,
+  property: string,
 ) {
   const parsed: StyleDescriptor[] = [];
 
@@ -2487,7 +2557,7 @@ export function parseCalcArguments(
       case "var":
       case "function":
       case "unresolved-color": {
-        const value = parseUnparsed(arg, builder);
+        const value = parseUnparsed(arg, builder, property);
 
         if (value === undefined) {
           return undefined;
@@ -2563,7 +2633,7 @@ export function parseCalcArguments(
               // Then drop the surrounding parenthesis
               .slice(1, -1);
 
-            parsed.push(parseCalcFn("calc", innerCalcArgs, builder));
+            parsed.push(parseCalcFn("calc", innerCalcArgs, builder, property));
 
             break;
           }
@@ -2616,6 +2686,8 @@ export function parseTranslateProp(
 export function parseUnresolvedColor(
   color: UnresolvedColor,
   builder: StylesheetBuilder,
+  property: string,
+  allowAuto: boolean,
 ): StyleDescriptor {
   switch (color.type) {
     case "rgb":
@@ -2626,26 +2698,31 @@ export function parseUnresolvedColor(
           round(color.r * 255),
           round(color.g * 255),
           round(color.b * 255),
-          parseUnparsed(color.alpha, builder),
+          parseUnparsed(color.alpha, builder, property),
         ],
       ];
     case "hsl":
       return [
         {},
         color.type,
-        [color.h, color.s, color.l, parseUnparsed(color.alpha, builder)],
+        [
+          color.h,
+          color.s,
+          color.l,
+          parseUnparsed(color.alpha, builder, property),
+        ],
       ];
     case "light-dark": {
       const extraRule = builder.extendRule({
         m: [["=", "prefers-color-scheme", "dark"]],
       });
       builder.addUnnamedDescriptor(
-        reduceParseUnparsed(color.dark, builder),
+        reduceParseUnparsed(color.dark, builder, property, allowAuto),
         false,
         extraRule,
       );
       builder.addExtraRule(extraRule);
-      return reduceParseUnparsed(color.light, builder);
+      return reduceParseUnparsed(color.light, builder, property, allowAuto);
     }
     default:
       color satisfies never;
@@ -2891,7 +2968,7 @@ function parseGradient(
     case "linear": {
       return [
         {},
-        "@linear-gradient",
+        "linear-gradient",
         [
           parseLineDirection(gradient.direction, builder),
           ...gradient.items.map((item) => parseGradientItem(item, builder)),
@@ -2968,6 +3045,16 @@ function parseFilter(
             [value.type]: parseAngle(value.value, builder),
           } as unknown as StyleDescriptor;
         case "drop-shadow":
+          return [
+            {},
+            toRNProperty(value.type),
+            [
+              parseLength(value.value.xOffset, builder),
+              parseLength(value.value.yOffset, builder),
+              parseLength(value.value.blur, builder),
+              parseColor(value.value.color, builder),
+            ],
+          ] as unknown as StyleDescriptor;
         case "url":
           return;
       }

package/src/compiler/keyframes.ts

@@ -30,7 +30,7 @@ export function parseEasingFunction(
       case "cubic-bezier":
         return [
           {},
-          "cubic-bezier",
+          "cubicBezier",
           [value.x1, value.y1, value.x2, value.y2],
         ] as const;
       case "steps":

package/src/compiler/stylesheet.ts

@@ -32,6 +32,8 @@ const staticDeclarations = new WeakMap<
 
 const extraRules = new WeakMap<StyleRule, Partial<StyleRule>[]>();
 
+const keywords = new Set(["unset"]);
+
 export class StylesheetBuilder {
   animationFrames?: AnimationKeyframes_V2[];
   animationDeclarations: StyleDeclaration[] = [];
@@ -50,6 +52,7 @@ export class StylesheetBuilder {
     private ruleTemplate: StyleRule = {
       s: [],
     },
+    // Any default mapping should be included in the @prop parsing
     private mapping: StyleRuleMapping = {},
     public descriptorProperty?: string,
     private shared: {
@@ -339,7 +342,10 @@ export class StylesheetBuilder {
       const [delayed, usesVariables] = postProcessStyleFunction(value);
 
       rule.d ??= [];
-      if (value[1] === "@animation") {
+      if (
+        value[1].startsWith("animation") ||
+        value[1].startsWith("transition")
+      ) {
         rule.a ??= true;
       }
 
@@ -404,17 +410,21 @@ export class StylesheetBuilder {
       propPath = property;
     }
 
-    if (isStyleFunction(value)) {
+    if (forceTuple && !Array.isArray(propPath)) {
+      propPath = [propPath];
+    }
+
+    if (isStyleFunction(value) || Array.isArray(propPath)) {
       if (delayed) {
         declarations.push([value, propPath, 1]);
       } else {
         declarations.push([value, propPath]);
       }
-    } else if (forceTuple || Array.isArray(propPath)) {
-      declarations.push([value, propPath]);
     } else if (Array.isArray(value) && value.some(isStyleFunction)) {
       declarations.push([value, propPath]);
-    } else {
+    } else if (typeof value === "string" && keywords.has(value)) {
+      declarations.push([value, propPath]);
+    } else if (typeof propPath === "string") {
       let staticDeclarationRecord = staticDeclarations.get(declarations);
       if (!staticDeclarationRecord) {
         staticDeclarationRecord = {};
@@ -431,7 +441,7 @@ export class StylesheetBuilder {
       return;
     }
 
-    if (!this.rule.d && !this.rule.v) {
+    if (!this.rule.d && !this.rule.v && !this.rule.c) {
       return;
     }
 
@@ -611,7 +621,7 @@ function postProcessStyleFunction(value: StyleDescriptor): [
   let [shouldDelay, usesVariables] = postProcessStyleFunction(value[2]);
 
   usesVariables ||= value[1] === "var";
-  shouldDelay ||= value[3] === 1;
+  shouldDelay ||= value[3] === 1 || usesVariables;
 
   if (shouldDelay) {
     return [true, usesVariables];