diff --git a/web/components/issues/issue-layouts/kanban/block.tsx b/web/components/issues/issue-layouts/kanban/block.tsx index e40112a75..2f8d7465f 100644 --- a/web/components/issues/issue-layouts/kanban/block.tsx +++ b/web/components/issues/issue-layouts/kanban/block.tsx @@ -29,6 +29,7 @@ interface IssueBlockProps { displayProperties: IIssueDisplayProperties | undefined; isDragDisabled: boolean; draggableId: string; + canDropOverIssue: boolean; updateIssue: ((projectId: string, issueId: string, data: Partial) => Promise) | undefined; quickActions: TRenderQuickActions; canEditProperties: (projectId: string | undefined) => boolean; @@ -108,6 +109,7 @@ export const KanbanIssueBlock: React.FC = observer((props) => { issuesMap, displayProperties, isDragDisabled, + canDropOverIssue, updateIssue, quickActions, canEditProperties, @@ -167,6 +169,7 @@ export const KanbanIssueBlock: React.FC = observer((props) => { }), dropTargetForElements({ element, + canDrop: () => canDropOverIssue, getData: () => ({ id: issue?.id, type: "ISSUE" }), onDragEnter: () => { setIsDraggingOverBlock(true); diff --git a/web/components/issues/issue-layouts/kanban/blocks-list.tsx b/web/components/issues/issue-layouts/kanban/blocks-list.tsx index c6dd43c39..db2e55c8b 100644 --- a/web/components/issues/issue-layouts/kanban/blocks-list.tsx +++ b/web/components/issues/issue-layouts/kanban/blocks-list.tsx @@ -15,6 +15,7 @@ interface IssueBlocksListProps { updateIssue: ((projectId: string, issueId: string, data: Partial) => Promise) | undefined; quickActions: TRenderQuickActions; canEditProperties: (projectId: string | undefined) => boolean; + canDropOverIssue: boolean; scrollableContainerRef?: MutableRefObject; } @@ -26,6 +27,7 @@ const KanbanIssueBlocksListMemo: React.FC = (props) => { issueIds, displayProperties, isDragDisabled, + canDropOverIssue, updateIssue, quickActions, canEditProperties, @@ -55,6 +57,7 @@ const KanbanIssueBlocksListMemo: React.FC = (props) => { quickActions={quickActions} draggableId={draggableId} isDragDisabled={isDragDisabled} + canDropOverIssue={canDropOverIssue} canEditProperties={canEditProperties} scrollableContainerRef={scrollableContainerRef} /> diff --git a/web/components/issues/issue-layouts/kanban/kanban-group.tsx b/web/components/issues/issue-layouts/kanban/kanban-group.tsx index 8704cc879..07ea9fb58 100644 --- a/web/components/issues/issue-layouts/kanban/kanban-group.tsx +++ b/web/components/issues/issue-layouts/kanban/kanban-group.tsx @@ -175,14 +175,15 @@ export const KanbanGroup = (props: IKanbanGroup) => { return preloadedData; }; - const shouldOverlay = isDraggingOverColumn && (orderBy !== "sort_order" || isDropDisabled); + const canDropOverIssue = orderBy === "sort_order"; + const shouldOverlay = isDraggingOverColumn && (!canDropOverIssue || isDropDisabled); const readableOrderBy = ISSUE_ORDER_BY_OPTIONS.find((orderByObj) => orderByObj.key === orderBy)?.title; return (
{ >
{ quickActions={quickActions} canEditProperties={canEditProperties} scrollableContainerRef={sub_group_by ? scrollableContainerRef : columnRef} + canDropOverIssue={canDropOverIssue} /> {enableQuickIssueCreate && !disableIssueCreation && (