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

chore(collections/board): fix dragging notes across columns

Browse Source
This commit is contained in:
Elian Doran 2025-09-12 15:10:20 +03:00
parent 95a392ccfa
commit c8f9d6e6df
No known key found for this signature in database
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ function useDragging({ column, columnIndex, columnItems }: DragContext) {
} }
} }
setDraggedCard(null); setDraggedCard(null);
}, [draggedCard, draggedColumn, dropPosition, columnItems, column, setDraggedCard, setDropTarget, setDropPosition]); }, [ api, draggedCard, draggedColumn, dropPosition, columnItems, column, setDraggedCard, setDropTarget, setDropPosition ]);
return { handleColumnDragStart, handleColumnDragEnd, handleDragOver, handleDragLeave, handleDrop }; return { handleColumnDragStart, handleColumnDragEnd, handleDragOver, handleDragLeave, handleDrop };
} }

7
apps/client/src/widgets/collections/board/index.tsx
View File

@ -11,8 +11,6 @@ import { createContext } from "preact";
import { onWheelHorizontalScroll } from "../../widget_utils"; import { onWheelHorizontalScroll } from "../../widget_utils";
import Column from "./column"; import Column from "./column";
import BoardApi from "./api"; import BoardApi from "./api";
import FBranch from "../../../entities/fbranch";
import FNote from "../../../entities/fnote";
export interface BoardViewData { export interface BoardViewData {
columns?: BoardColumnData[]; columns?: BoardColumnData[];
@ -55,13 +53,16 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
return new Api(byColumn, columns ?? [], parentNote, statusAttribute, viewConfig ?? {}, saveConfig, setBranchIdToEdit ); return new Api(byColumn, columns ?? [], parentNote, statusAttribute, viewConfig ?? {}, saveConfig, setBranchIdToEdit );
}, [ byColumn, columns, parentNote, statusAttribute, viewConfig, saveConfig, setBranchIdToEdit ]); }, [ byColumn, columns, parentNote, statusAttribute, viewConfig, saveConfig, setBranchIdToEdit ]);
const boardViewContext = useMemo<BoardViewContextData>(() => ({ const boardViewContext = useMemo<BoardViewContextData>(() => ({
api,
branchIdToEdit, setBranchIdToEdit, branchIdToEdit, setBranchIdToEdit,
columnNameToEdit, setColumnNameToEdit, columnNameToEdit, setColumnNameToEdit,
draggedColumn, setDraggedColumn, draggedColumn, setDraggedColumn,
dropPosition, setDropPosition, dropPosition, setDropPosition,
draggedCard, setDraggedCard, draggedCard, setDraggedCard,
dropTarget, setDropTarget dropTarget, setDropTarget
}), [ branchIdToEdit, setBranchIdToEdit, }), [
api,
branchIdToEdit, setBranchIdToEdit,
columnNameToEdit, setColumnNameToEdit, columnNameToEdit, setColumnNameToEdit,
draggedColumn, setDraggedColumn, draggedColumn, setDraggedColumn,
dropPosition, setDropPosition, dropPosition, setDropPosition,

3
apps/client/src/widgets/view_widgets/board_view/index.ts
View File

@ -1,7 +1,4 @@
import { setupHorizontalScrollViaWheel } from "../../widget_utils";
import ViewMode, { ViewModeArgs } from "../view_mode"; import ViewMode, { ViewModeArgs } from "../view_mode";
import noteCreateService from "../../../services/note_create";
import { EventData } from "../../../components/app_context";
import { BoardData } from "./config"; import { BoardData } from "./config";
import SpacedUpdate from "../../../services/spaced_update"; import SpacedUpdate from "../../../services/spaced_update";
import { setupContextMenu } from "./context_menu"; import { setupContextMenu } from "./context_menu";