Skip to content

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

feat: dataroom tree sidebar flex 426e (#2165)

Marc Seitz2ed064f18da3
diff --git a/components/datarooms/folders/view-tree.tsx b/components/datarooms/folders/view-tree.tsx
index 59ecab63..176fe551 100644
--- a/components/datarooms/folders/view-tree.tsx
+++ b/components/datarooms/folders/view-tree.tsx
@@ -221,14 +221,14 @@ const HomeLink = memo(
}
>
<span
- className="inline-flex w-full cursor-pointer items-center"
+ className="flex w-full min-w-0 cursor-pointer items-center"
onClick={(e) => {
e.preventDefault();
setFolderId(null);
}}
>
<HomeIcon className="h-5 w-5 shrink-0" aria-hidden="true" />
- <span className="ml-2 w-fit truncate" title="Home">
+ <span className="ml-2 min-w-0 flex-1 truncate" title="Dataroom Home">
Dataroom Home
</span>
</span>
diff --git a/components/ui/nextra-filetree.tsx b/components/ui/nextra-filetree.tsx
index b4788edb..8041f0ff 100644
--- a/components/ui/nextra-filetree.tsx
+++ b/components/ui/nextra-filetree.tsx
@@ -82,7 +82,7 @@ function Ident(): ReactElement {
return (
<>
{Array.from({ length }, (_, i) => (
- <span className="w-5" key={i} />
+ <span className="w-5 shrink-0" key={i} />
))}
</>
);
@@ -133,14 +133,14 @@ const Folder = memo<FolderProps>(
return (
<li
className={cn(
- "flex w-full list-none flex-col",
+ "flex w-full min-w-0 list-none flex-col",
hasChildren && "space-y-1",
)}
>
<div
title={name}
className={cn(
- "inline-flex w-full cursor-pointer items-center overflow-hidden",
+ "flex w-full min-w-0 cursor-pointer items-center",
"rounded-md duration-100",
prefersLightText
? "text-[var(--viewer-text)] hover:bg-[var(--viewer-control-bg)]"
@@ -157,7 +157,7 @@ const Folder = memo<FolderProps>(
>
<Ident />
<div
- className="-m-1 -ml-2 flex h-full items-center justify-center rounded p-2"
+ className="-m-1 -ml-2 flex h-full shrink-0 items-center justify-center rounded p-2"
onClick={handleChevronClick}
>
<ChevronRightIcon
@@ -173,10 +173,7 @@ const Folder = memo<FolderProps>(
<FolderIcon className="h-5 w-5 shrink-0" aria-hidden="true" />
)}
<span
- className="ml-2 truncate whitespace-nowrap"
- style={{
- maxWidth: `${Math.max(150, 300 - indent * 30)}px`,
- }}
+ className="ml-2 min-w-0 flex-1 truncate whitespace-nowrap"
title={(label ?? name) as string}
>
{label ?? name}
@@ -194,7 +191,6 @@ const Folder = memo<FolderProps>(
Folder.displayName = "Folder";
const File = memo<FileProps>(({ label, name, active, onToggle }) => {
- const indent = useIndent();
const prefersLightText = usePrefersLightText();
const toggle = useCallback(() => {
onToggle?.(!active);
@@ -203,7 +199,7 @@ const File = memo<FileProps>(({ label, name, active, onToggle }) => {
return (
<li
className={cn(
- "flex list-none",
+ "flex min-w-0 list-none",
"rounded-md duration-100",
prefersLightText
? "text-[var(--viewer-muted-text)] hover:bg-[var(--viewer-control-bg)]"
@@ -216,16 +212,13 @@ const File = memo<FileProps>(({ label, name, active, onToggle }) => {
)}
>
<span
- className="ml-5 inline-flex w-full cursor-default items-center overflow-hidden"
+ className="ml-5 flex w-full min-w-0 cursor-default items-center"
onClick={toggle}
>
<Ident />
<FileIcon className="h-5 w-5 shrink-0" aria-hidden="true" />
<span
- className="ml-2 truncate whitespace-nowrap"
- style={{
- maxWidth: `${Math.max(150, 280 - indent * 30)}px`,
- }}
+ className="ml-2 min-w-0 flex-1 truncate whitespace-nowrap"
title={(label ?? name) as string}
>
{label ?? name}
diff --git a/components/view/viewer/dataroom-viewer.tsx b/components/view/viewer/dataroom-viewer.tsx
index dcdf44b6..917a706e 100644
--- a/components/view/viewer/dataroom-viewer.tsx
+++ b/components/view/viewer/dataroom-viewer.tsx
@@ -528,19 +528,21 @@ export default function DataroomViewer({
>
{/* Tree view */}
<div
- className="hidden h-full w-1/4 space-y-8 overflow-auto px-3 pb-4 pt-4 md:flex md:px-6 md:pt-6 lg:px-8 lg:pt-9 xl:px-14"
+ className="hidden h-full shrink-0 overflow-y-auto overflow-x-hidden px-3 pb-4 pt-4 md:block md:px-4 md:pt-6 lg:px-6 lg:pt-9 xl:px-8"
+ style={{
+ // Fluid sidebar: grows with viewport but clamped to sensible
+ // bounds so the tree fills available space without feeling
+ // cramped on narrow screens or stretched on ultra-wide ones.
+ width: "clamp(260px, 28vw, 440px)",
+ }}
>
- <ScrollArea showScrollbar className="w-full">
- <ViewFolderTree
- folders={folders}
- documents={documents}
- setFolderId={setFolderId}
- folderId={folderId}
- dataroomIndexEnabled={dataroomIndexEnabled}
- />
- <ScrollBar orientation="horizontal" />
- <ScrollBar orientation="vertical" />
- </ScrollArea>
+ <ViewFolderTree
+ folders={folders}
+ documents={documents}
+ setFolderId={setFolderId}
+ folderId={folderId}
+ dataroomIndexEnabled={dataroomIndexEnabled}
+ />
</div>
{/* Detail view */}
diff --git a/package-lock.json b/package-lock.json
index 7af669dc..ad842eb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10001,17 +10001,6 @@
"integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==",
"license": "MIT"
},
- "node_modules/@types/whatwg-url": {
- "version": "11.0.5",
- "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz",
- "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==",
- "license": "MIT",
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/webidl-conversions": "*"
- }
- },
"node_modules/@types/ws": {
"version": "8.18.1",
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
@@ -11820,17 +11809,6 @@
"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
}
},
- "node_modules/bson": {
- "version": "6.10.4",
- "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz",
- "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==",
- "license": "Apache-2.0",
- "optional": true,
- "peer": true,
- "engines": {
- "node": ">=16.20.1"
- }
- },
"node_modules/buffer": {
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
@@ -19709,66 +19687,6 @@
"integrity": "sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==",
"license": "MIT"
},
- "node_modules/mongodb": {
- "version": "6.21.0",
- "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.21.0.tgz",
- "integrity": "sha512-URyb/VXMjJ4da46OeSXg+puO39XH9DeQpWCslifrRn9JWugy0D+DvvBvkm2WxmHe61O/H19JM66p1z7RHVkZ6A==",
- "license": "Apache-2.0",
- "optional": true,
- "peer": true,
- "dependencies": {
- "@mongodb-js/saslprep": "^1.3.0",
- "bson": "^6.10.4",
- "mongodb-connection-string-url": "^3.0.2"
- },
- "engines": {
- "node": ">=16.20.1"
- },
- "peerDependencies": {
- "@aws-sdk/credential-providers": "^3.188.0",
- "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
- "gcp-metadata": "^5.2.0",
- "kerberos": "^2.0.1",
- "mongodb-client-encryption": ">=6.0.0 <7",
- "snappy": "^7.3.2",
- "socks": "^2.7.1"
- },
- "peerDependenciesMeta": {
- "@aws-sdk/credential-providers": {
- "optional": true
- },
- "@mongodb-js/zstd": {
- "optional": true
- },
- "gcp-metadata": {
- "optional": true
- },
- "kerberos": {
- "optional": true
- },
- "mongodb-client-encryption": {
- "optional": true
- },
- "snappy": {
- "optional": true
- },
- "socks": {
- "optional": true
- }
- }
- },
- "node_modules/mongodb-connection-string-url": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz",
- "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==",
- "license": "Apache-2.0",
- "optional": true,
- "peer": true,
- "dependencies": {
- "@types/whatwg-url": "^11.0.2",
- "whatwg-url": "^14.1.0 || ^13.0.0"
- }
- },
"node_modules/motion": {
"version": "12.38.0",
"resolved": "https://registry.npmjs.org/motion/-/motion-12.38.0.tgz",
diff --git a/pages/room_ppreview_demo.tsx b/pages/room_ppreview_demo.tsx
index c27a743c..af798ff7 100644
--- a/pages/room_ppreview_demo.tsx
+++ b/pages/room_ppreview_demo.tsx
@@ -94,7 +94,8 @@ export default function ViewPage() {
<div style={{ height: "calc(100vh - 64px)" }} className="relative flex">
{/* Tree view */}
<div
- className="hidden h-full w-1/4 space-y-8 overflow-auto px-3 pb-4 pt-4 md:flex md:px-6 md:pt-6 lg:px-8 lg:pt-9 xl:px-14"
+ className="hidden h-full shrink-0 overflow-y-auto overflow-x-hidden px-3 pb-4 pt-4 md:block md:px-4 md:pt-6 lg:px-6 lg:pt-9 xl:px-8"
+ style={{ width: "clamp(260px, 28vw, 440px)" }}
>
<ViewFolderTree
folders={[