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
Compute insert constraints for tree (#1954)
Bogdan Chadkin6037a039b7ae
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 e11db50e9f..4e4f52ed07 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@@ -23,8 +23,10 @@ import {scaleStore,} from "~/builder/shared/nano-states";import {+ computeInstancesConstraints,findClosestDroppableTarget,- insertNewComponentInstance,+ getComponentTemplateData,+ insertTemplateData,} from "~/shared/instance-utils";import { MetaIcon } from "~/builder/shared/meta-icon";@@ -176,6 +178,16 @@ export const useDraggable = ({if (selectedPage === undefined) {return;}+ const templateData = getComponentTemplateData(component);+ if (templateData === undefined) {+ return;+ }+ const newInstances = new Map(+ templateData.instances.map((instance) => [instance.id, instance])+ );+ const rootInstanceIds = templateData.children+ .filter((child) => child.type === "id")+ .map((child) => child.value);const instanceSelector = selectedInstanceSelectorStore.get() ?? [selectedPage.rootInstanceId,];@@ -185,7 +197,7 @@ export const useDraggable = ({instancesStore.get(),// fallback to root as drop targetinstanceSelector,- [component]+ computeInstancesConstraints(metas, newInstances, rootInstanceIds));if (dropTarget === undefined) {const meta = metas.get(component);@@ -194,7 +206,7 @@ export const useDraggable = ({}return;}- insertNewComponentInstance(component, dropTarget);+ insertTemplateData(templateData, dropTarget);};return {diff --git a/apps/builder/app/builder/shared/navigator-tree.tsx b/apps/builder/app/builder/shared/navigator-tree.tsxindex b3a1cfbd39..0a40d558cd 100644--- a/apps/builder/app/builder/shared/navigator-tree.tsx+++ b/apps/builder/app/builder/shared/navigator-tree.tsx@@ -1,10 +1,7 @@import { useCallback, useMemo } from "react";import { useStore } from "@nanostores/react";import { shallowEqual } from "shallow-equal";-import {- findTreeInstanceIds,- type Instance,-} from "@webstudio-is/project-build";+import type { Instance } from "@webstudio-is/project-build";import {hoveredInstanceSelectorStore,instancesStore,@@ -17,8 +14,10 @@ import {} from "~/shared/nano-states";import type { InstanceSelector } from "~/shared/tree-utils";import {+ computeInstancesConstraints,findClosestDroppableComponentIndex,reparentInstance,+ type InsertConstraints,} from "~/shared/instance-utils";import { InstanceTree } from "./tree";import { generateDataFromEmbedTemplate } from "@webstudio-is/react-sdk";@@ -37,40 +36,41 @@ export const NavigatorTree = () => {? dragPayload.dragInstanceSelector: undefined;- // collect components of drag component and all its descendants- const dragComponents = useMemo(() => {- const dragComponents = new Set<Instance["component"]>();+ 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 { instances } = generateDataFromEmbedTemplate(+ const { children, instances } = generateDataFromEmbedTemplate(template,"__placeholder__");- for (const instance of instances) {- dragComponents.add(instance.component);- }+ const newInstances = new Map(+ instances.map((instance) => [instance.id, instance])+ );+ const rootInstanceIds = children+ .filter((child) => child.type === "id")+ .map((child) => child.value);+ return computeInstancesConstraints(+ metas,+ newInstances,+ rootInstanceIds+ );}}if (dragPayload?.type === "reparent") {- const instanceIds = findTreeInstanceIds(- instances,- dragPayload.dragInstanceSelector[0]- );- for (const instanceId of instanceIds) {- const instance = instances.get(instanceId);- if (instance) {- dragComponents.add(instance.component);- }- }+ return computeInstancesConstraints(metas, instances, [+ dragPayload.dragInstanceSelector[0],+ ]);}- return Array.from(dragComponents);}, [dragPayload, instances, metas]);const findClosestDroppableIndex = useCallback((instanceSelector: InstanceSelector) => {+ if (insertConstraints === undefined) {+ return -1;+ }const componentSelector: string[] = [];for (const instanceId of instanceSelector) {const component = instances.get(instanceId)?.component;@@ -82,10 +82,10 @@ export const NavigatorTree = () => {return findClosestDroppableComponentIndex(metas,componentSelector,- dragComponents+ insertConstraints);},- [instances, metas, dragComponents]+ [instances, metas, insertConstraints]);const isItemHidden = useCallback(diff --git a/apps/builder/app/canvas/shared/use-drag-drop.ts b/apps/builder/app/canvas/shared/use-drag-drop.tsindex 81ca734714..fe82d4739c 100644--- a/apps/builder/app/canvas/shared/use-drag-drop.ts+++ b/apps/builder/app/canvas/shared/use-drag-drop.ts@@ -1,8 +1,5 @@import { useLayoutEffect, useRef } from "react";-import {- findTreeInstanceIds,- type Instance,-} from "@webstudio-is/project-build";+import type { Instance } from "@webstudio-is/project-build";import {type Point,type Placement,@@ -18,10 +15,13 @@ import {} from "~/shared/nano-states";import { publish, useSubscribe } from "~/shared/pubsub";import {+ computeInstancesConstraints,findClosestDroppableComponentIndex,findClosestEditableInstanceSelector,- insertNewComponentInstance,+ getComponentTemplateData,+ insertTemplateData,reparentInstance,+ type InsertConstraints,} from "~/shared/instance-utils";import {getElementByInstanceSelector,@@ -67,32 +67,36 @@ const findClosestDroppableInstanceSelector = (const instances = instancesStore.get();const metas = registeredComponentMetasStore.get();- const dragComponents = new Set<Instance["component"]>();+ 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 { instances } = generateDataFromEmbedTemplate(+ const { children, instances } = generateDataFromEmbedTemplate(template,"__placeholder__");- for (const instance of instances) {- dragComponents.add(instance.component);- }+ const newInstances = new Map(+ instances.map((instance) => [instance.id, instance])+ );+ const rootInstanceIds = children+ .filter((child) => child.type === "id")+ .map((child) => child.value);+ insertConstraints = computeInstancesConstraints(+ metas,+ newInstances,+ rootInstanceIds+ );}}if (dragPayload?.type === "reparent") {- const instanceIds = findTreeInstanceIds(- instances,- dragPayload.dragInstanceSelector[0]- );- for (const instanceId of instanceIds) {- const instance = instances.get(instanceId);- if (instance) {- dragComponents.add(instance.component);- }- }+ insertConstraints = computeInstancesConstraints(metas, instances, [+ dragPayload.dragInstanceSelector[0],+ ]);+ }+ if (insertConstraints === undefined) {+ return;}const componentSelector: string[] = [];@@ -107,7 +111,7 @@ const findClosestDroppableInstanceSelector = (const droppableIndex = findClosestDroppableComponentIndex(registeredComponentMetasStore.get(),componentSelector,- Array.from(dragComponents)+ insertConstraints);if (droppableIndex === -1) {return;@@ -325,7 +329,13 @@ export const useDragAndDrop = () => {if (dropTarget && dragPayload && isCanceled === false) {if (dragPayload.type === "insert") {- insertNewComponentInstance(dragPayload.dragComponent, {+ const templateData = getComponentTemplateData(+ dragPayload.dragComponent+ );+ if (templateData === undefined) {+ return;+ }+ insertTemplateData(templateData, {parentSelector: dropTarget.itemSelector,position: dropTarget.indexWithinChildren,});diff --git a/apps/builder/app/shared/copy-paste/plugin-embed-template.ts b/apps/builder/app/shared/copy-paste/plugin-embed-template.tsindex e44ba18603..48215bff44 100644--- a/apps/builder/app/shared/copy-paste/plugin-embed-template.ts+++ b/apps/builder/app/shared/copy-paste/plugin-embed-template.ts@@ -11,6 +11,7 @@ import {breakpointsStore,} from "../nano-states";import {+ computeInstancesConstraints,findClosestDroppableTarget,insertTemplateData,} from "../instance-utils";@@ -54,14 +55,18 @@ export const onPaste = (clipboardData: string): boolean => {template,baseBreakpoint.id);- const dragComponents = Array.from(- new Set(templateData.instances.map((instance) => instance.component))+ const metas = registeredComponentMetasStore.get();+ const newInstances = new Map(+ templateData.instances.map((instance) => [instance.id, instance]));+ const rootInstanceIds = templateData.children+ .filter((child) => child.type === "id")+ .map((child) => child.value);const dropTarget = findClosestDroppableTarget(- registeredComponentMetasStore.get(),+ metas,instancesStore.get(),instanceSelector,- dragComponents+ computeInstancesConstraints(metas, newInstances, rootInstanceIds));if (dropTarget === undefined) {return false;diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.tsindex e8ed5d4157..b10eb982f5 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts@@ -34,7 +34,11 @@ import {findLocalStyleSourcesWithinInstances,mergeNewBreakpointsMutable,} from "../tree-utils";-import { deleteInstance, findClosestDroppableTarget } from "../instance-utils";+import {+ computeInstancesConstraints,+ deleteInstance,+ findClosestDroppableTarget,+} from "../instance-utils";import { getMapValuesBy, getMapValuesByKeysSet } from "../array-utils";import { Asset } from "@webstudio-is/asset-uploader";@@ -266,18 +270,20 @@ export const onPaste = (clipboardData: string): boolean => {return false;}+ const metas = registeredComponentMetasStore.get();+ const newInstances = new Map(+ data.instances.map((instance) => [instance.id, instance])+ );+ const rootInstanceId = data.instances[0].id;// paste to the root if nothing is selectedconst instanceSelector = selectedInstanceSelectorStore.get() ?? [selectedPage.rootInstanceId,];- const dragComponents = Array.from(- new Set(data.instances.map((instance) => instance.component))- );const dropTarget = findClosestDroppableTarget(- registeredComponentMetasStore.get(),+ metas,instancesStore.get(),instanceSelector,- dragComponents+ computeInstancesConstraints(metas, newInstances, [rootInstanceId]));if (dropTarget === undefined) {return false;diff --git a/apps/builder/app/shared/copy-paste/plugin-markdown.ts b/apps/builder/app/shared/copy-paste/plugin-markdown.tsindex 9c91797d9c..67d61f2bf9 100644--- a/apps/builder/app/shared/copy-paste/plugin-markdown.ts+++ b/apps/builder/app/shared/copy-paste/plugin-markdown.ts@@ -5,7 +5,10 @@ import { fromMarkdown } from "mdast-util-from-markdown";import type { Instance, Prop } from "@webstudio-is/project-build";import { nanoid } from "nanoid";import { insertInstancesMutable } from "../tree-utils";-import { findClosestDroppableTarget } from "../instance-utils";+import {+ computeInstancesConstraints,+ findClosestDroppableTarget,+} from "../instance-utils";import {instancesStore,propsStore,@@ -202,18 +205,22 @@ export const onPaste = (clipboardData: string): boolean => {if (data === undefined || selectedPage === undefined) {return false;}+ const metas = registeredComponentMetasStore.get();+ const newInstances = new Map(+ data.instances.map((instance) => [instance.id, instance])+ );+ const rootInstanceIds = data.children+ .filter((child) => child.type === "id")+ .map((child) => child.value);// paste to the root if nothing is selectedconst instanceSelector = selectedInstanceSelectorStore.get() ?? [selectedPage.rootInstanceId,];- const dragComponents = Array.from(- new Set(data.instances.map((instance) => instance.component))- );const dropTarget = findClosestDroppableTarget(- registeredComponentMetasStore.get(),+ metas,instancesStore.get(),instanceSelector,- dragComponents+ computeInstancesConstraints(metas, newInstances, rootInstanceIds));if (dropTarget === undefined) {return false;diff --git a/apps/builder/app/shared/instance-utils.test.ts b/apps/builder/app/shared/instance-utils.test.tsindex 4dbef4b322..6a857db963 100644--- a/apps/builder/app/shared/instance-utils.test.ts+++ b/apps/builder/app/shared/instance-utils.test.ts@@ -3,9 +3,11 @@ import type { WsComponentMeta } from "@webstudio-is/react-sdk";import * as defaultMetas from "@webstudio-is/sdk-components-react/metas";import type { Instance, Instances } from "@webstudio-is/project-build";import {+ computeInstancesConstraints,findClosestDroppableComponentIndex,findClosestDroppableTarget,findClosestEditableInstanceSelector,+ type InsertConstraints,} from "./instance-utils";const defaultMetasMap = new Map(Object.entries(defaultMetas));@@ -39,6 +41,11 @@ const createInstancePair = (return [id, { type: "instance", id, component, children }];};+const emptyInsertConstraints: InsertConstraints = {+ requiredAncestors: new Set(),+ invalidAncestors: new Set(),+};+describe("find closest editable instance selector", () => {test("searches closest container", () => {const instances: Instances = new Map([@@ -105,13 +112,60 @@ describe("find closest editable instance selector", () => {});});+describe("compute instances constraints", () => {+ const base = {+ type: "container",+ label: "",+ icon: "",+ } as const;++ test("combine required ancestors excluding already resolved ones", () => {+ const metas = new Map<string, WsComponentMeta>([+ ["Button", { ...base, requiredAncestors: ["Form"] }],+ ["Checkbox", { ...base, requiredAncestors: ["Form", "Label"] }],+ ["Label", { ...base, requiredAncestors: ["Body"] }],+ ]);+ // button+ // label+ // checkbox+ const instances = new Map<Instance["id"], Instance>([+ createInstancePair("button", "Button", []),+ createInstancePair("label", "Label", [{ type: "id", value: "checkbox" }]),+ createInstancePair("checkbox", "Checkbox", []),+ ]);+ expect(+ computeInstancesConstraints(metas, instances, ["button", "label"])+ ).toEqual({+ requiredAncestors: new Set(["Body", "Form"]),+ invalidAncestors: new Set(),+ });+ });++ test("combine invalid ancestors of all instances", () => {+ const metas = new Map<string, WsComponentMeta>([+ ["Button", { ...base, invalidAncestors: ["Button"] }],+ ["Form", { ...base, invalidAncestors: ["Button", "Form"] }],+ ]);+ // form+ // button+ const instances = new Map<Instance["id"], Instance>([+ createInstancePair("form", "Form", [{ type: "id", value: "button" }]),+ createInstancePair("button", "Button", []),+ ]);+ expect(computeInstancesConstraints(metas, instances, ["form"])).toEqual({+ requiredAncestors: new Set(),+ invalidAncestors: new Set(["Button", "Form"]),+ });+ });+});+describe("find closest droppable component index", () => {test("finds container", () => {expect(findClosestDroppableComponentIndex(createFakeComponentMetas({}),["Box", "Body"],- ["Item"]+ emptyInsertConstraints)).toEqual(0);});@@ -121,29 +175,20 @@ describe("find closest droppable component index", () => {findClosestDroppableComponentIndex(createFakeComponentMetas({}),["Bold", "Italic", "Text", "Box", "Body"],- ["Item"]+ emptyInsertConstraints)).toEqual(2);});- test("can be dropped into itself", () => {+ test("considers invalid ancestors", () => {expect(findClosestDroppableComponentIndex(createFakeComponentMetas({}),["Box", "Item", "Body"],- ["Item"]- )- ).toEqual(0);- });-- test("can be forbidden to drop into itself", () => {- expect(- findClosestDroppableComponentIndex(- createFakeComponentMetas({- invalidAncestors: ["Item"],- }),- ["Box", "Item", "Body"],- ["Item"]+ {+ requiredAncestors: new Set(),+ invalidAncestors: new Set(["Item"]),+ })).toEqual(2);});@@ -151,20 +196,22 @@ describe("find closest droppable component index", () => {test("requires some ancestor", () => {expect(findClosestDroppableComponentIndex(- createFakeComponentMetas({- requiredAncestors: ["Form"],- }),+ createFakeComponentMetas({}),["Box", "Body"],- ["Item"]+ {+ requiredAncestors: new Set(["Form"]),+ invalidAncestors: new Set(),+ })).toEqual(-1);expect(findClosestDroppableComponentIndex(- createFakeComponentMetas({- requiredAncestors: ["Form"],- }),+ createFakeComponentMetas({}),["Box", "Form", "Body"],- ["Item"]+ {+ requiredAncestors: new Set(["Form"]),+ invalidAncestors: new Set(),+ })).toEqual(0);});@@ -172,56 +219,25 @@ describe("find closest droppable component index", () => {test("considers both required and invalid ancestors", () => {expect(findClosestDroppableComponentIndex(- createFakeComponentMetas({- requiredAncestors: ["Form"],- invalidAncestors: ["Box"],- }),+ createFakeComponentMetas({}),["Div", "Box", "Form", "Body"],- ["Item"]+ {+ requiredAncestors: new Set(["Form"]),+ invalidAncestors: new Set(["Box"]),+ })).toEqual(2);expect(findClosestDroppableComponentIndex(- createFakeComponentMetas({- requiredAncestors: ["Form"],- invalidAncestors: ["Box"],- }),+ createFakeComponentMetas({}),["Div", "Form", "Box", "Body"],- ["Item"]+ {+ requiredAncestors: new Set(["Form"]),+ invalidAncestors: new Set(["Box"]),+ })).toEqual(-1);});-- test("considers multiple children", () => {- expect(- findClosestDroppableComponentIndex(- createFakeComponentMetas(- {- requiredAncestors: ["Form"],- },- {- requiredAncestors: ["Box"],- }- ),- ["Div", "Form", "Body"],- ["Item", "AnotherItem"]- )- ).toEqual(0);- expect(- findClosestDroppableComponentIndex(- createFakeComponentMetas(- {- requiredAncestors: ["Form"],- },- {- requiredAncestors: ["Box"],- }- ),- ["Div", "Box", "Body"],- ["Item", "AnotherItem"]- )- ).toEqual(0);- });});describe("find closest droppable target", () => {@@ -246,7 +262,7 @@ describe("find closest droppable target", () => {defaultMetasMap,instances,["box", "body"],- ["Box"]+ emptyInsertConstraints)).toEqual({parentSelector: ["box", "body"],@@ -257,7 +273,7 @@ describe("find closest droppable target", () => {defaultMetasMap,instances,["not-existing", "body"],- ["Box"]+ emptyInsertConstraints)).toEqual(undefined);});@@ -268,7 +284,12 @@ describe("find closest droppable target", () => {createInstancePair("box", "Box", [{ type: "id", value: "paragraph" }]),]);expect(- findClosestDroppableTarget(defaultMetasMap, instances, ["body"], ["Box"])+ findClosestDroppableTarget(+ defaultMetasMap,+ instances,+ ["body"],+ emptyInsertConstraints+ )).toEqual({parentSelector: ["body"],position: "end",@@ -288,30 +309,11 @@ describe("find closest droppable target", () => {defaultMetasMap,instances,["bold", "paragraph", "body"],- ["Box"]+ emptyInsertConstraints)).toEqual({parentSelector: ["paragraph", "body"],position: 1,});});-- test("puts multiple children", () => {- const instances = new Map([- createInstancePair("body", "Body", [{ type: "id", value: "box" }]),- createInstancePair("box", "Box", [{ type: "id", value: "bold" }]),- createInstancePair("bold", "Bold", []),- ]);- expect(- findClosestDroppableTarget(- defaultMetasMap,- instances,- ["bold", "box", "body"],- ["Box", "Form"]- )- ).toEqual({- parentSelector: ["box", "body"],- position: 1,- });- });});diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex 4bca92ab2d..311ca78ac3 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -1,6 +1,7 @@import store from "immerhin";import {- Instances,+ type Instance,+ type Instances,findTreeInstanceIdsExcludingSlotDescendants,} from "@webstudio-is/project-build";import {@@ -71,26 +72,81 @@ export const findClosestEditableInstanceSelector = (}};-export const findClosestDroppableComponentIndex = (+const traverseInstancesConstraints = (metas: Map<string, WsComponentMeta>,- componentSelector: string[],- childComponents: string[]+ instances: Instances,+ instanceId: Instance["id"],+ requiredAncestors: Set<Instance["component"]>,+ invalidAncestors: Set<Instance["component"]>,+ componentSelector: string[] = []) => {- const requiredAncestors = new Set<string>();- const invalidAncestors = new Set<string>();- for (const childComponent of childComponents) {- const childMeta = metas.get(childComponent);- if (childMeta?.requiredAncestors) {- for (const ancestorComponent of childMeta.requiredAncestors) {- requiredAncestors.add(ancestorComponent);+ const instance = instances.get(instanceId);+ if (instance === undefined) {+ return;+ }+ const meta = metas.get(instance.component);+ if (meta === undefined) {+ return;+ }+ if (meta.requiredAncestors) {+ for (const requiredAncestor of meta.requiredAncestors) {+ if (componentSelector.includes(requiredAncestor) === false) {+ requiredAncestors.add(requiredAncestor);}}- if (childMeta?.invalidAncestors) {- for (const ancestorComponent of childMeta.invalidAncestors) {- invalidAncestors.add(ancestorComponent);- }+ }+ if (meta.invalidAncestors) {+ for (const invalidAncestor of meta.invalidAncestors) {+ invalidAncestors.add(invalidAncestor);+ }+ }+ for (const child of instance.children) {+ if (child.type === "id") {+ traverseInstancesConstraints(+ metas,+ instances,+ child.value,+ requiredAncestors,+ invalidAncestors,+ [instance.component, ...componentSelector]+ );}}+};++export type InsertConstraints = {+ requiredAncestors: Set<Instance["component"]>;+ invalidAncestors: Set<Instance["component"]>;+};++export const computeInstancesConstraints = (+ metas: Map<string, WsComponentMeta>,+ instances: Instances,+ rootInstanceIds: Instance["id"][]+): InsertConstraints => {+ const requiredAncestors = new Set<string>();+ const invalidAncestors = new Set<string>();+ for (const instanceId of rootInstanceIds) {+ traverseInstancesConstraints(+ metas,+ instances,+ instanceId,+ requiredAncestors,+ invalidAncestors+ );+ }+ return {+ requiredAncestors,+ invalidAncestors,+ };+};++export const findClosestDroppableComponentIndex = (+ metas: Map<string, WsComponentMeta>,+ componentSelector: string[],+ constraints: InsertConstraints+) => {+ const { requiredAncestors, invalidAncestors } = constraints;let containerIndex = -1;let requiredFound = false;@@ -120,7 +176,7 @@ export const findClosestDroppableTarget = (metas: Map<string, WsComponentMeta>,instances: Instances,instanceSelector: InstanceSelector,- dragComponents: string[]+ insertConstraints: InsertConstraints): undefined | DroppableTarget => {const componentSelector: string[] = [];for (const instanceId of instanceSelector) {@@ -134,7 +190,7 @@ export const findClosestDroppableTarget = (const droppableIndex = findClosestDroppableComponentIndex(metas,componentSelector,- dragComponents+ insertConstraints);if (droppableIndex === -1) {return;@@ -227,10 +283,7 @@ export const insertTemplateData = (selectedStyleSourceSelectorStore.set(undefined);};-export const insertNewComponentInstance = (- component: string,- dropTarget: DroppableTarget-) => {+export const getComponentTemplateData = (component: string) => {const metas = registeredComponentMetasStore.get();const componentMeta = metas.get(component);// when template not specified fallback to template with the component@@ -247,11 +300,7 @@ export const insertNewComponentInstance = (if (baseBreakpoint === undefined) {return;}- const templateData = generateDataFromEmbedTemplate(- template,- baseBreakpoint.id- );- insertTemplateData(templateData, dropTarget);+ return generateDataFromEmbedTemplate(template, baseBreakpoint.id);};export const reparentInstance = (