fixed drag start event

ishubin · Dec 1, 2024 · 45a4c55 · 45a4c55
1 parent 3a7df46
commit 45a4c55
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/ui/components/editor/states/interact/DragItemState.js b/src/ui/components/editor/states/interact/DragItemState.js
@@ -76,11 +76,13 @@ export class DragItemState extends SubState {
      * @param {Item} item
      * @param {Number} x
      * @param {Number} y
+     * @param {UserEventBus}
      * @param {Item|undefined} componentItem
      */
-    constructor(parentState, listener, item, x, y, componentItem) {
+    constructor(parentState, listener, item, x, y, userEventBus, componentItem) {
         super(parentState, 'drag-item');
         this.listener = listener;
+        this.userEventBus = userEventBus;
         this.initialClickPoint = {x, y};
         this.originalItemPosition = {x: item.area.x, y: item.area.y};
         this.item = item;
@@ -104,11 +106,11 @@ export class DragItemState extends SubState {
         this.looper.stop();
     }
 
-    emit(element, eventName, ...args) {
+    emit(item, eventName, ...args) {
         if (this.componentItem) {
             this.componentItem.meta.componentUserEventBus.emitItemEvent(this.item.id, eventName, ...args);
         } else {
-            this.parentState.emit(element, eventName, ...args);
+            this.userEventBus.emitItemEvent(item.id, eventName, ...args);
         }
     }
 

diff --git a/src/ui/components/editor/states/interact/IdleInteractState.js b/src/ui/components/editor/states/interact/IdleInteractState.js
@@ -59,13 +59,13 @@ export class IdleInteractState extends SubState {
         this.initialClickPoint = {x: mx, y: my};
         if (!isEventMiddleClick(event) && object && object.type === 'item') {
             if (object.item.behavior.dragging !== 'none') {
-                this.migrateSubState(new DragItemState(this, this.listener, object.item, x, y, componentItem));
+                this.migrateSubState(new DragItemState(this, this.listener, object.item, x, y, this.userEventBus, componentItem));
                 return;
             } else if (object.item.meta.ancestorDraggableId) {
                 const schemeContainer = componentItem ? componentItem.meta.componentSchemeContainer : this.schemeContainer;
                 const ancestorItem =  schemeContainer.findItemById(object.item.meta.ancestorDraggableId);
                 if (ancestorItem) {
-                    this.migrateSubState(new DragItemState(this, this.listener, ancestorItem, x, y, componentItem));
+                    this.migrateSubState(new DragItemState(this, this.listener, ancestorItem, x, y, this.userEventBus, componentItem));
                     return;
                 }
             }
@@ -254,7 +254,7 @@ export class IdleInteractState extends SubState {
         if (componentItem && componentItem.meta.componentUserEventBus && item && item.id) {
             componentItem.meta.componentUserEventBus.emitItemEvent(item.id, eventName, ...args);
         } else {
-            this.parentState.emit(item, eventName, ...args);
+            this.userEventBus.emitItemEvent(item.id, eventName, ...args);
         }
     }