Merge pull request #19875 from timvandermeij/bump

Bump the stable version in `pdfjs.config`
Bump the stable version in pdfjs.config
2026-07-09 16:45:49 +02:00 · 2025-04-27 14:53:05 +02:00 · 2025-04-27 14:49:27 +02:00 · 2025-04-27 14:15:34 +02:00 · 2025-04-27 14:00:50 +02:00 · 2025-04-27 11:54:08 +02:00
7 changed files with 55 additions and 22 deletions
--- a/pdfjs.config
+++ b/pdfjs.config
@ -1,5 +1,5 @@
 {
-  "stableVersion": "5.1.91",
+  "stableVersion": "5.2.133",
  "baseVersion": "e5fbf52405fbb092351ef1cda8f44fbae3a84473",
  "versionPrefix": "5.2."
 }
--- a/test/integration/freetext_editor_spec.mjs
+++ b/test/integration/freetext_editor_spec.mjs
@ -3233,8 +3233,11 @@ describe("FreeText Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
+          await page.waitForSelector("#editorUndoBar", { visible: true });

-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBarUndoButton", {
+            visible: true,
+          });
          await page.click("#editorUndoBarUndoButton");
          await waitForSerialized(page, 1);
          await page.waitForSelector(editorSelector);
@ -3292,7 +3295,7 @@ describe("FreeText Editor", () => {
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);

-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });
          rect = await getRect(page, ".annotationEditorLayer");
          const secondEditorSelector = getEditorSelector(1);
          const newData = "This is a new text box!";
--- a/test/integration/highlight_editor_spec.mjs
+++ b/test/integration/highlight_editor_spec.mjs
@ -2204,8 +2204,11 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

+          await page.waitForSelector("#editorUndoBarUndoButton", {
+            visible: true,
+          });
          await page.click("#editorUndoBarUndoButton");
          await waitForSerialized(page, 1);
          await page.waitForSelector(editorSelector);
@ -2231,8 +2234,11 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

+          await page.waitForSelector("#editorUndoBarUndoButton", {
+            visible: true,
+          });
          await page.click("#editorUndoBarUndoButton");
          await page.waitForSelector("#editorUndoBar", { hidden: true });
        })
@ -2254,9 +2260,11 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

-          await page.waitForSelector("#editorUndoBarCloseButton");
+          await page.waitForSelector("#editorUndoBarCloseButton", {
+            visible: true,
+          });
          await page.click("#editorUndoBarCloseButton");
          await page.waitForSelector("#editorUndoBar", { hidden: true });
        })
@ -2278,7 +2286,7 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

          const newRect = await getSpanRectFromText(page, 1, "Introduction");
          const newX = newRect.x + newRect.width / 2;
@ -2306,7 +2314,7 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

          await page.evaluate(() => window.print());
          await page.waitForSelector("#editorUndoBar", { hidden: true });
@ -2329,7 +2337,7 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

          await page.click("#printButton");
          await page.waitForSelector("#editorUndoBar", { hidden: true });
@ -2352,7 +2360,7 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

          await kbSave(page);
          await page.waitForSelector("#editorUndoBar", { hidden: true });
@ -2375,7 +2383,7 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

          await page.click("#secondaryToolbarToggleButton");
          await page.click("#lastPage");
@ -2399,7 +2407,7 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

          await switchToHighlight(page, /* disable */ true);
          await page.waitForSelector("#editorUndoBar", { hidden: true });
