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
Represent breakpoints as map (#1032)
Bogdan Chadkineb255b7dab83
diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsxindex c98b1b6cc5..8faf9d0481 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx@@ -12,7 +12,6 @@ import {} from "@webstudio-is/design-system";import { PlusIcon, TrashIcon } from "@webstudio-is/icons";import { breakpointsContainer, useBreakpoints } from "~/shared/nano-states";-import { replaceByOrAppendMutable } from "~/shared/array-utils";type BreakpointEditorItemProps = {breakpoint: Breakpoint;@@ -101,7 +100,7 @@ export const BreakpointsEditor = ({ onDelete }: BreakpointsEditorProps) => {const [breakpoints] = useBreakpoints();const [addedBreakpoints, setAddedBreakpoints] = useState<Breakpoint[]>([]);const storedBreakpoints = new Set<string>();- for (const breakpoint of breakpoints) {+ for (const breakpoint of breakpoints.values()) {storedBreakpoints.add(breakpoint.id);}// filter out new breakpoints which are already store@@ -139,18 +138,14 @@ export const BreakpointsEditor = ({ onDelete }: BreakpointsEditorProps) => {prefix={<PlusIcon />}/></Flex>- {[...breakpoints, ...newBreakpoints].map((breakpoint) => {+ {[...breakpoints.values(), ...newBreakpoints].map((breakpoint) => {return (<BreakpointEditorItemkey={breakpoint.id}breakpoint={breakpoint}onChange={(updatedBreakpoint) => {store.createTransaction([breakpointsContainer], (breakpoints) => {- replaceByOrAppendMutable(- breakpoints,- updatedBreakpoint,- ({ id }) => id === updatedBreakpoint.id- );+ breakpoints.set(updatedBreakpoint.id, updatedBreakpoint);});}}onDelete={onDelete}diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints.tsxindex 6fc1c873a8..8114d9324e 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints.tsx@@ -26,7 +26,6 @@ import {stylesStore,useBreakpoints,} from "~/shared/nano-states";-import { removeByMutable } from "~/shared/array-utils";import {selectedBreakpointIdStore,selectedBreakpointStore,@@ -68,7 +67,7 @@ export const Breakpoints = () => {[breakpointsContainer, stylesStore],(breakpoints, styles) => {const breakpointId = breakpointToDelete.id;- removeByMutable(breakpoints, ({ id }) => id === breakpointId);+ breakpoints.delete(breakpointId);for (const [styleDeclKey, styleDecl] of styles) {if (styleDecl.breakpointId === breakpointId) {styles.delete(styleDeclKey);diff --git a/apps/builder/app/builder/features/style-panel/shared/property-name.tsx b/apps/builder/app/builder/features/style-panel/shared/property-name.tsxindex 12de843e18..cf5aa35e2f 100644--- a/apps/builder/app/builder/features/style-panel/shared/property-name.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/property-name.tsx@@ -53,9 +53,7 @@ const PropertyPopoverContent = ({if (styleValueInfo?.cascaded) {const { value, breakpointId } = styleValueInfo.cascaded;- const breakpoint = breakpoints.find(- (item) => item.id === breakpointId- );+ const breakpoint = breakpoints.get(breakpointId);return (<DeprecatedText2 key={property} color="hint">Resetting will change {property} to cascaded {toValue(value)}{" "}@@ -93,9 +91,7 @@ const PropertyPopoverContent = ({if (styleValueInfo?.cascaded) {const { breakpointId } = styleValueInfo.cascaded;- const breakpoint = breakpoints.find(- (item) => item.id === breakpointId- );+ const breakpoint = breakpoints.get(breakpointId);return (<DeprecatedText2 key={property} color="hint">{property} value is cascaded from {breakpoint?.label}diff --git a/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.test.tsindex c0cd95a5e8..36f499cdf0 100644--- a/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts+++ b/apps/builder/app/builder/features/style-panel/shared/style-info.test.ts@@ -1,5 +1,5 @@import type {- Breakpoint,+ Breakpoints,Instance,StyleDecl,} from "@webstudio-is/project-build";@@ -9,28 +9,12 @@ import {getInheritedInfo,} from "./style-info";-const breakpoints: Breakpoint[] = [- {- id: "1",- label: "1",- minWidth: 0,- },- {- id: "2",- label: "2",- minWidth: 768,- },- {- id: "3",- label: "3",- minWidth: 1280,- },- {- id: "4",- label: "4",- minWidth: 1920,- },-];+const breakpoints: Breakpoints = new Map([+ ["1", { id: "1", label: "1", minWidth: 0 }],+ ["2", { id: "2", label: "2", minWidth: 768 }],+ ["3", { id: "3", label: "3", minWidth: 1280 }],+ ["4", { id: "4", label: "4", minWidth: 1920 }],+]);const selectedBreakpointId = "3";const selectedInstanceId = "3";diff --git a/apps/builder/app/builder/features/style-panel/shared/style-info.ts b/apps/builder/app/builder/features/style-panel/shared/style-info.tsindex 39403b827a..0b799ea3cf 100644--- a/apps/builder/app/builder/features/style-panel/shared/style-info.ts+++ b/apps/builder/app/builder/features/style-panel/shared/style-info.ts@@ -4,7 +4,7 @@ import type { Style, StyleProperty, StyleValue } from "@webstudio-is/css-data";import { properties } from "@webstudio-is/css-data";import { utils } from "@webstudio-is/project";import type {- Breakpoint,+ Breakpoints,Instance,StyleDecl,StyleSource as StyleSourceType,@@ -98,7 +98,7 @@ const getSelectedStyle = (* find all breakpoints which may affect current view*/export const getCascadedBreakpointIds = (- breakpoints: Breakpoint[],+ breakpoints: Breakpoints,selectedBreakpointId?: string) => {const sortedBreakpoints = utils.breakpoints.sort(breakpoints);diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex 2069a52dfa..90454597c4 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -66,7 +66,7 @@ const useElementsTree = () => {instanceId,updates,rootInstance,- breakpoints[0].id+ Array.from(breakpoints.values())[0].id);});},diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 5f3e790a46..6008a6719a 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -71,7 +71,7 @@ export const GlobalStyles = () => {const assets = useStore(assetsStore);useIsomorphicLayoutEffect(() => {- for (const breakpoint of breakpoints) {+ for (const breakpoint of breakpoints.values()) {cssEngine.addMediaRule(breakpoint.id, breakpoint);}}, [breakpoints]);@@ -175,7 +175,7 @@ export const useCssRules = ({style[item.property] = item.value;}- for (const { id: breakpointId } of breakpoints) {+ for (const breakpointId of breakpoints.keys()) {const style = stylePerBreakpoint.get(breakpointId) ?? {};const rule = getRule(instanceId, breakpointId);// It's the first time the rule is being useddiff --git a/apps/builder/app/shared/array-utils.test.ts b/apps/builder/app/shared/array-utils.test.tsindex c3fa98348a..4610048c93 100644--- a/apps/builder/app/shared/array-utils.test.ts+++ b/apps/builder/app/shared/array-utils.test.ts@@ -1,5 +1,5 @@import { expect, test } from "@jest/globals";-import { removeByMutable, replaceByOrAppendMutable } from "./array-utils";+import { removeByMutable } from "./array-utils";test("removeByMutable", () => {const array = [@@ -33,38 +33,3 @@ test("removeByMutable", () => {]`);});--test("replaceByOrAppendMutable", () => {- const array = [{ param: 1 }, { param: 2 }, { param: 3 }];- replaceByOrAppendMutable(array, { param: 6 }, (item) => item.param === 2);- expect(array).toMatchInlineSnapshot(`- [- {- "param": 1,- },- {- "param": 6,- },- {- "param": 3,- },- ]- `);- replaceByOrAppendMutable(array, { param: 8 }, (item) => item.param === 8);- expect(array).toMatchInlineSnapshot(`- [- {- "param": 1,- },- {- "param": 6,- },- {- "param": 3,- },- {- "param": 8,- },- ]- `);-});diff --git a/apps/builder/app/shared/array-utils.ts b/apps/builder/app/shared/array-utils.tsindex f543881a89..2ca3ef00f7 100644--- a/apps/builder/app/shared/array-utils.ts+++ b/apps/builder/app/shared/array-utils.ts@@ -11,16 +11,3 @@ export const removeByMutable = <Item>(}}};--export const replaceByOrAppendMutable = <Item>(- array: Item[],- item: Item,- predicate: Predicate<Item>-) => {- const matchedIndex = array.findIndex(predicate);- if (matchedIndex === -1) {- array.push(item);- } else {- array[matchedIndex] = item;- }-};diff --git a/apps/builder/app/shared/nano-states/breakpoints.ts b/apps/builder/app/shared/nano-states/breakpoints.tsindex fbe24f4e00..d63d8c40e3 100644--- a/apps/builder/app/shared/nano-states/breakpoints.ts+++ b/apps/builder/app/shared/nano-states/breakpoints.ts@@ -24,11 +24,12 @@ export const selectedBreakpointIdStore = atom<undefined | Breakpoint["id"]>(export const selectedBreakpointStore = computed([breakpointsContainer, selectedBreakpointIdStore],(breakpoints, selectedBreakpointId) => {- const matchedBreakpoint = breakpoints.find(- (breakpoint) => breakpoint.id === selectedBreakpointId- );+ const matchedBreakpoint =+ selectedBreakpointId === undefined+ ? undefined+ : breakpoints.get(selectedBreakpointId);// initially set first breakpoint as selected breakpoint- const fallbackBreakpoint = utils.breakpoints.sort(breakpoints)[0];+ const fallbackBreakpoint = utils.breakpoints.sort(breakpoints).at(0);return matchedBreakpoint ?? fallbackBreakpoint;});diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex f4edfe0209..7c01770e32 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -6,6 +6,7 @@ import type { AuthPermit } from "@webstudio-is/trpc-interface";import type { Asset } from "@webstudio-is/asset-uploader";import type {Breakpoint,+ Breakpoints,Instance,Prop,Props,@@ -198,11 +199,13 @@ export const stylesIndexStore = computed(});-export const breakpointsContainer = atom<Breakpoint[]>([]);+export const breakpointsContainer = atom<Breakpoints>(new Map());export const useBreakpoints = () => useValue(breakpointsContainer);-export const useSetBreakpoints = (breakpoints: Breakpoint[]) => {+export const useSetBreakpoints = (+ breakpoints: [Breakpoint["id"], Breakpoint][]+) => {useSyncInitializeOnce(() => {- breakpointsContainer.set(breakpoints);+ breakpointsContainer.set(new Map(breakpoints));});};diff --git a/packages/project-build/src/schema/breakpoints.ts b/packages/project-build/src/schema/breakpoints.tsindex 537f349f4f..28d4673d8e 100644--- a/packages/project-build/src/schema/breakpoints.ts+++ b/packages/project-build/src/schema/breakpoints.ts@@ -13,3 +13,7 @@ export type Breakpoint = z.infer<typeof Breakpoint>;export const BreakpointsList = z.array(Breakpoint);export type BreakpointsList = z.infer<typeof BreakpointsList>;++export const Breakpoints = z.map(BreakpointId, Breakpoint);++export type Breakpoints = z.infer<typeof Breakpoints>;diff --git a/packages/project/src/db/breakpoints.ts b/packages/project/src/db/breakpoints.tsindex ed2b1ea6b7..c2cef6292b 100644--- a/packages/project/src/db/breakpoints.ts+++ b/packages/project/src/db/breakpoints.ts@@ -5,18 +5,40 @@ import {type Breakpoints as DbBreakpoints,prisma,} from "@webstudio-is/prisma-client";-import { BreakpointsList } from "@webstudio-is/project-build";+import {+ Breakpoint,+ Breakpoints,+ BreakpointsList,+} from "@webstudio-is/project-build";import type { Project } from "../shared/schema";import {authorizeProject,type AppContext,} from "@webstudio-is/trpc-interface/server";-export const createValues = (): BreakpointsList => {- return initialBreakpoints.map((breakpoint) => ({- ...breakpoint,- id: nanoid(),- }));+export const parseBreakpoints = (breakpointsString: string): Breakpoints => {+ const breakpointssList = BreakpointsList.parse(JSON.parse(breakpointsString));+ return new Map(breakpointssList.map((item) => [item.id, item]));+};++export const serializeBreakpoints = (breakpointssMap: Breakpoints) => {+ const breakpointssList: BreakpointsList = Array.from(+ breakpointssMap.values()+ );+ return JSON.stringify(breakpointssList);+};++export const createValues = (): [Breakpoint["id"], Breakpoint][] => {+ return initialBreakpoints.map((breakpoint) => {+ const id = nanoid();+ return [+ id,+ {+ ...breakpoint,+ id,+ },+ ];+ });};export const patch = async (@@ -31,7 +53,6 @@ export const patch = async ({ projectId, permit: "edit" },context);-if (canEdit === false) {throw new Error("You don't have edit access to this project");}@@ -41,12 +62,12 @@ export const patch = async (id_projectId: { id: buildId, projectId },},});-if (build === null) {return;}- const breakpoints = BreakpointsList.parse(JSON.parse(build.breakpoints));- const patchedBreakpoints = BreakpointsList.parse(++ const breakpoints = parseBreakpoints(build.breakpoints);+ const patchedBreakpoints = Breakpoints.parse(applyPatches(breakpoints, patches));@@ -54,6 +75,6 @@ export const patch = async (where: {id_projectId: { id: buildId, projectId },},- data: { breakpoints: JSON.stringify(patchedBreakpoints) },+ data: { breakpoints: serializeBreakpoints(patchedBreakpoints) },});};diff --git a/packages/project/src/db/build.ts b/packages/project/src/db/build.tsindex eceffb158f..a869fea3b9 100644--- a/packages/project/src/db/build.ts+++ b/packages/project/src/db/build.ts@@ -5,12 +5,12 @@ import {Prisma,Project,} from "@webstudio-is/prisma-client";-import { BreakpointsList } from "@webstudio-is/project-build";+import type { AppContext } from "@webstudio-is/trpc-interface";import * as db from ".";import { Build, Page, Pages } from "../shared/schema";import * as pagesUtils from "../shared/pages";+import { parseBreakpoints, serializeBreakpoints } from "./breakpoints";import { parseStyles, serializeStyles } from "./styles";-import type { AppContext } from "@webstudio-is/trpc-interface";import { parseStyleSources, serializeStyleSources } from "./style-sources";const parseBuild = async (build: DbBuild): Promise<Build> => {@@ -22,7 +22,7 @@ const parseBuild = async (build: DbBuild): Promise<Build> => {isProd: build.isProd,createdAt: build.createdAt.toISOString(),pages,- breakpoints: BreakpointsList.parse(JSON.parse(build.breakpoints)),+ breakpoints: Array.from(parseBreakpoints(build.breakpoints)),styles: Array.from(await parseStyles(build.projectId, build.styles)),styleSources: Array.from(parseStyleSources(build.styleSources)),};@@ -318,8 +318,8 @@ export async function create(data: {projectId: props.projectId,pages: JSON.stringify([]),- breakpoints: JSON.stringify(- props.sourceBuild?.breakpoints ?? db.breakpoints.createValues()+ breakpoints: serializeBreakpoints(+ new Map(props.sourceBuild?.breakpoints ?? db.breakpoints.createValues())),styles: serializeStyles(new Map(props.sourceBuild?.styles)),styleSources: serializeStyleSources(diff --git a/packages/project/src/shared/breakpoints/sort.test.ts b/packages/project/src/shared/breakpoints/sort.test.tsindex 7cf47f39a2..f00930c17a 100644--- a/packages/project/src/shared/breakpoints/sort.test.ts+++ b/packages/project/src/shared/breakpoints/sort.test.ts@@ -1,26 +1,31 @@import { describe, test, expect } from "@jest/globals";-import {- initialBreakpoints,- type BaseBreakpoint,-} from "@webstudio-is/react-sdk";+import type { Breakpoints } from "@webstudio-is/project-build";+import { initialBreakpoints } from "@webstudio-is/react-sdk";+import { nanoid } from "nanoid";import { sort } from "./sort";describe("Breakpoints sorting for visual rendering", () => {test("sort initial breakpoints", () => {- expect(sort(initialBreakpoints)).toStrictEqual(initialBreakpoints);+ const breakpoints: Breakpoints = new Map();+ for (const breakpoint of initialBreakpoints) {+ const id = nanoid();+ breakpoints.set(id, { ...breakpoint, id });+ }++ expect(sort(breakpoints)).toStrictEqual(Array.from(breakpoints.values()));});test("sort custom breakpoints", () => {- const breakpoints = [- { label: "0", minWidth: 0 },- { label: "3", minWidth: 3 },- { label: "2", minWidth: 2 },- ];+ const breakpoints = new Map([+ ["1", { id: "1", label: "0", minWidth: 0 }],+ ["2", { id: "2", label: "3", minWidth: 3 }],+ ["3", { id: "3", label: "2", minWidth: 2 }],+ ]);const sortedBreakpoints = [- { label: "0", minWidth: 0 },- { label: "2", minWidth: 2 },- { label: "3", minWidth: 3 },+ { id: "1", label: "0", minWidth: 0 },+ { id: "3", label: "2", minWidth: 2 },+ { id: "2", label: "3", minWidth: 3 },];- expect(sort<BaseBreakpoint>(breakpoints)).toStrictEqual(sortedBreakpoints);+ expect(sort(breakpoints)).toStrictEqual(sortedBreakpoints);});});diff --git a/packages/project/src/shared/breakpoints/sort.ts b/packages/project/src/shared/breakpoints/sort.tsindex 5194d1e0b0..3a8ad64eb7 100644--- a/packages/project/src/shared/breakpoints/sort.ts+++ b/packages/project/src/shared/breakpoints/sort.ts@@ -1,11 +1,11 @@+import type { Breakpoints } from "@webstudio-is/project-build";+/*** Sort by minWidth descending.* We want media querries with bigger minWidth to override the smaller once.*/-export const sort = <BreakpointSubset extends { minWidth: number }>(- breakpoints: Array<BreakpointSubset>-) => {- return [...breakpoints].sort((breakpointA, breakpointB) => {+export const sort = (breakpoints: Breakpoints) => {+ return Array.from(breakpoints.values()).sort((breakpointA, breakpointB) => {return breakpointA.minWidth - breakpointB.minWidth;});};diff --git a/packages/project/src/shared/schema.ts b/packages/project/src/shared/schema.tsindex 55a00bd68b..5143da9574 100644--- a/packages/project/src/shared/schema.ts+++ b/packages/project/src/shared/schema.ts@@ -102,7 +102,7 @@ export type Build = {isDev: boolean;isProd: boolean;pages: Pages;- breakpoints: Breakpoint[];+ breakpoints: [Breakpoint["id"], Breakpoint][];styles: [StyleDeclKey, StyleDecl][];styleSources: [StyleSource["id"], StyleSource][];};diff --git a/packages/project/src/shared/styles/css.ts b/packages/project/src/shared/styles/css.tsindex db7286cba9..3e0c031ef3 100644--- a/packages/project/src/shared/styles/css.ts+++ b/packages/project/src/shared/styles/css.ts@@ -20,7 +20,7 @@ export const generateCssText = (data: Data) => {const assets = new Map<Asset["id"], Asset>(data.assets.map((asset) => [asset.id, asset]));- const breakpoints = data.build?.breakpoints ?? [];+ const breakpoints = new Map(data.build?.breakpoints);const styles = new Map(data.build?.styles);const styleSourceSelections = new Map(data.tree?.styleSourceSelections);@@ -28,7 +28,7 @@ export const generateCssText = (data: Data) => {addGlobalRules(engine, { assets });- for (const breakpoint of breakpoints) {+ for (const breakpoint of breakpoints.values()) {engine.addMediaRule(breakpoint.id, breakpoint);}