Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16899 from calixteman/bug1851498

Browse Source 
Unconditionally render non-form annotations in the annotation layer (bug 1851498)
This commit is contained in:
calixteman 2023-09-05 11:28:23 +02:00 committed by GitHub
commit f2a4f2adaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
src/display/annotation_layer.js
View File

@ -190,6 +190,14 @@ class AnnotationElement {
} }
} }
static _hasPopupData({ titleObj, contentsObj, richText }) {
return !!(titleObj?.str || contentsObj?.str || richText?.str);
}
get hasPopupData() {
return AnnotationElement._hasPopupData(this.data);
}
/** /**
* Create an empty container for the annotation's HTML element. * Create an empty container for the annotation's HTML element.
* *
@ -956,13 +964,7 @@ class LinkAnnotationElement extends AnnotationElement {
class TextAnnotationElement extends AnnotationElement { class TextAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable });
} }
render() { render() {
@ -978,7 +980,7 @@ class TextAnnotationElement extends AnnotationElement {
image.dataset.l10nId = "text_annotation_type"; image.dataset.l10nId = "text_annotation_type";
image.dataset.l10nArgs = JSON.stringify({ type: this.data.name }); image.dataset.l10nArgs = JSON.stringify({ type: this.data.name });
if (!this.data.popupRef) { if (!this.data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -1927,12 +1929,7 @@ class ChoiceWidgetAnnotationElement extends WidgetAnnotationElement {
class PopupAnnotationElement extends AnnotationElement { class PopupAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const { data, elements } = parameters; const { data, elements } = parameters;
const isRenderable = !!( super(parameters, { isRenderable: AnnotationElement._hasPopupData(data) });
data.titleObj?.str ||
data.contentsObj?.str ||
data.richText?.str
);
super(parameters, { isRenderable });
this.elements = elements; this.elements = elements;
} }
@ -2044,9 +2041,7 @@ class PopupElement {
element.addEventListener("click", this.#boundToggle); element.addEventListener("click", this.#boundToggle);
element.addEventListener("mouseenter", this.#boundShow); element.addEventListener("mouseenter", this.#boundShow);
element.addEventListener("mouseleave", this.#boundHide); element.addEventListener("mouseleave", this.#boundHide);
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING")) { element.classList.add("popupTriggerArea");
element.classList.add("popupTriggerArea");
}
} }
// Attach the event listener to toggle the popup with the keyboard. // Attach the event listener to toggle the popup with the keyboard.
@ -2275,13 +2270,7 @@ class PopupElement {
class FreeTextAnnotationElement extends AnnotationElement { class FreeTextAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true, ignoreBorder: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable, ignoreBorder: true });
this.textContent = parameters.data.textContent; this.textContent = parameters.data.textContent;
this.textPosition = parameters.data.textPosition; this.textPosition = parameters.data.textPosition;
this.annotationEditorType = AnnotationEditorType.FREETEXT; this.annotationEditorType = AnnotationEditorType.FREETEXT;
@ -2302,7 +2291,7 @@ class FreeTextAnnotationElement extends AnnotationElement {
this.container.append(content); this.container.append(content);
} }
if (!this.data.popupRef) { if (!this.data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -2316,13 +2305,7 @@ class LineAnnotationElement extends AnnotationElement {
#line = null; #line = null;
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true, ignoreBorder: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable, ignoreBorder: true });
} }
render() { render() {
@ -2357,7 +2340,7 @@ class LineAnnotationElement extends AnnotationElement {
// Create the popup ourselves so that we can bind it to the line instead // Create the popup ourselves so that we can bind it to the line instead
// of to the entire container (which is the default). // of to the entire container (which is the default).
if (!data.popupRef) { if (!data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -2377,13 +2360,7 @@ class SquareAnnotationElement extends AnnotationElement {
#square = null; #square = null;
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true, ignoreBorder: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable, ignoreBorder: true });
} }
render() { render() {
@ -2420,7 +2397,7 @@ class SquareAnnotationElement extends AnnotationElement {
// Create the popup ourselves so that we can bind it to the square instead // Create the popup ourselves so that we can bind it to the square instead
// of to the entire container (which is the default). // of to the entire container (which is the default).
if (!data.popupRef) { if (!data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -2440,13 +2417,7 @@ class CircleAnnotationElement extends AnnotationElement {
#circle = null; #circle = null;
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true, ignoreBorder: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable, ignoreBorder: true });
} }
render() { render() {
@ -2484,7 +2455,7 @@ class CircleAnnotationElement extends AnnotationElement {
// Create the popup ourselves so that we can bind it to the circle instead // Create the popup ourselves so that we can bind it to the circle instead
// of to the entire container (which is the default). // of to the entire container (which is the default).
if (!data.popupRef) { if (!data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -2504,13 +2475,7 @@ class PolylineAnnotationElement extends AnnotationElement {
#polyline = null; #polyline = null;
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true, ignoreBorder: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable, ignoreBorder: true });
this.containerClassName = "polylineAnnotation"; this.containerClassName = "polylineAnnotation";
this.svgElementName = "svg:polyline"; this.svgElementName = "svg:polyline";
@ -2557,8 +2522,8 @@ class PolylineAnnotationElement extends AnnotationElement {
// Create the popup ourselves so that we can bind it to the polyline // Create the popup ourselves so that we can bind it to the polyline
// instead of to the entire container (which is the default). // instead of to the entire container (which is the default).
if (!data.popupRef) { if (!data.popupRef && this.hasPopupData) {
this._createPopup(polyline, data); this._createPopup();
} }
return this.container; return this.container;
@ -2585,19 +2550,13 @@ class PolygonAnnotationElement extends PolylineAnnotationElement {
class CaretAnnotationElement extends AnnotationElement { class CaretAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true, ignoreBorder: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable, ignoreBorder: true });
} }
render() { render() {
this.container.classList.add("caretAnnotation"); this.container.classList.add("caretAnnotation");
if (!this.data.popupRef) { if (!this.data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
return this.container; return this.container;
@ -2608,13 +2567,7 @@ class InkAnnotationElement extends AnnotationElement {
#polylines = []; #polylines = [];
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true, ignoreBorder: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable, ignoreBorder: true });
this.containerClassName = "inkAnnotation"; this.containerClassName = "inkAnnotation";
@ -2661,8 +2614,8 @@ class InkAnnotationElement extends AnnotationElement {
// Create the popup ourselves so that we can bind it to the polyline // Create the popup ourselves so that we can bind it to the polyline
// instead of to the entire container (which is the default). // instead of to the entire container (which is the default).
if (!data.popupRef) { if (!data.popupRef && this.hasPopupData) {
this._createPopup(polyline, data); this._createPopup();
} }
svg.append(polyline); svg.append(polyline);
@ -2683,21 +2636,15 @@ class InkAnnotationElement extends AnnotationElement {
class HighlightAnnotationElement extends AnnotationElement { class HighlightAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const isRenderable = !!(
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { super(parameters, {
isRenderable, isRenderable: true,
ignoreBorder: true, ignoreBorder: true,
createQuadrilaterals: true, createQuadrilaterals: true,
}); });
} }
render() { render() {
if (!this.data.popupRef) { if (!this.data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -2708,21 +2655,15 @@ class HighlightAnnotationElement extends AnnotationElement {
class UnderlineAnnotationElement extends AnnotationElement { class UnderlineAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const isRenderable = !!(
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { super(parameters, {
isRenderable, isRenderable: true,
ignoreBorder: true, ignoreBorder: true,
createQuadrilaterals: true, createQuadrilaterals: true,
}); });
} }
render() { render() {
if (!this.data.popupRef) { if (!this.data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -2733,21 +2674,15 @@ class UnderlineAnnotationElement extends AnnotationElement {
class SquigglyAnnotationElement extends AnnotationElement { class SquigglyAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const isRenderable = !!(
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { super(parameters, {
isRenderable, isRenderable: true,
ignoreBorder: true, ignoreBorder: true,
createQuadrilaterals: true, createQuadrilaterals: true,
}); });
} }
render() { render() {
if (!this.data.popupRef) { if (!this.data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -2758,21 +2693,15 @@ class SquigglyAnnotationElement extends AnnotationElement {
class StrikeOutAnnotationElement extends AnnotationElement { class StrikeOutAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const isRenderable = !!(
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { super(parameters, {
isRenderable, isRenderable: true,
ignoreBorder: true, ignoreBorder: true,
createQuadrilaterals: true, createQuadrilaterals: true,
}); });
} }
render() { render() {
if (!this.data.popupRef) { if (!this.data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
@ -2783,19 +2712,13 @@ class StrikeOutAnnotationElement extends AnnotationElement {
class StampAnnotationElement extends AnnotationElement { class StampAnnotationElement extends AnnotationElement {
constructor(parameters) { constructor(parameters) {
const isRenderable = !!( super(parameters, { isRenderable: true, ignoreBorder: true });
parameters.data.popupRef ||
parameters.data.titleObj?.str ||
parameters.data.contentsObj?.str ||
parameters.data.richText?.str
);
super(parameters, { isRenderable, ignoreBorder: true });
} }
render() { render() {
this.container.classList.add("stampAnnotation"); this.container.classList.add("stampAnnotation");
if (!this.data.popupRef) { if (!this.data.popupRef && this.hasPopupData) {
this._createPopup(); this._createPopup();
} }
return this.container; return this.container;
@ -2847,15 +2770,13 @@ class FileAttachmentAnnotationElement extends AnnotationElement {
} }
} }
} }
trigger.classList.add("popupTriggerArea");
trigger.addEventListener("dblclick", this._download.bind(this)); trigger.addEventListener("dblclick", this._download.bind(this));
this.#trigger = trigger; this.#trigger = trigger;
if ( if (!data.popupRef && this.hasPopupData) {
!data.popupRef &&
(data.titleObj?.str || data.contentsObj?.str || data.richText)
) {
this._createPopup(); this._createPopup();
} else {
trigger.classList.add("popupTriggerArea");
} }
this.container.append(trigger); this.container.append(trigger);

1
test/pdfs/.gitignore vendored
View File

@ -611,3 +611,4 @@
!widget_hidden_print.pdf !widget_hidden_print.pdf
!empty_protected.pdf !empty_protected.pdf
!tagged_stamp.pdf !tagged_stamp.pdf
!bug1851498.pdf

BIN
test/pdfs/bug1851498.pdf Executable file
View File

Binary file not shown.

8
test/test_manifest.json
View File

@ -8126,5 +8126,13 @@
"md5": "af8abe281721f92a0d46646969f061de", "md5": "af8abe281721f92a0d46646969f061de",
"link": true, "link": true,
"type": "other" "type": "other"
},
{
"id": "bug1851498",
"file": "pdfs/bug1851498.pdf",
"md5": "787f092f449016a649c6c9343042429a",
"rounds": 1,
"type": "eq",
"annotations": true
} }
] ]

15
web/annotation_layer_builder.css
View File

@ -337,20 +337,7 @@
font-size: calc(9px * var(--scale-factor)); font-size: calc(9px * var(--scale-factor));
} }
.annotationLayer .highlightAnnotation, .annotationLayer .popupTriggerArea {
.annotationLayer .underlineAnnotation,
.annotationLayer .squigglyAnnotation,
.annotationLayer .strikeoutAnnotation,
.annotationLayer .freeTextAnnotation,
.annotationLayer .lineAnnotation svg line,
.annotationLayer .squareAnnotation svg rect,
.annotationLayer .circleAnnotation svg ellipse,
.annotationLayer .polylineAnnotation svg polyline,
.annotationLayer .polygonAnnotation svg polygon,
.annotationLayer .caretAnnotation,
.annotationLayer .inkAnnotation svg polyline,
.annotationLayer .stampAnnotation,
.annotationLayer .fileAttachmentAnnotation {
cursor: pointer; cursor: pointer;
} }