Skip to content

Fix margin values not working for html #2977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Sep 14, 2021
Merged

Fix margin values not working for html #2977

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d1f864b
Fix margin values not working for html
jeffsieu Oct 24, 2020
16499ee
Merge branch 'master' into master
jeffsieu Oct 26, 2020
93aab85
Remove renderMaxWidthOverflow flag
jeffsieu Oct 26, 2020
184fcfa
Make margin parameter independent from x, y
jeffsieu Oct 27, 2020
d80fdf9
Merge branch 'master' into master
jeffsieu Oct 29, 2020
15264b0
Add test cases for html margin, x and y
jeffsieu Oct 29, 2020
d63fce6
Merge branch 'master' into master
jeffsieu Oct 29, 2020
d206850
Fix html tests
jeffsieu Oct 29, 2020
56f2747
Changes
jeffsieu Oct 31, 2020
ccd252e
Changes
jeffsieu Oct 31, 2020
824be42
Fix html test cases
jeffsieu Oct 31, 2020
0d4f672
Fix test cases
jeffsieu Oct 31, 2020
365b9bb
Fix tests
jeffsieu Oct 31, 2020
194c842
Fix tests
jeffsieu Oct 31, 2020
4f05e8c
add a couple of test cases (results are still wrong)
HackbrettXXX Nov 5, 2020
14bacf1
Apply suggestions from code review
jeffsieu Nov 18, 2020
e2dc83d
Merge branch 'master' into master
jeffsieu Nov 18, 2020
1643669
- fix issues with text baseline & use the correct bounding boxes at t…
HackbrettXXX Jul 14, 2021
64d0959
implement 'slice' and 'text' auto paging modes
HackbrettXXX Jul 19, 2021
08ad24d
Merge branch 'master' into jeffsiue-html-margin
HackbrettXXX Jul 19, 2021
c917272
Merge branch 'master' into master
HackbrettXXX Sep 9, 2021
f75ae8c
update reference files
HackbrettXXX Sep 9, 2021
8931539
Merge branch 'master' into master
HackbrettXXX Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix html tests
  • Loading branch information
@jeffsieu
jeffsieu committed Oct 29, 2020
commit d2068505969fed1579980a8321b60c145f6c0eb7
6 changes: 3 additions & 3 deletions src/modules/context2d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ import { console } from "../libs/console.js";

var topMargin = (i === min ? this.posY + this.margin[0] : this.margin[0]);
var firstPageHeight = this.pdf.internal.pageSize.height - this.posY - this.margin[0] - this.margin[2];
var pageHeightMinusMargin = this.pdf.internal.pageSize.height - this.margin[2];
var pageHeightMinusMargin = this.pdf.internal.pageSize.height - this.margin[0] - this.margin[2];
var pageWidthMinusMargin = this.pdf.internal.pageSize.width - this.margin[1];
var previousPageHeightSum = i === 1 ? 0 : firstPageHeight + (i - 2) * pageHeightMinusMargin;

Expand Down Expand Up @@ -1677,7 +1677,7 @@ import { console } from "../libs/console.js";

var topMargin = (k === min ? this.posY + this.margin[0] : this.margin[0]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be 1 instead of min here as well.

Suggested change
var topMargin = (k === min ? this.posY + this.margin[0] : this.margin[0]);
var topMargin = (k === 1 ? this.posY + this.margin[0] : this.margin[0]);

var firstPageHeight = this.pdf.internal.pageSize.height - this.posY - this.margin[0] - this.margin[2];
var pageHeightMinusMargin = this.pdf.internal.pageSize.height - this.margin[2];
var pageHeightMinusMargin = this.pdf.internal.pageSize.height - this.margin[0] - this.margin[2];
var previousPageHeightSum = k === 1 ? 0 : firstPageHeight + (k - 2) * pageHeightMinusMargin;

if (this.ctx.clip_path.length !== 0) {
Expand Down Expand Up @@ -2042,7 +2042,7 @@ import { console } from "../libs/console.js";

var topMargin = (i === min ? this.posY + this.margin[0] : this.margin[0]);
var firstPageHeight = this.pdf.internal.pageSize.height - this.posY - this.margin[0] - this.margin[2];
var pageHeightMinusMargin = this.pdf.internal.pageSize.height - this.margin[2];
var pageHeightMinusMargin = this.pdf.internal.pageSize.height - this.margin[0] - this.margin[2];
var pageWidthMinusMargin = this.pdf.internal.pageSize.width - this.margin[1];
var previousPageHeightSum = i === 1 ? 0 : firstPageHeight + (i - 2) * pageHeightMinusMargin;

Expand Down
Binary file modified test/reference/html-basic.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified test/reference/html-margin.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified test/reference/html-x-y.pdf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions test/specs/html.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ describe("Module: html", function() {
});

it("html margin insets properly", async () => {
const doc = jsPDF();
const doc = jsPDF({ floatPrecision: 2 });
await new Promise(resolve =>
doc.html("<h1>Basic HTML</h1><h2>Heading 2</h2>", { callback: resolve, margin: [10, 10] })
);
comparePdf(doc.output(), "html-margin.pdf", "html");
});

it("html x, y offsets properly", async () => {
const doc = jsPDF();
const doc = jsPDF({ floatPrecision: 2 });
await new Promise(resolve =>
doc.html("<h1>Basic HTML</h1><h2>Heading 2</h2>", { callback: resolve, x: 30, y: 40 })
);
Expand Down