Merge branch 'main' into cursor/update-link-agreement-to-show-compliance-text-7d7a

Author: mfts

SECURITY.md

@@ -2,7 +2,7 @@
 
 ## Supported Versions
 
-All versions of Papermark are currently being supported with security updates.
+The latest version of Papermark is currently being supported with security updates.
 
 ## Reporting a Vulnerability
 

components/search-box.tsx

@@ -137,12 +137,15 @@ export function SearchBoxPersisted({
       currentQuery[urlParam] = debouncedValue;
     }
 
+    // For custom domains, preserve the clean URL structure
+    const isCustomDomain = !!(router.query.domain && router.query.slug);
+
     router.push(
       {
         pathname: router.pathname,
         query: currentQuery,
       },
-      undefined,
+      isCustomDomain ? `/${router.query.slug}` : undefined, // Preserve custom domain URL
       { shallow: true },
     );
   }, [debouncedValue]);
@@ -164,4 +167,4 @@ export function SearchBoxPersisted({
       {...props}
     />
   );
-}
+}

components/view/document-view.tsx

@@ -9,6 +9,7 @@ import { ExtendedRecordMap } from "notion-types";
 import { toast } from "sonner";
 
 import { useAnalytics } from "@/lib/analytics";
+import { useDisablePrint } from "@/lib/hooks/use-disable-print";
 import { LinkWithDocument, NotionTheme, WatermarkConfig } from "@/lib/types";
 
 import LoadingSpinner from "@/components/ui/loading-spinner";
@@ -19,7 +20,6 @@ import AccessForm, {
 
 import EmailVerificationMessage from "./access-form/email-verification-form";
 import ViewData, { TViewDocumentData } from "./view-data";
-import { useDisablePrint } from "@/lib/hooks/use-disable-print";
 
 type RowData = { [key: string]: any };
 type SheetData = {

components/view/viewer/dataroom-viewer.tsx

@@ -1,4 +1,4 @@
-import { useSearchParams } from "next/navigation";
+import { useRouter } from "next/router";
 
 import { useMemo } from "react";
 import React from "react";
@@ -157,8 +157,8 @@ export default function DataroomViewer({
     allowBulkDownload: boolean;
   };
 
-  const searchParams = useSearchParams();
-  const searchQuery = searchParams?.get("search")?.toLowerCase() || "";
+  const router = useRouter();
+  const searchQuery = (router.query.search as string)?.toLowerCase() || "";
 
   const breadcrumbFolders = useMemo(
     () => getParentFolders(folderId, folders),

components/view/viewer/image-viewer.tsx

@@ -1,12 +1,8 @@
 import { useRouter } from "next/router";
 
-
-
 import { useEffect, useRef, useState } from "react";
 import React from "react";
 
-
-
 import { useSafePageViewTracker } from "@/lib/tracking/safe-page-view-tracker";
 import { getTrackingOptions } from "@/lib/tracking/tracking-config";
 import { WatermarkConfig } from "@/lib/types";
@@ -371,4 +367,4 @@ export default function ImageViewer({
       />
     </>
   );
-}
+}