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.

fix: generate text-wrap-style: auto (#4321)

Bogdan Chadkin8d7cf574fcc3
diff --git a/packages/css-data/bin/mdn-data.ts b/packages/css-data/bin/mdn-data.ts
index 0f7495096e..57109a60ce 100755
--- a/packages/css-data/bin/mdn-data.ts
+++ b/packages/css-data/bin/mdn-data.ts
@@ -366,6 +366,11 @@ const keywordValues = (() => {
const result = { ...customData.keywordValues };
for (const property in filteredProperties) {
+ const key = normalizePropertyName(property);
+ // prevent merging with custom keywords
+ if (result[key]) {
+ continue;
+ }
const keywords = new Set<string>();
walkSyntax(
filteredProperties[property as keyof typeof filteredProperties].syntax,
@@ -390,7 +395,6 @@ const keywordValues = (() => {
}
if (keywords.size !== 0) {
- const key = normalizePropertyName(property);
result[key] = [...(result[key] ?? []), ...keywords];
}
}
diff --git a/packages/css-data/src/__generated__/keyword-values.ts b/packages/css-data/src/__generated__/keyword-values.ts
index 977e817ee9..1d341c95cc 100644
--- a/packages/css-data/src/__generated__/keyword-values.ts
+++ b/packages/css-data/src/__generated__/keyword-values.ts
@@ -16,6 +16,7 @@ export const keywordValues = {
"inherit",
"unset",
],
+ textWrapMode: ["wrap", "nowrap", "initial", "inherit", "unset"],
"-webkit-line-clamp": ["none", "initial", "inherit", "unset"],
"-webkit-overflow-scrolling": [
"auto",
@@ -5041,7 +5042,6 @@ export const keywordValues = {
"inherit",
"unset",
],
- textWrapMode: ["auto", "wrap", "nowrap", "initial", "inherit", "unset"],
textWrapStyle: [
"auto",
"balance",
diff --git a/packages/css-data/src/custom-data.ts b/packages/css-data/src/custom-data.ts
index 77219cfa2a..5b172e3e97 100644
--- a/packages/css-data/src/custom-data.ts
+++ b/packages/css-data/src/custom-data.ts
@@ -82,8 +82,16 @@ keywordValues.listStyleType = [
"georgian",
"trad-chinese-informal",
"kannada",
+ "none",
+ "initial",
+ "inherit",
+ "unset",
];
+// removed auto from keywords
+// fixed in webref btw
+keywordValues.textWrapMode = ["wrap", "nowrap", "initial", "inherit", "unset"];
+
export const customLonghandPropertyNames = [
"boxShadowOffsetX",
"boxShadowOffsetY",
diff --git a/packages/css-engine/src/core/merger.test.ts b/packages/css-engine/src/core/merger.test.ts
index dab918e5e4..a9fd98cd83 100644
--- a/packages/css-engine/src/core/merger.test.ts
+++ b/packages/css-engine/src/core/merger.test.ts
@@ -272,6 +272,18 @@ test("merge text-wrap-mode and text-wrap-style into text-wrap", () => {
["white-space", "normal"],
["text-wrap", "pretty"],
]);
+ expect(
+ mergeKeywords([
+ ["text-wrap-mode", "wrap"],
+ ["text-wrap-style", "auto"],
+ ])
+ ).toEqual([
+ ["white-space", "normal"],
+ ["text-wrap", "wrap"],
+ ]);
+ expect(mergeKeywords([["text-wrap-style", "auto"]])).toEqual([
+ ["text-wrap", "wrap"],
+ ]);
});
test("merge text-wrap with vars", () => {
diff --git a/packages/css-engine/src/core/merger.ts b/packages/css-engine/src/core/merger.ts
index bb7d0beb89..bb470d7e81 100644
--- a/packages/css-engine/src/core/merger.ts
+++ b/packages/css-engine/src/core/merger.ts
@@ -94,6 +94,9 @@ const mergeWhiteSpaceAndTextWrap = (styleMap: StyleMap) => {
if (collapse === "break-spaces") {
styleMap.set("white-space", { type: "keyword", value: "break-spaces" });
}
+ if (style === "auto") {
+ styleMap.set("text-wrap", modeValue ?? { type: "keyword", value: "wrap" });
+ }
if (style === "balance" || style === "stable" || style === "pretty") {
styleMap.set("text-wrap", { type: "keyword", value: style });
}