Skip to content

Commit

Permalink
Update pdf.js
Browse files Browse the repository at this point in the history
  • Loading branch information
@stevenjoezhang
stevenjoezhang committed Sep 3, 2023
1 parent d1986a6 commit 996ed6d
Show file tree
Hide file tree
Showing 8 changed files with 115 additions and 70 deletions.
32 changes: 14 additions & 18 deletions build/pdf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ return /******/ (() => { // webpackBootstrap
Object.defineProperty(exports, "__esModule", ({
value: true
}));
exports.VerbosityLevel = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.RenderingIntentFlag = exports.PromiseCapability = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.MAX_IMAGE_SIZE_TO_CACHE = exports.LINE_FACTOR = exports.LINE_DESCENT_FACTOR = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FeatureTest = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.BASELINE_FACTOR = exports.AnnotationType = exports.AnnotationReplyType = exports.AnnotationMode = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationEditorType = exports.AnnotationEditorPrefix = exports.AnnotationEditorParamsType = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
exports.VerbosityLevel = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.RenderingIntentFlag = exports.PromiseCapability = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.MAX_IMAGE_SIZE_TO_CACHE = exports.LINE_FACTOR = exports.LINE_DESCENT_FACTOR = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FeatureTest = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.BASELINE_FACTOR = exports.AnnotationType = exports.AnnotationReplyType = exports.AnnotationPrefix = exports.AnnotationMode = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationEditorType = exports.AnnotationEditorPrefix = exports.AnnotationEditorParamsType = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
exports.assert = assert;
exports.bytesToString = bytesToString;
exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
Expand Down Expand Up @@ -840,6 +840,8 @@ function getUuid() {
}
return bytesToString(buf);
}
const AnnotationPrefix = "pdfjs_internal_id_";
exports.AnnotationPrefix = AnnotationPrefix;

/***/ }),
/* 2 */
Expand Down Expand Up @@ -970,7 +972,7 @@ function getDocument(src) {
}
const fetchDocParams = {
docId,
apiVersion: '3.10.0',
apiVersion: '3.11.0',
data,
password,
disableAutoFetch,
Expand Down Expand Up @@ -2535,11 +2537,7 @@ class WorkerTransport {
class PDFObjects {
#objs = Object.create(null);
#ensureObj(objId) {
const obj = this.#objs[objId];
if (obj) {
return obj;
}
return this.#objs[objId] = {
return this.#objs[objId] ||= {
capability: new _util.PromiseCapability(),
data: null
};
Expand Down Expand Up @@ -2739,9 +2737,9 @@ class InternalRenderTask {
}
}
}
const version = '3.10.0';
const version = '3.11.0';
exports.version = version;
const build = '598421b';
const build = '87ea2ed';
exports.build = build;

