From ae5576f2a39a27e3e2ed58a30b3e62450b0df066 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 13 Sep 2025 09:46:09 +0300
Subject: [PATCH] chore(react/collections/board): fix dragging from tree

---
 apps/client/src/widgets/collections/board/column.tsx | 6 +++---
 apps/client/src/widgets/note_tree.ts                 | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/widgets/collections/board/column.tsx b/apps/client/src/widgets/collections/board/column.tsx
index 37e095a44..f91243923 100644
--- a/apps/client/src/widgets/collections/board/column.tsx
+++ b/apps/client/src/widgets/collections/board/column.tsx
@@ -11,7 +11,7 @@ import BoardApi from "./api";
 import Card, { CARD_CLIPBOARD_TYPE, CardDragData } from "./card";
 import { JSX } from "preact/jsx-runtime";
 import froca from "../../../services/froca";
-import { DragData } from "../../note_tree";
+import { DragData, TREE_CLIPBOARD_TYPE } from "../../note_tree";
 
 interface DragContext {
     column: string;
@@ -173,7 +173,7 @@ function useDragging({ column, columnIndex, columnItems, isEditing }: DragContex
 
     const handleDragOver = useCallback((e: DragEvent) => {
         if (isEditing || draggedColumn || isDraggingRef.current) return; // Don't handle card drops when dragging columns
-        if (!e.dataTransfer?.types.includes(CARD_CLIPBOARD_TYPE)) return;
+        if (!e.dataTransfer?.types.includes(CARD_CLIPBOARD_TYPE) && !e.dataTransfer.types.includes(TREE_CLIPBOARD_TYPE)) return;
 
         e.preventDefault();
         setDropTarget(column);
@@ -215,7 +215,7 @@ function useDragging({ column, columnIndex, columnItems, isEditing }: DragContex
         setDropTarget(null);
         setDropPosition(null);
 
-        const data = e.dataTransfer?.getData(CARD_CLIPBOARD_TYPE);
+        const data = e.dataTransfer?.getData(CARD_CLIPBOARD_TYPE) || e.dataTransfer?.getData("text");
         if (!data) return;
 
         let draggedCard: CardDragData | DragData[];
diff --git a/apps/client/src/widgets/note_tree.ts b/apps/client/src/widgets/note_tree.ts
index 2bbee7b36..4636cd60d 100644
--- a/apps/client/src/widgets/note_tree.ts
+++ b/apps/client/src/widgets/note_tree.ts
@@ -195,6 +195,8 @@ export interface DragData {
     title: string;
 }
 
+export const TREE_CLIPBOARD_TYPE = "application/x-fancytree-node";
+
 export default class NoteTreeWidget extends NoteContextAwareWidget {
     private $tree!: JQuery<HTMLElement>;
     private $treeActions!: JQuery<HTMLElement>;