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
refactor: simplify var value fallbacks (#4201)
Bogdan Chadkinbbf37d3e618d
diff --git a/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx b/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsxindex 87faa11796..0d41127d9c 100644--- a/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx@@ -256,7 +256,7 @@ const AdvancedPropertyValue = ({styleValue.value.startsWith("--")) {setProperty(property)(- { type: "var", value: styleValue.value.slice(2), fallbacks: [] },+ { type: "var", value: styleValue.value.slice(2) },{ ...options, listed: true });} else {diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.tsindex b78cf3e96b..b4dcc50ece 100644--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.ts+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/parse-intermediate-or-invalid-value.ts.test.ts@@ -542,6 +542,5 @@ test("parse css vars", () => {expect(result).toEqual({type: "var",value: "color",- fallbacks: [],});});diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 53a6136931..397672a8bf 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -159,7 +159,7 @@ const toVarValue = (styleDecl: StyleDecl): undefined | VarValue => {// escape complex selectors in state like ":hover"// setProperty and removeProperty escape automaticallyvalue: CSS.escape(getEphemeralProperty(styleDecl).slice(2)),- fallbacks: [value],+ fallback: { type: "unparsed", value: toValue(value) },};}};diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex b71787bfe7..76d78c1e5e 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -752,8 +752,8 @@ const traverseStyleValue = (return;}if (value.type === "var") {- for (const item of value.fallbacks) {- traverseStyleValue(item, callback);+ if (value.fallback) {+ traverseStyleValue(value.fallback, callback);}return;}diff --git a/apps/builder/app/shared/style-object-model.ts b/apps/builder/app/shared/style-object-model.tsindex 2e3073db4f..afffe282e4 100644--- a/apps/builder/app/shared/style-object-model.ts+++ b/apps/builder/app/shared/style-object-model.ts@@ -1,6 +1,10 @@import type { HtmlTags } from "html-tags";import { html, properties } from "@webstudio-is/css-data";-import type { StyleValue, StyleProperty } from "@webstudio-is/css-engine";+import type {+ StyleValue,+ StyleProperty,+ VarFallback,+} from "@webstudio-is/css-engine";import {type Instance,type StyleDecl,@@ -350,7 +354,7 @@ export const getComputedStyleDecl = ({}usedCustomProperties.add(customProperty);- const fallback = computedValue.fallbacks.at(0);+ const fallback: undefined | VarFallback = computedValue.fallback;const customPropertyValue = getComputedStyleDecl({model,// resolve custom properties on instance they are defineddiff --git a/packages/css-data/src/parse-css-value.test.ts b/packages/css-data/src/parse-css-value.test.tsindex 62a0f7bcf7..bf1a9b59b8 100644--- a/packages/css-data/src/parse-css-value.test.ts+++ b/packages/css-data/src/parse-css-value.test.ts@@ -541,12 +541,11 @@ test("support custom properties var reference", () => {expect(parseCssValue("color", "var(--color)")).toEqual({type: "var",value: "color",- fallbacks: [],});expect(parseCssValue("color", "var(--color, red)")).toEqual({type: "var",value: "color",- fallbacks: [{ type: "unparsed", value: "red" }],+ fallback: { type: "unparsed", value: "red" },});});@@ -569,12 +568,11 @@ test("support custom properties var reference in custom property", () => {expect(parseCssValue("--bg", "var(--color)")).toEqual({type: "var",value: "color",- fallbacks: [],});expect(parseCssValue("--bg", "var(--color, red)")).toEqual({type: "var",value: "color",- fallbacks: [{ type: "unparsed", value: "red" }],+ fallback: { type: "unparsed", value: "red" },});});diff --git a/packages/css-data/src/parse-css-value.ts b/packages/css-data/src/parse-css-value.tsindex 6c8ea4345b..0af2b95cb8 100644--- a/packages/css-data/src/parse-css-value.ts+++ b/packages/css-data/src/parse-css-value.ts@@ -243,14 +243,14 @@ const parseLiteral = (children: new List<CssNode>().fromArray(fallback),}).trim();if (name.type === "Identifier") {- return {+ const value: VarValue = {type: "var",value: name.name.slice("--".length),- fallbacks:- fallback.length === 0- ? []- : [{ type: "unparsed", value: fallbackString }],};+ if (fallback.length > 0) {+ value.fallback = { type: "unparsed", value: fallbackString };+ }+ return value;}}diff --git a/packages/css-data/src/parse-css.test.ts b/packages/css-data/src/parse-css.test.tsindex 3ecb30fdb8..f18adb595f 100644--- a/packages/css-data/src/parse-css.test.ts+++ b/packages/css-data/src/parse-css.test.ts@@ -421,7 +421,7 @@ describe("Parse CSS", () => {{selector: "a",property: "color",- value: { type: "var", value: "color", fallbacks: [] },+ value: { type: "var", value: "color" },},{selector: "a",@@ -429,7 +429,7 @@ describe("Parse CSS", () => {value: {type: "var",value: "color",- fallbacks: [{ type: "unparsed", value: "red" }],+ fallback: { type: "unparsed", value: "red" },},},]);diff --git a/packages/css-engine/src/core/merger.test.ts b/packages/css-engine/src/core/merger.test.tsindex 5bc2c3e9de..dab918e5e4 100644--- a/packages/css-engine/src/core/merger.test.ts+++ b/packages/css-engine/src/core/merger.test.ts@@ -53,9 +53,9 @@ test("merge border with vars", () => {toStringMap(mergeStyles(new Map([- ["border-width", { type: "var", value: "width", fallbacks: [] }],- ["border-style", { type: "var", value: "style", fallbacks: [] }],- ["border-color", { type: "var", value: "color", fallbacks: [] }],+ ["border-width", { type: "var", value: "width" }],+ ["border-style", { type: "var", value: "style" }],+ ["border-color", { type: "var", value: "color" }],])))@@ -72,11 +72,11 @@ test("should not merge border with initial, inherit or unset", () => {{type: "var",value: "width",- fallbacks: [{ type: "keyword", value: "unset" }],+ fallback: { type: "keyword", value: "unset" },},],- ["border-style", { type: "var", value: "style", fallbacks: [] }],- ["border-color", { type: "var", value: "color", fallbacks: [] }],+ ["border-style", { type: "var", value: "style" }],+ ["border-color", { type: "var", value: "color" }],])))@@ -238,12 +238,7 @@ test("merge white-space with vars", () => {expect(toStringMap(mergeStyles(- new Map([- [- "white-space-collapse",- { type: "var", value: "collapse", fallbacks: [] },- ],- ])+ new Map([["white-space-collapse", { type: "var", value: "collapse" }]])))).toEqual([["white-space-collapse", "var(--collapse)"]]);@@ -284,8 +279,8 @@ test("merge text-wrap with vars", () => {toStringMap(mergeStyles(new Map([- ["text-wrap-mode", { type: "var", value: "mode", fallbacks: [] }],- ["text-wrap-style", { type: "var", value: "style", fallbacks: [] }],+ ["text-wrap-mode", { type: "var", value: "mode" }],+ ["text-wrap-style", { type: "var", value: "style" }],])))@@ -293,9 +288,7 @@ test("merge text-wrap with vars", () => {expect(toStringMap(mergeStyles(- new Map([- ["text-wrap-style", { type: "var", value: "style", fallbacks: [] }],- ])+ new Map([["text-wrap-style", { type: "var", value: "style" }]])))).toEqual([["text-wrap", "var(--style)"]]);diff --git a/packages/css-engine/src/core/merger.ts b/packages/css-engine/src/core/merger.tsindex 8003144685..bb7d0beb89 100644--- a/packages/css-engine/src/core/merger.ts+++ b/packages/css-engine/src/core/merger.ts@@ -14,7 +14,7 @@ const isLonghandValue = (value?: StyleValue): value is StyleValue => {return false;}if (value.type === "var") {- const fallback = value.fallbacks.at(0);+ const fallback = value.fallback;if (fallback?.type === "keyword" && cssWideKeywords.has(fallback.value)) {return false;}diff --git a/packages/css-engine/src/core/to-value.test.ts b/packages/css-engine/src/core/to-value.test.tsindex e909933b8a..34dfb2400f 100644--- a/packages/css-engine/src/core/to-value.test.ts+++ b/packages/css-engine/src/core/to-value.test.ts@@ -23,7 +23,7 @@ describe("Convert WS CSS Values to native CSS strings", () => {});test("var", () => {- const value = toValue({ type: "var", value: "namespace", fallbacks: [] });+ const value = toValue({ type: "var", value: "namespace" });expect(value).toBe("var(--namespace)");});@@ -31,17 +31,10 @@ describe("Convert WS CSS Values to native CSS strings", () => {const value = toValue({type: "var",value: "namespace",- fallbacks: [- {- type: "keyword",- value: "normal",- },- {- type: "unit",- value: 10,- unit: "px",- },- ],+ fallback: {+ type: "unparsed",+ value: "normal, 10px",+ },});expect(value).toBe("var(--namespace, normal, 10px)");});diff --git a/packages/css-engine/src/core/to-value.ts b/packages/css-engine/src/core/to-value.tsindex 3f1a314bc3..5d21b341b3 100644--- a/packages/css-engine/src/core/to-value.ts+++ b/packages/css-engine/src/core/to-value.ts@@ -53,12 +53,10 @@ export const toValue = (return families.join(", ");}if (value.type === "var") {- const fallbacks = [];- for (const fallback of value.fallbacks) {- fallbacks.push(toValue(fallback, transformValue));+ let fallbacksString = "";+ if (value.fallback) {+ fallbacksString = `, ${toValue(value.fallback, transformValue)}`;}- const fallbacksString =- fallbacks.length > 0 ? `, ${fallbacks.join(", ")}` : "";return `var(--${value.value}${fallbacksString})`;}diff --git a/packages/css-engine/src/schema.ts b/packages/css-engine/src/schema.tsindex 0315579b01..f90be7ca39 100644--- a/packages/css-engine/src/schema.ts+++ b/packages/css-engine/src/schema.ts@@ -190,10 +190,13 @@ export const isValidStaticStyleValue = ();};+export const VarFallback = z.union([UnparsedValue, KeywordValue]);+export type VarFallback = z.infer<typeof VarFallback>;+const VarValue = z.object({type: z.literal("var"),value: z.string(),- fallbacks: z.array(ValidStaticStyleValue),+ fallback: VarFallback.optional(),hidden: z.boolean().optional(),});export type VarValue = z.infer<typeof VarValue>;diff --git a/packages/sdk-components-react-radix/src/theme/tailwind-classes.ts b/packages/sdk-components-react-radix/src/theme/tailwind-classes.tsindex c856d07d59..51934e998d 100644--- a/packages/sdk-components-react-radix/src/theme/tailwind-classes.ts+++ b/packages/sdk-components-react-radix/src/theme/tailwind-classes.ts@@ -17,7 +17,7 @@ export const property = (if (value.startsWith("--")) {return {property,- value: { type: "var", value: value.slice(2), fallbacks: [] },+ value: { type: "var", value: value.slice(2) },};}return {