#195

eez-open · Aug 15, 2022 · 2bfa288 · 2bfa288
1 parent c572bca
commit 2bfa288
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/packages/project-editor/core/objectAdapter.ts b/packages/project-editor/core/objectAdapter.ts
@@ -1197,17 +1197,26 @@ export class TreeAdapter implements ITreeAdapter {
     }
 
     onDragStart(item: ITreeObjectAdapter, event: any) {
+        const projectEditorStore = getDocumentStore(this.rootItem.object);
+
         event.dataTransfer.effectAllowed = "copyMove";
-        setClipboardData(event, objectToClipboardData(item.object));
+        setClipboardData(
+            event,
+            objectToClipboardData(projectEditorStore, item.object)
+        );
         event.dataTransfer.setDragImage(
             DragAndDropManager.blankDragImage,
             0,
             0
         );
+
         // postpone render, otherwise we can receive onDragEnd immediatelly
-        const projectEditorStore = getDocumentStore(this.rootItem.object);
         setTimeout(() => {
-            DragAndDropManager.start(event, item.object as any, projectEditorStore);
+            DragAndDropManager.start(
+                event,
+                item.object as any,
+                projectEditorStore
+            );
         });
     }
 

diff --git a/packages/project-editor/flow/editor/ComponentsPalette.tsx b/packages/project-editor/flow/editor/ComponentsPalette.tsx
@@ -364,7 +364,10 @@ const PaletteItem = observer(
                 object.height = 0;
             }
 
-            setClipboardData(event, objectToClipboardData(object));
+            setClipboardData(
+                event,
+                objectToClipboardData(this.context, object)
+            );
 
             event.dataTransfer.effectAllowed = "copy";
 

diff --git a/packages/project-editor/store/clipboard.ts b/packages/project-editor/store/clipboard.ts
@@ -17,7 +17,6 @@ import {
     getChildOfObject,
     getClass,
     getClassInfo,
-    getDocumentStore,
     isArray,
     isObject,
     objectToJson,
@@ -28,9 +27,10 @@ import {
 
 const CLIPOARD_DATA_ID = "application/eez-studio-project-editor-data";
 
-export function cloneObjectWithNewObjIds(object: IEezObject) {
-    const projectEditorStore = getDocumentStore(object);
-
+export function cloneObjectWithNewObjIds(
+    projectEditorStore: ProjectEditorStore,
+    object: IEezObject
+) {
     const clonedObject = createObject(
         projectEditorStore,
         toJS(object) as any,
@@ -42,10 +42,13 @@ export function cloneObjectWithNewObjIds(object: IEezObject) {
     return objectToJson(clonedObject);
 }
 
-export function objectToClipboardData(object: IEezObject): string {
+export function objectToClipboardData(
+    projectEditorStore: ProjectEditorStore,
+    object: IEezObject
+): string {
     return JSON.stringify({
         objectClassName: getClass(object).name,
-        object: cloneObjectWithNewObjIds(object)
+        object: cloneObjectWithNewObjIds(projectEditorStore, object)
     });
 }
 
@@ -58,10 +61,15 @@ export function objectToClipboardDataWithoutNewObjIds(
     });
 }
 
-export function objectsToClipboardData(objects: IEezObject[]): string {
+export function objectsToClipboardData(
+    projectEditorStore: ProjectEditorStore,
+    objects: IEezObject[]
+): string {
     return JSON.stringify({
         objectClassName: getClass(objects[0]).name,
-        objects: objects.map(object => cloneObjectWithNewObjIds(object))
+        objects: objects.map(object =>
+            cloneObjectWithNewObjIds(projectEditorStore, object)
+        )
     });
 }
 

diff --git a/packages/project-editor/store/helper.ts b/packages/project-editor/store/helper.ts
@@ -719,15 +719,15 @@ export function deleteItem(object: IEezObject) {
 }
 
 export function cutItem(object: IEezObject) {
-    let clipboardText = objectToClipboardData(object);
+    let clipboardText = objectToClipboardData(getDocumentStore(object), object);
 
     deleteItems([object], () => {
         copyToClipboard(clipboardText);
     });
 }
 
 export function copyItem(object: IEezObject) {
-    copyToClipboard(objectToClipboardData(object));
+    copyToClipboard(objectToClipboardData(getDocumentStore(object), object));
 }
 
 function duplicateItem(object: IEezObject) {

diff --git a/packages/project-editor/store/index.ts b/packages/project-editor/store/index.ts
@@ -822,7 +822,7 @@ export class ProjectEditorStore {
         if (classInfo.objectsToClipboardData) {
             return classInfo.objectsToClipboardData(objects);
         }
-        return objectsToClipboardData(objects);
+        return objectsToClipboardData(this, objects);
     }
 
     setRuntimeMode(isDebuggerActive: boolean) {