@rowsncolumns/toolkit 24.4.5 → 24.5.1

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

@@ -1,8 +1,8 @@
 import { cellRangeToAddress, cellToAddress, escapeCharacters, getCellEffectiveFormat, getCellEffectiveValue, getCellFormattedValue, getCellUserEnteredFormat, getCellUserEnteredValue, getExtendedValueBool, getExtendedValueError, getExtendedValueFormula, getExtendedValueNumber, getExtendedValueString, isNil, sortSheetsByIndex, } from "@rowsncolumns/utils";
 import { zipSync } from "fflate";
 import { omitInvalidDataValidationError } from "../invalid-data-validation";
-import { buildAutoFilterConditionXml } from "../../autofilter-condition";
-import { buildControlElementXml, buildControlsXml, buildCtrlPropXml, buildFormControlVmlShape, buildVmlDrawingXml, CTRL_PROP_CONTENT_TYPE, CTRL_PROP_REL_TYPE, FORM_CONTROL_VML_SHAPETYPE, } from "./form-controls-builder";
+import { buildAutoFilterCriteriaXml } from "../../autofilter-condition";
+import { buildControlElementXml, buildControlsXml, buildCtrlPropXml, buildFormControlVmlShape, controlAnchorFlags, buildVmlDrawingXml, CTRL_PROP_CONTENT_TYPE, CTRL_PROP_REL_TYPE, FORM_CONTROL_VML_SHAPETYPE, } from "./form-controls-builder";
 import { buildChartExGraphicFrameXml, buildChartExXml, CHART_EX_CONTENT_TYPE, CHART_EX_REL_TYPE, isChartExType, } from "./chartex-builder";
 import { applyPowerQueryParts } from "./power-query-builder";
 import { encodeImplicitIntersection } from "../../helpers/implicit-intersection";
@@ -19,7 +19,7 @@ import { buildChartXml } from "./chart-builder";
 import { buildPivotCacheDefinitionXml, buildPivotTableRelsXml, buildPivotTableXml, calculatedFieldReferences, } from "./pivot-builder";
 import { buildSlicerCacheXml, buildSlicerXml } from "./slicer-builder";
 import { buildSparklineGroupsXml } from "./sparkline-builder";
-import { StyleBuilder } from "./style-builder";
+import { StyleBuilder, tableStyleElementsFromBanding, } from "./style-builder";
 const BLANK_LABEL = "(Blanks)";
 const isStyleReference = (value) => !!value && typeof value === "object" && "sid" in value;
 const DEFAULT_COLUMN_WIDTH_PX = 100;
@@ -38,9 +38,15 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
     if (namedCellStyles && namedCellStyles.length > 0) {
         styleBuilder.setNamedCellStyles(namedCellStyles);
     }
-    if (customTableStyles && customTableStyles.length > 0) {
-        styleBuilder.setCustomTableStyles(customTableStyles);
+    // The document facet carries `{ name, bandedRange }` (#668 T-103); a host may still pass the
+    // parser's element records. Both become `<tableStyle>` elements.
+    const customTableStyleRecords = (customTableStyles ?? []).map((style) => "bandedRange" in style
+        ? { name: style.name, elements: tableStyleElementsFromBanding(style.bandedRange) }
+        : style);
+    if (customTableStyleRecords.length > 0) {
+        styleBuilder.setCustomTableStyles(customTableStyleRecords);
     }
+    const customTableStyleNames = new Set(customTableStyleRecords.map((s) => s.name));
     // Drop tables with invalid coords or overlapping ranges — Excel rejects them
     // and would trigger a recovery prompt. Filter once so the id remap and the
     // prepared output stay in lockstep.
@@ -52,10 +58,13 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
         tableIdMap.set(String(table.id), index + 1);
     });
     const preparedTables = prepareTables(exportableTables);
-    const embedsBySheet = groupEmbedsBySheet(embeds ?? []);
-    const textBoxesBySheet = groupTextBoxesBySheet(embeds ?? []);
-    const shapesBySheet = groupShapesBySheet(embeds ?? []);
-    const formControlsBySheet = groupFormControlsBySheet(embeds ?? []);
+    // Charts and embeds share one z-order per sheet (`position.zOrder`, else
+    // creation order: charts below embeds) — the drawing anchors follow it.
+    const chartCount = charts?.length ?? 0;
+    const embedsBySheet = groupEmbedsBySheet(embeds ?? [], chartCount);
+    const textBoxesBySheet = groupTextBoxesBySheet(embeds ?? [], chartCount);
+    const shapesBySheet = groupShapesBySheet(embeds ?? [], chartCount);
+    const formControlsBySheet = groupFormControlsBySheet(embeds ?? [], chartCount);
     const ctrlProps = { parts: [] };
     const chartsBySheet = groupChartsBySheet(charts ?? []);
     // Remap slicer tableIds to match prepared table IDs
@@ -100,6 +109,22 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
     const pivotCacheRelsEntries = [];
     const pivotTableEntries = [];
     const pivotTableRelsEntries = [];
+    // `<c:pivotSource><c:name>` for PivotCharts: the exported pivot's name on
+    // its target sheet (`pivot-builder` names an unnamed pivot the same way).
+    // Only pivots the pivot writer emits (source + pivotRange) are named, so
+    // a chart never points Excel at a pivot part that is not in the file.
+    const pivotSourceNameById = new Map();
+    for (const p of pivotTables) {
+        const targetSheet = sortedSheets.find((s) => s.sheetId === p.targetPosition?.sheetId);
+        if (!targetSheet || !p.source || !p.pivotRange)
+            continue;
+        const sheetTitle = targetSheet.title ?? `Sheet${targetSheet.sheetId}`;
+        const quoted = /^[A-Za-z_][A-Za-z0-9_.]*$/.test(sheetTitle)
+            ? sheetTitle
+            : `'${sheetTitle.replace(/'/g, "''")}'`;
+        pivotSourceNameById.set(String(p.pivotId), `[Workbook]${quoted}!${p.name ?? `PivotTable${p.pivotId}`}`);
+    }
+    const resolvePivotSourceName = (pivotTableId) => pivotSourceNameById.get(String(pivotTableId));
     // Group pivots by the sheet they render on (targetPosition.sheetId).
     const pivotsByTargetSheet = new Map();
     for (const p of pivotTables) {
@@ -115,7 +140,15 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
     // Records pivot caches that need a workbook-level entry (added
     // after the sheet loop closes). Each entry: { cacheIndex, rIdOnWorkbook }
     const workbookPivotCacheRefs = [];
+    // Worksheet and chartsheet parts are numbered 1..N within their own folder
+    // (`xl/worksheets/sheetN.xml` / `xl/chartsheets/sheetN.xml`), as Excel does;
+    // drawings stay keyed by the sheet's position in `sortedSheets`.
+    let worksheetCount = 0;
+    let chartsheetCount = 0;
     const worksheetEntries = sortedSheets.map((sheet, index) => {
+        const isChartsheet = sheet.type === "chartsheet";
+        const partIndex = isChartsheet ? ++chartsheetCount : ++worksheetCount;
+        const partFolder = isChartsheet ? "chartsheets" : "worksheets";
         const rows = getRowsForSheet(sheetData, sheet.sheetId);
         const sheetRelationships = new RelationshipsBuilder();
         const sheetTables = preparedTables.filter((table) => table.sheetId === sheet.sheetId);
@@ -165,6 +198,7 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
                     offsetY: placement.offsetY,
                     width: placement.width,
                     height: placement.height,
+                    overlay: slicer.position?.overlayPosition,
                 });
                 globalSlicerIndex += 1;
             }
@@ -233,35 +267,42 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
             workbookPivotCacheRefs.push({ cacheIndex });
             globalPivotIndex += 1;
         }
-        const result = buildWorksheetXml({
-            sheet,
-            rows,
-            sharedStrings,
-            sourceSharedStrings,
-            cellXfs,
-            styleBuilder,
-            tables: sheetTables,
-            relationships: sheetRelationships,
-            drawingContext,
-            conditionalFormats: sheetConditionalFormats,
-            dataValidationsById,
-            dataValidations: _dataValidations,
-            ignoreFormulaPatterns,
-            citations: sheetCitations,
-            comments,
-            personRegistry,
-            slicerRelIds: worksheetSlicerRelIds,
-            sheetData,
-            sheets: sortedSheets,
-            locale,
-            protectedRanges,
-            formControls: sheetFormControls,
-            ctrlProps,
-        });
+        const result = isChartsheet
+            ? buildChartsheetXml({
+                sheet,
+                relationships: sheetRelationships,
+                drawingContext,
+            })
+            : buildWorksheetXml({
+                sheet,
+                rows,
+                sharedStrings,
+                sourceSharedStrings,
+                cellXfs,
+                styleBuilder,
+                tables: sheetTables,
+                relationships: sheetRelationships,
+                drawingContext,
+                conditionalFormats: sheetConditionalFormats,
+                dataValidationsById,
+                dataValidations: _dataValidations,
+                ignoreFormulaPatterns,
+                citations: sheetCitations,
+                comments,
+                personRegistry,
+                slicerRelIds: worksheetSlicerRelIds,
+                sheetData,
+                sheets: sortedSheets,
+                locale,
+                protectedRanges,
+                formControls: sheetFormControls,
+                ctrlProps,
+            });
         return {
             index,
-            path: `xl/worksheets/sheet${index + 1}.xml`,
-            relationshipsPath: `xl/worksheets/_rels/sheet${index + 1}.xml.rels`,
+            isChartsheet,
+            path: `xl/${partFolder}/sheet${partIndex}.xml`,
+            relationshipsPath: `xl/${partFolder}/_rels/sheet${partIndex}.xml.rels`,
             content: result.xml,
             relationshipsXml: result.relationshipsXml,
             drawingPath: `xl/drawings/drawing${index + 1}.xml`,
@@ -278,12 +319,25 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
             threadedCommentsXml: result.threadedCommentsXml,
         };
     });
