Merge branch 'main' into website-changes

ArpitBlagan · Jun 15, 2024 · 1346e93 · 1346e93
2 parents d150fd4 + 2e1d4fa
commit 1346e93
Show file tree

Hide file tree

Showing 119 changed files with 7,856 additions and 4,258 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -2,4 +2,6 @@ node_modules/
 .next/
 .react-email/
 .vercel/
-.github/
+.github/
+*.min.js
+*.min.css
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/components/NotionPage.tsx b/components/NotionPage.tsx
@@ -1,11 +1,13 @@
 import { useEffect, useRef, useState } from "react";
+import React from "react";
 
 import { Brand, DataroomBrand } from "@prisma/client";
 import { ExtendedRecordMap } from "notion-types";
 import { NotionRenderer } from "react-notion-x";
 // core styles shared by all of react-notion-x (required)
 import "react-notion-x/src/styles.css";
 
+import { TDocumentData } from "./view/dataroom/dataroom-view";
 import Nav from "./view/nav";
 
 export const NotionPage = ({
@@ -29,7 +31,7 @@ export const NotionPage = ({
   documentName?: string;
   brand?: Partial<Brand> | Partial<DataroomBrand> | null;
   dataroomId?: string;
-  setDocumentData?: (data: any) => void;
+  setDocumentData?: React.Dispatch<React.SetStateAction<TDocumentData | null>>;
 }) => {
   const [pageNumber, setPageNumber] = useState<number>(1); // start on first page
   const [maxScrollPercentage, setMaxScrollPercentage] = useState<number>(0);

diff --git a/components/datarooms/add-dataroom-document-modal.tsx b/components/datarooms/add-dataroom-document-modal.tsx
diff --git a/components/datarooms/dataroom-trial-modal.tsx b/components/datarooms/dataroom-trial-modal.tsx
@@ -43,7 +43,7 @@ export function DataroomTrialModal({
   const [companySize, setCompanySize] = useState<string>("");
   const [name, setName] = useState<string>("");
   const [companyName, setCompanyName] = useState<string>("");
-  const [phoneNumber, setPhoneNumber] = useState<E164Number>("");
+  const [phoneNumber, setPhoneNumber] = useState<E164Number | null>(null);
   const [loading, setLoading] = useState<boolean>(false);
   const [open, setOpen] = useState<boolean>(false);
 

diff --git a/components/datarooms/folders/selection-tree.tsx b/components/datarooms/folders/selection-tree.tsx
@@ -1,5 +1,6 @@
 import { memo, useMemo } from "react";
 
+import { TSelectedFolder } from "@/components/documents/move-folder-modal";
 import { FileTree } from "@/components/ui/nextra-filetree";
 
 import {
@@ -12,12 +13,12 @@ import { buildNestedFolderStructure } from "./utils";
 const FolderComponentSelection = memo(
   ({
     folder,
-    selectedFolderId,
-    setFolderId,
+    selectedFolder,
+    setSelectedFolder,
   }: {
     folder: DataroomFolderWithDocuments;
-    selectedFolderId: string;
-    setFolderId: React.Dispatch<React.SetStateAction<string>>;
+    selectedFolder: TSelectedFolder;
+    setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;
   }) => {
     // Recursively render child folders if they exist
     const childFolders = useMemo(
@@ -26,25 +27,34 @@ const FolderComponentSelection = memo(
           <FolderComponentSelection
             key={childFolder.id}
             folder={childFolder}
-            selectedFolderId={selectedFolderId}
-            setFolderId={setFolderId}
+            selectedFolder={selectedFolder}
+            setSelectedFolder={setSelectedFolder}
           />
         )),
-      [folder.childFolders, selectedFolderId, setFolderId],
+      [folder.childFolders, selectedFolder, setSelectedFolder],
+    );
+
+    const isActive = folder.id === selectedFolder?.id;
+    const isChildActive = folder.childFolders.some(
+      (childFolder) => childFolder.id === selectedFolder?.id,
     );
 
     return (
       <div
         onClick={(e) => {
           e.preventDefault();
           e.stopPropagation();
-          setFolderId(folder.id);
+          setSelectedFolder({ id: folder.id, name: folder.name });
         }}
       >
         <FileTree.Folder
           name={folder.name}
           key={folder.id}
-          active={folder.id === selectedFolderId}
+          active={isActive}
+          childActive={isChildActive}
+          onToggle={() =>
+            setSelectedFolder({ id: folder.id, name: folder.name })
+          }
         >
           {childFolders}
         </FileTree.Folder>
@@ -56,12 +66,12 @@ FolderComponentSelection.displayName = "FolderComponentSelection";
 
 const SidebarFoldersSelectipon = ({
   folders,
-  selectedFolderId,
-  setFolderId,
+  selectedFolder,
+  setSelectedFolder,
 }: {
   folders: DataroomFolderWithDocuments[];
-  selectedFolderId: string;
-  setFolderId: React.Dispatch<React.SetStateAction<string>>;
+  selectedFolder: TSelectedFolder;
+  setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;
 }) => {
   const nestedFolders = useMemo(() => {
     if (folders) {
@@ -76,8 +86,8 @@ const SidebarFoldersSelectipon = ({
         <FolderComponentSelection
           key={folder.id}
           folder={folder}
-          selectedFolderId={selectedFolderId}
-          setFolderId={setFolderId}
+          selectedFolder={selectedFolder}
+          setSelectedFolder={setSelectedFolder}
         />
       ))}
     </FileTree>
@@ -86,12 +96,12 @@ const SidebarFoldersSelectipon = ({
 
 export function SidebarFolderTreeSelection({
   dataroomId,
-  selectedFolderId,
-  setFolderId,
+  selectedFolder,
+  setSelectedFolder,
 }: {
   dataroomId: string;
-  selectedFolderId: string;
-  setFolderId: React.Dispatch<React.SetStateAction<string>>;
+  selectedFolder: TSelectedFolder;
+  setSelectedFolder: React.Dispatch<React.SetStateAction<TSelectedFolder>>;
 }) {
   const { folders, error } = useDataroomFoldersTree({ dataroomId });
 
@@ -100,8 +110,8 @@ export function SidebarFolderTreeSelection({
   return (
     <SidebarFoldersSelectipon
       folders={folders}
-      selectedFolderId={selectedFolderId}
-      setFolderId={setFolderId}
+      selectedFolder={selectedFolder}
+      setSelectedFolder={setSelectedFolder}
     />
   );
 }
diff --git a/components/datarooms/folders/sidebar-tree.tsx b/components/datarooms/folders/sidebar-tree.tsx
@@ -47,17 +47,30 @@ const FolderComponent = memo(
       [folder.childFolders, dataroomId],
     );
 
+    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(
+        `/datarooms/${dataroomId}/documents${folder.path}`,
+        `/datarooms/${dataroomId}/documents${folder.path}`,
+        {
+          scroll: false,
+        },
+      );
+    };
+
     return (
       <FileTree.Folder
         name={folder.name}
         key={folder.id}
-        active={
-          folder.path === "/" + (router.query.name as string[])?.join("/")
-        }
-        childActive={router.query.name?.includes(folder.name)}
-        onToggle={() =>
-          router.push(`/datarooms/${dataroomId}/documents${folder.path}`)
-        }
+        active={isActive}
+        childActive={isChildActive}
+        onToggle={handleFolderClick}
       >
         {childFolders}
         {documents}

diff --git 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 (
       <div
         onClick={(e) => {
@@ -80,11 +85,9 @@ const FolderComponent = memo(
         <FileTree.Folder
           name={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}