π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-1580] chore: drag handler and sidebar improvement (#4780)
Anmol Singh Bhatia7677f021a9c0
diff --git a/web/app/[workspaceSlug]/(projects)/sidebar.tsx b/web/app/[workspaceSlug]/(projects)/sidebar.tsxindex c856b69b87..9ca29af3ee 100644--- a/web/app/[workspaceSlug]/(projects)/sidebar.tsx+++ b/web/app/[workspaceSlug]/(projects)/sidebar.tsx@@ -32,10 +32,9 @@ export const AppSidebar: FC<IAppSidebar> = observer(() => {<divclassName={`fixed inset-y-0 z-20 flex h-full flex-shrink-0 flex-grow-0 flex-col border-r border-custom-sidebar-border-200 bg-custom-sidebar-background-100duration-300 md:relative- ${sidebarCollapsed ? "-ml-[280px]" : ""}- sm:${sidebarCollapsed ? "-ml-[280px]" : ""}- md:ml-0 ${sidebarCollapsed ? "w-[80px]" : "w-[280px]"}- lg:ml-0 ${sidebarCollapsed ? "w-[80px]" : "w-[280px]"}+ ${sidebarCollapsed ? "-ml-[250px]" : ""}+ sm:${sidebarCollapsed ? "-ml-[250px]" : ""}+ md:ml-0 ${sidebarCollapsed ? "w-[70px]" : "w-[250px]"}`}><div ref={ref} className="flex h-full w-full flex-1 flex-col">diff --git a/web/app/profile/sidebar.tsx b/web/app/profile/sidebar.tsxindex f3f87f8e48..8d4cebbdef 100644--- a/web/app/profile/sidebar.tsx+++ b/web/app/profile/sidebar.tsx@@ -95,10 +95,9 @@ export const ProfileLayoutSidebar = observer(() => {return (<divclassName={`fixed inset-y-0 z-20 flex h-full flex-shrink-0 flex-grow-0 flex-col border-r border-custom-sidebar-border-200 bg-custom-sidebar-background-100 duration-300 md:relative- ${sidebarCollapsed ? "-ml-[280px]" : ""}- sm:${sidebarCollapsed ? "-ml-[280px]" : ""}- md:ml-0 ${sidebarCollapsed ? "w-[80px]" : "w-[280px]"}- lg:ml-0 ${sidebarCollapsed ? "w-[80px]" : "w-[280px]"}+ ${sidebarCollapsed ? "-ml-[250px]" : ""}+ sm:${sidebarCollapsed ? "-ml-[250px]" : ""}+ md:ml-0 ${sidebarCollapsed ? "w-[70px]" : "w-[250px]"}`}><div ref={ref} className="flex h-full w-full flex-col gap-y-4">diff --git a/web/core/components/labels/label-block/label-item-block.tsx b/web/core/components/labels/label-block/label-item-block.tsxindex cfc9ae7c30..225b011bd5 100644--- a/web/core/components/labels/label-block/label-item-block.tsx+++ b/web/core/components/labels/label-block/label-item-block.tsx@@ -27,10 +27,11 @@ interface ILabelItemBlock {customMenuItems: ICustomMenuItem[];handleLabelDelete: (label: IIssueLabel) => void;isLabelGroup?: boolean;+ dragHandleRef: MutableRefObject<HTMLButtonElement | null>;}export const LabelItemBlock = (props: ILabelItemBlock) => {- const { label, customMenuItems, handleLabelDelete, isLabelGroup } = props;+ const { label, isDragging, customMenuItems, handleLabelDelete, isLabelGroup, dragHandleRef } = props;// statesconst [isMenuActive, setIsMenuActive] = useState(false);// refs@@ -41,6 +42,12 @@ export const LabelItemBlock = (props: ILabelItemBlock) => {return (<div className="group flex items-center"><div className="flex items-center">+ <DragHandle+ className={cn("opacity-0 group-hover:opacity-100", {+ "opacity-100": isDragging,+ })}+ ref={dragHandleRef}+ /><LabelName color={label.color} name={label.name} isGroup={isLabelGroup ?? false} /></div>diff --git a/web/core/components/labels/label-block/label-name.tsx b/web/core/components/labels/label-block/label-name.tsxindex ae5ffbf2e5..9c84959ccf 100644--- a/web/core/components/labels/label-block/label-name.tsx+++ b/web/core/components/labels/label-block/label-name.tsx@@ -10,7 +10,7 @@ export const LabelName = (props: ILabelName) => {const { name, color, isGroup } = props;return (- <div className="flex items-center gap-3 pl-2">+ <div className="flex items-center gap-3">{isGroup ? (<Component className="h-3.5 w-3.5" color={color} />) : (diff --git a/web/core/components/labels/project-setting-label-group.tsx b/web/core/components/labels/project-setting-label-group.tsxindex 264c93e479..3302cb6bf1 100644--- a/web/core/components/labels/project-setting-label-group.tsx+++ b/web/core/components/labels/project-setting-label-group.tsx@@ -55,13 +55,13 @@ export const ProjectSettingLabelGroup: React.FC<Props> = observer((props) => {return (<LabelDndHOC label={label} isGroup isChild={false} isLastChild={isLastChild} onDrop={onDrop}>- {(isDragging, isDroppingInLabel) => (+ {(isDragging, isDroppingInLabel, dragHandleRef) => (<divclassName={`rounded ${isDroppingInLabel ? "border-[2px] border-custom-primary-100" : "border-[1.5px] border-transparent"}`}><Disclosureas="div"- className={`rounded text-custom-text-100 cursor-grab ${+ className={`rounded text-custom-text-100 ${!isDroppingInLabel ? "border-[0.5px] border-custom-border-200" : ""} ${isDragging ? "bg-custom-background-80" : "bg-custom-background-100"}`}defaultOpen@@ -89,6 +89,7 @@ export const ProjectSettingLabelGroup: React.FC<Props> = observer((props) => {customMenuItems={customMenuItems}handleLabelDelete={handleLabelDelete}isLabelGroup+ dragHandleRef={dragHandleRef}/>)}diff --git a/web/core/components/labels/project-setting-label-item.tsx b/web/core/components/labels/project-setting-label-item.tsxindex f64e2cd7a2..fbc812e12d 100644--- a/web/core/components/labels/project-setting-label-item.tsx+++ b/web/core/components/labels/project-setting-label-item.tsx@@ -64,9 +64,9 @@ export const ProjectSettingLabelItem: React.FC<Props> = (props) => {return (<LabelDndHOC label={label} isGroup={false} isChild={isChild} isLastChild={isLastChild} onDrop={onDrop}>- {(isDragging, isDroppingInLabel) => (+ {(isDragging, isDroppingInLabel, dragHandleRef) => (<div- className={`rounded cursor-grab ${isDroppingInLabel ? "border-[2px] border-custom-primary-100" : "border-[1.5px] border-transparent"}`}+ className={`rounded ${isDroppingInLabel ? "border-[2px] border-custom-primary-100" : "border-[1.5px] border-transparent"}`}><divclassName={`py-3 px-1 group relative flex items-center justify-between gap-2 space-y-3 rounded ${@@ -90,6 +90,7 @@ export const ProjectSettingLabelItem: React.FC<Props> = (props) => {isDragging={isDragging}customMenuItems={customMenuItems}handleLabelDelete={handleLabelDelete}+ dragHandleRef={dragHandleRef}/>)}</div>diff --git a/web/core/components/project/sidebar-list-item.tsx b/web/core/components/project/sidebar-list-item.tsxindex ceaa78dac7..9529337641 100644--- a/web/core/components/project/sidebar-list-item.tsx+++ b/web/core/components/project/sidebar-list-item.tsx@@ -12,6 +12,7 @@ import { useParams, usePathname } from "next/navigation";import { createRoot } from "react-dom/client";// iconsimport {+ MoreVertical,PenSquare,LinkIcon,Star,@@ -123,6 +124,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {// refsconst actionSectionRef = useRef<HTMLDivElement | null>(null);const projectRef = useRef<HTMLDivElement | null>(null);+ const dragHandleRef = useRef<HTMLButtonElement | null>(null);// router paramsconst { workspaceSlug, projectId: URLProjectId } = useParams();// pathname@@ -185,6 +187,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {useEffect(() => {const element = projectRef.current;+ const dragHandleElement = dragHandleRef.current;if (!element) return;@@ -192,6 +195,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {draggable({element,canDrag: () => !disableDrag && !isSideBarCollapsed,+ dragHandle: dragHandleElement ?? undefined,getInitialData: () => ({ id: projectId, dragInstanceId: "PROJECTS" }),onDragStart: () => {setIsDragging(true);@@ -207,7 +211,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {const root = createRoot(container);root.render(<div className="rounded flex items-center bg-custom-background-100 text-sm p-1 pr-2">- <div className="h-6 w-6 grid place-items-center flex-shrink-0">+ <div className="size-4 grid place-items-center flex-shrink-0">{project && <Logo logo={project?.logo_props} />}</div><p className="truncate text-custom-sidebar-text-200">{project?.name}</p>@@ -268,7 +272,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {},}));- }, [projectRef?.current, projectId, isLastChild, projectListType, handleOnProjectDrop]);+ }, [projectRef?.current, dragHandleRef?.current, projectId, isLastChild, projectListType, handleOnProjectDrop]);useOutsideClickDetector(actionSectionRef, () => setIsMenuActive(false));useOutsideClickDetector(projectRef, () => projectRef?.current?.classList?.remove(HIGHLIGHT_CLASS));@@ -288,12 +292,39 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {<DropIndicator classNames="absolute top-0" isVisible={instruction === "DRAG_OVER"} /><divclassName={cn(- "group relative flex w-full items-center rounded-md py-1 text-custom-sidebar-text-100 hover:bg-custom-sidebar-background-80",+ "h-9 group relative flex w-full px-3 py-2 items-center rounded-md text-custom-sidebar-text-100 hover:bg-custom-sidebar-background-80",{"bg-custom-sidebar-background-80": isMenuActive,+ "pr-0": !isSideBarCollapsed,})}>+ {!disableDrag && (+ <Tooltip+ isMobile={isMobile}+ tooltipContent={project.sort_order === null ? "Join the project to rearrange" : "Drag to rearrange"}+ position="top-right"+ disabled={isDragging}+ >+ <button+ type="button"+ className={cn(+ "absolute -left-[18px] flex opacity-0 rounded text-custom-sidebar-text-400 ml-2 cursor-grab",+ {+ "group-hover:opacity-100": !isSideBarCollapsed,+ "cursor-not-allowed opacity-60": project.sort_order === null,+ "cursor-grabbing": isDragging,+ flex: isMenuActive,+ hidden: isSideBarCollapsed,+ }+ )}+ ref={dragHandleRef}+ >+ <MoreVertical className="-ml-3 h-3.5" />+ <MoreVertical className="-ml-5 h-3.5" />+ </button>+ </Tooltip>+ )}<TooltiptooltipContent={`${project.name}`}position="right"@@ -303,18 +334,18 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {<Disclosure.Buttonas="div"className={cn(- "flex flex-grow cursor-pointer select-none items-center justify-between truncate text-left text-sm font-medium pl-2",+ "flex flex-grow cursor-pointer select-none items-center justify-between truncate text-left text-sm font-medium",{"justify-center": isSideBarCollapsed,})}><div- className={cn("flex w-full h-7 flex-grow items-center gap-1 truncate", {+ className={cn("flex w-full flex-grow items-center gap-2.5 truncate", {"justify-center": isSideBarCollapsed,})}>- <div className="h-5 w-5 grid place-items-center flex-shrink-0 mr-1">+ <div className="size-5 grid place-items-center flex-shrink-0"><Logo logo={project.logo_props} /></div>{!isSideBarCollapsed && <p className="truncate text-custom-sidebar-text-200">{project.name}</p>}@@ -322,7 +353,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {{!isSideBarCollapsed && (<ChevronDownclassName={cn(- "mb-0.5 hidden h-4 w-4 flex-shrink-0 text-custom-sidebar-text-400 duration-300 group-hover:block",+ "hidden h-4 w-4 flex-shrink-0 text-custom-sidebar-text-400 duration-300 group-hover:block",{"rotate-180": open,block: isMenuActive,@@ -338,17 +369,16 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {customButton={<divref={actionSectionRef}- className="my-auto mt-1.5 w-full cursor-pointer px-1 text-custom-sidebar-text-400 duration-300"+ className="size-5 flex items-center justify-center cursor-pointer px-1 text-custom-sidebar-text-400 duration-300"onClick={() => setIsMenuActive(!isMenuActive)}><MoreHorizontal className="h-3.5 w-3.5" /></div>}- className={cn("hidden flex-shrink-0 group-hover:block", {+ className={cn("hidden flex-shrink-0 mr-1 group-hover:block", {"!block": isMenuActive,})}buttonClassName="!text-custom-sidebar-text-400"- ellipsisplacement="bottom-start">{!project.is_favorite && (@@ -432,7 +462,7 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {leaveFrom="transform scale-100 opacity-100"leaveTo="transform scale-95 opacity-0">- <Disclosure.Panel className={`mt-1 space-y-1 ${isSideBarCollapsed ? "" : "ml-[2.25rem]"}`}>+ <Disclosure.Panel className={`mt-1 space-y-1 ${isSideBarCollapsed ? "" : "ml-[1.25rem]"}`}>{navigation(workspaceSlug as string, project?.id).map((item) => {if ((item.name === "Cycles" && !project.cycle_view) ||diff --git a/web/core/components/project/sidebar-list.tsx b/web/core/components/project/sidebar-list.tsxindex 1d9804592f..98cde31c99 100644--- a/web/core/components/project/sidebar-list.tsx+++ b/web/core/components/project/sidebar-list.tsx@@ -207,7 +207,7 @@ export const ProjectSidebarList: FC = observer(() => {leaveTo="transform scale-95 opacity-0">{isFavoriteProjectsListOpen && (- <Disclosure.Panel as="div" className={`space-y-2 pl-2`} static>+ <Disclosure.Panel as="div" static>{favoriteProjects.map((projectId, index) => (<ProjectSidebarListItemkey={projectId}@@ -269,7 +269,7 @@ export const ProjectSidebarList: FC = observer(() => {leaveTo="transform scale-95 opacity-0">{isAllProjectsListOpen && (- <Disclosure.Panel as="div" className="pl-2" static>+ <Disclosure.Panel as="div" static>{joinedProjects.map((projectId, index) => (<ProjectSidebarListItemkey={projectId}