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.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: prevent merging var with unset, initial and inherit (#3630)
Bogdan Chadkina7cc5c84171e
diff --git a/packages/css-engine/src/core/merger.test.ts b/packages/css-engine/src/core/merger.test.tsindex ed299b6277..a4a8ec817a 100644--- a/packages/css-engine/src/core/merger.test.ts+++ b/packages/css-engine/src/core/merger.test.ts@@ -47,36 +47,43 @@ test("merge border when all parts are set", () => {]);});-test("should not merge border with initial", () => {+test("merge border with vars", () => {expect(toStringMap(mergeStyles(new Map([- ["border-width", { type: "keyword", value: "initial" }],- ["border-style", { type: "keyword", value: "solid" }],- ["border-color", { type: "keyword", value: "red" }],+ ["border-width", { type: "var", value: "width", fallbacks: [] }],+ ["border-style", { type: "var", value: "style", fallbacks: [] }],+ ["border-color", { type: "var", value: "color", fallbacks: [] }],])))- ).toEqual([- ["border-width", "initial"],- ["border-style", "solid"],- ["border-color", "red"],- ]);+ ).toEqual([["border", "var(--width) var(--style) var(--color)"]]);});-test("merge border with vars", () => {+test("should not merge border with initial, inherit or unset", () => {expect(toStringMap(mergeStyles(new Map([- ["border-width", { type: "var", value: "width", fallbacks: [] }],+ [+ "border-width",+ {+ type: "var",+ value: "width",+ fallbacks: [{ type: "keyword", value: "unset" }],+ },+ ],["border-style", { type: "var", value: "style", fallbacks: [] }],["border-color", { type: "var", value: "color", fallbacks: [] }],])))- ).toEqual([["border", "var(--width) var(--style) var(--color)"]]);+ ).toEqual([+ ["border-width", "var(--width, unset)"],+ ["border-style", "var(--style)"],+ ["border-color", "var(--color)"],+ ]);});test("merge margin/padding when the same value is set", () => {diff --git a/packages/css-engine/src/core/merger.ts b/packages/css-engine/src/core/merger.tsindex ce7110ffe3..904086b996 100644--- a/packages/css-engine/src/core/merger.ts+++ b/packages/css-engine/src/core/merger.ts@@ -14,6 +14,12 @@ const isLonghandValue = (value?: StyleValue): value is StyleValue => {if (value.type === "keyword" && cssWideKeywords.has(value.value)) {return false;}+ if (value.type === "var") {+ const fallback = value.fallbacks.at(0);+ if (fallback?.type === "keyword" && cssWideKeywords.has(fallback.value)) {+ return false;+ }+ }return true;};