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: switch preset styles to nesting rules (#3604)
Bogdan Chadkin14791a476bc5
diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 572631b725..241228d795 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -11,8 +11,8 @@ import {collapsedAttribute,idAttribute,addGlobalRules,+ addPresetRules,createImageValueTransformer,- getPresetStyleRules,descendantComponent,type Params,} from "@webstudio-is/react-sdk";@@ -319,16 +319,7 @@ export const GlobalStyles = ({ params }: { params: Params }) => {useLayoutEffect(() => {presetSheet.clear();- for (const [component, meta] of metas) {- const presetStyle = meta.presetStyle;- if (presetStyle === undefined) {- continue;- }- const rules = getPresetStyleRules(component, presetStyle);- for (const [selector, style] of rules) {- presetSheet.addStyleRule({ style }, selector);- }- }+ addPresetRules(presetSheet, metas);presetSheet.render();}, [metas]);diff --git a/packages/react-sdk/src/css/css.test.tsx b/packages/react-sdk/src/css/css.test.tsxindex f8f222ec0c..34a30feb12 100644--- a/packages/react-sdk/src/css/css.test.tsx+++ b/packages/react-sdk/src/css/css.test.tsx@@ -176,3 +176,63 @@ Map {}`);});++test("generate component presets", () => {+ const { cssText, atomicCssText, classesMap } = generateAllCss({+ assets: new Map(),+ instances: new Map(),+ props: new Map(),+ breakpoints: new Map(),+ styleSourceSelections: new Map([]),+ styles: new Map(),+ componentMetas: new Map([+ [+ "Box",+ {+ type: "container",+ icon: "",+ presetStyle: {+ div: [+ {+ property: "display",+ value: { type: "keyword", value: "block" },+ },+ ],+ a: [+ {+ property: "userSelect",+ value: { type: "keyword", value: "none" },+ },+ ],+ },+ },+ ],+ ]),+ assetBaseUrl: "",+ });+ expect(cssText).toMatchInlineSnapshot(`+"html {margin: 0; display: grid; min-height: 100%}+@media all {+ div:where([data-ws-component="Box"]) {+ display: block+ }+ a:where([data-ws-component="Box"]) {+ user-select: none+ }+}+"+`);+ expect(atomicCssText).toMatchInlineSnapshot(`+"html {margin: 0; display: grid; min-height: 100%}+@media all {+ div:where([data-ws-component="Box"]) {+ display: block+ }+ a:where([data-ws-component="Box"]) {+ user-select: none+ }+}+"+`);+ expect(classesMap).toMatchInlineSnapshot(`Map {}`);+});diff --git a/packages/react-sdk/src/css/css.ts b/packages/react-sdk/src/css/css.tsindex 48db141dd4..e67c0b1454 100644--- a/packages/react-sdk/src/css/css.ts+++ b/packages/react-sdk/src/css/css.ts@@ -16,8 +16,7 @@ import type {import type { WsComponentMeta } from "../components/component-meta";import { idAttribute } from "../props";import { descendantComponent } from "../core-components";-import { addGlobalRules } from "./global-rules";-import { getPresetStyleRules } from "./style-rules";+import { addGlobalRules, addPresetRules } from "./global-rules";export type CssConfig = {assets: Assets;@@ -68,6 +67,7 @@ export const generateCss = ({assetBaseUrl,atomic,}: CssConfig) => {+ const globalSheet = createRegularStyleSheet({ name: "ssr" });const sheet = createRegularStyleSheet({ name: "ssr" });const parentIdByInstanceId = new Map<Instance["id"], Instance["id"]>();for (const instance of instances.values()) {@@ -85,23 +85,13 @@ export const generateCss = ({}}- addGlobalRules(sheet, { assets, assetBaseUrl });+ addGlobalRules(globalSheet, { assets, assetBaseUrl });+ addPresetRules(globalSheet, componentMetas);for (const breakpoint of breakpoints.values()) {sheet.addMediaRule(breakpoint.id, breakpoint);}- for (const [component, meta] of componentMetas) {- const presetStyle = meta.presetStyle;- if (presetStyle === undefined) {- continue;- }- const rules = getPresetStyleRules(component, presetStyle);- for (const [selector, style] of rules) {- sheet.addStyleRule({ style }, selector);- }- }-const imageValueTransformer = createImageValueTransformer(assets, {assetBaseUrl,});@@ -141,13 +131,14 @@ export const generateCss = ({}if (atomic) {- return generateAtomic(sheet, {+ const { cssText, classesMap } = generateAtomic(sheet, {getKey: (rule) => instanceByRule.get(rule) ?? "",transformValue: imageValueTransformer,});+ return { cssText: `${globalSheet.cssText}\n${cssText}`, classesMap };}return {- cssText: sheet.cssText,+ cssText: `${globalSheet.cssText}\n${sheet.cssText}`,classesMap: new Map<string, Array<string>>(),};};diff --git a/packages/react-sdk/src/css/global-rules.ts b/packages/react-sdk/src/css/global-rules.tsindex 1652af2eb5..077a180d60 100644--- a/packages/react-sdk/src/css/global-rules.ts+++ b/packages/react-sdk/src/css/global-rules.ts@@ -1,6 +1,7 @@import type { StyleSheetRegular } from "@webstudio-is/css-engine";import type { Assets, FontAsset } from "@webstudio-is/sdk";import { getFontFaces } from "@webstudio-is/fonts";+import type { WsComponentMeta } from "../components/component-meta";export const addGlobalRules = (sheet: StyleSheetRegular,@@ -24,3 +25,25 @@ export const addGlobalRules = (sheet.addFontFaceRule(fontFace);}};++export const addPresetRules = (+ sheet: StyleSheetRegular,+ metas: Map<string, WsComponentMeta>+) => {+ sheet.addMediaRule("presets");+ for (const [component, meta] of metas) {+ for (const [tag, styles] of Object.entries(meta.presetStyle ?? {})) {+ const rule = sheet.addNestingRule(+ `${tag}:where([data-ws-component="${component}"])`+ );+ for (const declaration of styles) {+ rule.setDeclaration({+ breakpoint: "presets",+ selector: declaration.state ?? "",+ property: declaration.property,+ value: declaration.value,+ });+ }+ }+ }+};diff --git a/packages/react-sdk/src/css/style-rules.ts b/packages/react-sdk/src/css/style-rules.tsindex 34e1cdbd27..a5308b1feb 100644--- a/packages/react-sdk/src/css/style-rules.ts+++ b/packages/react-sdk/src/css/style-rules.ts@@ -6,8 +6,6 @@ import type {StyleSource,StyleSourceSelections,} from "@webstudio-is/sdk";-import type { PresetStyle } from "../components/component-meta";-import { componentAttribute } from "../props";type StyleRule = {instanceId: string;@@ -79,25 +77,3 @@ export const getStyleRules = (return styleRules;};--export const getPresetStyleRules = (- component: string,- presetStyle: PresetStyle-) => {- // group style declarations by selector to render as separate rules- const presetStyleRules = new Map<string, Style>();- for (const [tag, styles] of Object.entries(presetStyle)) {- for (const styleDecl of styles) {- const selector = `${tag}:where([${componentAttribute}="${component}"])${- styleDecl.state ?? ""- }`;- let rule = presetStyleRules.get(selector);- if (rule === undefined) {- rule = {};- presetStyleRules.set(selector, rule);- }- rule[styleDecl.property] = styleDecl.value;- }- }- return presetStyleRules;-};