2021-03-19 18:11:40 +09:00
|
|
|
/* Copyright 2021 Mozilla Foundation
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
2021-12-15 07:59:17 +09:00
|
|
|
/** @typedef {import("../src/display/api").PDFPageProxy} PDFPageProxy */
|
|
|
|
// eslint-disable-next-line max-len
|
|
|
|
/** @typedef {import("../src/display/display_utils").PageViewport} PageViewport */
|
|
|
|
/** @typedef {import("./interfaces").IPDFLinkService} IPDFLinkService */
|
Fix Viewer API definitions and include in CI
The Viewer API definitions do not compile because of missing imports and
anonymous objects are typed as `Object`. These issues were not caught
during CI because the test project was not compiling anything from the
Viewer API.
As an example of the first problem:
```
/**
* @implements MyInterface
*/
export class MyClass {
...
}
```
will generate a broken definition that doesn’t import MyInterface:
```
/**
* @implements MyInterface
*/
export class MyClass implements MyInterface {
...
}
```
This can be fixed by adding a typedef jsdoc to specify the import:
```
/** @typedef {import("./otherFile").MyInterface} MyInterface */
```
See https://github.com/jsdoc/jsdoc/issues/1537 and
https://github.com/microsoft/TypeScript/issues/22160 for more details.
As an example of the second problem:
```
/**
* Gets the size of the specified page, converted from PDF units to inches.
* @param {Object} An Object containing the properties: {Array} `view`,
* {number} `userUnit`, and {number} `rotate`.
*/
function getPageSizeInches({ view, userUnit, rotate }) {
...
}
```
generates the broken definition:
```
function getPageSizeInches({ view, userUnit, rotate }: Object) {
...
}
```
The jsdoc should specify the type of each nested property:
```
/**
* Gets the size of the specified page, converted from PDF units to inches.
* @param {Object} options An object containing the properties: {Array} `view`,
* {number} `userUnit`, and {number} `rotate`.
* @param {number[]} options.view
* @param {number} options.userUnit
* @param {number} options.rotate
*/
```
2021-08-26 07:44:06 +09:00
|
|
|
|
2021-03-19 18:11:40 +09:00
|
|
|
import { XfaLayer } from "pdfjs-lib";
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @typedef {Object} XfaLayerBuilderOptions
|
|
|
|
* @property {HTMLDivElement} pageDiv
|
2021-12-15 07:59:17 +09:00
|
|
|
* @property {PDFPageProxy} pdfPage
|
2021-05-24 20:42:42 +09:00
|
|
|
* @property {AnnotationStorage} [annotationStorage]
|
2021-09-30 17:40:21 +09:00
|
|
|
* @property {IPDFLinkService} linkService
|
Export the XFA/StructTree-layers in the viewer components
While e.g. the `simpleviewer` and `singlepageviewer` examples work, since they're based on the `BaseViewer`-class, the standalone `pageviewer` example currently doesn't support either XFA- or StructTree-layers. This seems like an obvious oversight, which can be easily addressed simply by exporting the necessary functionality through `pdf_viewer.component.js`, similar to the existing Text/Annotation-layers.
While working on, and testing, these changes I happened to notice a number of smaller things that's also fixed in this patch:
- Ensure that `XfaLayerBuilder.render` always have a *consistent* return type, to prevent possible run-time failures in `PDFPageView`; PR 13908 follow-up.
- Change the order of the options in the `XfaLayerBuilder`-constructor to agree with the parameter order in the `DefaultXfaLayerFactory.createXfaLayerBuilder`-method.
- Add a missing `textHighlighterFactory`-option, in the JSDocs for the `PDFPageView`-class.
- A couple of small tweaks in the `TextLayerBuilder.render`-method: Re-use an existing Array rather than creating a new one, and replace an `if` with optional chaining instead.
*Please note:* For now XFA-support is currently disabled by default, similar to the regular viewer.
2021-08-29 01:09:39 +09:00
|
|
|
* @property {Object} [xfaHtml]
|
2021-03-19 18:11:40 +09:00
|
|
|
*/
|
|
|
|
|
|
|
|
class XfaLayerBuilder {
|
|
|
|
/**
|
|
|
|
* @param {XfaLayerBuilderOptions} options
|
|
|
|
*/
|
2021-12-15 07:59:17 +09:00
|
|
|
constructor({
|
|
|
|
pageDiv,
|
|
|
|
pdfPage,
|
|
|
|
annotationStorage = null,
|
|
|
|
linkService,
|
|
|
|
xfaHtml = null,
|
|
|
|
}) {
|
2021-03-19 18:11:40 +09:00
|
|
|
this.pageDiv = pageDiv;
|
|
|
|
this.pdfPage = pdfPage;
|
2021-05-24 20:42:42 +09:00
|
|
|
this.annotationStorage = annotationStorage;
|
2021-09-30 17:40:21 +09:00
|
|
|
this.linkService = linkService;
|
Export the XFA/StructTree-layers in the viewer components
While e.g. the `simpleviewer` and `singlepageviewer` examples work, since they're based on the `BaseViewer`-class, the standalone `pageviewer` example currently doesn't support either XFA- or StructTree-layers. This seems like an obvious oversight, which can be easily addressed simply by exporting the necessary functionality through `pdf_viewer.component.js`, similar to the existing Text/Annotation-layers.
While working on, and testing, these changes I happened to notice a number of smaller things that's also fixed in this patch:
- Ensure that `XfaLayerBuilder.render` always have a *consistent* return type, to prevent possible run-time failures in `PDFPageView`; PR 13908 follow-up.
- Change the order of the options in the `XfaLayerBuilder`-constructor to agree with the parameter order in the `DefaultXfaLayerFactory.createXfaLayerBuilder`-method.
- Add a missing `textHighlighterFactory`-option, in the JSDocs for the `PDFPageView`-class.
- A couple of small tweaks in the `TextLayerBuilder.render`-method: Re-use an existing Array rather than creating a new one, and replace an `if` with optional chaining instead.
*Please note:* For now XFA-support is currently disabled by default, similar to the regular viewer.
2021-08-29 01:09:39 +09:00
|
|
|
this.xfaHtml = xfaHtml;
|
2021-03-19 18:11:40 +09:00
|
|
|
|
|
|
|
this.div = null;
|
|
|
|
this._cancelled = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param {PageViewport} viewport
|
|
|
|
* @param {string} intent (default value is 'display')
|
2021-08-19 09:02:29 +09:00
|
|
|
* @returns {Promise<Object | void>} A promise that is resolved when rendering
|
|
|
|
* of the XFA layer is complete. The first rendering will return an object
|
2022-12-11 21:07:44 +09:00
|
|
|
* with a `textDivs` property that can be used with the TextHighlighter.
|
2021-03-19 18:11:40 +09:00
|
|
|
*/
|
2022-12-11 21:07:44 +09:00
|
|
|
async render(viewport, intent = "display") {
|
2021-06-18 18:59:50 +09:00
|
|
|
if (intent === "print") {
|
|
|
|
const parameters = {
|
2021-06-18 19:31:58 +09:00
|
|
|
viewport: viewport.clone({ dontFlip: true }),
|
2021-06-18 18:59:50 +09:00
|
|
|
div: this.div,
|
2021-12-15 07:59:17 +09:00
|
|
|
xfaHtml: this.xfaHtml,
|
2021-06-18 18:59:50 +09:00
|
|
|
annotationStorage: this.annotationStorage,
|
2021-09-30 17:40:21 +09:00
|
|
|
linkService: this.linkService,
|
2021-06-18 18:59:50 +09:00
|
|
|
intent,
|
|
|
|
};
|
2021-03-19 18:11:40 +09:00
|
|
|
|
2021-06-18 18:59:50 +09:00
|
|
|
// Create an xfa layer div and render the form
|
|
|
|
const div = document.createElement("div");
|
2022-06-12 19:20:25 +09:00
|
|
|
this.pageDiv.append(div);
|
2021-06-18 18:59:50 +09:00
|
|
|
parameters.div = div;
|
2021-03-19 18:11:40 +09:00
|
|
|
|
2022-12-11 21:07:44 +09:00
|
|
|
return XfaLayer.render(parameters);
|
2021-05-27 23:56:31 +09:00
|
|
|
}
|
|
|
|
|
2021-06-18 18:59:50 +09:00
|
|
|
// intent === "display"
|
2022-12-11 21:07:44 +09:00
|
|
|
const xfaHtml = await this.pdfPage.getXfa();
|
|
|
|
if (this._cancelled || !xfaHtml) {
|
|
|
|
return { textDivs: [] };
|
|
|
|
}
|
|
|
|
|
|
|
|
const parameters = {
|
|
|
|
viewport: viewport.clone({ dontFlip: true }),
|
|
|
|
div: this.div,
|
|
|
|
xfaHtml,
|
|
|
|
annotationStorage: this.annotationStorage,
|
|
|
|
linkService: this.linkService,
|
|
|
|
intent,
|
|
|
|
};
|
Export the XFA/StructTree-layers in the viewer components
While e.g. the `simpleviewer` and `singlepageviewer` examples work, since they're based on the `BaseViewer`-class, the standalone `pageviewer` example currently doesn't support either XFA- or StructTree-layers. This seems like an obvious oversight, which can be easily addressed simply by exporting the necessary functionality through `pdf_viewer.component.js`, similar to the existing Text/Annotation-layers.
While working on, and testing, these changes I happened to notice a number of smaller things that's also fixed in this patch:
- Ensure that `XfaLayerBuilder.render` always have a *consistent* return type, to prevent possible run-time failures in `PDFPageView`; PR 13908 follow-up.
- Change the order of the options in the `XfaLayerBuilder`-constructor to agree with the parameter order in the `DefaultXfaLayerFactory.createXfaLayerBuilder`-method.
- Add a missing `textHighlighterFactory`-option, in the JSDocs for the `PDFPageView`-class.
- A couple of small tweaks in the `TextLayerBuilder.render`-method: Re-use an existing Array rather than creating a new one, and replace an `if` with optional chaining instead.
*Please note:* For now XFA-support is currently disabled by default, similar to the regular viewer.
2021-08-29 01:09:39 +09:00
|
|
|
|
2022-12-11 21:07:44 +09:00
|
|
|
if (this.div) {
|
|
|
|
return XfaLayer.update(parameters);
|
|
|
|
}
|
|
|
|
// Create an xfa layer div and render the form
|
|
|
|
this.div = document.createElement("div");
|
|
|
|
this.pageDiv.append(this.div);
|
|
|
|
parameters.div = this.div;
|
2021-05-27 23:56:31 +09:00
|
|
|
|
2022-12-11 21:07:44 +09:00
|
|
|
return XfaLayer.render(parameters);
|
2021-03-19 18:11:40 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
cancel() {
|
|
|
|
this._cancelled = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
hide() {
|
|
|
|
if (!this.div) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
this.div.hidden = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-15 21:54:29 +09:00
|
|
|
export { XfaLayerBuilder };
|