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: parse css wide keywords correctly (#3651)

Bogdan Chadkinad5d05030839
diff --git a/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts b/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts
index e84ae5b8ed..d2ce1e4ec4 100644
--- a/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts
@@ -921,8 +921,8 @@ export const styles = {
{
property: "all",
value: {
- type: "invalid",
- value: "",
+ type: "keyword",
+ value: "inherit",
},
},
],
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 42c592ea79..255db7b7f1 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -7,7 +7,8 @@
"scripts": {
"prebuild": "which remix",
"build": "remix vite:build",
- "build:webflow-presets": "css-to-ws ./app/shared/copy-paste/plugin-webflow/style-presets.css ./app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts",
+ "css-to-ws": "NODE_OPTIONS=--conditions=webstudio css-to-ws",
+ "build:webflow-presets": "pnpm css-to-ws ./app/shared/copy-paste/plugin-webflow/style-presets.css ./app/shared/copy-paste/plugin-webflow/__generated__/style-presets.ts",
"start": "remix-serve build/server/index.js",
"dev": "remix vite:dev",
"typecheck": "tsc --noEmit --emitDeclarationOnly false",
diff --git a/packages/css-data/src/parse-css-value.test.ts b/packages/css-data/src/parse-css-value.test.ts
index 7848c2048b..aa349bbd73 100644
--- a/packages/css-data/src/parse-css-value.test.ts
+++ b/packages/css-data/src/parse-css-value.test.ts
@@ -228,6 +228,29 @@ test("parse background-attachment property as layers", () => {
});
});
+test("parse repeated value with css wide keywords", () => {
+ expect(parseCssValue("backgroundAttachment", "initial")).toEqual({
+ type: "keyword",
+ value: "initial",
+ });
+ expect(parseCssValue("backgroundAttachment", "INHERIT")).toEqual({
+ type: "keyword",
+ value: "inherit",
+ });
+ expect(parseCssValue("backgroundAttachment", "unset")).toEqual({
+ type: "keyword",
+ value: "unset",
+ });
+ expect(parseCssValue("backgroundAttachment", "revert")).toEqual({
+ type: "keyword",
+ value: "revert",
+ });
+ expect(parseCssValue("backgroundAttachment", "revert-layer")).toEqual({
+ type: "keyword",
+ value: "revert-layer",
+ });
+});
+
test("parse transition-behavior property as layers", () => {
expect(parseCssValue("transitionBehavior", `normal`)).toEqual({
type: "layers",
diff --git a/packages/css-data/src/parse-css-value.ts b/packages/css-data/src/parse-css-value.ts
index 538274e52a..58a6151f55 100644
--- a/packages/css-data/src/parse-css-value.ts
+++ b/packages/css-data/src/parse-css-value.ts
@@ -4,6 +4,7 @@ import type { CssNode } from "css-tree";
import warnOnce from "warn-once";
import {
TupleValue,
+ cssWideKeywords,
hyphenateProperty,
type LayerValueItem,
type StyleProperty,
@@ -112,6 +113,11 @@ export const parseCssValue = (
input: string,
topLevel = true
): StyleValue => {
+ const potentialKeyword = input.toLowerCase();
+ if (cssWideKeywords.has(potentialKeyword)) {
+ return { type: "keyword", value: potentialKeyword };
+ }
+
const invalidValue = {
type: "invalid",
value: input,
diff --git a/packages/css-engine/src/core/merger.ts b/packages/css-engine/src/core/merger.ts
index e26e30c045..8003144685 100644
--- a/packages/css-engine/src/core/merger.ts
+++ b/packages/css-engine/src/core/merger.ts
@@ -1,9 +1,8 @@
import { StyleValue, TupleValue, TupleValueItem } from "../schema";
+import { cssWideKeywords } from "../css";
import type { StyleMap } from "./rules";
import { toValue } from "./to-value";
-const cssWideKeywords = new Set(["initial", "inherit", "unset", "revert"]);
-
/**
* Css wide keywords cannot be used in shorthand parts
*/
diff --git a/packages/css-engine/src/css.ts b/packages/css-engine/src/css.ts
new file mode 100644
index 0000000000..16f95d81dd
--- /dev/null
+++ b/packages/css-engine/src/css.ts
@@ -0,0 +1,7 @@
+export const cssWideKeywords = new Set([
+ "initial",
+ "inherit",
+ "unset",
+ "revert",
+ "revert-layer",
+]);
diff --git a/packages/css-engine/src/index.ts b/packages/css-engine/src/index.ts
index 44aab9ed99..5025b8a239 100644
--- a/packages/css-engine/src/index.ts
+++ b/packages/css-engine/src/index.ts
@@ -1,5 +1,6 @@
export * from "./core/index";
export * from "./schema";
+export * from "./css";
// necessary for sdk dts generation
export type {