Skip to content

fix: disable drag and drop on mobile #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 14, 2024
Merged

fix: disable drag and drop on mobile #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02fce89
fix: allow all members to move documents
mfts Aug 14, 2024
d49bbc8
fix(documents): hide drag and drop on mobile
mfts Aug 14, 2024
5c33993
Merge branch 'main' into fix/drag
mfts Aug 14, 2024
d1ecd34
fix(datarooms): disable drag documents on mobile
mfts Aug 14, 2024
02ace10
fix: z-index document header
mfts Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 90 additions & 48 deletions components/datarooms/dataroom-items-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
DataroomFolderDocument,
DataroomFolderWithCount,
} from "@/lib/swr/use-dataroom";
import { useMediaQuery } from "@/lib/utils/use-media-query";

import { DraggableItem } from "../documents/drag-and-drop/draggable-item";
import { DroppableFolder } from "../documents/drag-and-drop/droppable-folder";
Expand All @@ -54,6 +55,8 @@ export function DataroomItemsList({
folderCount: number;
documentCount: number;
}) {
const { isMobile } = useMediaQuery();

const [uploads, setUploads] = useState<
{ fileName: string; progress: number; documentId?: string }[]
>([]);
Expand Down Expand Up @@ -221,6 +224,29 @@ export function DataroomItemsList({
const renderItem = (item: FolderOrDocument) => {
const itemId = `${item.itemType}-${item.id}`;

if (isMobile) {
return (
<>
{item.itemType === "folder" ? (
<FolderCard
key={itemId}
folder={item}
teamInfo={teamInfo}
isDataroom={!!dataroomId}
dataroomId={dataroomId}
/>
) : (
<DataroomDocumentCard
key={itemId}
document={item as DataroomFolderDocument}
teamInfo={teamInfo}
dataroomId={dataroomId}
/>
)}
</>
);
}

return (
<>
{item.itemType === "folder" ? (
Expand Down Expand Up @@ -315,55 +341,71 @@ export function DataroomItemsList({
setRejectedFiles={setRejectedFiles}
dataroomId={dataroomId}
>
<DndContext
sensors={sensors}
onDragStart={handleDragStart}
onDragOver={handleDragOver}
onDragEnd={handleDragEnd}
onDragCancel={() => setIsOverFolder(false)}
measuring={{
droppable: {
strategy: MeasuringStrategy.Always,
},
}}
>
<ul role="list" className="space-y-4">
{mixedItems.map(renderItem)}
</ul>

<Portal>
<DragOverlay className="cursor-default">
<motion.div
initial={{ scale: 1, opacity: 1 }}
animate={{ scale: 0.5, opacity: 1 }}
exit={{ scale: 1, opacity: 1 }}
transition={{ duration: 0.2 }}
className="relative flex h-20 w-40 items-center justify-center rounded-lg bg-gray-200"
>
<div className="h-20 w-40 rounded-lg bg-white text-foreground dark:bg-secondary">
{draggedDocumentName}
</div>
{selectedDocuments.length > 1 ? (
<div className="absolute right-0 top-0 rounded-full bg-white p-1 ring ring-gray-500">
<span className="text-xs font-semibold text-gray-500">
{selectedDocuments.length}
</span>
{isMobile ? (
<div>
<ul role="list" className="space-y-4">
{mixedItems.map(renderItem)}
</ul>
<Portal containerId={"documents-header-count"}>
<HeaderContent />
</Portal>
{mixedItems.length === 0 && (
<div className="flex h-full justify-center">
<EmptyDocuments />
</div>
)}
</div>
) : (
<DndContext
sensors={sensors}
onDragStart={handleDragStart}
onDragOver={handleDragOver}
onDragEnd={handleDragEnd}
onDragCancel={() => setIsOverFolder(false)}
measuring={{
droppable: {
strategy: MeasuringStrategy.Always,
},
}}
>
<ul role="list" className="space-y-4">
{mixedItems.map(renderItem)}
</ul>

<Portal>
<DragOverlay className="cursor-default">
<motion.div
initial={{ scale: 1, opacity: 1 }}
animate={{ scale: 0.5, opacity: 1 }}
exit={{ scale: 1, opacity: 1 }}
transition={{ duration: 0.2 }}
className="relative flex h-20 w-40 items-center justify-center rounded-lg bg-gray-200"
>
<div className="h-20 w-40 rounded-lg bg-white text-foreground dark:bg-secondary">
{draggedDocumentName}
</div>
) : null}
</motion.div>
</DragOverlay>
</Portal>

<Portal containerId={"documents-header-count"}>
<HeaderContent />
</Portal>

{mixedItems.length === 0 && (
<div className="flex h-full justify-center">
<EmptyDocuments />
</div>
)}
</DndContext>
{selectedDocuments.length > 1 ? (
<div className="absolute right-0 top-0 rounded-full bg-white p-1 ring ring-gray-500">
<span className="text-xs font-semibold text-gray-500">
{selectedDocuments.length}
</span>
</div>
) : null}
</motion.div>
</DragOverlay>
</Portal>

<Portal containerId={"documents-header-count"}>
<HeaderContent />
</Portal>

{mixedItems.length === 0 && (
<div className="flex h-full justify-center">
<EmptyDocuments />
</div>
)}
</DndContext>
)}
</UploadZone>
{showDrawer ? (
<UploadNotificationDrawer
Expand Down
Loading