luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(kanban): move kanban card at same group (#524)

Browse Source
This commit is contained in:
lawvs
2022-07-25 18:21:37 +08:00
parent d4a77b5d7b
commit b4362dd968
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/components/editor-core/src/kanban/kanban.ts
View File

@@ -278,7 +278,11 @@ export const useKanban = () => {
// 1.1 Target group is not specified, just set the nowGroup as the targetGroup // 1.1 Target group is not specified, just set the nowGroup as the targetGroup
targetGroup = nowGroup; targetGroup = nowGroup;
} }
if (nowGroup.id !== targetGroup.id) { const isChangedGroup = nowGroup.id !== targetGroup.id;
const previousIdx = nowGroup.items.findIndex(
card => card.id === targetCard.id
);
if (isChangedGroup) {
// 1.2 Move to the target group // 1.2 Move to the target group
await moveCardToGroup(groupBy.id, targetCard, targetGroup); await moveCardToGroup(groupBy.id, targetCard, targetGroup);
} }
@@ -297,6 +301,10 @@ export const useKanban = () => {
await moveCardToBefore(targetCard, nowGroup.items[0].block); await moveCardToBefore(targetCard, nowGroup.items[0].block);
return; return;
} }
// Fix move card from idx 0 to idx 1 at same group
if (!isChangedGroup && previousIdx < idx && previousIdx !== -1) {
idx++;
}
if (idx > nowGroup.items.length) { if (idx > nowGroup.items.length) {
idx = nowGroup.items.length; idx = nowGroup.items.length;
} }