From 53fdee374c179a537f869e4c799275beece273dc Mon Sep 17 00:00:00 2001
From: Carlos <info@itscarlosrufo.com>
Date: Wed, 9 Apr 2025 17:57:08 +0800
Subject: [PATCH] fix: improve drag event handling by ensuring target and event
 are correctly set for move command

---
 packages/core/src/commands/index.ts                 | 11 -----------
 packages/core/src/dom_components/model/Component.ts | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts
index 290bd4edd..2ac6b4673 100644
--- a/packages/core/src/commands/index.ts
+++ b/packages/core/src/commands/index.ts
@@ -164,17 +164,6 @@ export default class CommandsModule extends Module<CommandsConfig & { pStylePref
         const onEnd = getOnComponentDragEnd(em, targets, { altMode });
 
         if (altMode) {
-          // Create the event if none is provided
-          // TODO: Check why this logic is needed with the toolbar move button in absolute mode (in not absolute mode it isn't needed)
-          if (!event) {
-            const rect = target.view?.el.getBoundingClientRect();
-
-            const clientX = rect ? rect.left + rect.width / 2 : 0;
-            const clientY = rect ? rect.top + rect.height / 2 : 0;
-
-            event = { type: 'manual', clientX, clientY };
-          }
-
           dragger = ed.runCommand('core:component-drag', {
             guidesInfo: 1,
             mode,
diff --git a/packages/core/src/dom_components/model/Component.ts b/packages/core/src/dom_components/model/Component.ts
index c9f0cbf26..ae311f22b 100644
--- a/packages/core/src/dom_components/model/Component.ts
+++ b/packages/core/src/dom_components/model/Component.ts
@@ -1146,7 +1146,18 @@ export default class Component extends StyleableModel<ComponentProperties> {
         tb.push({
           attributes: { class: `${ppfx}no-touch-actions`, draggable: true },
           label: em.getIcon('move'),
-          command: 'tlb-move',
+          command: (ed) => {
+            // tld-move event needs to be called with a target and a drag event
+            const target = ed.getSelected();
+            const rect = target?.view?.el.getBoundingClientRect();
+            const clientX = rect ? rect.left + rect.width / 2 : 0;
+            const clientY = rect ? rect.top + rect.height / 2 : 0;
+
+            ed.runCommand('tlb-move', {
+              target,
+              event: new DragEvent('dragstart', { clientX, clientY }),
+            });
+          },
         });
       model.get('copyable') &&
         tb.push({