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 container shorthands (#3600)

Bogdan Chadkine747398fdb73
diff --git a/packages/css-data/src/shorthands.test.ts b/packages/css-data/src/shorthands.test.ts
index 7570546ab6..2f59213687 100644
--- a/packages/css-data/src/shorthands.test.ts
+++ b/packages/css-data/src/shorthands.test.ts
@@ -940,8 +940,39 @@ test("expand grid", () => {
]);
});
-test.todo("container");
-test.todo("contain-intrinsic-size");
+test("expand container", () => {
+ expect(expandShorthands([["container", "my-layout"]])).toEqual([
+ ["container-name", "my-layout"],
+ ["container-type", "normal"],
+ ]);
+ expect(expandShorthands([["container", "my-layout / size"]])).toEqual([
+ ["container-name", "my-layout"],
+ ["container-type", "size"],
+ ]);
+});
+
+test("expand contain-intrinsic-size", () => {
+ expect(expandShorthands([["contain-intrinsic-size", "auto 300px"]])).toEqual([
+ ["contain-intrinsic-width", "auto 300px"],
+ ["contain-intrinsic-height", "auto 300px"],
+ ]);
+ expect(expandShorthands([["contain-intrinsic-size", "1000px"]])).toEqual([
+ ["contain-intrinsic-width", "1000px"],
+ ["contain-intrinsic-height", "1000px"],
+ ]);
+ expect(
+ expandShorthands([["contain-intrinsic-size", "1000px 1.5em"]])
+ ).toEqual([
+ ["contain-intrinsic-width", "1000px"],
+ ["contain-intrinsic-height", "1.5em"],
+ ]);
+ expect(
+ expandShorthands([["contain-intrinsic-size", "auto 300px auto 4rem"]])
+ ).toEqual([
+ ["contain-intrinsic-width", "auto 300px"],
+ ["contain-intrinsic-height", "auto 4rem"],
+ ]);
+});
test.todo("white-space - not a shorthand in webflow");
test.todo("text-wrap - not a shorthand in webflow");
diff --git a/packages/css-data/src/shorthands.ts b/packages/css-data/src/shorthands.ts
index 9f10b30e4a..08108d591f 100644
--- a/packages/css-data/src/shorthands.ts
+++ b/packages/css-data/src/shorthands.ts
@@ -1087,6 +1087,29 @@ const expandShorthand = function* (property: string, value: CssNode) {
break;
}
+ case "container": {
+ const [name, type] = splitByOperator(value, "/");
+ yield ["container-name", name ?? createIdentifier("none")] as const;
+ yield ["container-type", type ?? createIdentifier("normal")] as const;
+ break;
+ }
+
+ case "contain-intrinsic-size": {
+ const [width, height] = parseUnordered(
+ [`<'contain-intrinsic-width'>`, `<'contain-intrinsic-height'>`],
+ value
+ );
+ yield [
+ "contain-intrinsic-width",
+ width ?? createIdentifier("none"),
+ ] as const;
+ yield [
+ "contain-intrinsic-height",
+ height ?? width ?? createIdentifier("none"),
+ ] as const;
+ break;
+ }
+
default:
yield [property, value] as const;
}