Remove container argument from startSort

GrapesJS · Sep 19, 2024 · 88d91c9 · 88d91c9
1 parent f2ed0b1
commit 88d91c9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/packages/core/src/commands/view/SelectPosition.ts b/packages/core/src/commands/view/SelectPosition.ts
@@ -38,7 +38,7 @@ export default {
       });
 
     if (opts.onStart) this.sorter.onStart = opts.onStart;
-    trg && this.sorter.startSort(trg, { container });
+    trg && this.sorter.startSort(trg);
   },
 
   /**

diff --git a/packages/core/src/utils/Droppable.ts b/packages/core/src/utils/Droppable.ts
@@ -194,7 +194,7 @@ export default class Droppable {
         }
       })
       let dropModel = this.getTempDropModel(content);
-      sorter.startSort(dropModel.view?.el, { container: this.el });
+      sorter.startSort(dropModel.view?.el);
       this.sorter = sorter;
       dragStop = () => {
         sorter.endMove();

diff --git a/packages/core/src/utils/sorter/Sorter.ts b/packages/core/src/utils/sorter/Sorter.ts
@@ -105,11 +105,8 @@ export default class Sorter<T>{
    * Picking component to move
    * @param {HTMLElement} sourceElement
    * */
-  startSort(sourceElement?: HTMLElement, options: { container?: HTMLElement } = {}) {
-    // Check if the start element is a valid one, if not, try the closest valid one
-    if (sourceElement && !matches(sourceElement, `${this.containerContext.itemSel}, ${this.containerContext.containerSel}`)) {
-      sourceElement = closest(sourceElement, this.containerContext.itemSel)!;
-    }
+  startSort(sourceElement?: HTMLElement) {
+    sourceElement = this.findValidSourceElement(sourceElement);
 
     const sourceModel = $(sourceElement).data("model");
     const sourceNode = new this.treeClass(sourceModel);
@@ -119,9 +116,22 @@ export default class Sorter<T>{
     this.dropLocationDeterminer.startSort(sourceNode);
     this.bindDragEventHandlers(docs);
 
-    if (this.eventHandlers && isFunction(this.eventHandlers.onStartSort)) {
-      this.eventHandlers.onStartSort(this.sourceNode!, this.containerContext.container)
+    this.eventHandlers?.onStartSort?.(this.sourceNode, this.containerContext.container);
+    this.em.trigger('sorter:drag:start', sourceElement, sourceModel);
+  }
+
+  /**
+   * Finds the closest valid source element within the container context.
+  
+   * @param sourceElement - The initial source element to check.
+   * @returns The closest valid source element, or null if none is found.
+   */
+  private findValidSourceElement(sourceElement?: HTMLElement): HTMLElement | undefined {
+    if (sourceElement && !matches(sourceElement, `${this.containerContext.itemSel}, ${this.containerContext.containerSel}`)) {
+      sourceElement = closest(sourceElement, this.containerContext.itemSel)!;
     }
+
+    return sourceElement;
   }
 
   private bindDragEventHandlers(docs: Document[]) {

diff --git a/packages/core/src/utils/sorter/SorterUtils.ts b/packages/core/src/utils/sorter/SorterUtils.ts
@@ -307,6 +307,7 @@ export function getMergedOptions<T>(sorterOptions: RequiredEmAndTreeClassPartial
       ignoreViewChildren: false,
       selectOnEnd: true,
     },
+    eventHandlers: {}
   };
 
   const mergedOptions: Omit<SorterOptions<T>, 'em' | 'treeClass'> = {