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
experimental: parse non-standard properties (#3648)
Bogdan Chadkin009c5d8e2d9f
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.tsindex f119d4bb3d..c17c5e94f8 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@@ -3032,9 +3032,9 @@ export const styles = {},},{- property: "fontSmoothing",+ property: "WebkitFontSmoothing",value: {- type: "invalid",+ type: "keyword",value: "auto",},},@@ -8209,13 +8209,6 @@ export const styles = {b: 0,},},- {- property: "tapHighlightColor",- value: {- type: "invalid",- value: "rgba(0,0,0,0)",- },- },{property: "backgroundImage",value: {@@ -8511,13 +8504,6 @@ export const styles = {b: 0,},},- {- property: "tapHighlightColor",- value: {- type: "invalid",- value: "rgba(0,0,0,0)",- },- },{property: "marginTop",value: {@@ -8971,13 +8957,6 @@ export const styles = {b: 0,},},- {- property: "tapHighlightColor",- value: {- type: "invalid",- value: "rgba(0,0,0,0)",- },- },{property: "userSelect",value: {@@ -9143,13 +9122,6 @@ export const styles = {b: 0,},},- {- property: "tapHighlightColor",- value: {- type: "invalid",- value: "rgba(0,0,0,0)",- },- },{property: "userSelect",value: {@@ -10335,8 +10307,8 @@ export const styles = {{property: "-webkit-tap-highlight-color",value: {- type: "invalid",- value: "",+ type: "keyword",+ value: "transparent",},},{@@ -10586,8 +10558,8 @@ export const styles = {{property: "-webkit-overflow-scrolling",value: {- type: "invalid",- value: "",+ type: "keyword",+ value: "touch",},},{@@ -10617,8 +10589,8 @@ export const styles = {{property: "-webkit-overflow-scrolling",value: {- type: "invalid",- value: "",+ type: "keyword",+ value: "touch",},},{@@ -13117,13 +13089,6 @@ export const styles = {b: 0,},},- {- property: "tapHighlightColor",- value: {- type: "invalid",- value: "rgba(0,0,0,0)",- },- },{property: "userSelect",value: {diff --git a/apps/builder/package.json b/apps/builder/package.jsonindex e3a1bbed33..42c592ea79 100644--- a/apps/builder/package.json+++ b/apps/builder/package.json@@ -7,8 +7,7 @@"scripts": {"prebuild": "which remix","build": "remix vite:build",- "css-to-ws": "NODE_OPTIONS='--conditions=webstudio --import=tsx' 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",+ "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","start": "remix-serve build/server/index.js","dev": "remix vite:dev","typecheck": "tsc --noEmit --emitDeclarationOnly false",diff --git a/packages/css-data/bin/mdn-data.ts b/packages/css-data/bin/mdn-data.tsindex 356dd65f3a..80415bdb2e 100755--- a/packages/css-data/bin/mdn-data.ts+++ b/packages/css-data/bin/mdn-data.ts@@ -244,6 +244,8 @@ const experimentalProperties = ["-webkit-line-clamp","background-position-x","background-position-y",+ "-webkit-tap-highlight-color",+ "-webkit-overflow-scrolling",];const unsupportedProperties = [diff --git a/packages/css-data/src/__generated__/keyword-values.ts b/packages/css-data/src/__generated__/keyword-values.tsindex 4ea7cca62c..22d9ca8583 100644--- a/packages/css-data/src/__generated__/keyword-values.ts+++ b/packages/css-data/src/__generated__/keyword-values.ts@@ -17,6 +17,168 @@ export const keywordValues = {"unset",],"-webkit-line-clamp": ["none", "initial", "inherit", "unset"],+ "-webkit-overflow-scrolling": [+ "auto",+ "touch",+ "initial",+ "inherit",+ "unset",+ ],+ "-webkit-tap-highlight-color": [+ "transparent",+ "aliceblue",+ "antiquewhite",+ "aqua",+ "aquamarine",+ "azure",+ "beige",+ "bisque",+ "black",+ "blanchedalmond",+ "blue",+ "blueviolet",+ "brown",+ "burlywood",+ "cadetblue",+ "chartreuse",+ "chocolate",+ "coral",+ "cornflowerblue",+ "cornsilk",+ "crimson",+ "cyan",+ "darkblue",+ "darkcyan",+ "darkgoldenrod",+ "darkgray",+ "darkgreen",+ "darkgrey",+ "darkkhaki",+ "darkmagenta",+ "darkolivegreen",+ "darkorange",+ "darkorchid",+ "darkred",+ "darksalmon",+ "darkseagreen",+ "darkslateblue",+ "darkslategray",+ "darkslategrey",+ "darkturquoise",+ "darkviolet",+ "deeppink",+ "deepskyblue",+ "dimgray",+ "dimgrey",+ "dodgerblue",+ "firebrick",+ "floralwhite",+ "forestgreen",+ "fuchsia",+ "gainsboro",+ "ghostwhite",+ "gold",+ "goldenrod",+ "gray",+ "green",+ "greenyellow",+ "grey",+ "honeydew",+ "hotpink",+ "indianred",+ "indigo",+ "ivory",+ "khaki",+ "lavender",+ "lavenderblush",+ "lawngreen",+ "lemonchiffon",+ "lightblue",+ "lightcoral",+ "lightcyan",+ "lightgoldenrodyellow",+ "lightgray",+ "lightgreen",+ "lightgrey",+ "lightpink",+ "lightsalmon",+ "lightseagreen",+ "lightskyblue",+ "lightslategray",+ "lightslategrey",+ "lightsteelblue",+ "lightyellow",+ "lime",+ "limegreen",+ "linen",+ "magenta",+ "maroon",+ "mediumaquamarine",+ "mediumblue",+ "mediumorchid",+ "mediumpurple",+ "mediumseagreen",+ "mediumslateblue",+ "mediumspringgreen",+ "mediumturquoise",+ "mediumvioletred",+ "midnightblue",+ "mintcream",+ "mistyrose",+ "moccasin",+ "navajowhite",+ "navy",+ "oldlace",+ "olive",+ "olivedrab",+ "orange",+ "orangered",+ "orchid",+ "palegoldenrod",+ "palegreen",+ "paleturquoise",+ "palevioletred",+ "papayawhip",+ "peachpuff",+ "peru",+ "pink",+ "plum",+ "powderblue",+ "purple",+ "rebeccapurple",+ "red",+ "rosybrown",+ "royalblue",+ "saddlebrown",+ "salmon",+ "sandybrown",+ "seagreen",+ "seashell",+ "sienna",+ "silver",+ "skyblue",+ "slateblue",+ "slategray",+ "slategrey",+ "snow",+ "springgreen",+ "steelblue",+ "tan",+ "teal",+ "thistle",+ "tomato",+ "turquoise",+ "violet",+ "wheat",+ "white",+ "whitesmoke",+ "yellow",+ "yellowgreen",+ "currentColor",+ "initial",+ "inherit",+ "unset",+ ],accentColor: ["auto","transparent",diff --git a/packages/css-data/src/__generated__/properties.ts b/packages/css-data/src/__generated__/properties.tsindex 896a40c1c1..39efb394a6 100644--- a/packages/css-data/src/__generated__/properties.ts+++ b/packages/css-data/src/__generated__/properties.ts@@ -36,6 +36,24 @@ export const properties = {},types: ["integer"],},+ "-webkit-overflow-scrolling": {+ unitGroups: [],+ inherited: true,+ initial: {+ type: "keyword",+ value: "auto",+ },+ types: [],+ },+ "-webkit-tap-highlight-color": {+ unitGroups: [],+ inherited: true,+ initial: {+ type: "keyword",+ value: "black",+ },+ types: ["hex-color"],+ },accentColor: {unitGroups: [],inherited: true,diff --git a/packages/css-data/src/parse-css.test.ts b/packages/css-data/src/parse-css.test.tsindex 64918ef44d..b8c4d0fbd8 100644--- a/packages/css-data/src/parse-css.test.ts+++ b/packages/css-data/src/parse-css.test.ts@@ -650,3 +650,64 @@ describe("Parse CSS", () => {expect(parseCss(`a b { color: #ff0000 }`)).toMatchInlineSnapshot(`{}`);});});++test("parse font-smooth properties", () => {+ expect(+ parseCss(`+ a {+ font-smoothing: auto;+ }+ b {+ -webkit-font-smoothing: auto;+ }+ c {+ -moz-osx-font-smoothing: auto;+ }+ `)+ ).toEqual({+ a: [+ {+ property: "WebkitFontSmoothing",+ value: { type: "keyword", value: "auto" },+ },+ ],+ b: [+ {+ property: "WebkitFontSmoothing",+ value: { type: "keyword", value: "auto" },+ },+ ],+ c: [+ {+ property: "MozOsxFontSmoothing",+ value: { type: "keyword", value: "auto" },+ },+ ],+ });+});++test("parse incorrectly unprefixed tap-highlight-color", () => {+ expect(+ parseCss(`+ a {+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);+ }+ b {+ tap-highlight-color: transparent;+ }+ `)+ ).toEqual({+ a: [+ {+ property: "-webkit-tap-highlight-color",+ value: { alpha: 0, b: 0, g: 0, r: 0, type: "rgb" },+ },+ ],+ b: [+ {+ property: "-webkit-tap-highlight-color",+ value: { type: "keyword", value: "transparent" },+ },+ ],+ });+});diff --git a/packages/css-data/src/parse-css.ts b/packages/css-data/src/parse-css.tsindex 92a26077ca..bbcef47403 100644--- a/packages/css-data/src/parse-css.ts+++ b/packages/css-data/src/parse-css.ts@@ -12,12 +12,17 @@ import { expandShorthands } from "./shorthands";*/export const normalizePropertyName = (property: string) => {// these are manually added with pascal case- if (property === "-webkit-font-smoothing") {+ // convert unprefixed used by webflow version into prefixed one+ if (property === "-webkit-font-smoothing" || property === "font-smoothing") {return "WebkitFontSmoothing";}if (property === "-moz-osx-font-smoothing") {return "MozOsxFontSmoothing";}+ // webflow use unprefixed version+ if (property === "tap-highlight-color") {+ return "-webkit-tap-highlight-color";+ }if (property.startsWith("-")) {return property;}@@ -54,23 +59,25 @@ const parseCssValue = (const expanded = new Map(expandShorthands([[property, value]]));const final = new Map();for (const [property, value] of expanded) {- const normalizedProperty = normalizePropertyName(property);if (value === "") {// Keep the browser behavior when property is defined with an empty value e.g. `color:;`// It may override some existing value and effectively set it to "unset";- final.set(normalizedProperty, { type: "keyword", value: "unset" });+ final.set(property, { type: "keyword", value: "unset" });continue;}// @todo https://github.com/webstudio-is/webstudio/issues/3399if (value.startsWith("var(")) {- final.set(normalizedProperty, { type: "keyword", value: "unset" });+ final.set(property, { type: "keyword", value: "unset" });continue;}final.set(- normalizedProperty,- parseCssValueLonghand(normalizedProperty as StyleProperty, value)+ property,+ parseCssValueLonghand(+ normalizePropertyName(property) as StyleProperty,+ value+ ));}return final;diff --git a/packages/css-engine/src/__generated__/types.ts b/packages/css-engine/src/__generated__/types.tsindex abd90d11e7..9a32400c96 100644--- a/packages/css-engine/src/__generated__/types.ts+++ b/packages/css-engine/src/__generated__/types.ts@@ -3,6 +3,8 @@ export type Property =| "MozOsxFontSmoothing"| "-webkit-box-orient"| "-webkit-line-clamp"+ | "-webkit-overflow-scrolling"+ | "-webkit-tap-highlight-color"| "accentColor"| "alignContent"| "alignItems"