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
feat: substitute variables in calc and box-shadow (#5049)
Bogdan Chadkinccba8d9581cc
diff --git a/apps/builder/app/builder/features/style-panel/shared/shadow-content.tsx b/apps/builder/app/builder/features/style-panel/shared/shadow-content.tsxindex 10811f7fa2..2065b85580 100644--- a/apps/builder/app/builder/features/style-panel/shared/shadow-content.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/shadow-content.tsx@@ -9,7 +9,11 @@ import {type CssProperty,type RgbValue,} from "@webstudio-is/css-engine";-import { keywordValues, propertySyntaxes } from "@webstudio-is/css-data";+import {+ keywordValues,+ parseCssValue,+ propertySyntaxes,+} from "@webstudio-is/css-data";import {Flex,Grid,@@ -123,6 +127,16 @@ export const ShadowContent = ({useEffect(() => {setIntermediateValue({ type: "intermediate", value: propertyValue });}, [propertyValue]);+ const parsedShadowProperty: CssProperty =+ property === "drop-shadow" ? "text-shadow" : property;+ // try to reparse computed value+ // which can contain parsable value after variables substitution+ if (computedLayer?.type === "unparsed") {+ const styleValue = parseCssValue(parsedShadowProperty, computedLayer.value);+ if (styleValue.type === "layers") {+ [computedLayer] = styleValue.value;+ }+ }let shadowValue: ShadowValue = {type: "shadow",position: "outset",@@ -135,12 +149,12 @@ export const ShadowContent = ({if (layer.type === "var" && computedLayer?.type === "shadow") {shadowValue = computedLayer;}+ if (layer.type === "unparsed" && computedLayer?.type === "shadow") {+ shadowValue = computedLayer;+ }const computedShadow =computedLayer?.type === "shadow" ? computedLayer : shadowValue;- const parsedShadowProperty: CssProperty =- property === "drop-shadow" ? "text-shadow" : property;-const disabledControls = layer.type === "var" || layer.type === "unparsed";const handleChange = (value: string) => {@@ -406,7 +420,7 @@ export const ShadowContent = ({content={<CssFragmentEditorContentinvalid={intermediateValue?.type === "invalid"}- autoFocus={layer.type === "var"}+ autoFocus={disabledControls}value={intermediateValue?.value ?? propertyValue ?? ""}onChange={handleChange}onChangeComplete={handleComplete}diff --git a/apps/builder/app/shared/style-object-model.test.tsx b/apps/builder/app/shared/style-object-model.test.tsxindex 7f96dcddb5..c8ef011371 100644--- a/apps/builder/app/shared/style-object-model.test.tsx+++ b/apps/builder/app/shared/style-object-model.test.tsx@@ -472,6 +472,53 @@ test("support custom properties in tuples", () => {});});+test("support custom properties in unparsed values", () => {+ const model = createModel({+ css: `+ bodyLocal {+ --size: 10px;+ width: calc(var(--size) * 2);+ height: calc(var(--height, 20px) * 2);+ box-shadow: var(--size) red, var(--size) blue;+ }+ `,+ jsx: <$.Body ws:id="body" class="bodyLocal"></$.Body>,+ });+ expect(+ getComputedStyleDecl({+ model,+ instanceSelector: ["body"],+ property: "width",+ }).computedValue+ ).toEqual({+ type: "unparsed",+ value: "calc(10px*2)",+ });+ expect(+ getComputedStyleDecl({+ model,+ instanceSelector: ["body"],+ property: "height",+ }).computedValue+ ).toEqual({+ type: "unparsed",+ value: "calc(20px*2)",+ });+ expect(+ getComputedStyleDecl({+ model,+ instanceSelector: ["body"],+ property: "box-shadow",+ }).computedValue+ ).toEqual({+ type: "layers",+ value: [+ { type: "unparsed", value: "10px red" },+ { type: "unparsed", value: "10px blue" },+ ],+ });+});+test("use fallback value when custom property does not exist", () => {const model = createModel({css: `diff --git a/apps/builder/app/shared/style-object-model.ts b/apps/builder/app/shared/style-object-model.tsindex 53981068b0..aac9a5ebce 100644--- a/apps/builder/app/shared/style-object-model.ts+++ b/apps/builder/app/shared/style-object-model.ts@@ -1,15 +1,19 @@+import { generate, walk } from "css-tree";import type { HtmlTags } from "html-tags";import {camelCaseProperty,+ cssTryParseValue,html,+ parseCssVar,propertiesData,} from "@webstudio-is/css-data";-import type {- StyleValue,- VarFallback,- VarValue,- UnparsedValue,- CssProperty,+import {+ type StyleValue,+ type VarFallback,+ type VarValue,+ type UnparsedValue,+ type CssProperty,+ toValue,} from "@webstudio-is/css-engine";import {type Instance,@@ -281,15 +285,38 @@ const substituteVars = (}return newShadowValue;}+ // slightly optimize to not parse without variables+ if (styleValue.type === "unparsed" && styleValue.value.includes("var(")) {+ // parse, replace variables and serialize back to unparsed value+ const ast = cssTryParseValue(styleValue.value);+ if (ast) {+ walk(ast, {+ enter(node, item, list) {+ if (node.type === "Function" && node.name === "var") {+ const varValue = parseCssVar(node);+ if (varValue) {+ const newValue = mapper(varValue);+ list.replace(+ item,+ node.children.createItem({+ type: "Raw",+ value: toValue(newValue),+ })+ );+ }+ }+ },+ });+ return {+ type: "unparsed",+ value: generate(ast),+ };+ }+ return styleValue;+ }if (styleValue.type === "layers" || styleValue.type === "tuple") {const newItems = styleValue.value.map((item) => {- if (item.type === "var") {- return mapper(item) as UnparsedValue;- }- if (item.type === "shadow") {- return substituteVars(item, mapper) as UnparsedValue;- }- return item as UnparsedValue;+ return substituteVars(item, mapper) as UnparsedValue;});return { ...styleValue, value: newItems };}diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex a56efd9981..e0eb90098f 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -25,10 +25,10 @@"@codemirror/lang-html": "^6.4.9","@codemirror/lang-javascript": "^6.2.3","@codemirror/lang-markdown": "^6.3.2",- "@codemirror/language": "^6.10.8",- "@codemirror/lint": "^6.8.4",+ "@codemirror/language": "^6.11.0",+ "@codemirror/lint": "^6.8.5","@codemirror/state": "^6.5.2",- "@codemirror/view": "^6.36.3",+ "@codemirror/view": "^6.36.4","@floating-ui/dom": "^1.6.13","@fontsource-variable/inter": "^5.0.20","@fontsource-variable/manrope": "^5.0.20",@@ -39,7 +39,7 @@"@lexical/selection": "^0.21.0","@lexical/utils": "^0.21.0","@lezer/common": "^1.2.3",- "@lezer/css": "^1.1.10",+ "@lezer/css": "^1.1.11","@lezer/highlight": "^1.2.1","@nanostores/react": "^0.8.0","@nkzw/use-relative-time": "^1.1.0",diff --git a/packages/css-data/src/parse-css-value.ts b/packages/css-data/src/parse-css-value.tsindex 0f3723f59a..ec47bd0618 100644--- a/packages/css-data/src/parse-css-value.ts+++ b/packages/css-data/src/parse-css-value.ts@@ -1,6 +1,13 @@import { colord, extend } from "colord";import namesPlugin from "colord/plugins/names";-import { type CssNode, generate, lexer, List, parse } from "css-tree";+import {+ type CssNode,+ type FunctionNode,+ generate,+ lexer,+ List,+ parse,+} from "css-tree";import warnOnce from "warn-once";import {cssWideKeywords,@@ -18,7 +25,7 @@ import {type TupleValueItem,type CssProperty,type ShadowValue,- UnparsedValue,+ type UnparsedValue,} from "@webstudio-is/css-engine";import { keywordValues } from "./__generated__/keyword-values";import { units } from "./__generated__/units";@@ -208,6 +215,24 @@ const parseShadow = (return shadowValue;};+export const parseCssVar = (node: FunctionNode): undefined | VarValue => {+ const [name, _comma, ...fallback] = node.children;+ const fallbackString = generate({+ type: "Value",+ children: new List<CssNode>().fromArray(fallback),+ }).trim();+ if (name.type === "Identifier") {+ const value: VarValue = {+ type: "var",+ value: name.name.slice("--".length),+ };+ if (fallback.length > 0) {+ value.fallback = { type: "unparsed", value: fallbackString };+ }+ return value;+ }+};+const parseLiteral = (node: undefined | null | CssNode,keywords?: readonly string[]@@ -281,21 +306,7 @@ const parseLiteral = (}}if (node.name === "var") {- const [name, _comma, ...fallback] = node.children;- const fallbackString = generate({- type: "Value",- children: new List<CssNode>().fromArray(fallback),- }).trim();- if (name.type === "Identifier") {- const value: VarValue = {- type: "var",- value: name.name.slice("--".length),- };- if (fallback.length > 0) {- value.fallback = { type: "unparsed", value: fallbackString };- }- return value;- }+ return parseCssVar(node);}// functions with comma-separated argumentsdiff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex c560c659a7..48221887bb 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -140,17 +140,17 @@ importers:specifier: ^6.3.2version: 6.3.2'@codemirror/language':- specifier: ^6.10.8- version: 6.10.8+ specifier: ^6.11.0+ version: 6.11.0'@codemirror/lint':- specifier: ^6.8.4- version: 6.8.4+ specifier: ^6.8.5+ version: 6.8.5'@codemirror/state':specifier: ^6.5.2version: 6.5.2'@codemirror/view':- specifier: ^6.36.3- version: 6.36.3+ specifier: ^6.36.4+ version: 6.36.4'@floating-ui/dom':specifier: ^1.6.13version: 1.6.13@@ -182,8 +182,8 @@ importers:specifier: ^1.2.3version: 1.2.3'@lezer/css':- specifier: ^1.1.10- version: 1.1.10+ specifier: ^1.1.11+ version: 1.1.11'@lezer/highlight':specifier: ^1.2.1version: 1.2.1@@ -2497,17 +2497,17 @@ packages:'@codemirror/[email protected]':resolution: {integrity: sha512-c/5MYinGbFxYl4itE9q/rgN/sMTjOr8XL5OWnC+EaRMLfCbVUmmubTJfdgpfcSS2SCaT7b+Q+xi3l6CgoE+BsA==}- '@codemirror/[email protected]':- resolution: {integrity: sha512-wcP8XPPhDH2vTqf181U8MbZnW+tDyPYy0UzVOa+oHORjyT+mhhom9vBd7dApJwoDz9Nb/a8kHjJIsuA/t8vNFw==}+ '@codemirror/[email protected]':+ resolution: {integrity: sha512-A7+f++LodNNc1wGgoRDTt78cOwWm9KVezApgjOMp1W4hM0898nsqBXwF+sbePE7ZRcjN7Sa1Z5m2oN27XkmEjQ==}- '@codemirror/[email protected]':- resolution: {integrity: sha512-u4q7PnZlJUojeRe8FJa/njJcMctISGgPQ4PnWsd9268R4ZTtU+tfFYmwkBvgcrK2+QQ8tYFVALVb5fVJykKc5A==}+ '@codemirror/[email protected]':+ resolution: {integrity: sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==}'@codemirror/[email protected]':resolution: {integrity: sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==}- '@codemirror/[email protected]':- resolution: {integrity: sha512-N2bilM47QWC8Hnx0rMdDxO2x2ImJ1FvZWXubwKgjeoOrWwEiFrtpA7SFHcuZ+o2Ze2VzbkgbzWVj4+V18LVkeg==}+ '@codemirror/[email protected]':+ resolution: {integrity: sha512-ZQ0V5ovw/miKEXTvjgzRyjnrk9TwriUB1k4R5p7uNnHR9Hus+D1SXHGdJshijEzPFjU25xea/7nhIeSqYFKdbA==}'@cspotcode/[email protected]':resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}@@ -3715,8 +3715,8 @@ packages:'@lezer/[email protected]':resolution: {integrity: sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==}- '@lezer/[email protected]':- resolution: {integrity: sha512-V5/89eDapjeAkWPBpWEfQjZ1Hag3aYUUJOL8213X0dFRuXJ4BXa5NKl9USzOnaLod4AOpmVCkduir2oKwZYZtg==}+ '@lezer/[email protected]':+ resolution: {integrity: sha512-FuAnusbLBl1SEAtfN8NdShxYJiESKw9LAFysfea1T96jD3ydBn12oYjaSG1a04BQRIUd93/0D8e5CV1cUMkmQg==}'@lezer/[email protected]':resolution: {integrity: sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==}@@ -9736,45 +9736,45 @@ snapshots:'@codemirror/[email protected]':dependencies:- '@codemirror/language': 6.10.8+ '@codemirror/language': 6.11.0'@codemirror/state': 6.5.2- '@codemirror/view': 6.36.3+ '@codemirror/view': 6.36.4'@lezer/common': 1.2.3'@codemirror/[email protected]':dependencies:- '@codemirror/language': 6.10.8+ '@codemirror/language': 6.11.0'@codemirror/state': 6.5.2- '@codemirror/view': 6.36.3+ '@codemirror/view': 6.36.4'@lezer/common': 1.2.3'@codemirror/[email protected]':dependencies:'@codemirror/autocomplete': 6.18.6- '@codemirror/language': 6.10.8+ '@codemirror/language': 6.11.0'@codemirror/state': 6.5.2'@lezer/common': 1.2.3- '@lezer/css': 1.1.10+ '@lezer/css': 1.1.11'@codemirror/[email protected]':dependencies:'@codemirror/autocomplete': 6.18.6'@codemirror/lang-css': 6.3.1'@codemirror/lang-javascript': 6.2.3- '@codemirror/language': 6.10.8+ '@codemirror/language': 6.11.0'@codemirror/state': 6.5.2- '@codemirror/view': 6.36.3+ '@codemirror/view': 6.36.4'@lezer/common': 1.2.3- '@lezer/css': 1.1.10+ '@lezer/css': 1.1.11'@lezer/html': 1.3.10'@codemirror/[email protected]':dependencies:'@codemirror/autocomplete': 6.18.6- '@codemirror/language': 6.10.8- '@codemirror/lint': 6.8.4+ '@codemirror/language': 6.11.0+ '@codemirror/lint': 6.8.5'@codemirror/state': 6.5.2- '@codemirror/view': 6.36.3+ '@codemirror/view': 6.36.4'@lezer/common': 1.2.3'@lezer/javascript': 1.4.19@@ -9782,32 +9782,32 @@ snapshots:dependencies:'@codemirror/autocomplete': 6.18.6'@codemirror/lang-html': 6.4.9- '@codemirror/language': 6.10.8+ '@codemirror/language': 6.11.0'@codemirror/state': 6.5.2- '@codemirror/view': 6.36.3+ '@codemirror/view': 6.36.4'@lezer/common': 1.2.3'@lezer/markdown': 1.3.1- '@codemirror/[email protected]':+ '@codemirror/[email protected]':dependencies:'@codemirror/state': 6.5.2- '@codemirror/view': 6.36.3+ '@codemirror/view': 6.36.4'@lezer/common': 1.2.3'@lezer/highlight': 1.2.1'@lezer/lr': 1.4.2style-mod: 4.1.2- '@codemirror/[email protected]':+ '@codemirror/[email protected]':dependencies:'@codemirror/state': 6.5.2- '@codemirror/view': 6.36.3+ '@codemirror/view': 6.36.4crelt: 1.0.6'@codemirror/[email protected]':dependencies:'@marijn/find-cluster-break': 1.0.2- '@codemirror/[email protected]':+ '@codemirror/[email protected]':dependencies:'@codemirror/state': 6.5.2style-mod: 4.1.2@@ -10638,7 +10638,7 @@ snapshots:'@lezer/[email protected]': {}- '@lezer/[email protected]':+ '@lezer/[email protected]':dependencies:'@lezer/common': 1.2.3'@lezer/highlight': 1.2.1