From 92cd2e70e879bf517a4f389716231e47b2938e7d Mon Sep 17 00:00:00 2001 From: Gokhan Kurt Date: Sat, 23 Oct 2021 17:06:36 +0300 Subject: [PATCH 1/4] fix html related types --- types/index.d.ts | 116 ++++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 56 deletions(-) diff --git a/types/index.d.ts b/types/index.d.ts index 8b8c6f70b..de3cad19c 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -169,10 +169,13 @@ declare module "jspdf" { ): HTMLWorker; progress: HTMLWorkerProgress; error(msg: string): void; - save(filename: string): void; + save(filename: string): Promise; set(opt: HTMLOptions): HTMLWorker; get(key: "string"): HTMLWorker; get(key: "string", cbk: (value: string) => void): string; + doCallback(): Promise; + outputImg(type: "img" | "datauristring" | "dataurlstring" | "datauri" | "dataurl"): Promise; + outputPdf: jsPDF['output']; } export interface HTMLOptionImage { @@ -184,36 +187,36 @@ declare module "jspdf" { family: string; style?: "italic" | "oblique" | "normal"; stretch?: - | "ultra-condensed" - | "extra-condensed" - | "condensed" - | "semi-condensed" - | "normal" - | "semi-expanded" - | "expanded" - | "extra-expanded" - | "ultra-expanded"; + | "ultra-condensed" + | "extra-condensed" + | "condensed" + | "semi-condensed" + | "normal" + | "semi-expanded" + | "expanded" + | "extra-expanded" + | "ultra-expanded"; weight?: - | "normal" - | "bold" - | 100 - | 200 - | 300 - | 400 - | 500 - | 600 - | 700 - | 800 - | 900 - | "100" - | "200" - | "300" - | "400" - | "500" - | "600" - | "700" - | "800" - | "900"; + | "normal" + | "bold" + | 100 + | 200 + | 300 + | 400 + | 500 + | 600 + | 700 + | 800 + | 900 + | "100" + | "200" + | "300" + | "400" + | "500" + | "600" + | "700" + | "800" + | "900"; src: Array<{ url: string; format: "truetype"; @@ -400,12 +403,12 @@ declare module "jspdf" { strokeStyle: string | Gradient; textAlign: "right" | "end" | "center" | "left" | "start"; textBaseline: - | "alphabetic" - | "bottom" - | "top" - | "hanging" - | "middle" - | "ideographic"; + | "alphabetic" + | "bottom" + | "top" + | "hanging" + | "middle" + | "ideographic"; arc( x: number, y: number, @@ -504,11 +507,11 @@ declare module "jspdf" { export interface ImageOptions { imageData: - | string - | HTMLImageElement - | HTMLCanvasElement - | Uint8Array - | RGBAData; + | string + | HTMLImageElement + | HTMLCanvasElement + | Uint8Array + | RGBAData; x: number; y: number; width: number; @@ -531,18 +534,19 @@ declare module "jspdf" { predictor?: number; index: number; data: string; + fileType: "RGBA" | "UNKNOWN" | "PNG" | "TIFF" | "JPEG" | "JPEG2000" | "GIF87a" | "GIF89a" | "WEBP" | "BMP"; } export interface TextOptionsLight { align?: "left" | "center" | "right" | "justify"; angle?: number | Matrix; baseline?: - | "alphabetic" - | "ideographic" - | "bottom" - | "top" - | "middle" - | "hanging"; + | "alphabetic" + | "ideographic" + | "bottom" + | "top" + | "middle" + | "hanging"; flags?: { noBOM: boolean; autoencode: boolean; @@ -552,14 +556,14 @@ declare module "jspdf" { lineHeightFactor?: number; maxWidth?: number; renderingMode?: - | "fill" - | "stroke" - | "fillThenStroke" - | "invisible" - | "fillAndAddForClipping" - | "strokeAndAddPathForClipping" - | "fillThenStrokeAndAddToPathForClipping" - | "addToPathForClipping"; + | "fill" + | "stroke" + | "fillThenStroke" + | "invisible" + | "fillAndAddForClipping" + | "strokeAndAddPathForClipping" + | "fillThenStrokeAndAddToPathForClipping" + | "addToPathForClipping"; isInputVisual?: boolean; isOutputVisual?: boolean; isInputRtl?: boolean; @@ -1075,7 +1079,7 @@ declare module "jspdf" { ): void; // jsPDF plugin: html - html(src: string | HTMLElement, options?: HTMLOptions): Promise; + html(src: string | HTMLElement, options?: HTMLOptions): HTMLWorker; // jsPDF plugin: JavaScript addJS(javascript: string): jsPDF; From c956e388c929a3febddd82caadbf35c3441bf92a Mon Sep 17 00:00:00 2001 From: Gokhan Kurt Date: Sat, 23 Oct 2021 17:15:08 +0300 Subject: [PATCH 2/4] revert whitespace changes --- types/index.d.ts | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/types/index.d.ts b/types/index.d.ts index de3cad19c..bfe304907 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -403,12 +403,12 @@ declare module "jspdf" { strokeStyle: string | Gradient; textAlign: "right" | "end" | "center" | "left" | "start"; textBaseline: - | "alphabetic" - | "bottom" - | "top" - | "hanging" - | "middle" - | "ideographic"; + | "alphabetic" + | "bottom" + | "top" + | "hanging" + | "middle" + | "ideographic"; arc( x: number, y: number, @@ -507,11 +507,11 @@ declare module "jspdf" { export interface ImageOptions { imageData: - | string - | HTMLImageElement - | HTMLCanvasElement - | Uint8Array - | RGBAData; + | string + | HTMLImageElement + | HTMLCanvasElement + | Uint8Array + | RGBAData; x: number; y: number; width: number; @@ -541,12 +541,12 @@ declare module "jspdf" { align?: "left" | "center" | "right" | "justify"; angle?: number | Matrix; baseline?: - | "alphabetic" - | "ideographic" - | "bottom" - | "top" - | "middle" - | "hanging"; + | "alphabetic" + | "ideographic" + | "bottom" + | "top" + | "middle" + | "hanging"; flags?: { noBOM: boolean; autoencode: boolean; @@ -556,14 +556,14 @@ declare module "jspdf" { lineHeightFactor?: number; maxWidth?: number; renderingMode?: - | "fill" - | "stroke" - | "fillThenStroke" - | "invisible" - | "fillAndAddForClipping" - | "strokeAndAddPathForClipping" - | "fillThenStrokeAndAddToPathForClipping" - | "addToPathForClipping"; + | "fill" + | "stroke" + | "fillThenStroke" + | "invisible" + | "fillAndAddForClipping" + | "strokeAndAddPathForClipping" + | "fillThenStrokeAndAddToPathForClipping" + | "addToPathForClipping"; isInputVisual?: boolean; isOutputVisual?: boolean; isInputRtl?: boolean; From fd2d6b0f8ad9908cce118512d482e6f83340d543 Mon Sep 17 00:00:00 2001 From: Gokhan Kurt Date: Sat, 23 Oct 2021 17:17:22 +0300 Subject: [PATCH 3/4] run prettier --- types/index.d.ts | 76 ++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/types/index.d.ts b/types/index.d.ts index bfe304907..eb36406ca 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -174,8 +174,10 @@ declare module "jspdf" { get(key: "string"): HTMLWorker; get(key: "string", cbk: (value: string) => void): string; doCallback(): Promise; - outputImg(type: "img" | "datauristring" | "dataurlstring" | "datauri" | "dataurl"): Promise; - outputPdf: jsPDF['output']; + outputImg( + type: "img" | "datauristring" | "dataurlstring" | "datauri" | "dataurl" + ): Promise; + outputPdf: jsPDF["output"]; } export interface HTMLOptionImage { @@ -187,36 +189,36 @@ declare module "jspdf" { family: string; style?: "italic" | "oblique" | "normal"; stretch?: - | "ultra-condensed" - | "extra-condensed" - | "condensed" - | "semi-condensed" - | "normal" - | "semi-expanded" - | "expanded" - | "extra-expanded" - | "ultra-expanded"; + | "ultra-condensed" + | "extra-condensed" + | "condensed" + | "semi-condensed" + | "normal" + | "semi-expanded" + | "expanded" + | "extra-expanded" + | "ultra-expanded"; weight?: - | "normal" - | "bold" - | 100 - | 200 - | 300 - | 400 - | 500 - | 600 - | 700 - | 800 - | 900 - | "100" - | "200" - | "300" - | "400" - | "500" - | "600" - | "700" - | "800" - | "900"; + | "normal" + | "bold" + | 100 + | 200 + | 300 + | 400 + | 500 + | 600 + | 700 + | 800 + | 900 + | "100" + | "200" + | "300" + | "400" + | "500" + | "600" + | "700" + | "800" + | "900"; src: Array<{ url: string; format: "truetype"; @@ -534,7 +536,17 @@ declare module "jspdf" { predictor?: number; index: number; data: string; - fileType: "RGBA" | "UNKNOWN" | "PNG" | "TIFF" | "JPEG" | "JPEG2000" | "GIF87a" | "GIF89a" | "WEBP" | "BMP"; + fileType: + | "RGBA" + | "UNKNOWN" + | "PNG" + | "TIFF" + | "JPEG" + | "JPEG2000" + | "GIF87a" + | "GIF89a" + | "WEBP" + | "BMP"; } export interface TextOptionsLight { From 6927488d321a65e470bd0680e964d306e6aaf207 Mon Sep 17 00:00:00 2001 From: Gokhan Kurt Date: Wed, 27 Oct 2021 14:08:47 +0300 Subject: [PATCH 4/4] add format to ImageOptions --- types/index.d.ts | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/types/index.d.ts b/types/index.d.ts index fe345a17a..fd45e9e1f 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -507,6 +507,19 @@ declare module "jspdf" { | "Separation" | "DeviceN"; + export type ImageFormat = + | "RGBA" + | "UNKNOWN" + | "PNG" + | "TIFF" + | "JPG" + | "JPEG" + | "JPEG2000" + | "GIF87a" + | "GIF89a" + | "WEBP" + | "BMP"; + export interface ImageOptions { imageData: | string @@ -521,6 +534,7 @@ declare module "jspdf" { alias?: string; compression?: ImageCompression; rotation?: number; + format?: ImageFormat; } export interface ImageProperties { alias: number; @@ -536,17 +550,7 @@ declare module "jspdf" { predictor?: number; index: number; data: string; - fileType: - | "RGBA" - | "UNKNOWN" - | "PNG" - | "TIFF" - | "JPEG" - | "JPEG2000" - | "GIF87a" - | "GIF89a" - | "WEBP" - | "BMP"; + fileType: ImageFormat; } export interface TextOptionsLight {