Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
refactor(folder-tree): improved navigation and behaviour of folder tree
Marc Seitzdb45acb4696f
diff --git a/components/datarooms/folders/sidebar-tree.tsx b/components/datarooms/folders/sidebar-tree.tsxindex 515cab8c..6b8f5d25 100644--- a/components/datarooms/folders/sidebar-tree.tsx+++ b/components/datarooms/folders/sidebar-tree.tsx@@ -47,24 +47,30 @@ const FolderComponent = memo([folder.childFolders, dataroomId],);- const handleFolderClick = () => {- router.push(`/datarooms/${dataroomId}/documents${folder.path}`);- };+ const isActive =+ folder.path === "/" + (router.query.name as string[])?.join("/");+ const isChildActive = folder.childFolders.some(+ (childFolder) =>+ childFolder.path === "/" + (router.query.name as string[])?.join("/"),+ );- const handleChevronClick = (e: React.MouseEvent) => {- e.stopPropagation(); // Prevent navigation+ const handleFolderClick = () => {+ router.push(+ `/datarooms/${dataroomId}/documents${folder.path}`,+ `/datarooms/${dataroomId}/documents${folder.path}`,+ {+ scroll: false,+ },+ );};return (<FileTree.Foldername={folder.name}key={folder.id}- active={- folder.path === "/" + (router.query.name as string[])?.join("/")- }- childActive={router.query.name?.includes(folder.name)}+ active={isActive}+ childActive={isChildActive}onToggle={handleFolderClick}- onChevronClick={handleChevronClick} // Pass the new handler>{childFolders}{documents}diff --git a/components/datarooms/folders/view-tree.tsx b/components/datarooms/folders/view-tree.tsxindex aa6e0a9f..fee7c6b5 100644--- a/components/datarooms/folders/view-tree.tsx+++ b/components/datarooms/folders/view-tree.tsx@@ -69,6 +69,11 @@ const FolderComponent = memo([folder.childFolders, folderId, setFolderId],);+ const isActive = folder.id === folderId;+ const isChildActive = folder.childFolders.some(+ (childFolder) => childFolder.id === folderId,+ );+return (<divonClick={(e) => {@@ -80,11 +85,9 @@ const FolderComponent = memo(<FileTree.Foldername={folder.name}key={folder.id}- // childActive={folder.parentId === folderId}- active={folder.id === folderId}- // onToggle={() =>- // router.push(`/datarooms/${dataroomId}/documents${folder.path}`)- // }+ active={isActive}+ childActive={isChildActive}+ onToggle={() => setFolderId(folder.id)}>{childFolders}{documents}diff --git a/components/sidebar-folders.tsx b/components/sidebar-folders.tsxindex b1c98d75..d52dea7c 100644--- a/components/sidebar-folders.tsx+++ b/components/sidebar-folders.tsx@@ -54,13 +54,30 @@ const FolderComponent = memo(({ folder }: { folder: FolderWithDocuments }) => {[folder.childFolders],);+ const isActive =+ folder.path === "/" + (router.query.name as string[])?.join("/");+ const isChildActive = folder.childFolders.some(+ (childFolder) =>+ childFolder.path === "/" + (router.query.name as string[])?.join("/"),+ );++ const handleFolderClick = () => {+ router.push(+ `/documents/tree${folder.path}`,+ `/documents/tree${folder.path}`,+ {+ scroll: false,+ },+ );+ };+return (<FileTree.Foldername={folder.name}key={folder.id}- active={folder.path === "/" + (router.query.name as string[])?.join("/")}- childActive={router.query.name?.includes(folder.name)}- onToggle={() => router.push(`/documents/tree${folder.path}`)}+ active={isActive}+ childActive={isChildActive}+ onToggle={handleFolderClick}>{childFolders}{documents}diff --git a/components/ui/nextra-filetree.tsx b/components/ui/nextra-filetree.tsxindex 0c8dd602..b4e7230b 100644--- a/components/ui/nextra-filetree.tsx+++ b/components/ui/nextra-filetree.tsx@@ -1,9 +1,18 @@+"use client";+/*** This component is based on the nextra's filetree component from @shuding* https://github.com/shuding/nextra/blob/main/packages/nextra/src/components/file-tree.tsx**/-import { createContext, memo, useCallback, useContext, useState } from "react";+import {+ createContext,+ memo,+ useCallback,+ useContext,+ useEffect,+ useState,+} from "react";import type { ReactElement, ReactNode } from "react";import {@@ -29,7 +38,6 @@ interface FolderProps {active?: boolean;childActive?: boolean;onToggle?: (open: boolean) => void;- onChevronClick?: (e: React.MouseEvent) => void; // New propchildren: ReactNode;}@@ -69,12 +77,17 @@ const Folder = memo<FolderProps>(childActive,defaultOpen = false,onToggle,- onChevronClick,}) => {const indent = useIndent();- const [isOpen, setIsOpen] = useState(defaultOpen || active || childActive);+ const [isOpen, setIsOpen] = useState(defaultOpen || childActive);- const toggle = useCallback(+ useEffect(() => {+ if (childActive) {+ setIsOpen(true);+ }+ }, [childActive]);++ const handleFolderClick = useCallback((e: React.MouseEvent) => {e.stopPropagation();onToggle?.(!isOpen);@@ -82,6 +95,14 @@ const Folder = memo<FolderProps>([isOpen, onToggle],);+ const handleChevronClick = useCallback(+ (e: React.MouseEvent) => {+ e.stopPropagation();+ setIsOpen(!isOpen);+ },+ [isOpen],+ );+const isFolderOpen = open === undefined ? isOpen : open;return (@@ -91,20 +112,16 @@ const Folder = memo<FolderProps>(className={cn("inline-flex w-full cursor-pointer items-center","rounded-md text-foreground duration-100 hover:bg-gray-100 hover:dark:bg-muted",- "px-3 py-1.5 leading-6",+ "px-3 py-1.5 leading-6 ","group",active && "bg-gray-100 font-semibold dark:bg-muted",)}- onClick={toggle}+ onClick={handleFolderClick}><Ident /><div- className="mr-2 rounded p-1 hover:bg-gray-300 group-hover:bg-gray-300 dark:group-hover:bg-muted"- onClick={(e) => {- e.stopPropagation();- onChevronClick?.(e); // Call the new prop if provided- setIsOpen(!isOpen);- }}+ className="-m-1 mr-2 flex h-full items-center justify-center rounded p-2 hover:bg-gray-200 group-hover:bg-gray-200 dark:group-hover:bg-muted"+ onClick={handleChevronClick}><ChevronRightIconclassName={cn(