ooxml-ui 1.30.0 → 1.32.0

package/dist/pptx/{chunk-6KLPQQYP.cjs → chunk-D4LJJ7Z7.cjs}

@@ -1959,16 +1959,16 @@ function bevelMarkup(rects, threeD) {
 }
 
 // src/pptx/render/chart-format/chart-format-geometry.ts
-function chartTextBox(text, pad2 = 3) {
+function chartTextBox(text, pad = 3) {
   const width = Math.max(4, text.text.length * text.fontSize * 0.58);
   const left = text.textAnchor === "start" ? text.x : text.textAnchor === "end" ? text.x - width : text.x - width / 2;
   const middle = text.dominantBaseline === "middle" || text.dominantBaseline === "central";
   const top = middle ? text.y - text.fontSize / 2 : text.y - text.fontSize;
   return {
-    left: left - pad2,
-    top: top - pad2,
-    right: left + width + pad2,
-    bottom: top + text.fontSize + pad2
+    left: left - pad,
+    top: top - pad,
+    right: left + width + pad,
+    bottom: top + text.fontSize + pad
   };
 }
 function chartPlotBounds(vm) {
@@ -2552,12 +2552,12 @@ var hasBox = (format, ownGradient = true) => Boolean(
   format && !format.reset && (paints(format.fill, ownGradient) || format.line?.kind === "solid" || format.line?.kind === "gradient" || format.effects?.shadow || format.effects?.glow && format.effects.glow.radius > 0 || format.threeD?.bevelTop || format.threeD?.contour)
 );
 var boxFill = (fill, ownGradient) => fill?.kind === "gradient" && !ownGradient ? void 0 : fill;
-function union(boxes, pad2) {
+function union(boxes, pad) {
   if (boxes.length === 0) return void 0;
-  const left = Math.min(...boxes.map((b) => b.left)) - pad2;
-  const top = Math.min(...boxes.map((b) => b.top)) - pad2;
-  const right = Math.max(...boxes.map((b) => b.right)) + pad2;
-  const bottom = Math.max(...boxes.map((b) => b.bottom)) + pad2;
+  const left = Math.min(...boxes.map((b) => b.left)) - pad;
+  const top = Math.min(...boxes.map((b) => b.top)) - pad;
+  const right = Math.max(...boxes.map((b) => b.right)) + pad;
+  const bottom = Math.max(...boxes.map((b) => b.bottom)) + pad;
   return { x: left, y: top, w: right - left, h: bottom - top };
 }
 var textBoxes = (texts) => (texts ?? []).filter((t) => !t.transform).map((t) => chartTextBox(t, 2));
@@ -3492,18 +3492,6 @@ function manualLegendAnchor(layout, frame, entryCount, vertical, auto) {
   }
   return vertical ? { x: rect.x, y: rect.y } : { x: rect.x + rect.width / 2, y: rect.y + rect.height / 2 };
 }
-function applyLabelManualLayout(layout, frame, point) {
-  if (!chart.hasManualLayoutFields(layout)) {
-    return point;
-  }
-  const rect = chart.resolveManualLayoutRect(layout, frame, {
-    x: point.x,
-    y: point.y,
-    width: 1,
-    height: 1
-  });
-  return rect ? { x: rect.x, y: rect.y } : point;
-}
 function chartFrameToViewOffset(frame, view) {
   return { x: (frame.width - view.svgWidth) / 2, y: (frame.height - view.svgHeight) / 2 };
 }
@@ -3604,11 +3592,11 @@ function resolveMarkerLabelAnchor(position, point, offset = 7) {
   }
 }
 function resolveBarLabelPlacement(chartData, series, pointIndex, rect, value, orientation, frame, defaultPosition) {
-  const point = findPointLabel(series, pointIndex), position = point?.position ?? series.dataLabelOptions?.position ?? chartData.style?.dataLabels?.position ?? defaultPosition, anchor = resolveBarLabelAnchor(position, rect, value, orientation), shifted = applyLabelManualLayout(point?.layout, frame, anchor);
+  const point = findPointLabel(series, pointIndex), position = point?.position ?? series.dataLabelOptions?.position ?? chartData.style?.dataLabels?.position ?? defaultPosition, anchor = resolveBarLabelAnchor(position, rect, value, orientation), shifted = chart.applyLabelManualLayout(point?.layout, frame, anchor);
   return { ...anchor, x: shifted.x, y: shifted.y };
 }
 function resolveMarkerLabelPlacement(chartData, series, pointIndex, point, frame, offset = 7, defaultPosition) {
-  const override = findPointLabel(series, pointIndex), position = override?.position ?? series.dataLabelOptions?.position ?? chartData.style?.dataLabels?.position ?? defaultPosition, anchor = resolveMarkerLabelAnchor(position, point, offset), shifted = applyLabelManualLayout(override?.layout, frame, anchor);
+  const override = findPointLabel(series, pointIndex), position = override?.position ?? series.dataLabelOptions?.position ?? chartData.style?.dataLabels?.position ?? defaultPosition, anchor = resolveMarkerLabelAnchor(position, point, offset), shifted = chart.applyLabelManualLayout(override?.layout, frame, anchor);
   return { ...anchor, x: shifted.x, y: shifted.y };
 }
 
@@ -3878,60 +3866,6 @@ function dataLabelFontOverride(style) {
     ...style.color ? { fill: style.color } : {}
   };
 }
