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
chore: Rename all *Store to $store (#2747)
Oleg Isonenb2bf220ed64b
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex 2b7382e619..de77e32c77 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -23,19 +23,19 @@ import {Workspace,} from "./features/workspace";import {- assetsStore,+ $assets,$authPermit,$authToken,- breakpointsStore,- dataSourcesStore,- instancesStore,+ $breakpoints,+ $dataSources,+ $instances,$isPreviewMode,- pagesStore,- projectStore,- propsStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,+ $pages,+ $project,+ $props,+ $styleSourceSelections,+ $styleSources,+ $styles,$domains,$resources,subscribeResources,@@ -69,7 +69,7 @@ const useNavigatorLayout = () => {};const useSetWindowTitle = () => {- const project = useStore(projectStore);+ const project = useStore($project);useEffect(() => {document.title = `${project?.title} | Webstudio`;}, [project?.title]);@@ -242,30 +242,30 @@ export const Builder = ({}: BuilderProps) => {useMount(() => {// additional data stores- projectStore.set(project);+ $project.set(project);$domains.set(domains);$authPermit.set(authPermit);$authToken.set(authToken);// set initial containers value- assetsStore.set(new Map(assets));- instancesStore.set(new Map(build.instances));- dataSourcesStore.set(new Map(build.dataSources));+ $assets.set(new Map(assets));+ $instances.set(new Map(build.instances));+ $dataSources.set(new Map(build.dataSources));$resources.set(new Map(build.resources));// props should be after data sources to compute logic- propsStore.set(new Map(build.props));- pagesStore.set(build.pages);- styleSourcesStore.set(new Map(build.styleSources));- styleSourceSelectionsStore.set(new Map(build.styleSourceSelections));- breakpointsStore.set(new Map(build.breakpoints));- stylesStore.set(new Map(build.styles));+ $props.set(new Map(build.props));+ $pages.set(build.pages);+ $styleSources.set(new Map(build.styleSources));+ $styleSourceSelections.set(new Map(build.styleSourceSelections));+ $breakpoints.set(new Map(build.breakpoints));+ $styles.set(new Map(build.styles));});useEffect(subscribeCommands, []);useEffect(subscribeResources, []);useUnmount(() => {- pagesStore.set(undefined);+ $pages.set(undefined);});useSyncPageUrl();diff --git a/apps/builder/app/builder/features/ai/ai-command-bar.tsx b/apps/builder/app/builder/features/ai/ai-command-bar.tsxindex 2f07172983..16121cf935 100644--- a/apps/builder/app/builder/features/ai/ai-command-bar.tsx+++ b/apps/builder/app/builder/features/ai/ai-command-bar.tsx@@ -36,8 +36,8 @@ import {} from "react";import {$collaborativeInstanceSelector,- selectedInstanceSelectorStore,- selectedPageStore,+ $selectedInstanceSelector,+ $selectedPage,} from "~/shared/nano-states";import { useMediaRecorder } from "./hooks/media-recorder";import { useLongPressToggle } from "./hooks/long-press-toggle";@@ -198,12 +198,12 @@ export const AiCommandBar = ({ isPreviewMode }: { isPreviewMode: boolean }) => {// Skip Abort Logic for nowtry {- const page = selectedPageStore.get();+ const page = $selectedPage.get();const rootInstanceSelector = page?.rootInstanceId? [page.rootInstanceId]: [];const instanceSelector =- selectedInstanceSelectorStore.get() ?? rootInstanceSelector;+ $selectedInstanceSelector.get() ?? rootInstanceSelector;const [instanceId] = instanceSelector;diff --git a/apps/builder/app/builder/features/ai/ai-fetch-result.ts b/apps/builder/app/builder/features/ai/ai-fetch-result.tsindex 526ca3b0a3..aee573fc53 100644--- a/apps/builder/app/builder/features/ai/ai-fetch-result.ts+++ b/apps/builder/app/builder/features/ai/ai-fetch-result.ts@@ -18,15 +18,15 @@ import { Instance, createScope, findTreeInstanceIds } from "@webstudio-is/sdk";import { computed } from "nanostores";import { getMapValuesByKeysSet } from "~/shared/array-utils";import {- breakpointsStore,- dataSourcesStore,- instancesStore,- projectStore,- propsStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- styleSourceSelectionsStore,- stylesStore,+ $breakpoints,+ $dataSources,+ $instances,+ $project,+ $props,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $styleSourceSelections,+ $styles,} from "~/shared/nano-states";import { applyOperations, patchTextInstance } from "./apply-operations";import { restAi } from "~/shared/router-utils";@@ -84,7 +84,7 @@ export const fetchResult = async (throw new Error(commandsResponse.data.message);}- const project = projectStore.get();+ const project = $project.get();const availableComponentsNames = $availableComponentsNames.get();const [styles, jsx] = $jsx.get() || ["", ""];@@ -203,7 +203,7 @@ export const fetchResult = async (};const $availableComponentsNames = computed(- [registeredComponentMetasStore],+ [$registeredComponentMetas],(metas) => {const exclude = ["Body",@@ -244,14 +244,14 @@ const restoreComponentsNamespace = (operations: operations.WsOperations) => {const $jsx = computed([- selectedInstanceSelectorStore,- instancesStore,- propsStore,- dataSourcesStore,- registeredComponentMetasStore,- breakpointsStore,- stylesStore,- styleSourceSelectionsStore,+ $selectedInstanceSelector,+ $instances,+ $props,+ $dataSources,+ $registeredComponentMetas,+ $breakpoints,+ $styles,+ $styleSourceSelections,],(selectedInstanceSelector,diff --git a/apps/builder/app/builder/features/ai/apply-operations.ts b/apps/builder/app/builder/features/ai/apply-operations.tsindex da07bc4d84..106b37e79f 100644--- a/apps/builder/app/builder/features/ai/apply-operations.ts+++ b/apps/builder/app/builder/features/ai/apply-operations.ts@@ -7,14 +7,14 @@ import {insertTemplateData,} from "~/shared/instance-utils";import {- breakpointsStore,- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedInstanceStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,+ $breakpoints,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedInstance,+ $styleSourceSelections,+ $styleSources,+ $styles,} from "~/shared/nano-states";import type { DroppableTarget, InstanceSelector } from "~/shared/tree-utils";import { getStyleDeclKey, Instance, type StyleSource } from "@webstudio-is/sdk";@@ -44,13 +44,13 @@ export const applyOperations = (operations: operations.WsOperations) => {const insertTemplateByOp = (operation: operations.generateInsertTemplateWsOperation) => {- const breakpoints = breakpointsStore.get();+ const breakpoints = $breakpoints.get();const breakpointValues = Array.from(breakpoints.values());const baseBreakpoint = breakpointValues.find(isBaseBreakpoint);if (baseBreakpoint === undefined) {return false;}- const metas = registeredComponentMetasStore.get();+ const metas = $registeredComponentMetas.get();const templateData = generateDataFromEmbedTemplate(operation.template,metas,@@ -65,7 +65,7 @@ const insertTemplateByOp = (componentName.includes(operation.addTo))) {- const selectedInstance = selectedInstanceStore.get();+ const selectedInstance = $selectedInstance.get();if (selectedInstance) {operation.addTo = selectedInstance.id;}@@ -77,7 +77,7 @@ const insertTemplateByOp = (const instanceSelector = computeSelectorForInstanceId(operation.addTo);if (instanceSelector) {- const currentInstance = instancesStore.get().get(instanceSelector[0]);+ const currentInstance = $instances.get().get(instanceSelector[0]);// Only container components are allowed to have child elements.if (currentInstance &&@@ -107,13 +107,7 @@ const deleteInstanceByOp = (const applyStylesByOp = (operation: operations.editStylesWsOperation) => {serverSyncStore.createTransaction(- [- instancesStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,- breakpointsStore,- ],+ [$instances, $styleSourceSelections, $styleSources, $styles, $breakpoints],(instances, styleSourceSelections, styleSources, styles, breakpoints) => {const newStyles = [...operation.styles.values()];@@ -166,7 +160,7 @@ const applyStylesByOp = (operation: operations.editStylesWsOperation) => {};const computeSelectorForInstanceId = (instanceId: Instance["id"]) => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}@@ -180,7 +174,7 @@ const computeSelectorForInstanceId = (instanceId: Instance["id"]) => {// that instance and the selected instance (a parent).let subtreeSelector: InstanceSelector = [];const parentInstancesById = new Map<Instance["id"], Instance["id"]>();- for (const instance of instancesStore.get().values()) {+ for (const instance of $instances.get().values()) {for (const child of instance.children) {if (child.type === "id") {parentInstancesById.set(child.value, instance.id);@@ -210,16 +204,14 @@ const computeSelectorForInstanceId = (instanceId: Instance["id"]) => {};export const patchTextInstance = (textInstance: copywriter.TextInstance) => {- serverSyncStore.createTransaction([instancesStore], (instances) => {+ serverSyncStore.createTransaction([$instances], (instances) => {const currentInstance = instances.get(textInstance.instanceId);if (currentInstance === undefined) {return;}- const meta = registeredComponentMetasStore- .get()- .get(currentInstance.component);+ const meta = $registeredComponentMetas.get().get(currentInstance.component);// Only container components are allowed to have child elements.if (meta?.type !== "container") {diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsxindex b311787bf7..0d68f63b71 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-editor.tsx@@ -17,7 +17,7 @@ import {} from "@webstudio-is/design-system";import { MinusIcon, PlusIcon } from "@webstudio-is/icons";import { useStore } from "@nanostores/react";-import { breakpointsStore } from "~/shared/nano-states";+import { $breakpoints } from "~/shared/nano-states";import { groupBreakpoints, isBaseBreakpoint } from "~/shared/breakpoints";import { serverSyncStore } from "~/shared/sync";@@ -163,7 +163,7 @@ type BreakpointsEditorProps = {};export const BreakpointsEditor = ({ onDelete }: BreakpointsEditorProps) => {- const breakpoints = useStore(breakpointsStore);+ const breakpoints = useStore($breakpoints);const [addedBreakpoints, setAddedBreakpoints] = useState<Breakpoint[]>([]);const initialBreakpointsRef = useRef(groupBreakpoints(Array.from(breakpoints.values()))@@ -178,7 +178,7 @@ export const BreakpointsEditor = ({ onDelete }: BreakpointsEditorProps) => {].filter((breakpoint) => isBaseBreakpoint(breakpoint) === false);const handleChangeComplete = (breakpoint: Breakpoint) => {- serverSyncStore.createTransaction([breakpointsStore], (breakpoints) => {+ serverSyncStore.createTransaction([$breakpoints], (breakpoints) => {breakpoints.set(breakpoint.id, breakpoint);});};diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover-toolbar-button.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover-toolbar-button.tsxindex 57ffd78aed..ff969848d1 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover-toolbar-button.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover-toolbar-button.tsx@@ -1,8 +1,8 @@import { forwardRef, type ComponentProps } from "react";import { useStore } from "@nanostores/react";import { Flex, theme } from "@webstudio-is/design-system";-import { scaleStore, useCanvasWidth } from "~/builder/shared/nano-states";-import { selectedBreakpointStore } from "~/shared/nano-states";+import { $scale, useCanvasWidth } from "~/builder/shared/nano-states";+import { $selectedBreakpoint } from "~/shared/nano-states";const Value = ({children,@@ -27,8 +27,8 @@ export const BreakpointsPopoverToolbarButton = forwardRef<HTMLButtonElement,ComponentProps<"button">>((props, ref) => {- const scale = useStore(scaleStore);- const breakpoint = useStore(selectedBreakpointStore);+ const scale = useStore($scale);+ const breakpoint = useStore($selectedBreakpoint);const [canvasWidth] = useCanvasWidth();if (breakpoint === undefined || canvasWidth === undefined) {return null;diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsxindex 6239cbc2cb..840d0fa97b 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-popover.tsx@@ -26,10 +26,10 @@ import { BreakpointsPopoverToolbarButton } from "./breakpoints-popover-toolbar-bimport { WidthInput } from "./width-input";import { ConfirmationDialog } from "./confirmation-dialog";import {- breakpointsStore,- stylesStore,- selectedBreakpointIdStore,- selectedBreakpointStore,+ $breakpoints,+ $styles,+ $selectedBreakpointId,+ $selectedBreakpoint,} from "~/shared/nano-states";import {$breakpointsMenuView,@@ -37,7 +37,7 @@ import {isBaseBreakpoint,minCanvasWidth,} from "~/shared/breakpoints";-import { scaleStore } from "~/builder/shared/nano-states";+import { $scale } from "~/builder/shared/nano-states";import { setInitialCanvasWidth } from "./use-set-initial-canvas-width";import { serverSyncStore } from "~/shared/sync";@@ -46,9 +46,9 @@ export const BreakpointsPopover = () => {const [breakpointToDelete, setBreakpointToDelete] = useState<Breakpoint | undefined>();- const breakpoints = useStore(breakpointsStore);- const selectedBreakpoint = useStore(selectedBreakpointStore);- const scale = useStore(scaleStore);+ const breakpoints = useStore($breakpoints);+ const selectedBreakpoint = useStore($selectedBreakpoint);+ const scale = useStore($scale);if (selectedBreakpoint === undefined) {return null;@@ -59,7 +59,7 @@ export const BreakpointsPopover = () => {return;}serverSyncStore.createTransaction(- [breakpointsStore, stylesStore],+ [$breakpoints, $styles],(breakpoints, styles) => {const breakpointId = breakpointToDelete.id;breakpoints.delete(breakpointId);@@ -75,7 +75,7 @@ export const BreakpointsPopover = () => {const breakpointsArray = Array.from(breakpoints.values());const base =breakpointsArray.find(isBaseBreakpoint) ?? breakpointsArray[0];- selectedBreakpointIdStore.set(base.id);+ $selectedBreakpointId.set(base.id);setInitialCanvasWidth(base.id);}setBreakpointToDelete(undefined);@@ -148,7 +148,7 @@ export const BreakpointsPopover = () => {<ListItemasChildonSelect={() => {- selectedBreakpointIdStore.set(breakpoint.id);+ $selectedBreakpointId.set(breakpoint.id);setInitialCanvasWidth(breakpoint.id);}}index={index}diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsxindex c0da6ce1c9..53aa7f7b13 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector-container.tsx@@ -1,13 +1,10 @@import { useStore } from "@nanostores/react";-import {- breakpointsStore,- selectedBreakpointStore,-} from "~/shared/nano-states";+import { $breakpoints, $selectedBreakpoint } from "~/shared/nano-states";import { BreakpointsSelector } from "./breakpoints-selector";export const BreakpointsSelectorContainer = () => {- const breakpoints = useStore(breakpointsStore);- const selectedBreakpoint = useStore(selectedBreakpointStore);+ const breakpoints = useStore($breakpoints);+ const selectedBreakpoint = useStore($selectedBreakpoint);if (selectedBreakpoint === undefined) {return null;}diff --git a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsxindex 1ad942b100..5c4c3d5d41 100644--- a/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx+++ b/apps/builder/app/builder/features/breakpoints/breakpoints-selector.tsx@@ -9,7 +9,7 @@ import {} from "@webstudio-is/design-system";import { BpStarOffIcon, BpStarOnIcon } from "@webstudio-is/icons";import { CascadeIndicator } from "./cascade-indicator";-import { selectedBreakpointIdStore } from "~/shared/nano-states";+import { $selectedBreakpointId } from "~/shared/nano-states";import { groupBreakpoints, isBaseBreakpoint } from "~/shared/breakpoints";import { setInitialCanvasWidth } from "./use-set-initial-canvas-width";@@ -69,7 +69,7 @@ export const BreakpointsSelector = ({if (breakpoints.has(breakpointId) === false) {return;}- selectedBreakpointIdStore.set(breakpointId);+ $selectedBreakpointId.set(breakpointId);setInitialCanvasWidth(breakpointId);}}css={{ position: "relative" }}diff --git a/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx b/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsxindex 57f7ff656e..6fe5e1e8eb 100644--- a/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx+++ b/apps/builder/app/builder/features/breakpoints/cascade-indicator.tsx@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";import { useStore } from "@nanostores/react";import { css, theme } from "@webstudio-is/design-system";import type { Breakpoint, Breakpoints } from "@webstudio-is/sdk";-import { breakpointsStore } from "~/shared/nano-states";+import { $breakpoints } from "~/shared/nano-states";import { isBaseBreakpoint } from "~/shared/breakpoints";const cascadeIndicatorStyle = css({@@ -115,7 +115,7 @@ const useSizes = ({const [buttonLeft, setButtonLeft] = useState<number>();const [buttonWidth, setButtonWidth] = useState<number>();const [containerWidth, setContainerWidth] = useState<number>();- const breakpoints = useStore(breakpointsStore);+ const breakpoints = useStore($breakpoints);useEffect(() => {if (selectedBreakpoint === undefined) {diff --git a/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts b/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.tsindex 35a2957706..057978ae13 100644--- a/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts+++ b/apps/builder/app/builder/features/breakpoints/use-set-initial-canvas-width.ts@@ -1,20 +1,14 @@import { useEffect } from "react";import type { Breakpoint } from "@webstudio-is/sdk";-import {- workspaceRectStore,- canvasWidthStore,-} from "~/builder/shared/nano-states";-import {- breakpointsStore,- selectedBreakpointStore,-} from "~/shared/nano-states";+import { $workspaceRect, $canvasWidth } from "~/builder/shared/nano-states";+import { $breakpoints, $selectedBreakpoint } from "~/shared/nano-states";import { findInitialWidth } from "./find-initial-width";// Fixes initial canvas width jump on wide screens.// Calculate canvas width during SSR based on known initial width for wide screens.export const setInitialCanvasWidth = (breakpointId: Breakpoint["id"]) => {- const workspaceRect = workspaceRectStore.get();- const breakpoints = breakpointsStore.get();+ const workspaceRect = $workspaceRect.get();+ const breakpoints = $breakpoints.get();const breakpoint = breakpoints.get(breakpointId);if (workspaceRect === undefined || breakpoint === undefined) {return false;@@ -26,7 +20,7 @@ export const setInitialCanvasWidth = (breakpointId: Breakpoint["id"]) => {workspaceRect.width);- canvasWidthStore.set(width);+ $canvasWidth.set(width);return true;};@@ -36,13 +30,13 @@ export const setInitialCanvasWidth = (breakpointId: Breakpoint["id"]) => {export const useSetCanvasWidth = () => {useEffect(() => {const update = () => {- const breakpoints = breakpointsStore.get();- const workspaceRect = workspaceRectStore.get();+ const breakpoints = $breakpoints.get();+ const workspaceRect = $workspaceRect.get();if (workspaceRect === undefined || breakpoints.size === 0) {return;}const breakpointValues = Array.from(breakpoints.values());- const selectedBreakpoint = selectedBreakpointStore.get();+ const selectedBreakpoint = $selectedBreakpoint.get();// When there is selected breakpoint, we want to find the lowest possible size// that is bigger than all max breakpoints and smaller than all min breakpoints.@@ -52,12 +46,12 @@ export const useSetCanvasWidth = () => {selectedBreakpoint,workspaceRect.width);- canvasWidthStore.set(width);+ $canvasWidth.set(width);}};- const unsubscribeBreakpointStore = breakpointsStore.subscribe(update);- const unsubscribeRectStore = workspaceRectStore.listen((workspaceRect) => {+ const unsubscribeBreakpointStore = $breakpoints.subscribe(update);+ const unsubscribeRectStore = $workspaceRect.listen((workspaceRect) => {if (workspaceRect === undefined) {return;}diff --git a/apps/builder/app/builder/features/breakpoints/width-input.tsx b/apps/builder/app/builder/features/breakpoints/width-input.tsxindex 88e0c297a1..f011c5a515 100644--- a/apps/builder/app/builder/features/breakpoints/width-input.tsx+++ b/apps/builder/app/builder/features/breakpoints/width-input.tsx@@ -12,10 +12,10 @@ import {handleNumericInputArrowKeys,} from "@webstudio-is/design-system";import { useCanvasWidth } from "~/builder/shared/nano-states";-import { breakpointsStore, isResizingCanvasStore } from "~/shared/nano-states";+import { $breakpoints, $isResizingCanvas } from "~/shared/nano-states";import {- selectedBreakpointIdStore,- selectedBreakpointStore,+ $selectedBreakpointId,+ $selectedBreakpoint,} from "~/shared/nano-states";import { useState, type KeyboardEvent, useEffect } from "react";@@ -85,8 +85,8 @@ const useEnhancedInput = ({export const WidthInput = ({ min }: { min: number }) => {const id = useId();const [canvasWidth, setCanvasWidth] = useCanvasWidth();- const selectedBreakpoint = useStore(selectedBreakpointStore);- const breakpoints = useStore(breakpointsStore);+ const selectedBreakpoint = useStore($selectedBreakpoint);+ const breakpoints = useStore($breakpoints);const onChange = (value: number) => {setCanvasWidth(value);@@ -95,24 +95,24 @@ export const WidthInput = ({ min }: { min: number }) => {value);if (applicableBreakpoint) {- selectedBreakpointIdStore.set(applicableBreakpoint.id);+ $selectedBreakpointId.set(applicableBreakpoint.id);}- if (isResizingCanvasStore.get() === false) {- isResizingCanvasStore.set(true);+ if ($isResizingCanvas.get() === false) {+ $isResizingCanvas.set(true);}};const onChangeComplete = (value: number) => {onChange(value);- isResizingCanvasStore.set(false);+ $isResizingCanvas.set(false);};useEffect(() => {return () => {- // Just in case we haven't received onChangeComplete, make sure we have set isResizingCanvasStore to false,+ // Just in case we haven't received onChangeComplete, make sure we have set $isResizingCanvas to false,// otherwise the canvas will be stuck in a resizing state.- if (isResizingCanvasStore.get()) {- isResizingCanvasStore.set(false);+ if ($isResizingCanvas.get()) {+ $isResizingCanvas.set(false);}};}, []);diff --git a/apps/builder/app/builder/features/footer/breadcrumbs.tsx b/apps/builder/app/builder/features/footer/breadcrumbs.tsxindex 9b6622aff4..073180dc47 100644--- a/apps/builder/app/builder/features/footer/breadcrumbs.tsx+++ b/apps/builder/app/builder/features/footer/breadcrumbs.tsx@@ -7,20 +7,20 @@ import {Text,} from "@webstudio-is/design-system";import {- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedStyleSourceSelectorStore,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedStyleSourceSelector,} from "~/shared/nano-states";import { getAncestorInstanceSelector } from "~/shared/tree-utils";-import { textEditingInstanceSelectorStore } from "~/shared/nano-states";+import { $textEditingInstanceSelector } from "~/shared/nano-states";import { getInstanceLabel } from "~/shared/instance-utils";import { Fragment } from "react";export const Breadcrumbs = () => {- const instances = useStore(instancesStore);- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);- const metas = useStore(registeredComponentMetasStore);+ const instances = useStore($instances);+ const selectedInstanceSelector = useStore($selectedInstanceSelector);+ const metas = useStore($registeredComponentMetas);return (<Flex@@ -58,14 +58,14 @@ export const Breadcrumbs = () => {}}key={instance.id}onClick={() => {- selectedInstanceSelectorStore.set(+ $selectedInstanceSelector.set(getAncestorInstanceSelector(selectedInstanceSelector,instance.id));- textEditingInstanceSelectorStore.set(undefined);- selectedStyleSourceSelectorStore.set(undefined);+ $textEditingInstanceSelector.set(undefined);+ $selectedStyleSourceSelector.set(undefined);}}>{getInstanceLabel(instance, meta)}diff --git a/apps/builder/app/builder/features/inspector/inspector.tsx b/apps/builder/app/builder/features/inspector/inspector.tsxindex 8b51439df7..62604e70ad 100644--- a/apps/builder/app/builder/features/inspector/inspector.tsx+++ b/apps/builder/app/builder/features/inspector/inspector.tsx@@ -19,8 +19,8 @@ import { StylePanel } from "~/builder/features/style-panel";import { SettingsPanelContainer } from "~/builder/features/settings-panel";import { FloatingPanelProvider } from "~/builder/shared/floating-panel";import {- selectedInstanceStore,- registeredComponentMetasStore,+ $selectedInstance,+ $registeredComponentMetas,$dragAndDropState,} from "~/shared/nano-states";import { NavigatorTree } from "~/builder/shared/navigator-tree";@@ -30,7 +30,7 @@ import { getInstanceLabel } from "~/shared/instance-utils";import { BindingPopoverProvider } from "~/builder/shared/binding-popover";const InstanceInfo = ({ instance }: { instance: Instance }) => {- const metas = useStore(registeredComponentMetasStore);+ const metas = useStore($registeredComponentMetas);const componentMeta = metas.get(instance.component);if (componentMeta === undefined) {return null;@@ -68,11 +68,11 @@ const contentStyle = {const $isDragging = computed([$dragAndDropState], (state) => state.isDragging);export const Inspector = ({ navigatorLayout }: InspectorProps) => {- const selectedInstance = useStore(selectedInstanceStore);+ const selectedInstance = useStore($selectedInstance);const tabsRef = useRef<HTMLDivElement>(null);const [tab, setTab] = useState("style");const isDragging = useStore($isDragging);- const metas = useStore(registeredComponentMetasStore);+ const metas = useStore($registeredComponentMetas);if (navigatorLayout === "docked" && isDragging) {return <NavigatorTree />;diff --git a/apps/builder/app/builder/features/seo/project-settings.tsx b/apps/builder/app/builder/features/seo/project-settings.tsxindex 203c290575..3c6bc33d62 100644--- a/apps/builder/app/builder/features/seo/project-settings.tsx+++ b/apps/builder/app/builder/features/seo/project-settings.tsx@@ -18,7 +18,7 @@ import {import { useEffect, useState } from "react";import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";import { ImageControl } from "./image-control";-import { assetsStore, pagesStore } from "~/shared/nano-states";+import { $assets, $pages } from "~/shared/nano-states";import env from "~/shared/env";import { Image, createImageLoader } from "@webstudio-is/image";import { useIds } from "~/shared/form-utils";@@ -52,7 +52,7 @@ const ProjectSettingsContentMeta = (props: {});};- const assets = useStore(assetsStore);+ const assets = useStore($assets);const asset = assets.get(props.meta.faviconAssetId ?? "");const favIconUrl = asset ? `${asset.name}` : undefined;@@ -177,7 +177,7 @@ const ProjectAdvancedSettings = (props: {const ProjectSettingsView = () => {const [meta, setMeta] = useState(- pagesStore.get()?.meta ?? {+ $pages.get()?.meta ?? {siteName: "",faviconAssetId: "",code: "",@@ -185,7 +185,7 @@ const ProjectSettingsView = () => {);const [settings, setSettings] = useState(- pagesStore.get()?.settings ?? {+ $pages.get()?.settings ?? {atomicStyles: true,});@@ -193,7 +193,7 @@ const ProjectSettingsView = () => {const isOpen = useStore($isProjectSettingsOpen);const handleSave = useEffectEvent(() => {- serverSyncStore.createTransaction([pagesStore], (pages) => {+ serverSyncStore.createTransaction([$pages], (pages) => {if (pages === undefined) {return;}diff --git a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsxindex 63f969bde6..51eaf3db32 100644--- a/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/select-asset.tsx@@ -9,7 +9,7 @@ import {} from "@webstudio-is/design-system";import { TrashIcon } from "@webstudio-is/icons";import type { Prop } from "@webstudio-is/sdk";-import { assetsStore } from "~/shared/nano-states";+import { $assets } from "~/shared/nano-states";import { FloatingPanel } from "~/builder/shared/floating-panel";import { ImageManager } from "~/builder/shared/image-manager";import { type ControlProps } from "../shared";@@ -34,15 +34,15 @@ type Props = {};export const SelectAsset = ({ prop, onChange, onDelete, accept }: Props) => {- const assetStore = useMemo(+ const $asset = useMemo(() =>- computed(assetsStore, (assets) =>+ computed($assets, (assets) =>prop ? assets.get(prop.value) : undefined),[prop]);- const asset = useStore(assetStore);+ const asset = useStore($asset);if (isImageAccept(accept) === false) {return <Text color="destructive">Unsupported accept value: {accept}</Text>;diff --git a/apps/builder/app/builder/features/settings-panel/controls/url.tsx b/apps/builder/app/builder/features/settings-panel/controls/url.tsxindex 134156c1a4..3613aabd95 100644--- a/apps/builder/app/builder/features/settings-panel/controls/url.tsx+++ b/apps/builder/app/builder/features/settings-panel/controls/url.tsx@@ -20,7 +20,7 @@ import {} from "@webstudio-is/icons";import type { Instance, Page } from "@webstudio-is/sdk";import { findTreeInstanceIds } from "@webstudio-is/sdk";-import { instancesStore, pagesStore, propsStore } from "~/shared/nano-states";+import { $instances, $pages, $props } from "~/shared/nano-states";import {BindingControl,BindingPopover,@@ -256,7 +256,7 @@ const BaseEmail = ({};const instancesPerPageStore = computed(- [instancesStore, pagesStore],+ [$instances, $pages],(instances, pages) =>(pages ? [pages.homePage, ...pages.pages] : []).map((page) => ({pageId: page.id,@@ -264,8 +264,8 @@ const instancesPerPageStore = computed(})));-const sectionsStore = computed(- [instancesPerPageStore, propsStore],+const $sections = computed(+ [instancesPerPageStore, $props],(instancesPerPage, props) => {const sections: Array<{pageId: Page["id"];@@ -301,7 +301,7 @@ const getHash = (data: { hash: string }) => data.hash;const getInstanceId = (data: { instanceId: string }) => data.instanceId;const BasePage = ({ prop, onChange }: BaseControlProps) => {- const pages = useStore(pagesStore);+ const pages = useStore($pages);const pageSelectOptions =pages === undefined ? [] : [pages.homePage, ...pages.pages];@@ -315,7 +315,7 @@ const BasePage = ({ prop, onChange }: BaseControlProps) => {): undefined;- const sections = useStore(sectionsStore);+ const sections = useStore($sections);const sectionSelectOptions = pageSelectValue? sections.filter(({ pageId }) => pageId === pageSelectValue.id)diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsxindex 125585bd90..5f7658c013 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.stories.tsx@@ -5,12 +5,12 @@ import { textVariants } from "@webstudio-is/design-system";import { PropsSection } from "./props-section";import { usePropsLogic } from "./use-props-logic";import {- assetsStore,- instancesStore,- pagesStore,- propsStore,+ $assets,+ $instances,+ $pages,+ $props,registerComponentLibrary,- selectedPageIdStore,+ $selectedPageId,} from "~/shared/nano-states";import { setMockEnv } from "~/shared/env";// eslint-disable-next-line import/no-internal-modules@@ -33,7 +33,7 @@ const page = (name: string, path: string) => ({rootInstanceId: unique(),});-pagesStore.set({+$pages.set({meta: {},homePage: page("Home", "/"),pages: [@@ -43,21 +43,19 @@ pagesStore.set({],});-const getSectionInstanceId = (- name: string,- page = pagesStore.get()?.homePage-) => (page === undefined ? "" : `${page.id}-${name}`);+const getSectionInstanceId = (name: string, page = $pages.get()?.homePage) =>+ page === undefined ? "" : `${page.id}-${name}`;const addLinkableSections = (names: string[],- page = pagesStore.get()?.homePage+ page = $pages.get()?.homePage) => {if (page === undefined) {return;}- const instances = instancesStore.get();- const props = propsStore.get();+ const instances = $instances.get();+ const props = $props.get();const rootInstance: Instance = {id: page.rootInstanceId,@@ -92,9 +90,9 @@ const addLinkableSections = (addLinkableSections(["contacts", "about"]);const rootInstance = addLinkableSections(["company", "employees"],- pagesStore.get()?.pages[0]+ $pages.get()?.pages[0]);-selectedPageIdStore.set(pagesStore.get()?.homePage.id);+$selectedPageId.set($pages.get()?.homePage.id);const instance: Instance = {id: instanceId,@@ -116,7 +114,7 @@ const imageAsset = (name = "cat", format = "jpg"): Asset => ({meta: { width: 128, height: 180 },});-assetsStore.set(+$assets.set(new Map([imageAsset("cat"), imageAsset("car", "png"), imageAsset("beach")].map((asset) => [asset.id, asset]@@ -329,7 +327,7 @@ const startingProps: Prop[] = [instanceId,name: "addedUrlPage",type: "page",- value: pagesStore.get()?.pages[0].id ?? "",+ value: $pages.get()?.pages[0].id ?? "",},{id: unique(),@@ -337,7 +335,7 @@ const startingProps: Prop[] = [name: "addedUrlSection",type: "page",value: {- pageId: pagesStore.get()?.homePage.id ?? "",+ pageId: $pages.get()?.homePage.id ?? "",instanceId: getSectionInstanceId("about"),},},@@ -360,14 +358,14 @@ const startingProps: Prop[] = [instanceId,name: "addedUrlAttachment",type: "asset",- value: (Array.from(assetsStore.get().keys())[0] as string) ?? "",+ value: (Array.from($assets.get().keys())[0] as string) ?? "",},{id: unique(),instanceId,name: "addedFile",type: "asset",- value: (Array.from(assetsStore.get().keys())[0] as string) ?? "",+ value: (Array.from($assets.get().keys())[0] as string) ?? "",},];diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex cbb3ff9a51..872303f5af 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -16,9 +16,9 @@ import {} from "@webstudio-is/design-system";import {$propValuesByInstanceSelector,- propsIndexStore,- propsStore,- selectedInstanceSelectorStore,+ $propsIndex,+ $props,+ $selectedInstanceSelector,} from "~/shared/nano-states";import { CollapsibleSectionWithAddButton } from "~/builder/shared/collapsible-section";import {@@ -212,9 +212,9 @@ export const PropsSectionContainer = ({const { setProperty: setCssProperty } = useStyleData({selectedInstance: instance,});- const { propsByInstanceId } = useStore(propsIndexStore);+ const { propsByInstanceId } = useStore($propsIndex);const propValuesByInstanceSelector = useStore($propValuesByInstanceSelector);- const instanceSelector = useStore(selectedInstanceSelectorStore);+ const instanceSelector = useStore($selectedInstanceSelector);const propValues = propValuesByInstanceSelector.get(JSON.stringify(instanceSelector));@@ -224,14 +224,14 @@ export const PropsSectionContainer = ({props: propsByInstanceId.get(instance.id) ?? [],updateProp: (update) => {- const { propsByInstanceId } = propsIndexStore.get();+ const { propsByInstanceId } = $propsIndex.get();const instanceProps = propsByInstanceId.get(instance.id) ?? [];// Fixing a bug that caused some props to be duplicated on unmount by removing duplicates.// see for details https://github.com/webstudio-is/webstudio/pull/2170const duplicateProps = instanceProps.filter((prop) => prop.id !== update.id).filter((prop) => prop.name === update.name);- serverSyncStore.createTransaction([propsStore], (props) => {+ serverSyncStore.createTransaction([$props], (props) => {for (const prop of duplicateProps) {props.delete(prop.id);}@@ -240,7 +240,7 @@ export const PropsSectionContainer = ({},deleteProp: (propId) => {- serverSyncStore.createTransaction([propsStore], (props) => {+ serverSyncStore.createTransaction([$props], (props) => {props.delete(propId);});},diff --git a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.tsindex 803529676e..642eaf64db 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts+++ b/apps/builder/app/builder/features/settings-panel/props-section/use-props-logic.ts@@ -9,7 +9,7 @@ import type { PropValue } from "../shared";import { useStore } from "@nanostores/react";import {$dataSources,- registeredComponentPropsMetasStore,+ $registeredComponentPropsMetas,} from "~/shared/nano-states";type PropOrName = { prop?: Prop; propName: string };@@ -146,9 +146,7 @@ export const usePropsLogic = ({updateProp,deleteProp,}: UsePropsLogicInput) => {- const meta = useStore(registeredComponentPropsMetasStore).get(- instance.component- );+ const meta = useStore($registeredComponentPropsMetas).get(instance.component);const dataSources = useStore($dataSources);if (meta === undefined) {diff --git a/apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsx b/apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsxindex 89cf79a06f..9770cb464d 100644--- a/apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/settings-section/settings-section.tsx@@ -1,8 +1,8 @@import { useStore } from "@nanostores/react";import { InputField, useId } from "@webstudio-is/design-system";import {- registeredComponentMetasStore,- selectedInstanceStore,+ $registeredComponentMetas,+ $selectedInstance,} from "~/shared/nano-states";import { useSettingsLogic } from "./use-settings-logic";import { HorizontalLayout, Label, Row } from "../shared";@@ -10,8 +10,8 @@ import { getInstanceLabel } from "~/shared/instance-utils";export const SettingsSection = () => {const { setLabel, handleBlur, handleKeyDown } = useSettingsLogic();- const selectedInstance = useStore(selectedInstanceStore);- const metas = useStore(registeredComponentMetasStore);+ const selectedInstance = useStore($selectedInstance);+ const metas = useStore($registeredComponentMetas);const id = useId();if (selectedInstance === undefined) {diff --git a/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts b/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.tsindex 7030f83f71..c9dce972a6 100644--- a/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts+++ b/apps/builder/app/builder/features/settings-panel/settings-section/use-settings-logic.ts@@ -4,7 +4,7 @@ import {useEffect,useCallback,} from "react";-import { instancesStore, selectedInstanceStore } from "~/shared/nano-states";+import { $instances, $selectedInstance } from "~/shared/nano-states";import { serverSyncStore } from "~/shared/sync";type Setting = "label";@@ -46,11 +46,11 @@ export const useSettingsLogic = () => {};const updateLabel = useCallback(() => {- const selectedInstance = selectedInstanceStore.get();+ const selectedInstance = $selectedInstance.get();if (selectedInstance === undefined) {return;}- serverSyncStore.createTransaction([instancesStore], (instances) => {+ serverSyncStore.createTransaction([$instances], (instances) => {const instance = instances.get(selectedInstance.id);if (instance === undefined) {return;diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsxindex 3902a2988f..888d9f1c06 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/components.tsx@@ -25,7 +25,7 @@ import {useDraggable,} from "./use-draggable";import { MetaIcon } from "~/builder/shared/meta-icon";-import { registeredComponentMetasStore } from "~/shared/nano-states";+import { $registeredComponentMetas } from "~/shared/nano-states";import { getMetaMaps } from "./get-meta-maps";import { getInstanceLabel } from "~/shared/instance-utils";import { isFeatureEnabled } from "@webstudio-is/feature-flags";@@ -36,7 +36,7 @@ type TabContentProps = {};export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {- const metaByComponentName = useStore(registeredComponentMetasStore);+ const metaByComponentName = useStore($registeredComponentMetas);const { metaByCategory, componentNamesByMeta } = useMemo(() => getMetaMaps(metaByComponentName),[metaByComponentName]diff --git a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsxindex 11d10b3402..09501e5abe 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/components/use-draggable.tsx@@ -12,13 +12,13 @@ import {useDisableCanvasPointerEvents,} from "@webstudio-is/design-system";import {- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedPageStore,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedPage,} from "~/shared/nano-states";import { useSubscribe, type Publish } from "~/shared/pubsub";-import { $canvasRect, scaleStore } from "~/builder/shared/nano-states";+import { $canvasRect, $scale } from "~/builder/shared/nano-states";import {computeInstancesConstraints,findClosestDroppableTarget,@@ -35,7 +35,7 @@ const DragLayer = ({component: Instance["component"];point: Point;}) => {- const metas = useStore(registeredComponentMetasStore);+ const metas = useStore($registeredComponentMetas);const meta = metas.get(component);if (meta === undefined) {return null;@@ -126,7 +126,7 @@ export const useDraggable = ({const [dragComponent, setDragComponent] = useState<Instance["component"]>();const [point, setPoint] = useState<Point>({ x: 0, y: 0 });const canvasRect = useStore($canvasRect);- const scale = useStore(scaleStore);+ const scale = useStore($scale);const { enableCanvasPointerEvents, disableCanvasPointerEvents } =useDisableCanvasPointerEvents();@@ -175,7 +175,7 @@ export const useDraggable = ({) : undefined;const handleInsert = (component: string) => {- const selectedPage = selectedPageStore.get();+ const selectedPage = $selectedPage.get();if (selectedPage === undefined) {return;}@@ -189,13 +189,13 @@ export const useDraggable = ({const rootInstanceIds = templateData.children.filter((child) => child.type === "id").map((child) => child.value);- const instanceSelector = selectedInstanceSelectorStore.get() ?? [+ const instanceSelector = $selectedInstanceSelector.get() ?? [selectedPage.rootInstanceId,];- const metas = registeredComponentMetasStore.get();+ const metas = $registeredComponentMetas.get();const dropTarget = findClosestDroppableTarget(metas,- instancesStore.get(),+ $instances.get(),// fallback to root as drop targetinstanceSelector,computeInstancesConstraints(metas, newInstances, rootInstanceIds)diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsxindex 8eb3d0e495..2fddc5bf48 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx@@ -25,7 +25,7 @@ import type { TabName } from "../../types";import { CloseButton, Header } from "../../header";import { SettingsPanel } from "./settings-panel";import { NewPageSettings, PageSettings } from "./settings";-import { pagesStore, selectedPageIdStore } from "~/shared/nano-states";+import { $pages, $selectedPageId } from "~/shared/nano-states";import { switchPage } from "~/shared/pages";type TabContentProps = {@@ -129,7 +129,7 @@ const PagesPanel = ({onEdit?: (pageId: string | undefined) => void;editingPageId?: string;}) => {- const pages = useStore(pagesStore);+ const pages = useStore($pages);const pagesTree = useMemo(() => pages && toTreeData(pages), [pages]);const renderItem = useCallback(@@ -225,7 +225,7 @@ const PagesPanel = ({};export const TabContent = ({ onSetActiveTab }: TabContentProps) => {- const currentPageId = useStore(selectedPageIdStore);+ const currentPageId = useStore($selectedPageId);const newPageId = "new-page";const [editingPageId, setEditingPageId] = useState<string>();diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsxindex ecf4468f63..63c2b1280c 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.stories.tsx@@ -1,9 +1,9 @@-import { pagesStore } from "~/shared/nano-states/pages";+import { $pages } from "~/shared/nano-states/pages";import { PageSettings } from "./settings";import { $isProjectSettingsOpen } from "~/shared/nano-states/seo";import { Grid, theme } from "@webstudio-is/design-system";-import { assetsStore, projectStore } from "~/shared/nano-states";+import { $assets, $project } from "~/shared/nano-states";export default {component: PageSettings,@@ -11,7 +11,7 @@ export default {$isProjectSettingsOpen.set(true);-assetsStore.set(+$assets.set(new Map([["imageId",@@ -33,7 +33,7 @@ assetsStore.set(]));-pagesStore.set({+$pages.set({meta: {siteName: "Project name",faviconAssetId: "imageId",@@ -59,7 +59,7 @@ pagesStore.set({],});-projectStore.set({+$project.set({id: "projectId",title: "Project title",createdAt: `${new Date()}`,diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsxindex cac8a049e2..6eddcd8456 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx@@ -55,13 +55,13 @@ import {insertInstancesSliceCopy,} from "~/shared/instance-utils";import {- assetsStore,+ $assets,$domains,- instancesStore,- pagesStore,- projectStore,- selectedInstanceSelectorStore,- selectedPageIdStore,+ $instances,+ $pages,+ $project,+ $selectedInstanceSelector,+ $selectedPageId,$dataSources,$dataSourceVariables,} from "~/shared/nano-states";@@ -283,14 +283,14 @@ const FormFields = ({) => void;}) => {const fieldIds = useIds(fieldNames);- const assets = useStore(assetsStore);- const pages = useStore(pagesStore);+ const assets = useStore($assets);+ const pages = useStore($pages);const socialImageAsset = assets.get(values.socialImageAssetId);const faviconAsset = assets.get(pages?.meta?.faviconAssetId ?? "");const faviconUrl = faviconAsset?.type === "image" ? faviconAsset.name : "";- const project = projectStore.get();+ const project = $project.get();const customDomain: string | undefined = $domains.get()[0];const projectDomain = `${project?.domain}.${env.PUBLISHER_HOST ?? "wstd.work"@@ -653,7 +653,7 @@ export const NewPageSettings = ({onClose: () => void;onSuccess: (pageId: Page["id"]) => void;}) => {- const pages = useStore(pagesStore);+ const pages = useStore($pages);const [values, setValues] = useState<Values>({...fieldDefaultValues,@@ -666,7 +666,7 @@ export const NewPageSettings = ({const pageId = nanoid();serverSyncStore.createTransaction(- [pagesStore, instancesStore],+ [$pages, $instances],(pages, instances) => {if (pages === undefined) {return;@@ -687,7 +687,7 @@ export const NewPageSettings = ({component: "Body",children: [],});- selectedInstanceSelectorStore.set(undefined);+ $selectedInstanceSelector.set(undefined);});@@ -813,7 +813,7 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {};serverSyncStore.createTransaction(- [pagesStore, $dataSources],+ [$pages, $dataSources],(pages, dataSources) => {if (pages === undefined) {return;@@ -864,11 +864,11 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {};const deletePage = (pageId: Page["id"]) => {- const pages = pagesStore.get();+ const pages = $pages.get();// deselect page before deleting to avoid flash of content- if (selectedPageIdStore.get() === pageId) {- selectedPageIdStore.set(pages?.homePage.id);- selectedInstanceSelectorStore.set(undefined);+ if ($selectedPageId.get() === pageId) {+ $selectedPageId.set(pages?.homePage.id);+ $selectedInstanceSelector.set(undefined);}const rootInstanceId = pages?.pages.find((page) => page.id === pageId@@ -876,7 +876,7 @@ const deletePage = (pageId: Page["id"]) => {if (rootInstanceId !== undefined) {deleteInstance([rootInstanceId]);}- serverSyncStore.createTransaction([pagesStore], (pages) => {+ serverSyncStore.createTransaction([$pages], (pages) => {if (pages === undefined) {return;}@@ -885,7 +885,7 @@ const deletePage = (pageId: Page["id"]) => {};const duplicatePage = (pageId: Page["id"]) => {- const pages = pagesStore.get();+ const pages = $pages.get();const page =pages?.homePage.id === pageId? pages.homePage@@ -929,7 +929,7 @@ export const PageSettings = ({onDelete: () => void;pageId: string;}) => {- const pages = useStore(pagesStore);+ const pages = useStore($pages);const page = pages && findPageByIdOrPath(pages, pageId);const isHomePage = page?.id === pages?.homePage.id;diff --git a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsxindex 6c9a2f0237..4eaa34d7c7 100644--- a/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx+++ b/apps/builder/app/builder/features/style-panel/controls/image/image-control.tsx@@ -1,6 +1,6 @@import { useStore } from "@nanostores/react";import { Button } from "@webstudio-is/design-system";-import { assetsStore } from "~/shared/nano-states";+import { $assets } from "~/shared/nano-states";import { FloatingPanel } from "~/builder/shared/floating-panel";import { ImageManager } from "~/builder/shared/image-manager";import type { ControlProps } from "../../style-sections";@@ -10,7 +10,7 @@ export const ImageControl = ({currentStyle,setProperty,}: ControlProps) => {- const assets = useStore(assetsStore);+ const assets = useStore($assets);const styleValue = currentStyle[property]?.value;if (styleValue === undefined) {diff --git a/apps/builder/app/builder/features/style-panel/parent-style.ts b/apps/builder/app/builder/features/style-panel/parent-style.tsindex 8661ca40c0..1a3a7e518c 100644--- a/apps/builder/app/builder/features/style-panel/parent-style.ts+++ b/apps/builder/app/builder/features/style-panel/parent-style.ts@@ -1,18 +1,18 @@import { useStore } from "@nanostores/react";import { useStyleInfoByInstanceId } from "./shared/style-info";import {- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,} from "~/shared/nano-states";/*** Gets styleable parent style**/export const useParentStyle = () => {- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);- const instances = useStore(instancesStore);- const registeredComponentMetas = useStore(registeredComponentMetasStore);+ const selectedInstanceSelector = useStore($selectedInstanceSelector);+ const instances = useStore($instances);+ const registeredComponentMetas = useStore($registeredComponentMetas);let parentInstanceSelector: string[] | undefined = undefined;for (let i = 1; i < (selectedInstanceSelector?.length ?? 0); ++i) {diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsxindex 1f5d444056..1ef602dfff 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-thumbnail.tsx@@ -5,7 +5,7 @@ import {createImageLoader,} from "@webstudio-is/image";import { styled, theme } from "@webstudio-is/design-system";-import { assetsStore } from "~/shared/nano-states";+import { $assets } from "~/shared/nano-states";import type { StyleInfo } from "../../shared/style-info";import brokenImage from "~/shared/images/broken-image-placeholder.svg";import env from "~/shared/env";@@ -85,7 +85,7 @@ export const getLayerName = (layerStyle: StyleInfo, assets: Assets) => {};export const LayerThumbnail = (props: { layerStyle: StyleInfo }) => {- const assets = useStore(assetsStore);+ const assets = useStore($assets);const backgroundImageStyle = props.layerStyle.backgroundImage?.value;if (diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsxindex cff66034d2..093ae188e9 100644--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/backgrounds.tsx@@ -22,7 +22,7 @@ import {SubtractIcon,PlusIcon,} from "@webstudio-is/icons";-import { assetsStore } from "~/shared/nano-states";+import { $assets } from "~/shared/nano-states";import { PropertyName } from "../../shared/property-name";import type { StyleInfo } from "../../shared/style-info";import { ColorControl } from "../../controls/color/color-control";@@ -60,7 +60,7 @@ const Layer = (props: {deleteLayer: () => void;setBackgroundColor: (color: RgbValue) => void;}) => {- const assets = useStore(assetsStore);+ const assets = useStore($assets);const backgrounImageStyle = props.layerStyle.backgroundImage?.value;const isHidden =diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.tsxindex 8bd7c20cba..2af63c3e0b 100644--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transitions.tsx@@ -16,7 +16,7 @@ import { addLayer } from "../../style-layer-utils";import { parseTransition } from "@webstudio-is/css-data";import { LayersList } from "../../style-layers-list";import { Layer } from "./transition-layer";-import { selectedOrLastStyleSourceSelectorStore } from "~/shared/nano-states";+import { $selectedOrLastStyleSourceSelector } from "~/shared/nano-states";import { useStore } from "@nanostores/react";const property: StyleProperty = "transition";@@ -29,7 +29,7 @@ export const TransitionSection = (props: RenderCategoryProps) => {const value = currentStyle[property]?.value;const selectedOrLastStyleSourceSelector = useStore(- selectedOrLastStyleSourceSelectorStore+ $selectedOrLastStyleSourceSelector);const isStyleInLocalState =diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsxindex e34af53f14..c577cec355 100644--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx@@ -35,8 +35,8 @@ import type { StyleSource } from "../style-info";import { toPascalCase } from "../keyword-utils";import { isValidDeclaration } from "@webstudio-is/css-data";import {- selectedInstanceBrowserStyleStore,- selectedInstanceUnitSizesStore,+ $selectedInstanceBrowserStyle,+ $selectedInstanceUnitSizes,} from "~/shared/nano-states";import { convertUnits } from "./convert-units";@@ -442,7 +442,7 @@ export const CssValueInput = ({return;}- const unitSizes = selectedInstanceUnitSizesStore.get();+ const unitSizes = $selectedInstanceUnitSizes.get();// Value not edited by the user, we need to convert it to the new unitif (value.type === "unit") {@@ -465,7 +465,7 @@ export const CssValueInput = ({// value is a keyword or non numeric, try get browser style value and convert itif (value.type === "keyword" || value.type === "intermediate") {- const browserStyle = selectedInstanceBrowserStyleStore.get();+ const browserStyle = $selectedInstanceBrowserStyle.get();const browserPropertyValue = browserStyle?.[property];const propertyValue =browserPropertyValue?.type === "unit"diff --git a/apps/builder/app/builder/features/style-panel/shared/instances-kv.ts b/apps/builder/app/builder/features/style-panel/shared/instances-kv.tsindex 005ddf8979..af0106238e 100644--- a/apps/builder/app/builder/features/style-panel/shared/instances-kv.ts+++ b/apps/builder/app/builder/features/style-panel/shared/instances-kv.ts@@ -1,7 +1,7 @@import { useStore } from "@nanostores/react";import { map } from "nanostores";import { useCallback } from "react";-import { selectedInstanceSelectorStore } from "~/shared/nano-states";+import { $selectedInstanceSelector } from "~/shared/nano-states";const instancesKv = map<Record<string, unknown>>({});@@ -11,7 +11,7 @@ const instancesKv = map<Record<string, unknown>>({});* allowing the default UI behavior to be used until the user modifies the state.*/export const useSelectedInstanceKv = <T>(key: string, defaultValue: T) => {- const instanceSelector = useStore(selectedInstanceSelectorStore);+ const instanceSelector = useStore($selectedInstanceSelector);const keyInstanceSelector = instanceSelector? `${instanceSelector.join(",")}-${key}`: `undefined-${key}`;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 d2d8990e93..d56ba21626 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@@ -21,13 +21,13 @@ import type {} from "@webstudio-is/sdk";import { toProperty } from "@webstudio-is/css-engine";import {- breakpointsStore,- instancesStore,- registeredComponentMetasStore,- selectedBreakpointStore,- selectedInstanceStore,- selectedStyleSourceStore,- styleSourcesStore,+ $breakpoints,+ $instances,+ $registeredComponentMetas,+ $selectedBreakpoint,+ $selectedInstance,+ $selectedStyleSource,+ $styleSources,} from "~/shared/nano-states";import {type StyleInfo,@@ -140,13 +140,13 @@ const TooltipContent = ({style: StyleInfo;onReset?: undefined | (() => void);}) => {- const breakpoints = useStore(breakpointsStore);- const selectedBreakpoint = useStore(selectedBreakpointStore);- const instances = useStore(instancesStore);- const styleSources = useStore(styleSourcesStore);- const instance = useStore(selectedInstanceStore);- const metas = useStore(registeredComponentMetasStore);- const selectedStyleSource = useStore(selectedStyleSourceStore);+ const breakpoints = useStore($breakpoints);+ const selectedBreakpoint = useStore($selectedBreakpoint);+ const instances = useStore($instances);+ const styleSources = useStore($styleSources);+ const instance = useStore($selectedInstance);+ const metas = useStore($registeredComponentMetas);+ const selectedStyleSource = useStore($selectedStyleSource);const descriptionWithFallback = description ?? getDescription(properties);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 562e98a277..b4dce8321b 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@@ -12,15 +12,15 @@ import {import {$selectedBreakpointId,$selectedInstanceStates,- breakpointsStore,- instancesStore,- registeredComponentMetasStore,- selectedInstanceIntanceToTagStore,- selectedInstanceSelectorStore,- selectedStyleSourceSelectorStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,+ $breakpoints,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceIntanceToTag,+ $selectedInstanceSelector,+ $selectedStyleSourceSelector,+ $styleSourceSelections,+ $styleSources,+ $styles,} from "~/shared/nano-states";import {getCascadedBreakpointIds,@@ -394,15 +394,15 @@ test("compute styles from next sources", () => {});const resetStores = () => {- registeredComponentMetasStore.set(new Map());- instancesStore.set(new Map());- stylesStore.set(new Map());- styleSourcesStore.set(new Map());- styleSourceSelectionsStore.set(new Map());- breakpointsStore.set(new Map());- selectedInstanceSelectorStore.set(undefined);- selectedInstanceIntanceToTagStore.set(new Map());- selectedStyleSourceSelectorStore.set(undefined);+ $registeredComponentMetas.set(new Map());+ $instances.set(new Map());+ $styles.set(new Map());+ $styleSources.set(new Map());+ $styleSourceSelections.set(new Map());+ $breakpoints.set(new Map());+ $selectedInstanceSelector.set(undefined);+ $selectedInstanceIntanceToTag.set(new Map());+ $selectedStyleSourceSelector.set(undefined);$selectedInstanceStates.set(new Set());};@@ -423,8 +423,8 @@ describe("color and currentColor", () => {test("initial color and currentColor is taken from properties", () => {resetStores();- instancesStore.set(bodyBoxInstances);- selectedInstanceSelectorStore.set(["box", "body"]);+ $instances.set(bodyBoxInstances);+ $selectedInstanceSelector.set(["box", "body"]);const { result } = renderHook(() => useStyleInfo());expect(result.current.color?.value).toEqual({type: "keyword",@@ -438,12 +438,12 @@ describe("color and currentColor", () => {test("color and currentColor inherits from parent instance", () => {resetStores();- instancesStore.set(bodyBoxInstances);- breakpointsStore.set(baseBreakpoint);- styleSourcesStore.set(+ $instances.set(bodyBoxInstances);+ $breakpoints.set(baseBreakpoint);+ $styleSources.set(new Map([["body.local", { id: "body.local", type: "local" }]]));- styleSourceSelectionsStore.set(+ $styleSourceSelections.set(new Map([["body", { instanceId: "body", values: ["body.local"] }]]));const bodyColor: StyleDecl = {@@ -452,8 +452,8 @@ describe("color and currentColor", () => {property: "color",value: { type: "keyword", value: "red" },};- stylesStore.set(new Map([[getStyleDeclKey(bodyColor), bodyColor]]));- selectedInstanceSelectorStore.set(["box", "body"]);+ $styles.set(new Map([[getStyleDeclKey(bodyColor), bodyColor]]));+ $selectedInstanceSelector.set(["box", "body"]);const { result } = renderHook(() => useStyleInfo());expect(result.current.color?.value).toEqual({type: "keyword",@@ -467,15 +467,15 @@ describe("color and currentColor", () => {test("color: inherit inherits from parent instance", () => {resetStores();- instancesStore.set(bodyBoxInstances);- breakpointsStore.set(baseBreakpoint);- styleSourcesStore.set(+ $instances.set(bodyBoxInstances);+ $breakpoints.set(baseBreakpoint);+ $styleSources.set(new Map([["body.local", { id: "body.local", type: "local" }],["box.local", { id: "box.local", type: "local" }],]));- styleSourceSelectionsStore.set(+ $styleSourceSelections.set(new Map([["body", { instanceId: "body", values: ["body.local"] }],["box", { instanceId: "box", values: ["box.local"] }],@@ -493,13 +493,13 @@ describe("color and currentColor", () => {property: "color",value: { type: "keyword", value: "inherit" },};- stylesStore.set(+ $styles.set(new Map([[getStyleDeclKey(bodyColor), bodyColor],[getStyleDeclKey(boxColor), boxColor],]));- selectedInstanceSelectorStore.set(["box", "body"]);+ $selectedInstanceSelector.set(["box", "body"]);const { result } = renderHook(() => useStyleInfo());expect(result.current.color?.value).toEqual({type: "keyword",@@ -513,15 +513,15 @@ describe("color and currentColor", () => {test("color: currentColor inherits from parent instance", () => {resetStores();- instancesStore.set(bodyBoxInstances);- breakpointsStore.set(baseBreakpoint);- styleSourcesStore.set(+ $instances.set(bodyBoxInstances);+ $breakpoints.set(baseBreakpoint);+ $styleSources.set(new Map([["body.local", { id: "body.local", type: "local" }],["box.local", { id: "box.local", type: "local" }],]));- styleSourceSelectionsStore.set(+ $styleSourceSelections.set(new Map([["body", { instanceId: "body", values: ["body.local"] }],["box", { instanceId: "box", values: ["box.local"] }],@@ -539,13 +539,13 @@ describe("color and currentColor", () => {property: "color",value: { type: "keyword", value: "currentColor" },};- stylesStore.set(+ $styles.set(new Map([[getStyleDeclKey(bodyColor), bodyColor],[getStyleDeclKey(boxColor), boxColor],]));- selectedInstanceSelectorStore.set(["box", "body"]);+ $selectedInstanceSelector.set(["box", "body"]);const { result } = renderHook(() => useStyleInfo());expect(result.current.color?.value).toEqual({type: "keyword",@@ -559,12 +559,12 @@ describe("color and currentColor", () => {test("color and currentColor inherits default value", () => {resetStores();- instancesStore.set(bodyBoxInstances);- breakpointsStore.set(baseBreakpoint);- styleSourcesStore.set(+ $instances.set(bodyBoxInstances);+ $breakpoints.set(baseBreakpoint);+ $styleSources.set(new Map([["body.local", { id: "body.local", type: "local" }]]));- styleSourceSelectionsStore.set(+ $styleSourceSelections.set(new Map([["body", { instanceId: "body", values: ["body.local"] }]]));const bodyColor: StyleDecl = {@@ -573,8 +573,8 @@ describe("color and currentColor", () => {property: "color",value: { type: "keyword", value: "inherit" },};- stylesStore.set(new Map([[getStyleDeclKey(bodyColor), bodyColor]]));- selectedInstanceSelectorStore.set(["box", "body"]);+ $styles.set(new Map([[getStyleDeclKey(bodyColor), bodyColor]]));+ $selectedInstanceSelector.set(["box", "body"]);const { result } = renderHook(() => useStyleInfo());expect(result.current.color?.value).toEqual({type: "keyword",@@ -590,15 +590,15 @@ describe("color and currentColor", () => {describe("active states", () => {test("show stateless style as remote when state is selected", () => {resetStores();- instancesStore.set(+ $instances.set(toMap([{ type: "instance", id: "box", component: "Box", children: [] }]));- breakpointsStore.set(toMap([{ id: "base", label: "" }]));- styleSourcesStore.set(toMap([{ id: "box.local", type: "local" }]));- styleSourceSelectionsStore.set(+ $breakpoints.set(toMap([{ id: "base", label: "" }]));+ $styleSources.set(toMap([{ id: "box.local", type: "local" }]));+ $styleSourceSelections.set(toStyleSourceSelectionsMap([{ instanceId: "box", values: ["box.local"] }]));- stylesStore.set(+ $styles.set(toStylesMap([{styleSourceId: "box.local",@@ -608,8 +608,8 @@ describe("active states", () => {},]));- selectedInstanceSelectorStore.set(["box"]);- selectedStyleSourceSelectorStore.set({ styleSourceId: "box.local" });+ $selectedInstanceSelector.set(["box"]);+ $selectedStyleSourceSelector.set({ styleSourceId: "box.local" });const { result } = renderHook(() => useStyleInfo());expect(getStyleSource(result.current.color)).toEqual("local");@@ -619,7 +619,7 @@ describe("active states", () => {});act(() => {- selectedStyleSourceSelectorStore.set({+ $selectedStyleSourceSelector.set({styleSourceId: "box.local",state: ":hover",});@@ -633,15 +633,15 @@ describe("active states", () => {test("show active state style as local when selected", () => {resetStores();- instancesStore.set(+ $instances.set(toMap([{ type: "instance", id: "box", component: "Box", children: [] }]));- breakpointsStore.set(toMap([{ id: "base", label: "" }]));- styleSourcesStore.set(toMap([{ id: "box.local", type: "local" }]));- styleSourceSelectionsStore.set(+ $breakpoints.set(toMap([{ id: "base", label: "" }]));+ $styleSources.set(toMap([{ id: "box.local", type: "local" }]));+ $styleSourceSelections.set(toStyleSourceSelectionsMap([{ instanceId: "box", values: ["box.local"] }]));- stylesStore.set(+ $styles.set(toStylesMap([{styleSourceId: "box.local",@@ -652,8 +652,8 @@ describe("active states", () => {},]));- selectedInstanceSelectorStore.set(["box"]);- selectedStyleSourceSelectorStore.set({ styleSourceId: "box.local" });+ $selectedInstanceSelector.set(["box"]);+ $selectedStyleSourceSelector.set({ styleSourceId: "box.local" });$selectedInstanceStates.set(new Set([":hover"]));const { result } = renderHook(() => useStyleInfo());@@ -664,7 +664,7 @@ describe("active states", () => {});act(() => {- selectedStyleSourceSelectorStore.set({+ $selectedStyleSourceSelector.set({styleSourceId: "box.local",state: ":hover",});@@ -678,20 +678,20 @@ describe("active states", () => {test("show active state from another breakpoint as remote", () => {resetStores();- instancesStore.set(+ $instances.set(toMap([{ type: "instance", id: "box", component: "Box", children: [] }]));- breakpointsStore.set(+ $breakpoints.set(toMap([{ id: "base", label: "" },{ id: "small", label: "", minWidth: 768 },]));- styleSourcesStore.set(toMap([{ id: "box.local", type: "local" }]));- styleSourceSelectionsStore.set(+ $styleSources.set(toMap([{ id: "box.local", type: "local" }]));+ $styleSourceSelections.set(toStyleSourceSelectionsMap([{ instanceId: "box", values: ["box.local"] }]));- stylesStore.set(+ $styles.set(toStylesMap([{styleSourceId: "box.local",@@ -709,8 +709,8 @@ describe("active states", () => {},]));- selectedInstanceSelectorStore.set(["box"]);- selectedStyleSourceSelectorStore.set({ styleSourceId: "box.local" });+ $selectedInstanceSelector.set(["box"]);+ $selectedStyleSourceSelector.set({ styleSourceId: "box.local" });$selectedBreakpointId.set("small");const { result } = renderHook(() => useStyleInfo());@@ -732,7 +732,7 @@ describe("active states", () => {test("show active state inherited from parent as remote", () => {resetStores();- instancesStore.set(+ $instances.set(toMap([{type: "instance",@@ -743,14 +743,14 @@ describe("active states", () => {{ type: "instance", id: "box", component: "Box", children: [] },]));- breakpointsStore.set(toMap([{ id: "base", label: "" }]));- styleSourcesStore.set(toMap([{ id: "body.local", type: "local" }]));- styleSourceSelectionsStore.set(+ $breakpoints.set(toMap([{ id: "base", label: "" }]));+ $styleSources.set(toMap([{ id: "body.local", type: "local" }]));+ $styleSourceSelections.set(toStyleSourceSelectionsMap([{ instanceId: "body", values: ["body.local"] },]));- stylesStore.set(+ $styles.set(toStylesMap([{styleSourceId: "body.local",@@ -768,7 +768,7 @@ describe("active states", () => {},]));- selectedInstanceSelectorStore.set(["box", "body"]);+ $selectedInstanceSelector.set(["box", "body"]);const { result } = renderHook(() => useStyleInfo());expect(getStyleSource(result.current.color)).toEqual("remote");@@ -789,22 +789,22 @@ describe("active states", () => {test("show active state from the previous token as remote", () => {resetStores();- instancesStore.set(+ $instances.set(toMap([{ type: "instance", id: "box", component: "Box", children: [] }]));- breakpointsStore.set(toMap([{ id: "base", label: "" }]));- styleSourcesStore.set(+ $breakpoints.set(toMap([{ id: "base", label: "" }]));+ $styleSources.set(toMap([{ id: "box.token", type: "token", name: "" },{ id: "box.local", type: "local" },]));- styleSourceSelectionsStore.set(+ $styleSourceSelections.set(toStyleSourceSelectionsMap([{ instanceId: "box", values: ["box.token", "box.local"] },]));- stylesStore.set(+ $styles.set(toStylesMap([{styleSourceId: "box.token",@@ -822,8 +822,8 @@ describe("active states", () => {},]));- selectedInstanceSelectorStore.set(["box"]);- selectedStyleSourceSelectorStore.set({ styleSourceId: "box.local" });+ $selectedInstanceSelector.set(["box"]);+ $selectedStyleSourceSelector.set({ styleSourceId: "box.local" });const { result } = renderHook(() => useStyleInfo());expect(getStyleSource(result.current.color)).toEqual("remote");@@ -844,23 +844,23 @@ describe("active states", () => {test("show active state from the next token as overwritten", () => {resetStores();- instancesStore.set(+ $instances.set(toMap([{ type: "instance", id: "box", component: "Box", children: [] }]));- breakpointsStore.set(toMap([{ id: "base", label: "" }]));- styleSourcesStore.set(+ $breakpoints.set(toMap([{ id: "base", label: "" }]));+ $styleSources.set(toMap([{ id: "box.first", type: "token", name: "" },{ id: "box.second", type: "token", name: "" },{ id: "box.third", type: "token", name: "" },]));- styleSourceSelectionsStore.set(+ $styleSourceSelections.set(toStyleSourceSelectionsMap([{ instanceId: "box", values: ["box.first", "box.second", "box.third"] },]));- stylesStore.set(+ $styles.set(toStylesMap([{styleSourceId: "box.third",@@ -879,8 +879,8 @@ describe("active states", () => {},]));- selectedInstanceSelectorStore.set(["box"]);- selectedStyleSourceSelectorStore.set({ styleSourceId: "box.first" });+ $selectedInstanceSelector.set(["box"]);+ $selectedStyleSourceSelector.set({ styleSourceId: "box.first" });$selectedInstanceStates.set(new Set([":hover"]));const { result } = renderHook(() => useStyleInfo());@@ -891,7 +891,7 @@ describe("active states", () => {});act(() => {- selectedStyleSourceSelectorStore.set({ styleSourceId: "box.second" });+ $selectedStyleSourceSelector.set({ styleSourceId: "box.second" });});expect(getStyleSource(result.current.color)).toEqual("overwritten");expect(result.current.color?.value).toEqual({@@ -902,16 +902,16 @@ describe("active states", () => {test("show active state from preset", () => {resetStores();- instancesStore.set(+ $instances.set(toMap([{ type: "instance", id: "box", component: "Box", children: [] }]));- breakpointsStore.set(toMap([{ id: "base", label: "" }]));- styleSourcesStore.set(toMap([{ id: "box.local", type: "local" }]));- styleSourceSelectionsStore.set(+ $breakpoints.set(toMap([{ id: "base", label: "" }]));+ $styleSources.set(toMap([{ id: "box.local", type: "local" }]));+ $styleSourceSelections.set(toStyleSourceSelectionsMap([{ instanceId: "box", values: ["box.local"] }]));- stylesStore.set(new Map());- registeredComponentMetasStore.set(+ $styles.set(new Map());+ $registeredComponentMetas.set(new Map([["Box",@@ -935,10 +935,10 @@ describe("active states", () => {],]));- selectedInstanceSelectorStore.set(["box"]);+ $selectedInstanceSelector.set(["box"]);$selectedInstanceStates.set(new Set([":hover"]));- selectedStyleSourceSelectorStore.set({ styleSourceId: "box.local" });- selectedInstanceIntanceToTagStore.set(new Map([["box", "div"]]));+ $selectedStyleSourceSelector.set({ styleSourceId: "box.local" });+ $selectedInstanceIntanceToTag.set(new Map([["box", "div"]]));const { result } = renderHook(() => useStyleInfo());expect(getStyleSource(result.current.color)).toEqual("preset");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 8cbee9aed7..aca5b846c3 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@@ -19,17 +19,17 @@ import type {} from "@webstudio-is/sdk";import {type StyleSourceSelector,- instancesStore,- selectedInstanceSelectorStore,- selectedInstanceIntanceToTagStore,- stylesIndexStore,- selectedOrLastStyleSourceSelectorStore,- breakpointsStore,- styleSourceSelectionsStore,- registeredComponentMetasStore,+ $instances,+ $selectedInstanceSelector,+ $selectedInstanceIntanceToTag,+ $stylesIndex,+ $selectedOrLastStyleSourceSelector,+ $breakpoints,+ $styleSourceSelections,+ $registeredComponentMetas,$selectedInstanceStates,} from "~/shared/nano-states";-import { selectedBreakpointStore } from "~/shared/nano-states";+import { $selectedBreakpoint } from "~/shared/nano-states";import type { InstanceSelector } from "~/shared/tree-utils";import type { WsComponentMeta } from "@webstudio-is/react-sdk";@@ -494,19 +494,18 @@ const useStyleInfoByInstanceAndStyleSource = (instanceSelector: InstanceSelector | undefined,styleSourceSelector: StyleSourceSelector | undefined) => {- const breakpoints = useStore(breakpointsStore);- const selectedBreakpoint = useStore(selectedBreakpointStore);+ const breakpoints = useStore($breakpoints);+ const selectedBreakpoint = useStore($selectedBreakpoint);const selectedBreakpointId = selectedBreakpoint?.id;- // We do not move selectedInstanceIntanceToTagStore out of here as it contains ascendants of selected element+ // We do not move $selectedInstanceIntanceToTag out of here as it contains ascendants of selected element// And we do not gonna iterate over children- const instanceToTag = useStore(selectedInstanceIntanceToTagStore);+ const instanceToTag = useStore($selectedInstanceIntanceToTag);- const instances = useStore(instancesStore);- const metas = useStore(registeredComponentMetasStore);- const { stylesByInstanceId, stylesByStyleSourceId } =- useStore(stylesIndexStore);- const styleSourceSelections = useStore(styleSourceSelectionsStore);+ const instances = useStore($instances);+ const metas = useStore($registeredComponentMetas);+ const { stylesByInstanceId, stylesByStyleSourceId } = useStore($stylesIndex);+ const styleSourceSelections = useStore($styleSourceSelections);const selectedInstanceStates = useStore($selectedInstanceStates);const activeStates = useMemo(() => {const activeStates = new Set(selectedInstanceStates);@@ -771,9 +770,9 @@ const useStyleInfoByInstanceAndStyleSource = (};export const useStyleInfo = () => {- const instanceSelector = useStore(selectedInstanceSelectorStore);+ const instanceSelector = useStore($selectedInstanceSelector);- const styleSourceSelector = useStore(selectedOrLastStyleSourceSelectorStore);+ const styleSourceSelector = useStore($selectedOrLastStyleSourceSelector);return useStyleInfoByInstanceAndStyleSource(instanceSelector,@@ -784,7 +783,7 @@ export const useStyleInfo = () => {const isAncestorOrSelfOfSelectedInstance = (instanceSelector: InstanceSelector) => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return false;@@ -808,7 +807,7 @@ const isAncestorOrSelfOfSelectedInstance = (export const useStyleInfoByInstanceId = (instanceSelector: InstanceSelector | undefined) => {- const styleSourceSelections = useStore(styleSourceSelectionsStore);+ const styleSourceSelections = useStore($styleSourceSelections);if (instanceSelector !== undefined &&@@ -818,7 +817,7 @@ export const useStyleInfoByInstanceId = (console.error(`The style works correctly only on ancestors of the selected element,as our style data only includes information about these ancestors.- See selectedInstanceIntanceToTagStore for details.`+ See $selectedInstanceIntanceToTag for details.`);}diff --git a/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts b/apps/builder/app/builder/features/style-panel/shared/use-style-data.tsindex 55edc74112..96a6253941 100644--- a/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts+++ b/apps/builder/app/builder/features/style-panel/shared/use-style-data.ts@@ -7,12 +7,12 @@ import {} from "@webstudio-is/sdk";import type { StyleProperty, StyleValue } from "@webstudio-is/css-engine";import {- selectedBreakpointStore,- selectedOrLastStyleSourceSelectorStore,- selectedStyleSourceStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,+ $selectedBreakpoint,+ $selectedOrLastStyleSourceSelector,+ $selectedStyleSource,+ $styleSourceSelections,+ $styleSources,+ $styles,} from "~/shared/nano-states";import { useStyleInfo } from "./style-info";import { serverSyncStore } from "~/shared/sync";@@ -61,14 +61,14 @@ export type CreateBatchUpdate = () => {};export const useStyleData = ({ selectedInstance }: UseStyleData) => {- const selectedBreakpoint = useStore(selectedBreakpointStore);+ const selectedBreakpoint = useStore($selectedBreakpoint);const currentStyle = useStyleInfo();const publishUpdates = useCallback((type: "update" | "preview", updates: StyleUpdates["updates"]) => {- const selectedStyleSource = selectedStyleSourceStore.get();- const styleSourceSelector = selectedOrLastStyleSourceSelectorStore.get();+ const selectedStyleSource = $selectedStyleSource.get();+ const styleSourceSelector = $selectedOrLastStyleSourceSelector.get();if (updates.length === 0 ||@@ -98,7 +98,7 @@ export const useStyleData = ({ selectedInstance }: UseStyleData) => {$ephemeralStyles.set([]);serverSyncStore.createTransaction(- [styleSourceSelectionsStore, styleSourcesStore, stylesStore],+ [$styleSourceSelections, $styleSources, $styles],(styleSourceSelections, styleSources, styles) => {const instanceId = selectedInstance.id;const breakpointId = selectedBreakpoint.id;diff --git a/apps/builder/app/builder/features/style-panel/style-panel.tsx b/apps/builder/app/builder/features/style-panel/style-panel.tsxindex 9edc9ea6bd..b7bf543390 100644--- a/apps/builder/app/builder/features/style-panel/style-panel.tsx+++ b/apps/builder/app/builder/features/style-panel/style-panel.tsx@@ -12,7 +12,7 @@ import { useStyleData } from "./shared/use-style-data";import { StyleSettings } from "./style-settings";import { StyleSourcesSection } from "./style-source-section";-import { selectedInstanceRenderStateStore } from "~/shared/nano-states";+import { $selectedInstanceRenderState } from "~/shared/nano-states";import { useStore } from "@nanostores/react";type StylePanelProps = {@@ -25,9 +25,7 @@ export const StylePanel = ({ selectedInstance }: StylePanelProps) => {selectedInstance,});- const selectedInstanceRenderState = useStore(- selectedInstanceRenderStateStore- );+ const selectedInstanceRenderState = useStore($selectedInstanceRenderState);// If selected instance is not rendered on the canvas,// style panel will not work, because it needs the element in DOM in order to work.diff --git a/apps/builder/app/builder/features/style-panel/style-settings.tsx b/apps/builder/app/builder/features/style-panel/style-settings.tsxindex 5a1653efde..4e8bd71ea7 100644--- a/apps/builder/app/builder/features/style-panel/style-settings.tsx+++ b/apps/builder/app/builder/features/style-panel/style-settings.tsx@@ -10,8 +10,8 @@ import type { SetProperty, CreateBatchUpdate } from "./shared/use-style-data";import type { StyleInfo } from "./shared/style-info";import { useStore } from "@nanostores/react";import {- selectedInstanceIntanceToTagStore,- selectedInstanceSelectorStore,+ $selectedInstanceIntanceToTag,+ $selectedInstanceSelector,} from "~/shared/nano-states";import { computed } from "nanostores";import { useParentStyle } from "./parent-style";@@ -23,8 +23,8 @@ export type StyleSettingsProps = {createBatchUpdate: CreateBatchUpdate;};-const selectedInstanceTagStore = computed(- [selectedInstanceSelectorStore, selectedInstanceIntanceToTagStore],+const $selectedInstanceTag = computed(+ [$selectedInstanceSelector, $selectedInstanceIntanceToTag],(instanceSelector, instanceToTag) => {if (instanceSelector === undefined || instanceToTag === undefined) {return;@@ -39,7 +39,7 @@ export const StyleSettings = ({createBatchUpdate,currentStyle,}: StyleSettingsProps) => {- const selectedInstanceTag = useStore(selectedInstanceTagStore);+ const selectedInstanceTag = useStore($selectedInstanceTag);const all = [];const parentStyle = useParentStyle();diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.test.ts b/apps/builder/app/builder/features/style-panel/style-source-section.test.tsindex e75a0c5f63..695d197166 100644--- a/apps/builder/app/builder/features/style-panel/style-source-section.test.ts+++ b/apps/builder/app/builder/features/style-panel/style-source-section.test.ts@@ -4,12 +4,12 @@ import type { Breakpoint } from "@webstudio-is/sdk";import type { WsComponentMeta } from "@webstudio-is/react-sdk";import { registerContainers } from "~/shared/sync";import {- breakpointsStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedStyleSourceSelectorStore,- styleSourceSelectionsStore,- styleSourcesStore,+ $breakpoints,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedStyleSourceSelector,+ $styleSourceSelections,+ $styleSources,} from "~/shared/nano-states";import {$presetTokens,@@ -20,12 +20,12 @@ enableMapSet();registerContainers();test("generate Styles from preset tokens", () => {- breakpointsStore.set(+ $breakpoints.set(new Map<Breakpoint["id"], Breakpoint>([["base", { id: "base", label: "Base" }],]));- registeredComponentMetasStore.set(+ $registeredComponentMetas.set(new Map<string, WsComponentMeta>([["Box",@@ -108,30 +108,30 @@ test("generate Styles from preset tokens", () => {});test("add style source to instance", () => {- selectedInstanceSelectorStore.set(["root"]);- styleSourcesStore.set(new Map([["local1", { id: "local1", type: "local" }]]));- styleSourceSelectionsStore.set(new Map());- selectedStyleSourceSelectorStore.set(undefined);+ $selectedInstanceSelector.set(["root"]);+ $styleSources.set(new Map([["local1", { id: "local1", type: "local" }]]));+ $styleSourceSelections.set(new Map());+ $selectedStyleSourceSelector.set(undefined);addStyleSourceToInstance("token1");- expect(styleSourceSelectionsStore.get().get("root")).toEqual({+ expect($styleSourceSelections.get().get("root")).toEqual({instanceId: "root",values: ["token1"],});- expect(selectedStyleSourceSelectorStore.get()).toEqual({+ expect($selectedStyleSourceSelector.get()).toEqual({styleSourceId: "token1",});// put new style source lastaddStyleSourceToInstance("local1");- expect(styleSourceSelectionsStore.get().get("root")).toEqual({+ expect($styleSourceSelections.get().get("root")).toEqual({instanceId: "root",values: ["token1", "local1"],});// put new token before localaddStyleSourceToInstance("token2");- expect(styleSourceSelectionsStore.get().get("root")).toEqual({+ expect($styleSourceSelections.get().get("root")).toEqual({instanceId: "root",values: ["token1", "token2", "local1"],});diff --git a/apps/builder/app/builder/features/style-panel/style-source-section.tsx b/apps/builder/app/builder/features/style-panel/style-source-section.tsxindex 48c4585687..a2a2dba1c5 100644--- a/apps/builder/app/builder/features/style-panel/style-source-section.tsx+++ b/apps/builder/app/builder/features/style-panel/style-source-section.tsx@@ -23,18 +23,18 @@ import {} from "@webstudio-is/design-system";import { type ItemSource, StyleSourceInput } from "./style-source";import {- breakpointsStore,- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedInstanceStatesByStyleSourceIdStore,- selectedInstanceStore,- selectedInstanceStyleSourcesStore,- selectedOrLastStyleSourceSelectorStore,- selectedStyleSourceSelectorStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,+ $breakpoints,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedInstanceStatesByStyleSourceId,+ $selectedInstance,+ $selectedInstanceStyleSources,+ $selectedOrLastStyleSourceSelector,+ $selectedStyleSourceSelector,+ $styleSourceSelections,+ $styleSources,+ $styles,} from "~/shared/nano-states";import { removeByMutable } from "~/shared/array-utils";import { cloneStyles } from "~/shared/tree-utils";@@ -58,7 +58,7 @@ const getOrCreateStyleSourceSelectionMutable = (return styleSourceSelection;};-const $baseBreakpointId = computed(breakpointsStore, (breakpoints) => {+const $baseBreakpointId = computed($breakpoints, (breakpoints) => {const breakpointValues = Array.from(breakpoints.values());const baseBreakpoint = breakpointValues.find(isBaseBreakpoint);return baseBreakpoint?.id;@@ -67,7 +67,7 @@ const $baseBreakpointId = computed(breakpointsStore, (breakpoints) => {// metas are rarely change so keep preset token styles computing// in separate storeexport const $presetTokens = computed(- [registeredComponentMetasStore, $baseBreakpointId],+ [$registeredComponentMetas, $baseBreakpointId],(metas, baseBreakpointId) => {const presetTokens = new Map<StyleSource["id"],@@ -137,7 +137,7 @@ const addStyleSourceToInstaceMutable = (};const createStyleSource = (id: StyleSource["id"], name: string) => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}@@ -149,7 +149,7 @@ const createStyleSource = (id: StyleSource["id"], name: string) => {};const presetTokens = $presetTokens.get();serverSyncStore.createTransaction(- [styleSourcesStore, stylesStore, styleSourceSelectionsStore],+ [$styleSources, $styles, $styleSourceSelections],(styleSources, styles, styleSourceSelections) => {styleSources.set(newStyleSource.id, newStyleSource);addStyleSourceToInstaceMutable(@@ -167,19 +167,19 @@ const createStyleSource = (id: StyleSource["id"], name: string) => {}});- selectedStyleSourceSelectorStore.set({ styleSourceId: newStyleSource.id });+ $selectedStyleSourceSelector.set({ styleSourceId: newStyleSource.id });};export const addStyleSourceToInstance = (newStyleSourceId: StyleSource["id"]) => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}const [selectedInstanceId] = selectedInstanceSelector;serverSyncStore.createTransaction(- [styleSourceSelectionsStore, styleSourcesStore],+ [$styleSourceSelections, $styleSources],(styleSourceSelections, styleSources) => {addStyleSourceToInstaceMutable(styleSourceSelections,@@ -189,17 +189,17 @@ export const addStyleSourceToInstance = ();});- selectedStyleSourceSelectorStore.set({ styleSourceId: newStyleSourceId });+ $selectedStyleSourceSelector.set({ styleSourceId: newStyleSourceId });};const removeStyleSourceFromInstance = (styleSourceId: StyleSource["id"]) => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}const [selectedInstanceId] = selectedInstanceSelector;serverSyncStore.createTransaction(- [styleSourceSelectionsStore],+ [$styleSourceSelections],(styleSourceSelections) => {const styleSourceSelection =styleSourceSelections.get(selectedInstanceId);@@ -214,15 +214,15 @@ const removeStyleSourceFromInstance = (styleSourceId: StyleSource["id"]) => {);// reset selected style source if necessaryconst selectedStyleSourceId =- selectedStyleSourceSelectorStore.get()?.styleSourceId;+ $selectedStyleSourceSelector.get()?.styleSourceId;if (selectedStyleSourceId === styleSourceId) {- selectedStyleSourceSelectorStore.set(undefined);+ $selectedStyleSourceSelector.set(undefined);}};const deleteStyleSource = (styleSourceId: StyleSource["id"]) => {serverSyncStore.createTransaction(- [styleSourcesStore, styleSourceSelectionsStore, stylesStore],+ [$styleSources, $styleSourceSelections, $styles],(styleSources, styleSourceSelections, styles) => {styleSources.delete(styleSourceId);for (const styleSourceSelection of styleSourceSelections.values()) {@@ -242,19 +242,19 @@ const deleteStyleSource = (styleSourceId: StyleSource["id"]) => {);// reset selected style source if necessaryconst selectedStyleSourceId =- selectedStyleSourceSelectorStore.get()?.styleSourceId;+ $selectedStyleSourceSelector.get()?.styleSourceId;if (selectedStyleSourceId === styleSourceId) {- selectedStyleSourceSelectorStore.set(undefined);+ $selectedStyleSourceSelector.set(undefined);}};const duplicateStyleSource = (styleSourceId: StyleSource["id"]) => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}const [selectedInstanceId] = selectedInstanceSelector;- const styleSources = styleSourcesStore.get();+ const styleSources = $styleSources.get();// style source may not exist in store which means// temporary generated local stye source was not applied yetconst styleSource = styleSources.get(styleSourceId);@@ -269,10 +269,10 @@ const duplicateStyleSource = (styleSourceId: StyleSource["id"]) => {};const clonedStyleSourceIds = new Map();clonedStyleSourceIds.set(styleSourceId, newStyleSource.id);- const clonedStyles = cloneStyles(stylesStore.get(), clonedStyleSourceIds);+ const clonedStyles = cloneStyles($styles.get(), clonedStyleSourceIds);serverSyncStore.createTransaction(- [styleSourcesStore, stylesStore, styleSourceSelectionsStore],+ [$styleSources, $styles, $styleSourceSelections],(styleSources, styles, styleSourceSelections) => {const styleSourceSelection =styleSourceSelections.get(selectedInstanceId);@@ -289,13 +289,13 @@ const duplicateStyleSource = (styleSourceId: StyleSource["id"]) => {});- selectedStyleSourceSelectorStore.set({ styleSourceId: newStyleSource.id });+ $selectedStyleSourceSelector.set({ styleSourceId: newStyleSource.id });return newStyleSource.id;};const convertLocalStyleSourceToToken = (styleSourceId: StyleSource["id"]) => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}@@ -306,7 +306,7 @@ const convertLocalStyleSourceToToken = (styleSourceId: StyleSource["id"]) => {name: "Local (Copy)",};serverSyncStore.createTransaction(- [styleSourcesStore, styleSourceSelectionsStore],+ [$styleSources, $styleSourceSelections],(styleSources, styleSourceSelections) => {const styleSourceSelection = getOrCreateStyleSourceSelectionMutable(styleSourceSelections,@@ -319,17 +319,17 @@ const convertLocalStyleSourceToToken = (styleSourceId: StyleSource["id"]) => {styleSources.set(newStyleSource.id, newStyleSource);});- selectedStyleSourceSelectorStore.set({ styleSourceId: newStyleSource.id });+ $selectedStyleSourceSelector.set({ styleSourceId: newStyleSource.id });};const reorderStyleSources = (styleSourceIds: StyleSource["id"][]) => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}const [selectedInstanceId] = selectedInstanceSelector;serverSyncStore.createTransaction(- [styleSourceSelectionsStore],+ [$styleSourceSelections],(styleSourceSelections) => {const styleSourceSelection =styleSourceSelections.get(selectedInstanceId);@@ -342,7 +342,7 @@ const reorderStyleSources = (styleSourceIds: StyleSource["id"][]) => {};const renameStyleSource = (id: StyleSource["id"], label: string) => {- serverSyncStore.createTransaction([styleSourcesStore], (styleSources) => {+ serverSyncStore.createTransaction([$styleSources], (styleSources) => {const styleSource = styleSources.get(id);if (styleSource?.type === "token") {styleSource.name = label;@@ -351,7 +351,7 @@ const renameStyleSource = (id: StyleSource["id"], label: string) => {};const clearStyles = (styleSourceId: StyleSource["id"]) => {- serverSyncStore.createTransaction([stylesStore], (styles) => {+ serverSyncStore.createTransaction([$styles], (styles) => {for (const [styleDeclKey, styleDecl] of styles) {if (styleDecl.styleSourceId === styleSourceId) {styles.delete(styleDeclKey);@@ -360,8 +360,8 @@ const clearStyles = (styleSourceId: StyleSource["id"]) => {});};-const componentStatesStore = computed(- [selectedInstanceStore, registeredComponentMetasStore],+const $componentStates = computed(+ [$selectedInstance, $registeredComponentMetas],(selectedInstance, registeredComponentMetas) => {if (selectedInstance === undefined) {return;@@ -392,7 +392,7 @@ const convertToInputItem = (};const $selectedInstancePresetTokens = shallowComputed(- [selectedInstanceSelectorStore, instancesStore, $presetTokens],+ [$selectedInstanceSelector, $instances, $presetTokens],(selectedInstanceSelector, instances, presetTokens) => {const selectedInstancePresetTokens: StyleSourceToken[] = [];if (selectedInstanceSelector === undefined) {@@ -416,7 +416,7 @@ const $selectedInstancePresetTokens = shallowComputed(* find all non-local and component style sources*/const $availableStyleSources = computed(- [styleSourcesStore, $selectedInstancePresetTokens],+ [$styleSources, $selectedInstancePresetTokens],(styleSources, presetTokens) => {const availableStylesSources: StyleSourceInputItem[] = [];for (const styleSource of styleSources.values()) {@@ -443,13 +443,11 @@ const $availableStyleSources = computed();export const StyleSourcesSection = () => {- const componentStates = useStore(componentStatesStore);+ const componentStates = useStore($componentStates);const availableStyleSources = useStore($availableStyleSources);- const selectedInstanceStyleSources = useStore(- selectedInstanceStyleSourcesStore- );+ const selectedInstanceStyleSources = useStore($selectedInstanceStyleSources);const selectedInstanceStatesByStyleSourceId = useStore(- selectedInstanceStatesByStyleSourceIdStore+ $selectedInstanceStatesByStyleSourceId);const value = selectedInstanceStyleSources.map((styleSource) =>convertToInputItem(@@ -458,7 +456,7 @@ export const StyleSourcesSection = () => {));const selectedOrLastStyleSourceSelector = useStore(- selectedOrLastStyleSourceSelectorStore+ $selectedOrLastStyleSourceSelector);const [editingItemId, setEditingItemId] = useState<@@ -493,7 +491,7 @@ export const StyleSourcesSection = () => {removeStyleSourceFromInstance(id);}}onDeleteItem={(id) => {- const styleSources = styleSourcesStore.get();+ const styleSources = $styleSources.get();const token = styleSources.get(id);if (token?.type === "token") {setTokenToDelete(token);@@ -503,7 +501,7 @@ export const StyleSourcesSection = () => {reorderStyleSources(items.map((item) => item.id));}}onSelectItem={(styleSourceSelector) => {- selectedStyleSourceSelectorStore.set(styleSourceSelector);+ $selectedStyleSourceSelector.set(styleSourceSelector);}}// style source renamingeditingItemId={editingItemId}@@ -511,7 +509,7 @@ export const StyleSourcesSection = () => {setEditingItemId(id);// prevent deselect after renamingif (id !== undefined) {- selectedStyleSourceSelectorStore.set({+ $selectedStyleSourceSelector.set({styleSourceId: id,});}diff --git a/apps/builder/app/builder/features/topbar/sync-status.tsx b/apps/builder/app/builder/features/topbar/sync-status.tsxindex faa666e446..46cc1c151e 100644--- a/apps/builder/app/builder/features/topbar/sync-status.tsx+++ b/apps/builder/app/builder/features/topbar/sync-status.tsx@@ -5,10 +5,10 @@ import { OfflineIcon } from "@webstudio-is/icons";import { useEffect } from "react";import { queueStatus } from "~/builder/shared/sync";-const isOnlineStore = atom(false);+const $isOnline = atom(false);const subscribeIsOnline = () => {- const handle = () => isOnlineStore.set(navigator.onLine);+ const handle = () => $isOnline.set(navigator.onLine);addEventListener("offline", handle);addEventListener("online", handle);return () => {@@ -19,7 +19,7 @@ const subscribeIsOnline = () => {export const SyncStatus = () => {const statusObject = useStore(queueStatus);- const isOnline = useStore(isOnlineStore);+ const isOnline = useStore($isOnline);useEffect(subscribeIsOnline, []);if (diff --git a/apps/builder/app/builder/features/topbar/topbar.tsx b/apps/builder/app/builder/features/topbar/topbar.tsxindex 8854c7dd83..3fa5d9fc4b 100644--- a/apps/builder/app/builder/features/topbar/topbar.tsx+++ b/apps/builder/app/builder/features/topbar/topbar.tsx@@ -8,7 +8,7 @@ import {ToolbarToggleGroup,} from "@webstudio-is/design-system";import type { Project } from "@webstudio-is/project";-import { selectedPageStore } from "~/shared/nano-states";+import { $selectedPage } from "~/shared/nano-states";import { PreviewButton } from "./preview";import { ShareButton } from "./share";import { PublishButton } from "./publish";@@ -36,7 +36,7 @@ type TopbarProps = {};export const Topbar = ({ gridArea, project, hasProPlan }: TopbarProps) => {- const page = useStore(selectedPageStore);+ const page = useStore($selectedPage);return (<nav className={topbarContainerStyle({ css: { gridArea } })}>diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsxindex 70702afe55..a21f4001f2 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/canvas-tools.tsx@@ -2,7 +2,7 @@ import { useStore } from "@nanostores/react";import { css } from "@webstudio-is/design-system";import { PlacementIndicator } from "@webstudio-is/design-system";import {- instancesStore,+ $instances,$isPreviewMode,$dragAndDropState,} from "~/shared/nano-states";@@ -18,7 +18,7 @@ import { useSubscribeDragAndDropState } from "./use-subscribe-drag-drop-state";import { ResizeHandles } from "./resize-handles";import { MediaBadge } from "./media-badge";import { applyScale } from "./outline";-import { scaleStore } from "~/builder/shared/nano-states";+import { $scale } from "~/builder/shared/nano-states";const containerStyle = css({position: "absolute",@@ -39,8 +39,8 @@ export const CanvasTools = () => {const isPreviewMode = useStore($isPreviewMode);const dragAndDropState = useStore($dragAndDropState);- const instances = useStore(instancesStore);- const scale = useStore(scaleStore);+ const instances = useStore($instances);+ const scale = useStore($scale);if (dragAndDropState.isDragging &&dragAndDropState.placementIndicator !== undefineddiff --git a/apps/builder/app/builder/features/workspace/canvas-tools/media-badge.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/media-badge.tsxindex e8c7b5b90e..6ce957e5b6 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/media-badge.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/media-badge.tsx@@ -1,6 +1,6 @@import { useStore } from "@nanostores/react";import { Flex, Text, css, theme } from "@webstudio-is/design-system";-import { selectedBreakpointStore } from "~/shared/nano-states";+import { $selectedBreakpoint } from "~/shared/nano-states";const labelStyle = css({position: "absolute",@@ -17,7 +17,7 @@ const badgeStyle = css({});export const MediaBadge = () => {- const breakpoint = useStore(selectedBreakpointStore);+ const breakpoint = useStore($selectedBreakpoint);if (breakpoint === undefined) {return null;}diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsxindex dbbd7334f8..8573487626 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/collaborative-instance-outline.tsx@@ -2,11 +2,11 @@ import { useStore } from "@nanostores/react";import { $collaborativeInstanceRect } from "~/shared/nano-states";import { Outline } from "./outline";import { applyScale } from "./apply-scale";-import { scaleStore } from "~/builder/shared/nano-states";+import { $scale } from "~/builder/shared/nano-states";// Outline of an instance that is being edited by AI or a human collaborator.export const CollaborativeInstanceOutline = () => {- const scale = useStore(scaleStore);+ const scale = useStore($scale);const instanceRect = useStore($collaborativeInstanceRect);if (instanceRect === undefined) {diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsxindex bab7e1ba1e..8767d96fb4 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/hovered-instance-outline.tsx@@ -1,24 +1,22 @@import { useStore } from "@nanostores/react";import {- hoveredInstanceOutlineAndInstanceStore,- hoveredInstanceSelectorStore,- selectedInstanceSelectorStore,- textEditingInstanceSelectorStore,+ $hoveredInstanceOutlineAndInstance,+ $hoveredInstanceSelector,+ $selectedInstanceSelector,+ $textEditingInstanceSelector,} from "~/shared/nano-states";import { areInstanceSelectorsEqual } from "~/shared/tree-utils";import { Outline } from "./outline";import { Label } from "./label";import { applyScale } from "./apply-scale";-import { scaleStore } from "~/builder/shared/nano-states";+import { $scale } from "~/builder/shared/nano-states";export const HoveredInstanceOutline = () => {- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);- const hoveredInstanceSelector = useStore(hoveredInstanceSelectorStore);- const outline = useStore(hoveredInstanceOutlineAndInstanceStore);- const scale = useStore(scaleStore);- const textEditingInstanceSelector = useStore(- textEditingInstanceSelectorStore- );+ const selectedInstanceSelector = useStore($selectedInstanceSelector);+ const hoveredInstanceSelector = useStore($hoveredInstanceSelector);+ const outline = useStore($hoveredInstanceOutlineAndInstance);+ const scale = useStore($scale);+ const textEditingInstanceSelector = useStore($textEditingInstanceSelector);const isEditingText = textEditingInstanceSelector !== undefined;const isHoveringSelectedInstance = areInstanceSelectorsEqual(selectedInstanceSelector,diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsxindex 5fec7f6e01..f3e917a6ca 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/label.tsx@@ -4,7 +4,7 @@ import { styled, type Rect } from "@webstudio-is/design-system";import type { Instance } from "@webstudio-is/sdk";import { theme } from "@webstudio-is/design-system";import { MetaIcon } from "~/builder/shared/meta-icon";-import { registeredComponentMetasStore } from "~/shared/nano-states";+import { $registeredComponentMetas } from "~/shared/nano-states";import { getInstanceLabel } from "~/shared/instance-utils";type LabelPosition = "top" | "inside" | "bottom";@@ -82,7 +82,7 @@ type LabelProps = {export const Label = ({ instance, instanceRect }: LabelProps) => {const [labelRef, position] = useLabelPosition(instanceRect);- const metas = useStore(registeredComponentMetasStore);+ const metas = useStore($registeredComponentMetas);const meta = metas.get(instance.component);if (meta === undefined) {return <></>;diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsxindex 46f009c8ed..f3b6c8caf0 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/selected-instance-outline.tsx@@ -1,22 +1,20 @@import { useStore } from "@nanostores/react";import {- selectedInstanceOutlineAndInstanceStore,- selectedInstanceSelectorStore,+ $selectedInstanceOutlineAndInstance,+ $selectedInstanceSelector,} from "~/shared/nano-states";-import { textEditingInstanceSelectorStore } from "~/shared/nano-states";+import { $textEditingInstanceSelector } from "~/shared/nano-states";import { areInstanceSelectorsEqual } from "~/shared/tree-utils";import { Outline } from "./outline";import { Label } from "./label";import { applyScale } from "./apply-scale";-import { scaleStore } from "~/builder/shared/nano-states";+import { $scale } from "~/builder/shared/nano-states";export const SelectedInstanceOutline = () => {- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);- const textEditingInstanceSelector = useStore(- textEditingInstanceSelectorStore- );- const outline = useStore(selectedInstanceOutlineAndInstanceStore);- const scale = useStore(scaleStore);+ const selectedInstanceSelector = useStore($selectedInstanceSelector);+ const textEditingInstanceSelector = useStore($textEditingInstanceSelector);+ const outline = useStore($selectedInstanceOutlineAndInstance);+ const scale = useStore($scale);const isEditingCurrentInstance =textEditingInstanceSelector !== undefined &&areInstanceSelectorsEqual(diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsxindex 1e292ab6fc..f7ac58cc36 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/resize-handles.tsx@@ -7,12 +7,12 @@ import {theme,} from "@webstudio-is/design-system";import { useEffect, useRef } from "react";-import { canvasWidthStore } from "~/builder/shared/nano-states";+import { $canvasWidth } from "~/builder/shared/nano-states";import { minCanvasWidth } from "~/shared/breakpoints";import {- breakpointsStore,- isResizingCanvasStore,- selectedBreakpointIdStore,+ $breakpoints,+ $isResizingCanvas,+ $selectedBreakpointId,} from "~/shared/nano-states";const handlesContainerStyle = css({@@ -85,11 +85,11 @@ const handleIcon = (const updateBreakpoint = (width: number) => {const applicableBreakpoint = findApplicableMedia(- Array.from(breakpointsStore.get().values()),+ Array.from($breakpoints.get().values()),width);if (applicableBreakpoint) {- selectedBreakpointIdStore.set(applicableBreakpoint.id);+ $selectedBreakpointId.set(applicableBreakpoint.id);}};@@ -105,7 +105,7 @@ const useScrub = ({ side }: { side: "right" | "left" }) => {const disposeScrubControl = numericScrubControl(ref.current, {getInitialValue() {- return canvasWidthStore.get();+ return $canvasWidth.get();},getValue(state, movement) {const value =@@ -120,15 +120,15 @@ const useScrub = ({ side }: { side: "right" | "left" }) => {if (status === "scrubbing") {enableCanvasPointerEvents?.();enableCanvasPointerEvents = disableCanvasPointerEvents();- isResizingCanvasStore.set(true);+ $isResizingCanvas.set(true);return;}enableCanvasPointerEvents?.();- isResizingCanvasStore.set(false);+ $isResizingCanvas.set(false);},onValueInput(event) {- canvasWidthStore.set(event.value);+ $canvasWidth.set(event.value);updateBreakpoint(event.value);},});@@ -144,7 +144,7 @@ const useScrub = ({ side }: { side: "right" | "left" }) => {};const useResize = () => {- const isResizing = useStore(isResizingCanvasStore);+ const isResizing = useStore($isResizingCanvas);const leftRef = useScrub({ side: "left" });const rightRef = useScrub({ side: "right" });const state = isResizing ? "resizing" : "idle";diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsxindex f7a5666614..0ce040ac66 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar.tsx@@ -13,11 +13,11 @@ import {PaintBrushIcon,} from "@webstudio-is/icons";import {- selectedInstanceIntanceToTagStore,- selectedInstanceSelectorStore,+ $selectedInstanceIntanceToTag,+ $selectedInstanceSelector,} from "~/shared/nano-states";-import { type TextToolbarState, textToolbarStore } from "~/shared/nano-states";-import { scaleStore } from "~/builder/shared/nano-states";+import { type TextToolbarState, $textToolbar } from "~/shared/nano-states";+import { $scale } from "~/builder/shared/nano-states";import { emitCommand } from "~/builder/shared/commands";const getRectForRelativeRect = (@@ -39,7 +39,7 @@ const getRectForRelativeRect = (};const $isWithinLink = computed(- [selectedInstanceSelectorStore, selectedInstanceIntanceToTagStore],+ [$selectedInstanceSelector, $selectedInstanceIntanceToTag],(selectedInstanceSelector, selectedInstanceIntanceToTag) => {if (selectedInstanceSelector === undefined ||@@ -197,9 +197,9 @@ const Toolbar = ({ state, scale }: ToolbarProps) => {};export const TextToolbar = () => {- const textToolbar = useStore(textToolbarStore);- const scale = useStore(scaleStore);- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);+ const textToolbar = useStore($textToolbar);+ const scale = useStore($scale);+ const selectedInstanceSelector = useStore($selectedInstanceSelector);if (textToolbar?.selectionRect === undefined ||diff --git a/apps/builder/app/builder/features/workspace/use-read-canvas-rect.ts b/apps/builder/app/builder/features/workspace/use-read-canvas-rect.tsindex 69fe33196e..edba3200aa 100644--- a/apps/builder/app/builder/features/workspace/use-read-canvas-rect.ts+++ b/apps/builder/app/builder/features/workspace/use-read-canvas-rect.ts@@ -1,8 +1,8 @@import { useCallback, useEffect, useState } from "react";import {- scaleStore,- canvasWidthStore,+ $scale,+ $canvasWidth,$canvasRect,} from "~/builder/shared/nano-states";import { useWindowResizeDebounced } from "~/shared/dom-hooks";@@ -39,12 +39,12 @@ export const useReadCanvasRect = () => {useEffect(() => {updateRect();- const scaleStoreUnsubscribe = scaleStore.listen(updateRect);- const canvasWidthStoreUnsubscribe = canvasWidthStore.listen(updateRect);+ const $scaleUnsubscribe = $scale.listen(updateRect);+ const $canvasWidthUnsubscribe = $canvasWidth.listen(updateRect);return () => {- scaleStoreUnsubscribe();- canvasWidthStoreUnsubscribe();+ $scaleUnsubscribe();+ $canvasWidthUnsubscribe();};}, [updateRect]);diff --git a/apps/builder/app/builder/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsxindex e37e32516c..e2fcd8e94a 100644--- a/apps/builder/app/builder/features/workspace/workspace.tsx+++ b/apps/builder/app/builder/features/workspace/workspace.tsx@@ -1,15 +1,15 @@import { useStore } from "@nanostores/react";import { theme, Toaster, css } from "@webstudio-is/design-system";import {- scaleStore,+ $scale,useCanvasWidth,- workspaceRectStore,+ $workspaceRect,} from "~/builder/shared/nano-states";import {- selectedInstanceSelectorStore,- selectedStyleSourceSelectorStore,+ $selectedInstanceSelector,+ $selectedStyleSourceSelector,} from "~/shared/nano-states";-import { textEditingInstanceSelectorStore } from "~/shared/nano-states";+import { $textEditingInstanceSelector } from "~/shared/nano-states";import { CanvasTools } from "./canvas-tools";import { useEffect, useRef } from "react";import { useSetCanvasWidth } from "../breakpoints";@@ -39,7 +39,7 @@ const useMeasureWorkspace = () => {return;}const observer = new ResizeObserver((entries) => {- workspaceRectStore.set(entries[0].contentRect);+ $workspaceRect.set(entries[0].contentRect);});observer.observe(element);return () => {@@ -99,8 +99,8 @@ const getCanvasStyle = (const useCanvasStyle = (initialBreakpoints: [Breakpoint["id"], Breakpoint][]) => {- const scale = useStore(scaleStore);- const workspaceRect = useStore(workspaceRectStore);+ const scale = useStore($scale);+ const workspaceRect = useStore($workspaceRect);const [canvasWidth] = useCanvasWidth();return getCanvasStyle(initialBreakpoints, scale, workspaceRect, canvasWidth);@@ -109,8 +109,8 @@ const useCanvasStyle = (const useOutlineStyle = (initialBreakpoints: [Breakpoint["id"], Breakpoint][]) => {- const scale = useStore(scaleStore);- const workspaceRect = useStore(workspaceRectStore);+ const scale = useStore($scale);+ const workspaceRect = useStore($workspaceRect);const [canvasWidth] = useCanvasWidth();const style = getCanvasStyle(initialBreakpoints,@@ -143,9 +143,9 @@ export const Workspace = ({const workspaceRef = useMeasureWorkspace();useSetCanvasWidth();const handleWorkspaceClick = () => {- selectedInstanceSelectorStore.set(undefined);- textEditingInstanceSelectorStore.set(undefined);- selectedStyleSourceSelectorStore.set(undefined);+ $selectedInstanceSelector.set(undefined);+ $textEditingInstanceSelector.set(undefined);+ $selectedStyleSourceSelector.set(undefined);};return (diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsxindex e1444909d2..b8efbb33d9 100644--- a/apps/builder/app/builder/shared/assets/use-assets.tsx+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx@@ -12,12 +12,12 @@ import type {UploadingAssetContainer,} from "./types";import type { ActionData } from "~/builder/shared/assets";-import { assetsStore, $authToken, projectStore } from "~/shared/nano-states";+import { $assets, $authToken, $project } from "~/shared/nano-states";import { atom, computed } from "nanostores";import { serverSyncStore } from "~/shared/sync";export const deleteAssets = (assetIds: Asset["id"][]) => {- serverSyncStore.createTransaction([assetsStore], (assets) => {+ serverSyncStore.createTransaction([$assets], (assets) => {for (const assetId of assetIds) {assets.delete(assetId);}@@ -25,7 +25,7 @@ export const deleteAssets = (assetIds: Asset["id"][]) => {};const setAsset = (asset: Asset) => {- serverSyncStore.createTransaction([assetsStore], (assets) => {+ serverSyncStore.createTransaction([$assets], (assets) => {assets.set(asset.id, asset);});};@@ -62,8 +62,8 @@ const deleteUploadingFileData = (id: FileData["assetId"]) => {);};-const assetContainersStore = computed(- [assetsStore, uploadingFilesDataStore],+const $assetContainers = computed(+ [$assets, uploadingFilesDataStore],(assets, uploadingFilesData) => {const uploadingContainers: UploadingAssetContainer[] = [];for (const { assetId, type, file, objectURL } of uploadingFilesData) {@@ -169,7 +169,7 @@ export const useUploadAsset = () => {};const uploadAssets = (type: AssetType, files: File[]) => {- const projectId = projectStore.get()?.id;+ const projectId = $project.get()?.id;const authToken = $authToken.get();if (projectId === undefined) {return;@@ -209,7 +209,7 @@ const filterByType = (assetContainers: AssetContainer[], type: AssetType) => {};export const useAssets = (type: AssetType) => {- const assetContainers = useStore(assetContainersStore);+ const assetContainers = useStore($assetContainers);const assetsByType = useMemo(() => {return filterByType(assetContainers, type);diff --git a/apps/builder/app/builder/shared/commands.test.ts b/apps/builder/app/builder/shared/commands.test.tsindex fe35a5504d..170ae2085e 100644--- a/apps/builder/app/builder/shared/commands.test.ts+++ b/apps/builder/app/builder/shared/commands.test.ts@@ -2,9 +2,9 @@ import { describe, expect, test } from "@jest/globals";import type { Instance } from "@webstudio-is/sdk";import * as baseMetas from "@webstudio-is/sdk-components-react/metas";import {- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,} from "~/shared/nano-states";import { registerContainers } from "~/shared/sync";import { emitCommand } from "./commands";@@ -40,11 +40,11 @@ describe("deleteInstance", () => {]);test("delete selected instance and select next one", () => {- registeredComponentMetasStore.set(metas);- selectedInstanceSelectorStore.set(["child2", "parent", "body"]);- instancesStore.set(threeChildInstances);+ $registeredComponentMetas.set(metas);+ $selectedInstanceSelector.set(["child2", "parent", "body"]);+ $instances.set(threeChildInstances);emitCommand("deleteInstance");- expect(selectedInstanceSelectorStore.get()).toEqual([+ expect($selectedInstanceSelector.get()).toEqual(["child3","parent","body",@@ -52,11 +52,11 @@ describe("deleteInstance", () => {});test("delete selected instance and select previous one", () => {- registeredComponentMetasStore.set(metas);- selectedInstanceSelectorStore.set(["child3", "parent", "body"]);- instancesStore.set(threeChildInstances);+ $registeredComponentMetas.set(metas);+ $selectedInstanceSelector.set(["child3", "parent", "body"]);+ $instances.set(threeChildInstances);emitCommand("deleteInstance");- expect(selectedInstanceSelectorStore.get()).toEqual([+ expect($selectedInstanceSelector.get()).toEqual(["child2","parent","body",@@ -64,12 +64,12 @@ describe("deleteInstance", () => {});test("delete selected instance and select parent one", () => {- selectedInstanceSelectorStore.set(["child1", "parent", "body"]);- registeredComponentMetasStore.set(metas);+ $selectedInstanceSelector.set(["child1", "parent", "body"]);+ $registeredComponentMetas.set(metas);// body// parent// child1- instancesStore.set(+ $instances.set(new Map([createInstancePair("body", "Body", [{ type: "id", value: "parent" }]),createInstancePair("parent", "Box", [{ type: "id", value: "child1" }]),@@ -77,6 +77,6 @@ describe("deleteInstance", () => {]));emitCommand("deleteInstance");- expect(selectedInstanceSelectorStore.get()).toEqual(["parent", "body"]);+ expect($selectedInstanceSelector.get()).toEqual(["parent", "body"]);});});diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.tsindex 88b037e9f1..25378a6616 100644--- a/apps/builder/app/builder/shared/commands.ts+++ b/apps/builder/app/builder/shared/commands.ts@@ -2,11 +2,11 @@ import { createCommandsEmitter, type Command } from "~/shared/commands-emitter";import {$dataSources,$isPreviewMode,- editingItemIdStore,- instancesStore,- selectedInstanceSelectorStore,- selectedStyleSourceSelectorStore,- textEditingInstanceSelectorStore,+ $editingItemId,+ $instances,+ $selectedInstanceSelector,+ $selectedStyleSourceSelector,+ $textEditingInstanceSelector,} from "~/shared/nano-states";import {$breakpointsMenuView,@@ -37,8 +37,8 @@ const makeBreakpointCommand = <CommandName extends string>(});const deleteSelectedInstance = () => {- const textEditingInstanceSelector = textEditingInstanceSelectorStore.get();- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const textEditingInstanceSelector = $textEditingInstanceSelector.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();// cannot delete instance while editingif (textEditingInstanceSelector) {return;@@ -50,7 +50,7 @@ const deleteSelectedInstance = () => {return;}let newSelectedInstanceSelector: undefined | InstanceSelector;- const instances = instancesStore.get();+ const instances = $instances.get();const [selectedInstanceId, parentInstanceId] = selectedInstanceSelector;const parentInstance = instances.get(parentInstanceId);if (parentInstance) {@@ -71,8 +71,8 @@ const deleteSelectedInstance = () => {}}if (deleteInstance(selectedInstanceSelector)) {- selectedInstanceSelectorStore.set(newSelectedInstanceSelector);- selectedStyleSourceSelectorStore.set(undefined);+ $selectedInstanceSelector.set(newSelectedInstanceSelector);+ $selectedStyleSourceSelector.set(undefined);}};@@ -164,7 +164,7 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({name: "duplicateInstance",defaultHotkeys: ["meta+d", "ctrl+d"],handler: () => {- const instanceSelector = selectedInstanceSelectorStore.get();+ const instanceSelector = $selectedInstanceSelector.get();if (instanceSelector === undefined) {return;}@@ -204,7 +204,7 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({value: rootInstanceId,});// select new instance- selectedInstanceSelectorStore.set([+ $selectedInstanceSelector.set([rootInstanceId,...parentInstanceSelector,]);@@ -216,12 +216,12 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({name: "editInstanceLabel",defaultHotkeys: ["meta+e", "ctrl+e"],handler: () => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}const [targetInstanceId] = selectedInstanceSelector;- editingItemIdStore.set(targetInstanceId);+ $editingItemId.set(targetInstanceId);},},diff --git a/apps/builder/app/builder/shared/nano-states/index.ts b/apps/builder/app/builder/shared/nano-states/index.tsindex 46cbdf6b62..ea918dc8ad 100644--- a/apps/builder/app/builder/shared/nano-states/index.ts+++ b/apps/builder/app/builder/shared/nano-states/index.ts@@ -7,21 +7,21 @@ const useValue = <T>(atom: WritableAtom<T>) => {return [value, atom.set] as const;};-const isShareDialogOpenStore = atom<boolean>(false);-export const useIsShareDialogOpen = () => useValue(isShareDialogOpenStore);+const $isShareDialogOpen = atom<boolean>(false);+export const useIsShareDialogOpen = () => useValue($isShareDialogOpen);-const isPublishDialogOpenStore = atom<boolean>(false);-export const useIsPublishDialogOpen = () => useValue(isPublishDialogOpenStore);+const $isPublishDialogOpen = atom<boolean>(false);+export const useIsPublishDialogOpen = () => useValue($isPublishDialogOpen);-export const canvasWidthStore = atom<number | undefined>();-export const useCanvasWidth = () => useValue(canvasWidthStore);+export const $canvasWidth = atom<number | undefined>();+export const useCanvasWidth = () => useValue($canvasWidth);export const $canvasRect = atom<DOMRect | undefined>();-export const workspaceRectStore = atom<DOMRect | undefined>();+export const $workspaceRect = atom<DOMRect | undefined>();-export const scaleStore = computed(- [canvasWidthStore, workspaceRectStore],+export const $scale = computed(+ [$canvasWidth, $workspaceRect],(canvasWidth, workspaceRect) => {if (canvasWidth === undefined ||diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsxindex 9b22ab7c2d..948cf8397c 100644--- a/apps/builder/app/builder/shared/navigator-tree.tsx+++ b/apps/builder/app/builder/shared/navigator-tree.tsx@@ -4,13 +4,13 @@ import { shallowEqual } from "shallow-equal";import { toast } from "@webstudio-is/design-system";import { collectionComponent } from "@webstudio-is/react-sdk";import {- hoveredInstanceSelectorStore,- instancesStore,- rootInstanceStore,- selectedInstanceSelectorStore,- textEditingInstanceSelectorStore,- selectedStyleSourceSelectorStore,- registeredComponentMetasStore,+ $hoveredInstanceSelector,+ $instances,+ $rootInstance,+ $selectedInstanceSelector,+ $textEditingInstanceSelector,+ $selectedStyleSourceSelector,+ $registeredComponentMetas,$dragAndDropState,} from "~/shared/nano-states";import type { InstanceSelector } from "~/shared/tree-utils";@@ -25,10 +25,10 @@ import {import { InstanceTree } from "./tree";export const NavigatorTree = () => {- const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);- const rootInstance = useStore(rootInstanceStore);- const instances = useStore(instancesStore);- const metas = useStore(registeredComponentMetasStore);+ const selectedInstanceSelector = useStore($selectedInstanceSelector);+ const rootInstance = useStore($rootInstance);+ const instances = useStore($instances);+ const metas = useStore($registeredComponentMetas);const state = useStore($dragAndDropState);const dragPayload = state.dragPayload;@@ -120,12 +120,12 @@ export const NavigatorTree = () => {// TreeNode is refocused during "delete" hot key here https://github.com/webstudio-is/webstudio/blob/5935d7818fba3739e4f16fe710ea468bf9d0ac78/packages/design-system/src/components/tree/tree.tsx#L435// and then focus cause handleSelect to be called with the same instanceSelector// This avoids additional rerender on node delete- if (shallowEqual(selectedInstanceSelectorStore.get(), instanceSelector)) {+ if (shallowEqual($selectedInstanceSelector.get(), instanceSelector)) {return;}- selectedInstanceSelectorStore.set(instanceSelector);- textEditingInstanceSelectorStore.set(undefined);- selectedStyleSourceSelectorStore.set(undefined);+ $selectedInstanceSelector.set(instanceSelector);+ $textEditingInstanceSelector.set(undefined);+ $selectedStyleSourceSelector.set(undefined);}, []);if (rootInstance === undefined) {@@ -141,7 +141,7 @@ export const NavigatorTree = () => {isItemHidden={isItemHidden}findClosestDroppableIndex={findClosestDroppableIndex}onSelect={handleSelect}- onHover={hoveredInstanceSelectorStore.set}+ onHover={$hoveredInstanceSelector.set}onDragItemChange={(dragInstanceSelector) => {if (isInstanceDetachable(dragInstanceSelector) === false) {toast.error(diff --git a/apps/builder/app/builder/shared/tree/index.tsx b/apps/builder/app/builder/shared/tree/index.tsxindex deba946aaa..63e6973643 100644--- a/apps/builder/app/builder/shared/tree/index.tsx+++ b/apps/builder/app/builder/shared/tree/index.tsx@@ -13,10 +13,10 @@ import type { Instance } from "@webstudio-is/sdk";import { collectionComponent } from "@webstudio-is/react-sdk";import {$propValuesByInstanceSelector,- editingItemIdStore,+ $editingItemId,getIndexedInstanceId,- instancesStore,- registeredComponentMetasStore,+ $instances,+ $registeredComponentMetas,} from "~/shared/nano-states";import { MetaIcon } from "../meta-icon";import { useContentEditable } from "~/shared/dom-hooks";@@ -30,9 +30,9 @@ export const InstanceTree = ("renderItem" | "canLeaveParent" | "getItemChildren" | "editingItemId">) => {- const metas = useStore(registeredComponentMetasStore);- const instances = useStore(instancesStore);- const editingItemId = useStore(editingItemIdStore);+ const metas = useStore($registeredComponentMetas);+ const instances = useStore($instances);+ const editingItemId = useStore($editingItemId);const propValues = useStore($propValuesByInstanceSelector);const canLeaveParent = useCallback(@@ -100,7 +100,7 @@ export const InstanceTree = (const updateInstanceLabel = useCallback((instanceId: string, value: string) => {- serverSyncStore.createTransaction([instancesStore], (instances) => {+ serverSyncStore.createTransaction([$instances], (instances) => {const instance = instances.get(instanceId);if (instance === undefined) {return;@@ -129,7 +129,7 @@ export const InstanceTree = (updateInstanceLabel(props.itemData.id, val);}}onChangeEditing={(isEditing) => {- editingItemIdStore.set(+ $editingItemId.set(isEditing === true ? props.itemData.id : undefined);}}diff --git a/apps/builder/app/canvas/canvas.tsx b/apps/builder/app/canvas/canvas.tsxindex a4535ad3bc..dbe1c6e633 100644--- a/apps/builder/app/canvas/canvas.tsx+++ b/apps/builder/app/canvas/canvas.tsx@@ -26,12 +26,12 @@ import {WebstudioComponentPreview,} from "./features/webstudio-component";import {- assetsStore,- pagesStore,- instancesStore,- selectedPageStore,+ $assets,+ $pages,+ $instances,+ $selectedPage,registerComponentLibrary,- registeredComponentsStore,+ $registeredComponents,subscribeComponentHooks,$isPreviewMode,} from "~/shared/nano-states";@@ -58,7 +58,7 @@ const useElementsTree = (params: Params,imageLoader: ImageLoader) => {- const page = useStore(selectedPageStore);+ const page = useStore($selectedPage);const isPreviewMode = useStore($isPreviewMode);const rootInstanceId = page?.rootInstanceId ?? "";@@ -66,9 +66,9 @@ const useElementsTree = (// @todo remove after https://github.com/webstudio-is/webstudio/issues/1313 now its needed to be sure that no leaks exists// eslint-disable-next-line no-consoleconsole.log({- assetsStore: assetsStore.get().size,- pagesStore: pagesStore.get()?.pages.length ?? 0,- instancesStore: instancesStore.get().size,+ $assets: $assets.get().size,+ $pages: $pages.get()?.pages.length ?? 0,+ $instances: $instances.get().size,});}@@ -162,7 +162,7 @@ export const Canvas = ({$publisher.set({ publish });}, []);- const selectedPage = useStore(selectedPageStore);+ const selectedPage = useStore($selectedPage);useEffect(() => {const rootInstanceId = selectedPage?.rootInstanceId;@@ -184,8 +184,8 @@ export const Canvas = ({useEffect(subscribeInterceptedEvents, []);- const components = useStore(registeredComponentsStore);- const instances = useStore(instancesStore);+ const components = useStore($registeredComponents);+ const instances = useStore($instances);const elements = useElementsTree(components, instances, params, imageLoader);const [isInitialized, setInitialized] = useState(false);diff --git a/apps/builder/app/canvas/collapsed.ts b/apps/builder/app/canvas/collapsed.tsindex de86e74c43..6dca0f5303 100644--- a/apps/builder/app/canvas/collapsed.ts+++ b/apps/builder/app/canvas/collapsed.ts@@ -6,13 +6,13 @@ import {getPresetStyleRule,} from "~/builder/features/style-panel/shared/style-info";import {- breakpointsStore,- instancesStore,- registeredComponentMetasStore,- selectedPageStore,- stylesIndexStore,+ $breakpoints,+ $instances,+ $registeredComponentMetas,+ $selectedPage,+ $stylesIndex,} from "~/shared/nano-states";-import { selectedBreakpointStore } from "~/shared/nano-states";+import { $selectedBreakpoint } from "~/shared/nano-states";import { subscribe } from "~/shared/pubsub";import htmlTags, { type htmlTags as HtmlTags } from "html-tags";@@ -56,11 +56,11 @@ const isSelectorSupported = (selector: string) => {};const getInstanceSize = (instanceId: string, tagName: HtmlTags | undefined) => {- const metas = registeredComponentMetasStore.get();- const breakpoints = breakpointsStore.get();- const selectedBreakpoint = selectedBreakpointStore.get();- const { stylesByInstanceId } = stylesIndexStore.get();- const instances = instancesStore.get();+ const metas = $registeredComponentMetas.get();+ const breakpoints = $breakpoints.get();+ const selectedBreakpoint = $selectedBreakpoint.get();+ const { stylesByInstanceId } = $stylesIndex.get();+ const instances = $instances.get();const selectedBreakpointId = selectedBreakpoint?.id;if (selectedBreakpointId === undefined) {@@ -106,7 +106,7 @@ const getInstanceSize = (instanceId: string, tagName: HtmlTags | undefined) => {const MAX_SIZE_TO_USE_OPTIMIZATION = 50;const recalculate = () => {- const rootInstanceId = selectedPageStore.get()?.rootInstanceId;+ const rootInstanceId = $selectedPage.get()?.rootInstanceId;// Below algorithm quickly finds the common ancestor of all elements with an instanceId.// However, for a large number of elements, it's more efficient to calculate from the root.diff --git a/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsxindex 750b5ff265..4f0b47ccb4 100644--- a/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx+++ b/apps/builder/app/canvas/features/text-editor/text-editor.stories.tsx@@ -6,7 +6,7 @@ import { action } from "@storybook/addon-actions";import { Box } from "@webstudio-is/design-system";import { theme } from "@webstudio-is/design-system";import type { Instance, Instances } from "@webstudio-is/sdk";-import { textToolbarStore } from "~/shared/nano-states";+import { $textToolbar } from "~/shared/nano-states";import { TextEditor } from "./text-editor";import { emitCommand, subscribeCommands } from "~/canvas/shared/commands";@@ -47,7 +47,7 @@ const instances: Instances = new Map([]);export const Basic: StoryFn<typeof TextEditor> = ({ onChange }) => {- const state = useStore(textToolbarStore);+ const state = useStore($textToolbar);const ref = useRef<null | HTMLDivElement>(null);useEffect(subscribeCommands, []);diff --git a/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsx b/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsxindex 9f4815015b..ab2a523584 100644--- a/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsx+++ b/apps/builder/app/canvas/features/text-editor/toolbar-connector.tsx@@ -16,7 +16,7 @@ import { $getNearestNodeOfType } from "@lexical/utils";import { $patchStyleText } from "@lexical/selection";import { LinkNode } from "@lexical/link";import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";-import { textToolbarStore } from "~/shared/nano-states";+import { $textToolbar } from "~/shared/nano-states";import { subscribeScrollState } from "~/canvas/shared/scroll-state";let activeEditor: undefined | LexicalEditor;@@ -137,7 +137,7 @@ const ToolbarConnectorPluginInternal = ({const isSubscript = selection.hasFormat("subscript");const isLink = $isSelectedLink(selection);const isSpan = $getSpanNodes(selection).length !== 0;- textToolbarStore.set({+ $textToolbar.set({selectionRect,isBold,isItalic,@@ -147,7 +147,7 @@ const ToolbarConnectorPluginInternal = ({isSpan,});} else {- textToolbarStore.set(undefined);+ $textToolbar.set(undefined);}}, []);@@ -155,9 +155,9 @@ const ToolbarConnectorPluginInternal = ({return subscribeScrollState({onScrollStart: () => {// hide toolbar on scroll start preserving all data- const textToolbar = textToolbarStore.get();+ const textToolbar = $textToolbar.get();if (textToolbar) {- textToolbarStore.set({+ $textToolbar.set({...textToolbar,selectionRect: undefined,});@@ -165,9 +165,9 @@ const ToolbarConnectorPluginInternal = ({},onScrollEnd: () => {// restore toolbar with new position- const textToolbar = textToolbarStore.get();+ const textToolbar = $textToolbar.get();if (textToolbar) {- textToolbarStore.set({+ $textToolbar.set({...textToolbar,selectionRect: getSelectionClienRect(),});@@ -199,7 +199,7 @@ const ToolbarConnectorPluginInternal = ({useEffect(() => {// hide toolbar when editor is unmountedreturn () => {- textToolbarStore.set(undefined);+ $textToolbar.set(undefined);};}, []);diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex d9e2b405d6..88865773a0 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -30,15 +30,15 @@ import {import {$propValuesByInstanceSelector,getIndexedInstanceId,- instancesStore,- registeredComponentMetasStore,- selectedInstanceRenderStateStore,- selectedInstanceSelectorStore,- selectedPageStore,- selectedStyleSourceSelectorStore,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceRenderState,+ $selectedInstanceSelector,+ $selectedPage,+ $selectedStyleSourceSelector,useInstanceStyles,} from "~/shared/nano-states";-import { textEditingInstanceSelectorStore } from "~/shared/nano-states";+import { $textEditingInstanceSelector } from "~/shared/nano-states";import { useCssRules } from "~/canvas/shared/styles";import {type InstanceSelector,@@ -144,7 +144,7 @@ const getInstanceSelector = (};const $indexesWithinAncestors = computed(- [registeredComponentMetasStore, instancesStore, selectedPageStore],+ [$registeredComponentMetas, $instances, $selectedPage],(metas, instances, page) => {return getIndexesWithinAncestors(metas,@@ -157,7 +157,7 @@ const $indexesWithinAncestors = computed(const useInstanceProps = (instanceSelector: InstanceSelector) => {const instanceSelectorKey = JSON.stringify(instanceSelector);const [instanceId] = instanceSelector;- const instancePropsObjectStore = useMemo(() => {+ const $instancePropsObject = useMemo(() => {return computed([$propValuesByInstanceSelector, $indexesWithinAncestors],(propValuesByInstanceSelector, indexesWithinAncestors) => {@@ -177,7 +177,7 @@ const useInstanceProps = (instanceSelector: InstanceSelector) => {});}, [instanceSelectorKey, instanceId]);- const instancePropsObject = useStore(instancePropsObjectStore);+ const instancePropsObject = useStore($instancePropsObject);return instancePropsObject;};@@ -249,11 +249,9 @@ export const WebstudioComponentCanvas = forwardRef<const instanceId = instance.id;const instanceStyles = useInstanceStyles(instanceId);useCssRules({ instanceId: instance.id, instanceStyles });- const instances = useStore(instancesStore);+ const instances = useStore($instances);- const textEditingInstanceSelector = useStore(- textEditingInstanceSelectorStore- );+ const textEditingInstanceSelector = useStore($textEditingInstanceSelector);const { [showAttribute]: show = true, ...instanceProps } =useInstanceProps(instanceSelector);@@ -274,7 +272,7 @@ export const WebstudioComponentCanvas = forwardRef<useCollapsedOnNewElement(instanceId);- // this assumes presence of `useStore(selectedInstanceSelectorStore)` above+ // this assumes presence of `useStore($selectedInstanceSelector)` above// we rely on root re-rendering after selected instance changesuseEffect(() => {// 1 means root@@ -282,8 +280,8 @@ export const WebstudioComponentCanvas = forwardRef<// If by the time root is rendered,// no selected instance renders and sets state to "mounted",// then it's clear that selected instance will not render at all, so we set it to "notMounted"- if (selectedInstanceRenderStateStore.get() === "pending") {- selectedInstanceRenderStateStore.set("notMounted");+ if ($selectedInstanceRenderState.get() === "pending") {+ $selectedInstanceRenderState.set("notMounted");}}});@@ -368,7 +366,7 @@ export const WebstudioComponentCanvas = forwardRef</>}onChange={(instancesList) => {- serverSyncStore.createTransaction([instancesStore], (instances) => {+ serverSyncStore.createTransaction([$instances], (instances) => {const deletedTreeIds = findTreeInstanceIds(instances, instance.id);for (const updatedInstance of instancesList) {instances.set(updatedInstance.id, updatedInstance);@@ -381,15 +379,15 @@ export const WebstudioComponentCanvas = forwardRef<});}}onSelectInstance={(instanceId) => {- const instances = instancesStore.get();+ const instances = $instances.get();const newSelectedSelector = getInstanceSelector(instances,instanceSelector,instanceId);- textEditingInstanceSelectorStore.set(undefined);- selectedInstanceSelectorStore.set(newSelectedSelector);- selectedStyleSourceSelectorStore.set(undefined);+ $textEditingInstanceSelector.set(undefined);+ $selectedInstanceSelector.set(newSelectedSelector);+ $selectedStyleSourceSelector.set(undefined);}}/></Suspense>@@ -401,7 +399,7 @@ export const WebstudioComponentPreview = forwardRef<HTMLElement,WebstudioComponentProps>(({ instance, instanceSelector, components, ...restProps }, ref) => {- const instances = useStore(instancesStore);+ const instances = useStore($instances);const instanceStyles = useInstanceStyles(instance.id);useCssRules({ instanceId: instance.id, instanceStyles });const { [showAttribute]: show = true, ...instanceProps } =diff --git a/apps/builder/app/canvas/instance-hovering.ts b/apps/builder/app/canvas/instance-hovering.tsindex 929a3dbe17..cc14e61168 100644--- a/apps/builder/app/canvas/instance-hovering.ts+++ b/apps/builder/app/canvas/instance-hovering.ts@@ -1,9 +1,6 @@import { idAttribute } from "@webstudio-is/react-sdk";-import {- hoveredInstanceSelectorStore,- instancesStore,-} from "~/shared/nano-states";-import { hoveredInstanceOutlineStore } from "~/shared/nano-states";+import { $hoveredInstanceSelector, $instances } from "~/shared/nano-states";+import { $hoveredInstanceOutline } from "~/shared/nano-states";import {getAllElementsBoundingBox,getElementsByInstanceSelector,@@ -21,7 +18,7 @@ export const subscribeInstanceHovering = () => {const updateHoveredInstance = (element: Element) => {const instanceSelector = getInstanceSelectorFromElement(element);if (instanceSelector) {- hoveredInstanceSelectorStore.set(instanceSelector);+ $hoveredInstanceSelector.set(instanceSelector);}};@@ -42,12 +39,12 @@ export const subscribeInstanceHovering = () => {const handleMouseOut = () => {mouseOutTimeoutId = setTimeout(() => {hoveredElement = undefined;- hoveredInstanceSelectorStore.set(undefined);- hoveredInstanceOutlineStore.set(undefined);+ $hoveredInstanceSelector.set(undefined);+ $hoveredInstanceOutline.set(undefined);}, 100);// Fixes the bug, that new hover occures during timeout- const unsubscribe = hoveredInstanceSelectorStore.listen(() => {+ const unsubscribe = $hoveredInstanceSelector.listen(() => {clearTimeout(mouseOutTimeoutId);unsubscribe();});@@ -70,14 +67,14 @@ export const subscribeInstanceHovering = () => {}const [instanceId] = instanceSelector;- const instances = instancesStore.get();+ const instances = $instances.get();const instance = instances.get(instanceId);if (instance === undefined) {return;}if (!isScrolling) {- hoveredInstanceOutlineStore.set({+ $hoveredInstanceOutline.set({instanceId: instance.id,rect: getAllElementsBoundingBox(elements),});@@ -89,7 +86,7 @@ export const subscribeInstanceHovering = () => {const unsubscribeScrollState = subscribeScrollState({onScrollStart() {isScrolling = true;- hoveredInstanceOutlineStore.set(undefined);+ $hoveredInstanceOutline.set(undefined);},onScrollEnd() {isScrolling = false;@@ -106,13 +103,13 @@ export const subscribeInstanceHovering = () => {});// update rect whenever hovered instance is changed- const unsubscribeHoveredInstanceId = hoveredInstanceSelectorStore.subscribe(+ const unsubscribeHoveredInstanceId = $hoveredInstanceSelector.subscribe((instanceSelector) => {if (instanceSelector) {const elements = getElementsByInstanceSelector(instanceSelector);updateHoveredRect(elements, instanceSelector);} else {- hoveredInstanceOutlineStore.set(undefined);+ $hoveredInstanceOutline.set(undefined);}});diff --git a/apps/builder/app/canvas/instance-selected.ts b/apps/builder/app/canvas/instance-selected.tsindex b9ac6eabcb..0fd2e874bb 100644--- a/apps/builder/app/canvas/instance-selected.ts+++ b/apps/builder/app/canvas/instance-selected.ts@@ -2,18 +2,18 @@ import type { Instance } from "@webstudio-is/sdk";import { idAttribute, selectorIdAttribute } from "@webstudio-is/react-sdk";import { subscribeWindowResize } from "~/shared/dom-hooks";import {- isResizingCanvasStore,- selectedInstanceBrowserStyleStore,- selectedInstanceIntanceToTagStore,- selectedInstanceUnitSizesStore,- selectedInstanceRenderStateStore,- stylesIndexStore,- instancesStore,- selectedInstanceSelectorStore,+ $isResizingCanvas,+ $selectedInstanceBrowserStyle,+ $selectedInstanceIntanceToTag,+ $selectedInstanceUnitSizes,+ $selectedInstanceRenderState,+ $stylesIndex,+ $instances,+ $selectedInstanceSelector,$propValuesByInstanceSelector,$styles,$selectedInstanceStates,- styleSourceSelectionsStore,+ $styleSourceSelections,} from "~/shared/nano-states";import htmlTags, { type htmlTags as HtmlTags } from "html-tags";import {@@ -21,7 +21,7 @@ import {getElementsByInstanceSelector,} from "~/shared/dom-utils";import { subscribeScrollState } from "~/canvas/shared/scroll-state";-import { selectedInstanceOutlineStore } from "~/shared/nano-states";+import { $selectedInstanceOutline } from "~/shared/nano-states";import type { UnitSizes } from "~/builder/features/style-panel/shared/css-value-input/convert-units";import { setDataCollapsed } from "~/canvas/collapsed";import { getBrowserStyle } from "./features/webstudio-component/get-browser-style";@@ -31,14 +31,14 @@ const isHtmlTag = (tag: string): tag is HtmlTags =>htmlTags.includes(tag as HtmlTags);const setOutline = (instanceId: Instance["id"], elements: HTMLElement[]) => {- selectedInstanceOutlineStore.set({+ $selectedInstanceOutline.set({instanceId,rect: getAllElementsBoundingBox(elements),});};const hideOutline = () => {- selectedInstanceOutlineStore.set(undefined);+ $selectedInstanceOutline.set(undefined);};const calculateUnitSizes = (element: HTMLElement): UnitSizes => {@@ -124,7 +124,7 @@ const subscribeSelectedInstance = (updateDataCollapsed();const showOutline = () => {- if (isResizingCanvasStore.get()) {+ if ($isResizingCanvas.get()) {return;}setOutline(instanceId, elements);@@ -140,7 +140,7 @@ const subscribeSelectedInstance = (const [element] = elements;// trigger style recomputing every time instance styles are changed- selectedInstanceBrowserStyleStore.set(getBrowserStyle(element));+ $selectedInstanceBrowserStyle.set(getBrowserStyle(element));// Map self and ancestor instance ids to tag namesconst instanceToTag = new Map<Instance["id"], HtmlTags>();@@ -157,14 +157,14 @@ const subscribeSelectedInstance = (}}- selectedInstanceIntanceToTagStore.set(instanceToTag);+ $selectedInstanceIntanceToTag.set(instanceToTag);const unitSizes = calculateUnitSizes(element);- selectedInstanceUnitSizesStore.set(unitSizes);+ $selectedInstanceUnitSizes.set(unitSizes);const availableStates = new Set<string>();const instanceStyleSourceIds = new Set(- styleSourceSelectionsStore.get().get(instanceId)?.values+ $styleSourceSelections.get().get(instanceId)?.values);const styles = $styles.get();for (const styleDecl of styles.values()) {@@ -247,14 +247,14 @@ const subscribeSelectedInstance = (updateObservers();- const unsubscribeStylesIndexStore = stylesIndexStore.subscribe(update);- const unsubscribeInstancesStore = instancesStore.subscribe(update);+ const unsubscribe$stylesIndex = $stylesIndex.subscribe(update);+ const unsubscribe$instances = $instances.subscribe(update);const unsubscribePropValuesStore =$propValuesByInstanceSelector.subscribe(update);- const unsubscribeIsResizingCanvas = isResizingCanvasStore.subscribe(+ const unsubscribeIsResizingCanvas = $isResizingCanvas.subscribe((isResizing) => {- if (isResizing && selectedInstanceOutlineStore.get()) {+ if (isResizing && $selectedInstanceOutline.get()) {return hideOutline();}showOutline();@@ -279,20 +279,20 @@ const subscribeSelectedInstance = (},});- selectedInstanceRenderStateStore.set("mounted");+ $selectedInstanceRenderState.set("mounted");return () => {clearTimeout(updateStoreTimeouHandle);hideOutline();- selectedInstanceRenderStateStore.set("pending");+ $selectedInstanceRenderState.set("pending");resizeObserver.disconnect();mutationObserver.disconnect();bodyStyleMutationObserver.disconnect();unsubscribeIsResizingCanvas();unsubscribeScrollState();unsubscribeWindowResize();- unsubscribeStylesIndexStore();- unsubscribeInstancesStore();+ unsubscribe$stylesIndex();+ unsubscribe$instances();unsubscribePropValuesStore();};};@@ -301,7 +301,7 @@ export const subscribeSelected = (queueTask: (task: () => void) => void) => {let previousSelectedInstance: readonly string[] | undefined = undefined;let unsubscribeSelectedInstance = () => {};- const unsubscribe = selectedInstanceSelectorStore.subscribe(+ const unsubscribe = $selectedInstanceSelector.subscribe((instanceSelector) => {if (instanceSelector !== previousSelectedInstance) {unsubscribeSelectedInstance();diff --git a/apps/builder/app/canvas/instance-selection.ts b/apps/builder/app/canvas/instance-selection.tsindex f8eb5a8966..7853cc62db 100644--- a/apps/builder/app/canvas/instance-selection.ts+++ b/apps/builder/app/canvas/instance-selection.ts@@ -1,12 +1,12 @@import { getInstanceSelectorFromElement } from "~/shared/dom-utils";import { findClosestEditableInstanceSelector } from "~/shared/instance-utils";import {- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedStyleSourceSelectorStore,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedStyleSourceSelector,} from "~/shared/nano-states";-import { textEditingInstanceSelectorStore } from "~/shared/nano-states";+import { $textEditingInstanceSelector } from "~/shared/nano-states";import { emitCommand } from "./shared/commands";export const subscribeInstanceSelection = () => {@@ -58,25 +58,25 @@ export const subscribeInstanceSelection = () => {// the first click in double click or the only one in regular clickif (clickCount === 1) {- selectedInstanceSelectorStore.set(instanceSelector);+ $selectedInstanceSelector.set(instanceSelector);// reset text editor when another instance is selected- textEditingInstanceSelectorStore.set(undefined);- selectedStyleSourceSelectorStore.set(undefined);+ $textEditingInstanceSelector.set(undefined);+ $selectedStyleSourceSelector.set(undefined);}// the second click in a double click.if (clickCount === 2) {const editableInstanceSelector = findClosestEditableInstanceSelector(instanceSelector,- instancesStore.get(),- registeredComponentMetasStore.get()+ $instances.get(),+ $registeredComponentMetas.get());// enable text editor when double click on its instance or one of its descendantsif (editableInstanceSelector) {- selectedInstanceSelectorStore.set(editableInstanceSelector);- textEditingInstanceSelectorStore.set(editableInstanceSelector);- selectedStyleSourceSelectorStore.set(undefined);+ $selectedInstanceSelector.set(editableInstanceSelector);+ $textEditingInstanceSelector.set(editableInstanceSelector);+ $selectedStyleSourceSelector.set(undefined);}}};diff --git a/apps/builder/app/canvas/interceptor.ts b/apps/builder/app/canvas/interceptor.tsindex 5f4cd0d02b..2ac7315b9c 100644--- a/apps/builder/app/canvas/interceptor.ts+++ b/apps/builder/app/canvas/interceptor.ts@@ -1,5 +1,5 @@import { findPageByIdOrPath } from "@webstudio-is/project-build";-import { $isPreviewMode, pagesStore } from "~/shared/nano-states";+import { $isPreviewMode, $pages } from "~/shared/nano-states";import { switchPage } from "~/shared/pages";const isAbsoluteUrl = (href: string) => {@@ -12,7 +12,7 @@ const isAbsoluteUrl = (href: string) => {};const handleLinkClick = (element: HTMLAnchorElement) => {- const pages = pagesStore.get();+ const pages = $pages.get();const href = element.getAttribute("href");if (href === null || pages === undefined) {return;diff --git a/apps/builder/app/canvas/shared/commands.ts b/apps/builder/app/canvas/shared/commands.tsindex 604cd19827..54dffb4011 100644--- a/apps/builder/app/canvas/shared/commands.ts+++ b/apps/builder/app/canvas/shared/commands.ts@@ -4,11 +4,11 @@ import { createCommandsEmitter } from "~/shared/commands-emitter";import { getElementByInstanceSelector } from "~/shared/dom-utils";import { findClosestEditableInstanceSelector } from "~/shared/instance-utils";import {- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedStyleSourceSelectorStore,- textEditingInstanceSelectorStore,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedStyleSourceSelector,+ $textEditingInstanceSelector,} from "~/shared/nano-states";import {CLEAR_FORMAT_COMMAND,@@ -27,14 +27,14 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({// builder invokes command with custom hotkey setupdisableHotkeyOutsideApp: true,handler: () => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}const editableInstanceSelector = findClosestEditableInstanceSelector(selectedInstanceSelector,- instancesStore.get(),- registeredComponentMetasStore.get()+ $instances.get(),+ $registeredComponentMetas.get());if (editableInstanceSelector === undefined) {return;@@ -46,8 +46,8 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({// When an event is triggered from the Builder,// the canvas element may be unfocused, so it's important to focus the element on the canvas.element.focus();- selectedInstanceSelectorStore.set(editableInstanceSelector);- textEditingInstanceSelectorStore.set(editableInstanceSelector);+ $selectedInstanceSelector.set(editableInstanceSelector);+ $textEditingInstanceSelector.set(editableInstanceSelector);},},@@ -57,20 +57,19 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({// reset selection for canvas, but not for the builderdisableHotkeyOutsideApp: true,handler: () => {- const selectedInstanceSelector = selectedInstanceSelectorStore.get();- const textEditingInstanceSelector =- textEditingInstanceSelectorStore.get();+ const selectedInstanceSelector = $selectedInstanceSelector.get();+ const textEditingInstanceSelector = $textEditingInstanceSelector.get();if (selectedInstanceSelector === undefined) {return;}// exit text editing mode first without unselecting instanceif (textEditingInstanceSelector) {- textEditingInstanceSelectorStore.set(undefined);+ $textEditingInstanceSelector.set(undefined);return;}// unselect both instance and style source- selectedInstanceSelectorStore.set(undefined);- selectedStyleSourceSelectorStore.set(undefined);+ $selectedInstanceSelector.set(undefined);+ $selectedStyleSourceSelector.set(undefined);},},diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex 3a6ceac0e1..2848e0373c 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -18,12 +18,12 @@ import {isValidStaticStyleValue,} from "@webstudio-is/css-engine";import {- assetsStore,- breakpointsStore,+ $assets,+ $breakpoints,$isPreviewMode,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedStyleSourceSelectorStore,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedStyleSourceSelector,} from "~/shared/nano-states";import {type StyleRule,@@ -120,7 +120,7 @@ const subscribeEphemeralStyle = (params: Params) => {// track custom properties not set on this changeconst deletedCustomProperties = new Set(addedCustomProperties);- const assets = assetsStore.get();+ const assets = $assets.get();const transformer = createImageValueTransformer(assets, {assetBaseUrl: params.assetBaseUrl,});@@ -167,9 +167,9 @@ export const useManageDesignModeStyles = (params: Params) => {};export const GlobalStyles = ({ params }: { params: Params }) => {- const breakpoints = useStore(breakpointsStore);- const assets = useStore(assetsStore);- const metas = useStore(registeredComponentMetasStore);+ const breakpoints = useStore($breakpoints);+ const assets = useStore($assets);+ const metas = useStore($registeredComponentMetas);useIsomorphicLayoutEffect(() => {const sortedBreakpoints = Array.from(breakpoints.values()).sort(@@ -263,9 +263,9 @@ const getOrCreateRule = ({};const useSelectedState = (instanceId: Instance["id"]) => {- const selectedStateStore = useMemo(() => {+ const $selectedState = useMemo(() => {return computed(- [selectedInstanceSelectorStore, selectedStyleSourceSelectorStore],+ [$selectedInstanceSelector, $selectedStyleSourceSelector],(selectedInstanceSelector, selectedStyleSourceSelector) => {if (selectedInstanceSelector?.[0] !== instanceId) {return;@@ -274,7 +274,7 @@ const useSelectedState = (instanceId: Instance["id"]) => {});}, [instanceId]);- const selectedState = useStore(selectedStateStore);+ const selectedState = useStore($selectedState);return selectedState;};@@ -286,13 +286,13 @@ export const useCssRules = ({instanceStyles: StyleDecl[];}) => {const params = useContext(ReactSdkContext);- const breakpoints = useStore(breakpointsStore);+ const breakpoints = useStore($breakpoints);const selectedState = useSelectedState(instanceId);useIsomorphicLayoutEffect(() => {// expect assets to be up to date by the time styles are changed// to avoid all styles rerendering when assets are changed- const assets = assetsStore.get();+ const assets = $assets.get();// find all instance rules and collect rendered propertiesconst deletedPropertiesByRule = new Map<diff --git a/apps/builder/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.tsindex 4b0e1f910c..6822eb328a 100644--- a/apps/builder/app/canvas/shared/use-drag-drop.ts+++ b/apps/builder/app/canvas/shared/use-drag-drop.ts@@ -10,8 +10,8 @@ import {} from "@webstudio-is/design-system";import {$dragAndDropState,- instancesStore,- registeredComponentMetasStore,+ $instances,+ $registeredComponentMetas,} from "~/shared/nano-states";import { publish, useSubscribe } from "~/shared/pubsub";import {@@ -63,8 +63,8 @@ const findClosestDroppableInstanceSelector = (instanceSelector: InstanceSelector,dragPayload: DragStartPayload) => {- const instances = instancesStore.get();- const metas = registeredComponentMetasStore.get();+ const instances = $instances.get();+ const metas = $registeredComponentMetas.get();let insertConstraints: undefined | InsertConstraints;if (dragPayload?.type === "insert") {@@ -106,7 +106,7 @@ const findClosestDroppableInstanceSelector = (}const droppableIndex = findClosestDroppableComponentIndex(- registeredComponentMetasStore.get(),+ $registeredComponentMetas.get(),componentSelector,insertConstraints);@@ -232,8 +232,8 @@ export const useDragAndDrop = () => {return (findClosestDetachableInstanceSelector(instanceSelector,- instancesStore.get(),- registeredComponentMetasStore.get()+ $instances.get(),+ $registeredComponentMetas.get()) ?? false);},diff --git a/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts b/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.tsindex a3554f6f6a..b9490fe837 100644--- a/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts+++ b/apps/builder/app/shared/breakpoints/select-breakpoint-by-order.ts@@ -1,18 +1,18 @@import { groupBreakpoints } from "./group-breakpoints";-import { selectedBreakpointIdStore, breakpointsStore } from "../nano-states";+import { $selectedBreakpointId, $breakpoints } from "../nano-states";import { setInitialCanvasWidth } from "~/builder/features/breakpoints";/*** Order number starts with 1 and covers all existing breakpoints*/export const selectBreakpointByOrder = (orderNumber: number) => {- const breakpoints = breakpointsStore.get();+ const breakpoints = $breakpoints.get();const index = orderNumber - 1;const breakpoint = groupBreakpoints(Array.from(breakpoints.values())).at(index);if (breakpoint) {- selectedBreakpointIdStore.set(breakpoint.id);+ $selectedBreakpointId.set(breakpoint.id);setInitialCanvasWidth(breakpoint.id);}};diff --git a/apps/builder/app/shared/copy-paste/plugin-embed-template.ts b/apps/builder/app/shared/copy-paste/plugin-embed-template.tsindex cc0fc00749..aace4dfa0b 100644--- a/apps/builder/app/shared/copy-paste/plugin-embed-template.ts+++ b/apps/builder/app/shared/copy-paste/plugin-embed-template.ts@@ -4,11 +4,11 @@ import {generateDataFromEmbedTemplate,} from "@webstudio-is/react-sdk";import {- selectedInstanceSelectorStore,- instancesStore,- selectedPageStore,- registeredComponentMetasStore,- breakpointsStore,+ $selectedInstanceSelector,+ $instances,+ $selectedPage,+ $registeredComponentMetas,+ $breakpoints,} from "../nano-states";import {computeInstancesConstraints,@@ -35,23 +35,23 @@ export const mimeType = "text/plain";export const onPaste = (clipboardData: string): boolean => {const template = parse(clipboardData);- const selectedPage = selectedPageStore.get();+ const selectedPage = $selectedPage.get();if (template === undefined || selectedPage === undefined) {return false;}// paste to the root if nothing is selected- const instanceSelector = selectedInstanceSelectorStore.get() ?? [+ const instanceSelector = $selectedInstanceSelector.get() ?? [selectedPage.rootInstanceId,];- const breakpoints = breakpointsStore.get();+ const breakpoints = $breakpoints.get();const breakpointValues = Array.from(breakpoints.values());const baseBreakpoint = breakpointValues.find(isBaseBreakpoint);if (baseBreakpoint === undefined) {return false;}- const metas = registeredComponentMetasStore.get();+ const metas = $registeredComponentMetas.get();const templateData = generateDataFromEmbedTemplate(template,metas,@@ -65,7 +65,7 @@ export const onPaste = (clipboardData: string): boolean => {.map((child) => child.value);const dropTarget = findClosestDroppableTarget(metas,- instancesStore.get(),+ $instances.get(),instanceSelector,computeInstancesConstraints(metas, newInstances, rootInstanceIds));diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts b/apps/builder/app/shared/copy-paste/plugin-instance.test.tsindex 15dfd746bd..56c53130da 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.test.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.test.ts@@ -21,14 +21,12 @@ import { registerContainers } from "../sync";import {$instances,$selectedInstanceSelector,- dataSourcesStore,- instancesStore,- pagesStore,- projectStore,- propsStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedPageIdStore,+ $dataSources,+ $pages,+ $project,+ $props,+ $registeredComponentMetas,+ $selectedPageId,} from "../nano-states";import { onCopy, onPaste } from "./plugin-instance";@@ -37,16 +35,16 @@ const expectString = expect.any(String) as unknown as string;enableMapSet();registerContainers();-registeredComponentMetasStore.set(+$registeredComponentMetas.set(new Map(Object.entries({ ...baseComponentMetas, ...coreMetas })));-projectStore.set({ id: "my-project" } as Project);-pagesStore.set({+$project.set({ id: "my-project" } as Project);+$pages.set({meta: {},homePage: { id: "home-page", rootInstanceId: "body0" } as Page,pages: [],});-selectedPageIdStore.set("home-page");+$selectedPageId.set("home-page");const createInstance = (id: Instance["id"],@@ -96,18 +94,15 @@ describe("paste target", () => {] satisfies Instance[]);test("is inside selected instance", () => {- instancesStore.set(instances);- selectedInstanceSelectorStore.set(["box1", "body0"]);+ $instances.set(instances);+ $selectedInstanceSelector.set(["box1", "body0"]);const clipboardData = onCopy() ?? "";- selectedInstanceSelectorStore.set(["box2", "body0"]);+ $selectedInstanceSelector.set(["box2", "body0"]);onPaste(clipboardData);- const instancesDifference = getMapDifference(- instances,- instancesStore.get()- );+ const instancesDifference = getMapDifference(instances, $instances.get());const [newBox1] = instancesDifference.keys();- expect(instancesStore.get().get("box2")).toEqual(+ expect($instances.get().get("box2")).toEqual(createInstance("box2", "Box", [{ type: "id", value: newBox1 }]));expect(instancesDifference).toEqual(@@ -116,16 +111,13 @@ describe("paste target", () => {});test("is after selected instance when same as copied", () => {- instancesStore.set(instances);- selectedInstanceSelectorStore.set(["box1", "body0"]);+ $instances.set(instances);+ $selectedInstanceSelector.set(["box1", "body0"]);onPaste(onCopy() ?? "");- const instancesDifference = getMapDifference(- instances,- instancesStore.get()- );+ const instancesDifference = getMapDifference(instances, $instances.get());const [newBox1] = instancesDifference.keys();- expect(instancesStore.get().get("body0")).toEqual(+ expect($instances.get().get("body0")).toEqual(createInstance("body0", "Body", [{ type: "id", value: "box1" },{ type: "id", value: newBox1 },@@ -194,23 +186,20 @@ describe("data sources", () => {] satisfies Prop[]);test("are copy pasted when scoped to copied instances", () => {- instancesStore.set(instances);- dataSourcesStore.set(dataSources);- propsStore.set(props);- selectedInstanceSelectorStore.set(["box1", "body0"]);+ $instances.set(instances);+ $dataSources.set(dataSources);+ $props.set(props);+ $selectedInstanceSelector.set(["box1", "body0"]);const clipboardData = onCopy() ?? "";- selectedInstanceSelectorStore.set(["body0"]);+ $selectedInstanceSelector.set(["body0"]);onPaste(clipboardData);- const instancesDifference = getMapDifference(- instances,- instancesStore.get()- );+ const instancesDifference = getMapDifference(instances, $instances.get());const [newBox1, newBox2] = instancesDifference.keys();const dataSourcesDifference = getMapDifference(dataSources,- dataSourcesStore.get()+ $dataSources.get());const [newDataSource1] = dataSourcesDifference.keys();expect(dataSourcesDifference).toEqual(@@ -223,7 +212,7 @@ describe("data sources", () => {]));- const propsDifference = getMapDifference(props, propsStore.get());+ const propsDifference = getMapDifference(props, $props.get());const [newProp1, newProp2, newProp3, newProp4] = propsDifference.keys();expect(propsDifference).toEqual(toMap([@@ -266,27 +255,24 @@ describe("data sources", () => {});test("are inlined into props when not scoped to copied instances or depends on not scoped data source", () => {- instancesStore.set(instances);- propsStore.set(props);- dataSourcesStore.set(dataSources);- selectedInstanceSelectorStore.set(["box2", "box1", "body0"]);+ $instances.set(instances);+ $props.set(props);+ $dataSources.set(dataSources);+ $selectedInstanceSelector.set(["box2", "box1", "body0"]);const clipboardData = onCopy() ?? "";- selectedInstanceSelectorStore.set(["body0"]);+ $selectedInstanceSelector.set(["body0"]);onPaste(clipboardData);- const instancesDifference = getMapDifference(- instances,- instancesStore.get()- );+ const instancesDifference = getMapDifference(instances, $instances.get());const [newBox2] = instancesDifference.keys();const dataSourcesDifference = getMapDifference(dataSources,- dataSourcesStore.get()+ $dataSources.get());expect(dataSourcesDifference).toEqual(new Map());- const propsDifference = getMapDifference(props, propsStore.get());+ const propsDifference = getMapDifference(props, $props.get());const [newProp1, newProp2, newProp3] = propsDifference.keys();expect(propsDifference).toEqual(toMap([@@ -316,27 +302,24 @@ describe("data sources", () => {});test("preserve data sources outside of scope when pasted within their scope", () => {- instancesStore.set(instances);- propsStore.set(props);- dataSourcesStore.set(dataSources);- selectedInstanceSelectorStore.set(["box2", "box1", "body0"]);+ $instances.set(instances);+ $props.set(props);+ $dataSources.set(dataSources);+ $selectedInstanceSelector.set(["box2", "box1", "body0"]);const clipboardData = onCopy() ?? "";- selectedInstanceSelectorStore.set(["box1", "body0"]);+ $selectedInstanceSelector.set(["box1", "body0"]);onPaste(clipboardData);- const instancesDifference = getMapDifference(- instances,- instancesStore.get()- );+ const instancesDifference = getMapDifference(instances, $instances.get());const [newBox2] = instancesDifference.keys();const dataSourcesDifference = getMapDifference(dataSources,- dataSourcesStore.get()+ $dataSources.get());expect(dataSourcesDifference).toEqual(new Map());- const propsDifference = getMapDifference(props, propsStore.get());+ const propsDifference = getMapDifference(props, $props.get());const [newProp1, newProp2, newProp3] = propsDifference.keys();expect(propsDifference).toEqual(toMap([@@ -400,23 +383,20 @@ describe("data sources", () => {value: "itemDataSource",},] satisfies Prop[]);- instancesStore.set(instances);- propsStore.set(props);- dataSourcesStore.set(dataSources);- selectedInstanceSelectorStore.set(["list", "body"]);+ $instances.set(instances);+ $props.set(props);+ $dataSources.set(dataSources);+ $selectedInstanceSelector.set(["list", "body"]);const clipboardData = onCopy() ?? "";- selectedInstanceSelectorStore.set(["body"]);+ $selectedInstanceSelector.set(["body"]);onPaste(clipboardData);- const instancesDifference = getMapDifference(- instances,- instancesStore.get()- );+ const instancesDifference = getMapDifference(instances, $instances.get());const [collectionId] = instancesDifference.keys();const dataSourcesDifference = getMapDifference(dataSources,- dataSourcesStore.get()+ $dataSources.get());const [itemDataSourceId] = dataSourcesDifference.keys();expect(dataSourcesDifference).toEqual(@@ -433,7 +413,7 @@ describe("data sources", () => {]));- const propsDifference = getMapDifference(props, propsStore.get());+ const propsDifference = getMapDifference(props, $props.get());const [dataPropId, itemPropId] = propsDifference.keys();expect(propsDifference).toEqual(toMap([diff --git a/apps/builder/app/shared/copy-paste/plugin-markdown.test.ts b/apps/builder/app/shared/copy-paste/plugin-markdown.test.tsindex c19f84da00..8ed36611c6 100644--- a/apps/builder/app/shared/copy-paste/plugin-markdown.test.ts+++ b/apps/builder/app/shared/copy-paste/plugin-markdown.test.ts@@ -1,10 +1,10 @@import { describe, test, expect } from "@jest/globals";import { parse } from "./plugin-markdown";-import { breakpointsStore } from "../nano-states";+import { $breakpoints } from "../nano-states";const options = { generateId: () => "123" };-breakpointsStore.set(new Map([["0", { id: "0", label: "base" }]]));+$breakpoints.set(new Map([["0", { id: "0", label: "base" }]]));describe("Plugin Markdown", () => {test("paragraph", () => {diff --git a/apps/builder/app/shared/copy-paste/plugin-markdown.ts b/apps/builder/app/shared/copy-paste/plugin-markdown.tsindex ae9f8ba7dd..a3874130ea 100644--- a/apps/builder/app/shared/copy-paste/plugin-markdown.ts+++ b/apps/builder/app/shared/copy-paste/plugin-markdown.ts@@ -10,11 +10,11 @@ import {insertTemplateData,} from "../instance-utils";import {- breakpointsStore,- instancesStore,- registeredComponentMetasStore,- selectedInstanceSelectorStore,- selectedPageStore,+ $breakpoints,+ $instances,+ $registeredComponentMetas,+ $selectedInstanceSelector,+ $selectedPage,} from "../nano-states";import { isBaseBreakpoint } from "../breakpoints";@@ -188,7 +188,7 @@ export const parse = (clipboardData: string, options?: Options) => {if (ast.children.length === 0) {return;}- const breakpoints = breakpointsStore.get();+ const breakpoints = $breakpoints.get();const breakpointValues = Array.from(breakpoints.values());const baseBreakpoint = breakpointValues.find(isBaseBreakpoint);if (baseBreakpoint === undefined) {@@ -209,11 +209,11 @@ export const parse = (clipboardData: string, options?: Options) => {export const onPaste = (clipboardData: string): boolean => {const data = parse(clipboardData);- const selectedPage = selectedPageStore.get();+ const selectedPage = $selectedPage.get();if (data === undefined || selectedPage === undefined) {return false;}- const metas = registeredComponentMetasStore.get();+ const metas = $registeredComponentMetas.get();const newInstances = new Map(data.instances.map((instance) => [instance.id, instance]));@@ -221,12 +221,12 @@ export const onPaste = (clipboardData: string): boolean => {.filter((child) => child.type === "id").map((child) => child.value);// paste to the root if nothing is selected- const instanceSelector = selectedInstanceSelectorStore.get() ?? [+ const instanceSelector = $selectedInstanceSelector.get() ?? [selectedPage.rootInstanceId,];const dropTarget = findClosestDroppableTarget(metas,- instancesStore.get(),+ $instances.get(),instanceSelector,computeInstancesConstraints(metas, newInstances, rootInstanceIds));diff --git a/apps/builder/app/shared/instance-utils.test.ts b/apps/builder/app/shared/instance-utils.test.tsindex 62312ffb63..9ce17590fc 100644--- a/apps/builder/app/shared/instance-utils.test.ts+++ b/apps/builder/app/shared/instance-utils.test.ts@@ -40,15 +40,7 @@ import {$styleSourceSelections,$styleSources,$styles,- assetsStore,- breakpointsStore,- dataSourcesStore,- instancesStore,- propsStore,- registeredComponentMetasStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,+ $registeredComponentMetas,} from "./nano-states";import { registerContainers } from "./sync";import type { Project } from "@webstudio-is/project";@@ -429,12 +421,10 @@ describe("find closest droppable target", () => {});test("insert template data with only new style sources", () => {- instancesStore.set(new Map([createInstancePair("body", "Body", [])]));- styleSourceSelectionsStore.set(new Map());- styleSourcesStore.set(- new Map([["1", { type: "token", id: "1", name: "Zero" }]])- );- stylesStore.set(+ $instances.set(new Map([createInstancePair("body", "Body", [])]));+ $styleSourceSelections.set(new Map());+ $styleSources.set(new Map([["1", { type: "token", id: "1", name: "Zero" }]]));+ $styles.set(new Map([["1:base:color:",@@ -483,16 +473,16 @@ test("insert template data with only new style sources", () => {},{ parentSelector: ["body"], position: "end" });- expect(styleSourceSelectionsStore.get()).toEqual(+ expect($styleSourceSelections.get()).toEqual(new Map([["box1", { instanceId: "box1", values: ["1", "2"] }]]));- expect(styleSourcesStore.get()).toEqual(+ expect($styleSources.get()).toEqual(new Map([["1", { type: "token", id: "1", name: "Zero" }],["2", { type: "token", id: "2", name: "Two" }],]));- expect(stylesStore.get()).toEqual(+ expect($styles.get()).toEqual(new Map([["1:base:color:",@@ -521,7 +511,7 @@ describe("reparent instance", () => {// body// list// box- instancesStore.set(+ $instances.set(new Map([createInstancePair("body", "Body", [{ type: "id", value: "list" }]),createInstancePair("list", collectionComponent, [@@ -530,12 +520,12 @@ describe("reparent instance", () => {createInstancePair("box", "Box", []),]));- registeredComponentMetasStore.set(createFakeComponentMetas({}));+ $registeredComponentMetas.set(createFakeComponentMetas({}));reparentInstance(["box", "list[0]", "list", "body"], {parentSelector: ["body"],position: 1,});- expect(instancesStore.get()).toEqual(+ expect($instances.get()).toEqual(new Map([createInstancePair("body", "Body", [{ type: "id", value: "list" },@@ -554,7 +544,7 @@ describe("delete instance", () => {// box1// box11// box2- instancesStore.set(+ $instances.set(new Map([createInstancePair("body", "Body", [{ type: "id", value: "box1" },@@ -565,9 +555,9 @@ describe("delete instance", () => {createInstancePair("box2", "Box", []),]));- registeredComponentMetasStore.set(createFakeComponentMetas({}));+ $registeredComponentMetas.set(createFakeComponentMetas({}));deleteInstance(["box1", "body"]);- expect(instancesStore.get()).toEqual(+ expect($instances.get()).toEqual(new Map([createInstancePair("body", "Body", [{ type: "id", value: "box2" }]),createInstancePair("box2", "Box", []),@@ -578,15 +568,15 @@ describe("delete instance", () => {test("prevent deleting root instance", () => {// body// box1- instancesStore.set(+ $instances.set(new Map([createInstancePair("body", "Body", [{ type: "id", value: "box1" }]),createInstancePair("box1", "Box", []),]));- registeredComponentMetasStore.set(createFakeComponentMetas({}));+ $registeredComponentMetas.set(createFakeComponentMetas({}));deleteInstance(["body"]);- expect(instancesStore.get()).toEqual(+ expect($instances.get()).toEqual(new Map([createInstancePair("body", "Body", [{ type: "id", value: "box1" }]),createInstancePair("box1", "Box", []),@@ -598,7 +588,7 @@ describe("delete instance", () => {// body// list// box- instancesStore.set(+ $instances.set(new Map([createInstancePair("body", "Body", [{ type: "id", value: "list" }]),createInstancePair("list", collectionComponent, [@@ -607,9 +597,9 @@ describe("delete instance", () => {createInstancePair("box", "Box", []),]));- registeredComponentMetasStore.set(createFakeComponentMetas({}));+ $registeredComponentMetas.set(createFakeComponentMetas({}));deleteInstance(["box", "list[0]", "list", "body"]);- expect(instancesStore.get()).toEqual(+ expect($instances.get()).toEqual(new Map([createInstancePair("body", "Body", [{ type: "id", value: "list" }]),createInstancePair("list", collectionComponent, []),@@ -625,7 +615,7 @@ describe("get instances slice", () => {// slot// slotChild// bodyChild2- instancesStore.set(+ $instances.set(toMap([createInstance("body", "Body", [{ type: "id", value: "bodyChild1" },@@ -650,21 +640,21 @@ describe("get instances slice", () => {// body// box1// box2- instancesStore.set(+ $instances.set(toMap([createInstance("body", "Body", [{ type: "id", value: "box1" }]),createInstance("box1", "Box", [{ type: "id", value: "box2" }]),createInstance("box2", "Box", []),]));- styleSourceSelectionsStore.set(+ $styleSourceSelections.set(new Map([["body", { instanceId: "box1", values: ["localBody", "token1"] }],["box1", { instanceId: "box1", values: ["localBox1", "token2"] }],["box2", { instanceId: "box2", values: ["localBox2", "token2"] }],]));- styleSourcesStore.set(+ $styleSources.set(new Map([["localBody", { id: "localBody", type: "local" }],["localBox1", { id: "localBox1", type: "local" }],@@ -673,7 +663,7 @@ describe("get instances slice", () => {["token2", { id: "token2", type: "token", name: "token2" }],]));- stylesStore.set(+ $styles.set(new Map([createStyleDeclPair("localBody1", "base", "color", "red"),createStyleDeclPair("localBox1", "base", "color", "green"),@@ -682,7 +672,7 @@ describe("get instances slice", () => {createStyleDeclPair("token2", "base", "color", "orange"),]));- breakpointsStore.set(+ $breakpoints.set(new Map([["base", { id: "base", label: "base" }],["big", { id: "big", label: "big", minWidth: 768 }],@@ -713,14 +703,14 @@ describe("get instances slice", () => {// body// box1// box2- instancesStore.set(+ $instances.set(toMap([createInstance("body", "Body", [{ type: "id", value: "box1" }]),createInstance("box1", "Box", [{ type: "id", value: "box2" }]),createInstance("box2", "Box", []),]));- propsStore.set(+ $props.set(toMap([createProp("body", "bodyProp", "data-body"),createProp("box1", "box1Prop", "data-box1"),@@ -739,14 +729,14 @@ describe("get instances slice", () => {// body// box1// box2- instancesStore.set(+ $instances.set(toMap([createInstance("body", "Body", [{ type: "id", value: "box1" }]),createInstance("box1", "Box", [{ type: "id", value: "box2" }]),createInstance("box2", "Box", []),]));- propsStore.set(+ $props.set(new Map([["bodyProp",@@ -770,19 +760,19 @@ describe("get instances slice", () => {],]));- styleSourceSelectionsStore.set(+ $styleSourceSelections.set(new Map([["body", { instanceId: "box1", values: ["localBody"] }],["box1", { instanceId: "box1", values: ["localBox1"] }],]));- styleSourcesStore.set(+ $styleSources.set(new Map([["localBody", { id: "localBody", type: "local" }],["localBox1", { id: "localBox1", type: "local" }],]));- stylesStore.set(+ $styles.set(new Map([createStyleDeclPair("localBody1", "base", "fontFamily", {type: "fontFamily",@@ -802,8 +792,8 @@ describe("get instances slice", () => {}),]));- breakpointsStore.set(new Map([["base", { id: "base", label: "base" }]]));- assetsStore.set(+ $breakpoints.set(new Map([["base", { id: "base", label: "base" }]]));+ $assets.set(toMap([createImageAsset("asset1"),createImageAsset("asset2"),@@ -826,14 +816,14 @@ describe("get instances slice", () => {// body// box1// box2- instancesStore.set(+ $instances.set(toMap([createInstance("body", "Body", [{ type: "id", value: "box1" }]),createInstance("box1", "Box", [{ type: "id", value: "box2" }]),createInstance("box2", "Box", []),]));- dataSourcesStore.set(+ $dataSources.set(toMap([{id: "box1$state",@@ -844,7 +834,7 @@ describe("get instances slice", () => {},]));- propsStore.set(+ $props.set(toMap([{id: "box1$stateProp",@@ -916,14 +906,14 @@ describe("get instances slice", () => {// body// box1// box2- instancesStore.set(+ $instances.set(toMap([createInstance("body", "Body", [{ type: "id", value: "box1" }]),createInstance("box1", "Box", [{ type: "id", value: "box2" }]),createInstance("box2", "Box", []),]));- dataSourcesStore.set(+ $dataSources.set(toMap([{id: "box1$state",@@ -941,7 +931,7 @@ describe("get instances slice", () => {},]));- propsStore.set(+ $props.set(toMap([{id: "box2$onChange1",diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex b9d3eb08bd..cd85cdfcd4 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -31,26 +31,18 @@ import {collectionComponent,} from "@webstudio-is/react-sdk";import {- propsStore,- stylesStore,- selectedInstanceSelectorStore,- styleSourceSelectionsStore,- styleSourcesStore,- instancesStore,- selectedStyleSourceSelectorStore,- breakpointsStore,- registeredComponentMetasStore,- dataSourcesStore,- assetsStore,+ $props,+ $styles,+ $selectedInstanceSelector,+ $styleSourceSelections,+ $styleSources,$instances,+ $selectedStyleSourceSelector,+ $registeredComponentMetas,+ $dataSources,$assets,$project,- $dataSources,- $props,$breakpoints,- $styleSources,- $styles,- $styleSourceSelections,$pages,} from "./nano-states";import {@@ -144,8 +136,8 @@ export const findClosestDetachableInstanceSelector = (};export const isInstanceDetachable = (instanceSelector: InstanceSelector) => {- const instances = instancesStore.get();- const metas = registeredComponentMetasStore.get();+ const instances = $instances.get();+ const metas = $registeredComponentMetas.get();const [instanceId] = instanceSelector;const instance = instances.get(instanceId);if (instance === undefined) {@@ -320,14 +312,14 @@ export const insertTemplateData = (const rootInstanceId = insertedInstances[0].id;serverSyncStore.createTransaction([- instancesStore,+ $instances,// insert data sources before props to avoid error// about missing data source when compute data source logic- dataSourcesStore,- propsStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,+ $dataSources,+ $props,+ $styleSourceSelections,+ $styleSources,+ $styles,],(instances,@@ -340,7 +332,7 @@ export const insertTemplateData = (insertInstancesMutable(instances,props,- registeredComponentMetasStore.get(),+ $registeredComponentMetas.get(),insertedInstances,children,dropTarget@@ -375,15 +367,12 @@ export const insertTemplateData = (});- selectedInstanceSelectorStore.set([- rootInstanceId,- ...dropTarget.parentSelector,- ]);- selectedStyleSourceSelectorStore.set(undefined);+ $selectedInstanceSelector.set([rootInstanceId, ...dropTarget.parentSelector]);+ $selectedStyleSourceSelector.set(undefined);};export const getComponentTemplateData = (component: string) => {- const metas = registeredComponentMetasStore.get();+ const metas = $registeredComponentMetas.get();const componentMeta = metas.get(component);// when template not specified fallback to template with the componentconst template = componentMeta?.template ?? [@@ -393,7 +382,7 @@ export const getComponentTemplateData = (component: string) => {children: [],},];- const breakpoints = breakpointsStore.get();+ const breakpoints = $breakpoints.get();const breakpointValues = Array.from(breakpoints.values());const baseBreakpoint = breakpointValues.find(isBaseBreakpoint);if (baseBreakpoint === undefined) {@@ -407,19 +396,19 @@ export const reparentInstance = (dropTarget: DroppableTarget) => {serverSyncStore.createTransaction(- [instancesStore, propsStore],+ [$instances, $props],(instances, props) => {reparentInstanceMutable(instances,props,- registeredComponentMetasStore.get(),+ $registeredComponentMetas.get(),targetInstanceSelector,dropTarget);});- selectedInstanceSelectorStore.set(targetInstanceSelector);- selectedStyleSourceSelectorStore.set(undefined);+ $selectedInstanceSelector.set(targetInstanceSelector);+ $selectedStyleSourceSelector.set(undefined);};export const deleteInstance = (instanceSelector: InstanceSelector) => {@@ -435,12 +424,12 @@ export const deleteInstance = (instanceSelector: InstanceSelector) => {}serverSyncStore.createTransaction([- instancesStore,- propsStore,- styleSourceSelectionsStore,- styleSourcesStore,- stylesStore,- dataSourcesStore,+ $instances,+ $props,+ $styleSourceSelections,+ $styleSources,+ $styles,+ $dataSources,],(instances,@@ -571,14 +560,14 @@ type InstancesSlice = {};export const getInstancesSlice = (rootInstanceId: string) => {- const assets = assetsStore.get();- const instances = instancesStore.get();- const dataSources = dataSourcesStore.get();- const props = propsStore.get();- const styleSourceSelections = styleSourceSelectionsStore.get();- const styleSources = styleSourcesStore.get();- const breakpoints = breakpointsStore.get();- const styles = stylesStore.get();+ const assets = $assets.get();+ const instances = $instances.get();+ const dataSources = $dataSources.get();+ const props = $props.get();+ const styleSourceSelections = $styleSourceSelections.get();+ const styleSources = $styleSources.get();+ const breakpoints = $breakpoints.get();+ const styles = $styles.get();// collect the instance by id and all its descendants including portal instancesconst slicedInstanceIds = findTreeInstanceIds(instances, rootInstanceId);diff --git a/apps/builder/app/shared/nano-states/breakpoints.ts b/apps/builder/app/shared/nano-states/breakpoints.tsindex a25180002e..bf9900a178 100644--- a/apps/builder/app/shared/nano-states/breakpoints.ts+++ b/apps/builder/app/shared/nano-states/breakpoints.ts@@ -2,16 +2,14 @@ import { atom, computed } from "nanostores";import type { Breakpoint, Breakpoints } from "@webstudio-is/sdk";import { isBaseBreakpoint } from "../breakpoints";-export const breakpointsStore = atom<Breakpoints>(new Map());-export const $breakpoints = breakpointsStore;+export const $breakpoints = atom<Breakpoints>(new Map());-export const selectedBreakpointIdStore = atom<undefined | Breakpoint["id"]>(+export const $selectedBreakpointId = atom<undefined | Breakpoint["id"]>(undefined);-export const $selectedBreakpointId = selectedBreakpointIdStore;-export const selectedBreakpointStore = computed(- [breakpointsStore, selectedBreakpointIdStore],+export const $selectedBreakpoint = computed(+ [$breakpoints, $selectedBreakpointId],(breakpoints, selectedBreakpointId) => {const selectedBreakpoint =selectedBreakpointId === undefined@@ -31,6 +29,6 @@ export const selectedBreakpointStore = computed(});-export const synchronizedBreakpointsStores = [- ["selectedBreakpointId", selectedBreakpointIdStore],+export const $synchronizedBreakpoints = [+ ["selectedBreakpointId", $selectedBreakpointId],] as const;diff --git a/apps/builder/app/shared/nano-states/canvas.ts b/apps/builder/app/shared/nano-states/canvas.tsindex 739b943b7c..5161e85b08 100644--- a/apps/builder/app/shared/nano-states/canvas.ts+++ b/apps/builder/app/shared/nano-states/canvas.ts@@ -1,6 +1,6 @@import { atom, computed } from "nanostores";import type { Instance, Instances } from "@webstudio-is/sdk";-import { instancesStore } from "./instances";+import { $instances } from "./instances";import type { InstanceSelector } from "../tree-utils";export type TextToolbarState = {@@ -13,7 +13,7 @@ export type TextToolbarState = {isSpan: boolean;};-export const textToolbarStore = atom<undefined | TextToolbarState>(undefined);+export const $textToolbar = atom<undefined | TextToolbarState>(undefined);type InstanceOutline = {instanceId: Instance["id"];@@ -38,21 +38,21 @@ const getInstanceOutlineAndInstance = (};};-export const selectedInstanceOutlineStore = atom<undefined | InstanceOutline>(+export const $selectedInstanceOutline = atom<undefined | InstanceOutline>(undefined);-export const selectedInstanceOutlineAndInstanceStore = computed(- [instancesStore, selectedInstanceOutlineStore],+export const $selectedInstanceOutlineAndInstance = computed(+ [$instances, $selectedInstanceOutline],getInstanceOutlineAndInstance);-export const hoveredInstanceOutlineStore = atom<undefined | InstanceOutline>(+export const $hoveredInstanceOutline = atom<undefined | InstanceOutline>(undefined);-export const hoveredInstanceOutlineAndInstanceStore = computed(- [instancesStore, hoveredInstanceOutlineStore],+export const $hoveredInstanceOutlineAndInstance = computed(+ [$instances, $hoveredInstanceOutline],getInstanceOutlineAndInstance);@@ -63,9 +63,9 @@ export const $collaborativeInstanceSelector = atom<export const $collaborativeInstanceRect = atom<undefined | DOMRect>(undefined);export const synchronizedCanvasStores = [- ["textToolbar", textToolbarStore],- ["selectedInstanceOutline", selectedInstanceOutlineStore],- ["hoveredInstanceOutline", hoveredInstanceOutlineStore],+ ["textToolbar", $textToolbar],+ ["selectedInstanceOutline", $selectedInstanceOutline],+ ["hoveredInstanceOutline", $hoveredInstanceOutline],["$collaborativeInstanceSelector", $collaborativeInstanceSelector],["$collaborativeInstanceRect", $collaborativeInstanceRect],] as const;diff --git a/apps/builder/app/shared/nano-states/components.ts b/apps/builder/app/shared/nano-states/components.tsindex 8a7278f165..40580c5c81 100644--- a/apps/builder/app/shared/nano-states/components.ts+++ b/apps/builder/app/shared/nano-states/components.ts@@ -12,19 +12,15 @@ import {} from "@webstudio-is/react-sdk";import type { Instance } from "@webstudio-is/sdk";import type { InstanceSelector } from "../tree-utils";-import {- dataSourceVariablesStore,- dataSourcesStore,- propsStore,-} from "./nano-states";-import { instancesStore, selectedInstanceSelectorStore } from "./instances";-import { selectedPageStore } from "./pages";+import { $dataSourceVariables, $dataSources, $props } from "./nano-states";+import { $instances, $selectedInstanceSelector } from "./instances";+import { $selectedPage } from "./pages";import { shallowEqual } from "shallow-equal";const createHookContext = (): HookContext => {- const metas = registeredComponentMetasStore.get();- const instances = instancesStore.get();- const page = selectedPageStore.get();+ const metas = $registeredComponentMetas.get();+ const instances = $instances.get();+ const page = $selectedPage.get();const indexesWithinAncestors = getIndexesWithinAncestors(metas,instances,@@ -35,7 +31,7 @@ const createHookContext = (): HookContext => {indexesWithinAncestors,getPropValue: (instanceId, propName) => {- const props = propsStore.get();+ const props = $props.get();for (const prop of props.values()) {if (prop.instanceId === instanceId && prop.name === propName) {if (@@ -51,9 +47,9 @@ const createHookContext = (): HookContext => {},setPropVariable: (instanceId, propName, value) => {- const dataSourceVariables = new Map(dataSourceVariablesStore.get());- const dataSources = new Map(dataSourcesStore.get());- const props = propsStore.get();+ const dataSourceVariables = new Map($dataSourceVariables.get());+ const dataSources = new Map($dataSources.get());+ const props = $props.get();for (const prop of props.values()) {if (prop.instanceId === instanceId &&@@ -71,7 +67,7 @@ const createHookContext = (): HookContext => {}}}- dataSourceVariablesStore.set(dataSourceVariables);+ $dataSourceVariables.set(dataSourceVariables);},};};@@ -80,13 +76,13 @@ const createHookContext = (): HookContext => {export const subscribeComponentHooks = () => {let lastSelectedInstanceSelector: undefined | InstanceSelector = undefined;const unsubscribeSelectedInstanceSelector =- selectedInstanceSelectorStore.subscribe((instanceSelector) => {+ $selectedInstanceSelector.subscribe((instanceSelector) => {// prevent executing hooks when selected instance is not changedif (shallowEqual(lastSelectedInstanceSelector, instanceSelector)) {return;}- const hooks = registeredComponentHooksStore.get();- const instances = instancesStore.get();+ const hooks = $registeredComponentHooks.get();+ const instances = $instances.get();if (lastSelectedInstanceSelector) {for (const hook of hooks) {hook.onNavigatorUnselect?.(createHookContext(), {@@ -118,16 +114,15 @@ export const subscribeComponentHooks = () => {};};-export const registeredComponentsStore = atom(new Map<string, AnyComponent>());+export const $registeredComponents = atom(new Map<string, AnyComponent>());-export const registeredComponentHooksStore = atom<Hook[]>([]);+export const $registeredComponentHooks = atom<Hook[]>([]);-export const registeredComponentMetasStore = atom(+export const $registeredComponentMetas = atom(new Map<string, WsComponentMeta>());-export const $registeredComponentMetas = registeredComponentMetasStore;-export const registeredComponentPropsMetasStore = atom(+export const $registeredComponentPropsMetas = atom(new Map<string, WsComponentPropsMeta>());@@ -148,14 +143,14 @@ export const registerComponentLibrary = ({}) => {const prefix = namespace === undefined ? "" : `${namespace}:`;- const prevComponents = registeredComponentsStore.get();+ const prevComponents = $registeredComponents.get();const nextComponents = new Map(prevComponents);for (const [componentName, component] of Object.entries(components)) {nextComponents.set(`${prefix}${componentName}`, component);}- registeredComponentsStore.set(nextComponents);+ $registeredComponents.set(nextComponents);- const prevMetas = registeredComponentMetasStore.get();+ const prevMetas = $registeredComponentMetas.get();const nextMetas = new Map(prevMetas);for (const [componentName, meta] of Object.entries(metas)) {nextMetas.set(@@ -165,15 +160,15 @@ export const registerComponentLibrary = ({: namespaceMeta(meta, namespace, new Set(Object.keys(metas))));}- registeredComponentMetasStore.set(nextMetas);+ $registeredComponentMetas.set(nextMetas);if (hooks) {- const prevHooks = registeredComponentHooksStore.get();+ const prevHooks = $registeredComponentHooks.get();const nextHooks = [...prevHooks, ...hooks];- registeredComponentHooksStore.set(nextHooks);+ $registeredComponentHooks.set(nextHooks);}- const prevPropsMetas = registeredComponentPropsMetasStore.get();+ const prevPropsMetas = $registeredComponentPropsMetas.get();const nextPropsMetas = new Map(prevPropsMetas);for (const [componentName, propsMeta] of Object.entries(propsMetas)) {const { initialProps = [], props } = propsMeta;@@ -189,10 +184,10 @@ export const registerComponentLibrary = ({props,});}- registeredComponentPropsMetasStore.set(nextPropsMetas);+ $registeredComponentPropsMetas.set(nextPropsMetas);};export const synchronizedComponentsMetaStores = [- ["registeredComponentMetas", registeredComponentMetasStore],- ["registeredComponentPropsMetas", registeredComponentPropsMetasStore],+ ["registeredComponentMetas", $registeredComponentMetas],+ ["registeredComponentPropsMetas", $registeredComponentPropsMetas],] as const;diff --git a/apps/builder/app/shared/nano-states/instances.ts b/apps/builder/app/shared/nano-states/instances.tsindex 1c4b8636f4..7fd15c83b3 100644--- a/apps/builder/app/shared/nano-states/instances.ts+++ b/apps/builder/app/shared/nano-states/instances.ts@@ -2,24 +2,22 @@ import { atom, computed } from "nanostores";import type { Instances } from "@webstudio-is/sdk";import type { InstanceSelector } from "../tree-utils";-export const isResizingCanvasStore = atom(false);+export const $isResizingCanvas = atom(false);-export const selectedInstanceSelectorStore = atom<undefined | InstanceSelector>(+export const $selectedInstanceSelector = atom<undefined | InstanceSelector>(undefined);-export const $selectedInstanceSelector = selectedInstanceSelectorStore;-export const editingItemIdStore = atom<undefined | string>(undefined);+export const $editingItemId = atom<undefined | string>(undefined);-export const textEditingInstanceSelectorStore = atom<+export const $textEditingInstanceSelector = atom<undefined | InstanceSelector>();-export const instancesStore = atom<Instances>(new Map());-export const $instances = instancesStore;+export const $instances = atom<Instances>(new Map());-export const selectedInstanceStore = computed(- [instancesStore, selectedInstanceSelectorStore],+export const $selectedInstance = computed(+ [$instances, $selectedInstanceSelector],(instances, selectedInstanceSelector) => {if (selectedInstanceSelector === undefined) {return;@@ -29,7 +27,7 @@ export const selectedInstanceStore = computed(});-export const synchronizedInstancesStores = [- ["textEditingInstanceSelector", textEditingInstanceSelectorStore],- ["isResizingCanvas", isResizingCanvasStore],+export const $synchronizedInstances = [+ ["textEditingInstanceSelector", $textEditingInstanceSelector],+ ["isResizingCanvas", $isResizingCanvas],] as const;diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex 5af4bf769f..f6949a5346 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -23,18 +23,17 @@ import type { DragStartPayload } from "~/canvas/shared/use-drag-drop";import { shallowComputed } from "../store-utils";import { type InstanceSelector } from "../tree-utils";import type { htmlTags as HtmlTags } from "html-tags";-import { instancesStore, selectedInstanceSelectorStore } from "./instances";-import { selectedPageStore } from "./pages";+import { $instances, $selectedInstanceSelector } from "./instances";+import { $selectedPage } from "./pages";import type { UnitSizes } from "~/builder/features/style-panel/shared/css-value-input/convert-units";import type { Project } from "@webstudio-is/project";-export const projectStore = atom<Project | undefined>();-export const $project = projectStore;+export const $project = atom<Project | undefined>();export const $domains = atom<string[]>([]);-export const rootInstanceStore = computed(- [instancesStore, selectedPageStore],+export const $rootInstance = computed(+ [$instances, $selectedPage],(instances, selectedPage) => {if (selectedPage === undefined) {return undefined;@@ -43,19 +42,16 @@ export const rootInstanceStore = computed(});-export const dataSourcesStore = atom<DataSources>(new Map());-export const $dataSources = dataSourcesStore;-export const dataSourceVariablesStore = atom<Map<DataSource["id"], unknown>>(+export const $dataSources = atom<DataSources>(new Map());+export const $dataSourceVariables = atom<Map<DataSource["id"], unknown>>(new Map());-export const $dataSourceVariables = dataSourceVariablesStore;export const $resources = atom(new Map<Resource["id"], Resource>());export const $resourceValues = atom(new Map<Resource["id"], unknown>());-export const propsStore = atom<Props>(new Map());-export const $props = propsStore;-export const propsIndexStore = computed(propsStore, (props) => {+export const $props = atom<Props>(new Map());+export const $propsIndex = computed($props, (props) => {const propsByInstanceId = new Map<Instance["id"], Prop[]>();for (const prop of props.values()) {const { instanceId } = prop;@@ -71,36 +67,31 @@ export const propsIndexStore = computed(propsStore, (props) => {};});-export const stylesStore = atom<Styles>(new Map());-export const $styles = stylesStore;+export const $styles = atom<Styles>(new Map());export const useInstanceStyles = (instanceId: undefined | Instance["id"]) => {- const instanceStylesStore = useMemo(() => {- return shallowComputed([stylesIndexStore], (stylesIndex) => {+ const instance$styles = useMemo(() => {+ return shallowComputed([$stylesIndex], (stylesIndex) => {if (instanceId === undefined) {return [];}return stylesIndex.stylesByInstanceId.get(instanceId) ?? [];});}, [instanceId]);- const instanceStyles = useStore(instanceStylesStore);+ const instanceStyles = useStore(instance$styles);return instanceStyles;};-export const styleSourcesStore = atom<StyleSources>(new Map());-export const $styleSources = styleSourcesStore;+export const $styleSources = atom<StyleSources>(new Map());-export const styleSourceSelectionsStore = atom<StyleSourceSelections>(- new Map()-);-export const $styleSourceSelections = styleSourceSelectionsStore;+export const $styleSourceSelections = atom<StyleSourceSelections>(new Map());export type StyleSourceSelector = {styleSourceId: StyleSource["id"];state?: string;};-export const selectedStyleSourceSelectorStore = atom<+export const $selectedStyleSourceSelector = atom<undefined | StyleSourceSelector>(undefined);@@ -113,8 +104,8 @@ export const selectedStyleSourceSelectorStore = atom<* though will require to move away from running immer patches on array* of styles*/-export const stylesIndexStore = computed(- [stylesStore, styleSourceSelectionsStore],+export const $stylesIndex = computed(+ [$styles, $styleSourceSelections],(styles, styleSourceSelections) => {const stylesByStyleSourceId = new Map<StyleSource["id"], StyleDecl[]>();for (const styleDecl of styles.values()) {@@ -146,13 +137,12 @@ export const stylesIndexStore = computed(});-export const assetsStore = atom<Assets>(new Map());-export const $assets = assetsStore;+export const $assets = atom<Assets>(new Map());-export const selectedInstanceBrowserStyleStore = atom<undefined | Style>();+export const $selectedInstanceBrowserStyle = atom<undefined | Style>();// Init with some defaults to avoid undefined-export const selectedInstanceUnitSizesStore = atom<UnitSizes>({+export const $selectedInstanceUnitSizes = atom<UnitSizes>({ch: 8,vw: 3.2,vh: 4.8,@@ -164,7 +154,7 @@ export const selectedInstanceUnitSizesStore = atom<UnitSizes>({/*** instanceId => tagName store for selected instance and its ancestors*/-export const selectedInstanceIntanceToTagStore = atom<+export const $selectedInstanceIntanceToTag = atom<undefined | Map<Instance["id"], HtmlTags>>();@@ -172,12 +162,12 @@ export const selectedInstanceIntanceToTagStore = atom<* pending means: previous selected instance unmounted,* and we don't know yet whether a new one will mount**/-export const selectedInstanceRenderStateStore = atom<+export const $selectedInstanceRenderState = atom<"mounted" | "notMounted" | "pending">("notMounted");-export const selectedInstanceStatesByStyleSourceIdStore = computed(- [stylesStore, styleSourceSelectionsStore, selectedInstanceSelectorStore],+export const $selectedInstanceStatesByStyleSourceId = computed(+ [$styles, $styleSourceSelections, $selectedInstanceSelector],(styles, styleSourceSelections, selectedInstanceSelector) => {const statesByStyleSourceId = new Map<StyleSource["id"], string[]>();if (selectedInstanceSelector === undefined) {@@ -206,12 +196,8 @@ export const selectedInstanceStatesByStyleSourceIdStore = computed(});-export const selectedInstanceStyleSourcesStore = computed(- [- styleSourceSelectionsStore,- styleSourcesStore,- selectedInstanceSelectorStore,- ],+export const $selectedInstanceStyleSources = computed(+ [$styleSourceSelections, $styleSources, $selectedInstanceSelector],(styleSourceSelections, styleSources, selectedInstanceSelector) => {const selectedInstanceStyleSources: StyleSource[] = [];if (selectedInstanceSelector === undefined) {@@ -243,8 +229,8 @@ export const selectedInstanceStyleSourcesStore = computed(});-export const selectedOrLastStyleSourceSelectorStore = computed(- [selectedInstanceStyleSourcesStore, selectedStyleSourceSelectorStore],+export const $selectedOrLastStyleSourceSelector = computed(+ [$selectedInstanceStyleSources, $selectedStyleSourceSelector],(styleSources, selectedStyleSourceSelector) => {if (selectedStyleSourceSelector !== undefined) {return selectedStyleSourceSelector;@@ -261,8 +247,8 @@ export const selectedOrLastStyleSourceSelectorStore = computed(* Provide selected style source with fallback* to the last style source of selected instance*/-export const selectedStyleSourceStore = computed(- [selectedInstanceStyleSourcesStore, selectedStyleSourceSelectorStore],+export const $selectedStyleSource = computed(+ [$selectedInstanceStyleSources, $selectedStyleSourceSelector],(styleSources, selectedStyleSourceSelector) => {return (styleSources.find(@@ -271,7 +257,6 @@ export const selectedStyleSourceStore = computed();});-export const $selectedStyleSource = selectedStyleSourceStore;/*** Store the list of active states inferred from dom element@@ -279,7 +264,7 @@ export const $selectedStyleSource = selectedStyleSourceStore;*/export const $selectedInstanceStates = atom(new Set<string>());-export const hoveredInstanceSelectorStore = atom<undefined | InstanceSelector>(+export const $hoveredInstanceSelector = atom<undefined | InstanceSelector>(undefined);diff --git a/apps/builder/app/shared/nano-states/pages.ts b/apps/builder/app/shared/nano-states/pages.tsindex 270c20533e..c3712457af 100644--- a/apps/builder/app/shared/nano-states/pages.ts+++ b/apps/builder/app/shared/nano-states/pages.ts@@ -1,15 +1,13 @@import { atom, computed } from "nanostores";import type { Page, Pages } from "@webstudio-is/sdk";-export const pagesStore = atom<undefined | Pages>(undefined);-export const $pages = pagesStore;+export const $pages = atom<undefined | Pages>(undefined);-export const selectedPageIdStore = atom<undefined | Page["id"]>(undefined);-export const $selectedPageId = selectedPageIdStore;-export const selectedPageHashStore = atom<string>("");+export const $selectedPageId = atom<undefined | Page["id"]>(undefined);+export const $selectedPageHash = atom<string>("");-export const selectedPageStore = computed(- [pagesStore, selectedPageIdStore],+export const $selectedPage = computed(+ [$pages, $selectedPageId],(pages, selectedPageId) => {if (pages === undefined) {return undefined;@@ -20,4 +18,3 @@ export const selectedPageStore = computed(return pages.pages.find((page) => page.id === selectedPageId);});-export const $selectedPage = selectedPageStore;diff --git a/apps/builder/app/shared/pages/use-switch-page.ts b/apps/builder/app/shared/pages/use-switch-page.tsindex 905a17a5f7..c3e1a92dbf 100644--- a/apps/builder/app/shared/pages/use-switch-page.ts+++ b/apps/builder/app/shared/pages/use-switch-page.ts@@ -6,18 +6,18 @@ import { findPageByIdOrPath } from "@webstudio-is/project-build";import { useMount } from "~/shared/hook-utils/use-mount";import {$authToken,- pagesStore,- projectStore,- selectedPageStore,- selectedPageIdStore,- selectedPageHashStore,- selectedInstanceSelectorStore,+ $pages,+ $project,+ $selectedPage,+ $selectedPageId,+ $selectedPageHash,+ $selectedInstanceSelector,$isPreviewMode,} from "~/shared/nano-states";import { builderPath } from "~/shared/router-utils";export const switchPage = (pageId?: Page["id"], pageHash?: string) => {- const pages = pagesStore.get();+ const pages = $pages.get();if (pages === undefined) {return;@@ -25,16 +25,16 @@ export const switchPage = (pageId?: Page["id"], pageHash?: string) => {const page = findPageByIdOrPath(pages, pageId ?? "");- selectedPageHashStore.set(pageHash ?? "");- selectedPageIdStore.set(page?.id ?? pages.homePage.id);- selectedInstanceSelectorStore.set([+ $selectedPageHash.set(pageHash ?? "");+ $selectedPageId.set(page?.id ?? pages.homePage.id);+ $selectedInstanceSelector.set([page?.rootInstanceId ?? pages.homePage.rootInstanceId,]);};const setPageStateFromUrl = () => {const searchParams = new URLSearchParams(window.location.search);- const pages = pagesStore.get();+ const pages = $pages.get();const pageId = searchParams.get("pageId") ?? pages?.homePage.id;const pageHash = searchParams.get("pageHash") ?? "";@@ -55,8 +55,8 @@ const setPageStateFromUrl = () => {*/export const useSyncPageUrl = () => {const navigate = useNavigate();- const page = useStore(selectedPageStore);- const pageHash = useStore(selectedPageHashStore);+ const page = useStore($selectedPage);+ const pageHash = useStore($selectedPageHash);const isPreviewMode = useStore($isPreviewMode);// Get pageId and pageHash from URL@@ -72,8 +72,8 @@ export const useSyncPageUrl = () => {}, []);useEffect(() => {- const project = projectStore.get();- const pages = pagesStore.get();+ const project = $project.get();+ const pages = $pages.get();if (page === undefined || project === undefined || pages === undefined) {return;@@ -110,7 +110,7 @@ export const useSyncPageUrl = () => {* Synchronize pageHash with scrolling position*/export const useHashLinkSync = () => {- const pageHash = useStore(selectedPageHashStore);+ const pageHash = useStore($selectedPageHash);useEffect(() => {if (pageHash === "") {diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.tsindex 38d7645fff..e16413250e 100644--- a/apps/builder/app/shared/sync/sync-stores.ts+++ b/apps/builder/app/shared/sync/sync-stores.ts@@ -5,31 +5,31 @@ import type { WritableAtom } from "nanostores";import { useEffect } from "react";import { type Publish, subscribe } from "~/shared/pubsub";import {- projectStore,- pagesStore,- instancesStore,- propsStore,- dataSourcesStore,- breakpointsStore,- stylesStore,- styleSourcesStore,- styleSourceSelectionsStore,- assetsStore,- selectedPageIdStore,- selectedPageHashStore,- selectedInstanceSelectorStore,- selectedInstanceBrowserStyleStore,- selectedInstanceUnitSizesStore,- selectedInstanceIntanceToTagStore,- selectedInstanceRenderStateStore,- hoveredInstanceSelectorStore,+ $project,+ $pages,+ $instances,+ $props,+ $dataSources,+ $breakpoints,+ $styles,+ $styleSources,+ $styleSourceSelections,+ $assets,+ $selectedPageId,+ $selectedPageHash,+ $selectedInstanceSelector,+ $selectedInstanceBrowserStyle,+ $selectedInstanceUnitSizes,+ $selectedInstanceIntanceToTag,+ $selectedInstanceRenderState,+ $hoveredInstanceSelector,$isPreviewMode,synchronizedCanvasStores,- synchronizedInstancesStores,- synchronizedBreakpointsStores,- selectedStyleSourceSelectorStore,+ $synchronizedInstances,+ $synchronizedBreakpoints,+ $selectedStyleSourceSelector,synchronizedComponentsMetaStores,- dataSourceVariablesStore,+ $dataSourceVariables,$dragAndDropState,$selectedInstanceStates,$resources,@@ -73,53 +73,47 @@ const initializedStores = new Set<string>();export const registerContainers = () => {// synchronize patches- serverSyncStore.register("pages", pagesStore);- serverSyncStore.register("breakpoints", breakpointsStore);- serverSyncStore.register("instances", instancesStore);- serverSyncStore.register("styles", stylesStore);- serverSyncStore.register("styleSources", styleSourcesStore);- serverSyncStore.register("styleSourceSelections", styleSourceSelectionsStore);- serverSyncStore.register("props", propsStore);- serverSyncStore.register("dataSources", dataSourcesStore);+ serverSyncStore.register("pages", $pages);+ serverSyncStore.register("breakpoints", $breakpoints);+ serverSyncStore.register("instances", $instances);+ serverSyncStore.register("styles", $styles);+ serverSyncStore.register("styleSources", $styleSources);+ serverSyncStore.register("styleSourceSelections", $styleSourceSelections);+ serverSyncStore.register("props", $props);+ serverSyncStore.register("dataSources", $dataSources);serverSyncStore.register("resources", $resources);- serverSyncStore.register("assets", assetsStore);+ serverSyncStore.register("assets", $assets);// synchronize whole states- clientStores.set("project", projectStore);- clientStores.set("dataSourceVariables", dataSourceVariablesStore);+ clientStores.set("project", $project);+ clientStores.set("dataSourceVariables", $dataSourceVariables);clientStores.set("resourceValues", $resourceValues);- clientStores.set("selectedPageId", selectedPageIdStore);- clientStores.set("selectedPageHash", selectedPageHashStore);- clientStores.set("selectedInstanceSelector", selectedInstanceSelectorStore);+ clientStores.set("selectedPageId", $selectedPageId);+ clientStores.set("selectedPageHash", $selectedPageHash);+ clientStores.set("selectedInstanceSelector", $selectedInstanceSelector);clientStores.set("selectedInstanceBrowserStyle",- selectedInstanceBrowserStyleStore+ $selectedInstanceBrowserStyle);clientStores.set(- "selectedInstanceIntanceToTagStore",- selectedInstanceIntanceToTagStore+ "$selectedInstanceIntanceToTag",+ $selectedInstanceIntanceToTag);+ clientStores.set("$selectedInstanceUnitSizes", $selectedInstanceUnitSizes);clientStores.set(- "selectedInstanceUnitSizesStore",- selectedInstanceUnitSizesStore+ "$selectedInstanceRenderState",+ $selectedInstanceRenderState);- clientStores.set(- "selectedInstanceRenderStateStore",- selectedInstanceRenderStateStore- );- clientStores.set("hoveredInstanceSelector", hoveredInstanceSelectorStore);+ clientStores.set("hoveredInstanceSelector", $hoveredInstanceSelector);clientStores.set("isPreviewMode", $isPreviewMode);- clientStores.set(- "selectedStyleSourceSelector",- selectedStyleSourceSelectorStore- );+ clientStores.set("selectedStyleSourceSelector", $selectedStyleSourceSelector);clientStores.set("dragAndDropState", $dragAndDropState);clientStores.set("ephemeralStyles", $ephemeralStyles);clientStores.set("selectedInstanceStates", $selectedInstanceStates);- for (const [name, store] of synchronizedBreakpointsStores) {+ for (const [name, store] of $synchronizedBreakpoints) {clientStores.set(name, store);}- for (const [name, store] of synchronizedInstancesStores) {+ for (const [name, store] of $synchronizedInstances) {clientStores.set(name, store);}for (const [name, store] of synchronizedCanvasStores) {@@ -224,12 +218,12 @@ const syncStoresState = (name: SyncEventSource, publish: Publish) => {clientContainer.set(value);}// apply state stores data- const stateStore = clientStores.get(namespace);- if (stateStore) {+ const $state = clientStores.get(namespace);+ if ($state) {// should be called before store set// to be accessible in listen callbacklatestData.set(namespace, value);- stateStore.set(value);+ $state.set(value);}}}