-    const { xml: workbookRelationshipsXml, sheetRelationshipIds, slicerCacheRelationshipIds, pivotCacheRelationshipIds, externalLinkRelationshipIds, } = buildWorkbookRelationships(worksheetEntries.length, slicerCacheEntries.length, externalLinks.length, pivotCacheEntries.length, !personRegistry.isEmpty());
+    const { xml: workbookRelationshipsXml, sheetRelationshipIds, slicerCacheRelationshipIds, pivotCacheRelationshipIds, externalLinkRelationshipIds, } = buildWorkbookRelationships(worksheetEntries.map((entry) => ({
+        chartsheet: entry.isChartsheet,
+        target: entry.path.replace(/^xl\//, ""),
+    })), slicerCacheEntries.length, externalLinks.length, pivotCacheEntries.length, !personRegistry.isEmpty());
     const workbookXml = buildWorkbookXml(sortedSheets, sheetRelationshipIds, workbookSheetNames, namedRanges, iterativeCalculationOptions, slicerCacheRelationshipIds, use1904, externalLinkRelationshipIds, pivotCacheRelationshipIds);
     const sharedStringsXml = buildSharedStringsXml(sharedStrings);
     const rootRelationshipsXml = buildRootRelationshipsXml();
-    const appXml = buildAppXml(workbookSheetNames, properties);
+    const appXml = buildAppXml(workbookSheetNames, sortedSheets.map((sheet) => sheet.type === "chartsheet"), properties);
     const coreXml = buildCoreXml(properties);
+    // Table parts register dxfs (colour filters, colour sort levels), so they
+    // are built before styles.xml is serialized.
+    const tablePartFiles = {};
+    for (const table of preparedTables) {
+        const rows = getRowsForSheet(sheetData, table.sheetId);
+        const tableXml = buildTableXml(table, rows, sourceSharedStrings, styleBuilder, customTableStyleNames);
+        if (tableXml) {
+            tablePartFiles[table.path] = encodeXml(tableXml);
+        }
+    }
     const stylesXml = styleBuilder.toXml();
     const themeXml = theme ? generateThemeXml(theme) : theme1Xml;
     const files = {
@@ -317,13 +371,7 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
     if (personsXml) {
         files["xl/persons/person.xml"] = encodeXml(personsXml);
     }
-    for (const table of preparedTables) {
-        const rows = getRowsForSheet(sheetData, table.sheetId);
-        const tableXml = buildTableXml(table, rows, sourceSharedStrings, styleBuilder);
-        if (tableXml) {
-            files[table.path] = encodeXml(tableXml);
-        }
-    }
+    Object.assign(files, tablePartFiles);
     let globalImageIndex = 1;
     let globalChartIndex = 1;
     const drawingSheets = [];
@@ -356,6 +404,7 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
             charts: chartsForSheet,
             slicers: slicersForSheet,
             sheetNameById,
+            resolvePivotSourceName,
         });
         if (!drawingParts)
             continue;
