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

Merge pull request #13502 from calixteman/contentarea

Browse Source 
XFA - contentarea must be on top of the other containers in a pageArea
This commit is contained in:
Brendan Dahl 2021-06-09 12:36:21 -07:00 committed by GitHub
commit aa2712744d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/xfa/template.js
View File

@ -3304,7 +3304,14 @@ class PageArea extends XFAObject {
} }
this[$childrenToHTML]({ this[$childrenToHTML]({
filter: new Set(["area", "draw", "field", "subform", "contentArea"]), filter: new Set(["area", "draw", "field", "subform"]),
include: true,
});
// contentarea must be the last container to be sure it is
// on top of the others.
this[$childrenToHTML]({
filter: new Set(["contentArea"]),
include: true, include: true,
}); });

6
test/unit/xfa_tohtml_spec.js
View File

@ -65,7 +65,7 @@ describe("XFAFactory", function () {
}); });
expect(page1.children.length).toEqual(2); expect(page1.children.length).toEqual(2);
const container = page1.children[0]; const container = page1.children[1];
expect(container.attributes.class).toEqual(["xfaContentarea"]); expect(container.attributes.class).toEqual(["xfaContentarea"]);
expect(container.attributes.style).toEqual({ expect(container.attributes.style).toEqual({
height: "789px", height: "789px",
@ -75,7 +75,7 @@ describe("XFAFactory", function () {
position: "absolute", position: "absolute",
}); });
const wrapper = page1.children[1]; const wrapper = page1.children[0];
const draw = wrapper.children[0]; const draw = wrapper.children[0];
expect(wrapper.attributes.class).toEqual(["xfaWrapper"]); expect(wrapper.attributes.class).toEqual(["xfaWrapper"]);
@ -105,7 +105,7 @@ describe("XFAFactory", function () {
// draw element must be on each page. // draw element must be on each page.
expect(draw.attributes.style).toEqual( expect(draw.attributes.style).toEqual(
pages.children[1].children[1].children[0].attributes.style pages.children[1].children[0].children[0].attributes.style
); );
}); });
}); });