adds isOpenWithEmptyChildren to hover.atTop check on computeDrop

brimdata · Dec 13, 2023 · c9af3ab · c9af3ab
1 parent 7e58836
commit c9af3ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/react-arborist/src/dnd/compute-drop.ts b/packages/react-arborist/src/dnd/compute-drop.ts
@@ -1,6 +1,6 @@
 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";
 
 function measureHover(el: HTMLElement, offset: XYCoord) {
@@ -155,7 +155,7 @@ export function computeDrop(args: Args): ComputedDrop {
    * The above node is an item, a closed folder or hovering over
    * the top of next node, proposing to append as next sibling.
    */
-  if (isItem(above) || isClosed(above) || hover.atTop) {
+  if (isItem(above) || isClosed(above) || (!below && hover.inBottomHalf) || (hover.atTop && isOpenWithEmptyChildren(above))) {
     const level = getDropLevel(hover, above, below, args.indent);
     return {
       drop: walkUpFrom(above, level),

diff --git a/packages/react-arborist/src/utils.ts b/packages/react-arborist/src/utils.ts
@@ -14,6 +14,10 @@ export function isClosed(node: NodeApi<any> | null) {
   return node && node.isInternal && !node.isOpen;
 }
 
+export function isOpenWithEmptyChildren(node: NodeApi<any> | null) {
+  return node && node.isOpen && !node.children?.length;
+}
+
 /**
  * Is first param a descendant of the second param
  */