presenter 0.9.3 → 0.9.4

package/dist/export.mjs

@@ -757,40 +757,34 @@ function Sa(t) {
   return typeof t == "string" ? [[{ text: t }]] : t.map((n) => n.map((e) => typeof e == "string" ? { text: e } : e));
 }
 function Br(t) {
+  const n = Math.max(...t.map((A) => A.bottom), 0), e = Math.max(...t.map((A) => A.top), 0);
   return {
-    bottom: Math.max(...t.map((n) => n.bottom), 0),
-    height: Math.max(...t.map((n) => n.height), 0),
-    lineAdvance: Math.max(...t.map((n) => n.lineAdvance), 0),
-    top: Math.max(...t.map((n) => n.top), 0),
-    width: t.reduce((n, e) => n + e.width, 0)
+    bottom: n,
+    height: e + n,
+    lineAdvance: Math.max(...t.map((A) => A.lineAdvance), 0),
+    top: e,
+    width: t.reduce((A, a) => A + a.width, 0)
   };
 }
 function Ia(t, n = 1) {
   const e = t.map(Br);
   if (e.length === 0)
     return {
-      lines: [],
+      baselines: [],
       size: xt()
     };
-  let A = e[0]?.top ?? 0, a = 0;
-  const i = [];
-  for (let r = 0; r < e.length; r++) {
-    const o = e[r];
-    o !== void 0 && (r > 0 && (A += a * n), i.push({
-      ...o,
-      baselineY: A
-    }), a = o.lineAdvance);
+  let A = 0, a, i = 0, s = 0;
+  const c = [];
+  for (const r of e) {
+    const f = (r.lineAdvance * n - r.height) / 2, g = r.top + f;
+    a === void 0 ? A = g : A += a + g, c.push(A), i = Math.min(i, A - r.top), s = Math.max(s, A + r.bottom), a = r.bottom + f;
   }
-  const s = Math.min(...i.map((r) => r.baselineY - r.top), 0), c = Math.max(...i.map((r) => r.baselineY + r.bottom), 0), l = -s;
+  const l = -i;
   return {
-    lines: i.map((r) => ({
-      ...r,
-      // Keep all returned baselines relative to the top edge of the final text block
-      baselineY: r.baselineY + l
-    })),
+    baselines: c.map((r) => r + l),
     size: xt({
-      height: c - s,
-      width: Math.max(...i.map((r) => r.width), 0)
+      height: s - i,
+      width: Math.max(...e.map((r) => r.width), 0)
     })
   };
 }
@@ -859,7 +853,7 @@ const Pr = ({ ctx: t, object: n, opacity: e }) => {
   const { length: a } = n, i = Sa(n.text), s = Fa(n), c = Ea(i, s, t), l = Ia(c, n.lineSpacing), r = Ot(mt({ x: n.x, y: n.y }), n.anchor, l.size);
   let o = r.origin.x, f = 0;
   for (let g = 0; g < i.length; g++) {
-    const d = i[g], m = c[g], u = l.lines[g];
+    const d = i[g], m = c[g], u = l.baselines[g];
     if (d == null || m == null || u == null) {
       console.error("Could not determine text units or sizes for line");
       continue;
@@ -879,7 +873,7 @@ const Pr = ({ ctx: t, object: n, opacity: e }) => {
         Ut(n.alignment);
         break;
     }
-    const v = r.origin.y + u.baselineY;
+    const v = r.origin.y + u;
     for (let b = 0; b < d.length && !(a !== null && f >= a); b++) {
       const x = d[b], k = m[b];
       if (x == null || k == null) {