/***/ }),
Expand Down Expand Up @@ -2986,7 +2984,7 @@ class AnnotationEditor {
static get defaultPropertiesToUpdate() {
return [];
}
static isHandlingMimeForPasting(_mime) {
static isHandlingMimeForPasting(mime) {
return false;
}
static paste(item, parent) {
Expand Down Expand Up @@ -3556,7 +3554,7 @@ class AnnotationEditor {
this.div?.addEventListener("focusin", this.#boundFocusin);
this.div?.addEventListener("focusout", this.#boundFocusout);
}
serialize(_isForCopying = false, _context = null) {
serialize(isForCopying = false, context = null) {
(0, _util.unreachable)("An editor must be serializable");
}
static deserialize(data, parent, uiManager) {
Expand Down Expand Up @@ -4805,7 +4803,7 @@ exports.AnnotationEditorUIManager = AnnotationEditorUIManager;
Object.defineProperty(exports, "__esModule", ({
value: true
}));
exports.StatTimer = exports.RenderingCancelledException = exports.PixelsPerInch = exports.PageViewport = exports.PDFDateString = exports.DOMStandardFontDataFactory = exports.DOMSVGFactory = exports.DOMFilterFactory = exports.DOMCanvasFactory = exports.DOMCMapReaderFactory = exports.AnnotationPrefix = void 0;
exports.StatTimer = exports.RenderingCancelledException = exports.PixelsPerInch = exports.PageViewport = exports.PDFDateString = exports.DOMStandardFontDataFactory = exports.DOMSVGFactory = exports.DOMFilterFactory = exports.DOMCanvasFactory = exports.DOMCMapReaderFactory = void 0;
exports.deprecated = deprecated;
exports.getColorValues = getColorValues;
exports.getCurrentTransform = getCurrentTransform;
Expand All @@ -4822,8 +4820,6 @@ exports.setLayerDimensions = setLayerDimensions;
var _base_factory = __w_pdfjs_require__(7);
var _util = __w_pdfjs_require__(1);
const SVG_NS = "http://www.w3.org/2000/svg";
const AnnotationPrefix = "pdfjs_internal_id_";
exports.AnnotationPrefix = AnnotationPrefix;
class PixelsPerInch {
static CSS = 96.0;
static PDF = 72.0;
Expand Down Expand Up @@ -15288,7 +15284,7 @@ class PopupAnnotationElement extends AnnotationElement {
elementIds.push(element.data.id);
element.addHighlightArea();
}
this.container.setAttribute("aria-controls", elementIds.join(","));
this.container.setAttribute("aria-controls", elementIds.map(id => `${_util.AnnotationPrefix}${id}`).join(","));
return this.container;
}
}
Expand Down Expand Up @@ -15921,7 +15917,7 @@ class AnnotationLayer {
}
#appendElement(element, id) {
const contentElement = element.firstChild || element;
contentElement.id = `${_display_utils.AnnotationPrefix}${id}`;
contentElement.id = `${_util.AnnotationPrefix}${id}`;
this.div.append(element);
this.#accessibilityManager?.moveElementInDOM(this.div, element, contentElement, false);
}
Expand Down Expand Up @@ -17856,8 +17852,8 @@ var _tools = __w_pdfjs_require__(5);
var _annotation_layer = __w_pdfjs_require__(29);
var _worker_options = __w_pdfjs_require__(14);
var _xfa_layer = __w_pdfjs_require__(32);
const pdfjsVersion = '3.10.0';
const pdfjsBuild = '598421b';
const pdfjsVersion = '3.11.0';
const pdfjsBuild = '87ea2ed';
})();

/******/ return __webpack_exports__;
Expand Down
2 changes: 1 addition & 1 deletion build/pdf.js.map
View file

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions build/pdf.sandbox.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/pdf.sandbox.js.map
View file

Large diffs are not rendered by default.

104 changes: 75 additions & 29 deletions build/pdf.worker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class WorkerMessageHandler {
docId,
apiVersion
} = docParams;
const workerVersion = '3.10.0';
const workerVersion = '3.11.0';
if (apiVersion !== workerVersion) {
throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);
}
Expand Down Expand Up @@ -638,7 +638,7 @@ if (typeof window === "undefined" && !_util.isNodeJS && typeof self !== "undefin
Object.defineProperty(exports, "__esModule", ({
value: true
}));
exports.VerbosityLevel = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.RenderingIntentFlag = exports.PromiseCapability = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.MAX_IMAGE_SIZE_TO_CACHE = exports.LINE_FACTOR = exports.LINE_DESCENT_FACTOR = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FeatureTest = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.BASELINE_FACTOR = exports.AnnotationType = exports.AnnotationReplyType = exports.AnnotationMode = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationEditorType = exports.AnnotationEditorPrefix = exports.AnnotationEditorParamsType = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
exports.VerbosityLevel = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.RenderingIntentFlag = exports.PromiseCapability = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.PageActionEventType = exports.OPS = exports.MissingPDFException = exports.MAX_IMAGE_SIZE_TO_CACHE = exports.LINE_FACTOR = exports.LINE_DESCENT_FACTOR = exports.InvalidPDFException = exports.ImageKind = exports.IDENTITY_MATRIX = exports.FormatError = exports.FeatureTest = exports.FONT_IDENTITY_MATRIX = exports.DocumentActionEventType = exports.CMapCompressionType = exports.BaseException = exports.BASELINE_FACTOR = exports.AnnotationType = exports.AnnotationReplyType = exports.AnnotationPrefix = exports.AnnotationMode = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationEditorType = exports.AnnotationEditorPrefix = exports.AnnotationEditorParamsType = exports.AnnotationBorderStyleType = exports.AnnotationActionEventType = exports.AbortException = void 0;
exports.assert = assert;
exports.bytesToString = bytesToString;
exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
Expand Down Expand Up @@ -1436,6 +1436,8 @@ function getUuid() {
}
return bytesToString(buf);
}
const AnnotationPrefix = "pdfjs_internal_id_";
exports.AnnotationPrefix = AnnotationPrefix;

/***/ }),
/* 3 */
Expand Down Expand Up @@ -3363,12 +3365,13 @@ class Page {
if (!structTreeRoot) {
return null;
}
await this._parsedAnnotations;
const structTree = await this.pdfManager.ensure(this, "_parseStructTree", [structTreeRoot]);
return structTree.serializable;
}
_parseStructTree(structTreeRoot) {
const tree = new _struct_tree.StructTreePage(structTreeRoot, this.pageDict);
tree.parse();
tree.parse(this.ref);
return tree;
}
async getAnnotationsData(handler, task, intent) {
Expand Down Expand Up @@ -3416,7 +3419,7 @@ class Page {
const parsedAnnotations = this.pdfManager.ensure(this, "annotations").then(() => {
const annotationPromises = [];
for (const annotationRef of this.annotations) {
annotationPromises.push(_annotation.AnnotationFactory.create(this.xref, annotationRef, this.pdfManager, this._localIdFactory, false).catch(function (reason) {
annotationPromises.push(_annotation.AnnotationFactory.create(this.xref, annotationRef, this.pdfManager, this._localIdFactory, false, this.ref).catch(function (reason) {
(0, _util.warn)(`_parsedAnnotations: "${reason}".`);
return null;
}));
Expand Down Expand Up @@ -4168,7 +4171,7 @@ class PDFDocument {
if (!promises.has(name)) {
promises.set(name, []);
}
promises.get(name).push(_annotation.AnnotationFactory.create(this.xref, fieldRef, this.pdfManager, this._localIdFactory, true).then(annotation => annotation?.getFieldObject()).catch(function (reason) {
promises.get(name).push(_annotation.AnnotationFactory.create(this.xref, fieldRef, this.pdfManager, this._localIdFactory, true, null).then(annotation => annotation?.getFieldObject()).catch(function (reason) {
(0, _util.warn)(`_collectFieldObjects: "${reason}".`);
return null;
}));
Expand Down Expand Up @@ -4263,10 +4266,10 @@ var _object_loader = __w_pdfjs_require__(76);
var _operator_list = __w_pdfjs_require__(64);
var _factory = __w_pdfjs_require__(77);
class AnnotationFactory {
static create(xref, ref, pdfManager, idFactory, collectFields) {
return Promise.all([pdfManager.ensureCatalog("acroForm"), pdfManager.ensureCatalog("baseUrl"), pdfManager.ensureCatalog("attachments"), pdfManager.ensureDoc("xfaDatasets"), collectFields ? this._getPageIndex(xref, ref, pdfManager) : -1]).then(([acroForm, baseUrl, attachments, xfaDatasets, pageIndex]) => pdfManager.ensure(this, "_create", [xref, ref, pdfManager, idFactory, acroForm, attachments, xfaDatasets, collectFields, pageIndex]));
static create(xref, ref, pdfManager, idFactory, collectFields, pageRef) {
return Promise.all([pdfManager.ensureCatalog("acroForm"), pdfManager.ensureCatalog("baseUrl"), pdfManager.ensureCatalog("attachments"), pdfManager.ensureDoc("xfaDatasets"), collectFields ? this._getPageIndex(xref, ref, pdfManager) : -1, pageRef ? pdfManager.ensureCatalog("structTreeRoot") : null]).then(([acroForm, baseUrl, attachments, xfaDatasets, pageIndex, structTreeRoot]) => pdfManager.ensure(this, "_create", [xref, ref, pdfManager, idFactory, acroForm, attachments, xfaDatasets, collectFields, pageIndex, structTreeRoot, pageRef]));
}
static _create(xref, ref, pdfManager, idFactory, acroForm, attachments = null, xfaDatasets, collectFields, pageIndex = -1) {
static _create(xref, ref, pdfManager, idFactory, acroForm, attachments = null, xfaDatasets, collectFields, pageIndex = -1, structTreeRoot = null, pageRef = null) {
const dict = xref.fetchIfRef(ref);
if (!(dict instanceof _primitives.Dict)) {
return undefined;
Expand All @@ -4288,7 +4291,9 @@ class AnnotationFactory {
collectFields,
needAppearances: !collectFields && acroFormDict.get("NeedAppearances") === true,
pageIndex,
evaluatorOptions: pdfManager.evaluatorOptions
evaluatorOptions: pdfManager.evaluatorOptions,
structTreeRoot,
pageRef
};
switch (subtype) {
case "Link":
Expand Down Expand Up @@ -4634,6 +4639,11 @@ class Annotation {
}
const isLocked = !!(this.flags & _util.AnnotationFlag.LOCKED);
const isContentLocked = !!(this.flags & _util.AnnotationFlag.LOCKEDCONTENTS);
if (params.structTreeRoot) {
let structParent = dict.get("StructParent");
structParent = Number.isInteger(structParent) && structParent >= 0 ? structParent : -1;
params.structTreeRoot.addAnnotationIdToPage(params.pageRef, structParent);
}
this.data = {
annotationFlags: this.flags,
borderStyle: this.borderStyle,
Expand Down Expand Up @@ -45047,24 +45057,41 @@ Object.defineProperty(exports, "__esModule", ({
value: true
}));
exports.StructTreeRoot = exports.StructTreePage = void 0;
var _primitives = __w_pdfjs_require__(4);
var _util = __w_pdfjs_require__(2);
var _primitives = __w_pdfjs_require__(4);
var _name_number_tree = __w_pdfjs_require__(71);
const MAX_DEPTH = 40;
const StructElementType = {
PAGE_CONTENT: "PAGE_CONTENT",
STREAM_CONTENT: "STREAM_CONTENT",
OBJECT: "OBJECT",
ELEMENT: "ELEMENT"
PAGE_CONTENT: 1,
STREAM_CONTENT: 2,
OBJECT: 3,
ANNOTATION: 4,
ELEMENT: 5
};
class StructTreeRoot {
constructor(rootDict) {
this.dict = rootDict;
this.roleMap = new Map();
this.structParentIds = null;
}
init() {
this.readRoleMap();
}
#addIdToPage(pageRef, id, type) {
if (!(pageRef instanceof _primitives.Ref) || id < 0) {
return;
}
this.structParentIds ||= new _primitives.RefSetCache();
let ids = this.structParentIds.get(pageRef);
if (!ids) {
ids = [];
this.structParentIds.put(pageRef, ids);
}
ids.push([id, type]);
}
addAnnotationIdToPage(pageRef, id) {
this.#addIdToPage(pageRef, id, StructElementType.ANNOTATION);
}
readRoleMap() {
const roleMapDict = this.dict.get("RoleMap");
if (!(roleMapDict instanceof _primitives.Dict)) {
Expand Down Expand Up @@ -45147,9 +45174,10 @@ class StructElementNode {
if (this.tree.pageDict.objId !== pageObjId) {
return null;
}
const kidRef = kidDict.getRaw("Stm");
return new StructElement({
type: StructElementType.STREAM_CONTENT,
refObjId: kidDict.getRaw("Stm") instanceof _primitives.Ref ? kidDict.getRaw("Stm").toString() : null,
refObjId: kidRef instanceof _primitives.Ref ? kidRef.toString() : null,
pageObjId,
mcid: kidDict.get("MCID")
});
Expand All @@ -45158,9 +45186,10 @@ class StructElementNode {
if (this.tree.pageDict.objId !== pageObjId) {
return null;
}
const kidRef = kidDict.getRaw("Obj");
return new StructElement({
type: StructElementType.OBJECT,
refObjId: kidDict.getRaw("Obj") instanceof _primitives.Ref ? kidDict.getRaw("Obj").toString() : null,
refObjId: kidRef instanceof _primitives.Ref ? kidRef.toString() : null,
pageObjId
});
}
Expand Down Expand Up @@ -45193,7 +45222,7 @@ class StructTreePage {
this.pageDict = pageDict;
this.nodes = [];
}
parse() {
parse(pageRef) {
if (!this.root || !this.rootDict) {
return;
}
Expand All @@ -45202,18 +45231,32 @@ class StructTreePage {
return;
}
const id = this.pageDict.get("StructParents");
if (!Number.isInteger(id)) {
const ids = pageRef instanceof _primitives.Ref && this.root.structParentIds?.get(pageRef);
if (!Number.isInteger(id) && !ids) {
return;
}
const map = new Map();
const numberTree = new _name_number_tree.NumberTree(parentTree, this.rootDict.xref);
const parentArray = numberTree.get(id);
if (!Array.isArray(parentArray)) {
if (Number.isInteger(id)) {
const parentArray = numberTree.get(id);
if (Array.isArray(parentArray)) {
for (const ref of parentArray) {
if (ref instanceof _primitives.Ref) {
this.addNode(this.rootDict.xref.fetch(ref), map);
}
}
}
}
if (!ids) {
return;
}
const map = new Map();
for (const ref of parentArray) {
if (ref instanceof _primitives.Ref) {
this.addNode(this.rootDict.xref.fetch(ref), map);
for (const [elemId, type] of ids) {
const obj = numberTree.get(elemId);
if (obj) {
const elem = this.addNode(this.rootDict.xref.fetchIfRef(obj), map);
if (elem?.kids?.length === 1 && elem.kids[0].type === StructElementType.OBJECT) {
elem.kids[0].type = type;
}
}
}
}
Expand Down Expand Up @@ -45308,6 +45351,11 @@ class StructTreePage {
type: "object",
id: kid.refObjId
});
} else if (kid.type === StructElementType.ANNOTATION) {
obj.children.push({
type: "annotation",
id: `${_util.AnnotationPrefix}${kid.refObjId}`
});
}
}
}
Expand Down Expand Up @@ -57720,9 +57768,7 @@ class PDFWorkerStream {
return reader;
}
cancelAllRequests(reason) {
if (this._fullRequestReader) {
this._fullRequestReader.cancel(reason);
}
this._fullRequestReader?.cancel(reason);
for (const reader of this._rangeRequestReaders.slice(0)) {
reader.cancel(reason);
}
Expand Down Expand Up @@ -57854,8 +57900,8 @@ Object.defineProperty(exports, "WorkerMessageHandler", ({
}
}));
var _worker = __w_pdfjs_require__(1);
const pdfjsVersion = '3.10.0';
const pdfjsBuild = '598421b';
const pdfjsVersion = '3.11.0';
const pdfjsBuild = '87ea2ed';
})();

/******/ return __webpack_exports__;
Expand Down
2 changes: 1 addition & 1 deletion build/pdf.worker.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 996ed6d

Please sign in to comment.