work for the surveyjs/survey-creator#5740

surveyjs · Aug 5, 2024 · 021e548 · 021e548
1 parent 0296410
commit 021e548
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/dragdrop/core.ts b/src/dragdrop/core.ts
@@ -63,6 +63,8 @@ export abstract class DragDropCore<T> implements IDragDropEngine {
       event
     );
     this.onStartDrag(event);
+    const fromElement = this.draggedElement.parent;
+    this.onDragStart.fire(this, { fromElement: fromElement, draggedElement: this.draggedElement });
   }
 
   protected onStartDrag(event?: PointerEvent): void {
@@ -230,7 +232,6 @@ export abstract class DragDropCore<T> implements IDragDropEngine {
   public drop(): void {
     if (this.allowDropHere) {
       const fromElement = this.draggedElement.parent;
-      this.onDragStart.fire(this, { fromElement: fromElement, draggedElement: this.draggedElement });
       const newElement = this.doDrop();
       this.onDragEnd.fire(this, { fromElement: fromElement, draggedElement: newElement, toElement: this.dropTarget });
     }

diff --git a/tests/dragdrophelpertests.ts b/tests/dragdrophelpertests.ts
@@ -144,12 +144,14 @@ QUnit.test("choices: onDragStart and onDragEnd events", function (assert) {
   ddHelper.parentElement = question;
   ddHelper.draggedElement = question.choices[2];
 
+  ddHelper["createDraggedElementShortcut"] = ()=>{};
+  ddHelper.dragInit(null, ddHelper.draggedElement, ddHelper.parentElement, document.createElement("div"));
+  assert.equal(beforeCount, 1);
+  ddHelper["allowDropHere"] = true;
   ddHelper["domAdapter"]["draggedElementShortcut"] = document.body.appendChild(
     document.createElement("div")
   );
-  ddHelper["allowDropHere"] = true;
   ddHelper["drop"]();
-  assert.equal(beforeCount, 1);
   assert.equal(afterCount, 1);
   assert.equal(draggedElementParent.name, "q");
 });