From ad339b15395405ff7aa230f180914b586540b23c Mon Sep 17 00:00:00 2001
From: Carlos <info@itscarlosrufo.com>
Date: Mon, 24 Mar 2025 18:18:12 -0700
Subject: [PATCH] refactor: update drag event properties to include origin
 component and remove last matched component

---
 .../core/src/commands/view/ComponentDrag.ts    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/core/src/commands/view/ComponentDrag.ts b/packages/core/src/commands/view/ComponentDrag.ts
index fd4b8f375..a26ce817f 100644
--- a/packages/core/src/commands/view/ComponentDrag.ts
+++ b/packages/core/src/commands/view/ComponentDrag.ts
@@ -39,9 +39,10 @@ type Opts = {
 // TODO: should we export this type? and if so, we should create 1 type for every event?
 export type DragEventProps = {
   coords?: { x: number; y: number };
+  originComponent?: Component;
+  originComponentView?: ComponentView;
   matchedComponent?: Component;
   matchedComponentView?: ComponentView;
-  lastMatchedComponent?: Component;
   // TODO: draft
   elGuideInfo?: HTMLElement;
   elGuideInfoCnt?: HTMLElement;
@@ -87,7 +88,6 @@ export default {
     this.guidesContainer = this.getGuidesContainer();
     this.guidesTarget = this.getGuidesTarget();
     this.guidesStatic = this.getGuidesStatic();
-    this.lastMatchedComponent = null;
     let drg = this.dragger;
 
     if (!drg) {
@@ -395,13 +395,14 @@ export default {
       });
     }
 
-    const dragStartProps: DragEventProps = { matchedComponent: target };
+    const dragStartProps: DragEventProps = { originComponent: target, originComponentView: getComponentView(target) };
 
+    // TODO: send the guides
     this.editor.trigger(`${evName}:drag:start`, dragStartProps);
   },
 
   onDrag(mouseEvent: MouseEvent, _dragger: Dragger) {
-    const { guidesTarget, lastMatchedComponent, opts } = this;
+    const { guidesTarget, opts } = this;
     let guideNearElements = [];
 
     this.updateGuides(guidesTarget);
@@ -418,34 +419,31 @@ export default {
     if (matched?.origin) {
       matchedComponent = matched.origin;
       matchedComponentView = getComponentView(matchedComponent);
-      if (matchedComponent !== lastMatchedComponent) this.lastMatchedComponent = matchedComponent;
     }
 
     const dragMoveProps: DragEventProps = {
       coords: { x, y },
       matchedComponent,
       matchedComponentView,
-      lastMatchedComponent,
       elGuideInfo,
       elGuideInfoCnt,
       size,
       sizePercent,
     };
 
+    // TODO: send the matched guides
     this.editor.trigger(`${evName}:drag:move`, dragMoveProps);
   },
 
   onEnd(ev: Event, _dragger: Dragger, opt = {}) {
-    const { editor, opts, id, lastMatchedComponent } = this;
+    const { editor, opts, id } = this;
     opts?.onEnd?.(ev, opt, { event: ev, ...opt, ...this._getDragData() });
     editor.stopCommand(id);
     this.hideGuidesInfo();
 
     this.em.trigger(`${evName}:end`, this.getEventOpts());
 
-    const dragEndProps: DragEventProps = { lastMatchedComponent };
-
-    this.em.trigger(`${evName}:drag:end`, dragEndProps);
+    this.em.trigger(`${evName}:drag:end`, undefined);
   },
 
   hideGuidesInfo() {