From fa5cf064310f080751a4e1b7c1420fdaf3a6208a Mon Sep 17 00:00:00 2001
From: mathuo <6710312+mathuo@users.noreply.github.com>
Date: Sun, 12 Feb 2023 21:11:51 +0700
Subject: [PATCH] refactor: clean dnd logic

---
 packages/dockview/src/dnd/dnd.ts          |  2 +-
 packages/dockview/src/dnd/droptarget.scss | 16 -----------
 packages/dockview/src/dnd/droptarget.ts   | 33 +++++++++++++----------
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/packages/dockview/src/dnd/dnd.ts b/packages/dockview/src/dnd/dnd.ts
index e2a6190ba..10df4bdf7 100644
--- a/packages/dockview/src/dnd/dnd.ts
+++ b/packages/dockview/src/dnd/dnd.ts
@@ -10,7 +10,7 @@ export interface IDragAndDropObserverCallbacks {
 }
 
 export class DragAndDropObserver extends CompositeDisposable {
-    private target: any;
+    private target: EventTarget | null = null;
 
     constructor(
         private element: HTMLElement,
diff --git a/packages/dockview/src/dnd/droptarget.scss b/packages/dockview/src/dnd/droptarget.scss
index db835abee..fbb800615 100644
--- a/packages/dockview/src/dnd/droptarget.scss
+++ b/packages/dockview/src/dnd/droptarget.scss
@@ -19,22 +19,6 @@
             will-change: transform;
             pointer-events: none;
 
-            &.left {
-              transform: translateX(-35%) scaleX(0.3)
-            }
-
-            &.right {
-              transform: translateX(25%) scaleX(0.5)
-            }
-
-            &.top {
-              transform: translateY(-25%) scaleY(0.5);
-            }
-
-            &.bottom {
-              transform: translateY(25%) scaleY(0.5);
-            }
-
             &.small-top {
                 border-top: 1px solid var(--dv-drag-over-border-color);
             }
diff --git a/packages/dockview/src/dnd/droptarget.ts b/packages/dockview/src/dnd/droptarget.ts
index ea10e543b..cbb4b699e 100644
--- a/packages/dockview/src/dnd/droptarget.ts
+++ b/packages/dockview/src/dnd/droptarget.ts
@@ -82,6 +82,11 @@ export class Droptarget extends CompositeDisposable {
     ) {
         super();
 
+        // use a set to take advantage of #<set>.has
+        const acceptedTargetZonesSet = new Set(
+            this.options.acceptedTargetZones
+        );
+
         this.addDisposables(
             this._onDrop,
             new DragAndDropObserver(this.element, {
@@ -101,7 +106,7 @@ export class Droptarget extends CompositeDisposable {
                     const y = e.clientY - rect.top;
 
                     const quadrant = this.calculateQuadrant(
-                        this.options.acceptedTargetZones,
+                        acceptedTargetZonesSet,
                         x,
                         y,
                         width,
@@ -258,7 +263,7 @@ export class Droptarget extends CompositeDisposable {
     }
 
     private calculateQuadrant(
-        overlayType: DropTargetDirections[],
+        overlayType: Set<DropTargetDirections>,
         x: number,
         y: number,
         width: number,
@@ -306,7 +311,7 @@ export class Droptarget extends CompositeDisposable {
 }
 
 function calculateQuadrant_Percentage(
-    overlayType: DropTargetDirections[],
+    overlayType: Set<DropTargetDirections>,
     x: number,
     y: number,
     width: number,
@@ -316,20 +321,20 @@ function calculateQuadrant_Percentage(
     const xp = (100 * x) / width;
     const yp = (100 * y) / height;
 
-    if (overlayType.includes('left') && xp < threshold) {
+    if (overlayType.has('left') && xp < threshold) {
         return 'left';
     }
-    if (overlayType.includes('right') && xp > 100 - threshold) {
+    if (overlayType.has('right') && xp > 100 - threshold) {
         return 'right';
     }
-    if (overlayType.includes('top') && yp < threshold) {
+    if (overlayType.has('top') && yp < threshold) {
         return 'top';
     }
-    if (overlayType.includes('bottom') && yp > 100 - threshold) {
+    if (overlayType.has('bottom') && yp > 100 - threshold) {
         return 'bottom';
     }
 
-    if (!overlayType.includes('center')) {
+    if (!overlayType.has('center')) {
         return undefined;
     }
 
@@ -337,27 +342,27 @@ function calculateQuadrant_Percentage(
 }
 
 function calculateQuadrant_Pixels(
-    overlayType: DropTargetDirections[],
+    overlayType: Set<DropTargetDirections>,
     x: number,
     y: number,
     width: number,
     height: number,
     threshold: number
 ): Quadrant | null | undefined {
-    if (overlayType.includes('left') && x < threshold) {
+    if (overlayType.has('left') && x < threshold) {
         return 'left';
     }
-    if (overlayType.includes('right') && x > width - threshold) {
+    if (overlayType.has('right') && x > width - threshold) {
         return 'right';
     }
-    if (overlayType.includes('top') && y < threshold) {
+    if (overlayType.has('top') && y < threshold) {
         return 'top';
     }
-    if (overlayType.includes('right') && y > height - threshold) {
+    if (overlayType.has('right') && y > height - threshold) {
         return 'bottom';
     }
 
-    if (!overlayType.includes('center')) {
+    if (!overlayType.has('center')) {
         return undefined;
     }