luisgulo/focalboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GH-1724 (#1771)

Browse Source
This commit is contained in:
Hossein 2021-11-09 08:27:09 -05:00 committed by GitHub
parent 63ff9a7de5
commit ad0e3a1248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
webapp/src/components/kanban/kanban.tsx
View File

@ -4,6 +4,8 @@
import React, {useCallback, useState} from 'react'
import {FormattedMessage, injectIntl, IntlShape} from 'react-intl'
import {Position} from '../cardDetail/cardDetailContents'
import {Board, IPropertyOption, IPropertyTemplate, BoardGroup} from '../../blocks/board'
import {Card} from '../../blocks/card'
import {BoardView} from '../../blocks/boardView'
@ -11,6 +13,8 @@ import mutator from '../../mutator'
import {Utils, IDType} from '../../utils'
import Button from '../../widgets/buttons/button'
import {dragAndDropRearrange} from '../cardDetail/cardDetailContentsUtility'
import KanbanCard from './kanbanCard'
import KanbanColumn from './kanbanColumn'
import KanbanColumnHeader from './kanbanColumnHeader'
@ -110,16 +114,25 @@ const Kanban = (props: Props) => {
} else if (dstOption) {
Utils.log(`ondrop. Header option: ${dstOption.value}, column: ${option?.value}`)
// Move option to new index
const visibleOptionIds = visibleGroups.map((o) => o.option.id)
const srcBlockX = visibleOptionIds.indexOf(option.id)
const dstBlockX = visibleOptionIds.indexOf(dstOption.id)
const srcIndex = visibleOptionIds.indexOf(dstOption.id)
const destIndex = visibleOptionIds.indexOf(option.id)
// Here aboveRow means to the left while belowRow means to the right
const moveTo = (srcBlockX > dstBlockX ? 'aboveRow' : 'belowRow') as Position
visibleOptionIds[srcIndex] = option.id
visibleOptionIds[destIndex] = dstOption.id
const visibleOptionIdsRearranged = dragAndDropRearrange({
contentOrder: visibleOptionIds,
srcBlockX,
srcBlockY: -1,
dstBlockX,
dstBlockY: -1,
srcBlockId: option.id,
dstBlockId: dstOption.id,
moveTo,
}) as string[]
await mutator.changeViewVisibleOptionIds(activeView.id, activeView.fields.visibleOptionIds, visibleOptionIds)
await mutator.changeViewVisibleOptionIds(activeView.id, activeView.fields.visibleOptionIds, visibleOptionIdsRearranged)
}
}, [cards, visibleGroups, activeView, groupByProperty, props.selectedCardIds])