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.

Allow to map individual style values when stringify to css (#1404)

Bogdan Chadkin914fbfca97d7
diff --git a/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsx b/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsx
index 8fb9bcc986..b246b48e7f 100644
--- a/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/font-weight/font-weight-control.tsx
@@ -77,7 +77,15 @@ export const FontWeightControl = ({
const fontFamily = currentStyle.fontFamily?.value;
const availableFontWeights = useAvailableFontWeights(
- toValue(fontFamily, { withFallback: false })
+ toValue(fontFamily, (styleValue) => {
+ // override default fallback with rendering only first font family
+ if (styleValue.type === "fontFamily") {
+ return {
+ type: "fontFamily",
+ value: [styleValue.value[0]],
+ };
+ }
+ })
);
const { labels, selectedLabel } = useLabels(
availableFontWeights,
diff --git a/packages/css-engine/src/core/to-value.test.ts b/packages/css-engine/src/core/to-value.test.ts
index 88e4cb05e9..0765390f8e 100644
--- a/packages/css-engine/src/core/to-value.test.ts
+++ b/packages/css-engine/src/core/to-value.test.ts
@@ -54,13 +54,20 @@ describe("Convert WS CSS Values to native CSS strings", () => {
expect(value).toBe("Courier New, monospace");
});
- test("withFallback=false", () => {
+ test("Transform font family value to override default fallback", () => {
const value = toValue(
{
type: "fontFamily",
value: ["Courier New"],
},
- { withFallback: false }
+ (styleValue) => {
+ if (styleValue.type === "fontFamily") {
+ return {
+ type: "fontFamily",
+ value: [styleValue.value[0]],
+ };
+ }
+ }
);
expect(value).toBe("Courier New");
});
diff --git a/packages/css-engine/src/core/to-value.ts b/packages/css-engine/src/core/to-value.ts
index 6150535542..d24d65c2fd 100644
--- a/packages/css-engine/src/core/to-value.ts
+++ b/packages/css-engine/src/core/to-value.ts
@@ -1,44 +1,50 @@
import type { StyleValue } from "@webstudio-is/css-data";
import { DEFAULT_FONT_FALLBACK, SYSTEM_FONTS } from "@webstudio-is/fonts";
-type ToCssOptions = {
- withFallback: boolean;
-};
-
-const defaultOptions = {
- withFallback: true,
-};
+export type TransformValue = (styleValue: StyleValue) => undefined | StyleValue;
// exhaustive check, should never happen in runtime as ts would give error
const assertUnreachable = (_arg: never, errorMessage: string) => {
throw new Error(errorMessage);
};
+const fallbackTransform: TransformValue = (styleValue) => {
+ if (styleValue.type === "fontFamily") {
+ const firstFontFamily = styleValue.value[0];
+ const fallbacks = SYSTEM_FONTS.get(firstFontFamily);
+ const fontFamily: string[] = [...styleValue.value];
+ if (Array.isArray(fallbacks)) {
+ fontFamily.push(...fallbacks);
+ } else {
+ fontFamily.push(DEFAULT_FONT_FALLBACK);
+ }
+ return {
+ type: "fontFamily",
+ value: fontFamily,
+ };
+ }
+};
+
export const toValue = (
- value?: StyleValue,
- options: ToCssOptions = defaultOptions
+ styleValue: undefined | StyleValue,
+ transformValue?: TransformValue
): string => {
- if (value === undefined) {
+ if (styleValue === undefined) {
return "";
}
+ const transformedValue =
+ transformValue?.(styleValue) ?? fallbackTransform(styleValue);
+ const value = transformedValue ?? styleValue;
if (value.type === "unit") {
return value.value + (value.unit === "number" ? "" : value.unit);
}
if (value.type === "fontFamily") {
- if (options.withFallback === false) {
- return value.value[0];
- }
- const family = value.value[0];
- const fallbacks = SYSTEM_FONTS.get(family);
- if (Array.isArray(fallbacks)) {
- return [...value.value, ...fallbacks].join(", ");
- }
- return [...value.value, DEFAULT_FONT_FALLBACK].join(", ");
+ return value.value.join(", ");
}
if (value.type === "var") {
const fallbacks = [];
for (const fallback of value.fallbacks) {
- fallbacks.push(toValue(fallback, options));
+ fallbacks.push(toValue(fallback, transformValue));
}
const fallbacksString =
fallbacks.length > 0 ? `, ${fallbacks.join(", ")}` : "";
@@ -85,11 +91,11 @@ export const toValue = (
}
if (value.type === "layers") {
- return value.value.map((value) => toValue(value, options)).join(",");
+ return value.value.map((value) => toValue(value, transformValue)).join(",");
}
if (value.type === "tuple") {
- return value.value.map((value) => toValue(value, options)).join(" ");
+ return value.value.map((value) => toValue(value, transformValue)).join(" ");
}
// Will give ts error in case of missing type