Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

fix: add overflow truncation to move document to folder modal

Marc Seitz85569dd2c957
diff --git a/components/datarooms/move-dataroom-folder-modal.tsx b/components/datarooms/move-dataroom-folder-modal.tsx
index a5a97470..610ddcac 100644
--- a/components/datarooms/move-dataroom-folder-modal.tsx
+++ b/components/datarooms/move-dataroom-folder-modal.tsx
@@ -5,6 +5,9 @@ import { useState } from "react";
import { useTeam } from "@/context/team-context";
import { toast } from "sonner";
+import { moveDataroomDocumentToFolder } from "@/lib/documents/move-dataroom-documents";
+import { moveDataroomFolderToFolder } from "@/lib/documents/move-dataroom-folders";
+
import { SidebarFolderTreeSelection } from "@/components/datarooms/folders";
import { Button } from "@/components/ui/button";
import {
@@ -16,9 +19,6 @@ import {
DialogTitle,
} from "@/components/ui/dialog";
-import { moveDataroomDocumentToFolder } from "@/lib/documents/move-dataroom-documents";
-import { moveDataroomFolderToFolder } from "@/lib/documents/move-dataroom-folders";
-
import { TSelectedFolder } from "../documents/move-folder-modal";
export function MoveToDataroomFolderModal({
@@ -110,7 +110,7 @@ export function MoveToDataroomFolderModal({
<DialogDescription>Move your item to a folder.</DialogDescription>
</DialogHeader>
<form>
- <div className="mb-2 max-h-[75vh] overflow-y-scroll">
+ <div className="mb-2 max-h-[75vh] overflow-x-hidden overflow-y-scroll">
<SidebarFolderTreeSelection
dataroomId={dataroomId}
selectedFolder={selectedFolder}
@@ -133,7 +133,9 @@ export function MoveToDataroomFolderModal({
) : (
<>
Move to{" "}
- <span className="font-medium">{selectedFolder.name}</span>
+ <span className="max-w-[200px] truncate font-medium">
+ {selectedFolder.name}
+ </span>
</>
)}
</Button>
diff --git a/components/documents/move-folder-modal.tsx b/components/documents/move-folder-modal.tsx
index 0cd4dd7b..d6cb0fb6 100644
--- a/components/documents/move-folder-modal.tsx
+++ b/components/documents/move-folder-modal.tsx
@@ -5,6 +5,9 @@ import { useState } from "react";
import { useTeam } from "@/context/team-context";
import { toast } from "sonner";
+import { moveDocumentToFolder } from "@/lib/documents/move-documents";
+import { moveFolderToFolder } from "@/lib/documents/move-folder";
+
import { SidebarFolderTreeSelection } from "@/components/sidebar-folders";
import { Button } from "@/components/ui/button";
import {
@@ -16,9 +19,6 @@ import {
DialogTitle,
} from "@/components/ui/dialog";
-import { moveDocumentToFolder } from "@/lib/documents/move-documents";
-import { moveFolderToFolder } from "@/lib/documents/move-folder";
-
export type TSelectedFolder = {
id: string | null;
name: string;
@@ -104,14 +104,14 @@ export function MoveToFolderModal({
<DialogHeader className="text-start">
<DialogTitle>
Move
- <div className="w-[376px] truncate font-bold">
+ <div className="truncate font-bold">
{`${(documentIds?.length ?? 0) + (folderIds?.length ?? 0)} items`}
</div>
</DialogTitle>
<DialogDescription>Move your item to a folder.</DialogDescription>
</DialogHeader>
<form>
- <div className="mb-2 max-h-[75vh] overflow-y-scroll">
+ <div className="mb-2 max-h-[75vh] overflow-x-hidden overflow-y-scroll">
<SidebarFolderTreeSelection
selectedFolder={selectedFolder}
setSelectedFolder={setSelectedFolder}
@@ -133,7 +133,9 @@ export function MoveToFolderModal({
) : (
<>
Move to{" "}
- <span className="font-medium">{selectedFolder.name}</span>
+ <span className="max-w-[200px] truncate font-medium">
+ {selectedFolder.name}
+ </span>
</>
)}
</Button>
diff --git a/components/links/link-sheet/upload-section/index.tsx b/components/links/link-sheet/upload-section/index.tsx
index 3b5b4b31..38c3a721 100644
--- a/components/links/link-sheet/upload-section/index.tsx
+++ b/components/links/link-sheet/upload-section/index.tsx
@@ -89,7 +89,7 @@ function FolderSelectionModal({
</DialogDescription>
</DialogHeader>
<form>
- <div className="mb-2 max-h-[75vh] overflow-y-scroll">
+ <div className="mb-2 max-h-[75vh] overflow-x-hidden overflow-y-scroll">
{dataroomId && dataroomId !== "all_documents" ? (
<DataroomFolderTree
dataroomId={dataroomId}
@@ -115,7 +115,9 @@ function FolderSelectionModal({
) : (
<>
Select{" "}
- <span className="font-medium">{selectedFolder.name}</span>
+ <span className="max-w-[200px] truncate font-medium">
+ {selectedFolder.name}
+ </span>
</>
)}
</Button>
diff --git a/components/ui/nextra-filetree.tsx b/components/ui/nextra-filetree.tsx
index 52fd7991..5dafa317 100644
--- a/components/ui/nextra-filetree.tsx
+++ b/components/ui/nextra-filetree.tsx
@@ -120,7 +120,7 @@ const Folder = memo<FolderProps>(
<div
title={name}
className={cn(
- "inline-flex w-full cursor-pointer items-center",
+ "inline-flex w-full cursor-pointer items-center overflow-hidden",
"rounded-md text-foreground duration-100 hover:bg-gray-100 hover:dark:bg-muted",
"px-3 py-1.5 leading-6",
active && "bg-gray-100 font-semibold dark:bg-muted",
@@ -147,7 +147,10 @@ const Folder = memo<FolderProps>(
<FolderIcon className="h-5 w-5 shrink-0" aria-hidden="true" />
)}
<span
- className="ml-2 w-fit truncate"
+ className="ml-2 truncate whitespace-nowrap"
+ style={{
+ maxWidth: `${Math.max(150, 300 - indent * 30)}px`,
+ }}
title={(label ?? name) as string}
>
{label ?? name}
@@ -165,6 +168,7 @@ const Folder = memo<FolderProps>(
Folder.displayName = "Folder";
const File = memo<FileProps>(({ label, name, active, onToggle }) => {
+ const indent = useIndent();
const toggle = useCallback(() => {
onToggle?.(!active);
}, [onToggle]);
@@ -179,12 +183,18 @@ const File = memo<FileProps>(({ label, name, active, onToggle }) => {
)}
>
<span
- className="ml-5 inline-flex cursor-default items-center"
+ className="ml-5 inline-flex w-full cursor-default items-center overflow-hidden"
onClick={toggle}
>
<Ident />
<FileIcon className="h-5 w-5 shrink-0" aria-hidden="true" />
- <span className="ml-2 w-fit truncate" title={(label ?? name) as string}>
+ <span
+ className="ml-2 truncate whitespace-nowrap"
+ style={{
+ maxWidth: `${Math.max(150, 280 - indent * 30)}px`,
+ }}
+ title={(label ?? name) as string}
+ >
{label ?? name}
</span>
</span>