Skip to content

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

fix: watermark

Marc Seitz12a66f645dd4
diff --git a/components/view/dataroom/dataroom-document-view.tsx b/components/view/dataroom/dataroom-document-view.tsx
index 6cd490cb..af1fa676 100644
--- a/components/view/dataroom/dataroom-document-view.tsx
+++ b/components/view/dataroom/dataroom-document-view.tsx
@@ -46,13 +46,15 @@ export type DEFAULT_DATAROOM_DOCUMENT_VIEW_TYPE = {
file: string | null;
pageNumber: string;
embeddedLinks: string[];
- pageLinks: {
- href: string;
- coords: string;
- isInternal?: boolean;
- targetPage?: number;
- }[];
- metadata: { width: number; height: number; scaleFactor: number };
+ pageLinks?:
+ | {
+ href: string;
+ coords: string;
+ isInternal?: boolean;
+ targetPage?: number;
+ }[]
+ | null;
+ metadata: { width: number; height: number; scaleFactor: number } | null;
}[]
| null;
sheetData?: SheetData[] | null;
diff --git a/components/view/document-view.tsx b/components/view/document-view.tsx
index d01b2673..63ea3485 100644
--- a/components/view/document-view.tsx
+++ b/components/view/document-view.tsx
@@ -39,13 +39,15 @@ export type DEFAULT_DOCUMENT_VIEW_TYPE = {
file: string | null;
pageNumber: string;
embeddedLinks: string[];
- pageLinks: {
- href: string;
- coords: string;
- isInternal?: boolean;
- targetPage?: number;
- }[];
- metadata: { width: number; height: number; scaleFactor: number };
+ pageLinks?:
+ | {
+ href: string;
+ coords: string;
+ isInternal?: boolean;
+ targetPage?: number;
+ }[]
+ | null;
+ metadata: { width: number; height: number; scaleFactor: number } | null;
}[]
| null;
sheetData?: SheetData[] | null;
diff --git a/components/view/viewer/horizontal-page-content.tsx b/components/view/viewer/horizontal-page-content.tsx
index 9cce6f19..fb789e77 100644
--- a/components/view/viewer/horizontal-page-content.tsx
+++ b/components/view/viewer/horizontal-page-content.tsx
@@ -16,8 +16,8 @@ export type HorizontalViewerPage = {
file: string | null;
pageNumber: string;
embeddedLinks: string[];
- pageLinks: PageLink[];
- metadata: { width: number; height: number; scaleFactor: number };
+ pageLinks?: PageLink[] | null;
+ metadata: { width: number; height: number; scaleFactor: number } | null;
};
type PageDimensions = Record<number, { width: number; height: number }>;
@@ -64,15 +64,19 @@ export function HorizontalPageContent({
) => void;
onLinkClick: (href: string, event: MouseEvent<HTMLAreaElement>) => void;
}) {
+ // 0 makes getContainedImageRect fall back to the full element box.
+ const aspectRatio =
+ page.metadata && page.metadata.height > 0
+ ? page.metadata.width / page.metadata.height
+ : 0;
+
const watermarkBox = imageDimensions[index];
const watermarkRect =
watermarkConfig && watermarkBox
? getContainedImageRect(
watermarkBox.width,
watermarkBox.height,
- page.metadata.height > 0
- ? page.metadata.width / page.metadata.height
- : 0,
+ aspectRatio,
)
: null;
@@ -133,12 +137,10 @@ export function HorizontalPageContent({
{(() => {
if (!page.pageLinks) return null;
- const { links, media } = partitionPageLinks(
- page.pageLinks as PageLink[],
- );
+ const { links, media } = partitionPageLinks(page.pageLinks);
const displayScale = getScaleFactor({
- naturalHeight: page.metadata.height,
- scaleFactor: page.metadata.scaleFactor,
+ naturalHeight: page.metadata?.height ?? 0,
+ scaleFactor: page.metadata?.scaleFactor ?? 1,
});
// In fullscreen the <img> is given an explicit height plus
@@ -147,20 +149,12 @@ export function HorizontalPageContent({
// watermark) so GIF/video overlays scale and sit on the image instead
// of drifting into the letterbox bands and mis-scaling off the box.
const mediaBox = imageDimensions[index];
- const mediaAspectRatio =
- page.metadata.height > 0
- ? page.metadata.width / page.metadata.height
- : 0;
const mediaRect = mediaBox
- ? getContainedImageRect(
- mediaBox.width,
- mediaBox.height,
- mediaAspectRatio,
- )
+ ? getContainedImageRect(mediaBox.width, mediaBox.height, aspectRatio)
: null;
const mediaScale =
- mediaRect && page.metadata.height > 0
- ? (page.metadata.scaleFactor * mediaRect.height) /
+ mediaRect && page.metadata && page.metadata.height > 0
+ ? ((page.metadata.scaleFactor ?? 1) * mediaRect.height) /
page.metadata.height
: displayScale;
const mediaLeftOffset = mediaRect ? mediaRect.left : 0;
diff --git a/components/view/viewer/pages-vertical-viewer.tsx b/components/view/viewer/pages-vertical-viewer.tsx
index eb75bba9..6a0eab22 100644
--- a/components/view/viewer/pages-vertical-viewer.tsx
+++ b/components/view/viewer/pages-vertical-viewer.tsx
@@ -87,8 +87,8 @@ export default function PagesVerticalViewer({
file: string | null;
pageNumber: string;
embeddedLinks: string[];
- pageLinks: PageLink[];
- metadata: { width: number; height: number; scaleFactor: number };
+ pageLinks?: PageLink[] | null;
+ metadata: { width: number; height: number; scaleFactor: number } | null;
}[];
feedbackEnabled: boolean;
screenshotProtectionEnabled: boolean;
@@ -1012,11 +1012,11 @@ export default function PagesVerticalViewer({
{(() => {
if (!page.pageLinks) return null;
const { links, media } = partitionPageLinks(
- page.pageLinks as PageLink[],
+ page.pageLinks,
);
const displayScale = getScaleFactor({
- naturalHeight: page.metadata.height,
- scaleFactor: page.metadata.scaleFactor,
+ naturalHeight: page.metadata?.height ?? 0,
+ scaleFactor: page.metadata?.scaleFactor ?? 1,
pageIndex: index,
});
// Vertical layout uses px-4/md:px-8 outer padding
diff --git a/lib/hooks/use-lazy-pages.ts b/lib/hooks/use-lazy-pages.ts
index 12eb3f97..2b60f2a9 100644
--- a/lib/hooks/use-lazy-pages.ts
+++ b/lib/hooks/use-lazy-pages.ts
@@ -6,8 +6,8 @@ type PageData = {
file: string | null;
pageNumber: string;
embeddedLinks: string[];
- pageLinks: PageLink[];
- metadata: { width: number; height: number; scaleFactor: number };
+ pageLinks?: PageLink[] | null;
+ metadata: { width: number; height: number; scaleFactor: number } | null;
};
type FetchPagesResponse = {
diff --git a/lib/types/document-preview.ts b/lib/types/document-preview.ts
index 0e8ceaa2..5529cee7 100644
--- a/lib/types/document-preview.ts
+++ b/lib/types/document-preview.ts
@@ -12,8 +12,8 @@ export interface DocumentPreviewData {
file: string | null;
pageNumber: string;
embeddedLinks: string[];
- pageLinks: PageLink[];
- metadata: { width: number; height: number; scaleFactor: number };
+ pageLinks?: PageLink[] | null;
+ metadata: { width: number; height: number; scaleFactor: number } | null;
}[];
file?: string;
sheetData?: any;