-
-// src/pptx/render/chart-line-path.ts
-function smoothLinePath(points) {
-  if (points.length === 0) {
-    return "";
-  }
-  if (points.length === 1) {
-    return `M${points[0].x.toFixed(2)},${points[0].y.toFixed(2)}`;
-  }
-  if (points.length === 2) {
-    return `M${points[0].x.toFixed(2)},${points[0].y.toFixed(2)} L${points[1].x.toFixed(2)},${points[1].y.toFixed(2)}`;
-  }
-  let d = `M${points[0].x.toFixed(2)},${points[0].y.toFixed(2)}`;
-  for (let i = 0; i < points.length - 1; i++) {
-    const [cp1, cp2, end] = smoothSegment(points, i);
-    d += ` C${cp1.x.toFixed(2)},${cp1.y.toFixed(2)} ${cp2.x.toFixed(2)},${cp2.y.toFixed(2)} ${end.x.toFixed(2)},${end.y.toFixed(2)}`;
-  }
-  return d;
-}
-function smoothSegment(points, i) {
-  const p0 = points[i - 1] ?? points[i];
-  const p1 = points[i];
-  const p2 = points[i + 1];
-  const p3 = points[i + 2] ?? p2;
-  return [
-    { x: p1.x + (p2.x - p0.x) / 6, y: p1.y + (p2.y - p0.y) / 6 },
-    { x: p2.x - (p3.x - p1.x) / 6, y: p2.y - (p3.y - p1.y) / 6 },
-    p2
-  ];
-}
-function sampleSmoothLine(points, stepsPerSegment = 16) {
-  if (points.length < 3) {
-    return [...points];
-  }
-  const out = [points[0]];
-  for (let i = 0; i < points.length - 1; i++) {
-    const start = points[i], [cp1, cp2, end] = smoothSegment(points, i);
-    for (let step = 1; step <= stepsPerSegment; step++) {
-      const t = step / stepsPerSegment, u = 1 - t, a = u * u * u, b = 3 * u * u * t, c = 3 * u * t * t, d = t * t * t;
-      out.push(
-        step === stepsPerSegment ? end : {
-          x: a * start.x + b * cp1.x + c * cp2.x + d * end.x,
-          y: a * start.y + b * cp1.y + c * cp2.y + d * end.y
-        }
-      );
-    }
-  }
-  return out;
-}
-function polylineRunsPath(runs) {
-  return runs.map(
-    (run) => run.map((p, i) => `${i === 0 ? "M" : "L"}${p.x.toFixed(2)},${p.y.toFixed(2)}`).join(" ")
-  ).join(" ");
-}
 var DEFAULT_COLOR = "#64748b";
 function chartAxisTextStyle(axis, defaultFontSizePx = DEFAULT_CHART_TEXT_PX) {
   return {
@@ -4330,7 +4264,7 @@ function buildScatter(chartData, layout, range) {
       primitives.push(
         series.smooth ?? smoothStyle ? {
           kind: "path",
-          d: smoothLinePath(points),
+          d: chart.smoothLinePath(points),
           stroke: c,
           strokeWidth: 2.4,
           fill: "none",
@@ -4487,12 +4421,12 @@ function visibleSpanCentre(y1, y2, band2) {
 function clippedSeriesLine(points, smooth, style, band2) {
   if (points.every((point) => insideBand(point, band2))) {
     return [
-      smooth ? { kind: "path", d: smoothLinePath(points), ...style } : { kind: "polyline", points: linePointsToSvgString(points), ...style }
+      smooth ? { kind: "path", d: chart.smoothLinePath(points), ...style } : { kind: "polyline", points: linePointsToSvgString(points), ...style }
     ];
   }
   if (smooth) {
-    const runs = clipPolylineToBand(sampleSmoothLine(points), band2);
-    return runs.length > 0 ? [{ kind: "path", d: polylineRunsPath(runs), ...style }] : [];
+    const runs = clipPolylineToBand(chart.sampleSmoothLine(points), band2);
+    return runs.length > 0 ? [{ kind: "path", d: chart.polylineRunsPath(runs), ...style }] : [];
   }
   return clipPolylineToBand(points, band2).map((run) => ({
     kind: "polyline",
@@ -5396,8 +5330,6 @@ function buildLines(chartData, catCount, layout, primaryRange, secondaryRange, s
   }
   return { primitives: [...primitives, ...labelBoxes], dataLabels };
 }
-
-// src/pptx/render/chart-data-table-metrics.ts
 function resolveDataTableMetrics(chartData) {
   const table = chartData.dataTable;
   if (!table) {
@@ -5405,10 +5337,11 @@ function resolveDataTableMetrics(chartData) {
   }
   const sizePt = resolveChartTextStyle(chartData, table.txPr)?.fontSize;
   const fontSize = sizePt !== void 0 ? chartFontPx(sizePt) : resolveChartStyleDefaults(chartData).bodyTextPx;
-  const rowH = Math.max(14, Math.round(fontSize * 1.45));
-  const longestName = chartData.series.reduce((m, s) => Math.max(m, (s.name ?? "").length), 0);
-  const keyW = table.showKeys === false ? 0 : Math.min(160, Math.max(40, longestName * fontSize * 0.55 + 24));
-  return { fontSize, rowH, keyW, height: rowH * (1 + chartData.series.length) };
+  return chart.chartDataTableMetrics(
+    fontSize,
+    chartData.series.map((s) => s.name ?? ""),
+    table.showKeys !== false
+  );
 }
 function labelsBesideTable(chartData, axis) {
   return chartData.dataTable ? [] : axis.labels;
@@ -5494,14 +5427,14 @@ function computeDataTablePrimitives(chartData, layout, colorPalette) {
       out.push(line2(x, top, x, bottom));
     }
   });
-  if (showV && showK) {
+  if (showV) {
     out.push(line2(layout.plotLeft, top, layout.plotLeft, bottom));
   }
   series.forEach((s, si) => {
     const rowTop = top + rowH * (si + 1);
     const cy = rowTop + rowH / 2;
     if (showH) {
-      out.push(line2(showK ? left : layout.plotLeft, rowTop, right, rowTop));
+      out.push(line2(left, rowTop, right, rowTop));
     }
     if (showK) {
       const swatch = Math.max(6, Math.round(metrics.fontSize * 0.55));
@@ -5513,8 +5446,9 @@ function computeDataTablePrimitives(chartData, layout, colorPalette) {
         h: swatch,
         fill: seriesColor2(s, si, colorPalette)
       });
-      out.push(label(left + DATA_TABLE_PADDING + swatch + 3, cy, s.name, "start"));
     }
+    const keyInset = showK ? Math.max(6, Math.round(metrics.fontSize * 0.55)) + 3 : 0;
+    out.push(label(left + DATA_TABLE_PADDING + keyInset, cy, s.name, "start"));
     categories.forEach((_cat, ci) => {
       const val = s.values[ci];
       const x = layout.plotLeft + ci * cellW + cellW / 2;
@@ -5642,175 +5576,6 @@ function computeHelperLinePrimitives(chartData, layout, range, catCount, options
     ...computeHiLowLinePrimitives(chartData, layout, range, catCount, options)
   ];
 }
-
-// src/pptx/render/chart-date-format.ts
-var MONTH_ABBR = [
-  "Jan",
-  "Feb",
-  "Mar",
-  "Apr",
-  "May",
-  "Jun",
-  "Jul",
-  "Aug",
-  "Sep",
-  "Oct",
-  "Nov",
-  "Dec"
-];
-var MONTH_FULL = [
-  "January",
-  "February",
-  "March",
-  "April",
-  "May",
-  "June",
-  "July",
-  "August",
-  "September",
-  "October",
-  "November",
-  "December"
-];
-var WEEKDAY_ABBR = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-var WEEKDAY_FULL = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
-function scanDateFormatTokens(code) {
-  const tokens = [];
-  let i = 0;
-  while (i < code.length) {
-    const ch = code[i];
-    if (ch === '"') {
-      const close = code.indexOf('"', i + 1);
-      tokens.push({
-        kind: "literal",
-        text: close === -1 ? code.slice(i + 1) : code.slice(i + 1, close)
-      });
-      i = close === -1 ? code.length : close + 1;
-      continue;
-    }
-    if (ch === "\\") {
-      tokens.push({ kind: "literal", text: code[i + 1] ?? "" });
-      i += 2;
-      continue;
-    }
-    const rest = code.slice(i);
-    if (/^am\/pm/iu.test(rest)) {
-      tokens.push({ kind: "ampm", upper: ch === ch.toUpperCase(), short: false });
-      i += 5;
-      continue;
-    }
-    if (/^a\/p/iu.test(rest)) {
-      tokens.push({ kind: "ampm", upper: ch === ch.toUpperCase(), short: true });
-      i += 3;
-      continue;
-    }
-    if (/[ymdhs]/iu.test(ch)) {
-      let j = i + 1;
-      while (j < code.length && code[j].toLowerCase() === ch.toLowerCase()) {
-        j += 1;
-      }
-      tokens.push({
-        kind: "letters",
-        letter: ch.toLowerCase(),
-        count: j - i
-      });
-      i = j;
-      continue;
-    }
-    tokens.push({ kind: "literal", text: ch });
-    i += 1;
-  }
-  return tokens;
-}
-function findNonLiteral(tokens, index, step) {
-  for (let i = index + step; i >= 0 && i < tokens.length; i += step) {
-    if (tokens[i].kind !== "literal") {
-      return tokens[i];
-    }
-  }
-  return void 0;
-}
-function pad(n, width) {
-  return String(n).padStart(width, "0");
-}
-function renderDatePart(part, count, date, twelveHour) {
-  switch (part) {
-    case "year":
-      return count >= 4 ? pad(date.getUTCFullYear(), 4) : pad(date.getUTCFullYear() % 100, 2);
-    case "month":
-      if (count >= 4) {
-        return MONTH_FULL[date.getUTCMonth()] ?? "";
-      }
-      if (count === 3) {
-        return MONTH_ABBR[date.getUTCMonth()] ?? "";
-      }
-      return count >= 2 ? pad(date.getUTCMonth() + 1, 2) : String(date.getUTCMonth() + 1);
-    case "day":
-      if (count >= 4) {
-        return WEEKDAY_FULL[date.getUTCDay()] ?? "";
-      }
-      if (count === 3) {
-        return WEEKDAY_ABBR[date.getUTCDay()] ?? "";
-      }
-      return count >= 2 ? pad(date.getUTCDate(), 2) : String(date.getUTCDate());
-    case "hour": {
-      const h24 = date.getUTCHours();
-      const h = twelveHour ? h24 % 12 === 0 ? 12 : h24 % 12 : h24;
-      return count >= 2 ? pad(h, 2) : String(h);
-    }
-    case "minute":
-      return count >= 2 ? pad(date.getUTCMinutes(), 2) : String(date.getUTCMinutes());
-    case "second":
-      return count >= 2 ? pad(date.getUTCSeconds(), 2) : String(date.getUTCSeconds());
-  }
-}
-function renderExcelDateFormat(date, code) {
-  const tokens = scanDateFormatTokens(code);
-  const hasAmPm = tokens.some((t) => t.kind === "ampm");
-  let out = "";
-  for (const [index, token] of tokens.entries()) {
-    if (token.kind === "literal") {
-      out += token.text;
-      continue;
-    }
-    if (token.kind === "ampm") {
-      const hour = date.getUTCHours(), text = token.short ? hour < 12 ? "A" : "P" : hour < 12 ? "AM" : "PM";
-      out += token.upper ? text : text.toLowerCase();
-      continue;
-    }
-    if (token.letter === "m") {
-      const prev = findNonLiteral(tokens, index, -1), next = findNonLiteral(tokens, index, 1), isMinute = prev?.kind === "letters" && prev.letter === "h" || next?.kind === "letters" && next.letter === "s";
-      out += renderDatePart(isMinute ? "minute" : "month", token.count, date, hasAmPm);
-      continue;
-    }
-    const part = { y: "year", d: "day", h: "hour", s: "second" };
-    out += renderDatePart(part[token.letter], token.count, date, hasAmPm);
-  }
-  return out;
-}
-function formatDate(date, unit, format) {
-  if (format && /[ymdhs]/iu.test(format)) {
-    const rendered = renderExcelDateFormat(date, format);
-    if (rendered.length > 0) {
-      return rendered;
-    }
-  }
-  const month = date.toLocaleString("en-US", { month: "short", timeZone: "UTC" }), year = String(date.getUTCFullYear()), day = String(date.getUTCDate());
-  if (unit === "years") {
-    return year;
-  }
-  if (unit === "months") {
-    return `${month} ${year}`;
-  }
-  return `${day} ${month}`;
-}
-
-// src/pptx/render/chart-date-axis.ts
-var DAY_MS = 864e5;
-function excelSerialToDate(serial5, date1904 = false) {
-  const epoch2 = date1904 ? Date.UTC(1904, 0, 1) : Date.UTC(1899, 11, serial5 < 60 ? 31 : 30);
-  return new Date(epoch2 + serial5 * DAY_MS);
-}
 function primaryDateAxis(chartData) {
   return chartData.axes?.find((axis) => axis.axisType === "dateAx" && axis.axPos !== "t") ?? chartData.axes?.find((axis) => axis.axisType === "dateAx");
 }
@@ -5818,17 +5583,6 @@ function serialToX(serial5, min, max, layout) {
   const ratio = max === min ? 0.5 : (serial5 - min) / (max - min);
   return layout.plotLeft + ratio * layout.plotWidth;
 }
-function addUnit(date, amount, unit) {
-  const next = new Date(date);
-  if (unit === "days") {
-    next.setUTCDate(next.getUTCDate() + amount);
-  } else if (unit === "months") {
-    next.setUTCMonth(next.getUTCMonth() + amount);
-  } else {
-    next.setUTCFullYear(next.getUTCFullYear() + amount);
-  }
-  return next;
-}
 function tickLine2(x, y, axis, minor) {
   const placement = minor ? axis.minorTickMark : axis.majorTickMark;
   if (!placement || placement === "none" || isNoLine(axis.spPr)) {
@@ -5848,15 +5602,6 @@ function tickLine2(x, y, axis, minor) {
     ...chartLineStyle(axis.spPr)
   };
 }
-function calendarTicks(min, max, date1904, unit, step) {
-  const result = [];
-  let date = excelSerialToDate(min, date1904);
-  for (let guard = 0; guard < 1e3 && date.getTime() <= excelSerialToDate(max, date1904).getTime(); guard++) {
-    result.push(min + (date.getTime() - excelSerialToDate(min, date1904).getTime()) / DAY_MS);
-    date = addUnit(date, step, unit);
-  }
-  return result;
-}
 function buildDateAxisPlan(chartData, layout, selectedAxis, axisY) {
   const dates = chartData.dateCategories;
   const axis = selectedAxis ?? primaryDateAxis(chartData);
@@ -5878,7 +5623,7 @@ function buildDateAxisPlan(chartData, layout, selectedAxis, axisY) {
     return axis.orientation === "maxMin" ? layout.plotLeft + layout.plotWidth - (x - layout.plotLeft) : x;
   });
   const unit = axis.majorTimeUnit ?? axis.baseTimeUnit ?? "days";
-  const ticks = calendarTicks(
+  const ticks = chart.calendarTicks(
     min,
     max,
     dates.date1904 ?? false,
@@ -5903,8 +5648,8 @@ function buildDateAxisPlan(chartData, layout, selectedAxis, axisY) {
         kind: "text",
         x,
         y: labelsAbove ? labelY - offset : labelY + offset,
-        text: formatDate(
-          excelSerialToDate(serial5, dates.date1904),
+        text: chart.formatDate(
+          chart.excelSerialToDate(serial5, dates.date1904),
           unit,
           axis.numFmt?.formatCode ?? dates.formatCode
         ),
@@ -5937,7 +5682,7 @@ function buildDateAxisPlan(chartData, layout, selectedAxis, axisY) {
   }
   if (!axis.deleted && axis.minorTickMark && axis.minorTickMark !== "none") {
     const minorUnit = axis.minorTimeUnit ?? axis.baseTimeUnit ?? unit;
-    for (const serial5 of calendarTicks(
+    for (const serial5 of chart.calendarTicks(
       min,
       max,
       dates.date1904 ?? false,
@@ -7361,20 +7106,14 @@ function computeBoxWhiskerGeometry(chartData, rawCategories, layout, range, colo
       const observations = rows.map((row) => ({ row, value: series.values[row] })).filter((item) => item.value !== void 0);
       const values = observations.map((item) => item.value);
       const options = series.boxWhiskerOptions;
-      const stats = chart.computeBoxStats(values, options?.quartileMethod ?? "exclusive");
-      if (!stats) {
-        return;
-      }
-      const iqr = stats.q3 - stats.q1;
-      const lowerFence = stats.q1 - 1.5 * iqr;
-      const upperFence = stats.q3 + 1.5 * iqr;
-      const inlierValues = values.filter(
-        (value) => !options || value >= lowerFence && value <= upperFence
+      const distribution = chart.boxWhiskerDistribution(
+        values,
+        options?.quartileMethod ?? "exclusive",
+        options !== void 0
       );
-      const whiskerMin = inlierValues.length > 0 ? Math.min(...inlierValues) : stats.min;
-      const whiskerMax = inlierValues.length > 0 ? Math.max(...inlierValues) : stats.max;
+      if (!distribution) return;
+      const { stats, whiskerMin, whiskerMax, mean } = distribution;
       const boxX = layout.plotLeft + groupWidth * categoryIndex + slotWidth * seriesIndex + (slotWidth - boxW) / 2;
-      const mean = values.reduce((sum, value) => sum + value, 0) / values.length;
       output.push({
         stats,
         boxX,
@@ -7465,11 +7204,8 @@ function whiskerPrimitives(geometry) {
 }
 function optionPrimitives(geometry) {
   const options = geometry.options;
-  if (!options) {
-    return [];
-  }
   const output = [];
-  if (options.showMeanLine) {
+  if (options?.showMeanLine) {
     output.push({
       kind: "line",
       x1: geometry.boxX,
@@ -7480,17 +7216,17 @@ function optionPrimitives(geometry) {
       strokeWidth: 1.5
     });
   }
-  if (options.showMeanMarker) {
+  if (options?.showMeanMarker !== false) {
     output.push({
-      kind: "circle",
-      cx: geometry.xMid,
-      cy: geometry.yMean,
-      r: 3,
-      fill: "#0f766e"
+      kind: "path",
+      d: chart.boxMeanMarkerPath(geometry.xMid, geometry.yMean),
+      fill: "none",
+      stroke: "#0f766e",
+      strokeWidth: 1.5
     });
   }
   for (const point of geometry.points) {
-    if (point.outlier && !options.showOutlierPoints || !point.outlier && !options.showInnerPoints) {
+    if (point.outlier && !options?.showOutlierPoints || !point.outlier && !options?.showInnerPoints) {
       continue;
     }
     output.push({
@@ -7871,15 +7607,17 @@ function computeFunnelSegments(values, plotLeft, plotTop, plotWidth, plotHeight,
   if (count === 0) {
     return [];
   }
-  const maxVal = Math.max(...values.map((v) => Math.abs(v)), 1);
-  const segH = plotHeight / Math.max(count, 1);
-  const centerX = plotLeft + plotWidth / 2;
   const fill = seriesColorOverride ?? paletteColor2(0, colorPalette);
   const out = [];
-  for (let i = 0; i < count; i++) {
+  for (const bar of chart.computeFunnelGeometry(values, {
+    x: plotLeft,
+    y: plotTop,
+    width: plotWidth,
+    height: plotHeight
+  })) {
+    const i = bar.index;
     const val = values[i];
-    const w = Math.abs(val) / maxVal * plotWidth;
-    const y = plotTop + i * segH;
+    const w = bar.width, y = bar.y, segH = bar.height, centerX = bar.center;
     const labelY = y + segH / 2 + 4;
     const d = [
       `M ${centerX - w / 2} ${y}`,
@@ -7930,11 +7668,20 @@ function buildFunnelViewModel(element, chartData, categoryLabels) {
   }
   const funnelSeries = chartData.series[0];
   segments.forEach((seg, i) => {
+    if (!funnelSeries || !funnelSeries.dataLabelOptions && !chartData.style?.dataLabels && !funnelSeries.dataLabels?.some((label2) => label2.idx === i))
+      return;
+    const label = buildDataLabelText({
+      chartData,
+      series: funnelSeries,
+      pointIndex: i,
+      value: values[i]
+    });
+    if (!label) return;
     dataLabels.push({
       kind: "text",
       x: seg.labelX,
       y: seg.labelY,
-      text: seg.labelText,
+      text: label.text,
       fontSize: seg.fontSize,
       fill: "#ffffff",
       textAnchor: "middle",
@@ -7962,7 +7709,7 @@ function buildFunnelViewModel(element, chartData, categoryLabels) {
     categoryLabels: categoryAxisLabels,
     primitives,
     dataLabels,
-    // Funnel does not draw a separate legend swatch list (labels are inline).
+    // The PPTX host keeps its existing funnel legend policy.
     legend: [],
     legendX: layout.svgWidth / 2,
     legendY: layout.svgHeight - 8,
@@ -9138,7 +8885,7 @@ function applyManualDrag(point, pointIndex, params) {
   const layout = layoutFor(pointIndex);
   const viewOffset = chartFrameToViewOffset(frame, { svgWidth, svgHeight });
   const framePoint = { x: point.x + viewOffset.x, y: point.y + viewOffset.y };
-  const shifted = applyLabelManualLayout(layout, frame, framePoint);
+  const shifted = chart.applyLabelManualLayout(layout, frame, framePoint);
   return { x: shifted.x - viewOffset.x, y: shifted.y - viewOffset.y };
 }
 function leaderLine2(slice, cx, cy, outerR, to, style) {
@@ -9535,8 +9282,6 @@ function buildPieViewModel(element, chartData, categoryLabels, isDoughnut) {
     legendAnchor
   };
 }
-
-// src/pptx/render/chart-view-model-layout.ts
 function categoryAxisBand(chartData) {
   const axis = chartData.axes?.find(
     (candidate) => candidate.axisType === "catAx" || candidate.axisType === "dateAx"
@@ -9585,20 +9330,22 @@ function computePlotLayout(elementWidth, elementHeight, chartData, hasAxes, opti
     plotLeft = Math.max(plotLeft, 8 + tableMetrics.keyW);
   }
   const autoPlotHeight = Math.max(plotBottom - plotTop, 1);
-  const plotLayout = manualLayoutOf(chartData, "plotArea"), manual = chart.resolveManualLayoutRect(
+  const plotLayout = manualLayoutOf(chartData, "plotArea"), manual = chart.resolveManualPlotRect(
     plotLayout,
     { width: svgWidth, height: svgHeight },
-    { x: plotLeft, y: plotTop, width: plotRight - plotLeft, height: plotBottom - plotTop }
+    { x: plotLeft, y: plotTop, width: plotRight - plotLeft, height: plotBottom - plotTop },
+    {
+      left: hasAxes ? leftAxisBand(options?.leftCategoryLabelWidth) : 0,
+      top: 0,
+      right: 0,
+      bottom: hasAxes ? categoryAxisBand(chartData) - 8 : 0
+    }
   );
   if (plotLayout && manual) {
     plotLeft = manual.x;
     plotTop = manual.y;
     plotRight = manual.x + manual.width;
     plotBottom = manual.y + manual.height;
-    if (hasAxes && plotLayout.layoutTarget !== "inner") {
-      plotLeft += leftAxisBand(options?.leftCategoryLabelWidth);
-      plotBottom -= categoryAxisBand(chartData) - 8;
-    }
   }
   const plotWidth = Math.max(plotRight - plotLeft, 1), plotHeight = Math.max(plotBottom - plotTop, 1);
   return {
@@ -9707,7 +9454,7 @@ function buildRadarViewModel(element, chartData, categoryLabels) {
             y: clamp2(p.y + out * Math.sin(angle), fontSize, frame.height - fontSize)
           };
           anchor = {
-            ...applyLabelManualLayout(findPointLabel(series, vi)?.layout, frame, auto),
+            ...chart.applyLabelManualLayout(findPointLabel(series, vi)?.layout, frame, auto),
             textAnchor: "middle",
             dominantBaseline: "central"
           };
@@ -10947,7 +10694,7 @@ function computeTrendlinePrimitives(chartData, catCount, layout, range, mode = "
       }
       if (labelLines.length > 0) {
         const last = points[points.length - 1];
-        const anchor = applyLabelManualLayout(
+        const anchor = chart.applyLabelManualLayout(
           tl.label?.layout,
           { width: layout.svgWidth, height: layout.svgHeight },
           { x: last.x, y: last.y - 6 }
@@ -10977,6 +10724,10 @@ Object.defineProperty(exports, "DEFAULT_CHART_PALETTE", {
   enumerable: true,
   get: function () { return chart.DEFAULT_CHART_PALETTE; }
 });
+Object.defineProperty(exports, "applyLabelManualLayout", {
+  enumerable: true,
+  get: function () { return chart.applyLabelManualLayout; }
+});
 Object.defineProperty(exports, "computeBoxStats", {
   enumerable: true,
   get: function () { return chart.computeBoxStats; }
@@ -11128,7 +10879,6 @@ exports.TEXT_ORIENTATION_IDENTITY = TEXT_ORIENTATION_IDENTITY;
 exports.ZERO_LINE_COLOR = ZERO_LINE_COLOR;
 exports.adjustFillForMode = adjustFillForMode;
 exports.applyDataPointPictureFills = applyDataPointPictureFills;
-exports.applyLabelManualLayout = applyLabelManualLayout;
 exports.applyLegendEntryOverrides = applyLegendEntryOverrides;
 exports.applyParetoConversion = applyParetoConversion;
 exports.axisShowsMajorGridlines = axisShowsMajorGridlines;

package/dist/pptx/{chunk-MNSWEXYO.mjs → chunk-DACFW5LO.mjs}

@@ -1,4 +1,4 @@
-// src/pptx/render/custom-fonts.ts
+// src/fonts/custom-fonts.ts
 var CUSTOM_FONT_EXTENSIONS = [".ttf", ".otf", ".woff", ".woff2"];
 var CUSTOM_FONT_ACCEPT = [
   ...CUSTOM_FONT_EXTENSIONS,
@@ -90,7 +90,30 @@ async function registerCustomFont(file, target) {
   });
   await face.load();
   fontSet.add(face);
-  return { family: descriptor.family, descriptor };
+  return { family: descriptor.family, descriptor, dispose: () => void fontSet.delete(face) };
+}
+function createFontFaceScope(target) {
+  const registrations = /* @__PURE__ */ new Set();
+  let disposed = false;
+  return {
+    async register(file) {
+      if (disposed) return null;
+      const registration = await registerCustomFont(file, target);
+      if (!registration) return null;
+      if (disposed) {
+        registration.dispose();
+        return null;
+      }
+      registrations.add(registration);
+      return registration;
+    },
+    dispose() {
+      if (disposed) return;
+      disposed = true;
+      for (const registration of registrations) registration.dispose();
+      registrations.clear();
+    }
+  };
 }
 
-export { CUSTOM_FONT_ACCEPT, CUSTOM_FONT_EXTENSIONS, deriveCustomFontDescriptor, registerCustomFont };
+export { CUSTOM_FONT_ACCEPT, CUSTOM_FONT_EXTENSIONS, createFontFaceScope, deriveCustomFontDescriptor, registerCustomFont };