ooxml-core 1.19.1 → 1.19.2

package/dist/xlsx/index.cjs

@@ -32806,9 +32806,9 @@ function toHtml(cells, theme2) {
     for (let r = link.range.start.row; r <= link.range.end.row; r++)
       for (let c2 = link.range.start.col; c2 <= link.range.end.col; c2++) links.set(`${r},${c2}`, link);
   const covered = /* @__PURE__ */ new Set();
-  const spans2 = /* @__PURE__ */ new Map();
+  const spans3 = /* @__PURE__ */ new Map();
   for (const m of cells.merges) {
-    spans2.set(`${m.start.row},${m.start.col}`, m);
+    spans3.set(`${m.start.row},${m.start.col}`, m);
     for (let r = m.start.row; r <= m.end.row; r++)
       for (let c2 = m.start.col; c2 <= m.end.col; c2++)
         if (r !== m.start.row || c2 !== m.start.col) covered.add(`${r},${c2}`);
@@ -32820,7 +32820,7 @@ function toHtml(cells, theme2) {
       if (covered.has(`${r},${c2}`)) continue;
       const cell = cells.data[r]?.[c2] ?? null;
       const attrs2 = [];
-      const span3 = spans2.get(`${r},${c2}`);
+      const span3 = spans3.get(`${r},${c2}`);
       if (span3 && span3.end.row > span3.start.row)
         attrs2.push(`rowspan="${span3.end.row - span3.start.row + 1}"`);
       if (span3 && span3.end.col > span3.start.col)
@@ -35234,16 +35234,27 @@ function columnOverrides(sheet, mdw, defaultPx) {
   }
   return out;
 }
-function createGridMetrics(sheet, options2 = {}) {
-  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+function pixelScale(zoom) {
   const factor = zoom / 100;
-  const mdw = options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
-  const scale2 = (px) => px > 0 ? Math.max(1, Math.round(px * factor)) : 0;
+  return (px) => px > 0 ? Math.max(1, Math.round(px * factor)) : 0;
+}
+function columnAxis(sheet, mdw, scale2) {
   const defaultColPx = defaultColumnPixels(sheet.defaultColWidth, mdw);
   const colOverrides = [...columnOverrides(sheet, mdw, defaultColPx)].map(
     ([c2, px]) => [c2, scale2(px)]
   );
-  const cols = new AxisMetrics(scale2(defaultColPx), MAX_COL + 1, colOverrides);
+  return new AxisMetrics(scale2(defaultColPx), MAX_COL + 1, colOverrides);
+}
+function createColumnWidths(sheet, options2 = {}) {
+  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+  const cols = columnAxis(sheet, options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH, pixelScale(zoom));
+  return (c2) => cols.size(c2);
+}
+function createGridMetrics(sheet, options2 = {}) {
+  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+  const mdw = options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
+  const scale2 = pixelScale(zoom);
+  const cols = columnAxis(sheet, mdw, scale2);
   const defaultRowPx = pointsToPixels(sheet.defaultRowHeight);
   const rowOverrides = [];
   for (const [r, info] of sheet.rowInfo) {
@@ -39596,6 +39607,87 @@ function cellView(workbook, sheetIndex2, row2, col, cf, options2 = {}) {
   return view;
 }
 
+// xlsx/layout/merge-sweep.ts
+var NONE = { merged: false, spanned: false };
+var SINGLE2 = { merged: true, spanned: false };
+var SPANNED = { merged: true, spanned: true };
+var spans2 = (merge2) => merge2.start.row !== merge2.end.row || merge2.start.col !== merge2.end.col;
+function firstRightOf(merges, col) {
+  let lo = 0;
+  let hi = merges.length;
+  while (lo < hi) {
+    const mid = lo + hi >> 1;
+    if ((merges[mid]?.start.col ?? 0) <= col) lo = mid + 1;
+    else hi = mid;
+  }
+  return lo;
+}
+var MergeSweep = class {
+  /** The merges by first row; `next` is the first one the sweep has not reached. */
+  byRow;
+  next = 0;
+  row = Number.NEGATIVE_INFINITY;
+  /** The merges covering the current row, by first column. */
+  active = [];
+  /** The last row of the earliest-ending active merge. */
+  firstEnd = Number.POSITIVE_INFINITY;
+  overlapping = false;
+  constructor(merges) {
+    this.byRow = [...merges].sort((a2, b) => a2.start.row - b.start.row);
+  }
+  /** How many merges cover the current row, which is everything the sweep holds. */
+  get size() {
+    return this.active.length;
+  }
+  /** Moves to `row`, which must not be above the previous one. */
+  moveTo(row2) {
+    if (row2 < this.row) throw new RangeError(`Rows must not go up: ${row2} after ${this.row}`);
+    this.row = row2;
+    if (row2 > this.firstEnd) this.dropEnded(row2);
+    for (; this.next < this.byRow.length; this.next++) {
+      const merge2 = this.byRow[this.next];
+      if (!merge2 || merge2.start.row > row2) break;
+      if (merge2.end.row >= row2) this.add(merge2);
+    }
+  }
+  /** How the merges cover column `col` of the current row. */
+  at(col) {
+    if (this.overlapping) {
+      let merged = false;
+      for (const merge3 of this.active) {
+        if (col < merge3.start.col || col > merge3.end.col) continue;
+        if (spans2(merge3)) return SPANNED;
+        merged = true;
+      }
+      return merged ? SINGLE2 : NONE;
+    }
+    const merge2 = this.active[firstRightOf(this.active, col) - 1];
+    if (!merge2 || col > merge2.end.col) return NONE;
+    return spans2(merge2) ? SPANNED : SINGLE2;
+  }
+  add(merge2) {
+    const at = firstRightOf(this.active, merge2.start.col);
+    const before = this.active[at - 1];
+    const after = this.active[at];
+    if (before && before.end.col >= merge2.start.col || after && merge2.end.col >= after.start.col)
+      this.overlapping = true;
+    this.active.splice(at, 0, merge2);
+    this.firstEnd = Math.min(this.firstEnd, merge2.end.row);
+  }
+  dropEnded(row2) {
+    let kept = 0;
+    let firstEnd = Number.POSITIVE_INFINITY;
+    for (const merge2 of this.active) {
+      if (merge2.end.row < row2) continue;
+      this.active[kept++] = merge2;
+      firstEnd = Math.min(firstEnd, merge2.end.row);
+    }
+    this.active.length = kept;
+    this.firstEnd = firstEnd;
+    if (!kept) this.overlapping = false;
+  }
+};
+
 // xlsx/layout/row-autofit.ts
 var LINE_HEIGHTS = [
   [6, 8.25],
@@ -39656,29 +39748,41 @@ function wrappedLineCount(text4, width, measure2) {
   return lines;
 }
 function autoFitRowHeight(workbook, sheetIndex2, row2, measure2) {
+  return fitRowHeights(workbook, sheetIndex2, [row2], measure2).get(row2) ?? 15;
+}
+function fitRowHeights(workbook, sheetIndex2, rows, measure2) {
+  const heights = /* @__PURE__ */ new Map();
   const sheet = workbook.sheets[sheetIndex2];
-  if (!sheet) return 15;
-  const cells = sheet.rows.get(row2);
-  if (!cells?.size) return sheet.defaultRowHeight;
-  const metrics = createGridMetrics(sheet, { zoom: 100 });
-  let tallest = 0;
-  for (const col of cells.keys()) {
-    const merged = sheet.merges.some(
-      (m) => row2 >= m.start.row && row2 <= m.end.row && col >= m.start.col && col <= m.end.col && (m.start.row !== m.end.row || m.start.col !== m.end.col)
-    );
-    if (merged) continue;
-    const view = cellView(workbook, sheetIndex2, row2, col);
-    if (!view.text) continue;
-    const fonts = view.rich?.length ? view.rich.map((run2) => run2.font) : [view.font];
-    const sizePt = Math.max(...fonts.map((f6) => f6.sizePx * 3 / 4));
-    let lines = 1;
-    if (view.wrap) {
-      const width = metrics.colWidth(col) - COLUMN_PADDING_PX - 1 - view.indentPx;
-      lines = wrappedLineCount(view.text, width, (text4) => measure2(text4, view.font));
-    }
-    tallest = Math.max(tallest, lines * lineHeightPoints(sizePt));
-  }
-  return tallest > 0 ? tallest : sheet.defaultRowHeight;
+  if (!sheet) return heights;
+  const filled2 = [];
+  for (const row2 of new Set(rows)) {
+    if (sheet.rows.get(row2)?.size) filled2.push(row2);
+    else heights.set(row2, sheet.defaultRowHeight);
+  }
+  filled2.sort((a2, b) => a2 - b);
+  const merges = new MergeSweep(sheet.merges);
+  let colWidth;
+  for (const row2 of filled2) {
+    merges.moveTo(row2);
+    let tallest = 0;
+    for (const col of sheet.rows.get(row2)?.keys() ?? []) {
+      const cover = merges.at(col);
+      if (cover.spanned) continue;
+      const view = cellView(workbook, sheetIndex2, row2, col, void 0, { merged: cover.merged });
+      if (!view.text) continue;
+      const fonts = view.rich?.length ? view.rich.map((run2) => run2.font) : [view.font];
+      const sizePt = Math.max(...fonts.map((f6) => f6.sizePx * 3 / 4));
+      let lines = 1;
+      if (view.wrap) {
+        colWidth ??= createColumnWidths(sheet, { zoom: 100 });
+        const width = colWidth(col) - COLUMN_PADDING_PX - 1 - view.indentPx;
+        lines = wrappedLineCount(view.text, width, (text4) => measure2(text4, view.font));
+      }
+      tallest = Math.max(tallest, lines * lineHeightPoints(sizePt));
+    }
+    heights.set(row2, tallest > 0 ? tallest : sheet.defaultRowHeight);
+  }
+  return heights;
 }
 var approximateMeasure = (text4, font) => text4.length * font.sizePx * (font.bold ? 0.58 : 0.53);
 
@@ -39686,13 +39790,16 @@ var approximateMeasure = (text4, font) => text4.length * font.sizePx * (font.bol
 var MAX_HEIGHT2 = 409;
 function autoGrowRows(ctx, s, rows, measure2 = approximateMeasure) {
   const sheet = sheetAt(ctx.workbook, s);
-  const updates = [];
-  for (const row2 of new Set(rows)) {
+  const candidates = [...new Set(rows)].filter((row2) => {
     const info = sheet.rowInfo.get(row2);
-    if (info?.customHeight || info?.hidden) continue;
-    const fit2 = Math.min(MAX_HEIGHT2, autoFitRowHeight(ctx.workbook, s, row2, measure2));
+    return !info?.customHeight && !info?.hidden;
+  });
+  const fits = fitRowHeights(ctx.workbook, s, candidates, measure2);
+  const updates = [];
+  for (const row2 of candidates) {
+    const fit2 = Math.min(MAX_HEIGHT2, fits.get(row2) ?? sheet.defaultRowHeight);
     const next = Math.abs(fit2 - sheet.defaultRowHeight) < 1e-9 ? void 0 : fit2;
-    const current = info?.height;
+    const current = sheet.rowInfo.get(row2)?.height;
     if (current === next) continue;
     if (current !== void 0 && next !== void 0 && Math.abs(current - next) < 1e-9) continue;
     updates.push([row2, next]);
@@ -44523,13 +44630,13 @@ function chartRichTitleSvg(model, width, options2 = {}, frameHeight = 400) {
     measured ? 4 : 0
   );
   let baseline = 8 + (metrics[0]?.size ?? base.size ?? 14) + (vertical[0]?.before ?? 0) + (vertical[0]?.leading ?? 0);
-  const spans2 = [];
+  const spans3 = [];
   for (const [index3, line3] of metrics.entries()) {
     if (index3)
       baseline += vertical[index3 - 1].descent + vertical[index3 - 1].after + vertical[index3].before + vertical[index3].ascent;
     let x = line3.align === "l" ? (width - boxWidth) / 2 + 4 : line3.align === "r" ? (width + boxWidth) / 2 - 4 - line3.width : (width - line3.width) / 2;
     for (const run2 of line3.runs) {
-      spans2.push(
+      spans3.push(
         text3(x, baseline, run2.text, {
           ...run2.attrs,
           anchor: "start"
@@ -44540,7 +44647,7 @@ function chartRichTitleSvg(model, width, options2 = {}, frameHeight = 400) {
   }
   const parent = text3(0, 0, "", { ...base, underline: false }).replace(
     "</text>",
-    `${spans2.join("")}</text>`
+    `${spans3.join("")}</text>`
   );
   const markup = chartAreaRect(model, "title", {
     x: (width - boxWidth) / 2,

package/dist/xlsx/index.mjs

@@ -32800,9 +32800,9 @@ function toHtml(cells, theme2) {
     for (let r = link.range.start.row; r <= link.range.end.row; r++)
       for (let c2 = link.range.start.col; c2 <= link.range.end.col; c2++) links.set(`${r},${c2}`, link);
   const covered = /* @__PURE__ */ new Set();
-  const spans2 = /* @__PURE__ */ new Map();
+  const spans3 = /* @__PURE__ */ new Map();
   for (const m of cells.merges) {
-    spans2.set(`${m.start.row},${m.start.col}`, m);
+    spans3.set(`${m.start.row},${m.start.col}`, m);
     for (let r = m.start.row; r <= m.end.row; r++)
       for (let c2 = m.start.col; c2 <= m.end.col; c2++)
         if (r !== m.start.row || c2 !== m.start.col) covered.add(`${r},${c2}`);
@@ -32814,7 +32814,7 @@ function toHtml(cells, theme2) {
       if (covered.has(`${r},${c2}`)) continue;
       const cell = cells.data[r]?.[c2] ?? null;
       const attrs2 = [];
-      const span3 = spans2.get(`${r},${c2}`);
+      const span3 = spans3.get(`${r},${c2}`);
       if (span3 && span3.end.row > span3.start.row)
         attrs2.push(`rowspan="${span3.end.row - span3.start.row + 1}"`);
       if (span3 && span3.end.col > span3.start.col)
@@ -35228,16 +35228,27 @@ function columnOverrides(sheet, mdw, defaultPx) {
   }
   return out;
 }
-function createGridMetrics(sheet, options2 = {}) {
-  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+function pixelScale(zoom) {
   const factor = zoom / 100;
-  const mdw = options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
-  const scale2 = (px) => px > 0 ? Math.max(1, Math.round(px * factor)) : 0;
+  return (px) => px > 0 ? Math.max(1, Math.round(px * factor)) : 0;
+}
+function columnAxis(sheet, mdw, scale2) {
   const defaultColPx = defaultColumnPixels(sheet.defaultColWidth, mdw);
   const colOverrides = [...columnOverrides(sheet, mdw, defaultColPx)].map(
     ([c2, px]) => [c2, scale2(px)]
   );
-  const cols = new AxisMetrics(scale2(defaultColPx), MAX_COL + 1, colOverrides);
+  return new AxisMetrics(scale2(defaultColPx), MAX_COL + 1, colOverrides);
+}
+function createColumnWidths(sheet, options2 = {}) {
+  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+  const cols = columnAxis(sheet, options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH, pixelScale(zoom));
+  return (c2) => cols.size(c2);
+}
+function createGridMetrics(sheet, options2 = {}) {
+  const zoom = zoomPercent(options2.zoom ?? sheet.view.zoom);
+  const mdw = options2.mdw ?? DEFAULT_MAX_DIGIT_WIDTH;
+  const scale2 = pixelScale(zoom);
+  const cols = columnAxis(sheet, mdw, scale2);
   const defaultRowPx = pointsToPixels(sheet.defaultRowHeight);
   const rowOverrides = [];
   for (const [r, info] of sheet.rowInfo) {
@@ -39590,6 +39601,87 @@ function cellView(workbook, sheetIndex2, row2, col, cf, options2 = {}) {
   return view;
 }
 
+// xlsx/layout/merge-sweep.ts
+var NONE = { merged: false, spanned: false };
+var SINGLE2 = { merged: true, spanned: false };
+var SPANNED = { merged: true, spanned: true };
+var spans2 = (merge2) => merge2.start.row !== merge2.end.row || merge2.start.col !== merge2.end.col;
+function firstRightOf(merges, col) {
+  let lo = 0;
+  let hi = merges.length;
+  while (lo < hi) {
+    const mid = lo + hi >> 1;
+    if ((merges[mid]?.start.col ?? 0) <= col) lo = mid + 1;
+    else hi = mid;
+  }
+  return lo;
+}
+var MergeSweep = class {
+  /** The merges by first row; `next` is the first one the sweep has not reached. */
+  byRow;
+  next = 0;
+  row = Number.NEGATIVE_INFINITY;
+  /** The merges covering the current row, by first column. */
+  active = [];
+  /** The last row of the earliest-ending active merge. */
+  firstEnd = Number.POSITIVE_INFINITY;
+  overlapping = false;
+  constructor(merges) {
+    this.byRow = [...merges].sort((a2, b) => a2.start.row - b.start.row);
+  }
+  /** How many merges cover the current row, which is everything the sweep holds. */
+  get size() {
+    return this.active.length;
+  }
+  /** Moves to `row`, which must not be above the previous one. */
+  moveTo(row2) {
+    if (row2 < this.row) throw new RangeError(`Rows must not go up: ${row2} after ${this.row}`);
+    this.row = row2;
+    if (row2 > this.firstEnd) this.dropEnded(row2);
+    for (; this.next < this.byRow.length; this.next++) {
+      const merge2 = this.byRow[this.next];
+      if (!merge2 || merge2.start.row > row2) break;
+      if (merge2.end.row >= row2) this.add(merge2);
+    }
+  }
+  /** How the merges cover column `col` of the current row. */
+  at(col) {
+    if (this.overlapping) {
+      let merged = false;
+      for (const merge3 of this.active) {
+        if (col < merge3.start.col || col > merge3.end.col) continue;
+        if (spans2(merge3)) return SPANNED;
+        merged = true;
+      }
+      return merged ? SINGLE2 : NONE;
+    }
+    const merge2 = this.active[firstRightOf(this.active, col) - 1];
+    if (!merge2 || col > merge2.end.col) return NONE;
+    return spans2(merge2) ? SPANNED : SINGLE2;
+  }
+  add(merge2) {
+    const at = firstRightOf(this.active, merge2.start.col);
+    const before = this.active[at - 1];
+    const after = this.active[at];
+    if (before && before.end.col >= merge2.start.col || after && merge2.end.col >= after.start.col)
+      this.overlapping = true;
+    this.active.splice(at, 0, merge2);
+    this.firstEnd = Math.min(this.firstEnd, merge2.end.row);
+  }
+  dropEnded(row2) {
+    let kept = 0;
+    let firstEnd = Number.POSITIVE_INFINITY;
+    for (const merge2 of this.active) {
+      if (merge2.end.row < row2) continue;
+      this.active[kept++] = merge2;
+      firstEnd = Math.min(firstEnd, merge2.end.row);
+    }
+    this.active.length = kept;
+    this.firstEnd = firstEnd;
+    if (!kept) this.overlapping = false;
+  }
+};
+
 // xlsx/layout/row-autofit.ts
 var LINE_HEIGHTS = [
   [6, 8.25],
@@ -39650,29 +39742,41 @@ function wrappedLineCount(text4, width, measure2) {
   return lines;
 }
 function autoFitRowHeight(workbook, sheetIndex2, row2, measure2) {
+  return fitRowHeights(workbook, sheetIndex2, [row2], measure2).get(row2) ?? 15;
+}
+function fitRowHeights(workbook, sheetIndex2, rows, measure2) {
+  const heights = /* @__PURE__ */ new Map();
   const sheet = workbook.sheets[sheetIndex2];
-  if (!sheet) return 15;
-  const cells = sheet.rows.get(row2);
-  if (!cells?.size) return sheet.defaultRowHeight;
-  const metrics = createGridMetrics(sheet, { zoom: 100 });
-  let tallest = 0;
-  for (const col of cells.keys()) {
-    const merged = sheet.merges.some(
-      (m) => row2 >= m.start.row && row2 <= m.end.row && col >= m.start.col && col <= m.end.col && (m.start.row !== m.end.row || m.start.col !== m.end.col)
-    );
-    if (merged) continue;
-    const view = cellView(workbook, sheetIndex2, row2, col);
-    if (!view.text) continue;
-    const fonts = view.rich?.length ? view.rich.map((run2) => run2.font) : [view.font];
-    const sizePt = Math.max(...fonts.map((f6) => f6.sizePx * 3 / 4));
-    let lines = 1;
-    if (view.wrap) {
-      const width = metrics.colWidth(col) - COLUMN_PADDING_PX - 1 - view.indentPx;
-      lines = wrappedLineCount(view.text, width, (text4) => measure2(text4, view.font));
-    }
-    tallest = Math.max(tallest, lines * lineHeightPoints(sizePt));
-  }
-  return tallest > 0 ? tallest : sheet.defaultRowHeight;
+  if (!sheet) return heights;
+  const filled2 = [];
+  for (const row2 of new Set(rows)) {
+    if (sheet.rows.get(row2)?.size) filled2.push(row2);
+    else heights.set(row2, sheet.defaultRowHeight);
+  }
+  filled2.sort((a2, b) => a2 - b);
+  const merges = new MergeSweep(sheet.merges);
+  let colWidth;
+  for (const row2 of filled2) {
+    merges.moveTo(row2);
+    let tallest = 0;
+    for (const col of sheet.rows.get(row2)?.keys() ?? []) {
+      const cover = merges.at(col);
+      if (cover.spanned) continue;
+      const view = cellView(workbook, sheetIndex2, row2, col, void 0, { merged: cover.merged });
+      if (!view.text) continue;
+      const fonts = view.rich?.length ? view.rich.map((run2) => run2.font) : [view.font];
+      const sizePt = Math.max(...fonts.map((f6) => f6.sizePx * 3 / 4));
+      let lines = 1;
+      if (view.wrap) {
+        colWidth ??= createColumnWidths(sheet, { zoom: 100 });
+        const width = colWidth(col) - COLUMN_PADDING_PX - 1 - view.indentPx;
+        lines = wrappedLineCount(view.text, width, (text4) => measure2(text4, view.font));
+      }
+      tallest = Math.max(tallest, lines * lineHeightPoints(sizePt));
+    }
+    heights.set(row2, tallest > 0 ? tallest : sheet.defaultRowHeight);
+  }
+  return heights;
 }
 var approximateMeasure = (text4, font) => text4.length * font.sizePx * (font.bold ? 0.58 : 0.53);
 
@@ -39680,13 +39784,16 @@ var approximateMeasure = (text4, font) => text4.length * font.sizePx * (font.bol
 var MAX_HEIGHT2 = 409;
 function autoGrowRows(ctx, s, rows, measure2 = approximateMeasure) {
   const sheet = sheetAt(ctx.workbook, s);
-  const updates = [];
-  for (const row2 of new Set(rows)) {
+  const candidates = [...new Set(rows)].filter((row2) => {
     const info = sheet.rowInfo.get(row2);
-    if (info?.customHeight || info?.hidden) continue;
-    const fit2 = Math.min(MAX_HEIGHT2, autoFitRowHeight(ctx.workbook, s, row2, measure2));
+    return !info?.customHeight && !info?.hidden;
+  });
+  const fits = fitRowHeights(ctx.workbook, s, candidates, measure2);
+  const updates = [];
+  for (const row2 of candidates) {
+    const fit2 = Math.min(MAX_HEIGHT2, fits.get(row2) ?? sheet.defaultRowHeight);
     const next = Math.abs(fit2 - sheet.defaultRowHeight) < 1e-9 ? void 0 : fit2;
-    const current = info?.height;
+    const current = sheet.rowInfo.get(row2)?.height;
     if (current === next) continue;
     if (current !== void 0 && next !== void 0 && Math.abs(current - next) < 1e-9) continue;
     updates.push([row2, next]);
@@ -44517,13 +44624,13 @@ function chartRichTitleSvg(model, width, options2 = {}, frameHeight = 400) {
     measured ? 4 : 0
   );
   let baseline = 8 + (metrics[0]?.size ?? base.size ?? 14) + (vertical[0]?.before ?? 0) + (vertical[0]?.leading ?? 0);
-  const spans2 = [];
+  const spans3 = [];
   for (const [index3, line3] of metrics.entries()) {
     if (index3)
       baseline += vertical[index3 - 1].descent + vertical[index3 - 1].after + vertical[index3].before + vertical[index3].ascent;
     let x = line3.align === "l" ? (width - boxWidth) / 2 + 4 : line3.align === "r" ? (width + boxWidth) / 2 - 4 - line3.width : (width - line3.width) / 2;
     for (const run2 of line3.runs) {
-      spans2.push(
+      spans3.push(
         text3(x, baseline, run2.text, {
           ...run2.attrs,
           anchor: "start"
@@ -44534,7 +44641,7 @@ function chartRichTitleSvg(model, width, options2 = {}, frameHeight = 400) {
   }
   const parent = text3(0, 0, "", { ...base, underline: false }).replace(
     "</text>",
-    `${spans2.join("")}</text>`
+    `${spans3.join("")}</text>`
   );
   const markup = chartAreaRect(model, "title", {
     x: (width - boxWidth) / 2,

package/dist/xlsx/layout/merge-sweep.d.ts

@@ -0,0 +1,36 @@
+import type { CellRange } from '../address.js';
+/** How the merges cover one cell. */
+export interface MergeCover {
+    /** Some merge covers the cell. */
+    readonly merged: boolean;
+    /** Some merge of more than one cell covers it. */
+    readonly spanned: boolean;
+}
+/**
+ * Sweeps a sheet's rows top to bottom (`moveTo`) and tells how the merges cover a cell of the
+ * current row (`at`). It holds only the merges covering the current row: a sheet's merges do not
+ * overlap, so those are disjoint column spans, kept in column order and found by binary search.
+ * Overlapping merges, which only a malformed file has, are detected and answered by a scan of the
+ * current row's merges instead, which gives the same result.
+ */
+export declare class MergeSweep {
+    /** The merges by first row; `next` is the first one the sweep has not reached. */
+    private readonly byRow;
+    private next;
+    private row;
+    /** The merges covering the current row, by first column. */
+    private readonly active;
+    /** The last row of the earliest-ending active merge. */
+    private firstEnd;
+    private overlapping;
+    constructor(merges: readonly CellRange[]);
+    /** How many merges cover the current row, which is everything the sweep holds. */
+    get size(): number;
+    /** Moves to `row`, which must not be above the previous one. */
+    moveTo(row: number): void;
+    /** How the merges cover column `col` of the current row. */
+    at(col: number): MergeCover;
+    private add;
+    private dropEnded;
+}
+//# sourceMappingURL=merge-sweep.d.ts.map

package/dist/xlsx/layout/merge-sweep.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-sweep.d.ts","sourceRoot":"","sources":["../../../xlsx/layout/merge-sweep.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,qCAAqC;AACrC,MAAM,WAAW,UAAU;IAC1B,kCAAkC;IAClC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,kDAAkD;IAClD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC1B;AAqBD;;;;;;GAMG;AACH,qBAAa,UAAU;IACtB,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAc;IACpC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,GAAG,CAA4B;IACvC,4DAA4D;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAA4B;IAC5C,OAAO,CAAC,WAAW,CAAS;IAE5B,YAAY,MAAM,EAAE,SAAS,SAAS,EAAE,EAEvC;IAED,kFAAkF;IAClF,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,gEAAgE;IAChE,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CASxB;IAED,4DAA4D;IAC5D,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAa1B;IAED,OAAO,CAAC,GAAG;IAeX,OAAO,CAAC,SAAS;CAYjB"}

package/dist/xlsx/layout/metrics.d.ts

@@ -36,6 +36,11 @@ export interface GridMetricsOptions {
 }
 /** Normalizes a zoom given as percent or factor to percent within Excel's 10%-400% range. */
 export declare function zoomPercent(zoom: number | undefined): number;
+/**
+ * The column widths of `createGridMetrics(sheet, options).colWidth`, read from the column
+ * definitions alone: unlike the full metrics, this never walks the sheet's cells or rows.
+ */
+export declare function createColumnWidths(sheet: Worksheet, options?: Pick<GridMetricsOptions, 'zoom' | 'mdw'>): (c: number) => number;
 /** Builds the grid geometry of a sheet. Sizes are whole pixels scaled by the zoom. */
 export declare function createGridMetrics(sheet: Worksheet, options?: GridMetricsOptions): GridMetrics;
 //# sourceMappingURL=metrics.d.ts.map

package/dist/xlsx/layout/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../xlsx/layout/metrics.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAS1C,qFAAqF;AACrF,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,iEAAiE;IACjE,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,2DAA2D;IAC3D,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iEAAiE;IACjE,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACpC,+DAA+D;IAC/D,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrC,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,2FAA2F;IAC3F,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB;IAClC;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qEAAqE;IACrE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,6FAA6F;AAC7F,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAI5D;AAkBD,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,GAAE,kBAAuB,GAAG,WAAW,CA8CjG"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../xlsx/layout/metrics.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAS1C,qFAAqF;AACrF,MAAM,WAAW,WAAW;IAC3B,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,iEAAiE;IACjE,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,2DAA2D;IAC3D,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iEAAiE;IACjE,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACpC,+DAA+D;IAC/D,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrC,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,2FAA2F;IAC3F,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,kBAAkB;IAClC;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qEAAqE;IACrE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,6FAA6F;AAC7F,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAI5D;AAiCD;;;GAGG;AACH,wBAAgB,kBAAkB,CACjC,KAAK,EAAE,SAAS,EAChB,OAAO,GAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,KAAK,CAAM,GACpD,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAIvB;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,GAAE,kBAAuB,GAAG,WAAW,CAwCjG"}

package/dist/xlsx/layout/row-autofit.d.ts

@@ -12,6 +12,12 @@ export declare function wrappedLineCount(text: string, width: number, measure: (
  * Calibri metrics, so other fonts are approximate.
  */
 export declare function autoFitRowHeight(workbook: Workbook, sheetIndex: number, row: number, measure: MeasureText): number;
+/**
+ * {@link autoFitRowHeight} for many rows of one sheet at once (a missing sheet gives an empty
+ * map). The column widths and the merges are read once for all of `rows`, so the cost follows
+ * the cells of those rows, not the size of the sheet.
+ */
+export declare function fitRowHeights(workbook: Workbook, sheetIndex: number, rows: Iterable<number>, measure: MeasureText): Map<number, number>;
 /** A font-size based text measure (px) for when no real text measurement is available. */
 export declare const approximateMeasure: MeasureText;
 //# sourceMappingURL=row-autofit.d.ts.map

package/dist/xlsx/layout/row-autofit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"row-autofit.d.ts","sourceRoot":"","sources":["../../../xlsx/layout/row-autofit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AA0B7C,wFAAwF;AACxF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAevD;AAED,iGAAiG;AACjG,wBAAgB,gBAAgB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAC/B,MAAM,CAwBR;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,WAAW,GAClB,MAAM,CA6BR;AAED,0FAA0F;AAC1F,eAAO,MAAM,kBAAkB,EAAE,WACqB,CAAC"}
+{"version":3,"file":"row-autofit.d.ts","sourceRoot":"","sources":["../../../xlsx/layout/row-autofit.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AA2B7C,wFAAwF;AACxF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAevD;AAED,iGAAiG;AACjG,wBAAgB,gBAAgB,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAC/B,MAAM,CAwBR;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,WAAW,GAClB,MAAM,CAER;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAC5B,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EACtB,OAAO,EAAE,WAAW,GAClB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAmCrB;AAED,0FAA0F;AAC1F,eAAO,MAAM,kBAAkB,EAAE,WACqB,CAAC"}