Skip to content

Commit 39edfdd

Browse files
committed
fix nullability of style arguments of geometry methods
fixes parallax#3034
1 parent cef97fb commit 39edfdd

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

types/index.d.ts

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ declare module "jspdf" {
711711
height: number,
712712
matrix: any
713713
): jsPDF;
714-
circle(x: number, y: number, r: number, style: string): jsPDF;
714+
circle(x: number, y: number, r: number, style?: string | null): jsPDF;
715715
clip(rule?: "evenodd"): jsPDF;
716716
discardPath(): jsPDF;
717717
deletePage(targetPage: number): jsPDF;
@@ -721,7 +721,7 @@ declare module "jspdf" {
721721
y: number,
722722
rx: number,
723723
ry: number,
724-
style?: string
724+
style?: string | null
725725
): jsPDF;
726726
endFormObject(key: any): jsPDF;
727727
f2(number: number): string;
@@ -744,13 +744,19 @@ declare module "jspdf" {
744744
getStyle(style: string): string;
745745
getTextColor(): string;
746746
insertPage(beforePage: number): jsPDF;
747-
line(x1: number, y1: number, x2: number, y2: number): jsPDF;
747+
line(
748+
x1: number,
749+
y1: number,
750+
x2: number,
751+
y2: number,
752+
style?: string | null
753+
): jsPDF;
748754
lines(
749755
lines: any[],
750756
x: any,
751757
y: any,
752758
scale?: any,
753-
style?: string,
759+
style?: string | null,
754760
closed?: boolean
755761
): jsPDF;
756762
clip(): jsPDF;
@@ -791,7 +797,13 @@ declare module "jspdf" {
791797
): boolean;
792798
pdfEscape(text: string, flags: any): string;
793799
path(lines?: any[], style?: string): jsPDF;
794-
rect(x: number, y: number, w: number, h: number, style?: string): jsPDF;
800+
rect(
801+
x: number,
802+
y: number,
803+
w: number,
804+
h: number,
805+
style?: string | null
806+
): jsPDF;
795807
restoreGraphicsState(): jsPDF;
796808
roundedRect(
797809
x: number,
@@ -800,7 +812,7 @@ declare module "jspdf" {
800812
h: number,
801813
rx: number,
802814
ry: number,
803-
style: string
815+
style?: string | null
804816
): jsPDF;
805817
save(filename?: string, options?: { returnPromise?: boolean }): jsPDF;
806818
saveGraphicsState(): jsPDF;
@@ -867,7 +879,7 @@ declare module "jspdf" {
867879
y2: number,
868880
x3: number,
869881
y3: number,
870-
style: string
882+
style?: string | null
871883
): jsPDF;
872884
getHorizontalCoordinateString(value: number): number;
873885
getVerticalCoordinateString(value: number): number;

types/jspdf-tests.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,3 +638,14 @@ function test_addImageWithEncryption() {
638638
height: 100
639639
});
640640
}
641+
642+
function test_nullStyleArgument() {
643+
const doc = new jsPDF();
644+
doc.rect(0, 0, 0, 0, null);
645+
doc.roundedRect(0, 0, 0, 0, 0, 0, null);
646+
doc.line(0, 0, 0, 0, null);
647+
doc.triangle(0, 0, 0, 0, 0, 0, null);
648+
doc.lines([], 0, 0, 0, null, false);
649+
doc.ellipse(0, 0, 0, 0, null);
650+
doc.circle(0, 0, 0, null);
651+
}

0 commit comments

Comments
 (0)