jspdf-utils 0.1.14 → 0.1.16

package/dist/html-to-pdf.js

@@ -1,5 +1,5 @@
-import W from "html2canvas";
-const q = {
+import A from "html2canvas";
+const z = {
   a0: [841, 1189],
   a1: [594, 841],
   a2: [420, 594],
@@ -22,559 +22,594 @@ const q = {
   legal: 25.4,
   tabloid: 25
 };
-function M(t = {}) {
-  const e = t.format ?? "a4", [a, o] = q[e], i = t.pageWidth ?? a, n = t.pageHeight ?? o, l = _[e], r = {
-    top: l,
-    right: l,
-    bottom: l,
-    left: l
+function W(e = {}) {
+  const n = e.format ?? "a4", [a, t] = z[n], i = e.pageWidth ?? a, o = e.pageHeight ?? t, s = _[n], r = {
+    top: s,
+    right: s,
+    bottom: s,
+    left: s
   };
   return {
-    unit: t.unit ?? "mm",
-    format: e,
+    unit: e.unit ?? "mm",
+    format: n,
     pageWidth: i,
-    pageHeight: n,
-    margin: { ...r, ...t.margin }
+    pageHeight: o,
+    margin: { ...r, ...e.margin }
   };
 }
-function E(t, e) {
-  const a = t.offsetWidth, o = e.pageWidth - e.margin.left - e.margin.right, i = o / a, l = (e.pageHeight - e.margin.top - e.margin.bottom) / i;
-  return { renderedWidth: a, scale: i, contentWidthMm: o, pageContentPx: l };
+function R(e, n) {
+  const a = e.offsetWidth, t = n.pageWidth - n.margin.left - n.margin.right, i = t / a, s = (n.pageHeight - n.margin.top - n.margin.bottom) / i;
+  return { renderedWidth: a, scale: i, contentWidthMm: t, pageContentPx: s };
 }
-function B(t, e = 210) {
-  const a = t.cloneNode(!0);
+function P(e, n = 210) {
+  const a = e.cloneNode(!0);
   return Object.assign(a.style, {
     position: "fixed",
     top: "0",
     left: "0",
     boxSizing: "border-box",
-    width: e + "mm",
+    width: n + "mm",
     opacity: "0.000001",
     pointerEvents: "none"
   }), document.body.appendChild(a), a;
 }
+function G(e) {
+  const n = e.getBoundingClientRect();
+  let a = n.bottom;
+  for (const i of e.querySelectorAll("*")) {
+    const o = i.getBoundingClientRect().bottom;
+    o > a && (a = o);
+  }
+  const t = a - n.top;
+  t > e.offsetHeight && (e.style.minHeight = t + "px");
+}
+async function J(e) {
+  const n = Array.from(e.querySelectorAll("img"));
+  if (n.length === 0) return;
+  await Promise.all(
+    n.map((t) => {
+      if (!(t.complete && t.naturalWidth > 0))
+        return new Promise((i) => {
+          t.onload = () => i(), t.onerror = () => i();
+        });
+    })
+  );
+  const a = 2;
+  for (const t of n) {
+    if (!t.naturalWidth || !t.naturalHeight || t.src.startsWith("data:image/svg")) continue;
+    const i = t.offsetWidth || t.naturalWidth, o = t.offsetHeight || t.naturalHeight, s = Math.min(i * a, t.naturalWidth), r = Math.min(o * a, t.naturalHeight);
+    if (t.naturalWidth <= s && t.naturalHeight <= r && t.src.startsWith("data:"))
+      continue;
+    const l = document.createElement("canvas");
+    l.width = s, l.height = r;
+    const h = l.getContext("2d");
+    if (h)
+      try {
+        h.drawImage(t, 0, 0, s, r), t.style.width = i + "px", t.style.height = o + "px", t.src = l.toDataURL("image/png");
+      } catch {
+      }
+  }
+}
 function N() {
-  const t = document.createElement("style");
-  return t.setAttribute("data-jspdf-utils", ""), t.textContent = "img { display: inline !important; }", document.head.appendChild(t), () => t.remove();
+  const e = document.createElement("style");
+  return e.setAttribute("data-jspdf-utils", ""), e.textContent = "img { display: inline !important; }", document.head.appendChild(e), () => e.remove();
 }
-function P(t) {
-  for (const e of t.querySelectorAll("table")) {
-    const a = e.getAttribute("cellpadding");
+function F(e) {
+  for (const n of e.querySelectorAll("table")) {
+    const a = n.getAttribute("cellpadding");
     if (a) {
-      for (const o of e.querySelectorAll("th, td"))
-        o.style.padding || (o.style.padding = a + "px");
-      e.removeAttribute("cellpadding");
+      for (const t of n.querySelectorAll("th, td"))
+        t.style.padding || (t.style.padding = a + "px");
+      n.removeAttribute("cellpadding");
     }
   }
 }
-function R(t, e) {
+function I(e, n) {
   for (const a of Array.from(
-    t.querySelectorAll(":scope > table")
+    e.querySelectorAll(":scope > table")
   )) {
-    if (a.offsetHeight <= e) continue;
-    const o = Array.from(a.rows);
-    if (o.length === 0) continue;
-    const i = o[0].querySelector("th") !== null, n = i ? o[0] : null, l = i ? o.slice(1) : o, r = n ? n.offsetHeight : 0, c = e - r - 2, g = [];
-    let s = [], h = 0;
-    for (const f of l) {
-      const d = f.offsetHeight;
-      h + d > c && s.length > 0 && (g.push(s), s = [], h = 0), s.push(f), h += d;
+    if (a.offsetHeight <= n) continue;
+    const t = Array.from(a.rows);
+    if (t.length === 0) continue;
+    const i = t[0].querySelector("th") !== null, o = i ? t[0] : null, s = i ? t.slice(1) : t, r = o ? o.offsetHeight : 0, l = n - r - 2, h = [];
+    let c = [], f = 0;
+    for (const d of s) {
+      const g = d.offsetHeight;
+      f + g > l && c.length > 0 && (h.push(c), c = [], f = 0), c.push(d), f += g;
     }
-    s.length > 0 && g.push(s);
-    for (const f of g) {
-      const d = a.cloneNode(!1);
-      n && d.appendChild(n.cloneNode(!0));
-      for (const u of f) d.appendChild(u.cloneNode(!0));
-      a.parentNode.insertBefore(d, a);
+    c.length > 0 && h.push(c);
+    for (const d of h) {
+      const g = a.cloneNode(!1);
+      o && g.appendChild(o.cloneNode(!0));
+      for (const u of d) g.appendChild(u.cloneNode(!0));
+      a.parentNode.insertBefore(g, a);
     }
     a.remove();
   }
 }
-function F(t, e) {
-  for (const a of Array.from(t.querySelectorAll(":scope > *"))) {
-    const o = a;
-    if (o.offsetHeight <= e || o.tagName === "TABLE")
+function O(e, n) {
+  for (const a of Array.from(e.querySelectorAll(":scope > *"))) {
+    const t = a;
+    if (t.offsetHeight <= n || t.tagName === "TABLE")
       continue;
-    const i = o.tagName, n = o.getAttribute("style") || "", l = getComputedStyle(o).width, r = (o.textContent || "").split(/\s+/).filter(Boolean), c = document.createElement(i);
-    c.setAttribute("style", n), Object.assign(c.style, {
+    const i = t.tagName, o = t.getAttribute("style") || "", s = getComputedStyle(t).width, r = (t.textContent || "").split(/\s+/).filter(Boolean), l = document.createElement(i);
+    l.setAttribute("style", o), Object.assign(l.style, {
       position: "absolute",
       visibility: "hidden",
-      width: l
-    }), t.appendChild(c);
-    const g = [];
-    let s = 0;
-    for (; s < r.length; ) {
-      let h = s + 1, f = r.length;
-      for (; h < f; ) {
-        const u = Math.ceil((h + f) / 2);
-        c.textContent = r.slice(s, u).join(" "), c.offsetHeight <= e ? h = u : f = u - 1;
+      width: s
+    }), e.appendChild(l);
+    const h = [];
+    let c = 0;
+    for (; c < r.length; ) {
+      let f = c + 1, d = r.length;
+      for (; f < d; ) {
+        const u = Math.ceil((f + d) / 2);
+        l.textContent = r.slice(c, u).join(" "), l.offsetHeight <= n ? f = u : d = u - 1;
       }
-      const d = document.createElement(i);
-      d.setAttribute("style", n), d.textContent = r.slice(s, h).join(" "), g.push(d), s = h;
+      const g = document.createElement(i);
+      g.setAttribute("style", o), g.textContent = r.slice(c, f).join(" "), h.push(g), c = f;
     }
-    c.remove();
-    for (const h of g)
-      o.parentNode.insertBefore(h, o);
-    o.remove();
+    l.remove();
+    for (const f of h)
+      t.parentNode.insertBefore(f, t);
+    t.remove();
   }
 }
-function U(t, e, a) {
-  const o = Array.from(t.rows);
-  if (o.length === 0) return !1;
-  const i = o[0].querySelector("th") !== null, n = i ? o[0] : null, l = i ? o.slice(1) : o, r = n ? n.offsetHeight : 0;
-  if (l.length < 2) return !1;
-  const c = a - r - 2;
-  if (c <= 0) return !1;
-  let g = 0, s = 0;
-  for (const d of l) {
-    if (s + d.offsetHeight > c) break;
-    s += d.offsetHeight, g++;
+function Q(e, n, a) {
+  const t = Array.from(e.rows);
+  if (t.length === 0) return !1;
+  const i = t[0].querySelector("th") !== null, o = i ? t[0] : null, s = i ? t.slice(1) : t, r = o ? o.offsetHeight : 0;
+  if (s.length < 2) return !1;
+  const l = a - r - 2;
+  if (l <= 0) return !1;
+  let h = 0, c = 0;
+  for (const g of s) {
+    if (c + g.offsetHeight > l) break;
+    c += g.offsetHeight, h++;
   }
-  if (g === 0 || g === l.length) return !1;
-  const h = t.cloneNode(!1);
-  n && h.appendChild(n.cloneNode(!0));
-  for (let d = 0; d < g; d++)
-    h.appendChild(l[d].cloneNode(!0));
-  const f = t.cloneNode(!1);
-  n && f.appendChild(n.cloneNode(!0));
-  for (let d = g; d < l.length; d++)
-    f.appendChild(l[d].cloneNode(!0));
-  return e.insertBefore(h, t), e.insertBefore(f, t), t.remove(), !0;
+  if (h === 0 || h === s.length) return !1;
+  const f = e.cloneNode(!1);
+  o && f.appendChild(o.cloneNode(!0));
+  for (let g = 0; g < h; g++)
+    f.appendChild(s[g].cloneNode(!0));
+  const d = e.cloneNode(!1);
+  o && d.appendChild(o.cloneNode(!0));
+  for (let g = h; g < s.length; g++)
+    d.appendChild(s[g].cloneNode(!0));
+  return n.insertBefore(f, e), n.insertBefore(d, e), e.remove(), !0;
 }
-function J(t, e, a) {
-  if (t.tagName === "TABLE" || t.tagName === "IMG") return !1;
-  const o = (t.textContent || "").split(/\s+/).filter(Boolean);
-  if (o.length < 2) return !1;
-  const i = t.tagName, n = t.getAttribute("style") || "", l = getComputedStyle(t).width, r = document.createElement(i);
-  if (r.setAttribute("style", n), Object.assign(r.style, {
+function Z(e, n, a) {
+  if (e.tagName === "TABLE" || e.tagName === "IMG") return !1;
+  const t = (e.textContent || "").split(/\s+/).filter(Boolean);
+  if (t.length < 2) return !1;
+  const i = e.tagName, o = e.getAttribute("style") || "", s = getComputedStyle(e).width, r = document.createElement(i);
+  if (r.setAttribute("style", o), Object.assign(r.style, {
     position: "absolute",
     visibility: "hidden",
-    width: l
-  }), e.appendChild(r), r.textContent = o[0], r.offsetHeight > a)
+    width: s
+  }), n.appendChild(r), r.textContent = t[0], r.offsetHeight > a)
     return r.remove(), !1;
-  let c = 1, g = o.length;
-  for (; c < g; ) {
-    const f = Math.ceil((c + g) / 2);
-    r.textContent = o.slice(0, f).join(" "), r.offsetHeight <= a ? c = f : g = f - 1;
+  let l = 1, h = t.length;
+  for (; l < h; ) {
+    const d = Math.ceil((l + h) / 2);
+    r.textContent = t.slice(0, d).join(" "), r.offsetHeight <= a ? l = d : h = d - 1;
   }
-  if (r.remove(), c >= o.length) return !1;
-  const s = document.createElement(i);
-  s.setAttribute("style", n), s.textContent = o.slice(0, c).join(" ");
-  const h = document.createElement(i);
-  return h.setAttribute("style", n), h.textContent = o.slice(c).join(" "), e.insertBefore(s, t), e.insertBefore(h, t), t.remove(), !0;
+  if (r.remove(), l >= t.length) return !1;
+  const c = document.createElement(i);
+  c.setAttribute("style", o), c.textContent = t.slice(0, l).join(" ");
+  const f = document.createElement(i);
+  return f.setAttribute("style", o), f.textContent = t.slice(l).join(" "), n.insertBefore(c, e), n.insertBefore(f, e), e.remove(), !0;
 }
-function T(t, e) {
+function L(e, n) {
   let a = 0;
-  for (; a < t.children.length; ) {
-    const o = t.children[a], i = o.offsetTop, n = i + o.offsetHeight, l = (Math.floor(i / e) + 1) * e;
-    if (n > l) {
-      const r = l - i;
-      if (o.tagName === "TABLE") {
-        if (U(
-          o,
+  for (; a < e.children.length; ) {
+    const t = e.children[a], i = t.offsetTop, o = i + t.offsetHeight, s = (Math.floor(i / n) + 1) * n;
+    if (o > s) {
+      const r = s - i;
+      if (t.tagName === "TABLE") {
+        if (Q(
           t,
+          e,
           r
         ))
           continue;
-      } else if (J(o, t, r))
+      } else if (Z(t, e, r))
         continue;
-      if (o.offsetHeight <= e) {
-        const c = document.createElement("div");
-        c.style.height = l - i + 1 + "px", o.parentNode.insertBefore(c, o), a++;
+      if (t.offsetHeight <= n) {
+        const l = document.createElement("div");
+        l.style.height = s - i + 1 + "px", t.parentNode.insertBefore(l, t), a++;
       }
     }
     a++;
   }
 }
-function Q(t, e = {}) {
-  const a = M(e), o = N(), i = B(t, a.pageWidth);
-  P(i);
-  const n = E(i, a);
-  return R(i, n.pageContentPx), F(i, n.pageContentPx), T(i, n.pageContentPx), {
+function K(e, n = {}) {
+  const a = W(n), t = N(), i = P(e, a.pageWidth);
+  F(i);
+  const o = R(i, a);
+  return I(i, o.pageContentPx), O(i, o.pageContentPx), L(i, o.pageContentPx), {
     clone: i,
-    layout: n,
+    layout: o,
     options: a,
     cleanup: () => {
-      i.remove(), o();
+      i.remove(), t();
     }
   };
 }
-async function tt(t, e, a = {}) {
-  const { clone: o, layout: i, options: n, cleanup: l } = Q(e, a);
+async function nt(e, n, a = {}) {
+  const { clone: t, layout: i, options: o, cleanup: s } = K(n, a);
   try {
-    await new Promise((r) => {
-      t.html(o, {
+    await J(t), await new Promise((r) => {
+      e.html(t, {
         callback: () => r(),
         width: i.contentWidthMm,
         windowWidth: i.renderedWidth,
         margin: [
-          n.margin.top,
-          n.margin.right,
-          n.margin.bottom,
-          n.margin.left
+          o.margin.top,
+          o.margin.right,
+          o.margin.bottom,
+          o.margin.left
         ]
       });
     });
   } finally {
-    l();
+    s();
   }
-  return a.marginContent && await $(t, a.marginContent, a), t;
+  return a.marginContent && await $(e, a.marginContent, a), e;
 }
-function k(t, e) {
-  switch (t) {
+function T(e, n) {
+  switch (e) {
     case "top":
-      return { x: 0, y: 0, width: e.pageWidth, height: e.margin.top };
+      return { x: 0, y: 0, width: n.pageWidth, height: n.margin.top };
     case "bottom":
       return {
         x: 0,
-        y: e.pageHeight - e.margin.bottom,
-        width: e.pageWidth,
-        height: e.margin.bottom
+        y: n.pageHeight - n.margin.bottom,
+        width: n.pageWidth,
+        height: n.margin.bottom
       };
     case "left":
-      return { x: 0, y: 0, width: e.margin.left, height: e.pageHeight };
+      return { x: 0, y: 0, width: n.margin.left, height: n.pageHeight };
     case "right":
       return {
-        x: e.pageWidth - e.margin.right,
+        x: n.pageWidth - n.margin.right,
         y: 0,
-        width: e.margin.right,
-        height: e.pageHeight
+        width: n.margin.right,
+        height: n.pageHeight
       };
   }
 }
-async function L(t, e, a, o) {
+async function j(e, n, a, t) {
   const i = document.createElement("div");
   Object.assign(i.style, {
     position: "fixed",
     left: "-99999px",
     top: "0",
-    width: e + "mm",
+    width: n + "mm",
     height: a + "mm",
     overflow: "hidden"
-  }), i.appendChild(t), document.body.appendChild(i);
+  }), i.appendChild(e), document.body.appendChild(i);
   try {
-    return await W(i, {
-      scale: o,
+    return await A(i, {
+      scale: t,
       backgroundColor: null
     });
   } finally {
     i.remove();
   }
 }
-const D = ["top", "right", "bottom", "left"];
-async function G(t, e, a) {
-  const o = {};
-  for (const i of D) {
-    const n = t[i];
-    if (n && typeof n != "function") {
-      const l = k(i, e);
-      o[i] = await L(
-        n.cloneNode(!0),
-        l.width,
-        l.height,
+const S = ["top", "right", "bottom", "left"];
+async function q(e, n, a) {
+  const t = {};
+  for (const i of S) {
+    const o = e[i];
+    if (o && typeof o != "function") {
+      const s = T(i, n);
+      t[i] = await j(
+        o.cloneNode(!0),
+        s.width,
+        s.height,
         a
       );
     }
   }
-  return o;
+  return t;
 }
-function Z(t, e) {
-  return t == null ? e.margin : typeof t == "number" ? { top: t, right: t, bottom: t, left: t } : {
-    top: t.top ?? e.margin.top,
-    right: t.right ?? e.margin.right,
-    bottom: t.bottom ?? e.margin.bottom,
-    left: t.left ?? e.margin.left
+function V(e, n) {
+  return e == null ? n.margin : typeof e == "number" ? { top: e, right: e, bottom: e, left: e } : {
+    top: e.top ?? n.margin.top,
+    right: e.right ?? n.margin.right,
+    bottom: e.bottom ?? n.margin.bottom,
+    left: e.left ?? n.margin.left
   };
 }
-const K = /[\u0600-\u06FF\u0750-\u077F\u08A0-\u08FF\uFB50-\uFDFF\uFE70-\uFEFF\u0590-\u05FF]/;
-async function O(t, e, a, o, i, n, l, r, c = !1) {
-  const g = document.createElement("div");
-  Object.assign(g.style, {
+const Y = /[\u0600-\u06FF\u0750-\u077F\u08A0-\u08FF\uFB50-\uFDFF\uFE70-\uFEFF\u0590-\u05FF]/;
+async function D(e, n, a, t, i, o, s, r, l = !1) {
+  const h = document.createElement("div");
+  Object.assign(h.style, {
     position: "fixed",
     left: "-99999px",
     top: "0",
-    width: `${e}px`,
+    width: `${n}px`,
     height: `${a}px`,
     overflow: "hidden",
     whiteSpace: "nowrap",
-    fontSize: `${o}px`,
+    fontSize: `${t}px`,
     fontFamily: i,
-    fontWeight: n,
-    color: l,
+    fontWeight: o,
+    color: s,
     display: "flex",
     alignItems: "center",
     gap: `${r}px`,
-    direction: c ? "rtl" : "ltr"
+    direction: l ? "rtl" : "ltr"
   });
-  const s = document.createElement("span");
-  s.textContent = t, Object.assign(s.style, {
+  const c = document.createElement("span");
+  c.textContent = e, Object.assign(c.style, {
     position: "absolute",
     visibility: "hidden",
     whiteSpace: "nowrap",
-    fontSize: `${o}px`,
+    fontSize: `${t}px`,
     fontFamily: i,
-    fontWeight: n
-  }), document.body.appendChild(s);
-  const h = s.offsetWidth;
-  s.remove();
-  const f = Math.ceil(e / (h + r)) + 2;
-  for (let d = 0; d < f; d++) {
+    fontWeight: o
+  }), document.body.appendChild(c);
+  const f = c.offsetWidth;
+  c.remove();
+  const d = Math.ceil(n / (f + r)) + 2;
+  for (let g = 0; g < d; g++) {
     const u = document.createElement("span");
-    u.textContent = t, u.style.flexShrink = "0", g.appendChild(u);
+    u.textContent = e, u.style.flexShrink = "0", h.appendChild(u);
   }
-  document.body.appendChild(g);
+  document.body.appendChild(h);
   try {
-    return await W(g, {
+    return await A(h, {
       scale: 1,
       backgroundColor: null,
-      width: Math.ceil(e),
+      width: Math.ceil(n),
       height: Math.ceil(a)
     });
   } finally {
-    g.remove();
+    h.remove();
   }
 }
-async function V(t, e, a, o, i, n, l) {
+async function U(e, n, a, t, i, o, s) {
   const {
     text: r,
-    color: c = "#000000",
-    fontSize: g = 2.5,
-    fontFamily: s = "Arial, sans-serif",
-    fontWeight: h = "normal"
-  } = e, f = g * a, d = (e.gap ?? g * 0.5) * a, u = f * 0.5, m = Math.ceil(f * 1.5), v = K.test(r);
-  console.log("isRtl", v);
-  const w = Math.round(n - u * 2), y = Math.round(l - u * 2), [b, C] = await Promise.all([
-    O(
+    color: l = "#000000",
+    fontSize: h = 2.5,
+    fontFamily: c = "Arial, sans-serif",
+    fontWeight: f = "normal"
+  } = n, d = h * a, g = (n.gap ?? h * 0.5) * a, u = d * 0.5, m = Math.ceil(d * 1.5), b = Y.test(r), p = Math.round(o - u * 2), y = Math.round(s - u * 2), [C, v] = await Promise.all([
+    D(
       r,
-      w,
+      p,
       m,
-      f,
-      s,
-      h,
-      c,
       d,
-      v
+      c,
+      f,
+      l,
+      g,
+      b
     ),
-    O(
+    D(
       r,
       y,
       m,
-      f,
-      s,
-      h,
-      c,
       d,
-      v
+      c,
+      f,
+      l,
+      g,
+      b
     )
-  ]), p = Math.round(m / 2);
-  t.drawImage(
-    b,
+  ]), w = Math.round(m / 2);
+  e.drawImage(
+    C,
     0,
     0,
-    w,
+    p,
     m,
-    o + u,
-    i - p,
-    w,
+    t + u,
+    i - w,
+    p,
     m
-  ), t.drawImage(
-    b,
+  ), e.drawImage(
+    C,
     0,
     0,
-    w,
+    p,
     m,
-    o + u,
-    i + l - p,
-    w,
+    t + u,
+    i + s - w,
+    p,
     m
-  ), t.save(), t.translate(o, i + l - u), t.rotate(-Math.PI / 2), t.drawImage(
-    C,
+  ), e.save(), e.translate(t, i + s - u), e.rotate(-Math.PI / 2), e.drawImage(
+    v,
     0,
     0,
     y,
     m,
     0,
-    -p,
+    -w,
     y,
     m
-  ), t.restore(), t.save(), t.translate(o + n, i + u), t.rotate(Math.PI / 2), t.drawImage(
-    C,
+  ), e.restore(), e.save(), e.translate(t + o, i + u), e.rotate(Math.PI / 2), e.drawImage(
+    v,
     0,
     0,
     y,
     m,
     0,
-    -p,
+    -w,
     y,
     m
-  ), t.restore();
+  ), e.restore();
 }
-function j(t, e) {
-  return Z(t.margin, e);
+function B(e, n) {
+  return V(e.margin, n);
 }
-async function z(t, e, a, o, i, n, l, r) {
-  for (const c of D) {
-    const g = e[c];
-    if (!g) continue;
-    const s = k(c, o);
-    let h;
-    typeof g == "function" ? h = await L(
-      g(n, l),
-      s.width,
-      s.height,
+async function X(e, n, a, t, i, o, s, r) {
+  for (const l of S) {
+    const h = n[l];
+    if (!h) continue;
+    const c = T(l, t);
+    let f;
+    typeof h == "function" ? f = await j(
+      h(o, s),
+      c.width,
+      c.height,
       r
-    ) : h = a[c], t.drawImage(
-      h,
+    ) : f = a[l], e.drawImage(
+      f,
       0,
       0,
-      h.width,
-      h.height,
-      Math.round(s.x * i),
-      Math.round(s.y * i),
-      Math.round(s.width * i),
-      Math.round(s.height * i)
+      f.width,
+      f.height,
+      Math.round(c.x * i),
+      Math.round(c.y * i),
+      Math.round(c.width * i),
+      Math.round(c.height * i)
     );
   }
-  if (e.contentBorder) {
-    const { color: c = "#000000", width: g = 0.3 } = e.contentBorder, s = j(e.contentBorder, o);
-    t.strokeStyle = c, t.lineWidth = g * i, t.strokeRect(
-      Math.round(s.left * i),
-      Math.round(s.top * i),
-      Math.round((o.pageWidth - s.left - s.right) * i),
-      Math.round((o.pageHeight - s.top - s.bottom) * i)
+  if (n.contentBorder) {
+    const { color: l = "#000000", width: h = 0.3 } = n.contentBorder, c = B(n.contentBorder, t);
+    e.strokeStyle = l, e.lineWidth = h * i, e.strokeRect(
+      Math.round(c.left * i),
+      Math.round(c.top * i),
+      Math.round((t.pageWidth - c.left - c.right) * i),
+      Math.round((t.pageHeight - c.top - c.bottom) * i)
     );
   }
-  if (e.textBorder) {
-    const c = j(e.textBorder, o);
-    await V(
-      t,
-      e.textBorder,
+  if (n.textBorder) {
+    const l = B(n.textBorder, t);
+    await U(
+      e,
+      n.textBorder,
       i,
-      Math.round(c.left * i),
-      Math.round(c.top * i),
-      Math.round((o.pageWidth - c.left - c.right) * i),
-      Math.round((o.pageHeight - c.top - c.bottom) * i)
+      Math.round(l.left * i),
+      Math.round(l.top * i),
+      Math.round((t.pageWidth - l.left - l.right) * i),
+      Math.round((t.pageHeight - l.top - l.bottom) * i)
     );
   }
 }
-async function et(t, e = {}) {
-  const { imageFormat: a = "JPEG", imageQuality: o = 1, scale: i = 2 } = e, n = M(e), l = N(), r = B(t, n.pageWidth);
-  r.style.opacity = "1", r.style.left = "-99999px", P(r);
-  const c = E(r, n);
-  R(r, c.pageContentPx), F(r, c.pageContentPx), T(r, c.pageContentPx);
+async function ot(e, n = {}) {
+  const { imageFormat: a = "JPEG", imageQuality: t = 0.7, scale: i = 2 } = n, o = W(n), s = N(), r = P(e, o.pageWidth);
+  r.style.opacity = "1", r.style.left = "-99999px", F(r);
+  const l = R(r, o);
+  I(r, l.pageContentPx), O(r, l.pageContentPx), L(r, l.pageContentPx), G(r);
   try {
-    const g = await W(r, {
+    const h = await A(r, {
       scale: i,
       backgroundColor: "#ffffff"
-    }), { jsPDF: s } = await import("jspdf"), h = n.pageWidth - n.margin.left - n.margin.right, f = n.pageHeight - n.margin.top - n.margin.bottom, d = g.width, u = f / h * d, m = Math.ceil(g.height / u), v = n.pageWidth > n.pageHeight ? "l" : "p", w = new s({
-      orientation: v,
+    }), { jsPDF: c } = await import("jspdf"), f = o.pageWidth - o.margin.left - o.margin.right, d = o.pageHeight - o.margin.top - o.margin.bottom, g = h.width, u = d / f * g, m = Math.ceil(h.height / u), b = o.pageWidth > o.pageHeight ? "l" : "p", p = new c({
+      orientation: b,
       unit: "mm",
-      format: [n.pageWidth, n.pageHeight]
+      format: [o.pageWidth, o.pageHeight]
     });
     for (let y = 0; y < m; y++) {
-      const b = Math.min(
+      const C = Math.min(
         u,
-        g.height - y * u
-      ), C = document.createElement("canvas");
-      C.width = d, C.height = b;
-      const p = C.getContext("2d");
-      if (!p) throw new Error("Could not get canvas context");
-      p.fillStyle = "#ffffff", p.fillRect(0, 0, d, b), p.drawImage(
-        g,
+        h.height - y * u
+      ), v = document.createElement("canvas");
+      v.width = g, v.height = C;
+      const w = v.getContext("2d");
+      if (!w) throw new Error("Could not get canvas context");
+      w.fillStyle = "#ffffff", w.fillRect(0, 0, g, C), w.drawImage(
+        h,
         0,
         y * u,
-        d,
-        b,
+        g,
+        C,
         0,
         0,
-        d,
-        b
+        g,
+        C
       );
-      const A = C.toDataURL(
+      const E = v.toDataURL(
         `image/${a.toLowerCase()}`,
-        o
+        t
       );
-      y > 0 && w.addPage([n.pageWidth, n.pageHeight], v);
-      const H = b / d * h;
-      w.addImage(
-        A,
+      y > 0 && p.addPage([o.pageWidth, o.pageHeight], b);
+      const H = C / g * f;
+      p.addImage(
+        E,
         a,
-        n.margin.left,
-        n.margin.top,
-        h,
+        o.margin.left,
+        o.margin.top,
+        f,
         H,
         void 0,
-        "FAST"
+        "SLOW"
       );
     }
-    return e.marginContent && await $(w, e.marginContent, e), w;
+    return n.marginContent && await $(p, n.marginContent, n), p;
   } finally {
-    r.remove(), l();
+    r.remove(), s();
   }
 }
-async function Y(t, e = {}) {
-  const { imageFormat: a = "PNG", imageQuality: o = 1, scale: i = 2 } = e, n = M(e), l = N(), r = B(t, n.pageWidth);
-  r.style.opacity = "1", r.style.left = "-99999px", P(r);
-  const c = E(r, n);
-  R(r, c.pageContentPx), F(r, c.pageContentPx), T(r, c.pageContentPx);
+async function tt(e, n = {}) {
+  const { imageFormat: a = "PNG", imageQuality: t = 0.75, scale: i = 2 } = n, o = W(n), s = N(), r = P(e, o.pageWidth);
+  r.style.opacity = "1", r.style.left = "-99999px", F(r);
+  const l = R(r, o);
+  I(r, l.pageContentPx), O(r, l.pageContentPx), L(r, l.pageContentPx), G(r);
   try {
-    const g = await W(r, {
+    const h = await A(r, {
       scale: i,
       backgroundColor: "#ffffff"
-    }), s = n.pageWidth - n.margin.left - n.margin.right, h = n.pageHeight - n.margin.top - n.margin.bottom, f = g.width, d = h / s * f, u = f / s, m = Math.round(n.pageWidth * u), v = Math.round(n.pageHeight * u), w = Math.round(n.margin.top * u), y = Math.round(n.margin.left * u), b = Math.ceil(g.height / d), C = [], { marginContent: p } = e, A = p ? await G(p, n, i) : {};
-    for (let H = 0; H < b; H++) {
-      const I = Math.min(
-        d,
-        g.height - H * d
-      ), S = document.createElement("canvas");
-      S.width = m, S.height = v;
-      const x = S.getContext("2d");
-      if (!x) throw new Error("Could not get canvas context");
-      x.fillStyle = "#ffffff", x.fillRect(0, 0, m, v), x.drawImage(
+    }), c = o.pageWidth - o.margin.left - o.margin.right, f = o.pageHeight - o.margin.top - o.margin.bottom, d = h.width, g = f / c * d, u = d / c, m = Math.round(o.pageWidth * u), b = Math.round(o.pageHeight * u), p = Math.round(o.margin.top * u), y = Math.round(o.margin.left * u), C = Math.ceil(h.height / g), v = [], { marginContent: w } = n, E = w ? await q(w, o, i) : {};
+    for (let H = 0; H < C; H++) {
+      const k = Math.min(
         g,
+        h.height - H * g
+      ), M = document.createElement("canvas");
+      M.width = m, M.height = b;
+      const x = M.getContext("2d");
+      if (!x) throw new Error("Could not get canvas context");
+      x.fillStyle = "#ffffff", x.fillRect(0, 0, m, b), x.drawImage(
+        h,
         0,
-        H * d,
-        f,
-        I,
+        H * g,
+        d,
+        k,
         y,
-        w,
-        f,
-        I
-      ), p && await z(
-        x,
         p,
-        A,
-        n,
+        d,
+        k
+      ), w && await X(
+        x,
+        w,
+        E,
+        o,
         u,
         H + 1,
-        b,
+        C,
         i
-      ), C.push(
-        S.toDataURL(
+      ), v.push(
+        M.toDataURL(
           `image/${a.toLowerCase()}`,
-          o
+          t
         )
       );
     }
-    return C;
+    return v;
   } finally {
-    r.remove(), l();
+    r.remove(), s();
   }
 }
-async function nt(t, e, a = {}) {
-  const o = M(a), i = await Y(t, a);
-  e.innerHTML = "", Object.assign(e.style, {
+async function it(e, n, a = {}) {
+  const t = W(a), i = await tt(e, a);
+  n.innerHTML = "", Object.assign(n.style, {
     direction: "ltr",
     width: "fit-content",
-    height: o.pageHeight + "mm",
+    height: t.pageHeight + "mm",
     maxHeight: "100vh",
     overflowY: "auto",
     background: "#e0e0e0"
   });
-  for (let n = 0; n < i.length; n++) {
-    const l = document.createElement("img");
-    l.src = i[n], l.alt = `Page ${n + 1}`, Object.assign(l.style, {
-      width: o.pageWidth + "mm",
+  for (let o = 0; o < i.length; o++) {
+    const s = document.createElement("img");
+    s.src = i[o], s.alt = `Page ${o + 1}`, Object.assign(s.style, {
+      width: t.pageWidth + "mm",
       maxWidth: "100%",
       height: "auto",
       boxSizing: "border-box",
@@ -582,49 +617,89 @@ async function nt(t, e, a = {}) {
       border: "1px solid #bbb",
       boxShadow: "0 2px 8px rgba(0,0,0,0.2)",
       marginBottom: "16px"
-    }), e.appendChild(l);
+    }), n.appendChild(s);
   }
 }
-async function $(t, e, a = {}) {
-  const o = M(a), i = t.getNumberOfPages(), n = 2, l = n * (96 / 25.4), r = Math.round(o.pageWidth * l), c = Math.round(o.pageHeight * l), g = await G(e, o, n);
-  for (let s = 1; s <= i; s++) {
-    t.setPage(s);
-    const h = document.createElement("canvas");
-    h.width = r, h.height = c;
-    const f = h.getContext("2d");
-    f && (await z(
+async function $(e, n, a = {}) {
+  const t = W(a), i = e.getNumberOfPages(), o = 2, s = o * (96 / 25.4), r = Math.round(t.pageWidth * s), l = Math.round(t.pageHeight * s), h = await q(n, t, o), c = {};
+  for (const d of S)
+    h[d] && (c[d] = h[d].toDataURL("image/png"));
+  let f;
+  if (n.textBorder) {
+    const d = document.createElement("canvas");
+    d.width = r, d.height = l;
+    const g = d.getContext("2d");
+    if (g) {
+      const u = B(n.textBorder, t);
+      await U(
+        g,
+        n.textBorder,
+        s,
+        Math.round(u.left * s),
+        Math.round(u.top * s),
+        Math.round((t.pageWidth - u.left - u.right) * s),
+        Math.round((t.pageHeight - u.top - u.bottom) * s)
+      ), f = d.toDataURL("image/png");
+    }
+  }
+  for (let d = 1; d <= i; d++) {
+    e.setPage(d);
+    for (const g of S) {
+      const u = n[g];
+      if (!u) continue;
+      const m = T(g, t);
+      let b, p;
+      typeof u == "function" ? b = (await j(
+        u(d, i),
+        m.width,
+        m.height,
+        o
+      )).toDataURL("image/png") : (b = c[g], p = `margin-${g}`), e.addImage(
+        b,
+        "PNG",
+        m.x,
+        m.y,
+        m.width,
+        m.height,
+        p,
+        "SLOW"
+      );
+    }
+    if (n.contentBorder) {
+      const { color: g = "#000000", width: u = 0.3 } = n.contentBorder, m = B(n.contentBorder, t);
+      e.setDrawColor(g), e.setLineWidth(u), e.rect(
+        m.left,
+        m.top,
+        t.pageWidth - m.left - m.right,
+        t.pageHeight - m.top - m.bottom
+      );
+    }
+    f && e.addImage(
       f,
-      e,
-      g,
-      o,
-      l,
-      s,
-      i,
-      n
-    ), t.addImage(
-      h.toDataURL("image/png"),
       "PNG",
       0,
       0,
-      o.pageWidth,
-      o.pageHeight
-    ));
+      t.pageWidth,
+      t.pageHeight,
+      "text-border",
+      "SLOW"
+    );
   }
-  return t;
+  return e;
 }
 export {
   _ as PAGE_MARGINS,
-  q as PAGE_SIZES,
+  z as PAGE_SIZES,
   $ as addMarginContent,
-  E as computeLayout,
-  B as createPrintClone,
-  T as insertPageBreakSpacers,
-  P as normalizeTableAttributes,
-  Q as prepare,
-  nt as previewPageImages,
-  tt as renderHTML,
-  et as renderImagePDF,
-  Y as renderPageImages,
-  R as splitOversizedTables,
-  F as splitOversizedText
+  R as computeLayout,
+  P as createPrintClone,
+  L as insertPageBreakSpacers,
+  F as normalizeTableAttributes,
+  K as prepare,
+  it as previewPageImages,
+  nt as renderHTML,
+  ot as renderImagePDF,
+  tt as renderPageImages,
+  I as splitOversizedTables,
+  O as splitOversizedText
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspdf-utils",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Utility helpers for jsPDF's doc.html() renderer with automatic page breaking, table splitting, and RTL support",
   "type": "module",
   "main": "dist/html-to-pdf.js",