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 drag&drop on canvas (#2007)

Bogdan Chadkin923a3868a178
diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsx
index d96166bc9e..f6487455eb 100644
--- a/apps/builder/app/builder/shared/navigator-tree.tsx
+++ b/apps/builder/app/builder/shared/navigator-tree.tsx
@@ -3,7 +3,6 @@ import { useStore } from "@nanostores/react";
import { shallowEqual } from "shallow-equal";
import { toast } from "@webstudio-is/design-system";
import type { Instance } from "@webstudio-is/project-build";
-import { generateDataFromEmbedTemplate } from "@webstudio-is/react-sdk";
import {
hoveredInstanceSelectorStore,
instancesStore,
@@ -21,6 +20,7 @@ import {
reparentInstance,
type InsertConstraints,
isInstanceDetachable,
+ getComponentTemplateData,
} from "~/shared/instance-utils";
import { InstanceTree } from "./tree";
@@ -40,14 +40,9 @@ export const NavigatorTree = () => {
const insertConstraints: undefined | InsertConstraints = useMemo(() => {
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 { children, instances } = generateDataFromEmbedTemplate(
- template,
- "__placeholder__"
- );
+ const templateData = getComponentTemplateData(dragPayload.dragComponent);
+ if (templateData) {
+ const { children, instances } = templateData;
const newInstances = new Map(
instances.map((instance) => [instance.id, instance])
);
diff --git a/apps/builder/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.ts
index 900cdb3c03..90a08a6030 100644
--- a/apps/builder/app/canvas/shared/use-drag-drop.ts
+++ b/apps/builder/app/canvas/shared/use-drag-drop.ts
@@ -34,7 +34,6 @@ import {
type InstanceSelector,
areInstanceSelectorsEqual,
} from "~/shared/tree-utils";
-import { generateDataFromEmbedTemplate } from "@webstudio-is/react-sdk";
declare module "~/shared/pubsub" {
export interface PubsubMap {
@@ -71,14 +70,9 @@ const findClosestDroppableInstanceSelector = (
let insertConstraints: undefined | InsertConstraints;
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 { children, instances } = generateDataFromEmbedTemplate(
- template,
- "__placeholder__"
- );
+ const templateData = getComponentTemplateData(dragPayload.dragComponent);
+ if (templateData) {
+ const { children, instances } = templateData;
const newInstances = new Map(
instances.map((instance) => [instance.id, instance])
);
diff --git a/packages/react-sdk/src/tree/root.ts b/packages/react-sdk/src/tree/root.ts
index d2c7e64919..fba8b2f1e8 100644
--- a/packages/react-sdk/src/tree/root.ts
+++ b/packages/react-sdk/src/tree/root.ts
@@ -38,6 +38,7 @@ type RootProps = {
executeComputingExpressions: (values: DataSourceValues) => DataSourceValues;
executeEffectfulExpression: (
expression: string,
+ args: DataSourceValues,
values: DataSourceValues
) => DataSourceValues;
Component?: ForwardRefExoticComponent<