Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 22 additions & 13 deletions components/datarooms/dataroom-document-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type DocumentsCardProps = {
teamInfo: TeamContextType | null;
};
export default function DataroomDocumentCard({
document,
document: dataroomDocument,
teamInfo,
}: DocumentsCardProps) {
const { theme, systemTheme } = useTheme();
Expand All @@ -49,16 +49,25 @@ export default function DataroomDocumentCard({
const [moveFolderOpen, setMoveFolderOpen] = useState<boolean>(false);
const dropdownRef = useRef<HTMLDivElement | null>(null);

// https://github.com/radix-ui/primitives/issues/1241#issuecomment-1888232392
useEffect(() => {
if (!moveFolderOpen) {
setTimeout(() => {
document.body.style.pointerEvents = "";
});
}
}, [moveFolderOpen]);

return (
<>
<li className="group/row relative flex items-center justify-between rounded-lg border-0 p-3 ring-1 ring-gray-200 transition-all hover:bg-secondary hover:ring-gray-300 dark:bg-secondary dark:ring-gray-700 hover:dark:ring-gray-500 sm:p-4">
<div className="flex min-w-0 shrink items-center space-x-2 sm:space-x-4">
<div className="mx-0.5 flex w-8 items-center justify-center text-center sm:mx-1">
{document.document.type === "notion" ? (
{dataroomDocument.document.type === "notion" ? (
<NotionIcon className="h-8 w-8" />
) : (
<Image
src={`/_icons/${document.document.type}${isLight ? "-light" : ""}.svg`}
src={`/_icons/${dataroomDocument.document.type}${isLight ? "-light" : ""}.svg`}
alt="File icon"
width={50}
height={50}
Expand All @@ -70,20 +79,20 @@ export default function DataroomDocumentCard({
<div className="flex items-center">
<h2 className="min-w-0 max-w-[150px] truncate text-sm font-semibold leading-6 text-foreground sm:max-w-md">
<Link
href={`/documents/${document.document.id}`}
href={`/documents/${dataroomDocument.document.id}`}
className="w-full truncate"
>
<span>{document.document.name}</span>
<span>{dataroomDocument.document.name}</span>
<span className="absolute inset-0" />
</Link>
</h2>
</div>
<div className="mt-1 flex items-center space-x-1 text-xs leading-5 text-muted-foreground">
<p className="truncate">{timeAgo(document.createdAt)}</p>
{document.document._count.versions > 1 ? (
<p className="truncate">{timeAgo(dataroomDocument.createdAt)}</p>
{dataroomDocument.document._count.versions > 1 ? (
<>
<p>•</p>
<p className="truncate">{`${document.document._count.versions} Versions`}</p>
<p className="truncate">{`${dataroomDocument.document._count.versions} Versions`}</p>
</>
) : null}
</div>
Expand All @@ -95,12 +104,12 @@ export default function DataroomDocumentCard({
onClick={(e) => {
e.stopPropagation();
}}
href={`/documents/${document.document.id}`}
href={`/documents/${dataroomDocument.document.id}`}
className="z-10 flex items-center space-x-1 rounded-md bg-gray-200 px-1.5 py-0.5 transition-all duration-75 hover:scale-105 active:scale-100 dark:bg-gray-700 sm:px-2"
>
<BarChart className="h-3 w-3 text-muted-foreground sm:h-4 sm:w-4" />
<p className="whitespace-nowrap text-xs text-muted-foreground sm:text-sm">
{nFormatter(document.document._count.views)}
{nFormatter(dataroomDocument.document._count.views)}
<span className="ml-1 hidden sm:inline-block">views</span>
</p>
</Link>
Expand Down Expand Up @@ -144,9 +153,9 @@ export default function DataroomDocumentCard({
<MoveToDataroomFolderModal
open={moveFolderOpen}
setOpen={setMoveFolderOpen}
dataroomId={document.dataroomId}
documentId={document.id}
documentName={document.document.name}
dataroomId={dataroomDocument.dataroomId}
documentId={dataroomDocument.id}
documentName={dataroomDocument.document.name}
/>
) : null}
</>
Expand Down
9 changes: 9 additions & 0 deletions components/documents/document-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ export default function DocumentsCard({
);
}

// https://github.com/radix-ui/primitives/issues/1241#issuecomment-1888232392
useEffect(() => {
if (!moveFolderOpen || !addDataroomOpen) {
setTimeout(() => {
document.body.style.pointerEvents = "";
});
}
}, [moveFolderOpen, addDataroomOpen]);

useEffect(() => {
function handleClickOutside(event: { target: any }) {
if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
Expand Down
11 changes: 10 additions & 1 deletion components/documents/folder-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ export default function FolderCard({
};
}, []);

// https://github.com/radix-ui/primitives/issues/1241#issuecomment-1888232392
useEffect(() => {
if (!openFolder) {
setTimeout(() => {
document.body.style.pointerEvents = "";
});
}
}, [openFolder]);

const handleButtonClick = (event: any, documentId: string) => {
event.stopPropagation();
event.preventDefault();
Expand Down Expand Up @@ -160,7 +169,7 @@ export default function FolderCard({
<li className="group/row relative flex items-center justify-between rounded-lg border-0 p-3 ring-1 ring-gray-400 transition-all hover:bg-secondary hover:ring-gray-500 dark:bg-secondary dark:ring-gray-500 hover:dark:ring-gray-400 sm:p-4">
<div className="flex min-w-0 shrink items-center space-x-2 sm:space-x-4">
<div className="mx-0.5 flex w-8 items-center justify-center text-center sm:mx-1">
<FolderIcon className="h-8 w-8 " strokeWidth={1} />
<FolderIcon className="h-8 w-8" strokeWidth={1} />
</div>

<div className="flex-col">
Expand Down
3 changes: 2 additions & 1 deletion components/documents/move-folder-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ export function MoveToFolderModal({
<DialogContent className="sm:max-w-[425px]">
<DialogHeader className="text-start">
<DialogTitle>
Move <span className="font-bold">{documentName}</span>
Move
<div className="w-[376px] truncate font-bold">{documentName}</div>
</DialogTitle>
<DialogDescription>Move your document to a folder.</DialogDescription>
</DialogHeader>
Expand Down
10 changes: 1 addition & 9 deletions components/folders/edit-folder-modal.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { useRouter } from "next/router";

import { useState } from "react";
import { useEffect, useState } from "react";

import { useTeam } from "@/context/team-context";
import { Folder } from "@prisma/client";
import { toast } from "sonner";
import { mutate } from "swr";

Expand All @@ -20,11 +17,6 @@ import {
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";

import { useAnalytics } from "@/lib/analytics";
import { usePlan } from "@/lib/swr/use-billing";

import { UpgradePlanModal } from "../billing/upgrade-plan-modal";

export function EditFolderModal({
open,
setOpen,
Expand Down