@rowsncolumns/toolkit 24.4.4 → 24.5.0

package/dist/esm/exporter/ods/ods-export.js

@@ -1484,6 +1484,18 @@ const buildNumberStyleXml = (name, format) => {
     if (!format)
         return "";
     const type = format.type;
+    // The authored pattern decides the symbol, its side, the decimals and the
+    // thousands separator (the same numeric grammar the chart axes convert);
+    // the per-type defaults below only cover a format without a pattern.
+    if (format.pattern &&
+        (type === "PERCENT" ||
+            type === "CURRENCY" ||
+            type === "ACCOUNTING" ||
+            type === "NUMBER")) {
+        const fromPattern = numericPatternToOdsStyle(name, format.pattern);
+        if (fromPattern)
+            return fromPattern;
+    }
     if (type === "PERCENT") {
         return `<number:percentage-style style:name="${name}"><number:number number:min-integer-digits="1" number:decimal-places="2"/></number:percentage-style>`;
     }
@@ -2073,27 +2085,56 @@ const buildFilterXml = (filterSpecs, range, rows, headerRow = true, totalRow = f
     if (!filterSpecs?.length)
         return "";
     const conditions = [];
+    const filterConditionXml = (columnIndex, mapped) => {
+        const attrs = [
+            `table:field-number="${columnIndex}"`,
+            `table:operator="${mapped.operator}"`,
+        ];
+        if (mapped.value !== undefined) {
+            attrs.push(`table:value="${escapeXml(mapped.value)}"`);
+        }
+        if (mapped.value2 !== undefined) {
+            attrs.push(`table:value2="${escapeXml(mapped.value2)}"`);
+        }
+        return `<table:filter-condition ${attrs.join(" ")}/>`;
+    };
     for (const spec of filterSpecs) {
         const criteria = spec.filterCriteria;
-        // A condition filter (greater-than / contains / between / blank / …) takes
-        // precedence over a value list, and is emitted as a single operator-based
-        // <table:filter-condition>. Otherwise fall back to value-list entries.
+        // A condition filter (greater-than / contains / between / blank / Top 10
+        // / …) takes precedence over a value list, and is emitted as an
+        // operator-based <table:filter-condition>. Excel's Custom AutoFilter
+        // second clause joins it inside <table:filter-or> (Or) or beside it in
+        // the enclosing <table:filter-and> (And). Otherwise fall back to
+        // value-list entries.
         const condition = criteria?.condition;
         const mapped = condition?.type
             ? mapConditionToFilterCondition(condition.type, condition.values ?? [])
             : undefined;
         if (mapped) {
-            const attrs = [
-                `table:field-number="${spec.columnIndex}"`,
-                `table:operator="${mapped.operator}"`,
-            ];
-            if (mapped.value !== undefined) {
-                attrs.push(`table:value="${escapeXml(mapped.value)}"`);
+            const first = filterConditionXml(spec.columnIndex, mapped);
+            const condition2 = criteria?.condition2;
+            const mapped2 = condition2?.type
+                ? mapConditionToFilterCondition(condition2.type, condition2.values ?? [])
+                : undefined;
+            if (mapped2) {
+                const second = filterConditionXml(spec.columnIndex, mapped2);
+                conditions.push(criteria?.conditionJoin === "OR"
+                    ? `<table:filter-or>${first}${second}</table:filter-or>`
+                    : `${first}${second}`);
             }
-            if (mapped.value2 !== undefined) {
-                attrs.push(`table:value2="${escapeXml(mapped.value2)}"`);
+            else {
+                if (condition2?.type) {
+                    conditions.push(unsupportedConditionComment(spec.columnIndex, condition2.type));
+                }
+                conditions.push(first);
             }
-            conditions.push(`<table:filter-condition ${attrs.join(" ")}/>`);
+            continue;
+        }
+        if (condition?.type) {
+            // A criterion ODF cannot express (relative-date periods, above /
+            // below average, custom formulas): degrade explicitly instead of
+            // flattening the column into an all-values list.
+            conditions.push(unsupportedConditionComment(spec.columnIndex, condition.type));
             continue;
         }
         const visibleValues = criteria?.visibleValues ??
@@ -2110,6 +2151,12 @@ const buildFilterXml = (filterSpecs, range, rows, headerRow = true, totalRow = f
         return "";
     return `<table:filter><table:filter-and>${conditions.join("")}</table:filter-and></table:filter>`;
 };
+/**
+ * An XML comment recording a criterion ODF has no shape for (a dynamic
+ * period such as DATE_THIS_MONTH, above/below average, a custom formula).
+ * Readers ignore it; the column exports with no criterion on that clause.
+ */
+const unsupportedConditionComment = (columnIndex, type) => `<!-- rnc: ${type.replace(/-/g, "")} filter on field ${columnIndex} has no ODF equivalent; exported without that criterion -->`;
 const buildSortXml = (sortSpecs) => {
     if (!sortSpecs?.length)
         return "";
@@ -2167,6 +2214,16 @@ const mapConditionToFilterCondition = (type, values) => {
             return { operator: "non-empty" };
         case "BOOLEAN":
             return { operator: "=", value: "TRUE" };
+        // Excel's "Top 10…" AutoFilter — ODF 1.2 `table:operator` has native
+        // top / bottom values / percent forms.
+        case "NUMBER_TOP_N":
+            return { operator: "top values", value: first ?? "" };
+        case "NUMBER_BOTTOM_N":
+            return { operator: "bottom values", value: first ?? "" };
+        case "NUMBER_TOP_PERCENT":
+            return { operator: "top percent", value: first ?? "" };
+        case "NUMBER_BOTTOM_PERCENT":
+            return { operator: "bottom percent", value: first ?? "" };
         default:
             return undefined;
     }
@@ -2796,6 +2853,7 @@ const groupEmbedsBySheet = (embeds) => {
             offsetY: overlay.offsetYPixels ?? 0,
             width: overlay.widthPixels ?? 120,
             height: overlay.heightPixels ?? 120,
+            overlay,
         };
         const list = result.get(embed.position.sheetId) ?? [];
         list.push(placement);
@@ -2858,29 +2916,17 @@ const buildEmbedFramesXml = async ({ embeds, mediaEntries, sheetName, sheet, })
         const anchorAttr = anchorCell
             ? ` table:anchor-cell-address="${escapeXmlAddress(anchorCell)}"`
             : "";
-        const endColumn = resolveAnchorEndpoint({
-            startIndex: placement.columnIndex,
-            startOffset: offsetXPx,
-            span: widthPx,
-            getSize: (index) => getColumnWidthPx(sheet, index),
-        });
-        const endRow = resolveAnchorEndpoint({
-            startIndex: placement.rowIndex,
-            startOffset: offsetYPx,
-            span: heightPx,
-            getSize: (index) => getRowHeightPx(sheet, index),
-        });
-        const endRef = cellToAddress({
-            rowIndex: endRow.index,
-            columnIndex: endColumn.index,
+        const endAttrs = buildFrameEndCellAttrs({
+            sheet,
+            overlay: placement.overlay,
+            rowIndex: placement.rowIndex,
+            columnIndex: placement.columnIndex,
+            offsetXPx,
+            offsetYPx,
+            widthPx,
+            heightPx,
         });
-        const endCell = endRef ?? undefined;
-        const endCellAttr = endCell
-            ? ` table:end-cell-address="${escapeXmlAddress(endCell)}"`
-            : "";
-        const endX = pxToCm(endColumn.offset).toFixed(2);
-        const endY = pxToCm(endRow.offset).toFixed(2);
-        frames.push(`<draw:frame draw:name="Image${mediaEntries.length}" svg:width="${width}cm" svg:height="${height}cm" svg:x="${offsetX}cm" svg:y="${offsetY}cm" table:anchor-type="cell"${anchorAttr}${endCellAttr} table:end-x="${endX}cm" table:end-y="${endY}cm"><draw:image xlink:href="${mediaPath}" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>`);
+        frames.push(`<draw:frame draw:name="Image${mediaEntries.length}" svg:width="${width}cm" svg:height="${height}cm" svg:x="${offsetX}cm" svg:y="${offsetY}cm" table:anchor-type="cell"${anchorAttr}${endAttrs}><draw:image xlink:href="${mediaPath}" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>`);
     }
     return frames;
 };
@@ -2937,6 +2983,44 @@ const getCellOriginPx = (sheet, rowIndex, columnIndex) => {
     }
     return { x, y };
 };
+/**
+ * `table:end-cell-address` + `table:end-x/y` for a frame — ODS's shape of
+ * Excel's "Move and size with cells": the persisted second anchor when the
+ * object carries one, else the cell its pixel extent reaches. ODS has no
+ * placement mode, so "Move but don't size" / "Don't move or size" frames
+ * degrade to a fixed-size cell-anchored frame (no end cell) — the closest
+ * ODS reading; the mode itself is not round-tripped through ODS (#668 C-06).
+ */
+const buildFrameEndCellAttrs = ({ sheet, overlay, rowIndex, columnIndex, offsetXPx, offsetYPx, widthPx, heightPx, }) => {
+    if ((overlay?.placement ?? "moveAndSize") !== "moveAndSize")
+        return "";
+    const endColumn = overlay?.toCell
+        ? { index: overlay.toCell.columnIndex, offset: overlay.toOffsetXPixels ?? 0 }
+        : resolveAnchorEndpoint({
+            startIndex: columnIndex,
+            startOffset: offsetXPx,
+            span: widthPx,
+            getSize: (index) => getColumnWidthPx(sheet, index),
+        });
+    const endRow = overlay?.toCell
+        ? { index: overlay.toCell.rowIndex, offset: overlay.toOffsetYPixels ?? 0 }
+        : resolveAnchorEndpoint({
+            startIndex: rowIndex,
+            startOffset: offsetYPx,
+            span: heightPx,
+            getSize: (index) => getRowHeightPx(sheet, index),
+        });
+    const endRef = cellToAddress({
+        rowIndex: endRow.index,
+        columnIndex: endColumn.index,
+    });
+    const endCellAttr = endRef
+        ? ` table:end-cell-address="${escapeXmlAddress(endRef)}"`
+        : "";
+    const endX = pxToCm(endColumn.offset).toFixed(2);
+    const endY = pxToCm(endRow.offset).toFixed(2);
+    return `${endCellAttr} table:end-x="${endX}cm" table:end-y="${endY}cm"`;
+};
 const resolveAnchorEndpoint = ({ startIndex, startOffset, span, getSize, }) => {
     let remaining = Math.max(0, span);
     let index = Math.max(1, startIndex);
@@ -2956,6 +3040,12 @@ const resolveAnchorEndpoint = ({ startIndex, startOffset, span, getSize, }) => {
     }
     return { index, offset };
 };
+/** `ChartSpec.emptyCells` → ODF `chart:treat-empty-cells`. */
+const ODS_TREAT_EMPTY_CELLS = {
+    gaps: "leave-gap",
+    zero: "use-zero",
+    connect: "ignore",
+};
 const buildChartObjectXml = (chart, sheetNameById) => {
     const spec = chart.spec;
     const series = spec?.series ?? [];
@@ -2976,6 +3066,7 @@ const buildChartObjectXml = (chart, sheetNameById) => {
         column: "chart:bar",
         line: "chart:line",
         pie: "chart:circle",
+        doughnut: "chart:ring",
         scatter: "chart:scatter",
         area: "chart:area",
     };
@@ -2996,20 +3087,52 @@ const buildChartObjectXml = (chart, sheetNameById) => {
     const chartClass = isSurface
         ? "chart:surface"
         : (typeMap[spec.chartType] ?? "chart:bar");
-    const plotStyleProps = threeDimensional
-        ? `<style:chart-properties chart:three-dimensional="true"/>`
+    // Pie and doughnut (ODF `chart:ring`) share the slice model — no axes,
+    // walls or legend block, and the per-series slice offset.
+    const isCircular = chartClass === "chart:circle" || chartClass === "chart:ring";
+    // Excel's "Show empty cells as" has a native ODF shape on the plot-area
+    // style (`chart:treat-empty-cells`: leave-gap / use-zero / ignore, the
+    // last being "continue the line"); "Show #N/A as an empty cell" has none
+    // and degrades on ODS export.
+    const treatEmptyCells = ODS_TREAT_EMPTY_CELLS[String(spec.emptyCells ?? "")];
+    const plotChartProps = [
+        threeDimensional ? `chart:three-dimensional="true"` : "",
+        treatEmptyCells ? `chart:treat-empty-cells="${treatEmptyCells}"` : "",
+    ].filter(Boolean);
+    const plotStyleProps = plotChartProps.length
+        ? `<style:chart-properties ${plotChartProps.join(" ")}/>`
         : "";
     const title = spec.title
         ? `<chart:title><text:p>${escapeXml(String(spec.title))}</text:p></chart:title>`
         : "";
-    const seriesPalette = [
-        "#4285f4",
-        "#ea4335",
-        "#fbbc04",
-        "#34a853",
-        "#ff6d01",
-        "#46bdc6",
-    ];
+    // Axis tick-label formats. Excel's explicit `<c:numFmt sourceLinked="0">`
+    // is an ODF data style on the axis style with the link to the source
+    // severed (`chart:link-data-style-to-source="false"`); without one the
+    // axis keeps ODF's default and stays linked to its source cells.
+    const axisStyle = (name, options) => {
+        const dataStyleName = `${name}N`;
+        const pattern = options?.numberFormatPattern;
+        const numberStyle = typeof pattern === "string" && pattern.trim()
+            ? buildAxisNumberStyleXml(dataStyleName, pattern)
+            : undefined;
+        const dataStyleAttr = numberStyle
+            ? ` style:data-style-name="${dataStyleName}"`
+            : "";
+        const linkAttr = numberStyle
+            ? ` chart:link-data-style-to-source="false"`
+            : "";
+        return {
+            numberStyle: numberStyle ?? "",
+            style: `<style:style style:name="${name}" style:family="chart"${dataStyleAttr}><style:chart-properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true"${linkAttr}/><style:graphic-properties svg:stroke-color="#b3b3b3"/><style:text-properties fo:font-size="9pt"/></style:style>`,
+        };
+    };
+    const axisX = axisStyle("axisx", spec.categoryAxisOptions);
+    const axisY = axisStyle("axisy", spec.valueAxisOptions);
+    // Change Colors palette when set (ODF has no chart-style id — it
+    // degrades to the resolved series colours); else the default cycle.
+    const seriesPalette = Array.isArray(spec.palette) && spec.palette.length > 0
+        ? spec.palette
+        : ["#4285f4", "#ea4335", "#fbbc04", "#34a853", "#ff6d01", "#46bdc6"];
     // Series chart styles + (optional) gradient defs. When a series
     // carries an explicit gradient we emit a `<draw:gradient>` def
     // alongside it and reference the def via `draw:fill-gradient-name`
@@ -3017,6 +3140,14 @@ const buildChartObjectXml = (chart, sheetNameById) => {
     // for `draw:angle` (so a 90° XLSX gradient is `900` here) and
     // `linear` / `radial` for the two flavors we round-trip.
     const gradientDefs = [];
+    // Exploded pie / doughnut — ODF keeps the slice offset on the series
+    // style (`chart:pie-offset`, a percentage of the radius) like OOXML's
+    // per-series `<c:explosion>`.
+    const explosion = isCircular &&
+        typeof spec.explosion === "number" &&
+        spec.explosion > 0
+        ? `<style:chart-properties chart:pie-offset="${Math.round(spec.explosion)}"/>`
+        : "";
     const seriesStyles = seriesRanges
         .map((_range, index) => {
         const color = seriesPalette[index % seriesPalette.length];
@@ -3042,10 +3173,10 @@ const buildChartObjectXml = (chart, sheetNameById) => {
                 const angle = Math.round((gradient.degree ?? 0) * 10);
                 gradientDefs.push(`<draw:gradient draw:name="${gradName}" draw:style="linear" draw:start-color="${startColor}" draw:end-color="${endColor}" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="${angle}"/>`);
             }
-            return `<style:style style:name="series${index}" style:family="chart"><style:graphic-properties svg:stroke-color="${startColor}" svg:stroke-width="0.08cm" draw:fill="gradient" draw:fill-gradient-name="${gradName}"/></style:style>`;
+            return `<style:style style:name="series${index}" style:family="chart">${explosion}<style:graphic-properties svg:stroke-color="${startColor}" svg:stroke-width="0.08cm" draw:fill="gradient" draw:fill-gradient-name="${gradName}"/></style:style>`;
         }
         const fillColor = seriesData?.color || color;
-        return `<style:style style:name="series${index}" style:family="chart"><style:graphic-properties svg:stroke-color="${fillColor}" svg:stroke-width="0.08cm" draw:fill="none"/></style:style>`;
+        return `<style:style style:name="series${index}" style:family="chart">${explosion}<style:graphic-properties svg:stroke-color="${fillColor}" svg:stroke-width="0.08cm" draw:fill="none"/></style:style>`;
     })
         .join("");
     const gradientDefsXml = gradientDefs.join("");
@@ -3067,7 +3198,7 @@ const buildChartObjectXml = (chart, sheetNameById) => {
         return `<chart:series chart:class="${chartClass}" chart:style-name="series${index}" chart:values-cell-range-address="${escapeXmlAddress(range)}"${labelAttr}>${pointsXml}</chart:series>`;
     })
         .join("");
-    const axisXml = chartClass === "chart:circle"
+    const axisXml = isCircular
         ? ""
         : `<chart:axis chart:dimension="x" chart:name="primary-x" chart:style-name="axisx"><chart:title/></chart:axis><chart:axis chart:dimension="y" chart:name="primary-y" chart:style-name="axisy"><chart:title/></chart:axis>`;
     const categoriesAttr = domainRange
@@ -3075,14 +3206,61 @@ const buildChartObjectXml = (chart, sheetNameById) => {
         : "";
     const labelMode = domainRange ? "both" : hasSeriesLabels ? "row" : "none";
     const plotAreaAttrs = ` chart:data-source-has-labels="${labelMode}"${categoriesAttr}`;
-    const wallFloor = chartClass === "chart:circle"
+    const wallFloor = isCircular
         ? ""
         : `<chart:wall chart:style-name="wall1"/><chart:floor chart:style-name="floor1"/>`;
-    const legendXml = chartClass === "chart:circle"
+    const legendXml = isCircular
         ? ""
         : `<chart:legend chart:legend-position="end" chart:legend-align="center" chart:style-name="legend1"/>`;
-    return `${XML_DECLARATION}<office:document-content xmlns:office="${ODS_NS.office}" xmlns:chart="${ODS_NS.chart}" xmlns:table="${ODS_NS.table}" xmlns:text="${ODS_NS.text}" xmlns:style="${ODS_NS.style}" xmlns:draw="${ODS_NS.draw}" xmlns:svg="${ODS_NS.svg}" xmlns:fo="${ODS_NS.fo}" office:version="1.2"><office:automatic-styles>${gradientDefsXml}<style:style style:name="ch1" style:family="chart"><style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/></style:style><style:style style:name="plot1" style:family="chart">${plotStyleProps}<style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff" svg:stroke-color="#b3b3b3"/></style:style><style:style style:name="wall1" style:family="chart"><style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff" svg:stroke-color="#b3b3b3" svg:stroke-width="0.01cm"/></style:style><style:style style:name="floor1" style:family="chart"><style:graphic-properties draw:fill="none" svg:stroke-color="#b3b3b3"/></style:style><style:style style:name="legend1" style:family="chart"><style:graphic-properties draw:fill="none" svg:stroke-color="#b3b3b3"/><style:text-properties fo:font-size="10pt"/></style:style><style:style style:name="axisx" style:family="chart"><style:chart-properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true"/><style:graphic-properties svg:stroke-color="#b3b3b3"/><style:text-properties fo:font-size="9pt"/></style:style><style:style style:name="axisy" style:family="chart"><style:chart-properties chart:display-label="true" chart:tick-marks-major-inner="false" chart:tick-marks-major-outer="true"/><style:graphic-properties svg:stroke-color="#b3b3b3"/><style:text-properties fo:font-size="9pt"/></style:style>${seriesStyles}</office:automatic-styles><office:body><office:chart><chart:chart chart:class="${chartClass}" chart:style-name="ch1">${title}${legendXml}<chart:plot-area chart:style-name="plot1"${plotAreaAttrs}>${axisXml}${seriesXml}${wallFloor}</chart:plot-area></chart:chart></office:chart></office:body></office:document-content>`;
+    return `${XML_DECLARATION}<office:document-content xmlns:office="${ODS_NS.office}" xmlns:chart="${ODS_NS.chart}" xmlns:table="${ODS_NS.table}" xmlns:text="${ODS_NS.text}" xmlns:style="${ODS_NS.style}" xmlns:draw="${ODS_NS.draw}" xmlns:svg="${ODS_NS.svg}" xmlns:fo="${ODS_NS.fo}" xmlns:number="${ODS_NS.number}" office:version="1.2"><office:automatic-styles>${axisX.numberStyle}${axisY.numberStyle}${gradientDefsXml}<style:style style:name="ch1" style:family="chart"><style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/></style:style><style:style style:name="plot1" style:family="chart">${plotStyleProps}<style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff" svg:stroke-color="#b3b3b3"/></style:style><style:style style:name="wall1" style:family="chart"><style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff" svg:stroke-color="#b3b3b3" svg:stroke-width="0.01cm"/></style:style><style:style style:name="floor1" style:family="chart"><style:graphic-properties draw:fill="none" svg:stroke-color="#b3b3b3"/></style:style><style:style style:name="legend1" style:family="chart"><style:graphic-properties draw:fill="none" svg:stroke-color="#b3b3b3"/><style:text-properties fo:font-size="10pt"/></style:style>${axisX.style}${axisY.style}${seriesStyles}</office:automatic-styles><office:body><office:chart><chart:chart chart:class="${chartClass}" chart:style-name="ch1">${title}${legendXml}<chart:plot-area chart:style-name="plot1"${plotAreaAttrs}>${axisXml}${seriesXml}${wallFloor}</chart:plot-area></chart:chart></office:chart></office:body></office:document-content>`;
+};
+/**
+ * A numeric format pattern as an ODF data style — shared by cell number
+ * formats and the chart axes' tick-label patterns. Only the numeric grammar
+ * converts — digit placeholders, grouping, decimals, `%`, and a quoted /
+ * bare currency literal before or after the digits (as a
+ * `number:currency-style`; whitespace between the symbol and the digits is
+ * kept as a `number:text` so `€ #,##0.00` and `€#,##0.00` stay distinct).
+ * Dates, fractions, scientific and text patterns have no shape the ODS
+ * parser reads back, so they return `undefined` and the caller degrades
+ * (the axis stays linked to its source, a cell falls back to its type's
+ * default style — both stated in the compatibility table).
+ */
+const numericPatternToOdsStyle = (name, pattern) => {
+    // The first (positive) section; a `[$€-2]` currency token keeps its symbol
+    // as a literal, the other bracket tokens (colours, conditions) drop.
+    const section = pattern
+        .split(";")[0]
+        .replace(/\[\$([^\]-]*)(?:-[^\]]*)?\]/g, '"$1"')
+        .replace(/\[[^\]]*\]/g, "")
+        .trim();
+    const match = section.match(/^((?:"[^"]*"|\\.|[^#0?.,%"\\])*)([#0?][#0?,]*(?:\.[#0?]+)?)((?:"[^"]*"|\\.|[^#0?"\\])*)$/);
+    if (!match)
+        return undefined;
+    const unquote = (literal) => literal.replace(/"([^"]*)"/g, "$1").replace(/\\(.)/g, "$1");
+    const rawPrefix = unquote(match[1]);
+    const rawSuffix = unquote(match[3]);
+    const prefix = rawPrefix.trim();
+    const digits = match[2];
+    const suffix = rawSuffix.trim();
+    const [integerPart = "", fractionPart = ""] = digits.split(".");
+    const numberXml = `<number:number number:min-integer-digits="${(integerPart.match(/0/g) ?? []).length}" number:decimal-places="${fractionPart.length}" number:grouping="${integerPart.includes(",")}"/>`;
+    if (suffix.includes("%")) {
+        return `<number:percentage-style style:name="${name}">${numberXml}<number:text>%</number:text></number:percentage-style>`;
+    }
+    const gap = (literal) => /\s$/.test(literal) || /^\s/.test(literal)
+        ? "<number:text> </number:text>"
+        : "";
+    if (prefix) {
+        return `<number:currency-style style:name="${name}"><number:currency-symbol>${escapeXml(prefix)}</number:currency-symbol>${gap(rawPrefix)}${numberXml}</number:currency-style>`;
+    }
+    if (suffix) {
+        return `<number:currency-style style:name="${name}">${numberXml}${gap(rawSuffix)}<number:currency-symbol>${escapeXml(suffix)}</number:currency-symbol></number:currency-style>`;
+    }
+    return `<number:number-style style:name="${name}">${numberXml}</number:number-style>`;
 };
+/** A chart axis' explicit tick-label pattern as an ODF data style (see `numericPatternToOdsStyle`). */
+const buildAxisNumberStyleXml = numericPatternToOdsStyle;
 const buildChartRangeAddress = (range, sheetNameById) => {
     const sheetName = sheetNameById.get(range.sheetId);
     if (!sheetName)
@@ -3163,29 +3341,17 @@ const buildChartFramesXml = async ({ charts, sheet, sheetName, sheetNameById, st
         const anchorAttr = anchorCell
             ? ` table:anchor-cell-address="${escapeXmlAddress(anchorCell)}"`
             : "";
-        const endColumn = resolveAnchorEndpoint({
-            startIndex: placement.columnIndex,
-            startOffset: offsetXPx,
-            span: widthPx,
-            getSize: (index) => getColumnWidthPx(sheet, index),
-        });
-        const endRow = resolveAnchorEndpoint({
-            startIndex: placement.rowIndex,
-            startOffset: offsetYPx,
-            span: heightPx,
-            getSize: (index) => getRowHeightPx(sheet, index),
-        });
-        const endRef = cellToAddress({
-            rowIndex: endRow.index,
-            columnIndex: endColumn.index,
+        const endAttrs = buildFrameEndCellAttrs({
+            sheet,
+            overlay: placement.chart.position?.overlayPosition,
+            rowIndex: placement.rowIndex,
+            columnIndex: placement.columnIndex,
+            offsetXPx,
+            offsetYPx,
+            widthPx,
+            heightPx,
         });
-        const endCell = endRef ?? undefined;
-        const endCellAttr = endCell
-            ? ` table:end-cell-address="${escapeXmlAddress(endCell)}"`
-            : "";
-        const endX = pxToCm(endColumn.offset).toFixed(2);
-        const endY = pxToCm(endRow.offset).toFixed(2);
-        frames.push(`<draw:frame draw:name="Chart${index}" svg:width="${width}cm" svg:height="${height}cm" svg:x="${offsetX}cm" svg:y="${offsetY}cm" table:anchor-type="cell"${anchorAttr}${endCellAttr} table:end-x="${endX}cm" table:end-y="${endY}cm"><draw:object xlink:href="${folder}" xlink:type="simple"/></draw:frame>`);
+        frames.push(`<draw:frame draw:name="Chart${index}" svg:width="${width}cm" svg:height="${height}cm" svg:x="${offsetX}cm" svg:y="${offsetY}cm" table:anchor-type="cell"${anchorAttr}${endAttrs}><draw:object xlink:href="${folder}" xlink:type="simple"/></draw:frame>`);
         index += 1;
     }
     return { frames, chartObjects, nextIndex: index };

package/dist/esm/exporter/xlsx/chart-builder.d.ts

@@ -1,3 +1,9 @@
 import type { EmbeddedChart } from "@rowsncolumns/spreadsheet";
-export declare const buildChartXml: (chart: EmbeddedChart, sheetNameById: Map<number, string>) => string | undefined;
+/**
+ * Resolves a chart's `pivotTableId` to the `<c:pivotSource><c:name>` Excel
+ * expects (`[Workbook]Sheet!PivotTable1`); `undefined` when the pivot is
+ * not exported, in which case the chart is written as a plain chart.
+ */
+export type ResolvePivotSourceName = (pivotTableId: string | number) => string | undefined;
+export declare const buildChartXml: (input: EmbeddedChart, sheetNameById: Map<number, string>, resolvePivotSourceName?: ResolvePivotSourceName) => string | undefined;
 //# sourceMappingURL=chart-builder.d.ts.map

package/dist/esm/exporter/xlsx/chart-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/chart-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,aAAa,EAEd,MAAM,2BAA2B,CAAC;AAovCnC,eAAO,MAAM,aAAa,GACxB,OAAO,aAAa,EACpB,eAAe,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,KACjC,MAAM,GAAG,SA+lBX,CAAC"}
+{"version":3,"file":"chart-builder.d.ts","sourceRoot":"","sources":["../../../../exporter/xlsx/chart-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,aAAa,EAEd,MAAM,2BAA2B,CAAC;AA63CnC;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,CACnC,YAAY,EAAE,MAAM,GAAG,MAAM,KAC1B,MAAM,GAAG,SAAS,CAAC;AAExB,eAAO,MAAM,aAAa,GACxB,OAAO,aAAa,EACpB,eAAe,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,yBAAyB,sBAAsB,KAC9C,MAAM,GAAG,SAqqBX,CAAC"}