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
Copy data before paste (#1167)
Bogdan Chadkin37ed4b7820ec
diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.tsindex bcfe5a82f2..c4570ee4a0 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts@@ -1,15 +1,13 @@import store from "immerhin";import { z } from "zod";import {- getStyleDeclKey,- Instance,+ InstancesItem,Prop,StyleDecl,StyleSource,StyleSourceSelection,} from "@webstudio-is/project-build";import {- rootInstanceContainer,propsStore,stylesStore,selectedInstanceIdStore,@@ -17,26 +15,24 @@ import {styleSourcesStore,instancesIndexStore,instancesStore,- patchInstancesMutable,+ selectedPageStore,} from "../nano-states";import {- cloneInstance,- cloneProps,- cloneStyles,- cloneStyleSources,- cloneStyleSourceSelections,- createInstancesIndex,findClosestDroppableTarget,- findSubtree,findSubtreeLocalStyleSources,- insertInstanceMutable,+ findTreeInstances,+ insertInstancesCopyMutable,+ insertPropsCopyMutable,+ insertStylesCopyMutable,+ insertStyleSourcesCopyMutable,+ insertStyleSourceSelectionsCopyMutable,} from "../tree-utils";import { deleteInstance } from "../instance-utils";const version = "@webstudio/instance/v0.1";const InstanceData = z.object({- instance: Instance,+ instances: z.array(InstancesItem),props: z.array(Prop),styleSourceSelections: z.array(StyleSourceSelection),styleSources: z.array(StyleSource),@@ -45,51 +41,69 @@ const InstanceData = z.object({type InstanceData = z.infer<typeof InstanceData>;-const copyInstanceData = (targetInstanceId: string) => {- const rootInstance = rootInstanceContainer.get();- if (rootInstance === undefined) {- return;- }+const getTreeData = (targetInstanceId: string) => {+ const rootInstanceId = selectedPageStore.get()?.rootInstanceId;// @todo tell user they can't copy or cut root- if (targetInstanceId === rootInstance.id) {+ if (targetInstanceId === rootInstanceId) {return;}- const { targetInstance, subtreeIds } = findSubtree(- rootInstance,- targetInstanceId- );+ const instances = instancesStore.get();+ const treeInstanceIds = findTreeInstances(instances, targetInstanceId);const styleSources = styleSourcesStore.get();const styleSourceSelections = styleSourceSelectionsStore.get();const subtreeLocalStyleSourceIds = findSubtreeLocalStyleSources(- subtreeIds,+ treeInstanceIds,styleSources,styleSourceSelections);- if (targetInstance === undefined) {- return;++ // first item is guaranteed root of copied tree+ const treeInstances: InstancesItem[] = [];+ for (const instanceId of treeInstanceIds) {+ const instance = instances.get(instanceId);+ if (instance) {+ treeInstances.push(instance);+ }}- // clone all instance related data and link it with new ids- const { clonedInstance, clonedInstanceIds } = cloneInstance(targetInstance);- const clonedProps = cloneProps(propsStore.get(), clonedInstanceIds);- const { clonedStyleSources, clonedStyleSourceIds } = cloneStyleSources(- styleSources,- subtreeLocalStyleSourceIds- );- const clonedStyleSourceSelections = cloneStyleSourceSelections(- styleSourceSelections,- clonedInstanceIds,- clonedStyleSourceIds- );- const clonedStyles = cloneStyles(stylesStore.get(), clonedStyleSourceIds);+ const treeStyleSources: StyleSource[] = [];+ for (const styleSourceId of subtreeLocalStyleSourceIds) {+ const styleSource = styleSources.get(styleSourceId);+ if (styleSource) {+ treeStyleSources.push(styleSource);+ }+ }++ const props = propsStore.get();+ const treeProps: Prop[] = [];+ for (const prop of props.values()) {+ if (treeInstanceIds.has(prop.instanceId)) {+ treeProps.push(prop);+ }+ }++ const treeStyleSourceSelections: StyleSourceSelection[] = [];+ for (const styleSourceSelection of styleSourceSelections.values()) {+ if (treeInstanceIds.has(styleSourceSelection.instanceId)) {+ treeStyleSourceSelections.push(styleSourceSelection);+ }+ }++ const styles = stylesStore.get();+ const treeStyles: StyleDecl[] = [];+ for (const styleDecl of styles.values()) {+ if (subtreeLocalStyleSourceIds.has(styleDecl.styleSourceId)) {+ treeStyles.push(styleDecl);+ }+ }return {- instance: clonedInstance,- props: clonedProps,- styleSourceSelections: clonedStyleSourceSelections,- styleSources: clonedStyleSources,- styles: clonedStyles,+ instances: treeInstances,+ styleSources: treeStyleSources,+ props: treeProps,+ styleSourceSelections: treeStyleSourceSelections,+ styles: treeStyles,};};@@ -119,37 +133,38 @@ export const onPaste = (clipboardData: string) => {instancesIndexStore.get(),selectedInstanceIdStore.get());- const rootInstance = rootInstanceContainer.get();store.createTransaction([instancesStore,+ styleSourcesStore,propsStore,styleSourceSelectionsStore,- styleSourcesStore,stylesStore,],- (instances, props, styleSourceSelections, styleSources, styles) => {- const instancesIndex = createInstancesIndex(rootInstance);- insertInstanceMutable(instancesIndex, data.instance, dropTarget);- for (const prop of data.props) {- props.set(prop.id, prop);- }- for (const styleSourceSelection of data.styleSourceSelections) {- styleSourceSelections.set(- styleSourceSelection.instanceId,- styleSourceSelection- );- }- for (const styleSource of data.styleSources) {- styleSources.set(styleSource.id, styleSource);- }- for (const styleDecl of data.styles) {- styles.set(getStyleDeclKey(styleDecl), styleDecl);- }- patchInstancesMutable(rootInstance, instances);+ (instances, styleSources, props, styleSourceSelections, styles) => {+ const copiedInstanceIds = insertInstancesCopyMutable(+ instances,+ data.instances,+ dropTarget+ );+ const copiedStyleSourceIds = insertStyleSourcesCopyMutable(+ styleSources,+ data.styleSources+ );+ insertPropsCopyMutable(props, data.props, copiedInstanceIds);+ insertStyleSourceSelectionsCopyMutable(+ styleSourceSelections,+ data.styleSourceSelections,+ copiedInstanceIds,+ copiedStyleSourceIds+ );+ insertStylesCopyMutable(styles, data.styles, copiedStyleSourceIds);++ // first item is guaranteed root of copied tree+ const copiedRootInstanceId = Array.from(copiedInstanceIds.values())[0];+ selectedInstanceIdStore.set(copiedRootInstanceId);});- selectedInstanceIdStore.set(data.instance.id);};export const onCopy = () => {@@ -157,7 +172,7 @@ export const onCopy = () => {if (selectedInstanceId === undefined) {return;}- const data = copyInstanceData(selectedInstanceId);+ const data = getTreeData(selectedInstanceId);if (data === undefined) {return;}@@ -169,7 +184,7 @@ export const onCut = () => {if (selectedInstanceId === undefined) {return;}- const data = copyInstanceData(selectedInstanceId);+ const data = getTreeData(selectedInstanceId);if (data === undefined) {return;}diff --git a/apps/builder/app/shared/tree-utils.test.ts b/apps/builder/app/shared/tree-utils.test.tsindex b9c29597d0..7fb8e8f344 100644--- a/apps/builder/app/shared/tree-utils.test.ts+++ b/apps/builder/app/shared/tree-utils.test.ts@@ -10,20 +10,21 @@ import type {StyleSourceSelection,} from "@webstudio-is/project-build";import {- cloneInstance,- cloneProps,cloneStyles,- cloneStyleSources,- cloneStyleSourceSelections,createInstancesIndex,findClosestDroppableTarget,findClosestRichTextInstance,findParentInstance,- findSubtree,findSubtreeLocalStyleSources,findTreeInstances,getInstanceAncestorsAndSelf,insertInstanceMutable,+ insertInstancesCopyMutable,+ insertInstancesMutable,+ insertPropsCopyMutable,+ insertStylesCopyMutable,+ insertStyleSourcesCopyMutable,+ insertStyleSourceSelectionsCopyMutable,reparentInstanceMutable,} from "./tree-utils";@@ -42,20 +43,25 @@ const createInstance = (};};+const createInstancesItem = (+ id: Instance["id"],+ component: string,+ children: InstancesItem["children"]+): InstancesItem => {+ return {+ type: "instance",+ id,+ component,+ children,+ };+};+const createInstancePair = (id: Instance["id"],component: string,children: InstancesItem["children"]): [Instance["id"], InstancesItem] => {- return [- id,- {- type: "instance",- id,- component,- children,- },- ];+ return [id, createInstancesItem(id, component, children)];};const createProp = (id: string, instanceId: string): Prop => {@@ -209,6 +215,85 @@ test("insert instance into target", () => {);});+test("insert instances tree into target", () => {+ const instances = new Map([+ createInstancePair("root", "Body", [{ type: "id", value: "box1" }]),+ createInstancePair("box1", "Box", [+ { type: "id", value: "box11" },+ { type: "id", value: "box12" },+ { type: "id", value: "box13" },+ ]),+ createInstancePair("box11", "Box", []),+ createInstancePair("box12", "Box", []),+ createInstancePair("box13", "Box", []),+ ]);++ insertInstancesMutable(+ instances,+ [+ createInstancesItem("inserted1", "Box", [+ { type: "id", value: "inserted2" },+ ]),+ createInstancesItem("inserted2", "Box", []),+ ],+ {+ parentId: "box1",+ position: 1,+ }+ );+ expect(Array.from(instances.entries())).toEqual([+ createInstancePair("root", "Body", [{ type: "id", value: "box1" }]),+ createInstancePair("box1", "Box", [+ { type: "id", value: "box11" },+ { type: "id", value: "inserted1" },+ { type: "id", value: "box12" },+ { type: "id", value: "box13" },+ ]),+ createInstancePair("box11", "Box", []),+ createInstancePair("box12", "Box", []),+ createInstancePair("box13", "Box", []),+ createInstancePair("inserted1", "Box", [+ { type: "id", value: "inserted2" },+ ]),+ createInstancePair("inserted2", "Box", []),+ ]);++ insertInstancesMutable(+ instances,+ [+ createInstancesItem("inserted3", "Box", [+ { type: "id", value: "inserted4" },+ ]),+ createInstancesItem("inserted4", "Box", []),+ ],+ {+ parentId: "box1",+ position: "end",+ }+ );+ expect(Array.from(instances.entries())).toEqual([+ createInstancePair("root", "Body", [{ type: "id", value: "box1" }]),+ createInstancePair("box1", "Box", [+ { type: "id", value: "box11" },+ { type: "id", value: "inserted1" },+ { type: "id", value: "box12" },+ { type: "id", value: "box13" },+ { type: "id", value: "inserted3" },+ ]),+ createInstancePair("box11", "Box", []),+ createInstancePair("box12", "Box", []),+ createInstancePair("box13", "Box", []),+ createInstancePair("inserted1", "Box", [+ { type: "id", value: "inserted2" },+ ]),+ createInstancePair("inserted2", "Box", []),+ createInstancePair("inserted3", "Box", [+ { type: "id", value: "inserted4" },+ ]),+ createInstancePair("inserted4", "Box", []),+ ]);+});+test("reparent instance into target", () => {const rootInstance = createInstance("root", "Body", [createInstance("target", "Box", []),@@ -326,50 +411,6 @@ test("find closest rich text to instance", () => {);});-test("find subtree with all descendants and parent instance", () => {- const rootInstance: Instance = createInstance("root", "Box", [- createInstance("box1", "Box", []),- createInstance("box2", "Box", [- createInstance("box3", "Box", [- createInstance("child1", "Box", []),- createInstance("child2", "Box", [- createInstance("descendant", "Box", []),- ]),- createInstance("child3", "Box", []),- ]),- ]),- createInstance("box4", "Box", []),- ]);-- expect(findSubtree(rootInstance, "box3")).toEqual({- parentInstance: createInstance("box2", "Box", [- createInstance("box3", "Box", [- createInstance("child1", "Box", []),- createInstance("child2", "Box", [- createInstance("descendant", "Box", []),- ]),- createInstance("child3", "Box", []),- ]),- ]),- targetInstance: createInstance("box3", "Box", [- createInstance("child1", "Box", []),- createInstance("child2", "Box", [- createInstance("descendant", "Box", []),- ]),- createInstance("child3", "Box", []),- ]),- subtreeIds: new Set(["box3", "child1", "child2", "child3", "descendant"]),- });-- expect(findSubtree(rootInstance, "not_found")).toEqual({- parentInstance: undefined,- targetInstance: undefined,- subtreeIds: new Set(),- });-- expect(findSubtree(rootInstance, "root").parentInstance).toEqual(undefined);-});-test("find parent instance", () => {const instances: Instances = new Map([createInstancePair("1", "Body", [{ type: "id", value: "3" }]),@@ -414,68 +455,103 @@ test("find all tree instances", () => {expect(findTreeInstances(instances, "3")).toEqual(new Set(["3", "4", "5"]));});-test("clone instance tree and provide cloned ids map", () => {- const instance = createInstance("box", "Box", [- createInstance("child1", "Box", []),- createInstance("child2", "Box", [createInstance("descendant", "Box", [])]),- createInstance("child3", "Box", []),+test("insert tree of instances copy and provide map from ids map", () => {+ const instances = new Map([+ createInstancePair("1", "Body", [+ { type: "id", value: "2" },+ { type: "id", value: "3" },+ ]),+ createInstancePair("2", "Box", []),+ createInstancePair("3", "Box", [{ type: "id", value: "4" }]),+ createInstancePair("4", "Box", []),]);- const { clonedInstance, clonedInstanceIds } = cloneInstance(instance);- expect(clonedInstance).toEqual(- createInstance(expectString, "Box", [- createInstance(expectString, "Box", []),- createInstance(expectString, "Box", [- createInstance(expectString, "Box", []),- ]),- createInstance(expectString, "Box", []),- ])+ const copiedInstances = [+ createInstancesItem("2", "Box", [+ { type: "id", value: "3" },+ { type: "text", value: "text" },+ ]),+ createInstancesItem("3", "Box", []),+ ];+ const copiedInstanceIds = insertInstancesCopyMutable(+ instances,+ copiedInstances,+ {+ parentId: "3",+ position: 0,+ });- expect(clonedInstanceIds.get(instance.id)).toEqual(clonedInstance.id);- expect(clonedInstanceIds.get((instance.children[0] as Instance).id)).toEqual(- (clonedInstance.children[0] as Instance).id+ expect(Array.from(copiedInstanceIds.entries())).toEqual([+ ["2", expectString],+ ["3", expectString],+ ]);+ expect(Array.from(instances.entries())).toEqual([+ createInstancePair("1", "Body", [+ { type: "id", value: "2" },+ { type: "id", value: "3" },+ ]),+ createInstancePair("2", "Box", []),+ createInstancePair("3", "Box", [+ { type: "id", value: expectString },+ { type: "id", value: "4" },+ ]),+ createInstancePair("4", "Box", []),+ createInstancePair(expectString, "Box", [+ { type: "id", value: expectString },+ { type: "text", value: "text" },+ ]),+ createInstancePair(expectString, "Box", []),+ ]);+});++test("insert style sources copy with new ids and provide map from old ids", () => {+ const styleSources = new Map([+ ["local1", createStyleSource("local", "local1")],+ ["local2", createStyleSource("local", "local2")],+ ]);+ const copiedStyleSources = [+ createStyleSource("local", "local1"),+ createStyleSource("local", "local2"),+ ];+ const copiedStyleSourceIds = insertStyleSourcesCopyMutable(+ styleSources,+ copiedStyleSources);+ expect(Array.from(copiedStyleSourceIds.entries())).toEqual([+ ["local1", expectString],+ ["local2", expectString],+ ]);+ expect(Array.from(styleSources.entries())).toEqual([+ ["local1", createStyleSource("local", "local1")],+ ["local2", createStyleSource("local", "local2")],+ [expectString, createStyleSource("local", expectString)],+ [expectString, createStyleSource("local", expectString)],+ ]);});-test("clone props with new ids and apply new instance ids", () => {+test("insert props copy with new ids and apply new instance ids", () => {const props = new Map([["prop1", createProp("prop1", "instance1")],["prop2", createProp("prop2", "instance2")],- ["prop3", createProp("prop3", "instance1")],- ["prop4", createProp("prop4", "instance3")],- ["prop5", createProp("prop5", "instance1")],- ["prop6", createProp("prop6", "instance3")],+ ["prop3", createProp("prop3", "instance3")],]);- const clonedInstanceIds = new Map<Instance["id"], Instance["id"]>();- clonedInstanceIds.set("instance2", "newInstance2");- clonedInstanceIds.set("instance3", "newInstance3");- expect(cloneProps(props, clonedInstanceIds)).toEqual([- createProp(expectString, "newInstance2"),- createProp(expectString, "newInstance3"),- createProp(expectString, "newInstance3"),+ const copiedProps = [+ createProp("prop1", "instance1"),+ createProp("prop2", "instance2"),+ ];+ const clonedInstanceIds = new Map<Instance["id"], Instance["id"]>([+ ["instance2", "newInstance2"],]);-});--test("clone style sources with new ids within provided subset", () => {- const styleSources = new Map([- ["local1", createStyleSource("local", "local1")],- ["local2", createStyleSource("local", "local2")],- ["token3", createStyleSource("token", "token3")],- ["local4", createStyleSource("local", "local4")],+ insertPropsCopyMutable(props, copiedProps, clonedInstanceIds);+ expect(Array.from(props.entries())).toEqual([+ ["prop1", createProp("prop1", "instance1")],+ ["prop2", createProp("prop2", "instance2")],+ ["prop3", createProp("prop3", "instance3")],+ [expectString, createProp(expectString, "instance1")],+ [expectString, createProp(expectString, "newInstance2")],]);- const subsetIds = new Set<StyleSource["id"]>(["local2", "token3"]);- expect(cloneStyleSources(styleSources, subsetIds)).toEqual({- clonedStyleSources: [- createStyleSource("local", expectString),- createStyleSource("token", expectString),- ],- clonedStyleSourceIds: new Map([- ["local2", expectString],- ["token3", expectString],- ]),- });});-test("clone style source selections with applied instance ids and style source ids", () => {+test("insert style source selections copy and apply new instance ids and style source ids", () => {const styleSourceSelections = new Map([["instance1",@@ -487,27 +563,72 @@ test("clone style source selections with applied instance ids and style source i],["instance3", createStyleSourceSelection("instance3", ["local6"])],]);- const clonedStyleSourceIds = new Map<StyleSource["id"], StyleSource["id"]>([+ const copiedStyleSourceSelections = [+ createStyleSourceSelection("instance1", ["local1", "token2"]),+ createStyleSourceSelection("instance2", ["token3", "local4", "token5"]),+ ];+ const copiedStyleSourceIds = new Map<StyleSource["id"], StyleSource["id"]>([["local1", "newLocal1"],["local4", "newLocal4"],]);- const clonedInstanceIds = new Map<Instance["id"], Instance["id"]>([+ const copiedInstanceIds = new Map<Instance["id"], Instance["id"]>([["instance1", "newInstance1"],["instance2", "newInstance2"],]);- expect(- cloneStyleSourceSelections(- styleSourceSelections,- clonedInstanceIds,- clonedStyleSourceIds- )- ).toEqual([- createStyleSourceSelection("newInstance1", ["newLocal1", "token2"]),- createStyleSourceSelection("newInstance2", [- "token3",- "newLocal4",- "token5",- ]),+ insertStyleSourceSelectionsCopyMutable(+ styleSourceSelections,+ copiedStyleSourceSelections,+ copiedInstanceIds,+ copiedStyleSourceIds+ );+ expect(Array.from(styleSourceSelections.entries())).toEqual([+ [+ "instance1",+ createStyleSourceSelection("instance1", ["local1", "token2"]),+ ],+ [+ "instance2",+ createStyleSourceSelection("instance2", ["token3", "local4", "token5"]),+ ],+ ["instance3", createStyleSourceSelection("instance3", ["local6"])],+ [+ "newInstance1",+ createStyleSourceSelection("newInstance1", ["newLocal1", "token2"]),+ ],+ [+ "newInstance2",+ createStyleSourceSelection("newInstance2", [+ "token3",+ "newLocal4",+ "token5",+ ]),+ ],+ ]);+});++test("insert styles copy and apply new style source ids", () => {+ const styles: Styles = new Map([+ [`styleSource1:bp1:width`, createStyleDecl("styleSource1", "bp1")],+ [`styleSource2:bp2:width`, createStyleDecl("styleSource2", "bp2")],+ [`styleSource1:bp3:width`, createStyleDecl("styleSource1", "bp3")],+ [`styleSource3:bp4:width`, createStyleDecl("styleSource3", "bp4")],+ ]);+ const copiedStyles = [+ createStyleDecl("styleSource2", "bp2"),+ createStyleDecl("styleSource3", "bp4"),+ ];+ const copiedStyleSourceIds = new Map<StyleSource["id"], StyleSource["id"]>([+ ["styleSource2", "newStyleSource2"],+ ["styleSource3", "newStyleSource3"],+ ]);+ insertStylesCopyMutable(styles, copiedStyles, copiedStyleSourceIds);+ expect(Array.from(styles.entries())).toEqual([+ [`styleSource1:bp1:width`, createStyleDecl("styleSource1", "bp1")],+ [`styleSource2:bp2:width`, createStyleDecl("styleSource2", "bp2")],+ [`styleSource1:bp3:width`, createStyleDecl("styleSource1", "bp3")],+ [`styleSource3:bp4:width`, createStyleDecl("styleSource3", "bp4")],+ [`newStyleSource2:bp2:width`, createStyleDecl("newStyleSource2", "bp2")],+ [`newStyleSource3:bp4:width`, createStyleDecl("newStyleSource3", "bp4")],]);});diff --git a/apps/builder/app/shared/tree-utils.ts b/apps/builder/app/shared/tree-utils.tsindex 9257751f5c..ef281b273f 100644--- a/apps/builder/app/shared/tree-utils.ts+++ b/apps/builder/app/shared/tree-utils.ts@@ -1,6 +1,6 @@import { nanoid } from "nanoid";-import produce from "immer";-import type {+import {+ getStyleDeclKey,Instance,Instances,InstancesItem,@@ -191,34 +191,6 @@ export const findClosestRichTextInstance = ();};-export const findSubtree = (- rootInstance: Instance,- targetInstanceId: Instance["id"]-) => {- const instancesById = new Map<Instance["id"], Instance>();- const parentInstancesById = new Map<Instance["id"], Instance>();- const subtreeIds = new Set<Instance["id"]>();-- traverseInstances(rootInstance, (child, instance) => {- // add target instance- if (child.id === targetInstanceId) {- subtreeIds.add(child.id);- parentInstancesById.set(child.id, instance);- instancesById.set(child.id, child);- }- // add all descendants of target instance- if (subtreeIds.has(instance.id)) {- subtreeIds.add(child.id);- }- });-- return {- parentInstance: parentInstancesById.get(targetInstanceId),- targetInstance: instancesById.get(targetInstanceId),- subtreeIds,- };-};-export const findParentInstance = (instances: Instances,instanceId: Instance["id"]@@ -260,88 +232,6 @@ export const findTreeInstances = (return subtreeIds;};-export const cloneInstance = (targetInstance: Instance) => {- const clonedInstanceIds = new Map<Instance["id"], Instance["id"]>();- const clonedInstance = produce((targetInstance) => {- const newId = nanoid();- clonedInstanceIds.set(targetInstance.id, newId);- targetInstance.id = newId;- traverseInstances(targetInstance, (instance) => {- const newId = nanoid();- clonedInstanceIds.set(instance.id, newId);- instance.id = newId;- });- })(targetInstance);- return {- clonedInstanceIds,- clonedInstance,- };-};--export const cloneProps = (- props: Props,- clonedInstanceIds: Map<Instance["id"], Instance["id"]>-) => {- const clonedProps: Prop[] = [];- for (const prop of props.values()) {- const instanceId = clonedInstanceIds.get(prop.instanceId);- if (instanceId === undefined) {- continue;- }- clonedProps.push({- ...prop,- id: nanoid(),- instanceId,- });- }- return clonedProps;-};--export const cloneStyleSources = (- styleSources: StyleSources,- subsetIds: Set<StyleSource["id"]>-) => {- const clonedStyleSourceIds = new Map<Instance["id"], Instance["id"]>();- const clonedStyleSources: StyleSource[] = [];- for (const styleSource of styleSources.values()) {- if (subsetIds.has(styleSource.id) === false) {- continue;- }- const newId = nanoid();- clonedStyleSourceIds.set(styleSource.id, newId);- clonedStyleSources.push({- ...styleSource,- id: newId,- });- }- return { clonedStyleSources, clonedStyleSourceIds };-};--export const cloneStyleSourceSelections = (- styleSourceSelections: StyleSourceSelections,- clonedInstanceIds: Map<Instance["id"], Instance["id"]>,- clonedStyleSourceIds: Map<Instance["id"], Instance["id"]>-) => {- const clonedStyleSourceSelections: StyleSourceSelection[] = [];- for (const styleSourceSelection of styleSourceSelections.values()) {- const instanceId = clonedInstanceIds.get(styleSourceSelection.instanceId);- if (instanceId === undefined) {- continue;- }- // preserve style source id when not cloned- // which means it is non-local style source- const values = styleSourceSelection.values.map(- (styleSourceId) =>- clonedStyleSourceIds.get(styleSourceId) ?? styleSourceId- );- clonedStyleSourceSelections.push({- values,- instanceId,- });- }- return clonedStyleSourceSelections;-};-export const cloneStyles = (styles: Styles,clonedStyleSourceIds: Map<Instance["id"], Instance["id"]>@@ -388,3 +278,147 @@ export const findSubtreeLocalStyleSources = (return subtreeLocalStyleSourceIds;};++export const insertInstancesMutable = (+ instances: Instances,+ insertedInstances: InstancesItem[],+ dropTarget: undefined | DroppableTarget+) => {+ if (dropTarget === undefined) {+ return;+ }+ const parentInstance = instances.get(dropTarget.parentId);+ if (parentInstance === undefined) {+ return;+ }++ let treeRootInstanceId: undefined | Instance["id"] = undefined;+ for (const instance of insertedInstances) {+ if (treeRootInstanceId === undefined) {+ treeRootInstanceId = instance.id;+ }+ instances.set(instance.id, instance);+ }+ if (treeRootInstanceId === undefined) {+ return;+ }++ const { position } = dropTarget;+ const dropTargetChild: InstancesItem["children"][number] = {+ type: "id",+ value: treeRootInstanceId,+ };+ if (position === "end") {+ parentInstance.children.push(dropTargetChild);+ } else {+ parentInstance.children.splice(position, 0, dropTargetChild);+ }+};++export const insertInstancesCopyMutable = (+ instances: Instances,+ copiedInstances: InstancesItem[],+ dropTarget: undefined | DroppableTarget+) => {+ const copiedInstanceIds = new Map<Instance["id"], Instance["id"]>();+ const copiedInstancesWithNewIds: InstancesItem[] = [];+ for (const instance of copiedInstances) {+ const newInstanceId = nanoid();+ copiedInstanceIds.set(instance.id, newInstanceId);+ }++ for (const instance of copiedInstances) {+ copiedInstancesWithNewIds.push({+ ...instance,+ id: copiedInstanceIds.get(instance.id) ?? instance.id,+ children: instance.children.map((child) => {+ if (child.type === "id") {+ return {+ type: "id",+ value: copiedInstanceIds.get(child.value) ?? child.value,+ };+ }+ return child;+ }),+ });+ }++ insertInstancesMutable(instances, copiedInstancesWithNewIds, dropTarget);++ return copiedInstanceIds;+};++export const insertStyleSourcesCopyMutable = (+ styleSources: StyleSources,+ copiedStyleSources: StyleSource[]+) => {+ // store map of old ids to new ids to copy dependant data+ const copiedStyleSourceIds = new Map<StyleSource["id"], StyleSource["id"]>();+ for (const styleSource of copiedStyleSources) {+ const newStyleSourceId = nanoid();+ copiedStyleSourceIds.set(styleSource.id, newStyleSourceId);+ styleSources.set(newStyleSourceId, {+ ...styleSource,+ id: newStyleSourceId,+ });+ }+ return copiedStyleSourceIds;+};++export const insertPropsCopyMutable = (+ props: Props,+ copiedProps: Prop[],+ copiedInstanceIds: Map<Instance["id"], Instance["id"]>+) => {+ for (const prop of copiedProps) {+ const newInstanceId =+ copiedInstanceIds.get(prop.instanceId) ?? prop.instanceId;+ const newPropId = nanoid();+ props.set(newPropId, {+ ...prop,+ id: newPropId,+ instanceId: newInstanceId,+ });+ }+};++export const insertStyleSourceSelectionsCopyMutable = (+ styleSourceSelections: StyleSourceSelections,+ copiedStyleSourceSelections: StyleSourceSelection[],+ copiedInstanceIds: Map<Instance["id"], Instance["id"]>,+ copiedStyleSourceIds: Map<StyleSource["id"], StyleSource["id"]>+) => {+ for (const styleSourceSelection of copiedStyleSourceSelections) {+ // preserve ids when no new id provided+ // for example for non-local style source+ const newInstanceId =+ copiedInstanceIds.get(styleSourceSelection.instanceId) ??+ styleSourceSelection.instanceId;+ const newValues = styleSourceSelection.values.map(+ (styleSourceId) =>+ copiedStyleSourceIds.get(styleSourceId) ?? styleSourceId+ );+ styleSourceSelections.set(newInstanceId, {+ instanceId: newInstanceId,+ values: newValues,+ });+ }+};++export const insertStylesCopyMutable = (+ styles: Styles,+ copiedStyles: StyleDecl[],+ copiedStyleSourceIds: Map<StyleSource["id"], StyleSource["id"]>+) => {+ for (const styleDecl of copiedStyles) {+ // preserve ids when no new id provided+ const newStyleSourceId =+ copiedStyleSourceIds.get(styleDecl.styleSourceId) ??+ styleDecl.styleSourceId;+ const styleDeclCopy = {+ ...styleDecl,+ styleSourceId: newStyleSourceId,+ };+ styles.set(getStyleDeclKey(styleDeclCopy), styleDeclCopy);+ }+};