Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

experimental: expand grid-area shorthands (#3579)

Bogdan Chadkin4a452c9ec5e3
diff --git a/packages/css-data/src/shorthands.test.ts b/packages/css-data/src/shorthands.test.ts
index e566c2113f..997195f3c6 100644
--- a/packages/css-data/src/shorthands.test.ts
+++ b/packages/css-data/src/shorthands.test.ts
@@ -671,12 +671,61 @@ test("expand mask-border", () => {
]);
});
+test("expand grid-area", () => {
+ expect(expandShorthands([["grid-area", "a / b / c / d"]])).toEqual([
+ ["grid-row-start", "a"],
+ ["grid-column-start", "b"],
+ ["grid-row-end", "c"],
+ ["grid-column-end", "d"],
+ ]);
+ expect(expandShorthands([["grid-area", "a / b / c"]])).toEqual([
+ ["grid-row-start", "a"],
+ ["grid-column-start", "b"],
+ ["grid-row-end", "c"],
+ ["grid-column-end", "auto"],
+ ]);
+ expect(expandShorthands([["grid-area", "a / b"]])).toEqual([
+ ["grid-row-start", "a"],
+ ["grid-column-start", "b"],
+ ["grid-row-end", "auto"],
+ ["grid-column-end", "auto"],
+ ]);
+ expect(expandShorthands([["grid-area", "a"]])).toEqual([
+ ["grid-row-start", "a"],
+ ["grid-column-start", "auto"],
+ ["grid-row-end", "auto"],
+ ["grid-column-end", "auto"],
+ ]);
+});
+
+test("expand grid-row and grid-column", () => {
+ expect(
+ expandShorthands([
+ ["grid-row", "1"],
+ ["grid-column", "1"],
+ ])
+ ).toEqual([
+ ["grid-row-start", "1"],
+ ["grid-row-end", "auto"],
+ ["grid-column-start", "1"],
+ ["grid-column-end", "auto"],
+ ]);
+ expect(
+ expandShorthands([
+ ["grid-row", "1 / 2"],
+ ["grid-column", "3 / 4"],
+ ])
+ ).toEqual([
+ ["grid-row-start", "1"],
+ ["grid-row-end", "2"],
+ ["grid-column-start", "3"],
+ ["grid-column-end", "4"],
+ ]);
+});
+
test.todo("container");
test.todo("contain-intrinsic-size");
test.todo("grid");
-test.todo("grid-area");
-test.todo("grid-column");
-test.todo("grid-row");
test.todo("grid-template");
test.todo("offset");
test.todo("scroll-margin");
diff --git a/packages/css-data/src/shorthands.ts b/packages/css-data/src/shorthands.ts
index 7a6c1b370e..4970a51a0d 100644
--- a/packages/css-data/src/shorthands.ts
+++ b/packages/css-data/src/shorthands.ts
@@ -44,8 +44,9 @@ const getValueList = (value: CssNode): CssNode[] => {
return children ?? [value];
};
-const splitByOperator = (list: List<CssNode> | CssNode[], operator: string) => {
- const lists: Array<undefined | CssNode[]> = [[]];
+const splitByOperator = (node: CssNode, operator: string) => {
+ const list = getValueList(node);
+ const lists: Array<CssNode[]> = [[]];
for (const node of list) {
if (node.type === "Operator" && node.value === operator) {
lists.push([]);
@@ -53,7 +54,12 @@ const splitByOperator = (list: List<CssNode> | CssNode[], operator: string) => {
lists.at(-1)?.push(node);
}
}
- return lists;
+ return lists.map((list) => {
+ if (list.length === 0) {
+ return;
+ }
+ return createValueNode(list);
+ });
};
const joinByOperator = (list: List<CssNode> | CssNode[], operator: string) => {
@@ -279,28 +285,16 @@ const expandBorderImage = function* (value: CssNode) {
],
value
);
- let slice = createInitialNode();
- let width = createInitialNode();
- let outset = createInitialNode();
+ let slice: undefined | CssNode;
+ let width: undefined | CssNode;
+ let outset: undefined | CssNode;
if (config) {
- const [sliceNodes, widthNodes, outsetNodes] = splitByOperator(
- config.children,
- "/"
- );
- if (sliceNodes && sliceNodes.length > 0) {
- slice = createValueNode(sliceNodes);
- }
- if (widthNodes && widthNodes.length > 0) {
- width = createValueNode(widthNodes);
- }
- if (outsetNodes && outsetNodes.length > 0) {
- outset = createValueNode(outsetNodes);
- }
+ [slice, width, outset] = splitByOperator(config, "/");
}
yield ["border-image-source", source ?? createInitialNode()] as const;
- yield ["border-image-slice", slice] as const;
- yield ["border-image-width", width] as const;
- yield ["border-image-outset", outset] as const;
+ yield ["border-image-slice", slice ?? createInitialNode()] as const;
+ yield ["border-image-width", width ?? createInitialNode()] as const;
+ yield ["border-image-outset", outset ?? createInitialNode()] as const;
yield ["border-image-repeat", repeat ?? createInitialNode()] as const;
};
@@ -400,7 +394,10 @@ const expandAnimation = function* (value: CssNode) {
const fillModes: CssNode[] = [];
const playStates: CssNode[] = [];
const names: CssNode[] = [];
- for (const animationNodes of splitByOperator(getValueList(value), ",")) {
+ for (const animation of splitByOperator(value, ",")) {
+ if (animation === undefined) {
+ continue;
+ }
const [
duration,
timing,
@@ -421,7 +418,7 @@ const expandAnimation = function* (value: CssNode) {
"<single-animation-play-state>",
"[ none | <keyframes-name> ]",
],
- createValueNode(animationNodes)
+ animation
);
durations.push(duration ?? createDimension("0", "s"));
timings.push(timing ?? createIdentifier("ease"));
@@ -487,7 +484,10 @@ const expandTransition = function* (value: CssNode) {
const easings: CssNode[] = [];
const delays: CssNode[] = [];
const behaviors: CssNode[] = [];
- for (const animationNodes of splitByOperator(getValueList(value), ",")) {
+ for (const transition of splitByOperator(value, ",")) {
+ if (transition === undefined) {
+ continue;
+ }
const [property, duration, easing, delay, behavior] = parseUnordered(
[
"[ none | <single-transition-property> ]",
@@ -497,7 +497,7 @@ const expandTransition = function* (value: CssNode) {
// <transition-behavior-value> is not supported by csstree
"normal | allow-discrete",
],
- createValueNode(animationNodes)
+ transition
);
properties.push(property ?? createIdentifier("all"));
durations.push(duration ?? createDimension("0", "s"));
@@ -553,7 +553,10 @@ const expandMask = function* (value: CssNode) {
const clips: CssNode[] = [];
const compositionOperators: CssNode[] = [];
const modes: CssNode[] = [];
- for (const animationNodes of splitByOperator(getValueList(value), ",")) {
+ for (const mask of splitByOperator(value, ",")) {
+ if (mask === undefined) {
+ continue;
+ }
const [
reference,
positionAndSize,
@@ -572,24 +575,22 @@ const expandMask = function* (value: CssNode) {
"<compositing-operator>",
"<masking-mode>",
],
- createValueNode(animationNodes)
+ mask
);
references.push(reference ?? createIdentifier("none"));
- let position = createValueNode([
- { type: "Dimension", value: "0", unit: "%" },
- { type: "Dimension", value: "0", unit: "%" },
- ]);
- let bgSize = createIdentifier("auto");
+ let position: undefined | CssNode;
+ let bgSize: undefined | CssNode;
if (positionAndSize) {
- const [positionNodes, bgSizeNodes] = splitByOperator(
- getValueList(positionAndSize),
- "/"
- );
- position = createValueNode(positionNodes);
- bgSize = bgSizeNodes ? createValueNode(bgSizeNodes) : position;
+ [position, bgSize] = splitByOperator(positionAndSize, "/");
}
- positions.push(position);
- bgSizes.push(bgSize);
+ positions.push(
+ position ??
+ createValueNode([
+ { type: "Dimension", value: "0", unit: "%" },
+ { type: "Dimension", value: "0", unit: "%" },
+ ])
+ );
+ bgSizes.push(bgSize ?? createIdentifier("auto"));
repeatStyles.push(repeatStyle ?? createIdentifier("repeat"));
origins.push(origin ?? createIdentifier("border-box"));
clips.push(clip ?? origin ?? createIdentifier("border-box"));
@@ -641,19 +642,7 @@ const expandMaskBorder = function* (value: CssNode) {
let width: undefined | CssNode;
let outset: undefined | CssNode;
if (config) {
- const [sliceNodes, widthNodes, outsetNodes] = splitByOperator(
- config.children,
- "/"
- );
- if (sliceNodes && sliceNodes.length > 0) {
- slice = createValueNode(sliceNodes);
- }
- if (widthNodes && widthNodes.length > 0) {
- width = createValueNode(widthNodes);
- }
- if (outsetNodes && outsetNodes.length > 0) {
- outset = createValueNode(outsetNodes);
- }
+ [slice, width, outset] = splitByOperator(config, "/");
}
yield ["mask-border-source", source ?? createInitialNode()] as const;
yield ["mask-border-slice", slice ?? createInitialNode()] as const;
@@ -726,6 +715,35 @@ const expandShorthand = function* (property: string, value: CssNode) {
yield ["column-gap", value] as const;
break;
+ case "grid-area": {
+ const [rowStart, columnStart, rowEnd, columnEnd] = splitByOperator(
+ value,
+ "/"
+ );
+ yield ["grid-row-start", rowStart ?? createIdentifier("auto")] as const;
+ yield [
+ "grid-column-start",
+ columnStart ?? createIdentifier("auto"),
+ ] as const;
+ yield ["grid-row-end", rowEnd ?? createIdentifier("auto")] as const;
+ yield ["grid-column-end", columnEnd ?? createIdentifier("auto")] as const;
+ break;
+ }
+
+ case "grid-row": {
+ const [start, end] = splitByOperator(value, "/");
+ yield ["grid-row-start", start ?? createIdentifier("auto")] as const;
+ yield ["grid-row-end", end ?? createIdentifier("auto")] as const;
+ break;
+ }
+
+ case "grid-column": {
+ const [start, end] = splitByOperator(value, "/");
+ yield ["grid-column-start", start ?? createIdentifier("auto")] as const;
+ yield ["grid-column-end", end ?? createIdentifier("auto")] as const;
+ break;
+ }
+
case "flex":
yield* expandFlex(value);
break;