disabledDrop and target/source drop monitoring #62 (#98)

brimdata · Jan 26, 2023 · 87065fe · 87065fe
1 parent ec40e35
commit 87065fe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/react-arborist/src/dnd/drop-hook.ts b/packages/react-arborist/src/dnd/drop-hook.ts
@@ -33,13 +33,18 @@ export function useDropHook(
         });
         if (!drop) return false;
         const dropParent = tree.get(drop.parentId) ?? tree.root;
-
-        for (let id of item.dragIds) {
-          const drag = tree.get(id);
+        
+        const dragNodes = <NodeApi[]>item.dragIds.map(tree.get, tree);
+        for (const drag of dragNodes) {
           if (!drag) return false;
           if (!dropParent) return false;
           if (drag.isInternal && isDecendent(dropParent, drag)) return false;
         }
+
+        const check = tree.props.disableDrop;
+        if (typeof check === 'function' && check(dropParent, dragNodes)) {
+          return false;
+        }
         return true;
       },
       hover: (item, m) => {

diff --git a/packages/react-arborist/src/types/tree-props.ts b/packages/react-arborist/src/types/tree-props.ts
@@ -40,7 +40,7 @@ export interface TreeProps<T> {
   disableMultiSelection?: boolean;
   disableEdit?: string | boolean | BoolFunc<T>;
   disableDrag?: string | boolean | BoolFunc<T>;
-  disableDrop?: string | boolean | BoolFunc<T>;
+  disableDrop?: string | boolean | BoolFunc<T> | ((node: NodeApi, dragNodes: NodeApi[]) => boolean);
   childrenAccessor?: string | ((d: T) => T[] | null);
   idAccessor?: string | ((d: T) => string);