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
feat: Add Editable Block (#4468)
Ivan Starkovbbcdd2529c76
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 a86db29d9c..cc6f4936e5 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@@ -19,7 +19,7 @@ import { ResizeHandles } from "./resize-handles";import { MediaBadge } from "./media-badge";import { applyScale } from "./outline";import { $scale } from "~/builder/shared/nano-states";-import { EditableBlockChildHoveredInstanceOutline } from "./outline/hovered-instance-outline";+import { EditableBlockChildHoveredInstanceOutline } from "./outline/editable-block-instance-outline";const containerStyle = css({position: "absolute",@@ -73,9 +73,10 @@ export const CanvasTools = () => {<><SelectedInstanceOutline /><HoveredInstanceOutline />- <EditableBlockChildHoveredInstanceOutline /><CollaborativeInstanceOutline /><TextToolbar />++ <EditableBlockChildHoveredInstanceOutline /></>)}</>diff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/editable-block-instance-outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/editable-block-instance-outline.tsxnew file mode 100644index 0000000000..1543d9f92e--- /dev/null+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/editable-block-instance-outline.tsx@@ -0,0 +1,352 @@+import { useStore } from "@nanostores/react";+import {+ $editableBlockChildOutline,+ $instances,+ $isContentMode,+ type EditableBlockChildOutline,+} from "~/shared/nano-states";+import {+ Box,+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuPortal,+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,+ DropdownMenuTrigger,+ Flex,+ theme,+ IconButton,+ Tooltip,+ toast,+} from "@webstudio-is/design-system";+import { EditableBlockChildAddButtonOutline } from "./outline";+import { applyScale } from "./apply-scale";+import { $scale } from "~/builder/shared/nano-states";+import { BoxIcon, PlusIcon } from "@webstudio-is/icons";+import { useRef, useState } from "react";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import type { DroppableTarget, InstanceSelector } from "~/shared/tree-utils";+import type { Instance, Instances } from "@webstudio-is/sdk";+import {+ editableBlockComponent,+ editableBlockTemplateComponent,+} from "@webstudio-is/react-sdk";+import {+ extractWebstudioFragment,+ findAvailableDataSources,+ getWebstudioData,+ insertInstanceChildrenMutable,+ insertWebstudioFragmentCopy,+ updateWebstudioData,+} from "~/shared/instance-utils";+import { shallowEqual } from "shallow-equal";++const findEditableBlockSelector = (+ anchor: InstanceSelector,+ instances: Instances+) => {+ if (anchor === undefined) {+ return;+ }++ if (anchor.length === 0) {+ return undefined;+ }++ let editableBlockInstanceSelector: InstanceSelector | undefined = undefined;++ for (let i = 0; i < anchor.length; ++i) {+ const instanceId = anchor[i];++ const instance = instances.get(instanceId);+ if (instance === undefined) {+ return;+ }++ if (instance.component === editableBlockComponent) {+ editableBlockInstanceSelector = anchor.slice(i);+ break;+ }+ }++ if (editableBlockInstanceSelector === undefined) {+ return;+ }++ return editableBlockInstanceSelector;+};++const findTemplates = (anchor: InstanceSelector, instances: Instances) => {+ const editableBlockInstanceSelector = findEditableBlockSelector(+ anchor,+ instances+ );+ if (editableBlockInstanceSelector === undefined) {+ toast.error("Editable block not found");+ return;+ }++ const editableBlockInstance = instances.get(editableBlockInstanceSelector[0]);++ if (editableBlockInstance === undefined) {+ toast.error("Editable block instance not found");+ return;+ }++ const templateInstanceId = editableBlockInstance.children.find(+ (child) =>+ child.type === "id" &&+ instances.get(child.value)?.component === editableBlockTemplateComponent+ )?.value;++ if (templateInstanceId === undefined) {+ toast.error("Templates instance id not found");+ return;+ }++ const templateInstance = instances.get(templateInstanceId);++ if (templateInstance === undefined) {+ toast.error("Templates instance not found");+ return;+ }++ const result: [instance: Instance, instanceSelector: InstanceSelector][] =+ templateInstance.children+ .filter((child) => child.type === "id")+ .map((child) => child.value)+ .map((childId) => instances.get(childId))+ .filter((child) => child !== undefined)+ .map((child) => [+ child,+ [child.id, templateInstanceId, ...editableBlockInstanceSelector],+ ]);++ return result;+};++const getInsertionIndex = (anchor: InstanceSelector, instances: Instances) => {+ const editableBlockSelector = findEditableBlockSelector(anchor, instances);+ if (editableBlockSelector === undefined) {+ return;+ }++ const insertAtInitialPosition = shallowEqual(editableBlockSelector, anchor);++ const editableBlockInstance = instances.get(editableBlockSelector[0]);++ if (editableBlockInstance === undefined) {+ toast.error("Editable block instance not found");+ return;+ }++ let index = editableBlockInstance.children.findIndex((child) => {+ if (child.type !== "id") {+ return false;+ }++ if (insertAtInitialPosition) {+ return (+ instances.get(child.value)?.component === editableBlockTemplateComponent+ );+ }++ return child.value === anchor[0];+ });++ if (index === -1) {+ return;+ }+ index += 1;++ return index;+};++const TemplatesMenu = ({+ onOpenChange,+ children,+ anchor,+}: {+ children: React.ReactNode;+ onOpenChange: (open: boolean) => void;+ anchor: InstanceSelector;+}) => {+ const instances = useStore($instances);+ const templates = findTemplates(anchor, instances);++ const menuItems = templates?.map(([template, templateSelector]) => ({+ id: template.id,+ icon: <BoxIcon />,+ title: template.label ?? template.component,+ value: templateSelector,+ }));++ return (+ <DropdownMenu onOpenChange={onOpenChange} modal>+ <Tooltip content="Add next block" side="top" disableHoverableContent>+ <DropdownMenuTrigger asChild>{children}</DropdownMenuTrigger>+ </Tooltip>++ <DropdownMenuPortal>+ <DropdownMenuContent+ align="start"+ sideOffset={4}+ collisionPadding={16}+ side="bottom"+ loop+ >+ <DropdownMenuRadioGroup+ onValueChange={(value) => {+ const templateSelector = JSON.parse(value) as InstanceSelector;+ const fragment = extractWebstudioFragment(+ getWebstudioData(),+ templateSelector[0]+ );++ const parentSelector = findEditableBlockSelector(+ anchor,+ instances+ );++ if (parentSelector === undefined) {+ return;+ }++ const position = getInsertionIndex(anchor, instances);++ if (position === undefined) {+ return;+ }++ const target: DroppableTarget = {+ parentSelector,+ position,+ };++ updateWebstudioData((data) => {+ const { newInstanceIds } = insertWebstudioFragmentCopy({+ data,+ fragment,+ availableDataSources: findAvailableDataSources(+ data.dataSources,+ data.instances,+ target.parentSelector+ ),+ });+ const newRootInstanceId = newInstanceIds.get(+ fragment.instances[0].id+ );+ if (newRootInstanceId === undefined) {+ return;+ }+ const children: Instance["children"] = [+ { type: "id", value: newRootInstanceId },+ ];+ insertInstanceChildrenMutable(data, children, target);+ });+ }}+ >+ {menuItems?.map(({ icon, title, id, value }) => (+ <DropdownMenuRadioItem key={id} value={JSON.stringify(value)}>+ <Flex+ css={{ py: theme.spacing[4], px: theme.spacing[5] }}+ gap={2}+ >+ {icon}+ <Box>{title}</Box>+ </Flex>+ </DropdownMenuRadioItem>+ ))}+ </DropdownMenuRadioGroup>+ </DropdownMenuContent>+ </DropdownMenuPortal>+ </DropdownMenu>+ );+};++export const EditableBlockChildHoveredInstanceOutline = () => {+ const editableBlockChildOutline = useStore($editableBlockChildOutline);+ const scale = useStore($scale);+ const isContentMode = useStore($isContentMode);++ const timeoutRef = useRef<undefined | ReturnType<typeof setTimeout>>(+ undefined+ );+ const [buttonOutline, setButtonOutline] = useState<+ undefined | EditableBlockChildOutline+ >(undefined);++ const outline = editableBlockChildOutline ?? buttonOutline;++ const [isMenuOpen, setIsMenuOpen] = useState(false);++ if (isFeatureEnabled("contentEditableMode") === false) {+ return;+ }++ if (!isContentMode) {+ return;+ }++ if (outline === undefined) {+ return;+ }++ const rect = applyScale(outline.rect, scale);++ return (+ <EditableBlockChildAddButtonOutline rect={rect}>+ <Flex+ css={{+ width: "min-content",+ height: "min-content",+ pointerEvents: isMenuOpen ? "none" : "all",+ }}+ onMouseEnter={() => {+ clearTimeout(timeoutRef.current);++ setButtonOutline(outline);+ }}+ onMouseLeave={() => {+ if (isMenuOpen) {+ return;+ }++ clearTimeout(timeoutRef.current);++ timeoutRef.current = setTimeout(() => {+ setButtonOutline(undefined);+ }, 100);+ }}+ >+ <TemplatesMenu+ onOpenChange={(open) => {+ setIsMenuOpen(open);++ if (!open) {+ setButtonOutline(undefined);+ }+ }}+ anchor={outline.selector}+ >+ <IconButton+ variant={"local"}+ css={{+ borderStyle: "solid",+ borderColor: `oklch(from ${theme.colors.backgroundPrimary} l c h / 0.7)`,+ }}+ >+ <PlusIcon />+ </IconButton>+ </TemplatesMenu>+ <Box+ css={{+ width: theme.spacing[4],+ // For easier hover+ height: theme.spacing[12],+ }}+ ></Box>+ </Flex>+ </EditableBlockChildAddButtonOutline>+ );+};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 75cc72afee..0545b6fd0d 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@@ -6,82 +6,16 @@ import {$instances,$isContentMode,$textEditingInstanceSelector,- type EditableBlockChildOutline,} from "~/shared/nano-states";-import { EditableBlockChildAddButtonOutline, Outline } from "./outline";+import { Outline } from "./outline";import { Label } from "./label";import { applyScale } from "./apply-scale";import { $scale } from "~/builder/shared/nano-states";import { findClosestSlot } from "~/shared/instance-utils";import { shallowEqual } from "shallow-equal";import type { InstanceSelector } from "~/shared/tree-utils";-import { IconButton, theme, Tooltip } from "@webstudio-is/design-system";-import { PlusIcon } from "@webstudio-is/icons";-import { useRef, useState } from "react";import { isFeatureEnabled } from "@webstudio-is/feature-flags";-export const EditableBlockChildHoveredInstanceOutline = () => {- const editableBlockChildOutline = useStore($editableBlockChildOutline);- const scale = useStore($scale);- const isContentMode = useStore($isContentMode);- const timeoutRef = useRef<undefined | ReturnType<typeof setTimeout>>(- undefined- );- const [buttonOutline, setButtonOutline] = useState<- undefined | EditableBlockChildOutline- >(undefined);-- const outline = editableBlockChildOutline ?? buttonOutline;-- if (isFeatureEnabled("contentEditableMode") === false) {- return;- }-- if (!isContentMode) {- return;- }-- if (outline === undefined) {- return;- }-- const rect = applyScale(outline.rect, scale);-- return (- <EditableBlockChildAddButtonOutline rect={rect}>- <Tooltip content="Add next block" side="top" disableHoverableContent>- <IconButton- variant={"local"}- css={{- borderStyle: "solid",- borderColor: `oklch(from ${theme.colors.backgroundPrimary} l c h / 0.7)`,- borderRadius: "100%",- pointerEvents: "all",- // mr: theme.spacing[12],- }}- onClick={() => {- alert("not implemented");- }}- onMouseEnter={() => {- clearTimeout(timeoutRef.current);-- setButtonOutline(outline);- }}- onMouseLeave={() => {- clearTimeout(timeoutRef.current);-- timeoutRef.current = setTimeout(() => {- setButtonOutline(undefined);- }, 100);- }}- >- <PlusIcon />- </IconButton>- </Tooltip>- </EditableBlockChildAddButtonOutline>- );-};-const isDescendantOrSelf = (descendant: InstanceSelector,self: InstanceSelectordiff --git a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsxindex bf4a20669c..b1a96ea3d3 100644--- a/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx+++ b/apps/builder/app/builder/features/workspace/canvas-tools/outline/outline.tsx@@ -92,8 +92,9 @@ export const EditableBlockChildAddButtonOutline = ({height: 0,width: 0,display: "grid",- alignContent: "center",- justifyContent: "center",++ alignContent: "start",+ justifyContent: "end",justifySelf: "start",alignSelf: "start",diff --git a/apps/builder/app/canvas/elements.tsx b/apps/builder/app/canvas/elements.tsxindex 77b782994d..fa011c435d 100644--- a/apps/builder/app/canvas/elements.tsx+++ b/apps/builder/app/canvas/elements.tsx@@ -2,6 +2,7 @@ import {Fragment,type ForwardRefExoticComponent,type RefAttributes,+ type RefObject,} from "react";import type { Instance, Instances } from "@webstudio-is/sdk";import type { Components } from "@webstudio-is/react-sdk";@@ -19,6 +20,7 @@ export const createInstanceElement = ({instanceSelector,Component,components,+ ref,}: {instances: Instances;instanceId: Instance["id"];@@ -27,6 +29,7 @@ export const createInstanceElement = ({WebstudioComponentProps & RefAttributes<HTMLElement>>;components: Components;+ ref?: RefObject<HTMLElement>;}) => {const instance = instances.get(instanceId);if (instance === undefined) {@@ -34,6 +37,7 @@ export const createInstanceElement = ({}return (<Component+ ref={ref}key={instance.id}instance={instance}instanceSelector={instanceSelector}@@ -61,7 +65,7 @@ export const createInstanceChildrenElements = ({}: {instances: Instances;instanceSelector: InstanceSelector;- children: Instance["children"];+ children: Instance["children"][0][];Component: ForwardRefExoticComponent<WebstudioComponentProps & RefAttributes<HTMLElement>>;@@ -83,6 +87,7 @@ export const createInstanceChildrenElements = ({components,});}+child satisfies never;});// let empty children be coalesced with fallbackdiff --git a/apps/builder/app/canvas/features/build-mode/editable-block-template.tsx b/apps/builder/app/canvas/features/build-mode/editable-block-template.tsxindex 8290b17a3d..5d9557c17d 100644--- a/apps/builder/app/canvas/features/build-mode/editable-block-template.tsx+++ b/apps/builder/app/canvas/features/build-mode/editable-block-template.tsx@@ -1,12 +1,38 @@-import type {- AnyComponent,- WebstudioComponentSystemProps,+import { useStore } from "@nanostores/react";+import {+ selectorIdAttribute,+ type AnyComponent,+ type WebstudioComponentSystemProps,} from "@webstudio-is/react-sdk";import * as React from "react";+import { $isDesignMode, $selectedInstanceSelector } from "~/shared/nano-states";export const EditableBlockTemplate = React.forwardRef<HTMLDivElement,- WebstudioComponentSystemProps->((props, ref) => {- return <div ref={ref} {...props} />;+ WebstudioComponentSystemProps & { children: React.ReactNode }+>(({ ...props }, ref) => {+ const isDesignMode = useStore($isDesignMode);+ const selectedInstanceSelector = useStore($selectedInstanceSelector);+ const templateInstanceStringSelector = props[selectorIdAttribute];++ if (!isDesignMode) {+ return;+ }++ if (selectedInstanceSelector === undefined) {+ return;+ }++ if (selectedInstanceSelector.length === 0) {+ return;+ }++ const selectedSelector = selectedInstanceSelector.join(",");++ // Exclude all selected ancestors+ if (!selectedSelector.endsWith(templateInstanceStringSelector)) {+ return;+ }++ return <div style={{ display: "contents" }} ref={ref} {...props} />;}) as AnyComponent;diff --git a/apps/builder/app/canvas/features/build-mode/editable-block.tsx b/apps/builder/app/canvas/features/build-mode/editable-block.tsxindex 7b08492ab7..2424ea7461 100644--- a/apps/builder/app/canvas/features/build-mode/editable-block.tsx+++ b/apps/builder/app/canvas/features/build-mode/editable-block.tsx@@ -1,12 +1,75 @@-import type {- AnyComponent,- WebstudioComponentSystemProps,+import { useStore } from "@nanostores/react";+import {+ editableBlockTemplateComponent,+ idAttribute,+ selectorIdAttribute,+ type AnyComponent,+ type WebstudioComponentSystemProps,} from "@webstudio-is/react-sdk";+import * as React from "react";+import {+ $instances,+ $isDesignMode,+ $selectedInstanceSelector,+} from "~/shared/nano-states";export const EditableBlock = React.forwardRef<HTMLDivElement,- WebstudioComponentSystemProps->((props, ref) => {- return <div ref={ref} {...props} />;+ { children: React.ReactNode } & WebstudioComponentSystemProps+>(({ children, ...props }, ref) => {+ const instances = useStore($instances);+ const isDesignMode = useStore($isDesignMode);+ const instanceId = props[idAttribute];+ const instance = instances.get(instanceId);+ const selectedInstanceSelector = useStore($selectedInstanceSelector);++ const childArray = React.Children.toArray(children).filter((child) =>+ React.isValidElement(child)+ );++ if (isDesignMode) {+ if (instance === undefined) {+ return <div>Editable Block instance is undefined</div>;+ }++ const templateInstanceId = instance.children.find(+ (child) =>+ child.type === "id" &&+ instances.get(child.value)?.component === editableBlockTemplateComponent+ )?.value;++ if (templateInstanceId === undefined) {+ return <div>Editable Block template instance not found</div>;+ }++ if (selectedInstanceSelector !== undefined) {+ const selectedSelector = selectedInstanceSelector.join(",");+ // If any template child is selected then render only template+ const stringSelector = props[selectorIdAttribute];+ const templateSelector = `${templateInstanceId},${stringSelector}`;++ if (selectedSelector.endsWith(templateSelector)) {+ return (+ <div style={{ display: "contents" }} ref={ref} {...props}>+ {childArray.filter((child) => {+ const { instanceSelector } = child.props;++ return instanceSelector[0] === templateInstanceId;+ })}+ </div>+ );+ }+ }+ }++ const hasContent = childArray.length > 1;+ const editableBlockStyle = hasContent ? { display: "contents" } : {};++ return (+ <div ref={ref} style={editableBlockStyle} {...props}>+ {childArray}+ {hasContent ? null : <div>Editable block you can edit</div>}+ </div>+ );}) as AnyComponent;diff --git a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsxindex 87a644219b..53c230caf6 100644--- a/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx+++ b/apps/builder/app/canvas/features/webstudio-component/webstudio-component.tsx@@ -443,6 +443,7 @@ export const WebstudioComponentCanvas = forwardRef<const props: {[componentAttribute]: string;[idAttribute]: string;+ [selectorIdAttribute]: string;} & Record<string, unknown> = {...mergeProps(restProps, instanceProps, "delete"),// current props should override bypassed from parent@@ -527,6 +528,7 @@ export const WebstudioComponentPreview = forwardRef<...mergeProps(restProps, instanceProps, "merge"),[idAttribute]: instance.id,[componentAttribute]: instance.component,+ [selectorIdAttribute]: instanceSelector.join(","),};if (show === false) {return <></>;diff --git a/apps/builder/app/canvas/instance-hovering.ts b/apps/builder/app/canvas/instance-hovering.tsindex e5d1dec023..56033461ed 100644--- a/apps/builder/app/canvas/instance-hovering.ts+++ b/apps/builder/app/canvas/instance-hovering.ts@@ -3,6 +3,7 @@ import {$editableBlockChildOutline,$hoveredInstanceSelector,$instances,+ $selectedInstanceSelector,$textEditingInstanceSelector,findEditableBlockChildSelector,} from "~/shared/nano-states";@@ -204,9 +205,21 @@ export const subscribeInstanceHovering = ({});+ // selected instance selection can change hovered instance outlines (example EditableBlock/Template/Child)+ const usubscribeSelectedInstanceSelector =+ $selectedInstanceSelector.subscribe(() => {+ const instanceSelector = $hoveredInstanceSelector.get();+ if (instanceSelector) {+ updateHoveredRect(instanceSelector);+ } else {+ $hoveredInstanceOutline.set(undefined);+ }+ });+signal.addEventListener("abort", () => {unsubscribeScrollState();clearTimeout(mouseOutTimeoutId);unsubscribeHoveredInstanceId();+ usubscribeSelectedInstanceSelector();});};diff --git a/apps/builder/app/shared/dom-utils.ts b/apps/builder/app/shared/dom-utils.tsindex d8c591b474..8af9301ddd 100644--- a/apps/builder/app/shared/dom-utils.ts+++ b/apps/builder/app/shared/dom-utils.ts@@ -133,7 +133,10 @@ const sumRects = (first: Rect, second: Rect) => {};};-export const getAllElementsBoundingBox = (elements: Element[]): DOMRect => {+export const getAllElementsBoundingBox = (+ elements: Element[],+ depth: number = 0+): DOMRect => {const rects: Rect[] = [];if (elements.length === 0) {@@ -151,30 +154,51 @@ export const getAllElementsBoundingBox = (elements: Element[]): DOMRect => {if (element.children.length === 0) {const textNode = element.firstChild;- if (textNode?.nodeType !== Node.TEXT_NODE) {- continue;- }- // Create a range object- const range = document.createRange();- // Set the range to encompass the text node- range.selectNodeContents(textNode);- // Get the bounding rectangle- const rect = range.getBoundingClientRect();+ if (textNode?.nodeType === Node.TEXT_NODE) {+ // Create a range object+ const range = document.createRange();+ // Set the range to encompass the text node+ range.selectNodeContents(textNode);+ // Get the bounding rectangle+ const rect = range.getBoundingClientRect();++ if (rect.width !== 0 || rect.height !== 0) {+ rects.push(rect);+ range.detach();+ continue;+ }+ range.detach();+ }+ }- if (rect.width !== 0 || rect.height !== 0) {- rects.push(rect);+ if (element.children.length > 0) {+ const childRect = getAllElementsBoundingBox(+ [...element.children],+ depth + 1+ );+ if (childRect.width !== 0 || childRect.height !== 0) {+ const { top, right, bottom, left } = childRect;+ rects.push({ top, right, bottom, left });+ continue;}+ }- range.detach();+ if (depth > 0) {+ continue;+ }+ // We here, let's try ancestor size+ const parentElement = element.parentElement;+ if (parentElement === null) {continue;}+ const parentRect = getAllElementsBoundingBox([parentElement]);- const childRect = getAllElementsBoundingBox([...element.children]);- if (childRect.width !== 0 || childRect.height !== 0) {- const { top, right, bottom, left } = childRect;+ if (parentRect.width !== 0 || parentRect.height !== 0) {+ const { top, right, bottom, left } = parentRect;rects.push({ top, right, bottom, left });+ continue;}}diff --git a/apps/builder/app/shared/nano-states/canvas.ts b/apps/builder/app/shared/nano-states/canvas.tsindex 9352298722..6f56e0dbcb 100644--- a/apps/builder/app/shared/nano-states/canvas.ts+++ b/apps/builder/app/shared/nano-states/canvas.ts@@ -87,6 +87,12 @@ export const findEditableBlockChildSelector = (return editableBlockChildSelector;}}++ if (+ instances.get(instanceSelector[0])?.component === editableBlockComponent+ ) {+ return instanceSelector;+ }};export const $canvasIframeState = atom<"idle" | "ready">("idle");diff --git a/packages/react-sdk/src/components/components-utils.ts b/packages/react-sdk/src/components/components-utils.tsindex ea1c9d3188..81d7929d16 100644--- a/packages/react-sdk/src/components/components-utils.ts+++ b/packages/react-sdk/src/components/components-utils.ts@@ -1,4 +1,4 @@-import { componentAttribute, idAttribute } from "../props";+import { componentAttribute, idAttribute, selectorIdAttribute } from "../props";export type AnyComponent = React.ForwardRefExoticComponent<Omit<@@ -14,4 +14,5 @@ export type Components = Map<string, AnyComponent>;export type WebstudioComponentSystemProps = {[componentAttribute]: string;[idAttribute]: string;+ [selectorIdAttribute]: string;};