gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-21 07:38:53 +02:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fix(react/collections/board): column and card drag mixing

Browse Source
This commit is contained in:
Elian Doran 2025-09-12 23:14:15 +03:00
parent 7bbb15a535
commit c53e927a55
No known key found for this signature in database
1 changed files with 5 additions and 1 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

@ -152,8 +152,11 @@ function AddNewItem({ column, api }: { column: string, api: BoardApi }) {
function useDragging({ column, columnIndex, columnItems }: DragContext) { function useDragging({ column, columnIndex, columnItems }: DragContext) {
const { api, parentNote, draggedColumn, setDraggedColumn, setDropTarget, setDropPosition, dropPosition } = useContext(BoardViewContext); const { api, parentNote, draggedColumn, setDraggedColumn, setDropTarget, setDropPosition, dropPosition } = useContext(BoardViewContext);
/** Needed to track if current column is dragged in real-time, since {@link draggedColumn} is populated one render cycle later. */
const isDraggingRef = useRef(false);
const handleColumnDragStart = useCallback((e: DragEvent) => { const handleColumnDragStart = useCallback((e: DragEvent) => {
isDraggingRef.current = true;
e.dataTransfer!.effectAllowed = 'move'; e.dataTransfer!.effectAllowed = 'move';
e.dataTransfer!.setData('text/plain', column); e.dataTransfer!.setData('text/plain', column);
setDraggedColumn({ column, index: columnIndex }); setDraggedColumn({ column, index: columnIndex });
@ -161,11 +164,12 @@ function useDragging({ column, columnIndex, columnItems }: DragContext) {
}, [column, columnIndex, setDraggedColumn]); }, [column, columnIndex, setDraggedColumn]);
const handleColumnDragEnd = useCallback(() => { const handleColumnDragEnd = useCallback(() => {
isDraggingRef.current = false;
setDraggedColumn(null); setDraggedColumn(null);
}, [setDraggedColumn]); }, [setDraggedColumn]);
const handleDragOver = useCallback((e: DragEvent) => { const handleDragOver = useCallback((e: DragEvent) => {
if (draggedColumn) return; // Don't handle card drops when dragging columns if (draggedColumn || isDraggingRef.current) return; // Don't handle card drops when dragging columns
e.preventDefault(); e.preventDefault();
setDropTarget(column); setDropTarget(column);