react-arborist - npm Package Compare versions

Comparing version 3.3.2-0 to 3.4.0

dist/main/dnd/compute-drop.d.ts

@@ -34,5 +34,4 @@ import { XYCoord } from "react-dnd";
  * This is the most complex, tricky function in the whole repo.
- * It could be simplified and made more understandable.
  */
 export declare function computeDrop(args: Args): ComputedDrop;
 export {};

dist/main/dnd/compute-drop.js

@@ -44,19 +44,2 @@ "use strict";
 }
-function getDropLevel(hovering, aboveCursor, belowCursor, indent) {
-    const hoverLevel = Math.round(Math.max(0, hovering.x - indent) / indent);
-    let min, max;
-    if (!aboveCursor) {
-        max = 0;
-        min = 0;
-    }
-    else if (!belowCursor) {
-        max = aboveCursor.level;
-        min = 0;
-    }
-    else {
-        max = aboveCursor.level;
-        min = belowCursor.level;
-    }
-    return (0, utils_1.bound)(hoverLevel, min, max);
-}
 function dropAt(parentId, index) {
@@ -95,3 +78,2 @@ return { parentId: parentId || null, index };
  * This is the most complex, tricky function in the whole repo.
- * It could be simplified and made more understandable.
  */
@@ -101,2 +83,4 @@ function computeDrop(args) {
     const hover = measureHover(args.element, args.offset);
+    const indent = args.indent;
+    const hoverLevel = Math.round(Math.max(0, hover.x - indent) / indent);
     const { node, nextNode, prevNode } = args;
@@ -111,3 +95,7 @@ const [above, below] = getNodesAroundCursor(node, prevNode, nextNode, hover);
     }
-    /* At the top of the list */
+    /*
+     * Now we only need to care about the node above the cursor
+     * -----------                            -------
+     */
+    /* There is no node above the cursor line */
     if (!above) {
@@ -119,5 +107,5 @@ return {
     }
-    /* The above node is an item or a closed folder */
-    if ((0, utils_1.isItem)(above) || (0, utils_1.isClosed)(above)) {
-        const level = getDropLevel(hover, above, below, args.indent);
+    /* The node above the cursor line is an item */
+    if ((0, utils_1.isItem)(above)) {
+        const level = (0, utils_1.bound)(hoverLevel, (below === null || below === void 0 ? void 0 : below.level) || 0, above.level);
         return {
@@ -128,3 +116,29 @@ drop: walkUpFrom(above, level),
     }
-    /* The above node is an open folder */
+    /* The node above the cursor line is a closed folder */
+    if ((0, utils_1.isClosed)(above)) {
+        const level = (0, utils_1.bound)(hoverLevel, (below === null || below === void 0 ? void 0 : below.level) || 0, above.level);
+        return {
+            drop: walkUpFrom(above, level),
+            cursor: lineCursor(above.rowIndex + 1, level),
+        };
+    }
+    /* The node above the cursor line is an open folder with no children */
+    if ((0, utils_1.isOpenWithEmptyChildren)(above)) {
+        const level = (0, utils_1.bound)(hoverLevel, 0, above.level + 1);
+        if (level > above.level) {
+            /* Will be the first child of the empty folder */
+            return {
+                drop: dropAt(above.id, 0),
+                cursor: lineCursor(above.rowIndex + 1, level),
+            };
+        }
+        else {
+            /* Will be a sibling or grandsibling of the empty folder */
+            return {
+                drop: walkUpFrom(above, level),
+                cursor: lineCursor(above.rowIndex + 1, level),
+            };
+        }
+    }
+    /* The node above the cursor is a an open folder with children */
     return {
@@ -131,0 +145,0 @@ drop: dropAt(above === null || above === void 0 ? void 0 : above.id, 0),

dist/main/utils.d.ts

@@ -7,2 +7,3 @@ import { NodeApi } from "./interfaces/node-api";
 export declare function isClosed(node: NodeApi<any> | null): boolean | null;
+export declare function isOpenWithEmptyChildren(node: NodeApi<any> | null): boolean | null;
 /**
@@ -9,0 +10,0 @@ * Is first param a descendant of the second param

dist/main/utils.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInsertParentId = exports.getInsertIndex = exports.waitFor = exports.safeRun = exports.mergeRefs = exports.identify = exports.identifyNull = exports.access = exports.focusPrevElement = exports.focusNextElement = exports.walk = exports.dfs = exports.noop = exports.indexOf = exports.isDescendant = exports.isClosed = exports.isItem = exports.bound = void 0;
+exports.getInsertParentId = exports.getInsertIndex = exports.waitFor = exports.safeRun = exports.mergeRefs = exports.identify = exports.identifyNull = exports.access = exports.focusPrevElement = exports.focusNextElement = exports.walk = exports.dfs = exports.noop = exports.indexOf = exports.isDescendant = exports.isOpenWithEmptyChildren = exports.isClosed = exports.isItem = exports.bound = void 0;
 function bound(n, min, max) {
@@ -16,2 +16,7 @@ return Math.max(Math.min(n, max), min);
 exports.isClosed = isClosed;
+function isOpenWithEmptyChildren(node) {
+    var _a;
+    return node && node.isOpen && !((_a = node.children) === null || _a === void 0 ? void 0 : _a.length);
+}
+exports.isOpenWithEmptyChildren = isOpenWithEmptyChildren;
 /**
@@ -18,0 +23,0 @@ * Is first param a descendant of the second param

dist/module/dnd/compute-drop.d.ts

@@ -34,5 +34,4 @@ import { XYCoord } from "react-dnd";
  * This is the most complex, tricky function in the whole repo.
- * It could be simplified and made more understandable.
  */
 export declare function computeDrop(args: Args): ComputedDrop;
 export {};

dist/module/dnd/compute-drop.js

@@ -1,2 +0,2 @@
-import { bound, indexOf, isClosed, isItem } from "../utils";
+import { bound, indexOf, isClosed, isItem, isOpenWithEmptyChildren, } from "../utils";
 function measureHover(el, offset) {
@@ -41,19 +41,2 @@ const rect = el.getBoundingClientRect();
 }
-function getDropLevel(hovering, aboveCursor, belowCursor, indent) {
-    const hoverLevel = Math.round(Math.max(0, hovering.x - indent) / indent);
-    let min, max;
-    if (!aboveCursor) {
-        max = 0;
-        min = 0;
-    }
-    else if (!belowCursor) {
-        max = aboveCursor.level;
-        min = 0;
-    }
-    else {
-        max = aboveCursor.level;
-        min = belowCursor.level;
-    }
-    return bound(hoverLevel, min, max);
-}
 function dropAt(parentId, index) {
@@ -92,3 +75,2 @@ return { parentId: parentId || null, index };
  * This is the most complex, tricky function in the whole repo.
- * It could be simplified and made more understandable.
  */
@@ -98,2 +80,4 @@ export function computeDrop(args) {
     const hover = measureHover(args.element, args.offset);
+    const indent = args.indent;
+    const hoverLevel = Math.round(Math.max(0, hover.x - indent) / indent);
     const { node, nextNode, prevNode } = args;
@@ -108,3 +92,7 @@ const [above, below] = getNodesAroundCursor(node, prevNode, nextNode, hover);
     }
-    /* At the top of the list */
+    /*
+     * Now we only need to care about the node above the cursor
+     * -----------                            -------
+     */
+    /* There is no node above the cursor line */
     if (!above) {
@@ -116,5 +104,5 @@ return {
     }
-    /* The above node is an item or a closed folder */
-    if (isItem(above) || isClosed(above)) {
-        const level = getDropLevel(hover, above, below, args.indent);
+    /* The node above the cursor line is an item */
+    if (isItem(above)) {
+        const level = bound(hoverLevel, (below === null || below === void 0 ? void 0 : below.level) || 0, above.level);
         return {
@@ -125,3 +113,29 @@ drop: walkUpFrom(above, level),
     }
-    /* The above node is an open folder */
+    /* The node above the cursor line is a closed folder */
+    if (isClosed(above)) {
+        const level = bound(hoverLevel, (below === null || below === void 0 ? void 0 : below.level) || 0, above.level);
+        return {
+            drop: walkUpFrom(above, level),
+            cursor: lineCursor(above.rowIndex + 1, level),
+        };
+    }
+    /* The node above the cursor line is an open folder with no children */
+    if (isOpenWithEmptyChildren(above)) {
+        const level = bound(hoverLevel, 0, above.level + 1);
+        if (level > above.level) {
+            /* Will be the first child of the empty folder */
+            return {
+                drop: dropAt(above.id, 0),
+                cursor: lineCursor(above.rowIndex + 1, level),
+            };
+        }
+        else {
+            /* Will be a sibling or grandsibling of the empty folder */
+            return {
+                drop: walkUpFrom(above, level),
+                cursor: lineCursor(above.rowIndex + 1, level),
+            };
+        }
+    }
+    /* The node above the cursor is a an open folder with children */
     return {
@@ -128,0 +142,0 @@ drop: dropAt(above === null || above === void 0 ? void 0 : above.id, 0),

dist/module/utils.d.ts

@@ -7,2 +7,3 @@ import { NodeApi } from "./interfaces/node-api";
 export declare function isClosed(node: NodeApi<any> | null): boolean | null;
+export declare function isOpenWithEmptyChildren(node: NodeApi<any> | null): boolean | null;
 /**
@@ -9,0 +10,0 @@ * Is first param a descendant of the second param

dist/module/utils.js

@@ -10,2 +10,6 @@ export function bound(n, min, max) {
 }
+export function isOpenWithEmptyChildren(node) {
+    var _a;
+    return node && node.isOpen && !((_a = node.children) === null || _a === void 0 ? void 0 : _a.length);
+}
 /**
@@ -12,0 +16,0 @@ * Is first param a descendant of the second param

package.json

 {
   "name": "react-arborist",
-  "version": "3.3.2-0",
+  "version": "3.4.0",
   "license": "MIT",
@@ -61,4 +61,3 @@ "source": "src/index.ts",
     "typescript": "^5.3.3"
-  },
-  "stableVersion": "3.3.1"
+  }
 }

src/dnd/compute-drop.ts

 import { XYCoord } from "react-dnd";
 import { NodeApi } from "../interfaces/node-api";
-import { bound, indexOf, isClosed, isItem } from "../utils";
+import {
+  bound,
+  indexOf,
+  isClosed,
+  isItem,
+  isOpenWithEmptyChildren,
+} from "../utils";
 import { DropResult } from "./drop-hook";
@@ -59,24 +65,2 @@
 
-function getDropLevel(
-  hovering: HoverData,
-  aboveCursor: NodeApi | null,
-  belowCursor: NodeApi | null,
-  indent: number
-) {
-  const hoverLevel = Math.round(Math.max(0, hovering.x - indent) / indent);
-  let min, max;
-  if (!aboveCursor) {
-    max = 0;
-    min = 0;
-  } else if (!belowCursor) {
-    max = aboveCursor.level;
-    min = 0;
-  } else {
-    max = aboveCursor.level;
-    min = belowCursor.level;
-  }
-
-  return bound(hoverLevel, min, max);
-}
-
 export type ComputedDrop = {
@@ -132,6 +116,7 @@ drop: DropResult | null;
  * This is the most complex, tricky function in the whole repo.
- * It could be simplified and made more understandable.
  */
 export function computeDrop(args: Args): ComputedDrop {
   const hover = measureHover(args.element, args.offset);
+  const indent = args.indent;
+  const hoverLevel = Math.round(Math.max(0, hover.x - indent) / indent);
   const { node, nextNode, prevNode } = args;
@@ -148,3 +133,8 @@ const [above, below] = getNodesAroundCursor(node, prevNode, nextNode, hover);
 
-  /* At the top of the list */
+  /*
+   * Now we only need to care about the node above the cursor
+   * -----------                            -------
+   */
+
+  /* There is no node above the cursor line */
   if (!above) {
@@ -157,5 +147,5 @@ return {
 
-  /* The above node is an item or a closed folder */
-  if (isItem(above) || isClosed(above)) {
-    const level = getDropLevel(hover, above, below, args.indent);
+  /* The node above the cursor line is an item */
+  if (isItem(above)) {
+    const level = bound(hoverLevel, below?.level || 0, above.level);
     return {
@@ -167,3 +157,30 @@ drop: walkUpFrom(above, level),
 
-  /* The above node is an open folder */
+  /* The node above the cursor line is a closed folder */
+  if (isClosed(above)) {
+    const level = bound(hoverLevel, below?.level || 0, above.level);
+    return {
+      drop: walkUpFrom(above, level),
+      cursor: lineCursor(above.rowIndex! + 1, level),
+    };
+  }
+
+  /* The node above the cursor line is an open folder with no children */
+  if (isOpenWithEmptyChildren(above)) {
+    const level = bound(hoverLevel, 0, above.level + 1);
+    if (level > above.level) {
+      /* Will be the first child of the empty folder */
+      return {
+        drop: dropAt(above.id, 0),
+        cursor: lineCursor(above.rowIndex! + 1, level),
+      };
+    } else {
+      /* Will be a sibling or grandsibling of the empty folder */
+      return {
+        drop: walkUpFrom(above, level),
+        cursor: lineCursor(above.rowIndex! + 1, level),
+      };
+    }
+  }
+
+  /* The node above the cursor is a an open folder with children */
   return {
@@ -170,0 +187,0 @@ drop: dropAt(above?.id, 0),

src/utils.ts

@@ -17,2 +17,6 @@ import { NodeApi } from "./interfaces/node-api";
 
+export function isOpenWithEmptyChildren(node: NodeApi<any> | null) {
+  return node && node.isOpen && !node.children?.length;
+}
+
 /**
@@ -19,0 +23,0 @@ * Is first param a descendant of the second param

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

343202

increased by0.87%

Lines of code

9566

increased by0.59%

Number of low quality alerts

0

decreased by-100%

No dependency changes