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
Update normalized styles directly (#757)
Bogdan Chadkin8a691b92d194
diff --git a/apps/designer/app/canvas/canvas.tsx b/apps/designer/app/canvas/canvas.tsxindex 0ff5de5389..2ae3fdd6f8 100644--- a/apps/designer/app/canvas/canvas.tsx+++ b/apps/designer/app/canvas/canvas.tsx@@ -38,6 +38,7 @@ import {useBreakpoints,useRootInstance,useSetPresetStyles,+ useSetStyles,useSubscribeScrollState,} from "~/shared/nano-states";import { registerContainers } from "./shared/immerhin";@@ -175,7 +176,8 @@ export const Canvas = ({ data }: CanvasProps): JSX.Element | null => {useInitializeDesignTokens(data.designTokens);const assets = useAssets(data.assets);useAllUserProps(data.props);- useSetPresetStyles(data.tree?.presetStyles);+ useSetPresetStyles(data.tree.presetStyles);+ useSetStyles(data.tree.styles);usePopulateRootInstance(data.tree);setParams(data.params ?? null);diff --git a/apps/designer/app/canvas/features/wrapper-component/wrapper-component.tsx b/apps/designer/app/canvas/features/wrapper-component/wrapper-component.tsxindex f82fd217ed..172798a15f 100644--- a/apps/designer/app/canvas/features/wrapper-component/wrapper-component.tsx+++ b/apps/designer/app/canvas/features/wrapper-component/wrapper-component.tsx@@ -53,7 +53,7 @@ export const WrapperComponentDev = ({children,onChangeChildren,}: WrapperComponentDevProps) => {- useCssRules(instance);+ useCssRules({ instanceId: instance.id });const [editingInstanceId, setTextEditingInstanceId] =useTextEditingInstanceId();diff --git a/apps/designer/app/canvas/shared/breakpoints.ts b/apps/designer/app/canvas/shared/breakpoints.tsindex 0dce73fd90..7c8614121f 100644--- a/apps/designer/app/canvas/shared/breakpoints.ts+++ b/apps/designer/app/canvas/shared/breakpoints.ts@@ -6,11 +6,13 @@ import { deleteCssRulesByBreakpoint } from "~/shared/css-utils";import {breakpointsContainer,rootInstanceContainer,+ stylesContainer,useBreakpoints,} from "~/shared/nano-states";import { publish } from "~/shared/pubsub";import { addMediaRules } from "./styles";import { useSyncInitializeOnce } from "~/shared/hook-utils";+import { filterMutable } from "~/shared/array-utils";export const useInitializeBreakpoints = (breakpoints: Array<Breakpoint>) => {const [, setCurrentBreakpoints] = useBreakpoints();@@ -52,8 +54,8 @@ const useBreakpointChange = () => {const useBreakpointDelete = () => {useSubscribe("breakpointDelete", (breakpoint) => {store.createTransaction(- [breakpointsContainer, rootInstanceContainer],- (breakpoints, rootInstance) => {+ [breakpointsContainer, rootInstanceContainer, stylesContainer],+ (breakpoints, rootInstance, styles) => {if (rootInstance === undefined) {return;}@@ -64,6 +66,9 @@ const useBreakpointDelete = () => {}deleteCssRulesByBreakpoint(rootInstance, breakpoint.id);++ // delete breakpoint styles+ filterMutable(styles, (style) => style.breakpointId !== breakpoint.id);});});diff --git a/apps/designer/app/canvas/shared/immerhin.ts b/apps/designer/app/canvas/shared/immerhin.tsindex d9f5e355a1..e2e7cb9a91 100644--- a/apps/designer/app/canvas/shared/immerhin.ts+++ b/apps/designer/app/canvas/shared/immerhin.ts@@ -4,11 +4,13 @@ import {rootInstanceContainer,breakpointsContainer,designTokensContainer,+ stylesContainer,} from "~/shared/nano-states";export const registerContainers = () => {store.register("breakpoints", breakpointsContainer);store.register("root", rootInstanceContainer);+ store.register("styles", stylesContainer);store.register("props", allUserPropsContainer);store.register("designTokens", designTokensContainer);};diff --git a/apps/designer/app/canvas/shared/styles.ts b/apps/designer/app/canvas/shared/styles.tsindex 6b9b198216..3b9ac36c91 100644--- a/apps/designer/app/canvas/shared/styles.ts+++ b/apps/designer/app/canvas/shared/styles.ts@@ -1,3 +1,4 @@+import { useEffect, useMemo } from "react";import store from "immerhin";import { useSubscribe } from "~/shared/pubsub";import {@@ -9,8 +10,11 @@ import { useSelectedInstance } from "./nano-states";import {designTokensContainer,rootInstanceContainer,+ stylesContainer,+ useBreakpoints,useDesignTokens,usePresetStyles,+ useStyles,} from "~/shared/nano-states";import {getComponentMeta,@@ -26,7 +30,6 @@ import {type StyleProperty,type Style,} from "@webstudio-is/css-data";-import { useEffect } from "react";import {createCssEngine,toValue,@@ -186,23 +189,40 @@ const getRule = (id: string, breakpoint?: string) => {return wrappedRulesMap.get(key);};-export const useCssRules = ({- id,- cssRules,-}: {- id: string;- cssRules: Array<CssRule>;-}) => {+export const useCssRules = ({ instanceId }: { instanceId: string }) => {+ const [styles] = useStyles();+ const [breakpoints] = useBreakpoints();++ const [key, instanceStyles] = useMemo(() => {+ const instanceStyles = styles.filter(+ (item) => item.instanceId === instanceId+ );+ const key = JSON.stringify(instanceStyles);+ return [key, instanceStyles];+ }, [styles, instanceId]);+useIsomorphicLayoutEffect(() => {- for (const cssRule of cssRules) {- const rule = getRule(id, cssRule.breakpoint);+ const stylePerBreakpoint = new Map<string, Style>();++ for (const item of instanceStyles) {+ let style = stylePerBreakpoint.get(item.breakpointId);+ if (style === undefined) {+ style = {};+ stylePerBreakpoint.set(item.breakpointId, style);+ }+ style[item.property] = item.value;+ }++ for (const { id: breakpointId } of breakpoints) {+ const style = stylePerBreakpoint.get(breakpointId) ?? {};+ const rule = getRule(instanceId, breakpointId);// It's the first time the rule is being usedif (rule === undefined) {- addRule(id, cssRule);+ addRule(instanceId, { breakpoint: breakpointId, style });continue;}// It's an update to an existing rule- const dynamicStyle = toVarStyleWithFallback(id, cssRule.style);+ const dynamicStyle = toVarStyleWithFallback(instanceId, style);let property: StyleProperty;for (property in dynamicStyle) {rule.styleMap.set(property, dynamicStyle[property]);@@ -215,7 +235,9 @@ export const useCssRules = ({}}cssEngine.render();- }, [id, cssRules]);+ // run effect only when serialized instanceStyles changed+ // to avoid rerendering on other instances change+ }, [instanceId, key, breakpoints]);};const toVarNamespace = (id: string, property: string) => {@@ -250,6 +272,37 @@ const useUpdateStyle = () => {}utils.tree.setInstanceStyleMutable(rootInstance, id, updates, breakpoint);});++ store.createTransaction([stylesContainer], (styles) => {+ const instanceId = id;+ const breakpointId = breakpoint.id;+ for (const update of updates) {+ const matchedIndex = styles.findIndex(+ (item) =>+ item.breakpointId === breakpointId &&+ item.instanceId === instanceId &&+ item.property === update.property+ );++ if (update.operation === "set") {+ const newItem = {+ breakpointId,+ instanceId,+ property: update.property,+ value: update.value,+ };+ if (matchedIndex === -1) {+ styles.push(newItem);+ } else {+ styles[matchedIndex] = newItem;+ }+ }++ if (update.operation === "delete" && matchedIndex !== -1) {+ styles.splice(matchedIndex, 1);+ }+ }+ });});};diff --git a/apps/designer/app/routes/rest/patch.ts b/apps/designer/app/routes/rest/patch.tsindex e9a8d44cf1..063e3fcfc5 100644--- a/apps/designer/app/routes/rest/patch.ts+++ b/apps/designer/app/routes/rest/patch.ts@@ -28,6 +28,8 @@ export const action = async ({ request }: ActionArgs) => {if (namespace === "root") {await projectDb.tree.patch({ treeId }, patches);+ } else if (namespace === "styles") {+ await projectDb.styles.patch({ treeId }, patches);} else if (namespace === "props") {await projectDb.props.patch({ treeId }, patches);} else if (namespace === "breakpoints") {diff --git a/apps/designer/app/shared/array-utils.test.ts b/apps/designer/app/shared/array-utils.test.tsnew file mode 100644index 0000000000..7b8d7ddda3--- /dev/null+++ b/apps/designer/app/shared/array-utils.test.ts@@ -0,0 +1,35 @@+import { expect, test } from "@jest/globals";+import { filterMutable } from "./array-utils";++test("filterMutable", () => {+ const array = [+ { param: 1 },+ { param: 2 },+ { param: 3 },+ { param: 4 },+ { param: 5 },+ { param: 6 },+ ];+ filterMutable(array, (item) => item.param % 2 === 0);+ expect(array).toMatchInlineSnapshot(`+ [+ {+ "param": 2,+ },+ {+ "param": 4,+ },+ {+ "param": 6,+ },+ ]+ `);+ filterMutable(array, (item) => item.param === 4);+ expect(array).toMatchInlineSnapshot(`+ [+ {+ "param": 4,+ },+ ]+ `);+});diff --git a/apps/designer/app/shared/array-utils.ts b/apps/designer/app/shared/array-utils.tsnew file mode 100644index 0000000000..d224aa8bb5--- /dev/null+++ b/apps/designer/app/shared/array-utils.ts@@ -0,0 +1,11 @@+export const filterMutable = <T>(+ array: T[],+ predicate: (value: T) => boolean+) => {+ // reversed order to splice without breaking index+ for (let index = array.length - 1; index >= 0; index -= 1) {+ if (predicate(array[index]) === false) {+ array.splice(index, 1);+ }+ }+};diff --git a/apps/designer/app/shared/nano-states/nano-states.ts b/apps/designer/app/shared/nano-states/nano-states.tsindex 77fa8ea97a..c656adfca1 100644--- a/apps/designer/app/shared/nano-states/nano-states.ts+++ b/apps/designer/app/shared/nano-states/nano-states.ts@@ -1,12 +1,12 @@-import { useState } from "react";import { createValueContainer, useValue } from "react-nano-state";-import type { Instance, PresetStyles } from "@webstudio-is/react-sdk";+import type { Instance, PresetStyles, Styles } from "@webstudio-is/react-sdk";import type {DropTargetChangePayload,DragStartPayload,} from "~/canvas/shared/use-drag-drop";import type { Breakpoint } from "@webstudio-is/css-data";import type { DesignToken } from "@webstudio-is/design-tokens";+import { useSyncInitializeOnce } from "../hook-utils";export const rootInstanceContainer = createValueContainer<Instance | undefined@@ -15,11 +15,17 @@ export const useRootInstance = () => useValue(rootInstanceContainer);export const presetStylesContainer = createValueContainer<PresetStyles>([]);export const usePresetStyles = () => useValue(presetStylesContainer);-export const useSetPresetStyles = (presetStyles?: PresetStyles) => {- useState(() => {- if (presetStyles) {- presetStylesContainer.value = presetStyles;- }+export const useSetPresetStyles = (presetStyles: PresetStyles) => {+ useSyncInitializeOnce(() => {+ presetStylesContainer.value = presetStyles;+ });+};++export const stylesContainer = createValueContainer<Styles>([]);+export const useStyles = () => useValue(stylesContainer);+export const useSetStyles = (styles: Styles) => {+ useSyncInitializeOnce(() => {+ stylesContainer.value = styles;});};diff --git a/packages/project/src/db/index.ts b/packages/project/src/db/index.tsindex 0c117c9378..e40697ef97 100644--- a/packages/project/src/db/index.ts+++ b/packages/project/src/db/index.ts@@ -1,6 +1,7 @@import * as project from "./project";import * as tree from "./tree";+import * as styles from "./styles";import * as props from "./props";import * as breakpoints from "./breakpoints";import * as build from "./build";-export { project, tree, breakpoints, props, build };+export { project, tree, breakpoints, styles, props, build };diff --git a/packages/project/src/db/styles.ts b/packages/project/src/db/styles.tsnew file mode 100644index 0000000000..eac86d6459--- /dev/null+++ b/packages/project/src/db/styles.ts@@ -0,0 +1,30 @@+import { type Patch, applyPatches } from "immer";+import { prisma } from "@webstudio-is/prisma-client";+import { Styles } from "@webstudio-is/react-sdk";++const loadStylesByTreeId = async (treeId: string) => {+ const tree = await prisma.tree.findUnique({+ where: { id: treeId },+ });++ if (tree === null) {+ return [];+ }++ return Styles.parse(JSON.parse(tree.styles));+};++export const patch = async (+ { treeId }: { treeId: string },+ patches: Array<Patch>+) => {+ const styles = await loadStylesByTreeId(treeId);+ const patchedStyles = Styles.parse(applyPatches(styles, patches));++ await prisma.tree.update({+ data: {+ styles: JSON.stringify(patchedStyles),+ },+ where: { id: treeId },+ });+};diff --git a/packages/project/src/db/tree.ts b/packages/project/src/db/tree.tsindex a334e25133..8f4fb48b69 100644--- a/packages/project/src/db/tree.ts+++ b/packages/project/src/db/tree.ts@@ -20,7 +20,6 @@ import {SharedStyleValue,ImageValue,type CssRule,- type StyleProperty,} from "@webstudio-is/css-data";import { z } from "zod";import DataLoader from "dataloader";@@ -160,7 +159,7 @@ export const create = async (});};-export const deleteById = async (treeId: string): Promise<void> => {+export const deleteById = async (treeId: Tree["id"]): Promise<void> => {await prisma.tree.delete({ where: { id: treeId } });};@@ -190,7 +189,7 @@ const addStylesToInstancesMutable = (instance: Instance, styles: Styles) => {};export const loadById = async (- treeId: string,+ treeId: Tree["id"],client: Prisma.TransactionClient = prisma): Promise<Tree | null> => {const tree = await client.tree.findUnique({@@ -220,7 +219,7 @@ export const loadById = async (};export const clone = async (- treeId: string,+ treeId: Tree["id"],client: Prisma.TransactionClient = prisma) => {const tree = await loadById(treeId, client);@@ -239,32 +238,6 @@ const collectUsedComponents = (instance: Instance, components: Set<string>) => {}};-const extractStylesFromInstancesMutable = (- instance: Instance,- styles: Styles-) => {- for (const rule of instance.cssRules) {- if (rule.breakpoint === undefined) {- continue;- }- for (const [property, value] of Object.entries(rule.style)) {- styles.push({- breakpointId: rule.breakpoint,- instanceId: instance.id,- property: property as StyleProperty,- value,- });- }- }- instance.cssRules = [];-- for (const child of instance.children) {- if (child.type === "instance") {- extractStylesFromInstancesMutable(child, styles);- }- }-};-export const patch = async ({ treeId }: { treeId: Tree["id"] },patches: Array<Patch>@@ -281,17 +254,13 @@ export const patch = async (Array.from(components));const presetStyles = [...tree.presetStyles, ...missingPresetStyles];- const styles: Styles = [];const root = InstanceDbIn.parse(clientRoot);- extractStylesFromInstancesMutable(root, styles);-await prisma.tree.update({data: {root: JSON.stringify(root),presetStyles: JSON.stringify(presetStyles),- styles: JSON.stringify(styles),},where: { id: treeId },});diff --git a/packages/react-sdk/src/db/style.ts b/packages/react-sdk/src/db/style.tsindex 9af2f3a2aa..2b783c09ca 100644--- a/packages/react-sdk/src/db/style.ts+++ b/packages/react-sdk/src/db/style.ts@@ -7,18 +7,14 @@ import {getComponentNames,} from "../components";-export type PresetStylesItem = {- component: ComponentName;- property: StyleProperty;- value: StyleValue;-};--// @todo can't figure out how to make property to be enumexport const PresetStylesItem = z.object({component: z.enum(getComponentNames() as [ComponentName]),- property: z.string(),- value: SharedStyleValue,-}) as z.ZodType<PresetStylesItem>;+ // @todo can't figure out how to make property to be enum+ property: z.string() as z.ZodType<StyleProperty>,+ value: SharedStyleValue as z.ZodType<StyleValue>,+});++export type PresetStylesItem = z.infer<typeof PresetStylesItem>;export const PresetStyles = z.array(PresetStylesItem);@@ -52,20 +48,15 @@ export const findMissingPresetStyles = (return missingPresetStyles;};-export type StylesItem = {- breakpointId: string;- instanceId: string;- property: StyleProperty;- value: StyleValue;-};--// @todo can't figure out how to make property to be enumexport const StylesItem = z.object({breakpointId: z.string(),instanceId: z.string(),- property: z.string(),- value: SharedStyleValue,-}) as z.ZodType<StylesItem>;+ // @todo can't figure out how to make property to be enum+ property: z.string() as z.ZodType<StyleProperty>,+ value: SharedStyleValue as z.ZodType<StyleValue>,+});++export type StylesItem = z.infer<typeof StylesItem>;export const Styles = z.array(StylesItem);