Prevent keyboard interaction with form elements in PresentationMode (issue 12232)

This uses the relatively new `HTMLElement.inert` property, see https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/inert for additional information. The only "problem" is that this isn't yet available in all Firefox channels, but until https://bugzilla.mozilla.org/show_bug.cgi?id=1764263 is fixed we're no worse off than before.
This commit is contained in:
Jonas Jenwald 2022-10-30 17:36:20 +01:00
parent f0811a4a3c
commit 547556b5b2
3 changed files with 69 additions and 0 deletions

View File

@ -24,6 +24,7 @@
import { AnnotationLayer } from "pdfjs-lib";
import { NullL10n } from "./l10n_utils.js";
import { PresentationModeState } from "./ui_utils.js";
/**
* @typedef {Object} AnnotationLayerBuilderOptions
@ -46,6 +47,8 @@ import { NullL10n } from "./l10n_utils.js";
*/
class AnnotationLayerBuilder {
#onPresentationModeChanged = null;
/**
* @param {AnnotationLayerBuilderOptions} options
*/
@ -82,6 +85,7 @@ class AnnotationLayerBuilder {
this.div = null;
this._cancelled = false;
this._eventBus = linkService.eventBus;
}
/**
@ -134,11 +138,34 @@ class AnnotationLayerBuilder {
AnnotationLayer.render(parameters);
this.l10n.translate(this.div);
// Ensure that interactive form elements in the annotationLayer are
// disabled while PresentationMode is active (see issue 12232).
if (this.linkService.isInPresentationMode) {
this.#updatePresentationModeState(PresentationModeState.FULLSCREEN);
}
if (!this.#onPresentationModeChanged) {
this.#onPresentationModeChanged = evt => {
this.#updatePresentationModeState(evt.state);
};
this._eventBus?._on(
"presentationmodechanged",
this.#onPresentationModeChanged
);
}
}
}
cancel() {
this._cancelled = true;
if (this.#onPresentationModeChanged) {
this._eventBus?._off(
"presentationmodechanged",
this.#onPresentationModeChanged
);
this.#onPresentationModeChanged = null;
}
}
hide() {
@ -147,6 +174,29 @@ class AnnotationLayerBuilder {
}
this.div.hidden = true;
}
#updatePresentationModeState(state) {
if (!this.div) {
return;
}
let disableFormElements = false;
switch (state) {
case PresentationModeState.FULLSCREEN:
disableFormElements = true;
break;
case PresentationModeState.NORMAL:
break;
default:
return;
}
for (const section of this.div.childNodes) {
if (section.hasAttribute("data-internal-link")) {
continue;
}
section.inert = disableFormElements;
}
}
}
export { AnnotationLayerBuilder };

View File

@ -61,6 +61,11 @@ class IPDFLinkService {
*/
set rotation(value) {}
/**
* @type {boolean}
*/
get isInPresentationMode() {}
/**
* @type {boolean}
*/

View File

@ -173,6 +173,13 @@ class PDFLinkService {
this.pdfViewer.pagesRotation = value;
}
/**
* @type {boolean}
*/
get isInPresentationMode() {
return this.pdfViewer.isInPresentationMode;
}
#goToDestinationHelper(rawDest, namedDest = null, explicitDest) {
// Dest array looks like that: <page-ref> </XYZ|/FitXXX> <args..>
const destRef = explicitDest[0];
@ -673,6 +680,13 @@ class SimpleLinkService {
*/
set rotation(value) {}
/**
* @type {boolean}
*/
get isInPresentationMode() {
return false;
}
/**
* @param {string|Array} dest - The named, or explicit, PDF destination.
*/