gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 23:29:02 +02:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

chore(react/collections/board): fix dragging from tree

Browse Source
This commit is contained in:
Elian Doran 2025-09-13 09:46:09 +03:00
parent b934b2b6ca
commit ae5576f2a3
No known key found for this signature in database
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/client/src/widgets/collections/board/column.tsx
View File

@ -11,7 +11,7 @@ import BoardApi from "./api";
import Card, { CARD_CLIPBOARD_TYPE, CardDragData } from "./card"; import Card, { CARD_CLIPBOARD_TYPE, CardDragData } from "./card";
import { JSX } from "preact/jsx-runtime"; import { JSX } from "preact/jsx-runtime";
import froca from "../../../services/froca"; import froca from "../../../services/froca";
import { DragData } from "../../note_tree"; import { DragData, TREE_CLIPBOARD_TYPE } from "../../note_tree";
interface DragContext { interface DragContext {
column: string; column: string;
@ -173,7 +173,7 @@ function useDragging({ column, columnIndex, columnItems, isEditing }: DragContex
const handleDragOver = useCallback((e: DragEvent) => { const handleDragOver = useCallback((e: DragEvent) => {
if (isEditing || draggedColumn || isDraggingRef.current) return; // Don't handle card drops when dragging columns 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(); e.preventDefault();
setDropTarget(column); setDropTarget(column);
@ -215,7 +215,7 @@ function useDragging({ column, columnIndex, columnItems, isEditing }: DragContex
setDropTarget(null); setDropTarget(null);
setDropPosition(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; if (!data) return;
let draggedCard: CardDragData | DragData[]; let draggedCard: CardDragData | DragData[];

2
apps/client/src/widgets/note_tree.ts
View File

@ -195,6 +195,8 @@ export interface DragData {
title: string; title: string;
} }
export const TREE_CLIPBOARD_TYPE = "application/x-fancytree-node";
export default class NoteTreeWidget extends NoteContextAwareWidget { export default class NoteTreeWidget extends NoteContextAwareWidget {
private $tree!: JQuery<HTMLElement>; private $tree!: JQuery<HTMLElement>;
private $treeActions!: JQuery<HTMLElement>; private $treeActions!: JQuery<HTMLElement>;