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

Add color format for the method [getTextColor] #3759

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add color format for the method [getTextColor] #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69338e0
MD/DC Test Coverage for width and height tests
JoaoSchmitz Jul 21, 2024
eaf24b1
giving optional return for color format in decodeColorString
JoaoSchmitz Aug 8, 2024
c7c6286
modifying getTextColor method to reflect changes in decodeColorString
JoaoSchmitz Aug 8, 2024
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
3,766 changes: 1,898 additions & 1,868 deletions dist/jspdf.es.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jspdf.es.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/jspdf.es.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jspdf.es.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

53,066 changes: 26,548 additions & 26,518 deletions dist/jspdf.node.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jspdf.node.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/jspdf.node.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jspdf.node.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3,722 changes: 1,876 additions & 1,846 deletions dist/jspdf.umd.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jspdf.umd.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/jspdf.umd.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jspdf.umd.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/polyfills.es.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/polyfills.umd.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10,001 changes: 6,231 additions & 3,770 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 19 additions & 6 deletions src/jspdf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,7 @@ function jsPDF(options) {
// Private functions
/////////////////////

var decodeColorString = (API.__private__.decodeColorString = function(color) {
var decodeColorString = (API.__private__.decodeColorString = function(color, returnType = 0) {
var colorEncoded = color.split(" ");
if (
colorEncoded.length === 2 &&
Expand All @@ -1634,13 +1634,26 @@ function jsPDF(options) {

colorEncoded = [red, green, blue, "r"];
}
var colorAsRGB = "#";
var colorAsHex = "#";
for (var i = 0; i < 3; i++) {
colorAsRGB += (
colorAsHex += (
"0" + Math.floor(parseFloat(colorEncoded[i]) * 255).toString(16)
).slice(-2);
}
return colorAsRGB;
if (returnType == 0) {
return colorAsHex;

} else if (returnType == 1) {
colorAsHex = colorAsHex.replace(/^#/, '');
var bigint = parseInt(colorAsHex, 16);

var r = (bigint >> 16) & 255;
var g = (bigint >> 8) & 255;
var b = bigint & 255;

var colorAsRGB = `${r},${g},${b}`;
return colorAsRGB;
}
});

var encodeColorString = (API.__private__.encodeColorString = function(
Expand Down Expand Up @@ -5273,8 +5286,8 @@ function jsPDF(options) {
* @memberof jsPDF#
* @name getTextColor
*/
var getTextColor = (API.__private__.getTextColor = API.getTextColor = function() {
return decodeColorString(textColor);
var getTextColor = (API.__private__.getTextColor = API.getTextColor = function(colorFormat = 0) {
return decodeColorString(textColor, colorFormat);
});
/**
* Sets the text color for upcoming elements.
Expand Down
21 changes: 15 additions & 6 deletions test/specs/canvas.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,27 @@ describe("Context2D: standard tests", () => {
beforeAll(loadGlobals);
it("width", () => {
var doc = new jsPDF();
doc.canvas.width = undefined;

doc.canvas.width = "algoritmo";
expect(doc.canvas.width).toEqual(150);
doc.canvas.width = 1;
expect(doc.canvas.width).toEqual(1);
doc.canvas.width = 0.5;
expect(doc.canvas.width).toEqual(150);
doc.canvas.width = -30;
expect(doc.canvas.width).toEqual(150);
doc.canvas.width = 500;
expect(doc.canvas.width).toEqual(500);
});
it("height", () => {
var doc = new jsPDF();

doc.canvas.height = undefined;
doc.canvas.height = "algoritmo";
expect(doc.canvas.height).toEqual(300);
doc.canvas.height = 0.5;
expect(doc.canvas.height).toEqual(300);
doc.canvas.height = -30;
expect(doc.canvas.height).toEqual(300);
doc.canvas.height = 1;
expect(doc.canvas.height).toEqual(1);
doc.canvas.height = 500;
expect(doc.canvas.height).toEqual(500);
});
it("style", () => {
var doc = new jsPDF();
Expand Down
39 changes: 30 additions & 9 deletions test/specs/jspdf.unit.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,27 +1252,48 @@ describe("Core: Unit Tests", () => {

it("jsPDF private function decodeColorString", () => {
const doc = jsPDF({ floatPrecision: 2 });
expect(doc.__private__.decodeColorString("1. 0. 0. rg", 0)).toEqual("#ff0000");
expect(doc.__private__.decodeColorString("1. 0. 0. rg")).toEqual("#ff0000");
expect(doc.__private__.decodeColorString("1. 0. 0. rg")).toEqual("#ff0000");
expect(doc.__private__.decodeColorString("1. 1. 0. RG")).toEqual("#ffff00");
expect(doc.__private__.decodeColorString("1. 1. 0. RG", 0)).toEqual("#ffff00");
expect(doc.__private__.decodeColorString("1. 1. 1. RG")).toEqual("#ffffff");
expect(doc.__private__.decodeColorString("0. 0. 1. rg")).toEqual("#0000ff");
expect(doc.__private__.decodeColorString("0.33 0.1 1. rg")).toEqual(
expect(doc.__private__.decodeColorString("0. 0. 1. rg", 0)).toEqual("#0000ff");
expect(doc.__private__.decodeColorString("0.33 0.1 1. rg", 0)).toEqual(
"#5419ff"
);
expect(doc.__private__.decodeColorString("0 g")).toEqual("#000000");
expect(doc.__private__.decodeColorString("0 g", 0)).toEqual("#000000");
expect(doc.__private__.decodeColorString("0 G")).toEqual("#000000");
expect(doc.__private__.decodeColorString("0.39 G")).toEqual("#636363");
expect(doc.__private__.decodeColorString("1. G")).toEqual("#ffffff");
expect(doc.__private__.decodeColorString("0.32 0.67 0.1 0.32 k")).toEqual(
expect(doc.__private__.decodeColorString("0.39 G", 0)).toEqual("#636363");
expect(doc.__private__.decodeColorString("1. G", 0)).toEqual("#ffffff");
expect(doc.__private__.decodeColorString("0.32 0.67 0.1 0.32 k", 0)).toEqual(
"#75399c"
);
expect(doc.__private__.decodeColorString("1. 0. 0. 0. K")).toEqual(
"#00ffff"
);
expect(doc.__private__.decodeColorString("1. 0. 1. 0. K")).toEqual(
expect(doc.__private__.decodeColorString("1. 0. 1. 0. K", 0)).toEqual(
"#00ff00"
);
expect(doc.__private__.decodeColorString("1. 0. 0. rg", 1)).toEqual("255,0,0");
expect(doc.__private__.decodeColorString("1. 0. 0. rg", 1)).toEqual("255,0,0");
expect(doc.__private__.decodeColorString("1. 1. 0. RG", 1)).toEqual("255,255,0");
expect(doc.__private__.decodeColorString("1. 1. 1. RG", 1)).toEqual("255,255,255");
expect(doc.__private__.decodeColorString("0. 0. 1. rg", 1)).toEqual("0,0,255");
expect(doc.__private__.decodeColorString("0.33 0.1 1. rg", 1)).toEqual(
"84,25,255"
);
expect(doc.__private__.decodeColorString("0 g", 1)).toEqual("0,0,0");
expect(doc.__private__.decodeColorString("0 G", 1)).toEqual("0,0,0");
expect(doc.__private__.decodeColorString("0.39 G", 1)).toEqual("99,99,99");
expect(doc.__private__.decodeColorString("1. G", 1)).toEqual("255,255,255");
expect(doc.__private__.decodeColorString("0.32 0.67 0.1 0.32 k", 1)).toEqual(
"117,57,156"
);
expect(doc.__private__.decodeColorString("1. 0. 0. 0. K", 1)).toEqual(
"0,255,255"
);
expect(doc.__private__.decodeColorString("1. 0. 1. 0. K", 1)).toEqual(
"0,255,0"
);
});

it("jsPDF private function getDocumentProperty, setDocumentProperty", () => {
Expand Down