From bfe816d0d29e52e89e824fbde9d70248d85b25ac Mon Sep 17 00:00:00 2001
From: Calixte Denizet <calixte.denizet@gmail.com>
Date: Fri, 10 Jun 2022 16:40:55 +0200
Subject: [PATCH] Add an empty entry in combo list when nothing is selected
(bug 1773680)
- it aims to fix https://bugzilla.mozilla.org/show_bug.cgi?id=1773680
- the empty is removed once something is selected.
---
src/display/annotation_layer.js | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js
index a71278187..b74a15dbb 100644
--- a/src/display/annotation_layer.js
+++ b/src/display/annotation_layer.js
@@ -1461,6 +1461,8 @@ class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
selectElement.setAttribute("id", id);
selectElement.tabIndex = DEFAULT_TAB_INDEX;
+ let addAnEmptyEntry = this.data.combo && this.data.options.length > 0;
+
if (!this.data.combo) {
// List boxes have a size and (optionally) multiple selection.
selectElement.size = this.data.options.length;
@@ -1486,10 +1488,27 @@ class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
}
if (storedData.value.includes(option.exportValue)) {
optionElement.setAttribute("selected", true);
+ addAnEmptyEntry = false;
}
selectElement.appendChild(optionElement);
}
+ let removeEmptyEntry = null;
+ if (addAnEmptyEntry) {
+ const noneOptionElement = document.createElement("option");
+ noneOptionElement.value = " ";
+ noneOptionElement.setAttribute("hidden", true);
+ noneOptionElement.setAttribute("selected", true);
+ selectElement.insertBefore(noneOptionElement, selectElement.firstChild);
+
+ removeEmptyEntry = () => {
+ noneOptionElement.remove();
+ selectElement.removeEventListener("input", removeEmptyEntry);
+ removeEmptyEntry = null;
+ };
+ selectElement.addEventListener("input", removeEmptyEntry);
+ }
+
const getValue = (event, isExport) => {
const name = isExport ? "value" : "textContent";
const options = event.target.options;
@@ -1514,6 +1533,7 @@ class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
selectElement.addEventListener("updatefromsandbox", jsEvent => {
const actions = {
value(event) {
+ removeEmptyEntry?.();
const value = event.detail.value;
const values = new Set(Array.isArray(value) ? value : [value]);
for (const option of selectElement.options) {