mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Merge pull request #14239 from calixteman/1739502

Browse source 
XFA - Fix a breakBefore issue when target is a contentArea and startNew is 1 (bug 1739502)
This commit is contained in:
calixteman 2021-11-08 03:14:42 -08:00 • committed by GitHub
commit 4bb9de4b00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/xfa/layout.js
View file

@ -147,7 +147,10 @@ function addHTML(node, html, bbox) {
break;
}
case "tb": {
extra.width = availableSpace.width;
// Even if the subform can possibly take all the available width,
// we must compute the final width as it is in order to be able
// for example to center the subform within its parent.
extra.width = Math.min(availableSpace.width, Math.max(extra.width, w));
extra.height += h;
extra.children.push(html);
break;

30
src/core/xfa/template.js
View file

@ -370,23 +370,32 @@ function handleBreak(node) {
const pageArea = target && target[$getParent]();
let index;
let nextPageArea = pageArea;
if (node.startNew) {
// startNew === 1 so we must create a new container (pageArea or
// contentArea).
if (target) {
const contentAreas = pageArea.contentArea.children;
index = contentAreas.findIndex(e => e === target) - 1;
const indexForCurrent = contentAreas.indexOf(currentContentArea);
const indexForTarget = contentAreas.indexOf(target);
if (indexForCurrent !== -1 && indexForCurrent < indexForTarget) {
// The next container is after the current container so
// we can stay on the same page.
nextPageArea = null;
}
index = indexForTarget - 1;
} else {
index = currentPageArea.contentArea.children.findIndex(
e => e === currentContentArea
);
index = currentPageArea.contentArea.children.indexOf(currentContentArea);
}
} else if (target && target !== currentContentArea) {
const contentAreas = pageArea.contentArea.children;
index = contentAreas.findIndex(e => e === target) - 1;
index = contentAreas.indexOf(target) - 1;
nextPageArea = pageArea === currentPageArea ? null : pageArea;
} else {
return false;
}
node[$extra].target = pageArea === currentPageArea ? null : pageArea;
node[$extra].target = nextPageArea;
node[$extra].index = index;
return true;
}
@ -5209,6 +5218,13 @@ class Subform extends XFAObject {
style.height = measureToString(height);
}
if (
(style.width === "0px" || style.height === "0px") &&
children.length === 0
) {
return HTMLResult.EMPTY;
}
const html = {
name: "div",
attributes,
@ -5557,7 +5573,7 @@ class Template extends XFAObject {
hasSomething ||
(html.html.children && html.html.children.length !== 0);
htmlContentAreas[i].children.push(html.html);
} else if (!hasSomething) {
} else if (!hasSomething && mainHtml.children.length > 1) {
mainHtml.children.pop();
}
return mainHtml;