jspdf-utils 0.2.6 → 0.3.0

package/dist/html-to-pdf.d.ts

@@ -4,7 +4,7 @@
  * Helpers that prepare an HTML element for clean, paginated PDF output
  * via jsPDF's doc.html() renderer.
  */
-import type { jsPDF } from "jspdf";
+import jsPDF from "jspdf-with-html2canvas-pro";
 export interface Margin {
     top: number;
     right: number;

package/dist/html-to-pdf.js

@@ -1198,22 +1198,22 @@ const sA = (t) => t.type === 15, O = (t) => t.type === 17, H = (t) => t.type ===
     const n = (C, d) => {
       if (O(d))
         return d.number;
-      const E = (y) => y === "r" || y === "x" ? 0 : y === "g" || y === "y" ? 1 : 2;
+      const p = (y) => y === "r" || y === "x" ? 0 : y === "g" || y === "y" ? 1 : 2;
       if (H(d)) {
-        const y = E(d.value);
+        const y = p(d.value);
         return C[y];
       }
-      const p = (y) => {
+      const E = (y) => {
         const G = y.filter(V);
         let AA = "(";
         for (const R of G)
-          AA += R.type === 18 && R.name === "calc" ? p(R.values) : O(R) ? R.number : R.type === 6 || H(R) ? R.value : "";
+          AA += R.type === 18 && R.name === "calc" ? E(R.values) : O(R) ? R.number : R.type === 6 || H(R) ? R.value : "";
         return AA += ")", AA;
       };
       if (d.type === 18) {
         const y = d.values.filter(V);
         if (d.name === "calc") {
-          const G = p(y).replace(/r|x/, C[0].toString()).replace(/g|y/, C[1].toString()).replace(/b|z/, C[2].toString());
+          const G = E(y).replace(/r|x/, C[0].toString()).replace(/g|y/, C[1].toString()).replace(/b|z/, C[2].toString());
           return new Function("return " + G)();
         }
       }
@@ -1224,21 +1224,21 @@ const sA = (t) => t.type === 15, O = (t) => t.type === 17, H = (t) => t.type ===
       if (typeof rA[e[1].value.toUpperCase()] > "u")
         throw new Error("Attempting to use unknown color in relative color 'from'");
       {
-        const d = RA(t, e[1].value), E = 255 & d, p = 255 & d >> 8, y = 255 & d >> 16;
+        const d = RA(t, e[1].value), p = 255 & d, E = 255 & d >> 8, y = 255 & d >> 16;
         i = [
           { type: 17, number: 255 & d >> 24, flags: 1 },
           { type: 17, number: y, flags: 1 },
-          { type: 17, number: p, flags: 1 },
-          { type: 17, number: E > 1 ? E / 255 : E, flags: 1 }
+          { type: 17, number: E, flags: 1 },
+          { type: 17, number: p > 1 ? p / 255 : p, flags: 1 }
         ];
       }
     } else if (e[1].type === 5) {
-      const [C, d, E, p] = qs(e[1]);
+      const [C, d, p, E] = qs(e[1]);
       i = [
         { type: 17, number: C, flags: 1 },
         { type: 17, number: d, flags: 1 },
-        { type: 17, number: E, flags: 1 },
-        { type: 17, number: p > 1 ? p / 255 : p, flags: 1 }
+        { type: 17, number: p, flags: 1 },
+        { type: 17, number: E > 1 ? E / 255 : E, flags: 1 }
       ];
     }
     if (i.length === 0)
@@ -4132,8 +4132,8 @@ class zl {
     g.push((s + o) / r.width), g.push((c + i) / r.width), g.push((n + l) / r.height), g.push((B + a) / r.height);
     const Q = Math.max(...g);
     Q > 1 && (s /= Q, n /= Q, o /= Q, B /= Q, i /= Q, a /= Q, c /= Q, l /= Q);
-    const w = r.width - o, h = r.height - a, f = r.width - i, u = r.height - l, C = e.borderTopWidth, d = e.borderRightWidth, E = e.borderBottomWidth, p = e.borderLeftWidth, y = I(e.paddingTop, A.bounds.width), G = I(e.paddingRight, A.bounds.width), AA = I(e.paddingBottom, A.bounds.width), R = I(e.paddingLeft, A.bounds.width);
-    this.topLeftBorderDoubleOuterBox = s > 0 || n > 0 ? K(r.left + p / 3, r.top + C / 3, s - p / 3, n - C / 3, x.TOP_LEFT) : new F(r.left + p / 3, r.top + C / 3), this.topRightBorderDoubleOuterBox = s > 0 || n > 0 ? K(r.left + w, r.top + C / 3, o - d / 3, B - C / 3, x.TOP_RIGHT) : new F(r.left + r.width - d / 3, r.top + C / 3), this.bottomRightBorderDoubleOuterBox = i > 0 || a > 0 ? K(r.left + f, r.top + h, i - d / 3, a - E / 3, x.BOTTOM_RIGHT) : new F(r.left + r.width - d / 3, r.top + r.height - E / 3), this.bottomLeftBorderDoubleOuterBox = c > 0 || l > 0 ? K(r.left + p / 3, r.top + u, c - p / 3, l - E / 3, x.BOTTOM_LEFT) : new F(r.left + p / 3, r.top + r.height - E / 3), this.topLeftBorderDoubleInnerBox = s > 0 || n > 0 ? K(r.left + p * 2 / 3, r.top + C * 2 / 3, s - p * 2 / 3, n - C * 2 / 3, x.TOP_LEFT) : new F(r.left + p * 2 / 3, r.top + C * 2 / 3), this.topRightBorderDoubleInnerBox = s > 0 || n > 0 ? K(r.left + w, r.top + C * 2 / 3, o - d * 2 / 3, B - C * 2 / 3, x.TOP_RIGHT) : new F(r.left + r.width - d * 2 / 3, r.top + C * 2 / 3), this.bottomRightBorderDoubleInnerBox = i > 0 || a > 0 ? K(r.left + f, r.top + h, i - d * 2 / 3, a - E * 2 / 3, x.BOTTOM_RIGHT) : new F(r.left + r.width - d * 2 / 3, r.top + r.height - E * 2 / 3), this.bottomLeftBorderDoubleInnerBox = c > 0 || l > 0 ? K(r.left + p * 2 / 3, r.top + u, c - p * 2 / 3, l - E * 2 / 3, x.BOTTOM_LEFT) : new F(r.left + p * 2 / 3, r.top + r.height - E * 2 / 3), this.topLeftBorderStroke = s > 0 || n > 0 ? K(r.left + p / 2, r.top + C / 2, s - p / 2, n - C / 2, x.TOP_LEFT) : new F(r.left + p / 2, r.top + C / 2), this.topRightBorderStroke = s > 0 || n > 0 ? K(r.left + w, r.top + C / 2, o - d / 2, B - C / 2, x.TOP_RIGHT) : new F(r.left + r.width - d / 2, r.top + C / 2), this.bottomRightBorderStroke = i > 0 || a > 0 ? K(r.left + f, r.top + h, i - d / 2, a - E / 2, x.BOTTOM_RIGHT) : new F(r.left + r.width - d / 2, r.top + r.height - E / 2), this.bottomLeftBorderStroke = c > 0 || l > 0 ? K(r.left + p / 2, r.top + u, c - p / 2, l - E / 2, x.BOTTOM_LEFT) : new F(r.left + p / 2, r.top + r.height - E / 2), this.topLeftBorderBox = s > 0 || n > 0 ? K(r.left, r.top, s, n, x.TOP_LEFT) : new F(r.left, r.top), this.topRightBorderBox = o > 0 || B > 0 ? K(r.left + w, r.top, o, B, x.TOP_RIGHT) : new F(r.left + r.width, r.top), this.bottomRightBorderBox = i > 0 || a > 0 ? K(r.left + f, r.top + h, i, a, x.BOTTOM_RIGHT) : new F(r.left + r.width, r.top + r.height), this.bottomLeftBorderBox = c > 0 || l > 0 ? K(r.left, r.top + u, c, l, x.BOTTOM_LEFT) : new F(r.left, r.top + r.height), this.topLeftPaddingBox = s > 0 || n > 0 ? K(r.left + p, r.top + C, Math.max(0, s - p), Math.max(0, n - C), x.TOP_LEFT) : new F(r.left + p, r.top + C), this.topRightPaddingBox = o > 0 || B > 0 ? K(r.left + Math.min(w, r.width - d), r.top + C, w > r.width + d ? 0 : Math.max(0, o - d), Math.max(0, B - C), x.TOP_RIGHT) : new F(r.left + r.width - d, r.top + C), this.bottomRightPaddingBox = i > 0 || a > 0 ? K(r.left + Math.min(f, r.width - p), r.top + Math.min(h, r.height - E), Math.max(0, i - d), Math.max(0, a - E), x.BOTTOM_RIGHT) : new F(r.left + r.width - d, r.top + r.height - E), this.bottomLeftPaddingBox = c > 0 || l > 0 ? K(r.left + p, r.top + Math.min(u, r.height - E), Math.max(0, c - p), Math.max(0, l - E), x.BOTTOM_LEFT) : new F(r.left + p, r.top + r.height - E), this.topLeftContentBox = s > 0 || n > 0 ? K(r.left + p + R, r.top + C + y, Math.max(0, s - (p + R)), Math.max(0, n - (C + y)), x.TOP_LEFT) : new F(r.left + p + R, r.top + C + y), this.topRightContentBox = o > 0 || B > 0 ? K(r.left + Math.min(w, r.width + p + R), r.top + C + y, w > r.width + p + R ? 0 : o - p + R, B - (C + y), x.TOP_RIGHT) : new F(r.left + r.width - (d + G), r.top + C + y), this.bottomRightContentBox = i > 0 || a > 0 ? K(r.left + Math.min(f, r.width - (p + R)), r.top + Math.min(h, r.height + C + y), Math.max(0, i - (d + G)), a - (E + AA), x.BOTTOM_RIGHT) : new F(r.left + r.width - (d + G), r.top + r.height - (E + AA)), this.bottomLeftContentBox = c > 0 || l > 0 ? K(r.left + p + R, r.top + u, Math.max(0, c - (p + R)), l - (E + AA), x.BOTTOM_LEFT) : new F(r.left + p + R, r.top + r.height - (E + AA));
+    const w = r.width - o, h = r.height - a, f = r.width - i, u = r.height - l, C = e.borderTopWidth, d = e.borderRightWidth, p = e.borderBottomWidth, E = e.borderLeftWidth, y = I(e.paddingTop, A.bounds.width), G = I(e.paddingRight, A.bounds.width), AA = I(e.paddingBottom, A.bounds.width), R = I(e.paddingLeft, A.bounds.width);
+    this.topLeftBorderDoubleOuterBox = s > 0 || n > 0 ? K(r.left + E / 3, r.top + C / 3, s - E / 3, n - C / 3, x.TOP_LEFT) : new F(r.left + E / 3, r.top + C / 3), this.topRightBorderDoubleOuterBox = s > 0 || n > 0 ? K(r.left + w, r.top + C / 3, o - d / 3, B - C / 3, x.TOP_RIGHT) : new F(r.left + r.width - d / 3, r.top + C / 3), this.bottomRightBorderDoubleOuterBox = i > 0 || a > 0 ? K(r.left + f, r.top + h, i - d / 3, a - p / 3, x.BOTTOM_RIGHT) : new F(r.left + r.width - d / 3, r.top + r.height - p / 3), this.bottomLeftBorderDoubleOuterBox = c > 0 || l > 0 ? K(r.left + E / 3, r.top + u, c - E / 3, l - p / 3, x.BOTTOM_LEFT) : new F(r.left + E / 3, r.top + r.height - p / 3), this.topLeftBorderDoubleInnerBox = s > 0 || n > 0 ? K(r.left + E * 2 / 3, r.top + C * 2 / 3, s - E * 2 / 3, n - C * 2 / 3, x.TOP_LEFT) : new F(r.left + E * 2 / 3, r.top + C * 2 / 3), this.topRightBorderDoubleInnerBox = s > 0 || n > 0 ? K(r.left + w, r.top + C * 2 / 3, o - d * 2 / 3, B - C * 2 / 3, x.TOP_RIGHT) : new F(r.left + r.width - d * 2 / 3, r.top + C * 2 / 3), this.bottomRightBorderDoubleInnerBox = i > 0 || a > 0 ? K(r.left + f, r.top + h, i - d * 2 / 3, a - p * 2 / 3, x.BOTTOM_RIGHT) : new F(r.left + r.width - d * 2 / 3, r.top + r.height - p * 2 / 3), this.bottomLeftBorderDoubleInnerBox = c > 0 || l > 0 ? K(r.left + E * 2 / 3, r.top + u, c - E * 2 / 3, l - p * 2 / 3, x.BOTTOM_LEFT) : new F(r.left + E * 2 / 3, r.top + r.height - p * 2 / 3), this.topLeftBorderStroke = s > 0 || n > 0 ? K(r.left + E / 2, r.top + C / 2, s - E / 2, n - C / 2, x.TOP_LEFT) : new F(r.left + E / 2, r.top + C / 2), this.topRightBorderStroke = s > 0 || n > 0 ? K(r.left + w, r.top + C / 2, o - d / 2, B - C / 2, x.TOP_RIGHT) : new F(r.left + r.width - d / 2, r.top + C / 2), this.bottomRightBorderStroke = i > 0 || a > 0 ? K(r.left + f, r.top + h, i - d / 2, a - p / 2, x.BOTTOM_RIGHT) : new F(r.left + r.width - d / 2, r.top + r.height - p / 2), this.bottomLeftBorderStroke = c > 0 || l > 0 ? K(r.left + E / 2, r.top + u, c - E / 2, l - p / 2, x.BOTTOM_LEFT) : new F(r.left + E / 2, r.top + r.height - p / 2), this.topLeftBorderBox = s > 0 || n > 0 ? K(r.left, r.top, s, n, x.TOP_LEFT) : new F(r.left, r.top), this.topRightBorderBox = o > 0 || B > 0 ? K(r.left + w, r.top, o, B, x.TOP_RIGHT) : new F(r.left + r.width, r.top), this.bottomRightBorderBox = i > 0 || a > 0 ? K(r.left + f, r.top + h, i, a, x.BOTTOM_RIGHT) : new F(r.left + r.width, r.top + r.height), this.bottomLeftBorderBox = c > 0 || l > 0 ? K(r.left, r.top + u, c, l, x.BOTTOM_LEFT) : new F(r.left, r.top + r.height), this.topLeftPaddingBox = s > 0 || n > 0 ? K(r.left + E, r.top + C, Math.max(0, s - E), Math.max(0, n - C), x.TOP_LEFT) : new F(r.left + E, r.top + C), this.topRightPaddingBox = o > 0 || B > 0 ? K(r.left + Math.min(w, r.width - d), r.top + C, w > r.width + d ? 0 : Math.max(0, o - d), Math.max(0, B - C), x.TOP_RIGHT) : new F(r.left + r.width - d, r.top + C), this.bottomRightPaddingBox = i > 0 || a > 0 ? K(r.left + Math.min(f, r.width - E), r.top + Math.min(h, r.height - p), Math.max(0, i - d), Math.max(0, a - p), x.BOTTOM_RIGHT) : new F(r.left + r.width - d, r.top + r.height - p), this.bottomLeftPaddingBox = c > 0 || l > 0 ? K(r.left + E, r.top + Math.min(u, r.height - p), Math.max(0, c - E), Math.max(0, l - p), x.BOTTOM_LEFT) : new F(r.left + E, r.top + r.height - p), this.topLeftContentBox = s > 0 || n > 0 ? K(r.left + E + R, r.top + C + y, Math.max(0, s - (E + R)), Math.max(0, n - (C + y)), x.TOP_LEFT) : new F(r.left + E + R, r.top + C + y), this.topRightContentBox = o > 0 || B > 0 ? K(r.left + Math.min(w, r.width + E + R), r.top + C + y, w > r.width + E + R ? 0 : o - E + R, B - (C + y), x.TOP_RIGHT) : new F(r.left + r.width - (d + G), r.top + C + y), this.bottomRightContentBox = i > 0 || a > 0 ? K(r.left + Math.min(f, r.width - (E + R)), r.top + Math.min(h, r.height + C + y), Math.max(0, i - (d + G)), a - (p + AA), x.BOTTOM_RIGHT) : new F(r.left + r.width - (d + G), r.top + r.height - (p + AA)), this.bottomLeftContentBox = c > 0 || l > 0 ? K(r.left + E + R, r.top + u, Math.max(0, c - (E + R)), l - (p + AA), x.BOTTOM_LEFT) : new F(r.left + E + R, r.top + r.height - (p + AA));
   }
 }
 var x;
@@ -4610,9 +4610,9 @@ class lr extends Ln {
           });
         const h = l[w - 1];
         if (h && h.length > 0 && r) {
-          const f = h.map((E) => E.text).join(""), u = h[0], C = r.width - (u.bounds.left - r.left), d = this.truncateTextWithEllipsis(f, C, e.letterSpacing);
-          n.forEach((E) => {
-            switch (E) {
+          const f = h.map((p) => p.text).join(""), u = h[0], C = r.width - (u.bounds.left - r.left), d = this.truncateTextWithEllipsis(f, C, e.letterSpacing);
+          n.forEach((p) => {
+            switch (p) {
               case 0:
                 this.ctx.fillStyle = b(e.color), e.letterSpacing === 0 ? this.ctx.fillText(d, u.bounds.left, u.bounds.top + e.fontSize.number) : tA(d).reduce((y, G) => (this.ctx.fillText(G, y, u.bounds.top + e.fontSize.number), y + this.ctx.measureText(G).width + e.letterSpacing), u.bounds.left);
                 break;
@@ -4690,8 +4690,8 @@ class lr extends Ln {
       else if (f === 8)
         c > w ? (i += (c - w) / 2, c = w) : (g += (w - c) / 2, w = c), l > h ? (a += (l - h) / 2, l = h) : (Q += (h - l) / 2, h = l);
       else if (f === 16) {
-        const d = C > u ? w : h * C, E = c > w ? c : w;
-        d < E ? C > u ? (h = w / C, Q += (o.height - h) / 2) : (w = h * C, g += (o.width - w) / 2) : (c > w ? (i += (c - w) / 2, c = w) : (g += (w - c) / 2, w = c), l > h ? (a += (l - h) / 2, l = h) : (Q += (h - l) / 2, h = l));
+        const d = C > u ? w : h * C, p = c > w ? c : w;
+        d < p ? C > u ? (h = w / C, Q += (o.height - h) / 2) : (w = h * C, g += (o.width - w) / 2) : (c > w ? (i += (c - w) / 2, c = w) : (g += (w - c) / 2, w = c), l > h ? (a += (l - h) / 2, l = h) : (Q += (h - l) / 2, h = l));
       }
       this.ctx.drawImage(r, i, a, c, l, g, Q, w, h), this.ctx.restore();
     }
@@ -5082,15 +5082,15 @@ const dg = async (t, A) => {
     width: A.width ?? Math.ceil(w),
     height: A.height ?? Math.ceil(h)
   };
-  let E;
+  let p;
   if (a)
-    i.logger.debug("Document cloned, using foreign object rendering"), E = await new ug(i, d).render(g);
+    i.logger.debug("Document cloned, using foreign object rendering"), p = await new ug(i, d).render(g);
   else {
     i.logger.debug(`Document cloned, element located at ${f},${u} with size ${w}x${h} using computed rendering`), i.logger.debug("Starting DOM parsing");
-    const p = Un(i, g);
-    C === p.styles.backgroundColor && (p.styles.backgroundColor = rA.TRANSPARENT), i.logger.debug(`Starting renderer for element at ${d.x},${d.y} with size ${d.width}x${d.height}`), E = await new lr(i, d).render(p);
+    const E = Un(i, g);
+    C === E.styles.backgroundColor && (E.styles.backgroundColor = rA.TRANSPARENT), i.logger.debug(`Starting renderer for element at ${d.x},${d.y} with size ${d.width}x${d.height}`), p = await new lr(i, d).render(E);
   }
-  return (A.removeContainer ?? !0) && (hs.destroy(Q) || i.logger.error("Cannot detach cloned iframe as it is not in the DOM anymore")), i.logger.debug("Finished rendering"), E;
+  return (A.removeContainer ?? !0) && (hs.destroy(Q) || i.logger.error("Cannot detach cloned iframe as it is not in the DOM anymore")), i.logger.debug("Finished rendering"), p;
 }, pg = (t, A, e) => {
   const r = A.ownerDocument, s = r.documentElement ? RA(t, getComputedStyle(r.documentElement).backgroundColor) : rA.TRANSPARENT, n = r.body ? RA(t, getComputedStyle(r.body).backgroundColor) : rA.TRANSPARENT, o = typeof e == "string" ? RA(t, e) : e === null ? rA.TRANSPARENT : 4294967295;
   return A === r.documentElement ? fA(s) ? fA(n) ? o : n : s : o;
@@ -5707,7 +5707,7 @@ async function kn(t, A, e, r, s, n, o) {
     fontSize: a = 2.5,
     fontFamily: c = "Arial, sans-serif",
     fontWeight: l = "normal"
-  } = A, g = a * e, Q = (A.gap ?? a * 0.5) * e, w = g * 0.5, h = Math.ceil(g * 2.5), f = Dg.test(B), u = Math.round(n - w * 2), C = Math.round(o - w * 2), [d, E] = await Promise.all([
+  } = A, g = a * e, Q = (A.gap ?? a * 0.5) * e, w = g * 0.5, h = Math.ceil(g * 2.5), f = Dg.test(B), u = Math.round(n - w * 2), C = Math.round(o - w * 2), [d, p] = await Promise.all([
     Es(
       B,
       u,
@@ -5730,7 +5730,7 @@ async function kn(t, A, e, r, s, n, o) {
       Q,
       f
     )
-  ]), p = Math.round(h / 2);
+  ]), E = Math.round(h / 2);
   t.drawImage(
     d,
     0,
@@ -5738,7 +5738,7 @@ async function kn(t, A, e, r, s, n, o) {
     d.width,
     d.height,
     r + w,
-    s - p,
+    s - E,
     u,
     h
   ), t.drawImage(
@@ -5748,27 +5748,27 @@ async function kn(t, A, e, r, s, n, o) {
     d.width,
     d.height,
     r + w,
-    s + o - p,
+    s + o - E,
     u,
     h
   ), t.save(), t.translate(r, s + o - w), t.rotate(-Math.PI / 2), t.drawImage(
-    E,
+    p,
     0,
     0,
-    E.width,
-    E.height,
+    p.width,
+    p.height,
     0,
-    -p,
+    -E,
     C,
     h
   ), t.restore(), t.save(), t.translate(r + n, s + w), t.rotate(Math.PI / 2), t.drawImage(
-    E,
+    p,
     0,
     0,
-    E.width,
-    E.height,
+    p.width,
+    p.height,
     0,
-    -p,
+    -E,
     C,
     h
   ), t.restore();
@@ -5895,7 +5895,7 @@ async function Gg(t, A = {}) {
     const a = await ae(o, {
       scale: s,
       backgroundColor: null
-    }), { jsPDF: c } = await import("jspdf"), l = Jn(a, n, B, s), g = Math.ceil(a.height / l.contentHeightPx), Q = _n(
+    }), { jsPDF: c } = await import("./jspdf.es.min-BDu0IqVE.js").then((p) => p.j), l = Jn(a, n, B, s), g = Math.ceil(a.height / l.contentHeightPx), Q = _n(
       g,
       A.forcedPageCount
     ), w = n.pageWidth > n.pageHeight ? "l" : "p", { marginContent: h, textBorder: f, border: u } = A, C = h ? await ur(h, n, s) : {}, d = new c({
@@ -5903,29 +5903,29 @@ async function Gg(t, A = {}) {
       unit: "mm",
       format: [n.pageWidth, n.pageHeight]
     });
-    for (let E = 0; E < Q; E++) {
+    for (let p = 0; p < Q; p++) {
       const {
-        canvas: p,
+        canvas: E,
         ctx: y,
         sliceHeight: G
-      } = Wn(a, E, l);
+      } = Wn(a, p, l);
       (h || f || u) && await Xn(
         y,
         h,
         C,
         n,
         l.pxPerMm,
-        E + 1,
+        p + 1,
         Q,
         s,
         f,
         u
-      ), Yn(y, a, E, l, G);
-      const AA = p.toDataURL(
+      ), Yn(y, a, p, l, G);
+      const AA = E.toDataURL(
         `image/${e.toLowerCase()}`,
         r
       );
-      E > 0 && d.addPage([n.pageWidth, n.pageHeight], w), d.addImage(
+      p > 0 && d.addPage([n.pageWidth, n.pageHeight], w), d.addImage(
         AA,
         e,
         0,
@@ -5957,11 +5957,11 @@ async function Mg(t, A = {}) {
     for (let C = 0; C < g; C++) {
       const {
         canvas: d,
-        ctx: E,
-        sliceHeight: p
+        ctx: p,
+        sliceHeight: E
       } = Wn(a, C, c);
       (w || h || f) && await Xn(
-        E,
+        p,
         w,
         u,
         n,
@@ -5971,7 +5971,7 @@ async function Mg(t, A = {}) {
         s,
         h,
         f
-      ), Yn(E, a, C, c, p), Q.push(
+      ), Yn(p, a, C, c, E), Q.push(
         d.toDataURL(
           `image/${e.toLowerCase()}`,
           r
@@ -6042,26 +6042,26 @@ async function Og(t, A, e = {}, r, s) {
         if (!C) continue;
         const d = Cr(u, n, f);
         if (d.width <= 0 || d.height <= 0) continue;
-        let E, p;
+        let p, E;
         if (typeof C == "function") {
           const y = hr(C(h, o));
           if (!y) continue;
-          E = (await fr(
+          p = (await fr(
             y,
             d.width,
             d.height,
             B
           )).toDataURL("image/png");
         } else
-          E = Q[u], p = `margin-${u}`;
+          p = Q[u], E = `margin-${u}`;
         t.addImage(
-          E,
+          p,
           "PNG",
           d.x,
           d.y,
           d.width,
           d.height,
-          p,
+          E,
           "SLOW"
         );
       }