Skip to content
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

Jump to bottom

getTextDimensions should automatically infer numberOfLines if maxTextWidth is provided #2824

Merged
merged 7 commits into from Aug 10, 2020
Merged

getTextDimensions should automatically infer numberOfLines if maxTextWidth is provided #2824

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a6c4ce
Now maxTextWidth can be specified and the number of lines can automat…
Nnoerregaard Jul 26, 2020
0ef7aa2
Change the name of maxTextWidth to maxWidth so that it is consistent …
Nnoerregaard Jul 27, 2020
cb495b9
Changed to using splitTextToSize and updated the test to fit the actu…
Nnoerregaard Jul 30, 2020
facb6ef
Changed to using splitTextToSize for arrays as well to stay consistent
Nnoerregaard Jul 30, 2020
dbe4354
Update tests and change cell.js according to PR feedback
Jul 31, 2020
37e474a
Now it should work exactly the same as the text method
Aug 2, 2020
ee42ba8
Merge branch 'master' into handleMultilineText
HackbrettXXX Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions spec/cell.spec.js
View file
Open in desktop
Expand Up @@ -9,16 +9,16 @@ describe("Module: Cell", () => {
expect(
doc.getTextDimensions(doc.splitTextToSize("Octocat loves jsPDF", 50)).h
).toEqual(71.19999999999999);
expect(doc.getTextDimensions("Octocat loves jsPDF").w).toEqual(144.48000000000002);
expect(doc.getTextDimensions("Octocat loves jsPDF").h).toEqual(16);
expect(
doc.getTextDimensions(doc.splitTextToSize("Octocat loves jsPDF", 150)).w
doc.getTextDimensions("Octocat loves jsPDF", { maxWidth: 150}).w
).toEqual(144.48000000000002);
expect(
doc.getTextDimensions(doc.splitTextToSize("Octocat loves jsPDF", 150)).h
doc.getTextDimensions("Octocat loves jsPDF", { maxWidth: 150 }).h
).toEqual(16);
expect(doc.getTextDimensions("Octocat loves jsPDF").w).toEqual(
144.48000000000002
);
expect(doc.getTextDimensions("Octocat loves jsPDF").h).toEqual(16);
expect(doc.getTextDimensions("Octocat loves jsPDF", {maxWidth: 100 }).h).toEqual(34.4);
expect(doc.getTextDimensions("Octocat loves jsPDF", {maxWidth: 100 }).w).toEqual(96.64000000000001);
expect(doc.getTextDimensions("").w).toEqual(0);
expect(doc.getTextDimensions("").h).toEqual(0);
expect(doc.getTextDimensions([""]).w).toEqual(0);
Expand Down
11 changes: 7 additions & 4 deletions src/modules/cell.js
View file
Open in desktop
Expand Up @@ -192,15 +192,18 @@
);
}

text = Array.isArray(text) ? text : [text];
const maxWidthIsDefind = options.maxWidth !== undefined && options.maxWidth !== null
text = Array.isArray(text) ? text : maxWidthIsDefind ? this.splitTextToSize(text, options.maxWidth) : [text];
Copy link
Collaborator

Choose a reason for hiding this comment

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

This behaves now slightly different than in the text method if an array is passed. We could discuss what's best here, but for the moment it should behave the same. See jspdf.js#L3527.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@HackbrettXXX I just pushed a new commit which should make it behave exactly the same as in the text method


for (var i = 0; i < text.length; i++) {
tempWidth = this.getStringUnitWidth(text[i], { font: font }) * fontSize;
if (width < tempWidth) {
width = tempWidth;
}
if (width !== 0) {
amountOfLines = text.length;
}
}

if (width !== 0) {
amountOfLines = text.length;
}

width = width / scaleFactor;
Expand Down