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-1416] chore: Refactor project sidebar dnd and remove @hello-pangea dnd (#4581)

rahulrameshab93fa4a34050
diff --git a/web/components/project/sidebar-list-item.tsx b/web/components/project/sidebar-list-item.tsx
index 5dcc31c3fc..4d45a515fa 100644
--- a/web/components/project/sidebar-list-item.tsx
+++ b/web/components/project/sidebar-list-item.tsx
@@ -1,8 +1,13 @@
-import { useRef, useState } from "react";
-import { DraggableProvided, DraggableStateSnapshot } from "@hello-pangea/dnd";
+import { useEffect, useRef, useState } from "react";
+import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
+import { draggable, dropTargetForElements } from "@atlaskit/pragmatic-drag-and-drop/element/adapter";
+import { pointerOutsideOfPreview } from "@atlaskit/pragmatic-drag-and-drop/element/pointer-outside-of-preview";
+import { setCustomNativeDragPreview } from "@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview";
+import { attachInstruction, extractInstruction } from "@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item";
import { observer } from "mobx-react";
import Link from "next/link";
import { useRouter } from "next/router";
+import { createRoot } from "react-dom/client";
import {
MoreVertical,
PenSquare,
@@ -28,6 +33,7 @@ import {
ContrastIcon,
LayersIcon,
setPromiseToast,
+ DropIndicator,
} from "@plane/ui";
import { LeaveProjectModal, ProjectLogo, PublishProjectModal } from "@/components/project";
import { EUserProjectRoles } from "@/constants/project";
@@ -36,17 +42,23 @@ import { cn } from "@/helpers/common.helper";
import { useAppTheme, useEventTracker, useProject } from "@/hooks/store";
import useOutsideClickDetector from "@/hooks/use-outside-click-detector";
import { usePlatformOS } from "@/hooks/use-platform-os";
+import { HIGHLIGHT_CLASS, highlightIssueOnDrop } from "../issues/issue-layouts/utils";
// helpers
// components
type Props = {
projectId: string;
- provided?: DraggableProvided;
- snapshot?: DraggableStateSnapshot;
handleCopyText: () => void;
- shortContextMenu?: boolean;
+ handleOnProjectDrop?: (
+ sourceId: string | undefined,
+ destinationId: string | undefined,
+ shouldDropAtEnd: boolean
+ ) => void;
+ projectListType: "JOINED" | "FAVORITES";
disableDrag?: boolean;
+ disableDrop?: boolean;
+ isLastChild: boolean;
};
const navigation = (workspaceSlug: string, projectId: string) => [
@@ -89,7 +101,8 @@ const navigation = (workspaceSlug: string, projectId: string) => [
export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
- const { projectId, provided, snapshot, handleCopyText, shortContextMenu = false, disableDrag } = props;
+ const { projectId, handleCopyText, disableDrag, disableDrop, isLastChild, handleOnProjectDrop, projectListType } =
+ props;
// store hooks
const { sidebarCollapsed: isCollapsed, toggleSidebar } = useAppTheme();
const { setTrackElement } = useEventTracker();
@@ -99,8 +112,12 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {
const [leaveProjectModalOpen, setLeaveProjectModal] = useState(false);
const [publishModalOpen, setPublishModal] = useState(false);
const [isMenuActive, setIsMenuActive] = useState(false);
+ const [isDragging, setIsDragging] = useState(false);
+ const [instruction, setInstruction] = useState<"DRAG_OVER" | "DRAG_BELOW" | undefined>(undefined);
// refs
const actionSectionRef = useRef<HTMLDivElement | null>(null);
+ const projectRef = useRef<HTMLDivElement | null>(null);
+ const dragHandleRef = useRef<HTMLButtonElement | null>(null);
// router
const router = useRouter();
const { workspaceSlug, projectId: URLProjectId } = router.query;
@@ -160,7 +177,97 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {
}
};
+ useEffect(() => {
+ const element = projectRef.current;
+ const dragHandleElement = dragHandleRef.current;
+
+ if (!element) return;
+
+ return combine(
+ draggable({
+ element,
+ canDrag: () => !disableDrag,
+ dragHandle: dragHandleElement ?? undefined,
+ getInitialData: () => ({ id: projectId, dragInstanceId: "PROJECTS" }),
+ onDragStart: () => {
+ setIsDragging(true);
+ },
+ onDrop: () => {
+ setIsDragging(false);
+ },
+ onGenerateDragPreview: ({ nativeSetDragImage }) => {
+ // Add a custom drag image
+ setCustomNativeDragPreview({
+ getOffset: pointerOutsideOfPreview({ x: "0px", y: "0px" }),
+ render: ({ container }) => {
+ const root = createRoot(container);
+ root.render(
+ <div className="rounded flex items-center bg-custom-background-100 text-sm p-1 pr-2">
+ <div className="flex items-center h-7 w-5 grid place-items-center flex-shrink-0">
+ {project && <ProjectLogo logo={project?.logo_props} />}
+ </div>
+ <p className="truncate text-custom-sidebar-text-200">{project?.name}</p>
+ </div>
+ );
+ return () => root.unmount();
+ },
+ nativeSetDragImage,
+ });
+ },
+ }),
+ dropTargetForElements({
+ element,
+ canDrop: ({ source }) =>
+ !disableDrop && source?.data?.id !== projectId && source?.data?.dragInstanceId === "PROJECTS",
+ getData: ({ input, element }) => {
+ const data = { id: projectId };
+
+ // attach instruction for last in list
+ return attachInstruction(data, {
+ input,
+ element,
+ currentLevel: 0,
+ indentPerLevel: 0,
+ mode: isLastChild ? "last-in-group" : "standard",
+ });
+ },
+ onDrag: ({ self }) => {
+ const extractedInstruction = extractInstruction(self?.data)?.type;
+ // check if the highlight is to be shown above or below
+ setInstruction(
+ extractedInstruction
+ ? extractedInstruction === "reorder-below" && isLastChild
+ ? "DRAG_BELOW"
+ : "DRAG_OVER"
+ : undefined
+ );
+ },
+ onDragLeave: () => {
+ setInstruction(undefined);
+ },
+ onDrop: ({ self, source }) => {
+ setInstruction(undefined);
+ const extractedInstruction = extractInstruction(self?.data)?.type;
+ const currentInstruction = extractedInstruction
+ ? extractedInstruction === "reorder-below" && isLastChild
+ ? "DRAG_BELOW"
+ : "DRAG_OVER"
+ : undefined;
+ if (!currentInstruction) return;
+
+ const sourceId = source?.data?.id as string | undefined;
+ const destinationId = self?.data?.id as string | undefined;
+
+ handleOnProjectDrop && handleOnProjectDrop(sourceId, destinationId, currentInstruction === "DRAG_BELOW");
+
+ highlightIssueOnDrop(`sidebar-${sourceId}-${projectListType}`);
+ },
+ })
+ );
+ }, [projectRef?.current, dragHandleRef?.current, projectId, isLastChild, projectListType, handleOnProjectDrop]);
+
useOutsideClickDetector(actionSectionRef, () => setIsMenuActive(false));
+ useOutsideClickDetector(projectRef, () => projectRef?.current?.classList?.remove(HIGHLIGHT_CLASS));
if (!project) return null;
@@ -168,48 +275,47 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {
<>
<PublishProjectModal isOpen={publishModalOpen} project={project} onClose={() => setPublishModal(false)} />
<LeaveProjectModal project={project} isOpen={leaveProjectModalOpen} onClose={handleLeaveProjectModalClose} />
- <Disclosure key={`${project.id} ${URLProjectId}`} defaultOpen={URLProjectId === project.id}>
+ <Disclosure key={`${project.id}_${URLProjectId}`} ref={projectRef} defaultOpen={URLProjectId === project.id}>
{({ open }) => (
- <>
+ <div
+ id={`sidebar-${projectId}-${projectListType}`}
+ className={cn("rounded relative", { "bg-custom-sidebar-background-80 opacity-60": isDragging })}
+ >
+ <DropIndicator classNames="absolute top-0" isVisible={instruction === "DRAG_OVER"} />
<div
className={cn(
- "group relative flex w-full items-center rounded-md px-2 py-1 text-custom-sidebar-text-100 hover:bg-custom-sidebar-background-80",
+ "group relative flex w-full items-center rounded-md py-1 text-custom-sidebar-text-100 hover:bg-custom-sidebar-background-80",
{
- "opacity-60": snapshot?.isDragging,
"bg-custom-sidebar-background-80": isMenuActive,
+ "pl-8": disableDrag,
}
)}
>
- {provided && !disableDrag && (
+ {!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-2.5 top-1/2 hidden -translate-y-1/2 rounded p-0.5 text-custom-sidebar-text-400",
+ "flex opacity-0 rounded text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80 ml-2",
{
- "group-hover:flex": !isCollapsed,
+ "group-hover:opacity-100": !isCollapsed,
"cursor-not-allowed opacity-60": project.sort_order === null,
flex: isMenuActive,
}
)}
- {...provided?.dragHandleProps}
+ ref={dragHandleRef}
>
- <MoreVertical className="h-3.5" />
+ <MoreVertical className="-ml-3 h-3.5" />
<MoreVertical className="-ml-5 h-3.5" />
</button>
</Tooltip>
)}
- <Tooltip
- tooltipContent={`${project.name}`}
- position="right"
- className="ml-2"
- disabled={!isCollapsed}
- isMobile={isMobile}
- >
+ <Tooltip tooltipContent={`${project.name}`} position="right" disabled={!isCollapsed} isMobile={isMobile}>
<Disclosure.Button
as="div"
className={cn(
@@ -220,11 +326,11 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {
)}
>
<div
- className={cn("flex w-full flex-grow items-center gap-1 truncate", {
+ className={cn("flex w-full flex-grow items-center gap-1 truncate -ml-1", {
"justify-center": isCollapsed,
})}
>
- <div className="h-7 w-7 grid place-items-center flex-shrink-0">
+ <div className="h-7 w-5 grid place-items-center flex-shrink-0">
<ProjectLogo logo={project.logo_props} />
</div>
{!isCollapsed && <p className="truncate text-custom-sidebar-text-200">{project.name}</p>}
@@ -380,7 +486,8 @@ export const ProjectSidebarListItem: React.FC<Props> = observer((props) => {
})}
</Disclosure.Panel>
</Transition>
- </>
+ {isLastChild && <DropIndicator isVisible={instruction === "DRAG_BELOW"} />}
+ </div>
)}
</Disclosure>
</>
diff --git a/web/components/project/sidebar-list.tsx b/web/components/project/sidebar-list.tsx
index ed1c90692b..b6eb0c7082 100644
--- a/web/components/project/sidebar-list.tsx
+++ b/web/components/project/sidebar-list.tsx
@@ -1,5 +1,6 @@
import { useState, FC, useRef, useEffect } from "react";
-import { DragDropContext, Draggable, DropResult, Droppable } from "@hello-pangea/dnd";
+import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine";
+import { autoScrollForElements } from "@atlaskit/pragmatic-drag-and-drop-auto-scroll/element";
import { observer } from "mobx-react";
import { useRouter } from "next/router";
import { ChevronDown, ChevronRight, Plus } from "lucide-react";
@@ -54,21 +55,28 @@ export const ProjectSidebarList: FC = observer(() => {
});
};
- const onDragEnd = (result: DropResult) => {
- const { source, destination, draggableId } = result;
- if (!destination || !workspaceSlug) return;
- if (source.index === destination.index) return;
+ const handleOnProjectDrop = (
+ sourceId: string | undefined,
+ destinationId: string | undefined,
+ shouldDropAtEnd: boolean
+ ) => {
+ if (!sourceId || !destinationId || !workspaceSlug) return;
+ if (sourceId === destinationId) return;
const joinedProjectsList: IProject[] = [];
joinedProjects.map((projectId) => {
const projectDetails = getProjectById(projectId);
if (projectDetails) joinedProjectsList.push(projectDetails);
});
+
+ const sourceIndex = joinedProjects.indexOf(sourceId);
+ const destinationIndex = shouldDropAtEnd ? joinedProjects.length : joinedProjects.indexOf(destinationId);
+
if (joinedProjectsList.length <= 0) return;
- const updatedSortOrder = orderJoinedProjects(source.index, destination.index, draggableId, joinedProjectsList);
+ const updatedSortOrder = orderJoinedProjects(sourceIndex, destinationIndex, sourceId, joinedProjectsList);
if (updatedSortOrder != undefined)
- updateProjectView(workspaceSlug.toString(), draggableId, { sort_order: updatedSortOrder }).catch(() => {
+ updateProjectView(workspaceSlug.toString(), sourceId, { sort_order: updatedSortOrder }).catch(() => {
setToast({
type: TOAST_TYPE.ERROR,
title: "Error!",
@@ -98,7 +106,21 @@ export const ProjectSidebarList: FC = observer(() => {
currentContainerRef.removeEventListener("scroll", handleScroll);
}
};
- }, []);
+ }, [containerRef]);
+
+ useEffect(() => {
+ const element = containerRef.current;
+
+ if (!element) return;
+
+ return combine(
+ autoScrollForElements({
+ element,
+ canScroll: ({ source }) => source?.data?.dragInstanceId === "PROJECTS",
+ getAllowedAxis: () => "vertical",
+ })
+ );
+ }, [containerRef]);
return (
<>
@@ -123,156 +145,117 @@ export const ProjectSidebarList: FC = observer(() => {
}
)}
>
- <DragDropContext onDragEnd={onDragEnd}>
- <Droppable droppableId="favorite-projects">
- {(provided) => (
- <div ref={provided.innerRef} {...provided.droppableProps}>
- {favoriteProjects && favoriteProjects.length > 0 && (
- <Disclosure as="div" className="flex flex-col" defaultOpen>
- {({ open }) => (
- <>
- {!isCollapsed && (
- <div className="group flex w-full items-center justify-between rounded p-1.5 text-xs text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80">
- <Disclosure.Button
- as="button"
- type="button"
- className="group flex w-full items-center gap-1 whitespace-nowrap rounded px-1.5 text-left text-sm font-semibold text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80"
- >
- Favorites
- {open ? (
- <ChevronDown className="h-3.5 w-3.5" />
- ) : (
- <ChevronRight className="h-3.5 w-3.5" />
- )}
- </Disclosure.Button>
- {isAuthorizedUser && (
- <button
- className="opacity-0 group-hover:opacity-100"
- onClick={() => {
- setTrackElement("APP_SIDEBAR_FAVORITES_BLOCK");
- setIsFavoriteProjectCreate(true);
- setIsProjectModalOpen(true);
- }}
- >
- <Plus className="h-3 w-3" />
- </button>
- )}
- </div>
- )}
- <Transition
- enter="transition duration-100 ease-out"
- enterFrom="transform scale-95 opacity-0"
- enterTo="transform scale-100 opacity-100"
- leave="transition duration-75 ease-out"
- leaveFrom="transform scale-100 opacity-100"
- leaveTo="transform scale-95 opacity-0"
+ <div>
+ {favoriteProjects && favoriteProjects.length > 0 && (
+ <Disclosure as="div" className="flex flex-col" defaultOpen>
+ {({ open }) => (
+ <>
+ {!isCollapsed && (
+ <div className="group flex w-full items-center justify-between rounded p-1.5 text-xs text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80">
+ <Disclosure.Button
+ as="button"
+ type="button"
+ className="group flex w-full items-center gap-1 whitespace-nowrap rounded px-1.5 text-left text-sm font-semibold text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80"
+ >
+ Favorites
+ {open ? <ChevronDown className="h-3.5 w-3.5" /> : <ChevronRight className="h-3.5 w-3.5" />}
+ </Disclosure.Button>
+ {isAuthorizedUser && (
+ <button
+ className="opacity-0 group-hover:opacity-100"
+ onClick={() => {
+ setTrackElement("APP_SIDEBAR_FAVORITES_BLOCK");
+ setIsFavoriteProjectCreate(true);
+ setIsProjectModalOpen(true);
+ }}
>
- <Disclosure.Panel as="div" className="space-y-2">
- {favoriteProjects.map((projectId, index) => (
- <Draggable
- key={projectId}
- draggableId={projectId}
- index={index}
- // FIXME refactor the Draggable to a different component
- //isDragDisabled={!project.is_member}
- >
- {(provided, snapshot) => (
- <div ref={provided.innerRef} {...provided.draggableProps}>
- <ProjectSidebarListItem
- key={projectId}
- projectId={projectId}
- provided={provided}
- snapshot={snapshot}
- handleCopyText={() => handleCopyText(projectId)}
- shortContextMenu
- disableDrag
- />
- </div>
- )}
- </Draggable>
- ))}
- </Disclosure.Panel>
- </Transition>
- {provided.placeholder}
- </>
- )}
- </Disclosure>
- )}
- </div>
- )}
- </Droppable>
- </DragDropContext>
- <DragDropContext onDragEnd={onDragEnd}>
- <Droppable droppableId="joined-projects">
- {(provided) => (
- <div ref={provided.innerRef} {...provided.droppableProps}>
- {joinedProjects && joinedProjects.length > 0 && (
- <Disclosure as="div" className="flex flex-col" defaultOpen>
- {({ open }) => (
- <>
- {!isCollapsed && (
- <div className="group flex w-full items-center justify-between rounded p-1.5 text-xs text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80">
- <Disclosure.Button
- as="button"
- type="button"
- className="group flex w-full items-center gap-1 whitespace-nowrap rounded px-1.5 text-left text-sm font-semibold text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80"
- >
- Your projects
- {open ? (
- <ChevronDown className="h-3.5 w-3.5" />
- ) : (
- <ChevronRight className="h-3.5 w-3.5" />
- )}
- </Disclosure.Button>
- {isAuthorizedUser && (
- <button
- className="opacity-0 group-hover:opacity-100"
- onClick={() => {
- setTrackElement("Sidebar");
- setIsFavoriteProjectCreate(false);
- setIsProjectModalOpen(true);
- }}
- >
- <Plus className="h-3 w-3" />
- </button>
- )}
- </div>
- )}
- <Transition
- enter="transition duration-100 ease-out"
- enterFrom="transform scale-95 opacity-0"
- enterTo="transform scale-100 opacity-100"
- leave="transition duration-75 ease-out"
- leaveFrom="transform scale-100 opacity-100"
- leaveTo="transform scale-95 opacity-0"
+ <Plus className="h-3 w-3" />
+ </button>
+ )}
+ </div>
+ )}
+ <Transition
+ enter="transition duration-100 ease-out"
+ enterFrom="transform scale-95 opacity-0"
+ enterTo="transform scale-100 opacity-100"
+ leave="transition duration-75 ease-out"
+ leaveFrom="transform scale-100 opacity-100"
+ leaveTo="transform scale-95 opacity-0"
+ >
+ <Disclosure.Panel as="div" className="space-y-2">
+ {favoriteProjects.map((projectId, index) => (
+ <ProjectSidebarListItem
+ key={projectId}
+ projectId={projectId}
+ handleCopyText={() => handleCopyText(projectId)}
+ projectListType="FAVORITES"
+ disableDrag
+ disableDrop
+ isLastChild={index === favoriteProjects.length - 1}
+ />
+ ))}
+ </Disclosure.Panel>
+ </Transition>
+ </>
+ )}
+ </Disclosure>
+ )}
+ </div>
+ <div>
+ {joinedProjects && joinedProjects.length > 0 && (
+ <Disclosure as="div" className="flex flex-col" defaultOpen>
+ {({ open }) => (
+ <>
+ {!isCollapsed && (
+ <div className="group flex w-full items-center justify-between rounded p-1.5 text-xs text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80">
+ <Disclosure.Button
+ as="button"
+ type="button"
+ className="group flex w-full items-center gap-1 whitespace-nowrap rounded px-1.5 text-left text-sm font-semibold text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80"
+ >
+ Your projects
+ {open ? <ChevronDown className="h-3.5 w-3.5" /> : <ChevronRight className="h-3.5 w-3.5" />}
+ </Disclosure.Button>
+ {isAuthorizedUser && (
+ <button
+ className="opacity-0 group-hover:opacity-100"
+ onClick={() => {
+ setTrackElement("Sidebar");
+ setIsFavoriteProjectCreate(false);
+ setIsProjectModalOpen(true);
+ }}
>
- <Disclosure.Panel as="div" className="space-y-2">
- {joinedProjects.map((projectId, index) => (
- <Draggable key={projectId} draggableId={projectId} index={index}>
- {(provided, snapshot) => (
- <div ref={provided.innerRef} {...provided.draggableProps}>
- <ProjectSidebarListItem
- key={projectId}
- projectId={projectId}
- provided={provided}
- snapshot={snapshot}
- handleCopyText={() => handleCopyText(projectId)}
- />
- </div>
- )}
- </Draggable>
- ))}
- </Disclosure.Panel>
- </Transition>
- {provided.placeholder}
- </>
- )}
- </Disclosure>
- )}
- </div>
- )}
- </Droppable>
- </DragDropContext>
+ <Plus className="h-3 w-3" />
+ </button>
+ )}
+ </div>
+ )}
+ <Transition
+ enter="transition duration-100 ease-out"
+ enterFrom="transform scale-95 opacity-0"
+ enterTo="transform scale-100 opacity-100"
+ leave="transition duration-75 ease-out"
+ leaveFrom="transform scale-100 opacity-100"
+ leaveTo="transform scale-95 opacity-0"
+ >
+ <Disclosure.Panel as="div">
+ {joinedProjects.map((projectId, index) => (
+ <ProjectSidebarListItem
+ key={projectId}
+ projectId={projectId}
+ projectListType="JOINED"
+ handleCopyText={() => handleCopyText(projectId)}
+ isLastChild={index === joinedProjects.length - 1}
+ handleOnProjectDrop={handleOnProjectDrop}
+ />
+ ))}
+ </Disclosure.Panel>
+ </Transition>
+ </>
+ )}
+ </Disclosure>
+ )}
+ </div>
{isAuthorizedUser && joinedProjects && joinedProjects.length === 0 && (
<button
diff --git a/web/helpers/project.helper.ts b/web/helpers/project.helper.ts
index f479eb25c2..4e1489a6df 100644
--- a/web/helpers/project.helper.ts
+++ b/web/helpers/project.helper.ts
@@ -29,23 +29,16 @@ export const orderJoinedProjects = (
// updating project at the top of the project
const currentSortOrder = joinedProjects[destinationIndex].sort_order || 0;
updatedSortOrder = currentSortOrder - sortOrderDefaultValue;
- } else if (destinationIndex === joinedProjects.length - 1) {
+ } else if (destinationIndex === joinedProjects.length) {
// updating project at the bottom of the project
const currentSortOrder = joinedProjects[destinationIndex - 1].sort_order || 0;
updatedSortOrder = currentSortOrder + sortOrderDefaultValue;
} else {
// updating project in the middle of the project
- if (sourceIndex > destinationIndex) {
- const destinationTopProjectSortOrder = joinedProjects[destinationIndex - 1].sort_order || 0;
- const destinationBottomProjectSortOrder = joinedProjects[destinationIndex].sort_order || 0;
- const updatedValue = (destinationTopProjectSortOrder + destinationBottomProjectSortOrder) / 2;
- updatedSortOrder = updatedValue;
- } else {
- const destinationTopProjectSortOrder = joinedProjects[destinationIndex].sort_order || 0;
- const destinationBottomProjectSortOrder = joinedProjects[destinationIndex + 1].sort_order || 0;
- const updatedValue = (destinationTopProjectSortOrder + destinationBottomProjectSortOrder) / 2;
- updatedSortOrder = updatedValue;
- }
+ const destinationTopProjectSortOrder = joinedProjects[destinationIndex - 1].sort_order || 0;
+ const destinationBottomProjectSortOrder = joinedProjects[destinationIndex].sort_order || 0;
+ const updatedValue = (destinationTopProjectSortOrder + destinationBottomProjectSortOrder) / 2;
+ updatedSortOrder = updatedValue;
}
return updatedSortOrder;
diff --git a/web/package.json b/web/package.json
index cca3ca2f6b..bbdc5662f3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -17,7 +17,6 @@
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
"@blueprintjs/popover2": "^1.13.3",
"@headlessui/react": "^1.7.3",
- "@hello-pangea/dnd": "^16.3.0",
"@nivo/bar": "0.80.0",
"@nivo/calendar": "0.80.0",
"@nivo/core": "0.80.0",
diff --git a/yarn.lock b/yarn.lock
index d5f20fa8f5..816296898a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1176,7 +1176,7 @@
resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
version "7.24.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c"
integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==
@@ -1780,19 +1780,6 @@
"@tanstack/react-virtual" "^3.0.0-beta.60"
client-only "^0.0.1"
-"@hello-pangea/dnd@^16.3.0":
- version "16.6.0"
- resolved "https://registry.yarnpkg.com/@hello-pangea/dnd/-/dnd-16.6.0.tgz#7509639c7bd13f55e537b65a9dcfcd54e7c99ac7"
- integrity sha512-vfZ4GydqbtUPXSLfAvKvXQ6xwRzIjUSjVU0Sx+70VOhc2xx6CdmJXJ8YhH70RpbTUGjxctslQTHul9sIOxCfFQ==
- dependencies:
- "@babel/runtime" "^7.24.1"
- css-box-model "^1.2.1"
- memoize-one "^6.0.0"
- raf-schd "^4.0.3"
- react-redux "^8.1.3"
- redux "^4.2.1"
- use-memo-one "^1.1.3"
-
"@humanwhocodes/config-array@^0.11.14":
version "0.11.14"
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
@@ -4370,14 +4357,6 @@
dependencies:
"@types/unist" "*"
-"@types/hoist-non-react-statics@^3.3.1":
- version "3.3.5"
- resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494"
- integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==
- dependencies:
- "@types/react" "*"
- hoist-non-react-statics "^3.3.0"
-
"@types/html-minifier-terser@^6.0.0":
version "6.1.0"
resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
@@ -4703,11 +4682,6 @@
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.10.tgz#04ffa7f406ab628f7f7e97ca23e290cd8ab15efc"
integrity sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==
-"@types/use-sync-external-store@^0.0.3":
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43"
- integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==
-
"@types/uuid@^8.3.4":
version "8.3.4"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
@@ -6303,13 +6277,6 @@ crypto-random-string@^2.0.0:
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-css-box-model@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
- integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==
- dependencies:
- tiny-invariant "^1.0.6"
-
css-loader@^6.7.1:
version "6.11.0"
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.11.0.tgz#33bae3bf6363d0a7c2cf9031c96c744ff54d85ba"
@@ -8419,7 +8386,7 @@ highlight.js@~11.8.0:
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.8.0.tgz#966518ea83257bae2e7c9a48596231856555bb65"
integrity sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==
-hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.3.1, hoist-non-react-statics@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -9591,11 +9558,6 @@ memfs@^3.4.1, memfs@^3.4.12:
dependencies:
fs-monkey "^1.0.4"
-memoize-one@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
- integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
-
memoizerific@^1.11.3:
version "1.11.3"
resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -11470,18 +11432,6 @@ react-popper@^2.3.0:
react-fast-compare "^3.0.1"
warning "^4.0.2"
-react-redux@^8.1.3:
- version "8.1.3"
- resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.1.3.tgz#4fdc0462d0acb59af29a13c27ffef6f49ab4df46"
- integrity sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==
- dependencies:
- "@babel/runtime" "^7.12.1"
- "@types/hoist-non-react-statics" "^3.3.1"
- "@types/use-sync-external-store" "^0.0.3"
- hoist-non-react-statics "^3.3.2"
- react-is "^18.0.0"
- use-sync-external-store "^1.0.0"
-
react-remove-scroll-bar@^2.3.3:
version "2.3.6"
resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.6.tgz#3e585e9d163be84a010180b18721e851ac81a29c"
@@ -11615,13 +11565,6 @@ redent@^3.0.0:
indent-string "^4.0.0"
strip-indent "^3.0.0"
-redux@^4.2.1:
- version "4.2.1"
- resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
- integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
- dependencies:
- "@babel/runtime" "^7.9.2"
-
reflect.getprototypeof@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859"
@@ -12827,7 +12770,7 @@ through2@^2.0.3:
readable-stream "~2.3.6"
xtend "~4.0.1"
-tiny-invariant@^1.0.6, tiny-invariant@^1.3.1, tiny-invariant@^1.3.3:
+tiny-invariant@^1.3.1, tiny-invariant@^1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
@@ -13406,11 +13349,6 @@ use-debounce@^9.0.4:
resolved "https://registry.yarnpkg.com/use-debounce/-/use-debounce-9.0.4.tgz#51d25d856fbdfeb537553972ce3943b897f1ac85"
integrity sha512-6X8H/mikbrt0XE8e+JXRtZ8yYVvKkdYRfmIhWZYsP8rcNs9hk3APV8Ua2mFkKRLcJKVdnX2/Vwrmg2GWKUQEaQ==
-use-memo-one@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
- integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
-
use-sidecar@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.2.tgz#2f43126ba2d7d7e117aa5855e5d8f0276dfe73c2"
@@ -13419,7 +13357,7 @@ use-sidecar@^1.1.2:
detect-node-es "^1.1.0"
tslib "^2.0.0"
-use-sync-external-store@^1.0.0, use-sync-external-store@^1.2.0:
+use-sync-external-store@^1.2.0:
version "1.2.2"
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9"
integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==