From 5bef8120e710f79346bc9040c7b76a7f20a935e0 Mon Sep 17 00:00:00 2001
From: Calixte Denizet <calixte.denizet@gmail.com>
Date: Fri, 17 Sep 2021 12:41:50 +0200
Subject: [PATCH] Annotation - For checkboxes, get field value from AS (if any)
 instead of V (bug 1722036)   - it aims to fix
 https://bugzilla.mozilla.org/show_bug.cgi?id=1722036.   - AS and V should
 share the same value for checkbox: it's at least what the specs say;   - the
 pdf in the above bug opens correctly in Acrobat so it likely means that AS is
 chosen over V.

---
 src/core/annotation.js        | 7 +++++++
 test/pdfs/bug1722036.pdf.link | 1 +
 test/test_manifest.json       | 8 ++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 test/pdfs/bug1722036.pdf.link

diff --git a/src/core/annotation.js b/src/core/annotation.js
index 197012cd3..3dff3f7c4 100644
--- a/src/core/annotation.js
+++ b/src/core/annotation.js
@@ -2083,6 +2083,13 @@ class ButtonWidgetAnnotation extends WidgetAnnotation {
       return;
     }
 
+    // See https://bugzilla.mozilla.org/show_bug.cgi?id=1722036.
+    // If we've an AS and a V then take AS.
+    const asValue = this._decodeFormValue(params.dict.get("AS"));
+    if (typeof asValue === "string") {
+      this.data.fieldValue = asValue;
+    }
+
     const exportValues = normalAppearance.getKeys();
     if (!exportValues.includes("Off")) {
       // The /Off appearance is optional.
diff --git a/test/pdfs/bug1722036.pdf.link b/test/pdfs/bug1722036.pdf.link
new file mode 100644
index 000000000..d82c95add
--- /dev/null
+++ b/test/pdfs/bug1722036.pdf.link
@@ -0,0 +1 @@
+https://bugzilla.mozilla.org/attachment.cgi?id=9232845
diff --git a/test/test_manifest.json b/test/test_manifest.json
index 508fc5208..c45fb9210 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -5899,5 +5899,13 @@
        "rounds": 1,
        "lastPage": 1,
        "type": "eq"
+    },
+    {  "id": "bug1722036",
+       "file": "pdfs/bug1722036.pdf",
+       "md5": "bbc7f62ca85609c97069bd3ce2658288",
+       "rounds": 1,
+       "link": true,
+       "forms": true,
+       "type": "eq"
     }
 ]