parallax · laucheukhim · Oct 1, 2023 · Oct 1, 2023 · Mar 18, 2025
diff --git a/src/jspdf.js b/src/jspdf.js
@@ -784,15 +784,6 @@ function jsPDF(options) {
     );
   });
 
-  var getArrayBuffer = (API.__private__.getArrayBuffer = function(data) {
-    var len = data.length,
-      ab = new ArrayBuffer(len),
-      u8 = new Uint8Array(ab);
-
-    while (len--) u8[len] = data.charCodeAt(len);
-    return ab;
-  });
-
   var standardFonts = [
     ["Helvetica", "helvetica", "normal", "WinAnsiEncoding"],
     ["Helvetica-Bold", "helvetica", "bold", "WinAnsiEncoding"],
@@ -2998,11 +2989,51 @@ function jsPDF(options) {
 
     setOutputDestination(pages[currentPage]);
 
+    return content;
+  });
+
+  var getString = (API.__private__.getString = function(content) {
     return content.join("\n");
   });
 
-  var getBlob = (API.__private__.getBlob = function(data) {
-    return new Blob([getArrayBuffer(data)], {
+  var getArrayBuffer = (API.__private__.getArrayBuffer = function(content) {
+    let length = 0;
+    for (let i = 0; i < content.length; i++) {
+      let contentLine = content[i];
+      length += contentLine.length + 1; // +1 for newline
+    }
+
+    let arrayBuffer = new ArrayBuffer(length);
+    let uint8Array = new Uint8Array(arrayBuffer);
+    let index = 0;
+
+    for (let i = 0; i < content.length; i++) {
+      let contentLine = content[i];
+      for (let j = 0; j < contentLine.length; j++) {
+        uint8Array[index++] = contentLine.charCodeAt(j);
+      }
+      uint8Array[index++] = 0x0a; // newline
+    }
+
+    return arrayBuffer;
+  });
+
+  var getBlob = (API.__private__.getBlob = function(content) {
+    const parts = [];
+
+    for (let i = 0; i < content.length; i++) {
+      let contentLine = content[i];
+      let arrayBuffer = new ArrayBuffer(contentLine.length + 1); // +1 for newline
+      let uint8Array = new Uint8Array(arrayBuffer);
+
+      for (let j = 0; j < contentLine.length; j++) {
+        uint8Array[j] = contentLine.charCodeAt(j);
+      }
+      uint8Array[contentLine.length] = 0x0a; // newline
+      parts.push(arrayBuffer);
+    }
+
+    return new Blob(parts, {
       type: "application/pdf"
     });
   });
@@ -3047,7 +3078,7 @@ function jsPDF(options) {
 
     switch (type) {
       case undefined:
-        return buildDocument();
+        return getString(buildDocument());
       case "save":
         API.save(options.filename);
         break;
@@ -3076,7 +3107,7 @@ function jsPDF(options) {
       case "datauristring":
       case "dataurlstring":
         var dataURI = "";
-        var pdfDocument = buildDocument();
+        var pdfDocument = getString(buildDocument());
         try {
           dataURI = btoa(pdfDocument);
         } catch (e) {

diff --git a/test/reference/autoPaging10Pages.pdf b/test/reference/autoPaging10Pages.pdf
diff --git a/test/reference/closed.pdf b/test/reference/closed.pdf
diff --git a/test/reference/encrypted_printable.pdf b/test/reference/encrypted_printable.pdf
diff --git a/test/reference/encrypted_standard.pdf b/test/reference/encrypted_standard.pdf
diff --git a/test/reference/encrypted_withAcroForm.pdf b/test/reference/encrypted_withAcroForm.pdf
diff --git a/test/reference/encrypted_withImage.pdf b/test/reference/encrypted_withImage.pdf
diff --git a/test/reference/html-basic.pdf b/test/reference/html-basic.pdf
diff --git a/test/reference/html-font-faces.pdf b/test/reference/html-font-faces.pdf
diff --git a/test/reference/html-margin-page-break-slice.pdf b/test/reference/html-margin-page-break-slice.pdf
diff --git a/test/reference/html-margin-page-break-text.pdf b/test/reference/html-margin-page-break-text.pdf
diff --git a/test/reference/html-margin-page-break.pdf b/test/reference/html-margin-page-break.pdf
diff --git a/test/reference/html-margin-x-y-text.pdf b/test/reference/html-margin-x-y-text.pdf
diff --git a/test/reference/html-width-100-windowWidth-500.pdf b/test/reference/html-width-100-windowWidth-500.pdf
diff --git a/test/reference/html-width-210-windowWidth-1000.pdf b/test/reference/html-width-210-windowWidth-1000.pdf
diff --git a/test/reference/html-width-210-windowWidth-250.pdf b/test/reference/html-width-210-windowWidth-250.pdf
diff --git a/test/reference/html-width-210-windowWidth-500.pdf b/test/reference/html-width-210-windowWidth-500.pdf
diff --git a/test/reference/html-width-300-windowWidth-500-scale-2.pdf b/test/reference/html-width-300-windowWidth-500-scale-2.pdf
diff --git a/test/reference/html-width-300-windowWidth-500.pdf b/test/reference/html-width-300-windowWidth-500.pdf
diff --git a/test/reference/html-width-default-windowWidth-default.pdf b/test/reference/html-width-default-windowWidth-default.pdf
diff --git a/test/reference/multiLineLinkWithText.pdf b/test/reference/multiLineLinkWithText.pdf
diff --git a/test/reference/open.pdf b/test/reference/open.pdf
diff --git a/test/reference/table-autoSize-headerNames.pdf b/test/reference/table-autoSize-headerNames.pdf
diff --git a/test/reference/table-autoSize.pdf b/test/reference/table-autoSize.pdf
diff --git a/test/reference/table-formatted.pdf b/test/reference/table-formatted.pdf
diff --git a/test/reference/table.pdf b/test/reference/table.pdf
diff --git a/test/reference/textfieldMultiline.pdf b/test/reference/textfieldMultiline.pdf
diff --git a/test/reference/textfieldMultilineSmallForm.pdf b/test/reference/textfieldMultilineSmallForm.pdf
diff --git a/test/reference/webp-multiple.pdf b/test/reference/webp-multiple.pdf
diff --git a/test/specs/jspdf.unit.spec.js b/test/specs/jspdf.unit.spec.js
@@ -546,20 +546,28 @@ describe("Core: Unit Tests", () => {
     });
   });
 
+  it("jsPDF private function getString", () => {
+    const doc = jsPDF({ floatPrecision: 2 });
+    expect(doc.__private__.getString(["A"]).length).toEqual(1);
+    expect(typeof doc.__private__.getString(["A"]) === "string").toEqual(
+      true
+    );
+  });
+
   it("jsPDF private function getArrayBuffer", () => {
     const doc = jsPDF({ floatPrecision: 2 });
-    expect(doc.__private__.getArrayBuffer("A").byteLength).toEqual(1);
-    expect(doc.__private__.getArrayBuffer("A") instanceof ArrayBuffer).toEqual(
+    expect(doc.__private__.getArrayBuffer(["A"]).byteLength).toEqual(2); // +1 for newline
+    expect(doc.__private__.getArrayBuffer(["A"]) instanceof ArrayBuffer).toEqual(
       true
     );
   });
 
   if (global.isNode !== true) {
     it("jsPDF private function getBlob", () => {
       const doc = new jsPDF({ floatPrecision: 2 });
-      expect(typeof doc.__private__.getBlob("A")).toEqual("object");
-      expect(doc.__private__.getBlob("A") instanceof Blob).toEqual(true);
-      expect(doc.__private__.getBlob("A").type).toEqual("application/pdf");
+      expect(typeof doc.__private__.getBlob(["A"])).toEqual("object");
+      expect(doc.__private__.getBlob(["A"]) instanceof Blob).toEqual(true);
+      expect(doc.__private__.getBlob(["A"]).type).toEqual("application/pdf");
     });
   }