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
Rename instance address to instance selector (#1234)
Bogdan Chadkinfddb67e92448
diff --git a/apps/builder/app/builder/features/footer/breadcrumbs.tsx b/apps/builder/app/builder/features/footer/breadcrumbs.tsxindex 6378fa5f33..33c389c8c7 100644--- a/apps/builder/app/builder/features/footer/breadcrumbs.tsx+++ b/apps/builder/app/builder/features/footer/breadcrumbs.tsx@@ -8,9 +8,9 @@ import {} from "@webstudio-is/design-system";import {instancesStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,} from "~/shared/nano-states";-import { getAncestorInstanceAddress } from "~/shared/tree-utils";+import { getAncestorInstanceSelector } from "~/shared/tree-utils";type BreadcrumbProps = {children: JSX.Element | string;@@ -39,16 +39,16 @@ const Breadcrumb = ({ children, onClick }: BreadcrumbProps) => {export const Breadcrumbs = () => {const instances = useStore(instancesStore);- const selectedInstanceAddress = useStore(selectedInstanceAddressStore);+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);return (<Flex align="center" css={{ height: "100%" }}>- {selectedInstanceAddress === undefined ? (+ {selectedInstanceSelector === undefined ? (<Breadcrumb><DeprecatedText2>No instance selected</DeprecatedText2></Breadcrumb>) : (- selectedInstanceAddress+ selectedInstanceSelector// start breadcrumbs from the root.slice().reverse()@@ -61,9 +61,9 @@ export const Breadcrumbs = () => {<Breadcrumbkey={instance.id}onClick={() => {- selectedInstanceAddressStore.set(- getAncestorInstanceAddress(- selectedInstanceAddress,+ selectedInstanceSelectorStore.set(+ getAncestorInstanceSelector(+ selectedInstanceSelector,instance.id));diff --git a/apps/builder/app/builder/features/sidebar-left/navigator/navigator.tsx b/apps/builder/app/builder/features/sidebar-left/navigator/navigator.tsxindex acd1cd681a..9fae7421d3 100644--- a/apps/builder/app/builder/features/sidebar-left/navigator/navigator.tsx+++ b/apps/builder/app/builder/features/sidebar-left/navigator/navigator.tsx@@ -3,7 +3,7 @@ import { useStore } from "@nanostores/react";import { Flex } from "@webstudio-is/design-system";import type { Instance } from "@webstudio-is/project-build";import {- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,hoveredInstanceIdStore,useRootInstance,instancesStore,@@ -11,7 +11,7 @@ import {import { InstanceTree } from "~/builder/shared/tree";import { reparentInstance } from "~/shared/instance-utils";import { Header, CloseButton } from "../header";-import { getInstanceAddress } from "~/shared/tree-utils";+import { getInstanceSelector } from "~/shared/tree-utils";type NavigatorProps = {isClosable?: boolean;@@ -19,14 +19,14 @@ type NavigatorProps = {};export const Navigator = ({ isClosable, onClose }: NavigatorProps) => {- const selectedInstanceAddress = useStore(selectedInstanceAddressStore);- const selectedInstanceId = selectedInstanceAddress?.[0];+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);+ const selectedInstanceId = selectedInstanceSelector?.[0];const [rootInstance] = useRootInstance();const handleSelect = useCallback((instanceId: Instance["id"]) => {const instances = instancesStore.get();- const instanceAddress = getInstanceAddress(instances, instanceId);- selectedInstanceAddressStore.set(instanceAddress);+ const instanceSelector = getInstanceSelector(instances, instanceId);+ selectedInstanceSelectorStore.set(instanceSelector);}, []);const handleDragEnd = useCallback(@@ -58,7 +58,7 @@ export const Navigator = ({ isClosable, onClose }: NavigatorProps) => {<Flex css={{ flexGrow: 1, flexDirection: "column" }}><InstanceTreeroot={rootInstance}- // @todo accept and provide in callback instance address instead of just id+ // @todo accept and provide in callback instance selector instead of just idselectedItemId={selectedInstanceId}onSelect={handleSelect}onHover={handleHover}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 a6b8c81b24..266b03212b 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@@ -13,7 +13,7 @@ import { utils } from "@webstudio-is/project";import { findClosestDroppableTarget } from "~/shared/tree-utils";import {instancesIndexStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,} from "~/shared/nano-states";import { useSubscribe, type Publish } from "~/shared/pubsub";import { useCanvasRect } from "~/builder/shared/nano-states";@@ -175,8 +175,8 @@ export const TabContent = ({ publish, onSetActiveTab }: TabContentProps) => {onSetActiveTab("none");const dropTarget = findClosestDroppableTarget(instancesIndexStore.get(),- // @todo accept instance address- selectedInstanceAddressStore.get()?.[0]+ // @todo accept instance Selector+ selectedInstanceSelectorStore.get()?.[0]);insertNewComponentInstance(component, dropTarget);}}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 3a3959977d..2957b048b4 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@@ -12,7 +12,7 @@ import type {import {instancesIndexStore,selectedInstanceBrowserStyleStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,selectedStyleSourceStore,stylesIndexStore,useBreakpoints,@@ -232,7 +232,7 @@ export const useStyleInfo = () => {const [breakpoints] = useBreakpoints();const selectedBreakpoint = useStore(selectedBreakpointStore);const selectedBreakpointId = selectedBreakpoint?.id;- const selectedInstanceAddress = useStore(selectedInstanceAddressStore);+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);const selectedStyleSource = useStore(selectedStyleSourceStore);const selectedStyleSourceId = selectedStyleSource?.id;const browserStyle = useStore(selectedInstanceBrowserStyleStore);@@ -262,15 +262,15 @@ export const useStyleInfo = () => {const inheritedInfo = useMemo(() => {if (selectedBreakpointId === undefined ||- selectedInstanceAddress === undefined+ selectedInstanceSelector === undefined) {return {};}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;return getInheritedInfo(instancesIndex,stylesByInstanceId,- // @todo accept instance address+ // @todo accept instance selectorselectedInstanceId,cascadedBreakpointIds,selectedBreakpointId@@ -280,26 +280,26 @@ export const useStyleInfo = () => {stylesByInstanceId,cascadedBreakpointIds,selectedBreakpointId,- selectedInstanceAddress,+ selectedInstanceSelector,]);const cascadedInfo = useMemo(() => {- if (selectedInstanceAddress === undefined) {+ if (selectedInstanceSelector === undefined) {return {};}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;return getCascadedInfo(stylesByInstanceId,- // @todo accept instance address+ // @todo accept instance SelectorselectedInstanceId,cascadedBreakpointIds);- }, [stylesByInstanceId, selectedInstanceAddress, cascadedBreakpointIds]);+ }, [stylesByInstanceId, selectedInstanceSelector, cascadedBreakpointIds]);const presetStyle = useMemo(() => {- // @todo accept instance address- return getPresetStyle(instancesIndex, selectedInstanceAddress?.[0]);- }, [instancesIndex, selectedInstanceAddress]);+ // @todo accept instance Selector+ return getPresetStyle(instancesIndex, selectedInstanceSelector?.[0]);+ }, [instancesIndex, selectedInstanceSelector]);const styleInfoData = useMemo(() => {const styleInfoData: StyleInfo = {};diff --git a/apps/builder/app/builder/features/style-panel/style-settings.tsx b/apps/builder/app/builder/features/style-panel/style-settings.tsxindex 809743eac2..05ffb0f231 100644--- a/apps/builder/app/builder/features/style-panel/style-settings.tsx+++ b/apps/builder/app/builder/features/style-panel/style-settings.tsx@@ -15,7 +15,7 @@ import type { SetProperty, CreateBatchUpdate } from "./shared/use-style-data";import type { StyleInfo } from "./shared/style-info";import type { RenderPropertyProps } from "./style-sections";import { useStore } from "@nanostores/react";-import { selectedInstanceAddressStore } from "~/shared/nano-states";+import { selectedInstanceSelectorStore } from "~/shared/nano-states";import { useInstanceStyleData } from "./shared/style-info";// Finds a property/value by using any available form: property, label, value@@ -96,8 +96,8 @@ export type StyleSettingsProps = {};const useParentStyle = () => {- const selectedInstanceAddress = useStore(selectedInstanceAddressStore);- const parentInstanceId = selectedInstanceAddress?.[1];+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);+ const parentInstanceId = selectedInstanceSelector?.[1];const parentInstanceStyleData = useInstanceStyleData(parentInstanceId);return parentInstanceStyleData;};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 9af3c224eb..c50e262655 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@@ -16,7 +16,7 @@ import {import { useStore } from "@nanostores/react";import {availableStyleSourcesStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,selectedInstanceStyleSourcesStore,selectedStyleSourceIdStore,selectedStyleSourceStore,@@ -43,11 +43,11 @@ const getOrCreateStyleSourceSelectionMutable = (};const createStyleSource = (name: string) => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;const newStyleSource: StyleSource = {type: "token",id: nanoid(),@@ -68,11 +68,11 @@ const createStyleSource = (name: string) => {};const addStyleSourceToInstace = (newStyleSourceId: StyleSource["id"]) => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;store.createTransaction([styleSourceSelectionsStore],(styleSourceSelections) => {@@ -89,11 +89,11 @@ const addStyleSourceToInstace = (newStyleSourceId: StyleSource["id"]) => {};const removeStyleSourceFromInstance = (styleSourceId: StyleSource["id"]) => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;store.createTransaction([styleSourceSelectionsStore],(styleSourceSelections) => {@@ -111,11 +111,11 @@ const removeStyleSourceFromInstance = (styleSourceId: StyleSource["id"]) => {};const duplicateStyleSource = (styleSourceId: StyleSource["id"]) => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;const styleSources = styleSourcesStore.get();// style source may not exist in store which means// temporary generated local stye source was not applied yet@@ -157,11 +157,11 @@ const duplicateStyleSource = (styleSourceId: StyleSource["id"]) => {};const convertLocalStyleSourceToToken = (styleSourceId: StyleSource["id"]) => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;const newStyleSource: StyleSource = {type: "token",id: styleSourceId,@@ -185,11 +185,11 @@ const convertLocalStyleSourceToToken = (styleSourceId: StyleSource["id"]) => {};const reorderStyleSources = (styleSourceIds: StyleSource["id"][]) => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;store.createTransaction([styleSourcesStore, styleSourceSelectionsStore],(styleSources, styleSourceSelections) => {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 224a9e31d1..5d4dbb64f0 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@@ -3,23 +3,23 @@ import {hoveredInstanceIdStore,hoveredInstanceOutlineStore,instancesStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,useTextEditingInstanceId,} from "~/shared/nano-states";import { Outline } from "./outline";import { Label } from "./label";export const HoveredInstanceOutline = () => {- const selectedInstanceAddress = useStore(selectedInstanceAddressStore);+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);const hoveredInstanceId = useStore(hoveredInstanceIdStore);const instanceOutline = useStore(hoveredInstanceOutlineStore);const [textEditingInstanceId] = useTextEditingInstanceId();const instances = useStore(instancesStore);const isEditingText = textEditingInstanceId !== undefined;- // @todo compare instance addresses+ // @todo compare instance selectorsconst isHoveringSelectedInstance =- selectedInstanceAddress?.[0] === hoveredInstanceId;+ selectedInstanceSelector?.[0] === hoveredInstanceId;const instance = hoveredInstanceId? instances.get(hoveredInstanceId): undefined;diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsxindex 9e9f117307..e6ca03a66a 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/text-toolbar/text-toolbar.tsx@@ -18,7 +18,7 @@ import {} from "@webstudio-is/icons";import { useSubscribe } from "~/shared/pubsub";import { theme } from "@webstudio-is/design-system";-import { selectedInstanceAddressStore } from "~/shared/nano-states";+import { selectedInstanceSelectorStore } from "~/shared/nano-states";type Format =| "bold"@@ -191,9 +191,9 @@ type TextToolbarProps = {export const TextToolbar = ({ publish }: TextToolbarProps) => {const [textToolbar] = useTextToolbarState();- const selectedInstanceAddress = useStore(selectedInstanceAddressStore);+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);- if (textToolbar == null || selectedInstanceAddress === undefined) {+ if (textToolbar == null || selectedInstanceSelector === undefined) {return null;}diff --git a/apps/builder/app/builder/features/workspace/workspace.tsx b/apps/builder/app/builder/features/workspace/workspace.tsxindex a02e7e036e..f33331eb13 100644--- a/apps/builder/app/builder/features/workspace/workspace.tsx+++ b/apps/builder/app/builder/features/workspace/workspace.tsx@@ -2,7 +2,7 @@ import { useStore } from "@nanostores/react";import { theme, Box, Flex, Toaster } from "@webstudio-is/design-system";import { useCanvasWidth } from "~/builder/shared/nano-states";import type { Publish } from "~/shared/pubsub";-import { selectedInstanceAddressStore } from "~/shared/nano-states";+import { selectedInstanceSelectorStore } from "~/shared/nano-states";import {workspaceRectStore,zoomStore,@@ -60,7 +60,7 @@ export const Workspace = ({const workspaceRef = useSetWorkspaceRect();const handleWorkspaceClick = () => {- selectedInstanceAddressStore.set(undefined);+ selectedInstanceSelectorStore.set(undefined);};return (diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex 93eea98f8a..71e723a91d 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -16,14 +16,14 @@ import {import type { GetComponent } from "@webstudio-is/react-sdk";import {instancesStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,useInstanceProps,useInstanceStyles,useTextEditingInstanceId,} from "~/shared/nano-states";import { useCssRules } from "~/canvas/shared/styles";import { SelectedInstanceConnector } from "./selected-instance-connector";-import { getInstanceAddress } from "~/shared/tree-utils";+import { getInstanceSelector } from "~/shared/tree-utils";const TextEditor = lazy(() => import("../text-editor"));@@ -69,7 +69,7 @@ export const WebstudioComponentDev = ({const [editingInstanceId, setTextEditingInstanceId] =useTextEditingInstanceId();- const selectedInstanceAddress = useStore(selectedInstanceAddressStore);+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);const instanceProps = useInstanceProps(instance.id);const userProps = useMemo(() => {@@ -85,8 +85,8 @@ export const WebstudioComponentDev = ({return result;}, [instanceProps]);- // @todo compare instance addresses- const isSelected = selectedInstanceAddress?.[0] === instanceId;+ // @todo compare instance selectors+ const isSelected = selectedInstanceSelector?.[0] === instanceId;// Scroll the selected instance into view when selected from navigator.useEffect(() => {@@ -174,11 +174,11 @@ export const WebstudioComponentDev = ({}});}}- // @todo provide instance address+ // @todo provide instance selectoronSelectInstance={(instanceId) => {setTextEditingInstanceId(undefined);- selectedInstanceAddressStore.set(- getInstanceAddress(instancesStore.get(), instanceId)+ selectedInstanceSelectorStore.set(+ getInstanceSelector(instancesStore.get(), instanceId));}}/>diff --git a/apps/builder/app/canvas/instance-selection.ts b/apps/builder/app/canvas/instance-selection.tsindex 8a783d5d9e..f9215445c0 100644--- a/apps/builder/app/canvas/instance-selection.ts+++ b/apps/builder/app/canvas/instance-selection.ts@@ -1,13 +1,13 @@import { getComponentMeta, idAttribute } from "@webstudio-is/react-sdk";import {instancesStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,textEditingInstanceIdStore,} from "~/shared/nano-states";import { publish } from "~/shared/pubsub";import {- type InstanceAddress,- getAncestorInstanceAddress,+ type InstanceSelector,+ getAncestorInstanceSelector,} from "~/shared/tree-utils";declare module "~/shared/pubsub" {@@ -17,34 +17,34 @@ declare module "~/shared/pubsub" {}// traverse dom to the root and find all instances-const getInstanceAddressFromElement = (element: Element) => {- const instanceAddress: InstanceAddress = [];+const getInstanceSelectorFromElement = (element: Element) => {+ const instanceSelector: InstanceSelector = [];let matched: undefined | Element =element.closest(`[${idAttribute}]`) ?? undefined;while (matched) {const instanceId = matched.getAttribute(idAttribute) ?? undefined;if (instanceId !== undefined) {- instanceAddress.push(instanceId);+ instanceSelector.push(instanceId);}matched = matched.parentElement?.closest(`[${idAttribute}]`) ?? undefined;}- if (instanceAddress.length === 0) {+ if (instanceSelector.length === 0) {return;}- return instanceAddress;+ return instanceSelector;};-const findClosestRichTextInstanceAddress = (- instanceAddress: InstanceAddress+const findClosestRichTextInstanceSelector = (+ instanceSelector: InstanceSelector) => {const instances = instancesStore.get();- for (const instanceId of instanceAddress) {+ for (const instanceId of instanceSelector) {const instance = instances.get(instanceId);if (instance !== undefined &&getComponentMeta(instance.component)?.type === "rich-text") {- return getAncestorInstanceAddress(instanceAddress, instanceId);+ return getAncestorInstanceSelector(instanceSelector, instanceId);}}return;@@ -77,27 +77,27 @@ export const subscribeInstanceSelection = () => {return;}- const instanceAddress = getInstanceAddressFromElement(element);- if (instanceAddress === undefined) {+ const instanceSelector = getInstanceSelectorFromElement(element);+ if (instanceSelector === undefined) {return;}// the first click in double click or the only one in regular clickif (event.detail === 1) {- selectedInstanceAddressStore.set(instanceAddress);+ selectedInstanceSelectorStore.set(instanceSelector);// reset text editor when another instance is selectedtextEditingInstanceIdStore.set(undefined);}// the second click in a double click.if (event.detail === 2) {- const richTextInstanceAddress =- findClosestRichTextInstanceAddress(instanceAddress);+ const richTextInstanceSelector =+ findClosestRichTextInstanceSelector(instanceSelector);// enable text editor when double click on its instance or one of its descendants- if (richTextInstanceAddress) {- selectedInstanceAddressStore.set(richTextInstanceAddress);- textEditingInstanceIdStore.set(richTextInstanceAddress[0]);+ if (richTextInstanceSelector) {+ selectedInstanceSelectorStore.set(richTextInstanceSelector);+ textEditingInstanceIdStore.set(richTextInstanceSelector[0]);}}};diff --git a/apps/builder/app/canvas/shared/styles.ts b/apps/builder/app/canvas/shared/styles.tsindex ebd2414f1c..625d87588f 100644--- a/apps/builder/app/canvas/shared/styles.ts+++ b/apps/builder/app/canvas/shared/styles.ts@@ -5,7 +5,7 @@ import { addGlobalRules } from "@webstudio-is/project";import {assetsStore,isPreviewModeStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,useBreakpoints,} from "~/shared/nano-states";import type { StyleDecl } from "@webstudio-is/project-build";@@ -263,8 +263,8 @@ const setCssVar = (id: string, property: string, value?: StyleValue) => {const useUpdateStyle = () => {useSubscribe("updateStyle", ({ id, updates }) => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- const selectedInstanceId = selectedInstanceAddress?.[0];+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ const selectedInstanceId = selectedInstanceSelector?.[0];// Only update styles if they match the selected instance// It can potentially happen that we selected a difference instance right after we changed the style in style panel.if (id !== selectedInstanceId) {diff --git a/apps/builder/app/canvas/shared/use-shortcuts.ts b/apps/builder/app/canvas/shared/use-shortcuts.tsindex 2a20706b65..1f4f10f38b 100644--- a/apps/builder/app/canvas/shared/use-shortcuts.ts+++ b/apps/builder/app/canvas/shared/use-shortcuts.ts@@ -3,7 +3,7 @@ import { getComponentMeta } from "@webstudio-is/react-sdk";import { shortcuts, options } from "~/shared/shortcuts";import { publish, useSubscribe } from "~/shared/pubsub";import {- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,selectedInstanceStore,useTextEditingInstanceId,isPreviewModeStore,@@ -40,8 +40,8 @@ export const useShortcuts = () => {useHotkeys("esc",() => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}// Since we are in text editing mode, we want to first exit that mode without unselecting the instance.@@ -49,7 +49,7 @@ export const useShortcuts = () => {setEditingInstanceId(undefined);return;}- selectedInstanceAddressStore.set(undefined);+ selectedInstanceSelectorStore.set(undefined);},{ ...options, enableOnContentEditable: true },[editingInstanceId]diff --git a/apps/builder/app/canvas/shared/use-track-selected-element.ts b/apps/builder/app/canvas/shared/use-track-selected-element.tsindex 1d3b9f2998..a9a651ff6d 100644--- a/apps/builder/app/canvas/shared/use-track-selected-element.ts+++ b/apps/builder/app/canvas/shared/use-track-selected-element.ts@@ -1,20 +1,20 @@import { useEffect } from "react";import { useStore } from "@nanostores/react";import {- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,textEditingInstanceIdStore,} from "~/shared/nano-states";export const useTrackSelectedElement = () => {- const selectedInstanceAddress = useStore(selectedInstanceAddressStore);- const selectedInstanceId = selectedInstanceAddress?.[0];+ const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);+ const selectedInstanceId = selectedInstanceSelector?.[0];// @todo disable based on user input instead of tracking selecteduseEffect(() => {const editingInstanceId = textEditingInstanceIdStore.get();if (editingInstanceId !== undefined &&- // @todo compare instance addresses+ // @todo compare instance selectorsselectedInstanceId !== editingInstanceId) {textEditingInstanceIdStore.set(undefined);diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.tsindex 23e4d48f02..04f9b22732 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts@@ -11,7 +11,7 @@ import {import {propsStore,stylesStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,styleSourceSelectionsStore,styleSourcesStore,instancesIndexStore,@@ -131,13 +131,13 @@ export const onPaste = (clipboardData: string) => {return;}// paste to the root if nothing is selected- const instanceAddress = selectedInstanceAddressStore.get() ?? [+ const instanceSelector = selectedInstanceSelectorStore.get() ?? [selectedPage.rootInstanceId,];- const [targetInstanceId] = instanceAddress;+ const [targetInstanceId] = instanceSelector;const dropTarget = findClosestDroppableTarget(instancesIndexStore.get(),- // @todo accept instance address+ // @todo accept instance selectortargetInstanceId);store.createTransaction(@@ -169,20 +169,20 @@ export const onPaste = (clipboardData: string) => {// first item is guaranteed root of copied treeconst copiedRootInstanceId = Array.from(copiedInstanceIds.values())[0];- selectedInstanceAddressStore.set([+ selectedInstanceSelectorStore.set([copiedRootInstanceId,- ...instanceAddress,+ ...instanceSelector,]);});};export const onCopy = () => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;const data = getTreeData(selectedInstanceId);if (data === undefined) {return;@@ -191,11 +191,11 @@ export const onCopy = () => {};export const onCut = () => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();- if (selectedInstanceAddress === undefined) {+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;const rootInstanceId = selectedPageStore.get()?.rootInstanceId;// @todo tell user they can't delete rootif (selectedInstanceId === rootInstanceId) {@@ -205,7 +205,7 @@ export const onCut = () => {if (data === undefined) {return;}- deleteInstance(selectedInstanceAddress);+ deleteInstance(selectedInstanceSelector);if (data === undefined) {return;}diff --git a/apps/builder/app/shared/copy-paste/plugin-markdown.ts b/apps/builder/app/shared/copy-paste/plugin-markdown.tsindex c99643fb2e..d94cbc5722 100644--- a/apps/builder/app/shared/copy-paste/plugin-markdown.ts+++ b/apps/builder/app/shared/copy-paste/plugin-markdown.ts@@ -16,7 +16,7 @@ import {instancesIndexStore,instancesStore,propsStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,selectedPageStore,} from "../nano-states";@@ -213,13 +213,13 @@ export const onPaste = (clipboardData: string) => {return;}// paste to the root if nothing is selected- const instanceAddress = selectedInstanceAddressStore.get() ?? [+ const instanceSelector = selectedInstanceSelectorStore.get() ?? [selectedPage.rootInstanceId,];- const [targetInstanceId] = instanceAddress;+ const [targetInstanceId] = instanceSelector;const dropTarget = findClosestDroppableTarget(instancesIndexStore.get(),- // @todo accept instance address+ // @todo accept instance selectortargetInstanceId);store.createTransaction([instancesStore, propsStore], (instances, props) => {diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex bd21012c64..58b2b915c9 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -3,7 +3,7 @@ import { findTreeInstanceIds, Instance } from "@webstudio-is/project-build";import {propsStore,stylesStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,styleSourceSelectionsStore,styleSourcesStore,instancesStore,@@ -11,13 +11,13 @@ import {} from "./nano-states";import {type DroppableTarget,- type InstanceAddress,+ type InstanceSelector,createComponentInstance,findSubtreeLocalStyleSources,- getInstanceAddress,+ getInstanceSelector,insertInstancesMutable,reparentInstanceMutable,- getAncestorInstanceAddress,+ getAncestorInstanceSelector,} from "./tree-utils";import { removeByMutable } from "./array-utils";@@ -29,8 +29,8 @@ export const insertNewComponentInstance = (store.createTransaction([instancesStore], (instances) => {insertInstancesMutable(instances, [instance], [instance.id], dropTarget);});- selectedInstanceAddressStore.set(- getInstanceAddress(instancesStore.get(), instance.id)+ selectedInstanceSelectorStore.set(+ getInstanceSelector(instancesStore.get(), instance.id));};@@ -41,16 +41,16 @@ export const reparentInstance = (store.createTransaction([instancesStore], (instances) => {reparentInstanceMutable(instances,- getInstanceAddress(instances, targetInstanceId),+ getInstanceSelector(instances, targetInstanceId),dropTarget);});- selectedInstanceAddressStore.set(- getInstanceAddress(instancesStore.get(), targetInstanceId)+ selectedInstanceSelectorStore.set(+ getInstanceSelector(instancesStore.get(), targetInstanceId));};-export const deleteInstance = (instanceAddress: InstanceAddress) => {+export const deleteInstance = (instanceSelector: InstanceSelector) => {store.createTransaction([instancesStore,@@ -60,7 +60,7 @@ export const deleteInstance = (instanceAddress: InstanceAddress) => {stylesStore,],(instances, props, styleSourceSelections, styleSources, styles) => {- const [targetInstanceId, parentInstanceId] = instanceAddress;+ const [targetInstanceId, parentInstanceId] = instanceSelector;const parentInstance =parentInstanceId === undefined? undefined@@ -102,8 +102,8 @@ export const deleteInstance = (instanceAddress: InstanceAddress) => {}if (parentInstance) {- selectedInstanceAddressStore.set(- getAncestorInstanceAddress(instanceAddress, parentInstance.id)+ selectedInstanceSelectorStore.set(+ getAncestorInstanceSelector(instanceSelector, parentInstance.id));}}@@ -111,14 +111,14 @@ export const deleteInstance = (instanceAddress: InstanceAddress) => {};export const deleteSelectedInstance = () => {- const selectedInstanceAddress = selectedInstanceAddressStore.get();+ const selectedInstanceSelector = selectedInstanceSelectorStore.get();const rootInstanceId = selectedPageStore.get()?.rootInstanceId;// @todo tell user they can't delete rootif (- selectedInstanceAddress === undefined ||- selectedInstanceAddress[0] === rootInstanceId+ selectedInstanceSelector === undefined ||+ selectedInstanceSelector[0] === rootInstanceId) {return;}- deleteInstance(selectedInstanceAddress);+ deleteInstance(selectedInstanceSelector);};diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.tsindex c846d7ac5e..200e49d2c9 100644--- a/apps/builder/app/shared/nano-states/nano-states.ts+++ b/apps/builder/app/shared/nano-states/nano-states.ts@@ -33,7 +33,7 @@ import type {} from "~/builder/shared/assets";import { useSyncInitializeOnce } from "../hook-utils";import { shallowComputed } from "../store-utils";-import { createInstancesIndex, type InstanceAddress } from "../tree-utils";+import { createInstancesIndex, type InstanceSelector } from "../tree-utils";const useValue = <T>(atom: WritableAtom<T>) => {const value = useStore(atom);@@ -304,17 +304,17 @@ export const useSetAssets = (assets: Asset[]) => {});};-export const selectedInstanceAddressStore = atom<undefined | InstanceAddress>(+export const selectedInstanceSelectorStore = atom<undefined | InstanceSelector>(undefined);export const selectedInstanceStore = computed(- [instancesIndexStore, selectedInstanceAddressStore],- (instancesIndex, selectedInstanceAddress) => {- if (selectedInstanceAddress === undefined) {+ [instancesIndexStore, selectedInstanceSelectorStore],+ (instancesIndex, selectedInstanceSelector) => {+ if (selectedInstanceSelector === undefined) {return;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;return instancesIndex.instancesById.get(selectedInstanceId);});@@ -322,13 +322,17 @@ export const selectedInstanceStore = computed(export const selectedInstanceBrowserStyleStore = atom<undefined | Style>();export const selectedInstanceStyleSourcesStore = computed(- [styleSourceSelectionsStore, styleSourcesStore, selectedInstanceAddressStore],- (styleSourceSelections, styleSources, selectedInstanceAddress) => {+ [+ styleSourceSelectionsStore,+ styleSourcesStore,+ selectedInstanceSelectorStore,+ ],+ (styleSourceSelections, styleSources, selectedInstanceSelector) => {const selectedInstanceStyleSources: StyleSource[] = [];- if (selectedInstanceAddress === undefined) {+ if (selectedInstanceSelector === undefined) {return selectedInstanceStyleSources;}- const [selectedInstanceId] = selectedInstanceAddress;+ const [selectedInstanceId] = selectedInstanceSelector;const styleSourceIds =styleSourceSelections.get(selectedInstanceId)?.values ?? [];let hasLocal = false;diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.tsindex 3534979c16..9b2d18f6b2 100644--- a/apps/builder/app/shared/sync/sync-stores.ts+++ b/apps/builder/app/shared/sync/sync-stores.ts@@ -13,7 +13,7 @@ import {styleSourceSelectionsStore,selectedPageIdStore,assetContainersStore,- selectedInstanceAddressStore,+ selectedInstanceSelectorStore,selectedInstanceBrowserStyleStore,hoveredInstanceIdStore,hoveredInstanceOutlineStore,@@ -60,7 +60,7 @@ export const registerContainers = () => {// synchronize whole statesclientStores.set("selectedPageId", selectedPageIdStore);clientStores.set("assetContainers", assetContainersStore);- clientStores.set("selectedInstanceAddress", selectedInstanceAddressStore);+ clientStores.set("selectedInstanceSelector", selectedInstanceSelectorStore);clientStores.set("selectedInstanceBrowserStyle",selectedInstanceBrowserStyleStorediff --git a/apps/builder/app/shared/tree-utils.test.ts b/apps/builder/app/shared/tree-utils.test.tsindex 599e6a6805..bdbaa3ba48 100644--- a/apps/builder/app/shared/tree-utils.test.ts+++ b/apps/builder/app/shared/tree-utils.test.ts@@ -10,13 +10,14 @@ import type {StyleSourceSelection,} from "@webstudio-is/project-build";import {+ type InstanceSelector,cloneStyles,createInstancesIndex,findClosestDroppableTarget,findClosestRichTextInstance,findSubtreeLocalStyleSources,- getAncestorInstanceAddress,- getInstanceAddress,+ getAncestorInstanceSelector,+ getInstanceSelector,getInstanceAncestorsAndSelf,insertInstancesCopyMutable,insertInstancesMutable,@@ -24,7 +25,6 @@ import {insertStylesCopyMutable,insertStyleSourcesCopyMutable,insertStyleSourceSelectionsCopyMutable,- InstanceAddress,reparentInstanceMutable,} from "./tree-utils";@@ -116,14 +116,19 @@ const createStyleDecl = (};};-test("get ancestor instance address", () => {- const instanceAddress: InstanceAddress = ["4", "3", "2", "1"];- expect(getAncestorInstanceAddress(instanceAddress, "2")).toEqual(["2", "1"]);- expect(getAncestorInstanceAddress(instanceAddress, "-1")).toEqual(undefined);- expect(getAncestorInstanceAddress(instanceAddress, "1")).toEqual(["1"]);+test("get ancestor instance selector", () => {+ const instanceSelector: InstanceSelector = ["4", "3", "2", "1"];+ expect(getAncestorInstanceSelector(instanceSelector, "2")).toEqual([+ "2",+ "1",+ ]);+ expect(getAncestorInstanceSelector(instanceSelector, "-1")).toEqual(+ undefined+ );+ expect(getAncestorInstanceSelector(instanceSelector, "1")).toEqual(["1"]);});-test("get instance address", () => {+test("get instance selector", () => {const instances: Instances = new Map([createInstancePair("root", "Box", [{ type: "id", value: "box1" },@@ -140,7 +145,7 @@ test("get instance address", () => {createInstancePair("child1", "Box", []),createInstancePair("child2", "Box", []),]);- expect(getInstanceAddress(instances, "box3")).toEqual([+ expect(getInstanceSelector(instances, "box3")).toEqual(["box3","box2","root",diff --git a/apps/builder/app/shared/tree-utils.ts b/apps/builder/app/shared/tree-utils.tsindex 6b7e86d0d8..875248b26f 100644--- a/apps/builder/app/shared/tree-utils.ts+++ b/apps/builder/app/shared/tree-utils.ts@@ -18,26 +18,26 @@ import { getComponentMeta } from "@webstudio-is/react-sdk";// slots can have multiple parents so instance should be addressed// with full rendered path to avoid double selections with slots// and support deletion of slot child from specific parent-// address starts with target instance and ends with root-export type InstanceAddress = Instance["id"][];+// selector starts with target instance and ends with root+export type InstanceSelector = Instance["id"][];-// provide an address starting with ancestor id+// provide a selector starting with ancestor id// useful to select parent instance or one of breadcrumbs instances-export const getAncestorInstanceAddress = (- instanceAddress: InstanceAddress,+export const getAncestorInstanceSelector = (+ instanceSelector: InstanceSelector,ancestorId: Instance["id"]-): undefined | InstanceAddress => {- const ancestorIndex = instanceAddress.indexOf(ancestorId);+): undefined | InstanceSelector => {+ const ancestorIndex = instanceSelector.indexOf(ancestorId);if (ancestorIndex === -1) {return undefined;}- return instanceAddress.slice(ancestorIndex);+ return instanceSelector.slice(ancestorIndex);};-// this utility is temporary solution to compute instance addresses+// this utility is temporary solution to compute instance selectors// before all logic is migrated to get it from rendered context// @todo should be deleted before adding slots-export const getInstanceAddress = (+export const getInstanceSelector = (instances: Instances,instanceId: Instance["id"]) => {@@ -49,13 +49,13 @@ export const getInstanceAddress = (}}}- const address: InstanceAddress = [];+ const selector: InstanceSelector = [];let currentInstanceId: undefined | Instance["id"] = instanceId;while (currentInstanceId) {- address.push(currentInstanceId);+ selector.push(currentInstanceId);currentInstanceId = parentInstancesById.get(currentInstanceId);}- return address;+ return selector;};export const createComponentInstance = (@@ -224,10 +224,10 @@ export const reparentInstanceMutableDeprecated = (export const reparentInstanceMutable = (instances: Instances,- instanceAddress: InstanceAddress,+ instanceSelector: InstanceSelector,dropTarget: DroppableTarget) => {- const [instanceId, parentInstanceId] = instanceAddress;+ const [instanceId, parentInstanceId] = instanceSelector;const prevParent =parentInstanceId === undefined? undefined