@ -2422,7 +2430,7 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });
          const pdfPath = path.join(__dirname, "../pdfs/basicapi.pdf");
          const pdfData = fs.readFileSync(pdfPath).toString("base64");
          const dataTransfer = await page.evaluateHandle(data => {
@ -2559,8 +2567,11 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

+          await page.waitForSelector("#editorUndoBarUndoButton", {
+            visible: true,
+          });
          await page.focus("#editorUndoBarUndoButton"); // we have to simulate focus like this to avoid the wait
          await page.keyboard.press("Enter");
          await waitForSerialized(page, 1);
@ -2572,8 +2583,11 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

+          await page.waitForSelector("#editorUndoBarUndoButton", {
+            visible: true,
+          });
          await page.focus("#editorUndoBarUndoButton"); // we have to simulate focus like this to avoid the wait
          await page.keyboard.press(" ");
          await waitForSerialized(page, 1);
@ -2600,7 +2614,7 @@ describe("Highlight Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

          await page.focus("#editorUndoBar");
          await page.keyboard.press("Enter");
--- a/test/integration/ink_editor_spec.mjs
+++ b/test/integration/ink_editor_spec.mjs
@ -896,8 +896,11 @@ describe("Ink Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
+          await page.waitForSelector("#editorUndoBar", { visible: true });

-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBarUndoButton", {
+            visible: true,
+          });
          await page.click("#editorUndoBarUndoButton");
          await waitForSerialized(page, 1);
          await page.waitForSelector(editorSelector);
@ -966,7 +969,7 @@ describe("Ink Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });

          const newRect = await getRect(page, ".annotationEditorLayer");
          const newXStart = newRect.x + 300;
@ -1093,9 +1096,15 @@ describe("Ink Editor", () => {
          await waitForSelectedEditor(page, editorSelector);
          await dragAndDrop(page, editorSelector, [[0, -30]], /* steps = */ 10);
          await waitForSerialized(page, 2);
+
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 1);
+          await page.waitForSelector("#editorUndoBar", { visible: true });
+
+          await page.waitForSelector("#editorUndoBarUndoButton", {
+            visible: true,
+          });
          await page.click("#editorUndoBarUndoButton");
          await page.waitForSelector("#editorUndoBar", { hidden: true });

--- a/test/integration/stamp_editor_spec.mjs
+++ b/test/integration/stamp_editor_spec.mjs
@ -1605,9 +1605,11 @@ describe("Stamp Editor", () => {
          await page.waitForSelector(`${editorSelector} button.delete`);
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);
+          await page.waitForSelector("#editorUndoBar", { visible: true });

-          await page.waitForSelector("#editorUndoBar:not([hidden])");
-
+          await page.waitForSelector("#editorUndoBarUndoButton", {
+            visible: true,
+          });
          await page.click("#editorUndoBarUndoButton");
          await waitForSerialized(page, 1);
          await page.waitForSelector(editorSelector);
@ -1660,7 +1662,7 @@ describe("Stamp Editor", () => {
          await page.click(`${editorSelector} button.delete`);
          await waitForSerialized(page, 0);

-          await page.waitForSelector("#editorUndoBar:not([hidden])");
+          await page.waitForSelector("#editorUndoBar", { visible: true });
          await page.click("#editorStampAddImage");
          const newInput = await page.$("#stampEditorFileInput");
          await newInput.uploadFile(
--- a/web/annotation_layer_builder.css
+++ b/web/annotation_layer_builder.css
@ -14,6 +14,8 @@
 */

 .annotationLayer {
+  color-scheme: only light;
+
  --annotation-unfocused-field-background: url("data:image/svg+xml;charset=UTF-8,<svg width='1px' height='1px' xmlns='http://www.w3.org/2000/svg'><rect width='100%' height='100%' style='fill:rgba(0, 54, 255, 0.13);'/></svg>");
  --input-focus-border-color: Highlight;
  --input-focus-outline: 1px solid Canvas;
@ -305,6 +307,7 @@

  .popup {
    background-color: rgb(255 255 153);
+    color: black;
    box-shadow: 0 calc(2px * var(--total-scale-factor))
      calc(5px * var(--total-scale-factor)) rgb(136 136 136);
    border-radius: calc(2px * var(--total-scale-factor));
--- a/web/xfa_layer_builder.css
+++ b/web/xfa_layer_builder.css
@ -28,6 +28,8 @@
 }

 .xfaLayer {
+  color-scheme: only light;
+
  background-color: transparent;
 }
Author	SHA1	Message	Date
Tim van der Meij	b47b248e15	Merge pull request #19875 from timvandermeij/bump Bump the stable version in `pdfjs.config`	2025-04-27 14:53:05 +02:00
Tim van der Meij	6d0e8d752d	Bump the stable version in `pdfjs.config`	2025-04-27 14:49:27 +02:00
Tim van der Meij	4f7761353c	Merge pull request #19873 from timvandermeij/fix-editor-undo-bar-intermittents Fix the "must work properly when selecting undo by keyboard" integration test	2025-04-27 14:15:34 +02:00
Tim van der Meij	967e34046a	Fix the "must work properly when selecting undo by keyboard" integration test This integration test fails intermittently because the undo button can only be activated if focus can be put on it, and that in turn can only happen if it's visible. The test tried to make sure that the undo bar is visible, but checking for the absence of the `hidden` attribute is unfortunately not enough to assert visibility according to Puppeteer documentation [1]. Moreover, the undo button wasn't checked at all. To fix the issue we let Puppeteer do the visibility detection for the undo bar by providing the `visible: true` option to `waitForSelector` [2]. This is consistent with the other tests that already do this, and also with the existing code that detects if the undo bar is hidden (which uses the `hidden: true` option of `waitForSelector`). Moreover, we wait for the undo button to be present before putting focus on it. For consistency, and to avoid intermittent failures elsewhere, we mirror this solution to the other undo bar/button tests of the various editors. [1] https://pptr.dev/api/puppeteer.elementhandle.isvisible [2] https://pptr.dev/api/puppeteer.waitforselectoroptions	2025-04-27 14:00:50 +02:00
Tim van der Meij	9e1f93e5eb	Merge pull request #19874 from Snuffleupagus/issue-19871 Always render the Annotation- and XFA-layers with light `color-scheme` (issue 19871)	2025-04-27 11:54:08 +02:00
Jonas Jenwald	0852c42c15	Always render the Annotation- and XFA-layers with light `color-scheme` (issue 19871) The intention with PR 19819 was to change how colours are specified for the viewer UI, however it wasn't intended to affect elements in the Annotation- and XFA-layers. Hence we enforce the light `color-scheme` for these layers, and also make sure to provide a default `color` for PopupAnnotations.	2025-04-26 20:44:07 +02:00