fix(pdf): blank page

betagouv · Nov 12, 2024 · 6332499 · 6332499
1 parent 762821e
commit 6332499
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 12 deletions.
diff --git a/packages/frontend/src/routes/pdf.$reportId.tsx b/packages/frontend/src/routes/pdf.$reportId.tsx
@@ -427,6 +427,7 @@ const View = (props: ReportPDFDocumentProps) => {
       return blob;
     },
     refetchOnWindowFocus: false,
+    enabled: !!props.htmlString,
   });
 
   if (query.isLoading) return <Spinner />;

diff --git a/packages/pdf/src/report.tsx b/packages/pdf/src/report.tsx
@@ -1,4 +1,4 @@
-import { Document, Font, Image, Page, View } from "@react-pdf/renderer";
+import { Document, Font, Image, Page, Text, View } from "@react-pdf/renderer";
 import { Html } from "react-pdf-html";
 import React from "react";
 import type { Udap, Report, Service_instructeurs, Clause_v2, Pictures } from "@cr-vif/electric-client/frontend";
@@ -10,16 +10,17 @@ Font.registerHyphenationCallback((word) => {
 
 export const ReportPDFDocument = ({ udap, htmlString, images, pictures }: ReportPDFDocumentProps) => {
   return (
-    <Document>
+    <Document onRender={console.log}>
       <Page
-        minPresenceAhead={20}
         size="A4"
         style={{
           paddingTop: "48px",
           paddingBottom: "32px",
         }}
       >
         <Html
+          resetStyles
+          collapse
           style={{
             fontSize: "10px",
             paddingLeft: "32px",
@@ -154,16 +155,40 @@ export const ReportPDFDocument = ({ udap, htmlString, images, pictures }: Report
           </body>
         </html>
       `}</Html>
-        {pictures ? (
-          <View break>
-            {pictures
-              .filter((pic) => !!pic.url)
-              .map((pic) => (
-                <Image key={pic.id} style={{ width: `100%`, height: "auto" }} src={pic.url!} />
-              ))}
-          </View>
-        ) : null}
       </Page>
+      {pictures
+        ? pictures
+            .filter((pic) => !!pic.url)
+            .map((pic, index) => (
+              <Page
+                break={index > 0}
+                style={{
+                  paddingTop: "48px",
+                  paddingBottom: "32px",
+                  maxHeight: "100vh",
+                }}
+                key={pic.id}
+                size="A4"
+              >
+                <View
+                  style={{
+                    marginHorizontal: "10%",
+                    maxHeight: "100vh",
+                  }}
+                >
+                  <Image
+                    style={{
+                      width: `auto`,
+                      height: "auto",
+                      objectFit: "contain",
+                      overflow: "hidden",
+                    }}
+                    src={pic.url!}
+                  />
+                </View>
+              </Page>
+            ))
+        : null}
     </Document>
   );
 };