Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 35 additions & 19 deletions src/compiler/declarations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import Color from "colorjs.io";
import type {
Angle,
BorderBlockColor,
BorderSideWidth,
BorderStyle,
ColorOrAuto,
Expand Down Expand Up @@ -92,7 +91,7 @@ const parsers: {
"block-size": parseSizeDeclaration,
"border": parseBorder,
"border-block": parseBorderBlock,
"border-block-color": parseBorderBlockColor,
"border-block-color": parseBorderColor,
"border-block-end": parseBorderBlockEnd,
"border-block-end-color": parseColorDeclaration,
"border-block-end-width": parseBorderSideWidthDeclaration,
Expand All @@ -111,7 +110,7 @@ const parsers: {
"border-end-end-radius": parseSize2DDimensionPercentageDeclaration,
"border-end-start-radius": parseSize2DDimensionPercentageDeclaration,
"border-inline": parseBorderInline,
"border-inline-color": parseBorderBlockColor,
"border-inline-color": parseBorderColor,
"border-inline-end": parseBorderInlineEnd,
"border-inline-end-color": parseColorDeclaration,
"border-inline-end-style": parseBorderInlineStyle,
Expand Down Expand Up @@ -352,15 +351,41 @@ function parseBorderRadius(
}

function parseBorderColor(
{ value }: DeclarationType<"border-color">,
declaration: DeclarationType<
"border-color" | "border-block-color" | "border-inline-color"
>,
builder: StylesheetBuilder,
) {
builder.addShorthand("border-color", {
"border-top-color": parseColor(value.top, builder),
"border-bottom-color": parseColor(value.bottom, builder),
"border-left-color": parseColor(value.left, builder),
"border-right-color": parseColor(value.right, 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;
}
}

function parseBorderWidth(
Expand Down Expand Up @@ -1948,15 +1973,6 @@ export function parseBorderStyle(
return undefined;
}

export function parseBorderBlockColor(
{ value }: { value: BorderBlockColor },
builder: StylesheetBuilder,
) {
builder.addDescriptor("border-top-color", parseColor(value.start, builder));
builder.addDescriptor("border-bottom-color", parseColor(value.end, builder));
return;
}

export function parseBorderBlockWidth(
declaration: DeclarationType<"border-block-width">,
builder: StylesheetBuilder,
Expand Down