Add tagged (accessible) PDFs option (#2347)

kblok · web-flow · commit 90b8b7b0d0a5 · 2023-10-23T02:14:43.000Z
* Add tagged (accessible) PDFs option

* Navigate to page and bump browser
diff --git a/lib/PuppeteerSharp.TestServer/wwwroot/pdf.html b/lib/PuppeteerSharp.TestServer/wwwroot/pdf.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>PDF</title>
+  </head>
+  <body>
+    <div>PDF Content</div>
+  </body>
+</html>
diff --git a/lib/PuppeteerSharp.Tests/PageTests/PdfTests.cs b/lib/PuppeteerSharp.Tests/PageTests/PdfTests.cs
@@ -72,14 +72,40 @@ public async Task CanPrintToPDFAndStreamTheResult()
                 fileInfo.Delete();
             }
             await Page.PdfAsync(outputFile);
-            
+
             var stream = await Page.PdfStreamAsync();
 
             // Firefox in Linux might generate and of by one result here.
             // If the difference is less than 2 bytes is good
             Assert.True(Math.Abs(new FileInfo(outputFile).Length - stream.Length) < 2);
         }
 
+        [PuppeteerTest("page.spec.ts", "printing to PDF", "can print to PDF with accessible")]
+        [Skip(SkipAttribute.Targets.Firefox)]
+        public async Task CanPrintToPdfWithAccessible()
+        {
+            // We test this differently compared to puppeteer.
+            // We will compare that we can get to the same file using both PDF methods
+            var outputFile = Path.Combine(BaseDirectory, "output.pdf");
+            var fileInfo = new FileInfo(outputFile);
+            if (fileInfo.Exists)
+            {
+                fileInfo.Delete();
+            }
+
+            var accessibleOutputFile = Path.Combine(BaseDirectory, "output-accessible.pdf");
+            fileInfo = new FileInfo(accessibleOutputFile);
+            if (fileInfo.Exists)
+            {
+                fileInfo.Delete();
+            }
+            await Page.GoToAsync(TestConstants.ServerUrl + "/pdf.html");
+            await Page.PdfAsync(outputFile);
+            await Page.PdfAsync(accessibleOutputFile, new PdfOptions { Tagged = true });
+
+            Assert.Greater(new FileInfo(accessibleOutputFile).Length, new FileInfo(outputFile).Length);
+        }
+
         [PuppeteerTimeout]
         public void PdfOptionsShouldBeSerializable()
         {
diff --git a/lib/PuppeteerSharp/BrowserData/Chrome.cs b/lib/PuppeteerSharp/BrowserData/Chrome.cs
@@ -13,7 +13,7 @@ public static class Chrome
         /// <summary>
         /// Default chrome build.
         /// </summary>
-        public static string DefaultBuildId => "117.0.5938.149";
+        public static string DefaultBuildId => "118.0.5993.70";
 
         internal static async Task<string> ResolveBuildIdAsync(ChromeReleaseChannel channel)
             => (await GetLastKnownGoodReleaseForChannel(channel).ConfigureAwait(false)).Version;
diff --git a/lib/PuppeteerSharp/Messaging/PagePrintToPDFRequest.cs b/lib/PuppeteerSharp/Messaging/PagePrintToPDFRequest.cs
@@ -31,5 +31,7 @@ internal class PagePrintToPDFRequest
         public bool PreferCSSPageSize { get; set; }
 
         public string TransferMode { get; set; }
+
+        public bool GenerateTaggedPDF { get; set; }
     }
 }
diff --git a/lib/PuppeteerSharp/Page.cs b/lib/PuppeteerSharp/Page.cs
@@ -1186,6 +1186,7 @@ internal async Task<byte[]> PdfInternalAsync(string file, PdfOptions options)
                 MarginRight = marginRight,
                 PageRanges = options.PageRanges,
                 PreferCSSPageSize = options.PreferCSSPageSize,
+                GenerateTaggedPDF = options.Tagged,
             }).ConfigureAwait(false);
 
             if (options.OmitBackground)
diff --git a/lib/PuppeteerSharp/PdfOptions.cs b/lib/PuppeteerSharp/PdfOptions.cs
@@ -92,6 +92,11 @@ public PdfOptions()
         /// </summary>
         public bool OmitBackground { get; set; }
 
+        /// <summary>
+        /// Generate tagged (accessible) PDF.
+        /// </summary>
+        public bool Tagged { get; set; }
+
         /// <summary>Overriding == operator for <see cref="PdfOptions"/>.</summary>
         /// <param name="left">the value to compare against <paramref name="right" />.</param>
         /// <param name="right">the value to compare against <paramref name="left" />.</param>

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,7 @@ internal class PagePrintToPDFRequest`
`31`	`31`	`public bool PreferCSSPageSize { get; set; }`
`32`	`32`
`33`	`33`	`public string TransferMode { get; set; }`
	`34`	`+`
	`35`	`+ public bool GenerateTaggedPDF { get; set; }`
`34`	`36`	`}`
`35`	`37`	`}`