chore(core): improve dnd engine

alibaba · Apr 13, 2022 · 07cf5cc · 07cf5cc
1 parent 344c855
commit 07cf5cc
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/packages/core/src/models/TranslateHelper.ts b/packages/core/src/models/TranslateHelper.ts
@@ -60,21 +60,34 @@ const calcDynamicSnapLines = (translateHelper: TranslateHelper) => {
       translateHelper.cursor,
       translateHelper.dragStartCursorOffset
     )
-    const combineLines = calcClosestEdgeLines(
+    const closestLines = calcClosestEdgeLines(
       targetLines,
       cursorLines,
       TranslateHelper.threshold
     )
-    combineLines.h.forEach((line) => {
-      translateHelper.dynamicSnapLines.push(
+    const dynamicSnapLines = translateHelper.dynamicSnapLines
+    closestLines.h.forEach((line) => {
+      const gtLineIndex = dynamicSnapLines.findIndex(
+        (l) => l.direction === 'h' && l.distance != line.distance
+      )
+      if (gtLineIndex > -1) {
+        dynamicSnapLines.splice(gtLineIndex, 1)
+      }
+      dynamicSnapLines.push(
         new SnapLine(translateHelper, {
           refer,
           ...line,
         })
       )
     })
-    combineLines.v.forEach((line) => {
-      translateHelper.dynamicSnapLines.push(
+    closestLines.v.forEach((line) => {
+      const gtLineIndex = dynamicSnapLines.findIndex(
+        (l) => l.direction === 'v' && l.distance != line.distance
+      )
+      if (gtLineIndex > -1) {
+        dynamicSnapLines.splice(gtLineIndex, 1)
+      }
+      dynamicSnapLines.push(
         new SnapLine(translateHelper, {
           refer,
           ...line,
@@ -112,6 +125,15 @@ const calcRulerSnapLines = (translateHelper: TranslateHelper) => {
     }
   })
 }
+
+const calcRulerSpaceBlocks = (translateHelper: TranslateHelper) => {
+  const results: SpaceBlock[] = []
+  for (let type in translateHelper.aroundSpaceBlocks) {
+    if (translateHelper.aroundSpaceBlocks[type])
+      results.push(translateHelper.aroundSpaceBlocks[type])
+  }
+  return results
+}
 export interface ITranslateHelperProps {
   operation: Operation
 }
@@ -158,15 +180,6 @@ export class TranslateHelper {
     return lines
   }
 
-  calcRulerSpaceBlocks() {
-    const results: SpaceBlock[] = []
-    for (let type in this.aroundSpaceBlocks) {
-      if (this.aroundSpaceBlocks[type])
-        results.push(this.aroundSpaceBlocks[type])
-    }
-    return results
-  }
-
   get spaceBlocks(): SpaceBlock[] {
     const results = []
     for (let type in this.aroundSpaceBlocks) {
@@ -244,7 +257,7 @@ export class TranslateHelper {
     }
     handler(translate)
     if (snapping) {
-      this.rulerSpaceBlocks = this.calcRulerSpaceBlocks()
+      this.rulerSpaceBlocks = calcRulerSpaceBlocks(this)
     } else {
       this.rulerSpaceBlocks = []
     }

diff --git a/packages/shared/src/coordinate.ts b/packages/shared/src/coordinate.ts
@@ -450,7 +450,6 @@ export function calcClosestEdgeLines(
 ): IRectEdgeLines {
   const h: ISnapLineSegment[] = []
   const v: ISnapLineSegment[] = []
-
   target?.h?.forEach((targetLine) => {
     source?.h?.forEach((sourceLine) => {
       const distance = Math.abs(targetLine.start.y - sourceLine.start.y)