Skip to content

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.

Fix invalid ancestors for deeply nested instances (#1932)

Bogdan Chadkinb424f9fbde42
diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsx
index 755f10954f..b3a1cfbd39 100644
--- a/apps/builder/app/builder/shared/navigator-tree.tsx
+++ b/apps/builder/app/builder/shared/navigator-tree.tsx
@@ -1,7 +1,10 @@
import { useCallback, useMemo } from "react";
import { useStore } from "@nanostores/react";
import { shallowEqual } from "shallow-equal";
-import type { Instance } from "@webstudio-is/project-build";
+import {
+ findTreeInstanceIds,
+ type Instance,
+} from "@webstudio-is/project-build";
import {
hoveredInstanceSelectorStore,
instancesStore,
@@ -18,6 +21,7 @@ import {
reparentInstance,
} from "~/shared/instance-utils";
import { InstanceTree } from "./tree";
+import { generateDataFromEmbedTemplate } from "@webstudio-is/react-sdk";
export const NavigatorTree = () => {
const selectedInstanceSelector = useStore(selectedInstanceSelectorStore);
@@ -33,24 +37,40 @@ export const NavigatorTree = () => {
? dragPayload.dragInstanceSelector
: undefined;
- const dragComponent = useMemo(() => {
- let dragComponent: undefined | string;
+ // collect components of drag component and all its descendants
+ const dragComponents = useMemo(() => {
+ const dragComponents = new Set<Instance["component"]>();
if (dragPayload?.type === "insert") {
- dragComponent = dragPayload.dragComponent;
+ const template = metas.get(dragPayload.dragComponent)?.template;
+ if (template) {
+ // ignore breakpoint, here only instances are important
+ // @todo optimize by traversing only instances
+ const { instances } = generateDataFromEmbedTemplate(
+ template,
+ "__placeholder__"
+ );
+ for (const instance of instances) {
+ dragComponents.add(instance.component);
+ }
+ }
}
if (dragPayload?.type === "reparent") {
- dragComponent = instances.get(
+ const instanceIds = findTreeInstanceIds(
+ instances,
dragPayload.dragInstanceSelector[0]
- )?.component;
+ );
+ for (const instanceId of instanceIds) {
+ const instance = instances.get(instanceId);
+ if (instance) {
+ dragComponents.add(instance.component);
+ }
+ }
}
- return dragComponent;
- }, [dragPayload, instances]);
+ return Array.from(dragComponents);
+ }, [dragPayload, instances, metas]);
const findClosestDroppableIndex = useCallback(
(instanceSelector: InstanceSelector) => {
- if (dragComponent === undefined) {
- return -1;
- }
const componentSelector: string[] = [];
for (const instanceId of instanceSelector) {
const component = instances.get(instanceId)?.component;
@@ -59,11 +79,13 @@ export const NavigatorTree = () => {
}
componentSelector.push(component);
}
- return findClosestDroppableComponentIndex(metas, componentSelector, [
- dragComponent,
- ]);
+ return findClosestDroppableComponentIndex(
+ metas,
+ componentSelector,
+ dragComponents
+ );
},
- [instances, metas, dragComponent]
+ [instances, metas, dragComponents]
);
const isItemHidden = useCallback(
diff --git a/apps/builder/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.ts
index be243b1bc0..81ca734714 100644
--- a/apps/builder/app/canvas/shared/use-drag-drop.ts
+++ b/apps/builder/app/canvas/shared/use-drag-drop.ts
@@ -1,5 +1,8 @@
import { useLayoutEffect, useRef } from "react";
-import type { Instance } from "@webstudio-is/project-build";
+import {
+ findTreeInstanceIds,
+ type Instance,
+} from "@webstudio-is/project-build";
import {
type Point,
type Placement,
@@ -29,6 +32,7 @@ import {
type InstanceSelector,
areInstanceSelectorsEqual,
} from "~/shared/tree-utils";
+import { generateDataFromEmbedTemplate } from "@webstudio-is/react-sdk";
declare module "~/shared/pubsub" {
export interface PubsubMap {
@@ -61,17 +65,34 @@ const findClosestDroppableInstanceSelector = (
dragPayload: DragStartPayload
) => {
const instances = instancesStore.get();
- let dragComponent: undefined | string;
- if (dragPayload.type === "insert") {
- dragComponent = dragPayload.dragComponent;
+ const metas = registeredComponentMetasStore.get();
+
+ const dragComponents = new Set<Instance["component"]>();
+ if (dragPayload?.type === "insert") {
+ const template = metas.get(dragPayload.dragComponent)?.template;
+ if (template) {
+ // ignore breakpoint, here only instances are important
+ // @todo optimize by traversing only instances
+ const { instances } = generateDataFromEmbedTemplate(
+ template,
+ "__placeholder__"
+ );
+ for (const instance of instances) {
+ dragComponents.add(instance.component);
+ }
+ }
}
- if (dragPayload.type === "reparent") {
- dragComponent = instances.get(
+ if (dragPayload?.type === "reparent") {
+ const instanceIds = findTreeInstanceIds(
+ instances,
dragPayload.dragInstanceSelector[0]
- )?.component;
- }
- if (dragComponent === undefined) {
- return;
+ );
+ for (const instanceId of instanceIds) {
+ const instance = instances.get(instanceId);
+ if (instance) {
+ dragComponents.add(instance.component);
+ }
+ }
}
const componentSelector: string[] = [];
@@ -86,7 +107,7 @@ const findClosestDroppableInstanceSelector = (
const droppableIndex = findClosestDroppableComponentIndex(
registeredComponentMetasStore.get(),
componentSelector,
- [dragComponent]
+ Array.from(dragComponents)
);
if (droppableIndex === -1) {
return;
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.ts
index b5ba96c481..72f204f19a 100644
--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts
@@ -270,12 +270,14 @@ export const onPaste = (clipboardData: string) => {
const instanceSelector = selectedInstanceSelectorStore.get() ?? [
selectedPage.rootInstanceId,
];
- const dragComponent = data.instances[0].component;
+ const dragComponents = Array.from(
+ new Set(data.instances.map((instance) => instance.component))
+ );
const dropTarget = findClosestDroppableTarget(
registeredComponentMetasStore.get(),
instancesStore.get(),
instanceSelector,
- [dragComponent]
+ dragComponents
);
if (dropTarget === undefined) {
return;
diff --git a/apps/builder/app/shared/copy-paste/plugin-markdown.ts b/apps/builder/app/shared/copy-paste/plugin-markdown.ts
index 5dcc90d8ea..4b79584857 100644
--- a/apps/builder/app/shared/copy-paste/plugin-markdown.ts
+++ b/apps/builder/app/shared/copy-paste/plugin-markdown.ts
@@ -206,16 +206,9 @@ export const onPaste = (clipboardData: string) => {
const instanceSelector = selectedInstanceSelectorStore.get() ?? [
selectedPage.rootInstanceId,
];
- const instances = instancesStore.get();
- const dragComponents = [];
- for (const child of data.children) {
- if (child.type === "id") {
- const component = instances.get(child.value)?.component;
- if (component !== undefined) {
- dragComponents.push(component);
- }
- }
- }
+ const dragComponents = Array.from(
+ new Set(data.instances.map((instance) => instance.component))
+ );
const dropTarget = findClosestDroppableTarget(
registeredComponentMetasStore.get(),
instancesStore.get(),
diff --git a/packages/sdk-components-react/src/checkbox.ws.tsx b/packages/sdk-components-react/src/checkbox.ws.tsx
index c74afba192..a54a1f6b3d 100644
--- a/packages/sdk-components-react/src/checkbox.ws.tsx
+++ b/packages/sdk-components-react/src/checkbox.ws.tsx
@@ -21,6 +21,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
+ invalidAncestors: ["Button"],
type: "control",
label: "Checkbox",
icon: CheckboxCheckedIcon,
diff --git a/packages/sdk-components-react/src/input.ws.tsx b/packages/sdk-components-react/src/input.ws.tsx
index fee01f4d17..6c76802004 100644
--- a/packages/sdk-components-react/src/input.ws.tsx
+++ b/packages/sdk-components-react/src/input.ws.tsx
@@ -15,6 +15,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
+ invalidAncestors: ["Button"],
type: "control",
label: "Text Input",
icon: FormTextFieldIcon,
diff --git a/packages/sdk-components-react/src/label.ws.tsx b/packages/sdk-components-react/src/label.ws.tsx
index 269f69eb3b..dfb9feb9bb 100644
--- a/packages/sdk-components-react/src/label.ws.tsx
+++ b/packages/sdk-components-react/src/label.ws.tsx
@@ -18,6 +18,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
+ invalidAncestors: ["Button"],
type: "container",
label: "Input Label",
icon: TextIcon,
diff --git a/packages/sdk-components-react/src/radio-button.ws.tsx b/packages/sdk-components-react/src/radio-button.ws.tsx
index 1465c6e12e..4446121a69 100644
--- a/packages/sdk-components-react/src/radio-button.ws.tsx
+++ b/packages/sdk-components-react/src/radio-button.ws.tsx
@@ -21,6 +21,7 @@ const presetStyle = {
export const meta: WsComponentMeta = {
category: "forms",
+ invalidAncestors: ["Button"],
type: "control",
label: "Radio",
icon: RadioCheckedIcon,