Remove Position none

mbraak · Dec 26, 2024 · 264d47c · 264d47c
1 parent b011d0f
commit 264d47c
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 32 deletions.
diff --git a/src/dragAndDropHandler/generateHitAreas.ts b/src/dragAndDropHandler/generateHitAreas.ts
@@ -5,7 +5,7 @@ import { HitArea } from "./types";
 
 interface HitPosition {
     node: Node;
-    position: Position;
+    position: null | Position;
     top: number;
 }
 
@@ -16,7 +16,11 @@ export const generateHitPositions = (
     const hitPositions: HitPosition[] = [];
     let lastTop = 0;
 
-    const addHitPosition = (node: Node, position: Position, top: number) => {
+    const addHitPosition = (
+        node: Node,
+        position: null | Position,
+        top: number,
+    ) => {
         hitPositions.push({
             node,
             position,
@@ -28,7 +32,7 @@ export const generateHitPositions = (
     const handleAfterOpenFolder = (node: Node, nextNode: Node | null) => {
         if (node === currentNode || nextNode === currentNode) {
             // Cannot move before or after current item
-            addHitPosition(node, "none", lastTop);
+            addHitPosition(node, null, lastTop);
         } else {
             addHitPosition(node, "after", lastTop);
         }
@@ -43,7 +47,7 @@ export const generateHitPositions = (
 
         if (node === currentNode) {
             // Cannot move after current item
-            addHitPosition(node, "none", top);
+            addHitPosition(node, null, top);
         } else {
             addHitPosition(node, "inside", top);
 
@@ -69,14 +73,14 @@ export const generateHitPositions = (
 
         if (node === currentNode) {
             // Cannot move inside current item
-            addHitPosition(node, "none", top);
+            addHitPosition(node, null, top);
         } else {
             addHitPosition(node, "inside", top);
         }
 
         if (nextNode === currentNode || node === currentNode) {
             // Cannot move before or after current item
-            addHitPosition(node, "none", top);
+            addHitPosition(node, null, top);
         } else {
             addHitPosition(node, "after", top);
         }
@@ -89,11 +93,11 @@ export const generateHitPositions = (
             // Dnd over the current element is not possible: add a position with type None for the top and the bottom.
             const top = getOffsetTop(element);
             const height = element.clientHeight;
-            addHitPosition(node, "none", top);
+            addHitPosition(node, null, top);
 
             if (height > 5) {
                 // Subtract 5 pixels to allow more space for the next element.
-                addHitPosition(node, "none", top + height - 5);
+                addHitPosition(node, null, top + height - 5);
             }
 
             // Stop iterating
@@ -135,7 +139,7 @@ export const generateHitAreasForGroup = (
     for (let i = 0; i < positionCount; i++) {
         const position = positionsInGroup[i] as HitPosition;
 
-        if (position.position !== "none") {
+        if (position.position) {
             hitAreas.push({
                 bottom: areaTop + areaHeight,
                 node: position.node,

diff --git a/src/dragAndDropHandler/index.ts b/src/dragAndDropHandler/index.ts
@@ -319,8 +319,7 @@ export class DragAndDropHandler {
     private moveItem(positionInfo: PositionInfo): void {
         if (
             this.currentItem &&
-            this.hoveredArea &&
-            this.hoveredArea.position !== "none" &&
+            this.hoveredArea?.position &&
             this.canMoveToArea(this.hoveredArea, this.currentItem)
         ) {
             const movedNode = this.currentItem.node;

diff --git a/src/node.ts b/src/node.ts
@@ -1,6 +1,6 @@
 import { isNodeRecordWithChildren } from "./nodeUtils";
 
-export type Position = "after" | "before" | "inside" | "none";
+export type Position = "after" | "before" | "inside";
 
 type IterateCallback = (node: Node, level: number) => boolean;
 
@@ -542,9 +542,6 @@ export class Node implements INode {
                     targetNode.addChildAtPosition(movedNode, 0);
                     return true;
                 }
-
-                default:
-                    return false;
             }
         }
     }

diff --git a/src/test/dragAndDropHandler/generateHitAreas.test.ts b/src/test/dragAndDropHandler/generateHitAreas.test.ts
@@ -49,7 +49,7 @@ describe("generateHitAreasForGroup", () => {
         const node = new Node(null);
         const hitPosition = {
             node,
-            position: "none" as Position,
+            position: null,
             top: 0,
         };
 
@@ -203,12 +203,12 @@ describe("generatePositions", () => {
         expect(generateHitPositions(tree, node1)).toEqual([
             expect.objectContaining({
                 node: node1,
-                position: "none",
+                position: null,
                 top: 100,
             }),
             expect.objectContaining({
                 node: node1,
-                position: "none",
+                position: null,
                 top: 100,
             }),
             expect.objectContaining({
@@ -243,12 +243,12 @@ describe("generatePositions", () => {
         expect(generateHitPositions(tree, node1)).toEqual([
             expect.objectContaining({
                 node: node1,
-                position: "none",
+                position: null,
                 top: 100,
             }),
             expect.objectContaining({
                 node: node1,
-                position: "none",
+                position: null,
                 top: 100,
             }),
             expect.objectContaining({
@@ -303,17 +303,17 @@ describe("generatePositions", () => {
             }),
             expect.objectContaining({
                 node: node1,
-                position: "none",
+                position: null,
                 top: 100,
             }),
             expect.objectContaining({
                 node: node2,
-                position: "none",
+                position: null,
                 top: 120,
             }),
             expect.objectContaining({
                 node: node2,
-                position: "none",
+                position: null,
                 top: 135,
             }),
         ]);

diff --git a/src/test/node.test.ts b/src/test/node.test.ts
@@ -1273,14 +1273,6 @@ describe("moveNode", () => {
             });
         });
     });
-
-    context("with position None", () => {
-        it("returns false", () => {
-            expect(given.tree.moveNode(given.child2, given.node2, "none")).toBe(
-                false,
-            );
-        });
-    });
 });
 
 describe("prepend", () => {

diff --git a/src/tree.jquery.d.ts b/src/tree.jquery.d.ts
@@ -92,7 +92,7 @@ interface IJQTreePlugin {
         behavior: "moveNode",
         node: INode,
         targetNode: INode,
-        position: "after" | "before" | "inside" | "none",
+        position: "after" | "before" | "inside",
     ): JQuery;
     (behavior: "moveUp"): JQuery;
     (behavior: "openNode", node: INode): JQuery;