Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-1073] fix: Kanban dnd to work as tested on Chrome, Safari and Firefox (#4301)

rahulramesha6ac3cb9b312e
diff --git a/packages/ui/src/control-link/control-link.tsx b/packages/ui/src/control-link/control-link.tsx
index 328dae4fa8..8e0f73b700 100644
--- a/packages/ui/src/control-link/control-link.tsx
+++ b/packages/ui/src/control-link/control-link.tsx
@@ -6,10 +6,11 @@ export type TControlLink = React.AnchorHTMLAttributes<HTMLAnchorElement> & {
children: React.ReactNode;
target?: string;
disabled?: boolean;
+ className?: string;
};
-export const ControlLink: React.FC<TControlLink> = (props) => {
- const { href, onClick, children, target = "_self", disabled = false, ...rest } = props;
+export const ControlLink = React.forwardRef<HTMLAnchorElement, TControlLink>((props, ref) => {
+ const { href, onClick, children, target = "_self", disabled = false, className, ...rest } = props;
const LEFT_CLICK_EVENT_CODE = 0;
const handleOnClick = (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
@@ -20,11 +21,20 @@ export const ControlLink: React.FC<TControlLink> = (props) => {
}
};
+ // if disabled but still has a ref or a className then it has to be rendered without a href
+ if (disabled && (ref || className))
+ return (
+ <a ref={ref} className={className}>
+ {children}
+ </a>
+ );
+
+ // else if just disabled return without the parent wrapper
if (disabled) return <>{children}</>;
return (
- <a href={href} target={target} onClick={handleOnClick} {...rest}>
+ <a href={href} target={target} onClick={handleOnClick} {...rest} ref={ref} className={className}>
{children}
</a>
);
-};
+});
diff --git a/web/components/issues/issue-layouts/kanban/block.tsx b/web/components/issues/issue-layouts/kanban/block.tsx
index d12e289148..b70bebfdbf 100644
--- a/web/components/issues/issue-layouts/kanban/block.tsx
+++ b/web/components/issues/issue-layouts/kanban/block.tsx
@@ -103,7 +103,7 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = memo((props) => {
issueIds,
} = props;
- const cardRef = useRef<HTMLDivElement | null>(null);
+ const cardRef = useRef<HTMLAnchorElement | null>(null);
const {
router: { workspaceSlug },
} = useApplication();
@@ -138,6 +138,7 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = memo((props) => {
return combine(
draggable({
element,
+ dragHandle: element,
canDrag: () => isDragAllowed,
getInitialData: () => ({ id: issue?.id, type: "ISSUE" }),
onDragStart: () => {
@@ -151,7 +152,6 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = memo((props) => {
}),
dropTargetForElements({
element,
- canDrop: (payload) => payload.source?.data?.id !== issue?.id,
getData: () => ({ id: issue?.id, type: "ISSUE" }),
onDragEnter: () => {
setIsDraggingOverBlock(true);
@@ -181,35 +181,32 @@ export const KanbanIssueBlock: React.FC<IssueBlockProps> = memo((props) => {
href={`/${workspaceSlug}/projects/${issue.project_id}/${issue.archived_at ? "archives/" : ""}issues/${
issue.id
}`}
+ ref={cardRef}
+ className={cn(
+ "block rounded border-[0.5px] outline-[0.5px] outline-transparent w-full border-custom-border-200 bg-custom-background-100 text-sm transition-all hover:border-custom-border-400",
+ { "hover:cursor-pointer": isDragAllowed },
+ { "border border-custom-primary-70 hover:border-custom-primary-70": peekIssueId === issue.id },
+ { "bg-custom-background-80 z-[100]": isCurrentBlockDragging }
+ )}
target="_blank"
onClick={() => handleIssuePeekOverview(issue)}
disabled={!!issue?.tempId}
>
- <div
- className={cn(
- "rounded border-[0.5px] outline-[0.5px] outline-transparent w-full border-custom-border-200 bg-custom-background-100 text-sm transition-all hover:border-custom-border-400",
- { "hover:cursor-pointer": isDragAllowed },
- { "border border-custom-primary-70 hover:border-custom-primary-70": peekIssueId === issue.id },
- { "bg-custom-background-80 z-[100]": isCurrentBlockDragging }
- )}
- ref={cardRef}
+ <RenderIfVisible
+ classNames="space-y-2 px-3 py-2"
+ root={scrollableContainerRef}
+ defaultHeight="100px"
+ horizontalOffset={50}
+ changingReference={issueIds}
>
- <RenderIfVisible
- classNames="space-y-2 px-3 py-2"
- root={scrollableContainerRef}
- defaultHeight="100px"
- horizontalOffset={50}
- changingReference={issueIds}
- >
- <KanbanIssueDetailsBlock
- issue={issue}
- displayProperties={displayProperties}
- updateIssue={updateIssue}
- quickActions={quickActions}
- isReadOnly={!canEditIssueProperties}
- />
- </RenderIfVisible>
- </div>
+ <KanbanIssueDetailsBlock
+ issue={issue}
+ displayProperties={displayProperties}
+ updateIssue={updateIssue}
+ quickActions={quickActions}
+ isReadOnly={!canEditIssueProperties}
+ />
+ </RenderIfVisible>
</ControlLink>
</div>
</>