@@ -425,7 +474,8 @@ export const createExcelFile = async ({ conditionalFormats: _conditionalFormats,
         .filter((entry) => entry.threadedCommentsXml)
         .map((entry) => entry.sheet.sheetId ?? entry.index + 1);
     const contentTypesXml = buildContentTypesXml({
-        sheetCount: worksheetEntries.length,
+        worksheetCount,
+        chartsheetCount,
         tableCount: preparedTables.length,
         drawingSheets,
         mediaExtensions: Array.from(imageExtensions),
@@ -929,6 +979,27 @@ const buildWorksheetXml = ({ sheet, rows, sharedStrings, sourceSharedStrings, ce
         threadedCommentsXml,
     };
 };
+/**
+ * `CT_Chartsheet` — a sheet tab whose whole body is one chart and that has no
+ * cells (#668 C-17). Children in schema order: `sheetPr` (tab colour only),
+ * `sheetViews`, `pageMargins`, `drawing`. The chart itself rides the sheet's
+ * drawing part as an `absoluteAnchor`, like every other chart.
+ */
+const buildChartsheetXml = ({ sheet, relationships, drawingContext, }) => {
+    const tabColor = serializeColorXml(sheet.tabColor ?? undefined);
+    const sheetPrXml = tabColor ? `<sheetPr><tabColor ${tabColor}/></sheetPr>` : "";
+    const drawingXml = drawingContext.hasDrawing()
+        ? `<drawing r:id="${drawingContext.relId}"/>`
+        : "";
+    return {
+        xml: `${XML_DECLARATION}<chartsheet xmlns="${WORKSHEET_NS}" xmlns:r="${REL_NS}">${sheetPrXml}<sheetViews><sheetView workbookViewId="0" zoomToFit="1"/></sheetViews>${buildPageMarginsXml(sheet.printSettings)}${drawingXml}</chartsheet>`,
+        relationshipsXml: relationships.toXml(),
+        images: [],
+        commentsXml: undefined,
+        vmlDrawingXml: undefined,
+        threadedCommentsXml: undefined,
+    };
+};
 /**
  * Build combined extLst XML for worksheet (sparklines + slicers)
  */
@@ -1015,6 +1086,109 @@ const normalizeMergeRanges = (ranges) => {
     }
     return valid;
 };
+/** Escape `"` as `""` inside a formula string literal. */
+const escapeFormulaText = (value) => value.replace(/"/g, '""');
+// `xlsxSource` is meant to hold the verbatim OOXML representation, but
+// writers other than the importer have filled it from Excel's JavaScript-API
+// vocabulary: a bare `list.source` literal (`On track,Watch,Off track`),
+// PascalCase operators (`Between`), PascalCase types (`WholeNumber`) and
+// `=`-prefixed formulas. Excel opens a file carrying any of those in repair
+// mode and drops the rule, so the exporter normalizes every field before
+// replaying it, and a type / operator that is not an OOXML token even after
+// normalization (`undefined` below) is never replayed — the rule falls
+// through to the condition synthesizer. Twin of `normalize_source_*` in
+// `rust/crates/rnc-export/src/xlsx/datavalidation.rs` — keep the two in sync
+// so both engines emit identical XML.
+const normalizeXlsxSourceType = (type) => {
+    switch (type.trim().toLowerCase()) {
+        case "list":
+            return "list";
+        case "whole":
+        case "wholenumber":
+            return "whole";
+        case "decimal":
+            return "decimal";
+        case "date":
+            return "date";
+        case "time":
+            return "time";
+        case "textlength":
+            return "textLength";
+        case "custom":
+            return "custom";
+        default:
+            return undefined;
+    }
+};
+const normalizeXlsxSourceOperator = (operator) => {
+    switch (operator.trim().toLowerCase()) {
+        case "between":
+            return "between";
+        case "notbetween":
+            return "notBetween";
+        case "equal":
+        case "equalto":
+            return "equal";
+        case "notequal":
+        case "notequalto":
+            return "notEqual";
+        case "greaterthan":
+            return "greaterThan";
+        case "lessthan":
+            return "lessThan";
+        case "greaterthanorequal":
+        case "greaterthanorequalto":
+            return "greaterThanOrEqual";
+        case "lessthanorequal":
+        case "lessthanorequalto":
+            return "lessThanOrEqual";
+        default:
+            return undefined;
+    }
+};
+// OOXML `<formula1>` text never carries the leading `=` a formula-style
+// source (`=Sheet1!$A$1:$A$5`) has.
+const stripLeadingEquals = (formula) => {
+    const trimmed = formula.trim();
+    return trimmed.startsWith("=") ? trimmed.slice(1) : trimmed;
+};
+// One identifier token — `[A-Za-z_\\][A-Za-z0-9_.]*` — which is what a
+// defined name (`StatusList`, `My_List.v2`) or a single A1 cell (`A1`) looks
+// like; a word list with commas or spaces is not one.
+const XLSX_IDENTIFIER_TOKEN = /^[A-Za-z_\\][A-Za-z0-9_.]*$/;
+// A single A1 cell token: 1–3 letters followed by digits.
+const XLSX_A1_CELL_TOKEN = /^[A-Za-z]{1,3}[0-9]+$/;
+// A function call — `OFFSET(…)`, `INDIRECT(…)` — which Excel writes without
+// a leading `=`.
+const XLSX_FUNCTION_CALL = /^[A-Za-z_\\][A-Za-z0-9_.]*\(.*\)$/;
+// `true` when a list source reads as a reference / formula rather than as
+// list text: it carries a reference marker (`!` sheet qualifier, `:` range,
+// `$` absolute anchor, `[` structured / external ref), is a single A1 cell
+// or defined-name token, or is a function call. Anything else — comma lists,
+// text with spaces, digit-only entries — is a bare literal that Excel only
+// accepts quoted.
+const looksLikeXlsxListReference = (text) => text.length > 0 &&
+    (/[!:$[]/.test(text) ||
+        XLSX_A1_CELL_TOKEN.test(text) ||
+        XLSX_IDENTIFIER_TOKEN.test(text) ||
+        XLSX_FUNCTION_CALL.test(text));
+// A `list` source is valid OOXML only as a quoted string literal (`"a,b"`)
+// or a reference (`$A$1:$A$5`, `Sheet1!$A$1:$A$5`, `StatusList`, `OFFSET(…)`).
+// Excel's API hands back a literal list as bare comma-separated text and a
+// reference with a leading `=`, so: quoted → verbatim, `=`-prefixed → the `=`
+// is stripped and the rest replayed verbatim, reference-like → verbatim,
+// anything else → a literal that must be quoted (with `"` doubled inside, as
+// the ONE_OF_LIST branch does).
+const normalizeXlsxSourceListFormula1 = (formula1) => {
+    const trimmed = formula1.trim();
+    if (trimmed.startsWith('"'))
+        return trimmed;
+    if (trimmed.startsWith("="))
+        return trimmed.slice(1).trim();
+    if (looksLikeXlsxListReference(trimmed))
+        return trimmed;
+    return `"${escapeFormulaText(trimmed)}"`;
+};
 const convertDataValidationRule = (rule) => {
     if (!rule)
         return undefined;
@@ -1032,20 +1206,58 @@ const convertDataValidationRule = (rule) => {
         prompt: inputMessage?.message ?? undefined,
     };
     // Round-trip path: when the rule was imported from xlsx, replay the
-    // verbatim source representation. Preserves type/operator/formulas
-    // exactly, including `whole`/`textLength`/`time` types and user-written
-    // custom formulas without `INDIRECT("RC",FALSE)` rewriting.
+    // source representation after normalizing it to OOXML vocabulary (see
+    // `normalizeXlsxSource*`). Preserves type/operator/formulas, including
+    // `whole`/`textLength`/`time` types and user-written custom formulas
+    // without `INDIRECT("RC",FALSE)` rewriting. A type / operator that is not
+    // an OOXML token even after normalization (Excel's `Inconsistent`,
+    // `MixedCriteria`) is never written: the rule falls through to the
+    // condition synthesizer.
     const src = rule.xlsxSource;
+    let rejectedListSource;
     if (src && src.type && typeof src.formula1 === "string" && src.formula1) {
+        const type = normalizeXlsxSourceType(src.type);
+        const operator = src.operator
+            ? normalizeXlsxSourceOperator(src.operator)
+            : undefined;
+        const operatorValid = !src.operator || operator !== undefined;
+        if (type !== undefined && operatorValid) {
+            const formula1 = type === "list"
+                ? normalizeXlsxSourceListFormula1(src.formula1)
+                : stripLeadingEquals(src.formula1);
+            return {
+                type,
+                operator,
+                formula1,
+                formula2: src.formula2 ? stripLeadingEquals(src.formula2) : undefined,
+                showDropDown: type === "list" && rule.displayStyle === "plain" ? true : undefined,
+                ...baseConfig,
+            };
+        }
+        if (type === "list") {
+            rejectedListSource = normalizeXlsxSourceListFormula1(src.formula1);
+        }
+    }
+    const synthesized = convertDataValidationCondition(rule, baseConfig);
+    if (synthesized)
+        return synthesized;
+    // A rejected `list` source with no usable condition is still kept — its
+    // normalized source text (quoted literal or reference) is always valid
+    // OOXML. Anything else rejected has nothing valid to write and is skipped.
+    if (rejectedListSource !== undefined) {
         return {
-            type: src.type,
-            operator: src.operator,
-            formula1: src.formula1,
-            formula2: src.formula2,
-            showDropDown: src.type === "list" && rule.displayStyle === "plain" ? true : undefined,
+            type: "list",
+            formula1: rejectedListSource,
+            showDropDown: rule.displayStyle === "plain" ? true : undefined,
             ...baseConfig,
         };
     }
+    return undefined;
+};
+// The condition-based synthesizer: the Excel config for a rule that has no
+// replayable `xlsxSource` (UI-authored, edited after import, or rejected by
+// the round-trip guard above).
+const convertDataValidationCondition = (rule, baseConfig) => {
     if (!rule.condition?.type) {
         // Prompt-only DV (no validation rule, just an input-message tooltip
         // and/or an error alert). Emit it with no type/formula so Excel still
@@ -1058,7 +1270,6 @@ const convertDataValidationRule = (rule) => {
     const { condition } = rule;
     const values = condition.values ?? [];
     const currentCell = 'INDIRECT("RC",FALSE)';
-    const escapeFormulaText = (value) => value.replace(/"/g, '""');
     const ensureFormula = (value) => value.startsWith("=") ? value : `=${value}`;
     const ifErrorWrap = (formula) => `IFERROR(${formula},TRUE)`;
     if (condition.type === "ONE_OF_LIST") {
@@ -2360,7 +2571,7 @@ const resolveTableColumnTotals = (column, totalsCell) => {
     const label = getExtendedValueString(getCellUserEnteredValue(totalsCell));
     return label && label.trim() !== "" ? { totalsRowLabel: label } : undefined;
 };
-const buildTableXml = (table, rows, sourceSharedStrings, styleBuilder) => {
+const buildTableXml = (table, rows, sourceSharedStrings, styleBuilder, customTableStyleNames) => {
     const rangeRef = table.ref;
     const columnCount = Math.max(table.columns?.length ?? 0, (table.range.endColumnIndex ?? table.range.startColumnIndex) -
         table.range.startColumnIndex +
@@ -2434,17 +2645,71 @@ const buildTableXml = (table, rows, sourceSharedStrings, styleBuilder) => {
     })
         .join("")}</tableColumns>`;
     const isBuiltInStyle = table.theme && /^TableStyle(Light|Medium|Dark)\d+$/.test(table.theme);
-    const tableStyleName = isBuiltInStyle ? table.theme : "TableStyleMedium2";
+    // A custom style written to `<tableStyles>` keeps its name here (#668 T-103).
+    const isCustomStyle = !!table.theme && (customTableStyleNames?.has(table.theme) ?? false);
+    const tableStyleName = isBuiltInStyle || isCustomStyle ? table.theme : "TableStyleMedium2";
     const tableStyleInfo = `<tableStyleInfo name="${tableStyleName}" showFirstColumn="${table.showFirstColumn ? 1 : 0}" showLastColumn="${table.showLastColumn ? 1 : 0}" showRowStripes="${table.showRowStripes ? 1 : 0}" showColumnStripes="${table.showColumnStripes ? 1 : 0}"/>`;
+    // Excel's per-column "filter button" toggle: `<filterColumn hiddenButton="1">`
+    // (the table-level toggle is the presence of `<autoFilter>` itself).
+    const hiddenButtonColumns = new Set(columnNames
+        .map((_, idx) => idx)
+        .filter((idx) => table.columns?.[idx]?.filterButton === false));
     const autoFilter = headerRowCount > 0 && table.filterButton !== false
         ? (() => {
-            const filterColumns = buildFilterColumnsXml(table.filterSpecs ?? [], table.range, rows, table.headerRow ?? true, table.totalRow ?? false, styleBuilder);
+            const filterColumns = buildFilterColumnsXml(table.filterSpecs ?? [], table.range, rows, table.headerRow ?? true, table.totalRow ?? false, styleBuilder, hiddenButtonColumns);
             return filterColumns
                 ? `<autoFilter ref="${rangeRef}">${filterColumns}</autoFilter>`
                 : `<autoFilter ref="${rangeRef}"/>`;
         })()
         : "";
-    return `${XML_DECLARATION}<table xmlns="${WORKSHEET_NS}" id="${table.id}" name="${escapeXmlAttr(table.name)}" displayName="${escapeXmlAttr(table.displayName)}" ref="${rangeRef}" totalsRowCount="${totalsRowCount}" headerRowCount="${headerRowCount}">${autoFilter}${tableColumns}${tableStyleInfo}</table>`;
+    const sortState = buildTableSortStateXml(table, headerRowCount, totalsRowCount, styleBuilder);
+    return `${XML_DECLARATION}<table xmlns="${WORKSHEET_NS}" id="${table.id}" name="${escapeXmlAttr(table.name)}" displayName="${escapeXmlAttr(table.displayName)}" ref="${rangeRef}" totalsRowCount="${totalsRowCount}" headerRowCount="${headerRowCount}">${autoFilter}${sortState}${tableColumns}${tableStyleInfo}</table>`;
+};
+/**
+ * A table's persisted sort levels as `<sortState ref="<body>">` with one
+ * `<sortCondition>` per level (`CT_SortCondition`: `ref` is the level's
+ * column over the body rows, `descending`, `sortBy` + `dxfId` for a colour
+ * level, `sortBy="icon"` + `iconSet`/`iconId`, and Excel's comma-joined
+ * `customList`). Sits between `<autoFilter>` and `<tableColumns>` per
+ * `CT_Table`. The inverse of the parser's `createSortSpecsFromSortState`.
+ */
+const buildTableSortStateXml = (table, headerRowCount, totalsRowCount, styleBuilder) => {
+    const sortSpecs = table.sortSpecs ?? [];
+    const bodyStartRow = table.range.startRowIndex + headerRowCount;
+    const bodyEndRow = table.range.endRowIndex - totalsRowCount;
+    if (!sortSpecs.length || bodyEndRow < bodyStartRow)
+        return "";
+    const bodyRef = (startColumnIndex, endColumnIndex) => cellRangeToAddress(undefined, {
+        startRowIndex: bodyStartRow,
+        endRowIndex: bodyEndRow,
+        startColumnIndex,
+        endColumnIndex,
+    });
+    const conditions = sortSpecs.map((spec) => {
+        const columnIndex = table.range.startColumnIndex + spec.dimensionIndex;
+        const attrs = [`ref="${bodyRef(columnIndex, columnIndex)}"`];
+        if (spec.sortOrder === "DESCENDING")
+            attrs.push(`descending="1"`);
+        const sortBy = spec.sortBy ?? "value";
+        if (sortBy === "cellColor" || sortBy === "fontColor") {
+            attrs.push(`sortBy="${sortBy}"`);
+            const dxfId = spec.sortColor && styleBuilder
+                ? styleBuilder.registerDifferentialFormat(sortBy === "cellColor"
+                    ? { backgroundColor: spec.sortColor }
+                    : { textFormat: { color: spec.sortColor } })
+                : undefined;
+            if (typeof dxfId === "number")
+                attrs.push(`dxfId="${dxfId}"`);
+        }
+        else if (sortBy === "icon" && spec.sortIcon) {
+            attrs.push(`sortBy="icon"`, `iconSet="${escapeXmlAttr(spec.sortIcon.iconSet)}"`, `iconId="${spec.sortIcon.iconId ?? 0}"`);
+        }
+        if (spec.customList?.length) {
+            attrs.push(`customList="${escapeXmlAttr(spec.customList.join(","))}"`);
+        }
+        return `<sortCondition ${attrs.join(" ")}/>`;
+    });
+    return `<sortState ref="${bodyRef(table.range.startColumnIndex, table.range.endColumnIndex)}">${conditions.join("")}</sortState>`;
 };
 const getFilterVisibleValues = (spec, range, rows, headerRow = true, totalRow = false) => {
     const values = new Set();
@@ -2615,6 +2880,12 @@ const xmlNumAttr = (name, value) => typeof value === "number" && Number.isFinite
  * mandatory in practice (Excel always writes it), so the default margins go
  * out when the sheet has none of its own.
  */
+const buildPageMarginsXml = (print) => {
+    const margins = print?.pageMargins;
+    return margins && Object.values(margins).some((v) => typeof v === "number")
+        ? `<pageMargins left="${margins.left ?? 0.7}" right="${margins.right ?? 0.7}" top="${margins.top ?? 0.75}" bottom="${margins.bottom ?? 0.75}" header="${margins.header ?? 0.3}" footer="${margins.footer ?? 0.3}"/>`
+        : DEFAULT_PAGE_MARGINS;
+};
 const buildPrintSettingsXml = (print) => {
     const parts = [];
     const options = print?.printOptions;
@@ -2624,11 +2895,7 @@ const buildPrintSettingsXml = (print) => {
         xmlBoolAttr("gridLines", options?.gridLines);
     if (optionAttrs)
         parts.push(`<printOptions${optionAttrs}/>`);
-    const margins = print?.pageMargins;
-    parts.push(margins &&
-        Object.values(margins).some((v) => typeof v === "number")
-        ? `<pageMargins left="${margins.left ?? 0.7}" right="${margins.right ?? 0.7}" top="${margins.top ?? 0.75}" bottom="${margins.bottom ?? 0.75}" header="${margins.header ?? 0.3}" footer="${margins.footer ?? 0.3}"/>`
-        : DEFAULT_PAGE_MARGINS);
+    parts.push(buildPageMarginsXml(print));
     const setup = print?.pageSetup;
     if (setup) {
         // Excel keeps `firstPageNumber` as a dormant value until the user picks
@@ -2693,13 +2960,27 @@ const buildPrintSettingsXml = (print) => {
     }
     return parts.join("");
 };
-const buildFilterColumnsXml = (filterSpecs, range, rows, headerRow = true, totalRow = false, styleBuilder) => {
-    if (!filterSpecs?.length)
-        return "";
-    const entries = filterSpecs
-        .map((spec) => buildFilterColumnXml(spec, range, rows, headerRow, totalRow, styleBuilder))
-        .filter((entry) => Boolean(entry));
-    return entries.join("");
+const buildFilterColumnsXml = (filterSpecs, range, rows, headerRow = true, totalRow = false, styleBuilder, 
+/** Table-relative column ids whose header hides its filter button. */
+hiddenButtonColumns) => {
+    const entries = new Map();
+    for (const spec of filterSpecs ?? []) {
+        const xml = buildFilterColumnXml(spec, range, rows, headerRow, totalRow, styleBuilder);
+        if (xml)
+            entries.set(spec.columnIndex, xml);
+    }
+    // `hiddenButton="1"` rides the column's criteria element when it has one,
+    // else a bare `<filterColumn/>` carries it.
+    hiddenButtonColumns?.forEach((colId) => {
+        const existing = entries.get(colId);
+        entries.set(colId, existing
+            ? existing.replace(`<filterColumn colId="${colId}">`, `<filterColumn colId="${colId}" hiddenButton="1">`)
+            : `<filterColumn colId="${colId}" hiddenButton="1"/>`);
+    });
+    return [...entries.entries()]
+        .sort(([a], [b]) => a - b)
+        .map(([, xml]) => xml)
+        .join("");
 };
 const buildFilterColumnXml = (spec, range, rows, headerRow = true, totalRow = false, styleBuilder) => {
     const parts = [];
@@ -2728,7 +3009,9 @@ const buildFilterColumnXml = (spec, range, rows, headerRow = true, totalRow = fa
     // above-average …) takes precedence over a value-list and is emitted as
     // <customFilters> or <dynamicFilter>. Falls back to the value list when the
     // condition has no AutoFilter representation.
-    const conditionXml = buildAutoFilterConditionXml(spec.filterCriteria?.condition);
+    const conditionXml = spec.filterCriteria
+        ? buildAutoFilterCriteriaXml(spec.filterCriteria)
+        : null;
     if (conditionXml) {
         parts.push(conditionXml);
     }
@@ -2758,9 +3041,9 @@ const gridRangeToRef = (range) => {
         return undefined;
     }
 };
-const groupEmbedsBySheet = (embeds) => {
+const groupEmbedsBySheet = (embeds, chartCount) => {
     const result = new Map();
-    (embeds ?? []).forEach((embed, order) => {
+    (embeds ?? []).forEach((embed, index) => {
         if (!embed.position?.overlayPosition)
             return;
         if (embed.spec?.type !== "image")
@@ -2779,13 +3062,14 @@ const groupEmbedsBySheet = (embeds) => {
             adjustments: Object.values(adjustments).some((v) => v !== undefined)
                 ? adjustments
                 : undefined,
-            order,
+            order: embed.position.zOrder ?? chartCount + index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
             offsetX: overlay.offsetXPixels ?? 0,
             offsetY: overlay.offsetYPixels ?? 0,
             width: overlay.widthPixels ?? 120,
             height: overlay.heightPixels ?? 120,
+            overlay,
         };
         const list = result.get(embed.position.sheetId) ?? [];
         list.push(placement);
@@ -2793,9 +3077,9 @@ const groupEmbedsBySheet = (embeds) => {
     });
     return result;
 };
-const groupTextBoxesBySheet = (embeds) => {
+const groupTextBoxesBySheet = (embeds, chartCount) => {
     const result = new Map();
-    (embeds ?? []).forEach((embed, order) => {
+    (embeds ?? []).forEach((embed, index) => {
         if (!embed.position?.overlayPosition)
             return;
         if (embed.spec?.type !== "textbox")
@@ -2803,7 +3087,7 @@ const groupTextBoxesBySheet = (embeds) => {
         const overlay = embed.position.overlayPosition;
         const placement = {
             textBox: embed,
-            order,
+            order: embed.position.zOrder ?? chartCount + index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
             offsetX: overlay.offsetXPixels ?? 0,
@@ -2818,9 +3102,9 @@ const groupTextBoxesBySheet = (embeds) => {
     return result;
 };
 /** Form-control embeds (`spec.type === "formControl"`) by sheet, in host order. */
-const groupFormControlsBySheet = (embeds) => {
+const groupFormControlsBySheet = (embeds, chartCount) => {
     const result = new Map();
-    (embeds ?? []).forEach((embed, order) => {
+    (embeds ?? []).forEach((embed, index) => {
         if (!embed.position?.overlayPosition)
             return;
         if (embed.spec?.type !== "formControl")
@@ -2828,7 +3112,7 @@ const groupFormControlsBySheet = (embeds) => {
         const overlay = embed.position.overlayPosition;
         const placement = {
             shape: embed,
-            order,
+            order: embed.position.zOrder ?? chartCount + index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
             offsetX: overlay.offsetXPixels ?? 0,
@@ -2883,18 +3167,33 @@ const buildSheetFormControls = ({ sheet, controls, relationships, ctrlProps, zIn
         const heightPx = Math.max(5, placement.height ?? 20);
         const columnSize = (index) => getColumnWidthPx(sheet, index, true);
         const rowSize = (index) => getRowHeightPx(sheet, index, true);
-        const toColumn = resolveAnchorEndpoint({
-            startIndex: fromColumn,
-            startOffset: offsetX,
-            span: widthPx,
-            getSize: columnSize,
-        });
-        const toRow = resolveAnchorEndpoint({
-            startIndex: fromRow,
-            startOffset: offsetY,
-            span: heightPx,
-            getSize: rowSize,
-        });
+        // A "Move and size" control keeps its persisted second anchor (#668 C-46)
+        const overlay = placement.shape.position?.overlayPosition;
+        const persistedTo = controlAnchorFlags(spec, overlay).sizeWithCells && overlay?.toCell
+            ? overlay.toCell
+            : undefined;
+        const toColumn = persistedTo
+            ? {
+                index: Math.max(0, persistedTo.columnIndex - 1),
+                offset: Math.max(0, overlay?.toOffsetXPixels ?? 0),
+            }
+            : resolveAnchorEndpoint({
+                startIndex: fromColumn,
+                startOffset: offsetX,
+                span: widthPx,
+                getSize: columnSize,
+            });
+        const toRow = persistedTo
+            ? {
+                index: Math.max(0, persistedTo.rowIndex - 1),
+                offset: Math.max(0, overlay?.toOffsetYPixels ?? 0),
+            }
+            : resolveAnchorEndpoint({
+                startIndex: fromRow,
+                startOffset: offsetY,
+                span: heightPx,
+                getSize: rowSize,
+            });
         const partIndex = ctrlProps.parts.length + 1;
         const path = `xl/ctrlProps/ctrlProp${partIndex}.xml`;
         ctrlProps.parts.push({ path, xml: buildCtrlPropXml(spec) });
@@ -2916,11 +3215,13 @@ const buildSheetFormControls = ({ sheet, controls, relationships, ctrlProps, zIn
                 row: toRow.index,
                 rowOff: toRow.offset * EMUS_PER_PIXEL,
             },
+            overlay,
         }));
         vmlShapes.push(buildFormControlVmlShape({
             spec,
             shapeId,
             zIndex: zIndexStart + position + 1,
+            overlay,
             geometry: {
                 leftPx: sumSizes(fromColumn, columnSize) + offsetX,
                 topPx: sumSizes(fromRow, rowSize) + offsetY,
@@ -2941,9 +3242,9 @@ const buildSheetFormControls = ({ sheet, controls, relationships, ctrlProps, zIn
     });
     return { controlsXml: buildControlsXml(controlElements), vmlShapes };
 };
-const groupShapesBySheet = (embeds) => {
+const groupShapesBySheet = (embeds, chartCount) => {
     const result = new Map();
-    (embeds ?? []).forEach((embed, order) => {
+    (embeds ?? []).forEach((embed, index) => {
         if (!embed.position?.overlayPosition)
             return;
         if (embed.spec?.type !== "shape")
@@ -2951,7 +3252,7 @@ const groupShapesBySheet = (embeds) => {
         const overlay = embed.position.overlayPosition;
         const placement = {
             shape: embed,
-            order,
+            order: embed.position.zOrder ?? chartCount + index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
             offsetX: overlay.offsetXPixels ?? 0,
@@ -2967,12 +3268,13 @@ const groupShapesBySheet = (embeds) => {
 };
 const groupChartsBySheet = (charts) => {
     const result = new Map();
-    for (const chart of charts ?? []) {
+    (charts ?? []).forEach((chart, index) => {
         const overlay = chart.position?.overlayPosition;
         if (!overlay)
-            continue;
+            return;
         const placement = {
             chart,
+            order: chart.position.zOrder ?? index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
             offsetX: overlay.offsetXPixels ?? 0,
@@ -2983,7 +3285,7 @@ const groupChartsBySheet = (charts) => {
         const list = result.get(chart.position.sheetId) ?? [];
         list.push(placement);
         result.set(chart.position.sheetId, list);
-    }
+    });
     return result;
 };
 const groupSlicersBySheet = (slicers) => {
@@ -3554,7 +3856,7 @@ const buildConditionalFormattingRuleXml = ({ rule, styleBuilder, priority, baseC
         rules.push(dataBarXml);
     return rules.length ? rules : undefined;
 };
-const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImageIndex, startChartIndex, startChartExIndex = 1, charts, slicers, sheet, sheetNameById, }) => {
+const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImageIndex, startChartIndex, startChartExIndex = 1, charts, slicers, sheet, sheetNameById, resolvePivotSourceName, }) => {
     if (!placements.length &&
         !textBoxes.length &&
         !shapes.length &&
@@ -3571,6 +3873,12 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
     let frameId = 1;
     const chartEntries = [];
     const chartExEntries = [];
+    // Charts and embeds (text boxes, shapes, images) are written back-to-front
+    // by their shared z-order — anchor order IS Excel's z-order, so a picture
+    // sent behind a chart must be emitted before it regardless of kind.
+    // Placements without an order (in-cell images) go last, in their own order.
+    const orderedAnchors = [];
+    const orderOf = (order) => order ?? Number.MAX_SAFE_INTEGER;
     for (const placement of charts) {
         if (isChartExType(placement.chart.spec.chartType)) {
             // Treemap / sunburst live in a chartex part with an mc:AlternateContent anchor.
@@ -3578,7 +3886,16 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
             if (!chartExXml)
                 continue;
             const relId = relationships.add(CHART_EX_REL_TYPE, `../charts/chartEx${chartExIndex}.xml`);
-            anchors.push(createChartAnchor({ sheet, placement, relId, frameId, chartEx: true }));
+            orderedAnchors.push({
+                order: placement.order,
+                xml: createChartAnchor({
+                    sheet,
+                    placement,
+                    relId,
+                    frameId,
+                    chartEx: true,
+                }),
+            });
             chartExEntries.push({
                 path: `xl/charts/chartEx${chartExIndex}.xml`,
                 xml: chartExXml,
@@ -3587,16 +3904,19 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
             frameId += 1;
             continue;
         }
-        const chartXml = buildChartXml(placement.chart, sheetNameById);
+        const chartXml = buildChartXml(placement.chart, sheetNameById, resolvePivotSourceName);
         if (!chartXml)
             continue;
         const relId = relationships.add(CHART_REL_TYPE, `../charts/chart${chartIndex}.xml`);
-        anchors.push(createChartAnchor({
-            sheet,
-            placement,
-            relId,
-            frameId,
-        }));
+        orderedAnchors.push({
+            order: placement.order,
+            xml: createChartAnchor({
+                sheet,
+                placement,
+                relId,
+                frameId,
+            }),
+        });
         chartEntries.push({
             path: `xl/charts/chart${chartIndex}.xml`,
             xml: chartXml,
@@ -3612,14 +3932,8 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
         }));
         frameId += 1;
     }
-    // Embeds (text boxes, shapes, images) keep the host's `embeds` order in the
-    // drawing part — anchor order IS Excel's z-order, so an image drawn over a
-    // shape must be emitted after it regardless of kind. Placements without an
-    // order (in-cell images) go last, in their own order.
-    const embedAnchors = [];
-    const orderOf = (order) => order ?? Number.MAX_SAFE_INTEGER;
     for (const placement of textBoxes) {
-        embedAnchors.push({
+        orderedAnchors.push({
             order: orderOf(placement.order),
             xml: createTextBoxAnchor({
                 sheet,
@@ -3630,7 +3944,7 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
         frameId += 1;
     }
     for (const placement of shapes) {
-        embedAnchors.push({
+        orderedAnchors.push({
             order: orderOf(placement.order),
             xml: createShapeAnchor({
                 sheet,
@@ -3654,7 +3968,7 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
             extension: buffer.extension,
         });
         const relId = relationships.add(IMAGE_REL_TYPE, `../media/image${imageIndex}.${buffer.extension}`);
-        embedAnchors.push({
+        orderedAnchors.push({
             order: orderOf(placement.order),
             xml: createTwoCellAnchor({
                 sheet,
@@ -3666,8 +3980,8 @@ const buildDrawingParts = async ({ placements, textBoxes, shapes = [], startImag
         imageIndex += 1;
         pictureId += 1;
     }
-    embedAnchors.sort((a, b) => a.order - b.order);
-    for (const entry of embedAnchors)
+    orderedAnchors.sort((a, b) => a.order - b.order);
+    for (const entry of orderedAnchors)
         anchors.push(entry.xml);
     const drawingXml = `${XML_DECLARATION}<xdr:wsDr xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="${REL_NS}">${anchors.join("")}</xdr:wsDr>`;
     return {
@@ -3690,25 +4004,21 @@ const createTwoCellAnchor = ({ placement, relId, pictureId, sheet, }) => {
     const defaultHeight = placement.kind === "cell" ? getRowHeightPx(sheet, fromRow) : 120;
     const widthPx = Math.max(5, placement.width ?? defaultWidth);
     const heightPx = Math.max(5, placement.height ?? defaultHeight);
-    const toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: (index) => getColumnWidthPx(sheet, index, true),
-    });
-    const toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: (index) => getRowHeightPx(sheet, index, true),
-    });
-    const fromXml = `<xdr:from><xdr:col>${fromColumn}</xdr:col><xdr:colOff>${Math.round(offsetX * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${fromRow}</xdr:row><xdr:rowOff>${Math.round(offsetY * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:from>`;
-    const toXml = `<xdr:to><xdr:col>${toColumn.index}</xdr:col><xdr:colOff>${Math.round(toColumn.offset * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${toRow.index}</xdr:row><xdr:rowOff>${Math.round(toRow.offset * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:to>`;
     const { blipChildren, srcRectXml } = buildPictureAdjustmentsXml(placement.adjustments);
     const blipXml = blipChildren
         ? `<a:blip r:embed="${relId}">${blipChildren}</a:blip>`
         : `<a:blip r:embed="${relId}"/>`;
-    return `<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}<xdr:pic><xdr:nvPicPr><xdr:cNvPr id="${pictureId}" name="Picture ${pictureId}"/><xdr:cNvPicPr/></xdr:nvPicPr><xdr:blipFill>${blipXml}${srcRectXml}<a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(widthPx * EMUS_PER_PIXEL)}" cy="${Math.round(heightPx * EMUS_PER_PIXEL)}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic><xdr:clientData/></xdr:twoCellAnchor>`;
+    return buildDrawingAnchorXml({
+        sheet,
+        overlay: placement.overlay,
+        fromRow,
+        fromColumn,
+        offsetX,
+        offsetY,
+        widthPx,
+        heightPx,
+        body: `<xdr:pic><xdr:nvPicPr><xdr:cNvPr id="${pictureId}" name="Picture ${pictureId}"/><xdr:cNvPicPr/></xdr:nvPicPr><xdr:blipFill>${blipXml}${srcRectXml}<a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(widthPx * EMUS_PER_PIXEL)}" cy="${Math.round(heightPx * EMUS_PER_PIXEL)}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic>`,
+    });
 };
 /** Fraction (0…1) → DrawingML per-mille percent (100000 = 100%). */
 const fractionToPct = (value) => Math.round(Math.max(-1, Math.min(1, value)) * 100000);
@@ -3759,29 +4069,30 @@ const createChartAnchor = ({ placement, relId, frameId, sheet, chartEx = false,
     const offsetY = Math.max(0, placement.offsetY ?? 0);
     const widthPx = Math.max(5, placement.width ?? 300);
     const heightPx = Math.max(5, placement.height ?? 200);
-    const toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: (index) => getColumnWidthPx(sheet, index, true),
-    });
-    const toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: (index) => getRowHeightPx(sheet, index, true),
-    });
-    const fromXml = `<xdr:from><xdr:col>${fromColumn}</xdr:col><xdr:colOff>${Math.round(offsetX * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${fromRow}</xdr:row><xdr:rowOff>${Math.round(offsetY * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:from>`;
-    const toXml = `<xdr:to><xdr:col>${toColumn.index}</xdr:col><xdr:colOff>${Math.round(toColumn.offset * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${toRow.index}</xdr:row><xdr:rowOff>${Math.round(toRow.offset * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:to>`;
-    if (chartEx) {
-        return `<xdr:twoCellAnchor>${fromXml}${toXml}${buildChartExGraphicFrameXml({
+    const body = chartEx
+        ? buildChartExGraphicFrameXml({
             relId,
             frameId,
             widthEmu: Math.round(widthPx * EMUS_PER_PIXEL),
             heightEmu: Math.round(heightPx * EMUS_PER_PIXEL),
-        })}<xdr:clientData/></xdr:twoCellAnchor>`;
-    }
-    return `<xdr:twoCellAnchor>${fromXml}${toXml}<xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id="${frameId}" name="Chart ${frameId}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(widthPx * EMUS_PER_PIXEL)}" cy="${Math.round(heightPx * EMUS_PER_PIXEL)}"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="${REL_NS}" r:id="${relId}"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor>`;
+        })
+        : `<xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id="${frameId}" name="Chart ${frameId}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(widthPx * EMUS_PER_PIXEL)}" cy="${Math.round(heightPx * EMUS_PER_PIXEL)}"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="${REL_NS}" r:id="${relId}"/></a:graphicData></a:graphic></xdr:graphicFrame>`;
+    const overlay = placement.chart.position?.overlayPosition;
+    return buildDrawingAnchorXml({
+        sheet,
+        // A chartsheet has no cells to anchor to: Excel only reads an
+        // `absoluteAnchor` there, whatever placement the chart carries.
+        overlay: sheet.type === "chartsheet" && overlay
+            ? { ...overlay, placement: "absolute" }
+            : overlay,
+        fromRow,
+        fromColumn,
+        offsetX,
+        offsetY,
+        widthPx,
+        heightPx,
+        body,
+    });
 };
 const createSlicerAnchor = ({ placement, frameId, sheet, }) => {
     const fromRow = Math.max(0, placement.rowIndex - 1);
@@ -3790,21 +4101,42 @@ const createSlicerAnchor = ({ placement, frameId, sheet, }) => {
     const offsetY = Math.max(0, placement.offsetY ?? 0);
     const widthPx = Math.max(50, placement.width ?? 200);
     const heightPx = Math.max(50, placement.height ?? 200);
-    const toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: (index) => getColumnWidthPx(sheet, index, true),
-    });
-    const toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: (index) => getRowHeightPx(sheet, index, true),
-    });
+    // Excel keeps a slicer in a `twoCellAnchor` whatever its placement and
+    // spells the other two modes as `editAs` (#668 C-46); a "Move and size"
+    // slicer keeps its persisted second anchor.
+    const overlay = placement.overlay;
+    const mode = overlay?.placement ?? "moveAndSize";
+    const persistedTo = mode === "moveAndSize" ? overlay?.toCell : undefined;
+    const editAs = mode === "moveOnly"
+        ? ' editAs="oneCell"'
+        : mode === "absolute"
+            ? ' editAs="absolute"'
+            : "";
+    const toColumn = persistedTo
+        ? {
+            index: Math.max(0, persistedTo.columnIndex - 1),
+            offset: Math.max(0, overlay?.toOffsetXPixels ?? 0),
+        }
+        : resolveAnchorEndpoint({
+            startIndex: fromColumn,
+            startOffset: offsetX,
+            span: widthPx,
+            getSize: (index) => getColumnWidthPx(sheet, index, true),
+        });
+    const toRow = persistedTo
+        ? {
+            index: Math.max(0, persistedTo.rowIndex - 1),
+            offset: Math.max(0, overlay?.toOffsetYPixels ?? 0),
+        }
+        : resolveAnchorEndpoint({
+            startIndex: fromRow,
+            startOffset: offsetY,
+            span: heightPx,
+            getSize: (index) => getRowHeightPx(sheet, index, true),
+        });
     const fromXml = `<xdr:from><xdr:col>${fromColumn}</xdr:col><xdr:colOff>${Math.round(offsetX * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${fromRow}</xdr:row><xdr:rowOff>${Math.round(offsetY * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:from>`;
     const toXml = `<xdr:to><xdr:col>${toColumn.index}</xdr:col><xdr:colOff>${Math.round(toColumn.offset * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${toRow.index}</xdr:row><xdr:rowOff>${Math.round(toRow.offset * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:to>`;
-    return `<xdr:twoCellAnchor editAs="absolute">${fromXml}${toXml}<mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"><mc:Choice xmlns:sle15="http://schemas.microsoft.com/office/drawing/2012/slicer" Requires="sle15"><xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="${frameId}" name="${escapeXmlAttr(placement.title)}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(widthPx * EMUS_PER_PIXEL)}" cy="${Math.round(heightPx * EMUS_PER_PIXEL)}"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.microsoft.com/office/drawing/2010/slicer"><sle:slicer xmlns:sle="http://schemas.microsoft.com/office/drawing/2010/slicer" name="${escapeXmlAttr(placement.title)}"/></a:graphicData></a:graphic></xdr:graphicFrame></mc:Choice></mc:AlternateContent><xdr:clientData/></xdr:twoCellAnchor>`;
+    return `<xdr:twoCellAnchor${editAs}>${fromXml}${toXml}<mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"><mc:Choice xmlns:sle15="http://schemas.microsoft.com/office/drawing/2012/slicer" Requires="sle15"><xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="${frameId}" name="${escapeXmlAttr(placement.title)}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(widthPx * EMUS_PER_PIXEL)}" cy="${Math.round(heightPx * EMUS_PER_PIXEL)}"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.microsoft.com/office/drawing/2010/slicer"><sle:slicer xmlns:sle="http://schemas.microsoft.com/office/drawing/2010/slicer" name="${escapeXmlAttr(placement.title)}"/></a:graphicData></a:graphic></xdr:graphicFrame></mc:Choice></mc:AlternateContent><xdr:clientData/></xdr:twoCellAnchor>`;
 };
 const createTextBoxAnchor = ({ placement, frameId, sheet, }) => {
     const fromRow = Math.max(0, placement.rowIndex - 1);
@@ -3813,24 +4145,20 @@ const createTextBoxAnchor = ({ placement, frameId, sheet, }) => {
     const offsetY = Math.max(0, placement.offsetY ?? 0);
     const widthPx = Math.max(50, placement.width ?? 200);
     const heightPx = Math.max(50, placement.height ?? 60);
-    const toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: (index) => getColumnWidthPx(sheet, index, true),
-    });
-    const toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: (index) => getRowHeightPx(sheet, index, true),
-    });
-    const fromXml = `<xdr:from><xdr:col>${fromColumn}</xdr:col><xdr:colOff>${Math.round(offsetX * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${fromRow}</xdr:row><xdr:rowOff>${Math.round(offsetY * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:from>`;
-    const toXml = `<xdr:to><xdr:col>${toColumn.index}</xdr:col><xdr:colOff>${Math.round(toColumn.offset * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${toRow.index}</xdr:row><xdr:rowOff>${Math.round(toRow.offset * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:to>`;
     const spec = placement.textBox.spec;
     const textBodyXml = buildTextBodyXml(spec);
     const shapePropertiesXml = buildShapePropertiesXml(spec, widthPx, heightPx);
-    return `<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}<xdr:sp><xdr:nvSpPr><xdr:cNvPr id="${frameId}" name="TextBox ${frameId}"/><xdr:cNvSpPr txBox="1"/></xdr:nvSpPr>${shapePropertiesXml}${textBodyXml}</xdr:sp><xdr:clientData/></xdr:twoCellAnchor>`;
+    return buildDrawingAnchorXml({
+        sheet,
+        overlay: placement.textBox.position?.overlayPosition,
+        fromRow,
+        fromColumn,
+        offsetX,
+        offsetY,
+        widthPx,
+        heightPx,
+        body: `<xdr:sp><xdr:nvSpPr><xdr:cNvPr id="${frameId}" name="TextBox ${frameId}"/><xdr:cNvSpPr txBox="1"/></xdr:nvSpPr>${shapePropertiesXml}${textBodyXml}</xdr:sp>`,
+    });
 };
 /** ColorIndex slots → canonical DrawingML scheme names (inverse of the importer's map). */
 const THEME_INDEX_TO_SCHEME = [
@@ -3948,20 +4276,6 @@ const createShapeAnchor = ({ placement, frameId, sheet, }) => {
     const offsetY = Math.max(0, placement.offsetY ?? 0);
     const widthPx = Math.max(10, placement.width ?? 120);
     const heightPx = Math.max(10, placement.height ?? 60);
-    const toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: (index) => getColumnWidthPx(sheet, index, true),
-    });
-    const toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: (index) => getRowHeightPx(sheet, index, true),
-    });
-    const fromXml = `<xdr:from><xdr:col>${fromColumn}</xdr:col><xdr:colOff>${Math.round(offsetX * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${fromRow}</xdr:row><xdr:rowOff>${Math.round(offsetY * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:from>`;
-    const toXml = `<xdr:to><xdr:col>${toColumn.index}</xdr:col><xdr:colOff>${Math.round(toColumn.offset * EMUS_PER_PIXEL)}</xdr:colOff><xdr:row>${toRow.index}</xdr:row><xdr:rowOff>${Math.round(toRow.offset * EMUS_PER_PIXEL)}</xdr:rowOff></xdr:to>`;
     const xfrmAttrs = [
         placement.shape.rotation
             ? ` rot="${Math.round(placement.shape.rotation * 60000)}"`
@@ -3988,7 +4302,17 @@ const createShapeAnchor = ({ placement, frameId, sheet, }) => {
         ? buildTextBodyXml(spec.textBody)
         : `<xdr:txBody><a:bodyPr vertOverflow="clip" horzOverflow="clip" rtlCol="0" anchor="t"/><a:lstStyle/><a:p><a:endParaRPr lang="en-US"/></a:p></xdr:txBody>`;
     const name = escapeXmlAttr(spec.name ?? `Shape ${frameId}`);
-    return `<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}<xdr:sp><xdr:nvSpPr><xdr:cNvPr id="${frameId}" name="${name}"/><xdr:cNvSpPr/></xdr:nvSpPr>${spPr}${styleXml}${textBodyXml}</xdr:sp><xdr:clientData/></xdr:twoCellAnchor>`;
+    return buildDrawingAnchorXml({
+        sheet,
+        overlay: placement.shape.position?.overlayPosition,
+        fromRow,
+        fromColumn,
+        offsetX,
+        offsetY,
+        widthPx,
+        heightPx,
+        body: `<xdr:sp><xdr:nvSpPr><xdr:cNvPr id="${frameId}" name="${name}"/><xdr:cNvSpPr/></xdr:nvSpPr>${spPr}${styleXml}${textBodyXml}</xdr:sp>`,
+    });
 };
 const buildTextWithTabs = (text, rPrXml) => {
     const parts = text.split("\t");
@@ -4239,6 +4563,60 @@ const buildShapePropertiesXml = (spec, widthPx, heightPx) => {
     }
     return `<xdr:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${Math.round(widthPx * EMUS_PER_PIXEL)}" cy="${Math.round(heightPx * EMUS_PER_PIXEL)}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom>${fillXml}${outlineXml}</xdr:spPr>`;
 };
+/**
+ * Wrap a drawing object's body in the anchor its placement mode calls for
+ * (#668 C-06). "Move and size with cells" (Excel's default) is a
+ * `twoCellAnchor` whose `to` is the object's persisted second anchor — or,
+ * for an object that has none yet, the cell its pixel extent reaches over
+ * this sheet's row / column sizes. "Move but don't size" is a
+ * `oneCellAnchor` (`from` + `ext`); "Don't move or size" is an
+ * `absoluteAnchor` (`pos` + `ext`). The importers read all three back into
+ * the same placement.
+ */
+const buildDrawingAnchorXml = ({ sheet, overlay, fromRow, fromColumn, offsetX, offsetY, widthPx, heightPx, body, }) => {
+    const emu = (px) => Math.round(px * EMUS_PER_PIXEL);
+    const fromXml = `<xdr:from><xdr:col>${fromColumn}</xdr:col><xdr:colOff>${emu(offsetX)}</xdr:colOff><xdr:row>${fromRow}</xdr:row><xdr:rowOff>${emu(offsetY)}</xdr:rowOff></xdr:from>`;
+    const extXml = `<xdr:ext cx="${emu(widthPx)}" cy="${emu(heightPx)}"/>`;
+    const placement = overlay?.placement ?? "moveAndSize";
+    if (placement === "moveOnly") {
+        return `<xdr:oneCellAnchor>${fromXml}${extXml}${body}<xdr:clientData/></xdr:oneCellAnchor>`;
+    }
+    if (placement === "absolute") {
+        let x = offsetX;
+        for (let index = 0; index < fromColumn; index++) {
+            x += getColumnWidthPx(sheet, index, true);
+        }
+        let y = offsetY;
+        for (let index = 0; index < fromRow; index++) {
+            y += getRowHeightPx(sheet, index, true);
+        }
+        return `<xdr:absoluteAnchor><xdr:pos x="${emu(x)}" y="${emu(y)}"/>${extXml}${body}<xdr:clientData/></xdr:absoluteAnchor>`;
+    }
+    const toColumn = overlay?.toCell
+        ? {
+            index: Math.max(0, overlay.toCell.columnIndex - 1),
+            offset: Math.max(0, overlay.toOffsetXPixels ?? 0),
+        }
+        : resolveAnchorEndpoint({
+            startIndex: fromColumn,
+            startOffset: offsetX,
+            span: widthPx,
+            getSize: (index) => getColumnWidthPx(sheet, index, true),
+        });
+    const toRow = overlay?.toCell
+        ? {
+            index: Math.max(0, overlay.toCell.rowIndex - 1),
+            offset: Math.max(0, overlay.toOffsetYPixels ?? 0),
+        }
+        : resolveAnchorEndpoint({
+            startIndex: fromRow,
+            startOffset: offsetY,
+            span: heightPx,
+            getSize: (index) => getRowHeightPx(sheet, index, true),
+        });
+    const toXml = `<xdr:to><xdr:col>${toColumn.index}</xdr:col><xdr:colOff>${emu(toColumn.offset)}</xdr:colOff><xdr:row>${toRow.index}</xdr:row><xdr:rowOff>${emu(toRow.offset)}</xdr:rowOff></xdr:to>`;
+    return `<xdr:twoCellAnchor>${fromXml}${toXml}${body}<xdr:clientData/></xdr:twoCellAnchor>`;
+};
 const resolveAnchorEndpoint = ({ startIndex, startOffset, span, getSize, }) => {
     let index = startIndex;
     let offset = Math.max(0, startOffset);
@@ -4548,15 +4926,18 @@ const buildWorkbookSlicerCachesXml = (slicerCacheRelIds) => {
         .join("");
     return `<extLst><ext uri="{46BE6895-7355-4a93-B00E-2C351335B9C9}" xmlns:x15="http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"><x15:slicerCaches xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main">${cacheEntries}</x15:slicerCaches></ext></extLst>`;
 };
-const buildWorkbookRelationships = (sheetCount, slicerCacheCount = 0, externalLinkCount = 0, pivotCacheCount = 0, hasPersons = false) => {
+const buildWorkbookRelationships = (
+/** One entry per sheet in `<sheets>` order; `target` is relative to `xl/`. */
+sheetParts, slicerCacheCount = 0, externalLinkCount = 0, pivotCacheCount = 0, hasPersons = false) => {
     const relationships = [];
     const sheetRelIds = [];
     const slicerCacheRelIds = [];
-    for (let i = 0; i < sheetCount; i++) {
+    const sheetCount = sheetParts.length;
+    sheetParts.forEach((part, i) => {
         const relId = `rId${i + 1}`;
         sheetRelIds.push(relId);
-        relationships.push(`<Relationship Id="${relId}" Type="${REL_NS}/worksheet" Target="worksheets/sheet${i + 1}.xml"/>`);
-    }
+        relationships.push(`<Relationship Id="${relId}" Type="${REL_NS}/${part.chartsheet ? "chartsheet" : "worksheet"}" Target="${part.target}"/>`);
+    });
     const stylesId = `rId${sheetCount + 1}`;
     const themeId = `rId${sheetCount + 2}`;
     const sharedStringsId = `rId${sheetCount + 3}`;
@@ -4600,10 +4981,11 @@ const buildWorkbookRelationships = (sheetCount, slicerCacheCount = 0, externalLi
         slicerCacheRelationshipIds: slicerCacheRelIds,
     };
 };
-const buildContentTypesXml = ({ sheetCount, tableCount, drawingSheets, mediaExtensions, chartCount, chartExCount = 0, slicerCount = 0, slicerCacheCount = 0, pivotTableCount = 0, pivotCacheCount = 0, commentsSheets = [], threadedCommentsSheets = [], hasPersons = false, externalLinkCount = 0, hasVmlDrawings = false, ctrlPropCount = 0, }) => {
-    const sheetOverrides = Array.from({ length: sheetCount }, (_, index) => {
+const buildContentTypesXml = ({ worksheetCount, chartsheetCount = 0, tableCount, drawingSheets, mediaExtensions, chartCount, chartExCount = 0, slicerCount = 0, slicerCacheCount = 0, pivotTableCount = 0, pivotCacheCount = 0, commentsSheets = [], threadedCommentsSheets = [], hasPersons = false, externalLinkCount = 0, hasVmlDrawings = false, ctrlPropCount = 0, }) => {
+    const sheetOverrides = Array.from({ length: worksheetCount }, (_, index) => {
         return `<Override PartName="/xl/worksheets/sheet${index + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>`;
     }).join("");
+    const chartsheetOverrides = Array.from({ length: chartsheetCount }, (_, index) => `<Override PartName="/xl/chartsheets/sheet${index + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml"/>`).join("");
     const tableOverrides = Array.from({ length: tableCount }, (_, index) => {
         return `<Override PartName="/xl/tables/table${index + 1}.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"/>`;
     }).join("");
@@ -4644,13 +5026,25 @@ const buildContentTypesXml = ({ sheetCount, tableCount, drawingSheets, mediaExte
         ? `<Default Extension="vml" ContentType="application/vnd.openxmlformats-officedocument.vmlDrawing"/>`
         : "";
     const ctrlPropOverrides = Array.from({ length: ctrlPropCount }, (_, index) => `<Override PartName="/xl/ctrlProps/ctrlProp${index + 1}.xml" ContentType="${CTRL_PROP_CONTENT_TYPE}"/>`).join("");
-    return `${XML_DECLARATION}<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/>${vmlDefault}${mediaDefaults}<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>${sheetOverrides}${tableOverrides}${drawingOverrides}${chartOverrides}${chartExOverrides}${slicerOverrides}${slicerCacheOverrides}${pivotTableOverrides}${pivotCacheOverrides}${externalLinkOverrides}${ctrlPropOverrides}${commentsOverrides}${threadedCommentsOverrides}${personOverride}<Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/><Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/><Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/></Types>`;
+    return `${XML_DECLARATION}<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/>${vmlDefault}${mediaDefaults}<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>${sheetOverrides}${chartsheetOverrides}${tableOverrides}${drawingOverrides}${chartOverrides}${chartExOverrides}${slicerOverrides}${slicerCacheOverrides}${pivotTableOverrides}${pivotCacheOverrides}${externalLinkOverrides}${ctrlPropOverrides}${commentsOverrides}${threadedCommentsOverrides}${personOverride}<Override PartName="/xl/theme/theme1.xml" ContentType="application/vnd.openxmlformats-officedocument.theme+xml"/><Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/><Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/><Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/><Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/></Types>`;
 };
 const buildRootRelationshipsXml = () => {
     return `${XML_DECLARATION}<Relationships xmlns="${PACKAGE_REL_NS}"><Relationship Id="rId1" Type="${REL_NS}/officeDocument" Target="xl/workbook.xml"/><Relationship Id="rId2" Type="${REL_NS}/extended-properties" Target="docProps/app.xml"/><Relationship Id="rId3" Type="${REL_NS}/core-properties" Target="docProps/core.xml"/></Relationships>`;
 };
-const buildAppXml = (sheetNames, properties) => {
-    const titles = sheetNames
+const buildAppXml = (sheetNames, isChartsheet, properties) => {
+    // Excel groups the tabs by kind: `HeadingPairs` counts `Worksheets` then
+    // `Charts` (a pair is only written for a non-empty kind) and `TitlesOfParts`
+    // lists the worksheet names followed by the chartsheet names.
+    const worksheetNames = sheetNames.filter((_, index) => !isChartsheet[index]);
+    const chartsheetNames = sheetNames.filter((_, index) => isChartsheet[index]);
+    const headingPairs = [
+        ["Worksheets", worksheetNames.length],
+        ["Charts", chartsheetNames.length],
+    ].filter(([, count]) => count > 0);
+    const headingPairsXml = headingPairs
+        .map(([kind, count]) => `<vt:variant><vt:lpstr>${kind}</vt:lpstr></vt:variant><vt:variant><vt:i4>${count}</vt:i4></vt:variant>`)
+        .join("");
+    const titles = [...worksheetNames, ...chartsheetNames]
         .map((name) => `<vt:lpstr>${escapeXmlText(name)}</vt:lpstr>`)
         .join("");
     const application = properties?.application ?? CREATOR;
@@ -4660,7 +5054,7 @@ const buildAppXml = (sheetNames, properties) => {
     const managerTag = properties?.manager
         ? `<Manager>${escapeXmlText(properties.manager)}</Manager>`
         : "";
-    return `${XML_DECLARATION}<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><Application>${escapeXmlText(application)}</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size="2" baseType="variant"><vt:variant><vt:lpstr>Worksheets</vt:lpstr></vt:variant><vt:variant><vt:i4>${sheetNames.length}</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size="${sheetNames.length}" baseType="lpstr">${titles}</vt:vector></TitlesOfParts>${companyTag}${managerTag}</Properties>`;
+    return `${XML_DECLARATION}<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><Application>${escapeXmlText(application)}</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size="${headingPairs.length * 2}" baseType="variant">${headingPairsXml}</vt:vector></HeadingPairs><TitlesOfParts><vt:vector size="${sheetNames.length}" baseType="lpstr">${titles}</vt:vector></TitlesOfParts>${companyTag}${managerTag}</Properties>`;
 };
 const buildCoreXml = (properties) => {
     const now = new Date().toISOString();