@rowsncolumns/toolkit 24.4.5 → 24.5.1

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

@@ -2,8 +2,8 @@ import { __assign, __awaiter, __generator, __read, __spreadArray, __values } fro
 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";
@@ -20,7 +20,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";
 var BLANK_LABEL = "(Blanks)";
 var isStyleReference = function (value) {
     return !!value && typeof value === "object" && "sid" in value;
@@ -31,12 +31,12 @@ var pixelToPoints = function (px) {
     return Math.max(1, Number(((px * 72) / 96).toFixed(2)));
 };
 export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var sortedSheets, sharedStrings, personRegistry, styleBuilder, exportableTables, tableIdMap, preparedTables, embedsBySheet, textBoxesBySheet, shapesBySheet, formControlsBySheet, ctrlProps, chartsBySheet, remappedSlicers, slicersBySheet, workbookSheetNames, sheetNameById, dataValidationsById, globalSlicerIndex, slicerCacheEntries, slicerEntries, globalPivotIndex, pivotCacheEntries, pivotCacheRelsEntries, pivotTableEntries, pivotTableRelsEntries, pivotsByTargetSheet, pivotTables_1, pivotTables_1_1, p, sid, list, workbookPivotCacheRefs, worksheetEntries, _d, workbookRelationshipsXml, sheetRelationshipIds, slicerCacheRelationshipIds, pivotCacheRelationshipIds, externalLinkRelationshipIds, workbookXml, sharedStringsXml, rootRelationshipsXml, appXml, coreXml, stylesXml, themeXml, files, worksheetEntries_1, worksheetEntries_1_1, entry, personsXml, preparedTables_1, preparedTables_1_1, table, rows, tableXml, globalImageIndex, globalChartIndex, drawingSheets, imageExtensions, chartEntries, chartExEntries, globalChartExIndex, worksheetEntries_2, worksheetEntries_2_1, entry, placements, textBoxesForSheet, shapesForSheet, chartsForSheet, slicersForSheet, drawingParts, _e, _f, media, _g, _h, chartEntry, _j, _k, chartExEntry, e_1_1, chartEntries_1, chartEntries_1_1, chartEntry, chartExEntries_1, chartExEntries_1_1, chartExEntry, slicerCacheEntries_1, slicerCacheEntries_1_1, slicerCacheEntry, slicerEntries_1, slicerEntries_1_1, slicerEntry, pivotCacheEntries_1, pivotCacheEntries_1_1, cacheEntry, pivotCacheRelsEntries_1, pivotCacheRelsEntries_1_1, cacheRels, pivotTableEntries_1, pivotTableEntries_1_1, tableEntry, pivotTableRelsEntries_1, pivotTableRelsEntries_1_1, tableRels, i, link, linkPath, relsPath, commentsSheets, hasVmlDrawings, _l, _m, part, threadedCommentsSheets, contentTypesXml, zipBytes;
-    var e_2, _o, e_3, _p, e_4, _q, e_1, _s, e_5, _t, e_6, _u, e_7, _v, e_8, _w, e_9, _x, e_10, _y, e_11, _z, e_12, _0, e_13, _1, e_14, _2, e_15, _3, e_16, _4;
-    var _5, _6, _7, _8, _9, _10;
-    var _conditionalFormats = _b.conditionalFormats, _dataValidations = _b.dataValidations, sheets = _b.sheets, sheetData = _b.sheetData, sourceSharedStrings = _b.sharedStrings, _11 = _b.tables, _tables = _11 === void 0 ? [] : _11, cellXfs = _b.cellXfs, theme = _b.theme, defaultFont = _b.defaultFont, _12 = _b.embeds, embeds = _12 === void 0 ? [] : _12, _13 = _b.charts, charts = _13 === void 0 ? [] : _13, _14 = _b.slicers, slicers = _14 === void 0 ? [] : _14, _15 = _b.pivotTables, pivotTables = _15 === void 0 ? [] : _15, _16 = _b.externalLinks, externalLinks = _16 === void 0 ? [] : _16, _17 = _b.namedRanges, namedRanges = _17 === void 0 ? [] : _17, _18 = _b.protectedRanges, protectedRanges = _18 === void 0 ? [] : _18, namedCellStyles = _b.namedCellStyles, customTableStyles = _b.customTableStyles, iterativeCalculationOptions = _b.iterativeCalculationOptions, ignoreFormulaPatterns = _b.ignoreFormulaPatterns, citations = _b.citations, comments = _b.comments, password = _b.password, locale = _b.locale, _19 = _b.use1904, use1904 = _19 === void 0 ? false : _19, properties = _b.properties, powerQuery = _b.powerQuery;
-    return __generator(this, function (_20) {
-        switch (_20.label) {
+    var sortedSheets, sharedStrings, personRegistry, styleBuilder, customTableStyleRecords, customTableStyleNames, exportableTables, tableIdMap, preparedTables, chartCount, embedsBySheet, textBoxesBySheet, shapesBySheet, formControlsBySheet, ctrlProps, chartsBySheet, remappedSlicers, slicersBySheet, workbookSheetNames, sheetNameById, dataValidationsById, globalSlicerIndex, slicerCacheEntries, slicerEntries, globalPivotIndex, pivotCacheEntries, pivotCacheRelsEntries, pivotTableEntries, pivotTableRelsEntries, pivotSourceNameById, _loop_1, pivotTables_1, pivotTables_1_1, p, resolvePivotSourceName, pivotsByTargetSheet, pivotTables_2, pivotTables_2_1, p, sid, list, workbookPivotCacheRefs, worksheetCount, chartsheetCount, worksheetEntries, _d, workbookRelationshipsXml, sheetRelationshipIds, slicerCacheRelationshipIds, pivotCacheRelationshipIds, externalLinkRelationshipIds, workbookXml, sharedStringsXml, rootRelationshipsXml, appXml, coreXml, tablePartFiles, preparedTables_1, preparedTables_1_1, table, rows, tableXml, stylesXml, themeXml, files, worksheetEntries_1, worksheetEntries_1_1, entry, personsXml, globalImageIndex, globalChartIndex, drawingSheets, imageExtensions, chartEntries, chartExEntries, globalChartExIndex, worksheetEntries_2, worksheetEntries_2_1, entry, placements, textBoxesForSheet, shapesForSheet, chartsForSheet, slicersForSheet, drawingParts, _e, _f, media, _g, _h, chartEntry, _j, _k, chartExEntry, e_1_1, chartEntries_1, chartEntries_1_1, chartEntry, chartExEntries_1, chartExEntries_1_1, chartExEntry, slicerCacheEntries_1, slicerCacheEntries_1_1, slicerCacheEntry, slicerEntries_1, slicerEntries_1_1, slicerEntry, pivotCacheEntries_1, pivotCacheEntries_1_1, cacheEntry, pivotCacheRelsEntries_1, pivotCacheRelsEntries_1_1, cacheRels, pivotTableEntries_1, pivotTableEntries_1_1, tableEntry, pivotTableRelsEntries_1, pivotTableRelsEntries_1_1, tableRels, i, link, linkPath, relsPath, commentsSheets, hasVmlDrawings, _l, _m, part, threadedCommentsSheets, contentTypesXml, zipBytes;
+    var e_2, _o, e_3, _p, e_4, _q, e_5, _s, e_1, _t, e_6, _u, e_7, _v, e_8, _w, e_9, _x, e_10, _y, e_11, _z, e_12, _0, e_13, _1, e_14, _2, e_15, _3, e_16, _4, e_17, _5;
+    var _6, _7, _8, _9, _10, _11, _12, _13, _14;
+    var _conditionalFormats = _b.conditionalFormats, _dataValidations = _b.dataValidations, sheets = _b.sheets, sheetData = _b.sheetData, sourceSharedStrings = _b.sharedStrings, _15 = _b.tables, _tables = _15 === void 0 ? [] : _15, cellXfs = _b.cellXfs, theme = _b.theme, defaultFont = _b.defaultFont, _16 = _b.embeds, embeds = _16 === void 0 ? [] : _16, _17 = _b.charts, charts = _17 === void 0 ? [] : _17, _18 = _b.slicers, slicers = _18 === void 0 ? [] : _18, _19 = _b.pivotTables, pivotTables = _19 === void 0 ? [] : _19, _20 = _b.externalLinks, externalLinks = _20 === void 0 ? [] : _20, _21 = _b.namedRanges, namedRanges = _21 === void 0 ? [] : _21, _22 = _b.protectedRanges, protectedRanges = _22 === void 0 ? [] : _22, namedCellStyles = _b.namedCellStyles, customTableStyles = _b.customTableStyles, iterativeCalculationOptions = _b.iterativeCalculationOptions, ignoreFormulaPatterns = _b.ignoreFormulaPatterns, citations = _b.citations, comments = _b.comments, password = _b.password, locale = _b.locale, _23 = _b.use1904, use1904 = _23 === void 0 ? false : _23, properties = _b.properties, powerQuery = _b.powerQuery;
+    return __generator(this, function (_24) {
+        switch (_24.label) {
             case 0:
                 sortedSheets = sortSheetsByIndex(sheets, true);
                 sharedStrings = new SharedStrings();
@@ -48,9 +48,15 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 if (namedCellStyles && namedCellStyles.length > 0) {
                     styleBuilder.setNamedCellStyles(namedCellStyles);
                 }
-                if (customTableStyles && customTableStyles.length > 0) {
-                    styleBuilder.setCustomTableStyles(customTableStyles);
+                customTableStyleRecords = (customTableStyles !== null && customTableStyles !== void 0 ? customTableStyles : []).map(function (style) {
+                    return "bandedRange" in style
+                        ? { name: style.name, elements: tableStyleElementsFromBanding(style.bandedRange) }
+                        : style;
+                });
+                if (customTableStyleRecords.length > 0) {
+                    styleBuilder.setCustomTableStyles(customTableStyleRecords);
                 }
+                customTableStyleNames = new Set(customTableStyleRecords.map(function (s) { return s.name; }));
                 exportableTables = filterExportableTables(_tables !== null && _tables !== void 0 ? _tables : []);
                 tableIdMap = new Map();
                 exportableTables.forEach(function (table, index) {
@@ -58,10 +64,11 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                     tableIdMap.set(String(table.id), index + 1);
                 });
                 preparedTables = prepareTables(exportableTables);
-                embedsBySheet = groupEmbedsBySheet(embeds !== null && embeds !== void 0 ? embeds : []);
-                textBoxesBySheet = groupTextBoxesBySheet(embeds !== null && embeds !== void 0 ? embeds : []);
-                shapesBySheet = groupShapesBySheet(embeds !== null && embeds !== void 0 ? embeds : []);
-                formControlsBySheet = groupFormControlsBySheet(embeds !== null && embeds !== void 0 ? embeds : []);
+                chartCount = (_6 = charts === null || charts === void 0 ? void 0 : charts.length) !== null && _6 !== void 0 ? _6 : 0;
+                embedsBySheet = groupEmbedsBySheet(embeds !== null && embeds !== void 0 ? embeds : [], chartCount);
+                textBoxesBySheet = groupTextBoxesBySheet(embeds !== null && embeds !== void 0 ? embeds : [], chartCount);
+                shapesBySheet = groupShapesBySheet(embeds !== null && embeds !== void 0 ? embeds : [], chartCount);
+                formControlsBySheet = groupFormControlsBySheet(embeds !== null && embeds !== void 0 ? embeds : [], chartCount);
                 ctrlProps = { parts: [] };
                 chartsBySheet = groupChartsBySheet(charts !== null && charts !== void 0 ? charts : []);
                 remappedSlicers = slicers.map(function (slicer) {
@@ -80,10 +87,10 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                     var _a;
                     sheetNameById.set((_a = sheet.sheetId) !== null && _a !== void 0 ? _a : index + 1, workbookSheetNames[index]);
                 });
-                dataValidationsById = (_5 = _dataValidations === null || _dataValidations === void 0 ? void 0 : _dataValidations.reduce(function (acc, rule) {
+                dataValidationsById = (_7 = _dataValidations === null || _dataValidations === void 0 ? void 0 : _dataValidations.reduce(function (acc, rule) {
                     acc[rule.id] = rule;
                     return acc;
-                }, {})) !== null && _5 !== void 0 ? _5 : undefined;
+                }, {})) !== null && _7 !== void 0 ? _7 : undefined;
                 globalSlicerIndex = 1;
                 slicerCacheEntries = [];
                 slicerEntries = [];
@@ -92,11 +99,38 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 pivotCacheRelsEntries = [];
                 pivotTableEntries = [];
                 pivotTableRelsEntries = [];
-                pivotsByTargetSheet = new Map();
+                pivotSourceNameById = new Map();
+                _loop_1 = function (p) {
+                    var targetSheet = sortedSheets.find(function (s) { var _a; return s.sheetId === ((_a = p.targetPosition) === null || _a === void 0 ? void 0 : _a.sheetId); });
+                    if (!targetSheet || !p.source || !p.pivotRange)
+                        return "continue";
+                    var sheetTitle = (_8 = targetSheet.title) !== null && _8 !== void 0 ? _8 : "Sheet".concat(targetSheet.sheetId);
+                    var quoted = /^[A-Za-z_][A-Za-z0-9_.]*$/.test(sheetTitle)
+                        ? sheetTitle
+                        : "'".concat(sheetTitle.replace(/'/g, "''"), "'");
+                    pivotSourceNameById.set(String(p.pivotId), "[Workbook]".concat(quoted, "!").concat((_9 = p.name) !== null && _9 !== void 0 ? _9 : "PivotTable".concat(p.pivotId)));
+                };
                 try {
                     for (pivotTables_1 = __values(pivotTables), pivotTables_1_1 = pivotTables_1.next(); !pivotTables_1_1.done; pivotTables_1_1 = pivotTables_1.next()) {
                         p = pivotTables_1_1.value;
-                        sid = (_6 = p.targetPosition) === null || _6 === void 0 ? void 0 : _6.sheetId;
+                        _loop_1(p);
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (pivotTables_1_1 && !pivotTables_1_1.done && (_o = pivotTables_1.return)) _o.call(pivotTables_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+                resolvePivotSourceName = function (pivotTableId) {
+                    return pivotSourceNameById.get(String(pivotTableId));
+                };
+                pivotsByTargetSheet = new Map();
+                try {
+                    for (pivotTables_2 = __values(pivotTables), pivotTables_2_1 = pivotTables_2.next(); !pivotTables_2_1.done; pivotTables_2_1 = pivotTables_2.next()) {
+                        p = pivotTables_2_1.value;
+                        sid = (_10 = p.targetPosition) === null || _10 === void 0 ? void 0 : _10.sheetId;
                         if (sid == null)
                             continue;
                         list = pivotsByTargetSheet.get(sid);
@@ -106,17 +140,22 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                             pivotsByTargetSheet.set(sid, [p]);
                     }
                 }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (pivotTables_1_1 && !pivotTables_1_1.done && (_o = pivotTables_1.return)) _o.call(pivotTables_1);
+                        if (pivotTables_2_1 && !pivotTables_2_1.done && (_p = pivotTables_2.return)) _p.call(pivotTables_2);
                     }
-                    finally { if (e_2) throw e_2.error; }
+                    finally { if (e_3) throw e_3.error; }
                 }
                 workbookPivotCacheRefs = [];
+                worksheetCount = 0;
+                chartsheetCount = 0;
                 worksheetEntries = sortedSheets.map(function (sheet, index) {
-                    var e_17, _a, e_18, _b;
-                    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _s, _t, _u;
+                    var e_18, _a, e_19, _b;
+                    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _s, _t, _u, _v;
+                    var isChartsheet = sheet.type === "chartsheet";
+                    var partIndex = isChartsheet ? ++chartsheetCount : ++worksheetCount;
+                    var partFolder = isChartsheet ? "chartsheets" : "worksheets";
                     var rows = getRowsForSheet(sheetData, sheet.sheetId);
                     var sheetRelationships = new RelationshipsBuilder();
                     var sheetTables = preparedTables.filter(function (table) { return table.sheetId === sheet.sheetId; });
@@ -168,29 +207,30 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                                     offsetY: placement.offsetY,
                                     width: placement.width,
                                     height: placement.height,
+                                    overlay: (_k = slicer.position) === null || _k === void 0 ? void 0 : _k.overlayPosition,
                                 });
                                 globalSlicerIndex += 1;
                             }
                         }
                     }
-                    catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                    catch (e_18_1) { e_18 = { error: e_18_1 }; }
                     finally {
                         try {
                             if (sheetSlicers_1_1 && !sheetSlicers_1_1.done && (_a = sheetSlicers_1.return)) _a.call(sheetSlicers_1);
                         }
-                        finally { if (e_17) throw e_17.error; }
+                        finally { if (e_18) throw e_18.error; }
                     }
                     // Phase D2 — emit pivot table XMLs + relationships for this
                     // sheet. PivotTable lives on the rendering sheet; its cache
                     // definition is workbook-scoped (added to <pivotCaches> after
                     // this loop).
-                    var sheetPivots = (_k = pivotsByTargetSheet.get(sheet.sheetId)) !== null && _k !== void 0 ? _k : [];
-                    var _loop_1 = function (pivot) {
-                        var e_19, _v, e_20, _w, e_21, _x, e_22, _y, e_23, _z, e_24, _0;
+                    var sheetPivots = (_l = pivotsByTargetSheet.get(sheet.sheetId)) !== null && _l !== void 0 ? _l : [];
+                    var _loop_2 = function (pivot) {
+                        var e_20, _w, e_21, _x, e_22, _y, e_23, _z, e_24, _0, e_25, _1;
                         var cacheIndex = globalPivotIndex;
                         var tableIndex = globalPivotIndex;
                         var sourceSheet = sortedSheets.find(function (s) { var _a; return s.sheetId === ((_a = pivot.source) === null || _a === void 0 ? void 0 : _a.sheetId); });
-                        var sourceSheetName = (_m = (_l = sourceSheet === null || sourceSheet === void 0 ? void 0 : sourceSheet.title) !== null && _l !== void 0 ? _l : sheet.title) !== null && _m !== void 0 ? _m : "Sheet".concat(sheet.sheetId);
+                        var sourceSheetName = (_o = (_m = sourceSheet === null || sourceSheet === void 0 ? void 0 : sourceSheet.title) !== null && _m !== void 0 ? _m : sheet.title) !== null && _o !== void 0 ? _o : "Sheet".concat(sheet.sheetId);
                         // Field universe: union of every field referenced by the
                         // pivot. PivotCacheDefinition requires one <cacheField>
                         // entry per field, and pivotTable.fld indices reference them.
@@ -202,88 +242,88 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                             fieldIndex.set(name, fieldNameList.length);
                             fieldNameList.push(name);
                         };
-                        var calculatedNames = new Set(((_o = pivot.calculatedFields) !== null && _o !== void 0 ? _o : []).map(function (c) { return c.name; }));
+                        var calculatedNames = new Set(((_p = pivot.calculatedFields) !== null && _p !== void 0 ? _p : []).map(function (c) { return c.name; }));
                         try {
-                            for (var _1 = (e_19 = void 0, __values((_p = pivot.rows) !== null && _p !== void 0 ? _p : [])), _2 = _1.next(); !_2.done; _2 = _1.next()) {
-                                var r = _2.value;
+                            for (var _2 = (e_20 = void 0, __values((_q = pivot.rows) !== null && _q !== void 0 ? _q : [])), _3 = _2.next(); !_3.done; _3 = _2.next()) {
+                                var r = _3.value;
                                 registerField(r.field);
                             }
                         }
-                        catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                        catch (e_20_1) { e_20 = { error: e_20_1 }; }
                         finally {
                             try {
-                                if (_2 && !_2.done && (_v = _1.return)) _v.call(_1);
+                                if (_3 && !_3.done && (_w = _2.return)) _w.call(_2);
                             }
-                            finally { if (e_19) throw e_19.error; }
+                            finally { if (e_20) throw e_20.error; }
                         }
                         try {
-                            for (var _3 = (e_20 = void 0, __values((_q = pivot.columns) !== null && _q !== void 0 ? _q : [])), _4 = _3.next(); !_4.done; _4 = _3.next()) {
-                                var c = _4.value;
+                            for (var _4 = (e_21 = void 0, __values((_s = pivot.columns) !== null && _s !== void 0 ? _s : [])), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                                var c = _5.value;
                                 registerField(c.field);
                             }
                         }
-                        catch (e_20_1) { e_20 = { error: e_20_1 }; }
+                        catch (e_21_1) { e_21 = { error: e_21_1 }; }
                         finally {
                             try {
-                                if (_4 && !_4.done && (_w = _3.return)) _w.call(_3);
+                                if (_5 && !_5.done && (_x = _4.return)) _x.call(_4);
                             }
-                            finally { if (e_20) throw e_20.error; }
+                            finally { if (e_21) throw e_21.error; }
                         }
                         try {
-                            for (var _5 = (e_21 = void 0, __values((_s = pivot.values) !== null && _s !== void 0 ? _s : [])), _6 = _5.next(); !_6.done; _6 = _5.next()) {
-                                var v = _6.value;
+                            for (var _6 = (e_22 = void 0, __values((_t = pivot.values) !== null && _t !== void 0 ? _t : [])), _7 = _6.next(); !_7.done; _7 = _6.next()) {
+                                var v = _7.value;
                                 if (!calculatedNames.has(v.field))
                                     registerField(v.field);
                             }
                         }
-                        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                        catch (e_22_1) { e_22 = { error: e_22_1 }; }
                         finally {
                             try {
-                                if (_6 && !_6.done && (_x = _5.return)) _x.call(_5);
+                                if (_7 && !_7.done && (_y = _6.return)) _y.call(_6);
                             }
-                            finally { if (e_21) throw e_21.error; }
+                            finally { if (e_22) throw e_22.error; }
                         }
                         try {
                             // Source fields a calculated field reads must exist in the cache
                             // for Excel to evaluate the formula; the calculated fields
                             // themselves come last, as Excel orders them.
-                            for (var _7 = (e_22 = void 0, __values((_t = pivot.calculatedFields) !== null && _t !== void 0 ? _t : [])), _8 = _7.next(); !_8.done; _8 = _7.next()) {
-                                var c = _8.value;
+                            for (var _8 = (e_23 = void 0, __values((_u = pivot.calculatedFields) !== null && _u !== void 0 ? _u : [])), _9 = _8.next(); !_9.done; _9 = _8.next()) {
+                                var c = _9.value;
                                 try {
-                                    for (var _9 = (e_23 = void 0, __values(calculatedFieldReferences(c.formula))), _10 = _9.next(); !_10.done; _10 = _9.next()) {
-                                        var ref = _10.value;
+                                    for (var _10 = (e_24 = void 0, __values(calculatedFieldReferences(c.formula))), _11 = _10.next(); !_11.done; _11 = _10.next()) {
+                                        var ref = _11.value;
                                         if (!calculatedNames.has(ref))
                                             registerField(ref);
                                     }
                                 }
-                                catch (e_23_1) { e_23 = { error: e_23_1 }; }
+                                catch (e_24_1) { e_24 = { error: e_24_1 }; }
                                 finally {
                                     try {
-                                        if (_10 && !_10.done && (_z = _9.return)) _z.call(_9);
+                                        if (_11 && !_11.done && (_0 = _10.return)) _0.call(_10);
                                     }
-                                    finally { if (e_23) throw e_23.error; }
+                                    finally { if (e_24) throw e_24.error; }
                                 }
                             }
                         }
-                        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+                        catch (e_23_1) { e_23 = { error: e_23_1 }; }
                         finally {
                             try {
-                                if (_8 && !_8.done && (_y = _7.return)) _y.call(_7);
+                                if (_9 && !_9.done && (_z = _8.return)) _z.call(_8);
                             }
-                            finally { if (e_22) throw e_22.error; }
+                            finally { if (e_23) throw e_23.error; }
                         }
                         try {
-                            for (var _11 = (e_24 = void 0, __values((_u = pivot.calculatedFields) !== null && _u !== void 0 ? _u : [])), _12 = _11.next(); !_12.done; _12 = _11.next()) {
-                                var c = _12.value;
+                            for (var _12 = (e_25 = void 0, __values((_v = pivot.calculatedFields) !== null && _v !== void 0 ? _v : [])), _13 = _12.next(); !_13.done; _13 = _12.next()) {
+                                var c = _13.value;
                                 registerField(c.name);
                             }
                         }
-                        catch (e_24_1) { e_24 = { error: e_24_1 }; }
+                        catch (e_25_1) { e_25 = { error: e_25_1 }; }
                         finally {
                             try {
-                                if (_12 && !_12.done && (_0 = _11.return)) _0.call(_11);
+                                if (_13 && !_13.done && (_1 = _12.return)) _1.call(_12);
                             }
-                            finally { if (e_24) throw e_24.error; }
+                            finally { if (e_25) throw e_25.error; }
                         }
                         var cacheXml = buildPivotCacheDefinitionXml(pivot, sourceSheetName, fieldNameList);
                         var tableXml = buildPivotTableXml(pivot, cacheIndex, fieldIndex);
@@ -311,45 +351,52 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                     try {
                         for (var sheetPivots_1 = __values(sheetPivots), sheetPivots_1_1 = sheetPivots_1.next(); !sheetPivots_1_1.done; sheetPivots_1_1 = sheetPivots_1.next()) {
                             var pivot = sheetPivots_1_1.value;
-                            _loop_1(pivot);
+                            _loop_2(pivot);
                         }
                     }
-                    catch (e_18_1) { e_18 = { error: e_18_1 }; }
+                    catch (e_19_1) { e_19 = { error: e_19_1 }; }
                     finally {
                         try {
                             if (sheetPivots_1_1 && !sheetPivots_1_1.done && (_b = sheetPivots_1.return)) _b.call(sheetPivots_1);
                         }
-                        finally { if (e_18) throw e_18.error; }
+                        finally { if (e_19) throw e_19.error; }
                     }
-                    var result = buildWorksheetXml({
-                        sheet: sheet,
-                        rows: rows,
-                        sharedStrings: sharedStrings,
-                        sourceSharedStrings: sourceSharedStrings,
-                        cellXfs: cellXfs,
-                        styleBuilder: styleBuilder,
-                        tables: sheetTables,
-                        relationships: sheetRelationships,
-                        drawingContext: drawingContext,
-                        conditionalFormats: sheetConditionalFormats,
-                        dataValidationsById: dataValidationsById,
-                        dataValidations: _dataValidations,
-                        ignoreFormulaPatterns: ignoreFormulaPatterns,
-                        citations: sheetCitations,
-                        comments: comments,
-                        personRegistry: personRegistry,
-                        slicerRelIds: worksheetSlicerRelIds,
-                        sheetData: sheetData,
-                        sheets: sortedSheets,
-                        locale: locale,
-                        protectedRanges: protectedRanges,
-                        formControls: sheetFormControls,
-                        ctrlProps: ctrlProps,
-                    });
+                    var result = isChartsheet
+                        ? buildChartsheetXml({
+                            sheet: sheet,
+                            relationships: sheetRelationships,
+                            drawingContext: drawingContext,
+                        })
+                        : buildWorksheetXml({
+                            sheet: sheet,
+                            rows: rows,
+                            sharedStrings: sharedStrings,
+                            sourceSharedStrings: sourceSharedStrings,
+                            cellXfs: cellXfs,
+                            styleBuilder: styleBuilder,
+                            tables: sheetTables,
+                            relationships: sheetRelationships,
+                            drawingContext: drawingContext,
+                            conditionalFormats: sheetConditionalFormats,
+                            dataValidationsById: dataValidationsById,
+                            dataValidations: _dataValidations,
+                            ignoreFormulaPatterns: ignoreFormulaPatterns,
+                            citations: sheetCitations,
+                            comments: comments,
+                            personRegistry: personRegistry,
+                            slicerRelIds: worksheetSlicerRelIds,
+                            sheetData: sheetData,
+                            sheets: sortedSheets,
+                            locale: locale,
+                            protectedRanges: protectedRanges,
+                            formControls: sheetFormControls,
+                            ctrlProps: ctrlProps,
+                        });
                     return {
                         index: index,
-                        path: "xl/worksheets/sheet".concat(index + 1, ".xml"),
-                        relationshipsPath: "xl/worksheets/_rels/sheet".concat(index + 1, ".xml.rels"),
+                        isChartsheet: isChartsheet,
+                        path: "xl/".concat(partFolder, "/sheet").concat(partIndex, ".xml"),
+                        relationshipsPath: "xl/".concat(partFolder, "/_rels/sheet").concat(partIndex, ".xml.rels"),
                         content: result.xml,
                         relationshipsXml: result.relationshipsXml,
                         drawingPath: "xl/drawings/drawing".concat(index + 1, ".xml"),
@@ -366,12 +413,33 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         threadedCommentsXml: result.threadedCommentsXml,
                     };
                 });
-                _d = buildWorkbookRelationships(worksheetEntries.length, slicerCacheEntries.length, externalLinks.length, pivotCacheEntries.length, !personRegistry.isEmpty()), workbookRelationshipsXml = _d.xml, sheetRelationshipIds = _d.sheetRelationshipIds, slicerCacheRelationshipIds = _d.slicerCacheRelationshipIds, pivotCacheRelationshipIds = _d.pivotCacheRelationshipIds, externalLinkRelationshipIds = _d.externalLinkRelationshipIds;
+                _d = buildWorkbookRelationships(worksheetEntries.map(function (entry) { return ({
+                    chartsheet: entry.isChartsheet,
+                    target: entry.path.replace(/^xl\//, ""),
+                }); }), slicerCacheEntries.length, externalLinks.length, pivotCacheEntries.length, !personRegistry.isEmpty()), workbookRelationshipsXml = _d.xml, sheetRelationshipIds = _d.sheetRelationshipIds, slicerCacheRelationshipIds = _d.slicerCacheRelationshipIds, pivotCacheRelationshipIds = _d.pivotCacheRelationshipIds, externalLinkRelationshipIds = _d.externalLinkRelationshipIds;
                 workbookXml = buildWorkbookXml(sortedSheets, sheetRelationshipIds, workbookSheetNames, namedRanges, iterativeCalculationOptions, slicerCacheRelationshipIds, use1904, externalLinkRelationshipIds, pivotCacheRelationshipIds);
                 sharedStringsXml = buildSharedStringsXml(sharedStrings);
                 rootRelationshipsXml = buildRootRelationshipsXml();
-                appXml = buildAppXml(workbookSheetNames, properties);
+                appXml = buildAppXml(workbookSheetNames, sortedSheets.map(function (sheet) { return sheet.type === "chartsheet"; }), properties);
                 coreXml = buildCoreXml(properties);
+                tablePartFiles = {};
+                try {
+                    for (preparedTables_1 = __values(preparedTables), preparedTables_1_1 = preparedTables_1.next(); !preparedTables_1_1.done; preparedTables_1_1 = preparedTables_1.next()) {
+                        table = preparedTables_1_1.value;
+                        rows = getRowsForSheet(sheetData, table.sheetId);
+                        tableXml = buildTableXml(table, rows, sourceSharedStrings, styleBuilder, customTableStyleNames);
+                        if (tableXml) {
+                            tablePartFiles[table.path] = encodeXml(tableXml);
+                        }
+                    }
+                }
+                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                finally {
+                    try {
+                        if (preparedTables_1_1 && !preparedTables_1_1.done && (_q = preparedTables_1.return)) _q.call(preparedTables_1);
+                    }
+                    finally { if (e_4) throw e_4.error; }
+                }
                 stylesXml = styleBuilder.toXml();
                 themeXml = theme ? generateThemeXml(theme) : theme1Xml;
                 files = {
@@ -403,34 +471,18 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         }
                     }
                 }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
-                        if (worksheetEntries_1_1 && !worksheetEntries_1_1.done && (_p = worksheetEntries_1.return)) _p.call(worksheetEntries_1);
+                        if (worksheetEntries_1_1 && !worksheetEntries_1_1.done && (_s = worksheetEntries_1.return)) _s.call(worksheetEntries_1);
                     }
-                    finally { if (e_3) throw e_3.error; }
+                    finally { if (e_5) throw e_5.error; }
                 }
                 personsXml = personRegistry.toXml();
                 if (personsXml) {
                     files["xl/persons/person.xml"] = encodeXml(personsXml);
                 }
-                try {
-                    for (preparedTables_1 = __values(preparedTables), preparedTables_1_1 = preparedTables_1.next(); !preparedTables_1_1.done; preparedTables_1_1 = preparedTables_1.next()) {
-                        table = preparedTables_1_1.value;
-                        rows = getRowsForSheet(sheetData, table.sheetId);
-                        tableXml = buildTableXml(table, rows, sourceSharedStrings, styleBuilder);
-                        if (tableXml) {
-                            files[table.path] = encodeXml(tableXml);
-                        }
-                    }
-                }
-                catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                finally {
-                    try {
-                        if (preparedTables_1_1 && !preparedTables_1_1.done && (_q = preparedTables_1.return)) _q.call(preparedTables_1);
-                    }
-                    finally { if (e_4) throw e_4.error; }
-                }
+                Object.assign(files, tablePartFiles);
                 globalImageIndex = 1;
                 globalChartIndex = 1;
                 drawingSheets = [];
@@ -438,19 +490,19 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                 chartEntries = [];
                 chartExEntries = [];
                 globalChartExIndex = 1;
-                _20.label = 1;
+                _24.label = 1;
             case 1:
-                _20.trys.push([1, 6, 7, 8]);
+                _24.trys.push([1, 6, 7, 8]);
                 worksheetEntries_2 = __values(worksheetEntries), worksheetEntries_2_1 = worksheetEntries_2.next();
-                _20.label = 2;
+                _24.label = 2;
             case 2:
                 if (!!worksheetEntries_2_1.done) return [3 /*break*/, 5];
                 entry = worksheetEntries_2_1.value;
                 placements = __spreadArray(__spreadArray([], __read(entry.cellImages), false), __read(entry.embedImages), false);
-                textBoxesForSheet = (_7 = entry.textBoxes) !== null && _7 !== void 0 ? _7 : [];
-                shapesForSheet = (_8 = entry.shapes) !== null && _8 !== void 0 ? _8 : [];
-                chartsForSheet = (_9 = entry.charts) !== null && _9 !== void 0 ? _9 : [];
-                slicersForSheet = (_10 = entry.slicers) !== null && _10 !== void 0 ? _10 : [];
+                textBoxesForSheet = (_11 = entry.textBoxes) !== null && _11 !== void 0 ? _11 : [];
+                shapesForSheet = (_12 = entry.shapes) !== null && _12 !== void 0 ? _12 : [];
+                chartsForSheet = (_13 = entry.charts) !== null && _13 !== void 0 ? _13 : [];
+                slicersForSheet = (_14 = entry.slicers) !== null && _14 !== void 0 ? _14 : [];
                 if (!placements.length &&
                     !textBoxesForSheet.length &&
                     !shapesForSheet.length &&
@@ -468,9 +520,10 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         charts: chartsForSheet,
                         slicers: slicersForSheet,
                         sheetNameById: sheetNameById,
+                        resolvePivotSourceName: resolvePivotSourceName,
                     })];
             case 3:
-                drawingParts = _20.sent();
+                drawingParts = _24.sent();
                 if (!drawingParts)
                     return [3 /*break*/, 4];
                 files[entry.drawingPath] = encodeXml(drawingParts.xml);
@@ -478,61 +531,61 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                     files[entry.drawingRelsPath] = encodeXml(drawingParts.relsXml);
                 }
                 try {
-                    for (_e = (e_5 = void 0, __values(drawingParts.media)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    for (_e = (e_6 = void 0, __values(drawingParts.media)), _f = _e.next(); !_f.done; _f = _e.next()) {
                         media = _f.value;
                         files[media.path] = media.data;
                         imageExtensions.add(media.extension);
                     }
                 }
-                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
-                        if (_f && !_f.done && (_t = _e.return)) _t.call(_e);
+                        if (_f && !_f.done && (_u = _e.return)) _u.call(_e);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_6) throw e_6.error; }
                 }
                 try {
-                    for (_g = (e_6 = void 0, __values(drawingParts.charts)), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    for (_g = (e_7 = void 0, __values(drawingParts.charts)), _h = _g.next(); !_h.done; _h = _g.next()) {
                         chartEntry = _h.value;
                         chartEntries.push(chartEntry);
                     }
                 }
-                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                catch (e_7_1) { e_7 = { error: e_7_1 }; }
                 finally {
                     try {
-                        if (_h && !_h.done && (_u = _g.return)) _u.call(_g);
+                        if (_h && !_h.done && (_v = _g.return)) _v.call(_g);
                     }
-                    finally { if (e_6) throw e_6.error; }
+                    finally { if (e_7) throw e_7.error; }
                 }
                 try {
-                    for (_j = (e_7 = void 0, __values(drawingParts.chartExs)), _k = _j.next(); !_k.done; _k = _j.next()) {
+                    for (_j = (e_8 = void 0, __values(drawingParts.chartExs)), _k = _j.next(); !_k.done; _k = _j.next()) {
                         chartExEntry = _k.value;
                         chartExEntries.push(chartExEntry);
                     }
                 }
-                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                catch (e_8_1) { e_8 = { error: e_8_1 }; }
                 finally {
                     try {
-                        if (_k && !_k.done && (_v = _j.return)) _v.call(_j);
+                        if (_k && !_k.done && (_w = _j.return)) _w.call(_j);
                     }
-                    finally { if (e_7) throw e_7.error; }
+                    finally { if (e_8) throw e_8.error; }
                 }
                 globalImageIndex = drawingParts.nextImageIndex;
                 globalChartIndex = drawingParts.nextChartIndex;
                 globalChartExIndex = drawingParts.nextChartExIndex;
                 drawingSheets.push(entry.index + 1);
-                _20.label = 4;
+                _24.label = 4;
             case 4:
                 worksheetEntries_2_1 = worksheetEntries_2.next();
                 return [3 /*break*/, 2];
             case 5: return [3 /*break*/, 8];
             case 6:
-                e_1_1 = _20.sent();
+                e_1_1 = _24.sent();
                 e_1 = { error: e_1_1 };
                 return [3 /*break*/, 8];
             case 7:
                 try {
-                    if (worksheetEntries_2_1 && !worksheetEntries_2_1.done && (_s = worksheetEntries_2.return)) _s.call(worksheetEntries_2);
+                    if (worksheetEntries_2_1 && !worksheetEntries_2_1.done && (_t = worksheetEntries_2.return)) _t.call(worksheetEntries_2);
                 }
                 finally { if (e_1) throw e_1.error; }
                 return [7 /*endfinally*/];
@@ -543,12 +596,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[chartEntry.path] = encodeXml(chartEntry.xml);
                     }
                 }
-                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                catch (e_9_1) { e_9 = { error: e_9_1 }; }
                 finally {
                     try {
-                        if (chartEntries_1_1 && !chartEntries_1_1.done && (_w = chartEntries_1.return)) _w.call(chartEntries_1);
+                        if (chartEntries_1_1 && !chartEntries_1_1.done && (_x = chartEntries_1.return)) _x.call(chartEntries_1);
                     }
-                    finally { if (e_8) throw e_8.error; }
+                    finally { if (e_9) throw e_9.error; }
                 }
                 try {
                     for (chartExEntries_1 = __values(chartExEntries), chartExEntries_1_1 = chartExEntries_1.next(); !chartExEntries_1_1.done; chartExEntries_1_1 = chartExEntries_1.next()) {
@@ -556,12 +609,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[chartExEntry.path] = encodeXml(chartExEntry.xml);
                     }
                 }
-                catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                catch (e_10_1) { e_10 = { error: e_10_1 }; }
                 finally {
                     try {
-                        if (chartExEntries_1_1 && !chartExEntries_1_1.done && (_x = chartExEntries_1.return)) _x.call(chartExEntries_1);
+                        if (chartExEntries_1_1 && !chartExEntries_1_1.done && (_y = chartExEntries_1.return)) _y.call(chartExEntries_1);
                     }
-                    finally { if (e_9) throw e_9.error; }
+                    finally { if (e_10) throw e_10.error; }
                 }
                 try {
                     for (slicerCacheEntries_1 = __values(slicerCacheEntries), slicerCacheEntries_1_1 = slicerCacheEntries_1.next(); !slicerCacheEntries_1_1.done; slicerCacheEntries_1_1 = slicerCacheEntries_1.next()) {
@@ -569,12 +622,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[slicerCacheEntry.path] = encodeXml(slicerCacheEntry.xml);
                     }
                 }
-                catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                catch (e_11_1) { e_11 = { error: e_11_1 }; }
                 finally {
                     try {
-                        if (slicerCacheEntries_1_1 && !slicerCacheEntries_1_1.done && (_y = slicerCacheEntries_1.return)) _y.call(slicerCacheEntries_1);
+                        if (slicerCacheEntries_1_1 && !slicerCacheEntries_1_1.done && (_z = slicerCacheEntries_1.return)) _z.call(slicerCacheEntries_1);
                     }
-                    finally { if (e_10) throw e_10.error; }
+                    finally { if (e_11) throw e_11.error; }
                 }
                 try {
                     for (slicerEntries_1 = __values(slicerEntries), slicerEntries_1_1 = slicerEntries_1.next(); !slicerEntries_1_1.done; slicerEntries_1_1 = slicerEntries_1.next()) {
@@ -582,12 +635,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[slicerEntry.path] = encodeXml(slicerEntry.xml);
                     }
                 }
-                catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                catch (e_12_1) { e_12 = { error: e_12_1 }; }
                 finally {
                     try {
-                        if (slicerEntries_1_1 && !slicerEntries_1_1.done && (_z = slicerEntries_1.return)) _z.call(slicerEntries_1);
+                        if (slicerEntries_1_1 && !slicerEntries_1_1.done && (_0 = slicerEntries_1.return)) _0.call(slicerEntries_1);
                     }
-                    finally { if (e_11) throw e_11.error; }
+                    finally { if (e_12) throw e_12.error; }
                 }
                 try {
                     // Phase D2 — emit pivot files.
@@ -596,12 +649,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[cacheEntry.path] = encodeXml(cacheEntry.xml);
                     }
                 }
-                catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                catch (e_13_1) { e_13 = { error: e_13_1 }; }
                 finally {
                     try {
-                        if (pivotCacheEntries_1_1 && !pivotCacheEntries_1_1.done && (_0 = pivotCacheEntries_1.return)) _0.call(pivotCacheEntries_1);
+                        if (pivotCacheEntries_1_1 && !pivotCacheEntries_1_1.done && (_1 = pivotCacheEntries_1.return)) _1.call(pivotCacheEntries_1);
                     }
-                    finally { if (e_12) throw e_12.error; }
+                    finally { if (e_13) throw e_13.error; }
                 }
                 try {
                     for (pivotCacheRelsEntries_1 = __values(pivotCacheRelsEntries), pivotCacheRelsEntries_1_1 = pivotCacheRelsEntries_1.next(); !pivotCacheRelsEntries_1_1.done; pivotCacheRelsEntries_1_1 = pivotCacheRelsEntries_1.next()) {
@@ -609,12 +662,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[cacheRels.path] = encodeXml(cacheRels.xml);
                     }
                 }
-                catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                catch (e_14_1) { e_14 = { error: e_14_1 }; }
                 finally {
                     try {
-                        if (pivotCacheRelsEntries_1_1 && !pivotCacheRelsEntries_1_1.done && (_1 = pivotCacheRelsEntries_1.return)) _1.call(pivotCacheRelsEntries_1);
+                        if (pivotCacheRelsEntries_1_1 && !pivotCacheRelsEntries_1_1.done && (_2 = pivotCacheRelsEntries_1.return)) _2.call(pivotCacheRelsEntries_1);
                     }
-                    finally { if (e_13) throw e_13.error; }
+                    finally { if (e_14) throw e_14.error; }
                 }
                 try {
                     for (pivotTableEntries_1 = __values(pivotTableEntries), pivotTableEntries_1_1 = pivotTableEntries_1.next(); !pivotTableEntries_1_1.done; pivotTableEntries_1_1 = pivotTableEntries_1.next()) {
@@ -622,12 +675,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[tableEntry.path] = encodeXml(tableEntry.xml);
                     }
                 }
-                catch (e_14_1) { e_14 = { error: e_14_1 }; }
+                catch (e_15_1) { e_15 = { error: e_15_1 }; }
                 finally {
                     try {
-                        if (pivotTableEntries_1_1 && !pivotTableEntries_1_1.done && (_2 = pivotTableEntries_1.return)) _2.call(pivotTableEntries_1);
+                        if (pivotTableEntries_1_1 && !pivotTableEntries_1_1.done && (_3 = pivotTableEntries_1.return)) _3.call(pivotTableEntries_1);
                     }
-                    finally { if (e_14) throw e_14.error; }
+                    finally { if (e_15) throw e_15.error; }
                 }
                 try {
                     for (pivotTableRelsEntries_1 = __values(pivotTableRelsEntries), pivotTableRelsEntries_1_1 = pivotTableRelsEntries_1.next(); !pivotTableRelsEntries_1_1.done; pivotTableRelsEntries_1_1 = pivotTableRelsEntries_1.next()) {
@@ -635,12 +688,12 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[tableRels.path] = encodeXml(tableRels.xml);
                     }
                 }
-                catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                catch (e_16_1) { e_16 = { error: e_16_1 }; }
                 finally {
                     try {
-                        if (pivotTableRelsEntries_1_1 && !pivotTableRelsEntries_1_1.done && (_3 = pivotTableRelsEntries_1.return)) _3.call(pivotTableRelsEntries_1);
+                        if (pivotTableRelsEntries_1_1 && !pivotTableRelsEntries_1_1.done && (_4 = pivotTableRelsEntries_1.return)) _4.call(pivotTableRelsEntries_1);
                     }
-                    finally { if (e_15) throw e_15.error; }
+                    finally { if (e_16) throw e_16.error; }
                 }
                 // Add external link files (for formulas referencing other workbooks)
                 for (i = 0; i < externalLinks.length; i++) {
@@ -663,18 +716,19 @@ export var createExcelFile = function (_a) { return __awaiter(void 0, [_a], void
                         files[part.path] = encodeXml(part.xml);
                     }
                 }
-                catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                catch (e_17_1) { e_17 = { error: e_17_1 }; }
                 finally {
                     try {
-                        if (_m && !_m.done && (_4 = _l.return)) _4.call(_l);
+                        if (_m && !_m.done && (_5 = _l.return)) _5.call(_l);
                     }
-                    finally { if (e_16) throw e_16.error; }
+                    finally { if (e_17) throw e_17.error; }
                 }
                 threadedCommentsSheets = worksheetEntries
                     .filter(function (entry) { return entry.threadedCommentsXml; })
                     .map(function (entry) { var _a; return (_a = entry.sheet.sheetId) !== null && _a !== void 0 ? _a : entry.index + 1; });
                 contentTypesXml = buildContentTypesXml({
-                    sheetCount: worksheetEntries.length,
+                    worksheetCount: worksheetCount,
+                    chartsheetCount: chartsheetCount,
                     tableCount: preparedTables.length,
                     drawingSheets: drawingSheets,
                     mediaExtensions: Array.from(imageExtensions),
@@ -804,7 +858,7 @@ export var normalizeSqrefMembers = function (refs) {
     };
     var out = [];
     var seen = new Set();
-    var _loop_2 = function (i) {
+    var _loop_3 = function (i) {
         var _a = parsed[i], ref = _a.ref, rect = _a.rect;
         if (seen.has(ref))
             return "continue";
@@ -823,7 +877,7 @@ export var normalizeSqrefMembers = function (refs) {
         out.push(ref);
     };
     for (var i = 0; i < parsed.length; i++) {
-        _loop_2(i);
+        _loop_3(i);
     }
     return out;
 };
@@ -971,7 +1025,7 @@ var getRowsForSheet = function (sheetData, sheetId) {
     return ((_d = (_b = (_a = sheetData[sheetId]) !== null && _a !== void 0 ? _a : sheetData[String(sheetId)]) !== null && _b !== void 0 ? _b : sheetData[Number(sheetId)]) !== null && _d !== void 0 ? _d : []);
 };
 var buildWorksheetXml = function (_a) {
-    var e_25, _b, e_26, _d, e_27, _e, e_28, _f, e_29, _g, e_30, _h;
+    var e_26, _b, e_27, _d, e_28, _e, e_29, _f, e_30, _g, e_31, _h;
     var _j, _k;
     var sheet = _a.sheet, rows = _a.rows, sharedStrings = _a.sharedStrings, sourceSharedStrings = _a.sourceSharedStrings, cellXfs = _a.cellXfs, styleBuilder = _a.styleBuilder, tables = _a.tables, relationships = _a.relationships, drawingContext = _a.drawingContext, conditionalFormats = _a.conditionalFormats, dataValidationsById = _a.dataValidationsById, dataValidations = _a.dataValidations, ignoreFormulaPatterns = _a.ignoreFormulaPatterns, citations = _a.citations, comments = _a.comments, personRegistry = _a.personRegistry, slicerRelIds = _a.slicerRelIds, sheetData = _a.sheetData, sheets = _a.sheets, locale = _a.locale, protectedRanges = _a.protectedRanges, _l = _a.formControls, formControls = _l === void 0 ? [] : _l, _m = _a.ctrlProps, ctrlProps = _m === void 0 ? { parts: [] } : _m;
     var tableNameMap = buildTableNameMap(tables);
@@ -1008,12 +1062,12 @@ var buildWorksheetXml = function (_a) {
                 }
             }
         }
-        catch (e_25_1) { e_25 = { error: e_25_1 }; }
+        catch (e_26_1) { e_26 = { error: e_26_1 }; }
         finally {
             try {
                 if (citations_1_1 && !citations_1_1.done && (_b = citations_1.return)) _b.call(citations_1);
             }
-            finally { if (e_25) throw e_25.error; }
+            finally { if (e_26) throw e_26.error; }
         }
     }
     if (dataValidations) {
@@ -1023,7 +1077,7 @@ var buildWorksheetXml = function (_a) {
                 if (!rule.ranges)
                     continue;
                 try {
-                    for (var _o = (e_27 = void 0, __values(rule.ranges)), _p = _o.next(); !_p.done; _p = _o.next()) {
+                    for (var _o = (e_28 = void 0, __values(rule.ranges)), _p = _o.next(); !_p.done; _p = _o.next()) {
                         var range = _p.value;
                         if (range.sheetId !== sheet.sheetId)
                             continue;
@@ -1037,21 +1091,21 @@ var buildWorksheetXml = function (_a) {
                         }
                     }
                 }
-                catch (e_27_1) { e_27 = { error: e_27_1 }; }
+                catch (e_28_1) { e_28 = { error: e_28_1 }; }
                 finally {
                     try {
                         if (_p && !_p.done && (_e = _o.return)) _e.call(_o);
                     }
-                    finally { if (e_27) throw e_27.error; }
+                    finally { if (e_28) throw e_28.error; }
                 }
             }
         }
-        catch (e_26_1) { e_26 = { error: e_26_1 }; }
+        catch (e_27_1) { e_27 = { error: e_27_1 }; }
         finally {
             try {
                 if (dataValidations_1_1 && !dataValidations_1_1.done && (_d = dataValidations_1.return)) _d.call(dataValidations_1);
             }
-            finally { if (e_26) throw e_26.error; }
+            finally { if (e_27) throw e_27.error; }
         }
     }
     // Pre-scan for valid shared-formula leaders in this sheet. The cell-emit
@@ -1071,7 +1125,7 @@ var buildWorksheetXml = function (_a) {
         if (!Array.isArray(rowValues))
             continue;
         try {
-            for (var rowValues_1 = (e_28 = void 0, __values(rowValues)), rowValues_1_1 = rowValues_1.next(); !rowValues_1_1.done; rowValues_1_1 = rowValues_1.next()) {
+            for (var rowValues_1 = (e_29 = void 0, __values(rowValues)), rowValues_1_1 = rowValues_1.next(); !rowValues_1_1.done; rowValues_1_1 = rowValues_1.next()) {
                 var cell = rowValues_1_1.value;
                 var sf = cell === null || cell === void 0 ? void 0 : cell.sf;
                 if (sf && sf.ref && Number.isFinite(sf.si)) {
@@ -1079,12 +1133,12 @@ var buildWorksheetXml = function (_a) {
                 }
             }
         }
-        catch (e_28_1) { e_28 = { error: e_28_1 }; }
+        catch (e_29_1) { e_29 = { error: e_29_1 }; }
         finally {
             try {
                 if (rowValues_1_1 && !rowValues_1_1.done && (_f = rowValues_1.return)) _f.call(rowValues_1);
             }
-            finally { if (e_28) throw e_28.error; }
+            finally { if (e_29) throw e_29.error; }
         }
     }
     for (var rowIndex = 1; rowIndex < maxRows; rowIndex++) {
@@ -1175,12 +1229,12 @@ var buildWorksheetXml = function (_a) {
                 commentsCollector.add(entry.address, entry.text, entry.author);
             }
         }
-        catch (e_29_1) { e_29 = { error: e_29_1 }; }
+        catch (e_30_1) { e_30 = { error: e_30_1 }; }
         finally {
             try {
                 if (_s && !_s.done && (_g = _q.return)) _g.call(_q);
             }
-            finally { if (e_29) throw e_29.error; }
+            finally { if (e_30) throw e_30.error; }
         }
         relationships.add(THREADED_COMMENT_REL_TYPE, "../threadedComments/threadedComment".concat(sheet.sheetId, ".xml"));
     }
@@ -1220,19 +1274,19 @@ var buildWorksheetXml = function (_a) {
         if (row === null || row === void 0 ? void 0 : row.values) {
             var rowValues = {};
             try {
-                for (var _t = (e_30 = void 0, __values(Object.entries(row.values))), _u = _t.next(); !_u.done; _u = _t.next()) {
+                for (var _t = (e_31 = void 0, __values(Object.entries(row.values))), _u = _t.next(); !_u.done; _u = _t.next()) {
                     var _v = __read(_u.value, 2), colIndex = _v[0], cell = _v[1];
                     if (cell) {
                         rowValues[parseInt(colIndex, 10)] = cell;
                     }
                 }
             }
-            catch (e_30_1) { e_30 = { error: e_30_1 }; }
+            catch (e_31_1) { e_31 = { error: e_31_1 }; }
             finally {
                 try {
                     if (_u && !_u.done && (_h = _t.return)) _h.call(_t);
                 }
-                finally { if (e_30) throw e_30.error; }
+                finally { if (e_31) throw e_31.error; }
             }
             if (Object.keys(rowValues).length > 0) {
                 rowDataMap[rowIndex] = rowValues;
@@ -1265,6 +1319,29 @@ var buildWorksheetXml = function (_a) {
         threadedCommentsXml: 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.
+ */
+var buildChartsheetXml = function (_a) {
+    var _b;
+    var sheet = _a.sheet, relationships = _a.relationships, drawingContext = _a.drawingContext;
+    var tabColor = serializeColorXml((_b = sheet.tabColor) !== null && _b !== void 0 ? _b : undefined);
+    var sheetPrXml = tabColor ? "<sheetPr><tabColor ".concat(tabColor, "/></sheetPr>") : "";
+    var drawingXml = drawingContext.hasDrawing()
+        ? "<drawing r:id=\"".concat(drawingContext.relId, "\"/>")
+        : "";
+    return {
+        xml: "".concat(XML_DECLARATION, "<chartsheet xmlns=\"").concat(WORKSHEET_NS, "\" xmlns:r=\"").concat(REL_NS, "\">").concat(sheetPrXml, "<sheetViews><sheetView workbookViewId=\"0\" zoomToFit=\"1\"/></sheetViews>").concat(buildPageMarginsXml(sheet.printSettings)).concat(drawingXml, "</chartsheet>"),
+        relationshipsXml: relationships.toXml(),
+        images: [],
+        commentsXml: undefined,
+        vmlDrawingXml: undefined,
+        threadedCommentsXml: undefined,
+    };
+};
 /**
  * Build combined extLst XML for worksheet (sparklines + slicers)
  */
@@ -1316,7 +1393,7 @@ var sanitizeIndex = function (value) {
     return Math.max(1, Math.floor(value));
 };
 var normalizeMergeRanges = function (ranges) {
-    var e_31, _a;
+    var e_32, _a;
     if (!(ranges === null || ranges === void 0 ? void 0 : ranges.length))
         return [];
     var sanitized = ranges
@@ -1338,7 +1415,7 @@ var normalizeMergeRanges = function (ranges) {
     });
     var valid = [];
     var active = [];
-    var _loop_3 = function (merge) {
+    var _loop_4 = function (merge) {
         if (active.length) {
             active = active.filter(function (entry) { return entry.endRowIndex >= merge.startRowIndex; });
         }
@@ -1355,20 +1432,125 @@ var normalizeMergeRanges = function (ranges) {
     try {
         for (var sorted_1 = __values(sorted), sorted_1_1 = sorted_1.next(); !sorted_1_1.done; sorted_1_1 = sorted_1.next()) {
             var merge = sorted_1_1.value;
-            _loop_3(merge);
+            _loop_4(merge);
         }
     }
-    catch (e_31_1) { e_31 = { error: e_31_1 }; }
+    catch (e_32_1) { e_32 = { error: e_32_1 }; }
     finally {
         try {
             if (sorted_1_1 && !sorted_1_1.done && (_a = sorted_1.return)) _a.call(sorted_1);
         }
-        finally { if (e_31) throw e_31.error; }
+        finally { if (e_32) throw e_32.error; }
     }
     return valid;
 };
+/** Escape `"` as `""` inside a formula string literal. */
+var escapeFormulaText = function (value) { return 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.
+var normalizeXlsxSourceType = function (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;
+    }
+};
+var normalizeXlsxSourceOperator = function (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.
+var stripLeadingEquals = function (formula) {
+    var 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.
+var XLSX_IDENTIFIER_TOKEN = /^[A-Za-z_\\][A-Za-z0-9_.]*$/;
+// A single A1 cell token: 1–3 letters followed by digits.
+var XLSX_A1_CELL_TOKEN = /^[A-Za-z]{1,3}[0-9]+$/;
+// A function call — `OFFSET(…)`, `INDIRECT(…)` — which Excel writes without
+// a leading `=`.
+var 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.
+var looksLikeXlsxListReference = function (text) {
+    return 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).
+var normalizeXlsxSourceListFormula1 = function (formula1) {
+    var trimmed = formula1.trim();
+    if (trimmed.startsWith('"'))
+        return trimmed;
+    if (trimmed.startsWith("="))
+        return trimmed.slice(1).trim();
+    if (looksLikeXlsxListReference(trimmed))
+        return trimmed;
+    return "\"".concat(escapeFormulaText(trimmed), "\"");
+};
 var convertDataValidationRule = function (rule) {
-    var _a, _b, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
+    var _a, _b, _d, _e, _f, _g;
     if (!rule)
         return undefined;
     var allowBlank = rule.allowBlank !== false;
@@ -1385,14 +1567,48 @@ var convertDataValidationRule = function (rule) {
         prompt: (_g = inputMessage === null || inputMessage === void 0 ? void 0 : inputMessage.message) !== null && _g !== void 0 ? _g : 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.
     var src = rule.xlsxSource;
+    var rejectedListSource;
     if (src && src.type && typeof src.formula1 === "string" && src.formula1) {
-        return __assign({ type: src.type, operator: src.operator, formula1: src.formula1, formula2: src.formula2, showDropDown: src.type === "list" && rule.displayStyle === "plain" ? true : undefined }, baseConfig);
+        var type = normalizeXlsxSourceType(src.type);
+        var operator = src.operator
+            ? normalizeXlsxSourceOperator(src.operator)
+            : undefined;
+        var operatorValid = !src.operator || operator !== undefined;
+        if (type !== undefined && operatorValid) {
+            var formula1 = type === "list"
+                ? normalizeXlsxSourceListFormula1(src.formula1)
+                : stripLeadingEquals(src.formula1);
+            return __assign({ type: type, operator: operator, formula1: formula1, formula2: src.formula2 ? stripLeadingEquals(src.formula2) : undefined, showDropDown: type === "list" && rule.displayStyle === "plain" ? true : undefined }, baseConfig);
+        }
+        if (type === "list") {
+            rejectedListSource = normalizeXlsxSourceListFormula1(src.formula1);
+        }
     }
-    if (!((_h = rule.condition) === null || _h === void 0 ? void 0 : _h.type)) {
+    var 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 __assign({ 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).
+var convertDataValidationCondition = function (rule, baseConfig) {
+    var _a, _b, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _s, _t, _u, _v, _w, _x, _y, _z;
+    if (!((_a = rule.condition) === null || _a === void 0 ? void 0 : _a.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
         // shows the tooltip when the cell is selected.
@@ -1402,9 +1618,8 @@ var convertDataValidationRule = function (rule) {
         return undefined;
     }
     var condition = rule.condition;
-    var values = (_j = condition.values) !== null && _j !== void 0 ? _j : [];
+    var values = (_b = condition.values) !== null && _b !== void 0 ? _b : [];
     var currentCell = 'INDIRECT("RC",FALSE)';
-    var escapeFormulaText = function (value) { return value.replace(/"/g, '""'); };
     var ensureFormula = function (value) {
         return value.startsWith("=") ? value : "=".concat(value);
     };
@@ -1428,7 +1643,7 @@ var convertDataValidationRule = function (rule) {
         return __assign({ type: "list", formula1: formula1.startsWith("=") ? formula1 : "=".concat(formula1), showDropDown: rule.displayStyle === "plain" ? true : undefined }, baseConfig);
     }
     if (condition.type === "CUSTOM_FORMULA") {
-        var raw = (_l = (_k = values[0]) === null || _k === void 0 ? void 0 : _k.userEnteredValue) !== null && _l !== void 0 ? _l : "";
+        var raw = (_e = (_d = values[0]) === null || _d === void 0 ? void 0 : _d.userEnteredValue) !== null && _e !== void 0 ? _e : "";
         if (!raw)
             return undefined;
         return __assign({ type: "custom", formula1: ensureFormula(raw) }, baseConfig);
@@ -1443,33 +1658,33 @@ var convertDataValidationRule = function (rule) {
         return __assign({ type: "custom", formula1: "=".concat(currentCell, "<>\"\"") }, baseConfig);
     }
     if (condition.type === "TEXT_EQ" || condition.type === "TEXT_NOT_EQ") {
-        var raw = (_o = (_m = values[0]) === null || _m === void 0 ? void 0 : _m.userEnteredValue) !== null && _o !== void 0 ? _o : "";
+        var raw = (_g = (_f = values[0]) === null || _f === void 0 ? void 0 : _f.userEnteredValue) !== null && _g !== void 0 ? _g : "";
         if (!raw)
             return undefined;
         var op = condition.type === "TEXT_EQ" ? "=" : "<>";
         return __assign({ type: "custom", formula1: "=".concat(currentCell).concat(op, "\"").concat(escapeFormulaText(raw), "\"") }, baseConfig);
     }
     if (condition.type === "TEXT_CONTAINS") {
-        var raw = (_q = (_p = values[0]) === null || _p === void 0 ? void 0 : _p.userEnteredValue) !== null && _q !== void 0 ? _q : "";
+        var raw = (_j = (_h = values[0]) === null || _h === void 0 ? void 0 : _h.userEnteredValue) !== null && _j !== void 0 ? _j : "";
         if (!raw)
             return undefined;
         return __assign({ type: "custom", formula1: "=ISNUMBER(SEARCH(\"".concat(escapeFormulaText(raw), "\",").concat(currentCell, "))") }, baseConfig);
     }
     if (condition.type === "TEXT_NOT_CONTAINS") {
-        var raw = (_t = (_s = values[0]) === null || _s === void 0 ? void 0 : _s.userEnteredValue) !== null && _t !== void 0 ? _t : "";
+        var raw = (_l = (_k = values[0]) === null || _k === void 0 ? void 0 : _k.userEnteredValue) !== null && _l !== void 0 ? _l : "";
         if (!raw)
             return undefined;
         return __assign({ type: "custom", formula1: "=ISERROR(SEARCH(\"".concat(escapeFormulaText(raw), "\",").concat(currentCell, "))") }, baseConfig);
     }
     if (condition.type === "TEXT_STARTS_WITH") {
-        var raw = (_v = (_u = values[0]) === null || _u === void 0 ? void 0 : _u.userEnteredValue) !== null && _v !== void 0 ? _v : "";
+        var raw = (_o = (_m = values[0]) === null || _m === void 0 ? void 0 : _m.userEnteredValue) !== null && _o !== void 0 ? _o : "";
         if (!raw)
             return undefined;
         var text = escapeFormulaText(raw);
         return __assign({ type: "custom", formula1: "=LEFT(".concat(currentCell, ",LEN(\"").concat(text, "\"))=\"").concat(text, "\"") }, baseConfig);
     }
     if (condition.type === "TEXT_ENDS_WITH") {
-        var raw = (_x = (_w = values[0]) === null || _w === void 0 ? void 0 : _w.userEnteredValue) !== null && _x !== void 0 ? _x : "";
+        var raw = (_q = (_p = values[0]) === null || _p === void 0 ? void 0 : _p.userEnteredValue) !== null && _q !== void 0 ? _q : "";
         if (!raw)
             return undefined;
         var text = escapeFormulaText(raw);
@@ -1489,10 +1704,10 @@ var convertDataValidationRule = function (rule) {
         condition.type === "NUMBER_GREATER_THAN_EQ" ||
         condition.type === "NUMBER_LESS" ||
         condition.type === "NUMBER_LESS_THAN_EQ") {
-        var first = (_z = (_y = values[0]) === null || _y === void 0 ? void 0 : _y.userEnteredValue) !== null && _z !== void 0 ? _z : "";
+        var first = (_t = (_s = values[0]) === null || _s === void 0 ? void 0 : _s.userEnteredValue) !== null && _t !== void 0 ? _t : "";
         if (!first)
             return undefined;
-        var second = (_1 = (_0 = values[1]) === null || _0 === void 0 ? void 0 : _0.userEnteredValue) !== null && _1 !== void 0 ? _1 : "";
+        var second = (_v = (_u = values[1]) === null || _u === void 0 ? void 0 : _u.userEnteredValue) !== null && _v !== void 0 ? _v : "";
         var operatorMap = {
             NUMBER_BETWEEN: "between",
             NUMBER_NOT_BETWEEN: "notBetween",
@@ -1529,10 +1744,10 @@ var convertDataValidationRule = function (rule) {
         condition.type === "DATE_ON_OR_AFTER" ||
         condition.type === "DATE_BETWEEN" ||
         condition.type === "DATE_NOT_BETWEEN") {
-        var first = (_3 = (_2 = values[0]) === null || _2 === void 0 ? void 0 : _2.userEnteredValue) !== null && _3 !== void 0 ? _3 : "";
+        var first = (_x = (_w = values[0]) === null || _w === void 0 ? void 0 : _w.userEnteredValue) !== null && _x !== void 0 ? _x : "";
         if (!first)
             return undefined;
-        var second = (_5 = (_4 = values[1]) === null || _4 === void 0 ? void 0 : _4.userEnteredValue) !== null && _5 !== void 0 ? _5 : "";
+        var second = (_z = (_y = values[1]) === null || _y === void 0 ? void 0 : _y.userEnteredValue) !== null && _z !== void 0 ? _z : "";
         var operatorMap = {
             DATE_EQ: "equal",
             DATE_NOT_EQ: "notEqual",
@@ -1730,7 +1945,7 @@ var buildWorksheetRow = function (_a) {
     };
 };
 var buildCellXml = function (_a) {
-    var e_32, _b;
+    var e_33, _b;
     var _d, _e, _f, _g, _h, _j, _k, _l;
     var rowNumber = _a.rowNumber, columnIndex = _a.columnIndex, cell = _a.cell, sharedStrings = _a.sharedStrings, sourceSharedStrings = _a.sourceSharedStrings, cellXfs = _a.cellXfs, styleBuilder = _a.styleBuilder, onImage = _a.onImage, onHyperlink = _a.onHyperlink, dataValidationsById = _a.dataValidationsById, onDataValidation = _a.onDataValidation, tableNameMap = _a.tableNameMap, tables = _a.tables, ignoreFormulaPatterns = _a.ignoreFormulaPatterns, commentsCollector = _a.commentsCollector, onCommentThread = _a.onCommentThread, sheetId = _a.sheetId, sheetData = _a.sheetData, sheets = _a.sheets, locale = _a.locale, validSharedFormulaLeaders = _a.validSharedFormulaLeaders;
     var normalizedCell = cell;
@@ -1827,12 +2042,12 @@ var buildCellXml = function (_a) {
                     sheetIdByName_1.set(s.title, s.sheetId);
             }
         }
-        catch (e_32_1) { e_32 = { error: e_32_1 }; }
+        catch (e_33_1) { e_33 = { error: e_33_1 }; }
         finally {
             try {
                 if (sheets_1_1 && !sheets_1_1.done && (_b = sheets_1.return)) _b.call(sheets_1);
             }
-            finally { if (e_32) throw e_32.error; }
+            finally { if (e_33) throw e_33.error; }
         }
         // A real CellXfsRegistry so `SheetCell.assign` inside the derive
         // helper can resolve precedent cells whose `uf` is a `{ sid }` style
@@ -2069,7 +2284,7 @@ function isValidExcelDateSerial(value) {
     return value >= MIN_EXCEL_DATE_SERIAL && value <= MAX_EXCEL_DATE_SERIAL;
 }
 function rewriteTableNamesInFormula(formula, tableNameMap) {
-    var e_33, _a;
+    var e_34, _a;
     if (!(tableNameMap === null || tableNameMap === void 0 ? void 0 : tableNameMap.size))
         return formula;
     var normalized = formula;
@@ -2084,12 +2299,12 @@ function rewriteTableNamesInFormula(formula, tableNameMap) {
             normalized = normalized.replace(new RegExp("".concat(escaped, "(?=\\[)"), "g"), exportedName);
         }
     }
-    catch (e_33_1) { e_33 = { error: e_33_1 }; }
+    catch (e_34_1) { e_34 = { error: e_34_1 }; }
     finally {
         try {
             if (tableNameMap_1_1 && !tableNameMap_1_1.done && (_a = tableNameMap_1.return)) _a.call(tableNameMap_1);
         }
-        finally { if (e_33) throw e_33.error; }
+        finally { if (e_34) throw e_34.error; }
     }
     return normalized;
 }
@@ -2489,7 +2704,7 @@ var buildRichRunProperties = function (format) {
  * style flag, but that's a cell-style concern, not a sharedString one.
  */
 var buildRichTextRuns = function (text, runs) {
-    var e_34, _a;
+    var e_35, _a;
     var sorted = __spreadArray([], __read(runs), false).sort(function (a, b) { return a.startIndex - b.startIndex; });
     var out = [];
     var cursor = 0;
@@ -2522,12 +2737,12 @@ var buildRichTextRuns = function (text, runs) {
                 cursor = end;
         }
     }
-    catch (e_34_1) { e_34 = { error: e_34_1 }; }
+    catch (e_35_1) { e_35 = { error: e_35_1 }; }
     finally {
         try {
             if (sorted_2_1 && !sorted_2_1.done && (_a = sorted_2.return)) _a.call(sorted_2);
         }
-        finally { if (e_34) throw e_34.error; }
+        finally { if (e_35) throw e_35.error; }
     }
     if (cursor < text.length) {
         emit(text.slice(cursor), "");
@@ -2548,7 +2763,7 @@ var buildSharedStringsXml = function (sharedStrings) {
     return "".concat(XML_DECLARATION, "<sst xmlns=\"").concat(WORKSHEET_NS, "\" count=\"").concat(sharedStrings.totalCount, "\" uniqueCount=\"").concat(sharedStrings.entries.length, "\">").concat(entries, "</sst>");
 };
 var buildTableNameMap = function (tables) {
-    var e_35, _a;
+    var e_36, _a;
     var _b;
     var map = new Map();
     try {
@@ -2560,12 +2775,12 @@ var buildTableNameMap = function (tables) {
             map.set(tableTitle, table.name);
         }
     }
-    catch (e_35_1) { e_35 = { error: e_35_1 }; }
+    catch (e_36_1) { e_36 = { error: e_36_1 }; }
     finally {
         try {
             if (tables_1_1 && !tables_1_1.done && (_a = tables_1.return)) _a.call(tables_1);
         }
-        finally { if (e_35) throw e_35.error; }
+        finally { if (e_36) throw e_36.error; }
     }
     return map;
 };
@@ -2573,7 +2788,7 @@ var buildTableNameMap = function (tables) {
 // whose box intersects another table on the same sheet. Drop both before
 // emitting so the workbook opens without "We found a problem" recovery prompts.
 var filterExportableTables = function (tables) {
-    var e_36, _a;
+    var e_37, _a;
     var _b;
     var isValidBox = function (range) {
         if (!range)
@@ -2600,7 +2815,7 @@ var filterExportableTables = function (tables) {
     };
     var keptBySheet = new Map();
     var result = [];
-    var _loop_4 = function (table) {
+    var _loop_5 = function (table) {
         if (!isValidBox(table.range))
             return "continue";
         var sheetKept = (_b = keptBySheet.get(table.sheetId)) !== null && _b !== void 0 ? _b : [];
@@ -2613,15 +2828,15 @@ var filterExportableTables = function (tables) {
     try {
         for (var tables_2 = __values(tables), tables_2_1 = tables_2.next(); !tables_2_1.done; tables_2_1 = tables_2.next()) {
             var table = tables_2_1.value;
-            _loop_4(table);
+            _loop_5(table);
         }
     }
-    catch (e_36_1) { e_36 = { error: e_36_1 }; }
+    catch (e_37_1) { e_37 = { error: e_37_1 }; }
     finally {
         try {
             if (tables_2_1 && !tables_2_1.done && (_a = tables_2.return)) _a.call(tables_2);
         }
-        finally { if (e_36) throw e_36.error; }
+        finally { if (e_37) throw e_37.error; }
     }
     return result;
 };
@@ -2697,8 +2912,8 @@ var resolveTableColumnTotals = function (column, totalsCell) {
     var label = getExtendedValueString(getCellUserEnteredValue(totalsCell));
     return label && label.trim() !== "" ? { totalsRowLabel: label } : undefined;
 };
-var buildTableXml = function (table, rows, sourceSharedStrings, styleBuilder) {
-    var _a, _b, _d;
+var buildTableXml = function (table, rows, sourceSharedStrings, styleBuilder, customTableStyleNames) {
+    var _a, _b, _d, _e;
     var rangeRef = table.ref;
     var columnCount = Math.max((_b = (_a = table.columns) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0, ((_d = table.range.endColumnIndex) !== null && _d !== void 0 ? _d : table.range.startColumnIndex) -
         table.range.startColumnIndex +
@@ -2774,18 +2989,76 @@ var buildTableXml = function (table, rows, sourceSharedStrings, styleBuilder) {
     })
         .join(""), "</tableColumns>");
     var isBuiltInStyle = table.theme && /^TableStyle(Light|Medium|Dark)\d+$/.test(table.theme);
-    var tableStyleName = isBuiltInStyle ? table.theme : "TableStyleMedium2";
+    // A custom style written to `<tableStyles>` keeps its name here (#668 T-103).
+    var isCustomStyle = !!table.theme && ((_e = customTableStyleNames === null || customTableStyleNames === void 0 ? void 0 : customTableStyleNames.has(table.theme)) !== null && _e !== void 0 ? _e : false);
+    var tableStyleName = isBuiltInStyle || isCustomStyle ? table.theme : "TableStyleMedium2";
     var tableStyleInfo = "<tableStyleInfo name=\"".concat(tableStyleName, "\" showFirstColumn=\"").concat(table.showFirstColumn ? 1 : 0, "\" showLastColumn=\"").concat(table.showLastColumn ? 1 : 0, "\" showRowStripes=\"").concat(table.showRowStripes ? 1 : 0, "\" showColumnStripes=\"").concat(table.showColumnStripes ? 1 : 0, "\"/>");
+    // Excel's per-column "filter button" toggle: `<filterColumn hiddenButton="1">`
+    // (the table-level toggle is the presence of `<autoFilter>` itself).
+    var hiddenButtonColumns = new Set(columnNames
+        .map(function (_, idx) { return idx; })
+        .filter(function (idx) { var _a, _b; return ((_b = (_a = table.columns) === null || _a === void 0 ? void 0 : _a[idx]) === null || _b === void 0 ? void 0 : _b.filterButton) === false; }));
     var autoFilter = headerRowCount > 0 && table.filterButton !== false
         ? (function () {
             var _a, _b, _d;
-            var filterColumns = buildFilterColumnsXml((_a = table.filterSpecs) !== null && _a !== void 0 ? _a : [], table.range, rows, (_b = table.headerRow) !== null && _b !== void 0 ? _b : true, (_d = table.totalRow) !== null && _d !== void 0 ? _d : false, styleBuilder);
+            var filterColumns = buildFilterColumnsXml((_a = table.filterSpecs) !== null && _a !== void 0 ? _a : [], table.range, rows, (_b = table.headerRow) !== null && _b !== void 0 ? _b : true, (_d = table.totalRow) !== null && _d !== void 0 ? _d : false, styleBuilder, hiddenButtonColumns);
             return filterColumns
                 ? "<autoFilter ref=\"".concat(rangeRef, "\">").concat(filterColumns, "</autoFilter>")
                 : "<autoFilter ref=\"".concat(rangeRef, "\"/>");
         })()
         : "";
-    return "".concat(XML_DECLARATION, "<table xmlns=\"").concat(WORKSHEET_NS, "\" id=\"").concat(table.id, "\" name=\"").concat(escapeXmlAttr(table.name), "\" displayName=\"").concat(escapeXmlAttr(table.displayName), "\" ref=\"").concat(rangeRef, "\" totalsRowCount=\"").concat(totalsRowCount, "\" headerRowCount=\"").concat(headerRowCount, "\">").concat(autoFilter).concat(tableColumns).concat(tableStyleInfo, "</table>");
+    var sortState = buildTableSortStateXml(table, headerRowCount, totalsRowCount, styleBuilder);
+    return "".concat(XML_DECLARATION, "<table xmlns=\"").concat(WORKSHEET_NS, "\" id=\"").concat(table.id, "\" name=\"").concat(escapeXmlAttr(table.name), "\" displayName=\"").concat(escapeXmlAttr(table.displayName), "\" ref=\"").concat(rangeRef, "\" totalsRowCount=\"").concat(totalsRowCount, "\" headerRowCount=\"").concat(headerRowCount, "\">").concat(autoFilter).concat(sortState).concat(tableColumns).concat(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`.
+ */
+var buildTableSortStateXml = function (table, headerRowCount, totalsRowCount, styleBuilder) {
+    var _a;
+    var sortSpecs = (_a = table.sortSpecs) !== null && _a !== void 0 ? _a : [];
+    var bodyStartRow = table.range.startRowIndex + headerRowCount;
+    var bodyEndRow = table.range.endRowIndex - totalsRowCount;
+    if (!sortSpecs.length || bodyEndRow < bodyStartRow)
+        return "";
+    var bodyRef = function (startColumnIndex, endColumnIndex) {
+        return cellRangeToAddress(undefined, {
+            startRowIndex: bodyStartRow,
+            endRowIndex: bodyEndRow,
+            startColumnIndex: startColumnIndex,
+            endColumnIndex: endColumnIndex,
+        });
+    };
+    var conditions = sortSpecs.map(function (spec) {
+        var _a, _b, _d;
+        var columnIndex = table.range.startColumnIndex + spec.dimensionIndex;
+        var attrs = ["ref=\"".concat(bodyRef(columnIndex, columnIndex), "\"")];
+        if (spec.sortOrder === "DESCENDING")
+            attrs.push("descending=\"1\"");
+        var sortBy = (_a = spec.sortBy) !== null && _a !== void 0 ? _a : "value";
+        if (sortBy === "cellColor" || sortBy === "fontColor") {
+            attrs.push("sortBy=\"".concat(sortBy, "\""));
+            var dxfId = spec.sortColor && styleBuilder
+                ? styleBuilder.registerDifferentialFormat(sortBy === "cellColor"
+                    ? { backgroundColor: spec.sortColor }
+                    : { textFormat: { color: spec.sortColor } })
+                : undefined;
+            if (typeof dxfId === "number")
+                attrs.push("dxfId=\"".concat(dxfId, "\""));
+        }
+        else if (sortBy === "icon" && spec.sortIcon) {
+            attrs.push("sortBy=\"icon\"", "iconSet=\"".concat(escapeXmlAttr(spec.sortIcon.iconSet), "\""), "iconId=\"".concat((_b = spec.sortIcon.iconId) !== null && _b !== void 0 ? _b : 0, "\""));
+        }
+        if ((_d = spec.customList) === null || _d === void 0 ? void 0 : _d.length) {
+            attrs.push("customList=\"".concat(escapeXmlAttr(spec.customList.join(",")), "\""));
+        }
+        return "<sortCondition ".concat(attrs.join(" "), "/>");
+    });
+    return "<sortState ref=\"".concat(bodyRef(table.range.startColumnIndex, table.range.endColumnIndex), "\">").concat(conditions.join(""), "</sortState>");
 };
 var getFilterVisibleValues = function (spec, range, rows, headerRow, totalRow) {
     var _a, _b, _d;
@@ -2846,7 +3119,7 @@ var SHEET_PROTECTION_FLAG_ATTRS = [
  * Excel's schema default applies). Mirrors `rnc-export`'s `sheet_protection_xml`.
  */
 var buildSheetProtectionElementXml = function (protection) {
-    var e_37, _a;
+    var e_38, _a;
     var attrs = [];
     if (protection.algorithmName) {
         attrs.push("algorithmName=\"".concat(escapeXmlAttr(protection.algorithmName), "\""));
@@ -2872,12 +3145,12 @@ var buildSheetProtectionElementXml = function (protection) {
             }
         }
     }
-    catch (e_37_1) { e_37 = { error: e_37_1 }; }
+    catch (e_38_1) { e_38 = { error: e_38_1 }; }
     finally {
         try {
             if (SHEET_PROTECTION_FLAG_ATTRS_1_1 && !SHEET_PROTECTION_FLAG_ATTRS_1_1.done && (_a = SHEET_PROTECTION_FLAG_ATTRS_1.return)) _a.call(SHEET_PROTECTION_FLAG_ATTRS_1);
         }
-        finally { if (e_37) throw e_37.error; }
+        finally { if (e_38) throw e_38.error; }
     }
     return attrs.length ? "<sheetProtection ".concat(attrs.join(" "), "/>") : "";
 };
@@ -2889,7 +3162,7 @@ var buildSheetProtectionElementXml = function (protection) {
  * is the range's id, synthesized as `Range{n}` when absent (schema requires it).
  */
 var buildSheetProtectionXml = function (sheet, protectedRanges) {
-    var e_38, _a;
+    var e_39, _a;
     var protectionXml = sheet.sheetProtection
         ? buildSheetProtectionElementXml(sheet.sheetProtection)
         : "";
@@ -2930,12 +3203,12 @@ var buildSheetProtectionXml = function (sheet, protectedRanges) {
             rangeItems.push("<protectedRange sqref=\"".concat(escapeXmlAttr(sqref), "\" name=\"").concat(escapeXmlAttr(name_1), "\"").concat(securityDescriptor, "/>"));
         }
     }
-    catch (e_38_1) { e_38 = { error: e_38_1 }; }
+    catch (e_39_1) { e_39 = { error: e_39_1 }; }
     finally {
         try {
             if (_d && !_d.done && (_a = _b.return)) _a.call(_b);
         }
-        finally { if (e_38) throw e_38.error; }
+        finally { if (e_39) throw e_39.error; }
     }
     var rangesXml = rangeItems.length
         ? "<protectedRanges>".concat(rangeItems.join(""), "</protectedRanges>")
@@ -2984,8 +3257,14 @@ var xmlNumAttr = function (name, value) {
  * mandatory in practice (Excel always writes it), so the default margins go
  * out when the sheet has none of its own.
  */
-var buildPrintSettingsXml = function (print) {
+var buildPageMarginsXml = function (print) {
     var _a, _b, _d, _e, _f, _g;
+    var margins = print === null || print === void 0 ? void 0 : print.pageMargins;
+    return margins && Object.values(margins).some(function (v) { return typeof v === "number"; })
+        ? "<pageMargins left=\"".concat((_a = margins.left) !== null && _a !== void 0 ? _a : 0.7, "\" right=\"").concat((_b = margins.right) !== null && _b !== void 0 ? _b : 0.7, "\" top=\"").concat((_d = margins.top) !== null && _d !== void 0 ? _d : 0.75, "\" bottom=\"").concat((_e = margins.bottom) !== null && _e !== void 0 ? _e : 0.75, "\" header=\"").concat((_f = margins.header) !== null && _f !== void 0 ? _f : 0.3, "\" footer=\"").concat((_g = margins.footer) !== null && _g !== void 0 ? _g : 0.3, "\"/>")
+        : DEFAULT_PAGE_MARGINS;
+};
+var buildPrintSettingsXml = function (print) {
     var parts = [];
     var options = print === null || print === void 0 ? void 0 : print.printOptions;
     var optionAttrs = xmlBoolAttr("horizontalCentered", options === null || options === void 0 ? void 0 : options.horizontalCentered) +
@@ -2994,11 +3273,7 @@ var buildPrintSettingsXml = function (print) {
         xmlBoolAttr("gridLines", options === null || options === void 0 ? void 0 : options.gridLines);
     if (optionAttrs)
         parts.push("<printOptions".concat(optionAttrs, "/>"));
-    var margins = print === null || print === void 0 ? void 0 : print.pageMargins;
-    parts.push(margins &&
-        Object.values(margins).some(function (v) { return typeof v === "number"; })
-        ? "<pageMargins left=\"".concat((_a = margins.left) !== null && _a !== void 0 ? _a : 0.7, "\" right=\"").concat((_b = margins.right) !== null && _b !== void 0 ? _b : 0.7, "\" top=\"").concat((_d = margins.top) !== null && _d !== void 0 ? _d : 0.75, "\" bottom=\"").concat((_e = margins.bottom) !== null && _e !== void 0 ? _e : 0.75, "\" header=\"").concat((_f = margins.header) !== null && _f !== void 0 ? _f : 0.3, "\" footer=\"").concat((_g = margins.footer) !== null && _g !== void 0 ? _g : 0.3, "\"/>")
-        : DEFAULT_PAGE_MARGINS);
+    parts.push(buildPageMarginsXml(print));
     var setup = print === null || print === void 0 ? void 0 : print.pageSetup;
     if (setup) {
         // Excel keeps `firstPageNumber` as a dormant value until the user picks
@@ -3063,20 +3338,49 @@ var buildPrintSettingsXml = function (print) {
     }
     return parts.join("");
 };
-var buildFilterColumnsXml = function (filterSpecs, range, rows, headerRow, totalRow, styleBuilder) {
+var buildFilterColumnsXml = function (filterSpecs, range, rows, headerRow, totalRow, styleBuilder, 
+/** Table-relative column ids whose header hides its filter button. */
+hiddenButtonColumns) {
+    var e_40, _a;
     if (headerRow === void 0) { headerRow = true; }
     if (totalRow === void 0) { totalRow = false; }
-    if (!(filterSpecs === null || filterSpecs === void 0 ? void 0 : filterSpecs.length))
-        return "";
-    var entries = filterSpecs
-        .map(function (spec) {
-        return buildFilterColumnXml(spec, range, rows, headerRow, totalRow, styleBuilder);
+    var entries = new Map();
+    try {
+        for (var _b = __values(filterSpecs !== null && filterSpecs !== void 0 ? filterSpecs : []), _d = _b.next(); !_d.done; _d = _b.next()) {
+            var spec = _d.value;
+            var xml = buildFilterColumnXml(spec, range, rows, headerRow, totalRow, styleBuilder);
+            if (xml)
+                entries.set(spec.columnIndex, xml);
+        }
+    }
+    catch (e_40_1) { e_40 = { error: e_40_1 }; }
+    finally {
+        try {
+            if (_d && !_d.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_40) throw e_40.error; }
+    }
+    // `hiddenButton="1"` rides the column's criteria element when it has one,
+    // else a bare `<filterColumn/>` carries it.
+    hiddenButtonColumns === null || hiddenButtonColumns === void 0 ? void 0 : hiddenButtonColumns.forEach(function (colId) {
+        var existing = entries.get(colId);
+        entries.set(colId, existing
+            ? existing.replace("<filterColumn colId=\"".concat(colId, "\">"), "<filterColumn colId=\"".concat(colId, "\" hiddenButton=\"1\">"))
+            : "<filterColumn colId=\"".concat(colId, "\" hiddenButton=\"1\"/>"));
+    });
+    return __spreadArray([], __read(entries.entries()), false).sort(function (_a, _b) {
+        var _d = __read(_a, 1), a = _d[0];
+        var _e = __read(_b, 1), b = _e[0];
+        return a - b;
     })
-        .filter(function (entry) { return Boolean(entry); });
-    return entries.join("");
+        .map(function (_a) {
+        var _b = __read(_a, 2), xml = _b[1];
+        return xml;
+    })
+        .join("");
 };
 var buildFilterColumnXml = function (spec, range, rows, headerRow, totalRow, styleBuilder) {
-    var _a, _b, _d, _e, _f, _g;
+    var _a, _b, _d, _e, _f;
     if (headerRow === void 0) { headerRow = true; }
     if (totalRow === void 0) { totalRow = false; }
     var parts = [];
@@ -3105,13 +3409,15 @@ var buildFilterColumnXml = function (spec, range, rows, headerRow, totalRow, sty
     // 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.
-    var conditionXml = buildAutoFilterConditionXml((_e = spec.filterCriteria) === null || _e === void 0 ? void 0 : _e.condition);
+    var conditionXml = spec.filterCriteria
+        ? buildAutoFilterCriteriaXml(spec.filterCriteria)
+        : null;
     if (conditionXml) {
         parts.push(conditionXml);
     }
     else {
         // <filters><filter val=…/></filters>
-        var values = (_g = (_f = spec.filterCriteria) === null || _f === void 0 ? void 0 : _f.visibleValues) !== null && _g !== void 0 ? _g : getFilterVisibleValues(spec, range, rows, headerRow, totalRow);
+        var values = (_f = (_e = spec.filterCriteria) === null || _e === void 0 ? void 0 : _e.visibleValues) !== null && _f !== void 0 ? _f : getFilterVisibleValues(spec, range, rows, headerRow, totalRow);
         if (values === null || values === void 0 ? void 0 : values.length) {
             var filters = values
                 .map(function (value) { return "<filter val=\"".concat(escapeXmlAttr(value), "\"/>"); })
@@ -3134,10 +3440,10 @@ var gridRangeToRef = function (range) {
         return undefined;
     }
 };
-var groupEmbedsBySheet = function (embeds) {
+var groupEmbedsBySheet = function (embeds, chartCount) {
     var result = new Map();
-    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, order) {
-        var _a, _b, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, index) {
+        var _a, _b, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         if (!((_a = embed.position) === null || _a === void 0 ? void 0 : _a.overlayPosition))
             return;
         if (((_b = embed.spec) === null || _b === void 0 ? void 0 : _b.type) !== "image")
@@ -3156,24 +3462,25 @@ var groupEmbedsBySheet = function (embeds) {
             adjustments: Object.values(adjustments).some(function (v) { return v !== undefined; })
                 ? adjustments
                 : undefined,
-            order: order,
+            order: (_h = embed.position.zOrder) !== null && _h !== void 0 ? _h : chartCount + index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
-            offsetX: (_h = overlay.offsetXPixels) !== null && _h !== void 0 ? _h : 0,
-            offsetY: (_j = overlay.offsetYPixels) !== null && _j !== void 0 ? _j : 0,
-            width: (_k = overlay.widthPixels) !== null && _k !== void 0 ? _k : 120,
-            height: (_l = overlay.heightPixels) !== null && _l !== void 0 ? _l : 120,
+            offsetX: (_j = overlay.offsetXPixels) !== null && _j !== void 0 ? _j : 0,
+            offsetY: (_k = overlay.offsetYPixels) !== null && _k !== void 0 ? _k : 0,
+            width: (_l = overlay.widthPixels) !== null && _l !== void 0 ? _l : 120,
+            height: (_m = overlay.heightPixels) !== null && _m !== void 0 ? _m : 120,
+            overlay: overlay,
         };
-        var list = (_m = result.get(embed.position.sheetId)) !== null && _m !== void 0 ? _m : [];
+        var list = (_o = result.get(embed.position.sheetId)) !== null && _o !== void 0 ? _o : [];
         list.push(placement);
         result.set(embed.position.sheetId, list);
     });
     return result;
 };
-var groupTextBoxesBySheet = function (embeds) {
+var groupTextBoxesBySheet = function (embeds, chartCount) {
     var result = new Map();
-    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, order) {
-        var _a, _b, _d, _e, _f, _g, _h;
+    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, index) {
+        var _a, _b, _d, _e, _f, _g, _h, _j;
         if (!((_a = embed.position) === null || _a === void 0 ? void 0 : _a.overlayPosition))
             return;
         if (((_b = embed.spec) === null || _b === void 0 ? void 0 : _b.type) !== "textbox")
@@ -3181,25 +3488,25 @@ var groupTextBoxesBySheet = function (embeds) {
         var overlay = embed.position.overlayPosition;
         var placement = {
             textBox: embed,
-            order: order,
+            order: (_d = embed.position.zOrder) !== null && _d !== void 0 ? _d : chartCount + index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
-            offsetX: (_d = overlay.offsetXPixels) !== null && _d !== void 0 ? _d : 0,
-            offsetY: (_e = overlay.offsetYPixels) !== null && _e !== void 0 ? _e : 0,
-            width: (_f = overlay.widthPixels) !== null && _f !== void 0 ? _f : 120,
-            height: (_g = overlay.heightPixels) !== null && _g !== void 0 ? _g : 60,
+            offsetX: (_e = overlay.offsetXPixels) !== null && _e !== void 0 ? _e : 0,
+            offsetY: (_f = overlay.offsetYPixels) !== null && _f !== void 0 ? _f : 0,
+            width: (_g = overlay.widthPixels) !== null && _g !== void 0 ? _g : 120,
+            height: (_h = overlay.heightPixels) !== null && _h !== void 0 ? _h : 60,
         };
-        var list = (_h = result.get(embed.position.sheetId)) !== null && _h !== void 0 ? _h : [];
+        var list = (_j = result.get(embed.position.sheetId)) !== null && _j !== void 0 ? _j : [];
         list.push(placement);
         result.set(embed.position.sheetId, list);
     });
     return result;
 };
 /** Form-control embeds (`spec.type === "formControl"`) by sheet, in host order. */
-var groupFormControlsBySheet = function (embeds) {
+var groupFormControlsBySheet = function (embeds, chartCount) {
     var result = new Map();
-    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, order) {
-        var _a, _b, _d, _e, _f, _g, _h;
+    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, index) {
+        var _a, _b, _d, _e, _f, _g, _h, _j;
         if (!((_a = embed.position) === null || _a === void 0 ? void 0 : _a.overlayPosition))
             return;
         if (((_b = embed.spec) === null || _b === void 0 ? void 0 : _b.type) !== "formControl")
@@ -3207,15 +3514,15 @@ var groupFormControlsBySheet = function (embeds) {
         var overlay = embed.position.overlayPosition;
         var placement = {
             shape: embed,
-            order: order,
+            order: (_d = embed.position.zOrder) !== null && _d !== void 0 ? _d : chartCount + index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
-            offsetX: (_d = overlay.offsetXPixels) !== null && _d !== void 0 ? _d : 0,
-            offsetY: (_e = overlay.offsetYPixels) !== null && _e !== void 0 ? _e : 0,
-            width: (_f = overlay.widthPixels) !== null && _f !== void 0 ? _f : 120,
-            height: (_g = overlay.heightPixels) !== null && _g !== void 0 ? _g : 20,
+            offsetX: (_e = overlay.offsetXPixels) !== null && _e !== void 0 ? _e : 0,
+            offsetY: (_f = overlay.offsetYPixels) !== null && _f !== void 0 ? _f : 0,
+            width: (_g = overlay.widthPixels) !== null && _g !== void 0 ? _g : 120,
+            height: (_h = overlay.heightPixels) !== null && _h !== void 0 ? _h : 20,
         };
-        var list = (_h = result.get(embed.position.sheetId)) !== null && _h !== void 0 ? _h : [];
+        var list = (_j = result.get(embed.position.sheetId)) !== null && _j !== void 0 ? _j : [];
         list.push(placement);
         result.set(embed.position.sheetId, list);
     });
@@ -3254,7 +3561,7 @@ var buildSheetFormControls = function (_a) {
         return total;
     };
     controls.forEach(function (placement, position) {
-        var _a, _b, _d, _e;
+        var _a, _b, _d, _e, _f, _g, _h;
         var spec = placement.shape.spec;
         var fromRow = Math.max(0, placement.rowIndex - 1);
         var fromColumn = Math.max(0, placement.columnIndex - 1);
@@ -3264,18 +3571,33 @@ var buildSheetFormControls = function (_a) {
         var heightPx = Math.max(5, (_e = placement.height) !== null && _e !== void 0 ? _e : 20);
         var columnSize = function (index) { return getColumnWidthPx(sheet, index, true); };
         var rowSize = function (index) { return getRowHeightPx(sheet, index, true); };
-        var toColumn = resolveAnchorEndpoint({
-            startIndex: fromColumn,
-            startOffset: offsetX,
-            span: widthPx,
-            getSize: columnSize,
-        });
-        var toRow = resolveAnchorEndpoint({
-            startIndex: fromRow,
-            startOffset: offsetY,
-            span: heightPx,
-            getSize: rowSize,
-        });
+        // A "Move and size" control keeps its persisted second anchor (#668 C-46)
+        var overlay = (_f = placement.shape.position) === null || _f === void 0 ? void 0 : _f.overlayPosition;
+        var persistedTo = controlAnchorFlags(spec, overlay).sizeWithCells && (overlay === null || overlay === void 0 ? void 0 : overlay.toCell)
+            ? overlay.toCell
+            : undefined;
+        var toColumn = persistedTo
+            ? {
+                index: Math.max(0, persistedTo.columnIndex - 1),
+                offset: Math.max(0, (_g = overlay === null || overlay === void 0 ? void 0 : overlay.toOffsetXPixels) !== null && _g !== void 0 ? _g : 0),
+            }
+            : resolveAnchorEndpoint({
+                startIndex: fromColumn,
+                startOffset: offsetX,
+                span: widthPx,
+                getSize: columnSize,
+            });
+        var toRow = persistedTo
+            ? {
+                index: Math.max(0, persistedTo.rowIndex - 1),
+                offset: Math.max(0, (_h = overlay === null || overlay === void 0 ? void 0 : overlay.toOffsetYPixels) !== null && _h !== void 0 ? _h : 0),
+            }
+            : resolveAnchorEndpoint({
+                startIndex: fromRow,
+                startOffset: offsetY,
+                span: heightPx,
+                getSize: rowSize,
+            });
         var partIndex = ctrlProps.parts.length + 1;
         var path = "xl/ctrlProps/ctrlProp".concat(partIndex, ".xml");
         ctrlProps.parts.push({ path: path, xml: buildCtrlPropXml(spec) });
@@ -3297,11 +3619,13 @@ var buildSheetFormControls = function (_a) {
                 row: toRow.index,
                 rowOff: toRow.offset * EMUS_PER_PIXEL,
             },
+            overlay: overlay,
         }));
         vmlShapes.push(buildFormControlVmlShape({
             spec: spec,
             shapeId: shapeId,
             zIndex: zIndexStart + position + 1,
+            overlay: overlay,
             geometry: {
                 leftPx: sumSizes(fromColumn, columnSize) + offsetX,
                 topPx: sumSizes(fromRow, rowSize) + offsetY,
@@ -3322,10 +3646,10 @@ var buildSheetFormControls = function (_a) {
     });
     return { controlsXml: buildControlsXml(controlElements), vmlShapes: vmlShapes };
 };
-var groupShapesBySheet = function (embeds) {
+var groupShapesBySheet = function (embeds, chartCount) {
     var result = new Map();
-    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, order) {
-        var _a, _b, _d, _e, _f, _g, _h;
+    (embeds !== null && embeds !== void 0 ? embeds : []).forEach(function (embed, index) {
+        var _a, _b, _d, _e, _f, _g, _h, _j;
         if (!((_a = embed.position) === null || _a === void 0 ? void 0 : _a.overlayPosition))
             return;
         if (((_b = embed.spec) === null || _b === void 0 ? void 0 : _b.type) !== "shape")
@@ -3333,55 +3657,45 @@ var groupShapesBySheet = function (embeds) {
         var overlay = embed.position.overlayPosition;
         var placement = {
             shape: embed,
-            order: order,
+            order: (_d = embed.position.zOrder) !== null && _d !== void 0 ? _d : chartCount + index,
             rowIndex: overlay.anchorCell.rowIndex,
             columnIndex: overlay.anchorCell.columnIndex,
-            offsetX: (_d = overlay.offsetXPixels) !== null && _d !== void 0 ? _d : 0,
-            offsetY: (_e = overlay.offsetYPixels) !== null && _e !== void 0 ? _e : 0,
-            width: (_f = overlay.widthPixels) !== null && _f !== void 0 ? _f : 120,
-            height: (_g = overlay.heightPixels) !== null && _g !== void 0 ? _g : 60,
+            offsetX: (_e = overlay.offsetXPixels) !== null && _e !== void 0 ? _e : 0,
+            offsetY: (_f = overlay.offsetYPixels) !== null && _f !== void 0 ? _f : 0,
+            width: (_g = overlay.widthPixels) !== null && _g !== void 0 ? _g : 120,
+            height: (_h = overlay.heightPixels) !== null && _h !== void 0 ? _h : 60,
         };
-        var list = (_h = result.get(embed.position.sheetId)) !== null && _h !== void 0 ? _h : [];
+        var list = (_j = result.get(embed.position.sheetId)) !== null && _j !== void 0 ? _j : [];
         list.push(placement);
         result.set(embed.position.sheetId, list);
     });
     return result;
 };
 var groupChartsBySheet = function (charts) {
-    var e_39, _a;
-    var _b, _d, _e, _f, _g, _h;
     var result = new Map();
-    try {
-        for (var _j = __values(charts !== null && charts !== void 0 ? charts : []), _k = _j.next(); !_k.done; _k = _j.next()) {
-            var chart = _k.value;
-            var overlay = (_b = chart.position) === null || _b === void 0 ? void 0 : _b.overlayPosition;
-            if (!overlay)
-                continue;
-            var placement = {
-                chart: chart,
-                rowIndex: overlay.anchorCell.rowIndex,
-                columnIndex: overlay.anchorCell.columnIndex,
-                offsetX: (_d = overlay.offsetXPixels) !== null && _d !== void 0 ? _d : 0,
-                offsetY: (_e = overlay.offsetYPixels) !== null && _e !== void 0 ? _e : 0,
-                width: (_f = overlay.widthPixels) !== null && _f !== void 0 ? _f : 300,
-                height: (_g = overlay.heightPixels) !== null && _g !== void 0 ? _g : 200,
-            };
-            var list = (_h = result.get(chart.position.sheetId)) !== null && _h !== void 0 ? _h : [];
-            list.push(placement);
-            result.set(chart.position.sheetId, list);
-        }
-    }
-    catch (e_39_1) { e_39 = { error: e_39_1 }; }
-    finally {
-        try {
-            if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
-        }
-        finally { if (e_39) throw e_39.error; }
-    }
+    (charts !== null && charts !== void 0 ? charts : []).forEach(function (chart, index) {
+        var _a, _b, _d, _e, _f, _g, _h;
+        var overlay = (_a = chart.position) === null || _a === void 0 ? void 0 : _a.overlayPosition;
+        if (!overlay)
+            return;
+        var placement = {
+            chart: chart,
+            order: (_b = chart.position.zOrder) !== null && _b !== void 0 ? _b : index,
+            rowIndex: overlay.anchorCell.rowIndex,
+            columnIndex: overlay.anchorCell.columnIndex,
+            offsetX: (_d = overlay.offsetXPixels) !== null && _d !== void 0 ? _d : 0,
+            offsetY: (_e = overlay.offsetYPixels) !== null && _e !== void 0 ? _e : 0,
+            width: (_f = overlay.widthPixels) !== null && _f !== void 0 ? _f : 300,
+            height: (_g = overlay.heightPixels) !== null && _g !== void 0 ? _g : 200,
+        };
+        var list = (_h = result.get(chart.position.sheetId)) !== null && _h !== void 0 ? _h : [];
+        list.push(placement);
+        result.set(chart.position.sheetId, list);
+    });
     return result;
 };
 var groupSlicersBySheet = function (slicers) {
-    var e_40, _a;
+    var e_41, _a;
     var _b, _d, _e, _f, _g, _h;
     var result = new Map();
     try {
@@ -3404,17 +3718,17 @@ var groupSlicersBySheet = function (slicers) {
             result.set(slicer.position.sheetId, list);
         }
     }
-    catch (e_40_1) { e_40 = { error: e_40_1 }; }
+    catch (e_41_1) { e_41 = { error: e_41_1 }; }
     finally {
         try {
             if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
         }
-        finally { if (e_40) throw e_40.error; }
+        finally { if (e_41) throw e_41.error; }
     }
     return result;
 };
 var buildConditionalFormattingXml = function (_a) {
-    var e_41, _b;
+    var e_42, _b;
     var _d, _e, _f;
     var conditionalFormats = _a.conditionalFormats, sheetId = _a.sheetId, styleBuilder = _a.styleBuilder;
     if (!(conditionalFormats === null || conditionalFormats === void 0 ? void 0 : conditionalFormats.length)) {
@@ -3478,12 +3792,12 @@ var buildConditionalFormattingXml = function (_a) {
             parts.push("<conditionalFormatting sqref=\"".concat(sqrefParts.join(" "), "\">").concat(ruleXmlEntries.join(""), "</conditionalFormatting>"));
         }
     }
-    catch (e_41_1) { e_41 = { error: e_41_1 }; }
+    catch (e_42_1) { e_42 = { error: e_42_1 }; }
     finally {
         try {
             if (orderedRules_1_1 && !orderedRules_1_1.done && (_b = orderedRules_1.return)) _b.call(orderedRules_1);
         }
-        finally { if (e_41) throw e_41.error; }
+        finally { if (e_42) throw e_42.error; }
     }
     return parts.join("");
 };
@@ -3979,9 +4293,9 @@ var buildConditionalFormattingRuleXml = function (_a) {
     return rules.length ? rules : undefined;
 };
 var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var anchors, relationships, media, imageIndex, chartIndex, chartExIndex, pictureId, frameId, chartEntries, chartExEntries, charts_1, charts_1_1, placement, chartExXml, relId_1, chartXml, relId, slicers_1, slicers_1_1, placement, embedAnchors, orderOf, textBoxes_1, textBoxes_1_1, placement, shapes_1, shapes_1_1, placement, placements_1, placements_1_1, placement, dataUrl, buffer, mediaPath, relId, e_42_1, embedAnchors_1, embedAnchors_1_1, entry, drawingXml;
-    var e_43, _d, e_44, _e, e_45, _f, e_46, _g, e_42, _h, e_47, _j;
-    var placements = _b.placements, textBoxes = _b.textBoxes, _k = _b.shapes, shapes = _k === void 0 ? [] : _k, startImageIndex = _b.startImageIndex, startChartIndex = _b.startChartIndex, _l = _b.startChartExIndex, startChartExIndex = _l === void 0 ? 1 : _l, charts = _b.charts, slicers = _b.slicers, sheet = _b.sheet, sheetNameById = _b.sheetNameById;
+    var anchors, relationships, media, imageIndex, chartIndex, chartExIndex, pictureId, frameId, chartEntries, chartExEntries, orderedAnchors, orderOf, charts_1, charts_1_1, placement, chartExXml, relId_1, chartXml, relId, slicers_1, slicers_1_1, placement, textBoxes_1, textBoxes_1_1, placement, shapes_1, shapes_1_1, placement, placements_1, placements_1_1, placement, dataUrl, buffer, mediaPath, relId, e_43_1, orderedAnchors_1, orderedAnchors_1_1, entry, drawingXml;
+    var e_44, _d, e_45, _e, e_46, _f, e_47, _g, e_43, _h, e_48, _j;
+    var placements = _b.placements, textBoxes = _b.textBoxes, _k = _b.shapes, shapes = _k === void 0 ? [] : _k, startImageIndex = _b.startImageIndex, startChartIndex = _b.startChartIndex, _l = _b.startChartExIndex, startChartExIndex = _l === void 0 ? 1 : _l, charts = _b.charts, slicers = _b.slicers, sheet = _b.sheet, sheetNameById = _b.sheetNameById, resolvePivotSourceName = _b.resolvePivotSourceName;
     return __generator(this, function (_m) {
         switch (_m.label) {
             case 0:
@@ -4001,6 +4315,10 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                 frameId = 1;
                 chartEntries = [];
                 chartExEntries = [];
+                orderedAnchors = [];
+                orderOf = function (order) {
+                    return order !== null && order !== void 0 ? order : Number.MAX_SAFE_INTEGER;
+                };
                 try {
                     for (charts_1 = __values(charts), charts_1_1 = charts_1.next(); !charts_1_1.done; charts_1_1 = charts_1.next()) {
                         placement = charts_1_1.value;
@@ -4009,7 +4327,16 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                             if (!chartExXml)
                                 continue;
                             relId_1 = relationships.add(CHART_EX_REL_TYPE, "../charts/chartEx".concat(chartExIndex, ".xml"));
-                            anchors.push(createChartAnchor({ sheet: sheet, placement: placement, relId: relId_1, frameId: frameId, chartEx: true }));
+                            orderedAnchors.push({
+                                order: placement.order,
+                                xml: createChartAnchor({
+                                    sheet: sheet,
+                                    placement: placement,
+                                    relId: relId_1,
+                                    frameId: frameId,
+                                    chartEx: true,
+                                }),
+                            });
                             chartExEntries.push({
                                 path: "xl/charts/chartEx".concat(chartExIndex, ".xml"),
                                 xml: chartExXml,
@@ -4018,16 +4345,19 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                             frameId += 1;
                             continue;
                         }
-                        chartXml = buildChartXml(placement.chart, sheetNameById);
+                        chartXml = buildChartXml(placement.chart, sheetNameById, resolvePivotSourceName);
                         if (!chartXml)
                             continue;
                         relId = relationships.add(CHART_REL_TYPE, "../charts/chart".concat(chartIndex, ".xml"));
-                        anchors.push(createChartAnchor({
-                            sheet: sheet,
-                            placement: placement,
-                            relId: relId,
-                            frameId: frameId,
-                        }));
+                        orderedAnchors.push({
+                            order: placement.order,
+                            xml: createChartAnchor({
+                                sheet: sheet,
+                                placement: placement,
+                                relId: relId,
+                                frameId: frameId,
+                            }),
+                        });
                         chartEntries.push({
                             path: "xl/charts/chart".concat(chartIndex, ".xml"),
                             xml: chartXml,
@@ -4036,12 +4366,12 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                         frameId += 1;
                     }
                 }
-                catch (e_43_1) { e_43 = { error: e_43_1 }; }
+                catch (e_44_1) { e_44 = { error: e_44_1 }; }
                 finally {
                     try {
                         if (charts_1_1 && !charts_1_1.done && (_d = charts_1.return)) _d.call(charts_1);
                     }
-                    finally { if (e_43) throw e_43.error; }
+                    finally { if (e_44) throw e_44.error; }
                 }
                 try {
                     for (slicers_1 = __values(slicers), slicers_1_1 = slicers_1.next(); !slicers_1_1.done; slicers_1_1 = slicers_1.next()) {
@@ -4054,21 +4384,17 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                         frameId += 1;
                     }
                 }
-                catch (e_44_1) { e_44 = { error: e_44_1 }; }
+                catch (e_45_1) { e_45 = { error: e_45_1 }; }
                 finally {
                     try {
                         if (slicers_1_1 && !slicers_1_1.done && (_e = slicers_1.return)) _e.call(slicers_1);
                     }
-                    finally { if (e_44) throw e_44.error; }
+                    finally { if (e_45) throw e_45.error; }
                 }
-                embedAnchors = [];
-                orderOf = function (order) {
-                    return order !== null && order !== void 0 ? order : Number.MAX_SAFE_INTEGER;
-                };
                 try {
                     for (textBoxes_1 = __values(textBoxes), textBoxes_1_1 = textBoxes_1.next(); !textBoxes_1_1.done; textBoxes_1_1 = textBoxes_1.next()) {
                         placement = textBoxes_1_1.value;
-                        embedAnchors.push({
+                        orderedAnchors.push({
                             order: orderOf(placement.order),
                             xml: createTextBoxAnchor({
                                 sheet: sheet,
@@ -4079,17 +4405,17 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                         frameId += 1;
                     }
                 }
-                catch (e_45_1) { e_45 = { error: e_45_1 }; }
+                catch (e_46_1) { e_46 = { error: e_46_1 }; }
                 finally {
                     try {
                         if (textBoxes_1_1 && !textBoxes_1_1.done && (_f = textBoxes_1.return)) _f.call(textBoxes_1);
                     }
-                    finally { if (e_45) throw e_45.error; }
+                    finally { if (e_46) throw e_46.error; }
                 }
                 try {
                     for (shapes_1 = __values(shapes), shapes_1_1 = shapes_1.next(); !shapes_1_1.done; shapes_1_1 = shapes_1.next()) {
                         placement = shapes_1_1.value;
-                        embedAnchors.push({
+                        orderedAnchors.push({
                             order: orderOf(placement.order),
                             xml: createShapeAnchor({
                                 sheet: sheet,
@@ -4100,12 +4426,12 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                         frameId += 1;
                     }
                 }
-                catch (e_46_1) { e_46 = { error: e_46_1 }; }
+                catch (e_47_1) { e_47 = { error: e_47_1 }; }
                 finally {
                     try {
                         if (shapes_1_1 && !shapes_1_1.done && (_g = shapes_1.return)) _g.call(shapes_1);
                     }
-                    finally { if (e_46) throw e_46.error; }
+                    finally { if (e_47) throw e_47.error; }
                 }
                 _m.label = 1;
             case 1:
@@ -4130,7 +4456,7 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                     extension: buffer.extension,
                 });
                 relId = relationships.add(IMAGE_REL_TYPE, "../media/image".concat(imageIndex, ".").concat(buffer.extension));
-                embedAnchors.push({
+                orderedAnchors.push({
                     order: orderOf(placement.order),
                     xml: createTwoCellAnchor({
                         sheet: sheet,
@@ -4147,29 +4473,29 @@ var buildDrawingParts = function (_a) { return __awaiter(void 0, [_a], void 0, f
                 return [3 /*break*/, 2];
             case 5: return [3 /*break*/, 8];
             case 6:
-                e_42_1 = _m.sent();
-                e_42 = { error: e_42_1 };
+                e_43_1 = _m.sent();
+                e_43 = { error: e_43_1 };
                 return [3 /*break*/, 8];
             case 7:
                 try {
                     if (placements_1_1 && !placements_1_1.done && (_h = placements_1.return)) _h.call(placements_1);
                 }
-                finally { if (e_42) throw e_42.error; }
+                finally { if (e_43) throw e_43.error; }
                 return [7 /*endfinally*/];
             case 8:
-                embedAnchors.sort(function (a, b) { return a.order - b.order; });
+                orderedAnchors.sort(function (a, b) { return a.order - b.order; });
                 try {
-                    for (embedAnchors_1 = __values(embedAnchors), embedAnchors_1_1 = embedAnchors_1.next(); !embedAnchors_1_1.done; embedAnchors_1_1 = embedAnchors_1.next()) {
-                        entry = embedAnchors_1_1.value;
+                    for (orderedAnchors_1 = __values(orderedAnchors), orderedAnchors_1_1 = orderedAnchors_1.next(); !orderedAnchors_1_1.done; orderedAnchors_1_1 = orderedAnchors_1.next()) {
+                        entry = orderedAnchors_1_1.value;
                         anchors.push(entry.xml);
                     }
                 }
-                catch (e_47_1) { e_47 = { error: e_47_1 }; }
+                catch (e_48_1) { e_48 = { error: e_48_1 }; }
                 finally {
                     try {
-                        if (embedAnchors_1_1 && !embedAnchors_1_1.done && (_j = embedAnchors_1.return)) _j.call(embedAnchors_1);
+                        if (orderedAnchors_1_1 && !orderedAnchors_1_1.done && (_j = orderedAnchors_1.return)) _j.call(orderedAnchors_1);
                     }
-                    finally { if (e_47) throw e_47.error; }
+                    finally { if (e_48) throw e_48.error; }
                 }
                 drawingXml = "".concat(XML_DECLARATION, "<xdr:wsDr xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:r=\"").concat(REL_NS, "\">").concat(anchors.join(""), "</xdr:wsDr>");
                 return [2 /*return*/, {
@@ -4196,25 +4522,21 @@ var createTwoCellAnchor = function (_a) {
     var defaultHeight = placement.kind === "cell" ? getRowHeightPx(sheet, fromRow) : 120;
     var widthPx = Math.max(5, (_e = placement.width) !== null && _e !== void 0 ? _e : defaultWidth);
     var heightPx = Math.max(5, (_f = placement.height) !== null && _f !== void 0 ? _f : defaultHeight);
-    var toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: function (index) { return getColumnWidthPx(sheet, index, true); },
-    });
-    var toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: function (index) { return getRowHeightPx(sheet, index, true); },
-    });
-    var fromXml = "<xdr:from><xdr:col>".concat(fromColumn, "</xdr:col><xdr:colOff>").concat(Math.round(offsetX * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(fromRow, "</xdr:row><xdr:rowOff>").concat(Math.round(offsetY * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:from>");
-    var toXml = "<xdr:to><xdr:col>".concat(toColumn.index, "</xdr:col><xdr:colOff>").concat(Math.round(toColumn.offset * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(toRow.index, "</xdr:row><xdr:rowOff>").concat(Math.round(toRow.offset * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:to>");
     var _g = buildPictureAdjustmentsXml(placement.adjustments), blipChildren = _g.blipChildren, srcRectXml = _g.srcRectXml;
     var blipXml = blipChildren
         ? "<a:blip r:embed=\"".concat(relId, "\">").concat(blipChildren, "</a:blip>")
         : "<a:blip r:embed=\"".concat(relId, "\"/>");
-    return "<xdr:twoCellAnchor editAs=\"oneCell\">".concat(fromXml).concat(toXml, "<xdr:pic><xdr:nvPicPr><xdr:cNvPr id=\"").concat(pictureId, "\" name=\"Picture ").concat(pictureId, "\"/><xdr:cNvPicPr/></xdr:nvPicPr><xdr:blipFill>").concat(blipXml).concat(srcRectXml, "<a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(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: sheet,
+        overlay: placement.overlay,
+        fromRow: fromRow,
+        fromColumn: fromColumn,
+        offsetX: offsetX,
+        offsetY: offsetY,
+        widthPx: widthPx,
+        heightPx: heightPx,
+        body: "<xdr:pic><xdr:nvPicPr><xdr:cNvPr id=\"".concat(pictureId, "\" name=\"Picture ").concat(pictureId, "\"/><xdr:cNvPicPr/></xdr:nvPicPr><xdr:blipFill>").concat(blipXml).concat(srcRectXml, "<a:stretch><a:fillRect/></a:stretch></xdr:blipFill><xdr:spPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(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%). */
 var fractionToPct = function (value) {
@@ -4261,40 +4583,40 @@ var buildPictureAdjustmentsXml = function (adjustments) {
     return { blipChildren: blipChildren, srcRectXml: srcRectXml };
 };
 var createChartAnchor = function (_a) {
-    var _b, _d, _e, _f;
-    var placement = _a.placement, relId = _a.relId, frameId = _a.frameId, sheet = _a.sheet, _g = _a.chartEx, chartEx = _g === void 0 ? false : _g;
+    var _b, _d, _e, _f, _g;
+    var placement = _a.placement, relId = _a.relId, frameId = _a.frameId, sheet = _a.sheet, _h = _a.chartEx, chartEx = _h === void 0 ? false : _h;
     var fromRow = Math.max(0, placement.rowIndex - 1);
     var fromColumn = Math.max(0, placement.columnIndex - 1);
     var offsetX = Math.max(0, (_b = placement.offsetX) !== null && _b !== void 0 ? _b : 0);
     var offsetY = Math.max(0, (_d = placement.offsetY) !== null && _d !== void 0 ? _d : 0);
     var widthPx = Math.max(5, (_e = placement.width) !== null && _e !== void 0 ? _e : 300);
     var heightPx = Math.max(5, (_f = placement.height) !== null && _f !== void 0 ? _f : 200);
-    var toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: function (index) { return getColumnWidthPx(sheet, index, true); },
-    });
-    var toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: function (index) { return getRowHeightPx(sheet, index, true); },
-    });
-    var fromXml = "<xdr:from><xdr:col>".concat(fromColumn, "</xdr:col><xdr:colOff>").concat(Math.round(offsetX * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(fromRow, "</xdr:row><xdr:rowOff>").concat(Math.round(offsetY * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:from>");
-    var toXml = "<xdr:to><xdr:col>".concat(toColumn.index, "</xdr:col><xdr:colOff>").concat(Math.round(toColumn.offset * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(toRow.index, "</xdr:row><xdr:rowOff>").concat(Math.round(toRow.offset * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:to>");
-    if (chartEx) {
-        return "<xdr:twoCellAnchor>".concat(fromXml).concat(toXml).concat(buildChartExGraphicFrameXml({
+    var body = chartEx
+        ? buildChartExGraphicFrameXml({
             relId: relId,
             frameId: frameId,
             widthEmu: Math.round(widthPx * EMUS_PER_PIXEL),
             heightEmu: Math.round(heightPx * EMUS_PER_PIXEL),
-        }), "<xdr:clientData/></xdr:twoCellAnchor>");
-    }
-    return "<xdr:twoCellAnchor>".concat(fromXml).concat(toXml, "<xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id=\"").concat(frameId, "\" name=\"Chart ").concat(frameId, "\"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(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=\"").concat(REL_NS, "\" r:id=\"").concat(relId, "\"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor>");
+        })
+        : "<xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id=\"".concat(frameId, "\" name=\"Chart ").concat(frameId, "\"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(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=\"").concat(REL_NS, "\" r:id=\"").concat(relId, "\"/></a:graphicData></a:graphic></xdr:graphicFrame>");
+    var overlay = (_g = placement.chart.position) === null || _g === void 0 ? void 0 : _g.overlayPosition;
+    return buildDrawingAnchorXml({
+        sheet: 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
+            ? __assign(__assign({}, overlay), { placement: "absolute" }) : overlay,
+        fromRow: fromRow,
+        fromColumn: fromColumn,
+        offsetX: offsetX,
+        offsetY: offsetY,
+        widthPx: widthPx,
+        heightPx: heightPx,
+        body: body,
+    });
 };
 var createSlicerAnchor = function (_a) {
-    var _b, _d, _e, _f;
+    var _b, _d, _e, _f, _g, _h, _j;
     var placement = _a.placement, frameId = _a.frameId, sheet = _a.sheet;
     var fromRow = Math.max(0, placement.rowIndex - 1);
     var fromColumn = Math.max(0, placement.columnIndex - 1);
@@ -4302,24 +4624,45 @@ var createSlicerAnchor = function (_a) {
     var offsetY = Math.max(0, (_d = placement.offsetY) !== null && _d !== void 0 ? _d : 0);
     var widthPx = Math.max(50, (_e = placement.width) !== null && _e !== void 0 ? _e : 200);
     var heightPx = Math.max(50, (_f = placement.height) !== null && _f !== void 0 ? _f : 200);
-    var toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: function (index) { return getColumnWidthPx(sheet, index, true); },
-    });
-    var toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: function (index) { return 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.
+    var overlay = placement.overlay;
+    var mode = (_g = overlay === null || overlay === void 0 ? void 0 : overlay.placement) !== null && _g !== void 0 ? _g : "moveAndSize";
+    var persistedTo = mode === "moveAndSize" ? overlay === null || overlay === void 0 ? void 0 : overlay.toCell : undefined;
+    var editAs = mode === "moveOnly"
+        ? ' editAs="oneCell"'
+        : mode === "absolute"
+            ? ' editAs="absolute"'
+            : "";
+    var toColumn = persistedTo
+        ? {
+            index: Math.max(0, persistedTo.columnIndex - 1),
+            offset: Math.max(0, (_h = overlay === null || overlay === void 0 ? void 0 : overlay.toOffsetXPixels) !== null && _h !== void 0 ? _h : 0),
+        }
+        : resolveAnchorEndpoint({
+            startIndex: fromColumn,
+            startOffset: offsetX,
+            span: widthPx,
+            getSize: function (index) { return getColumnWidthPx(sheet, index, true); },
+        });
+    var toRow = persistedTo
+        ? {
+            index: Math.max(0, persistedTo.rowIndex - 1),
+            offset: Math.max(0, (_j = overlay === null || overlay === void 0 ? void 0 : overlay.toOffsetYPixels) !== null && _j !== void 0 ? _j : 0),
+        }
+        : resolveAnchorEndpoint({
+            startIndex: fromRow,
+            startOffset: offsetY,
+            span: heightPx,
+            getSize: function (index) { return getRowHeightPx(sheet, index, true); },
+        });
     var fromXml = "<xdr:from><xdr:col>".concat(fromColumn, "</xdr:col><xdr:colOff>").concat(Math.round(offsetX * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(fromRow, "</xdr:row><xdr:rowOff>").concat(Math.round(offsetY * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:from>");
     var toXml = "<xdr:to><xdr:col>".concat(toColumn.index, "</xdr:col><xdr:colOff>").concat(Math.round(toColumn.offset * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(toRow.index, "</xdr:row><xdr:rowOff>").concat(Math.round(toRow.offset * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:to>");
-    return "<xdr:twoCellAnchor editAs=\"absolute\">".concat(fromXml).concat(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=\"").concat(frameId, "\" name=\"").concat(escapeXmlAttr(placement.title), "\"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(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=\"").concat(escapeXmlAttr(placement.title), "\"/></a:graphicData></a:graphic></xdr:graphicFrame></mc:Choice></mc:AlternateContent><xdr:clientData/></xdr:twoCellAnchor>");
+    return "<xdr:twoCellAnchor".concat(editAs, ">").concat(fromXml).concat(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=\"").concat(frameId, "\" name=\"").concat(escapeXmlAttr(placement.title), "\"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"").concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(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=\"").concat(escapeXmlAttr(placement.title), "\"/></a:graphicData></a:graphic></xdr:graphicFrame></mc:Choice></mc:AlternateContent><xdr:clientData/></xdr:twoCellAnchor>");
 };
 var createTextBoxAnchor = function (_a) {
-    var _b, _d, _e, _f;
+    var _b, _d, _e, _f, _g;
     var placement = _a.placement, frameId = _a.frameId, sheet = _a.sheet;
     var fromRow = Math.max(0, placement.rowIndex - 1);
     var fromColumn = Math.max(0, placement.columnIndex - 1);
@@ -4327,24 +4670,20 @@ var createTextBoxAnchor = function (_a) {
     var offsetY = Math.max(0, (_d = placement.offsetY) !== null && _d !== void 0 ? _d : 0);
     var widthPx = Math.max(50, (_e = placement.width) !== null && _e !== void 0 ? _e : 200);
     var heightPx = Math.max(50, (_f = placement.height) !== null && _f !== void 0 ? _f : 60);
-    var toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: function (index) { return getColumnWidthPx(sheet, index, true); },
-    });
-    var toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: function (index) { return getRowHeightPx(sheet, index, true); },
-    });
-    var fromXml = "<xdr:from><xdr:col>".concat(fromColumn, "</xdr:col><xdr:colOff>").concat(Math.round(offsetX * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(fromRow, "</xdr:row><xdr:rowOff>").concat(Math.round(offsetY * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:from>");
-    var toXml = "<xdr:to><xdr:col>".concat(toColumn.index, "</xdr:col><xdr:colOff>").concat(Math.round(toColumn.offset * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(toRow.index, "</xdr:row><xdr:rowOff>").concat(Math.round(toRow.offset * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:to>");
     var spec = placement.textBox.spec;
     var textBodyXml = buildTextBodyXml(spec);
     var shapePropertiesXml = buildShapePropertiesXml(spec, widthPx, heightPx);
-    return "<xdr:twoCellAnchor editAs=\"oneCell\">".concat(fromXml).concat(toXml, "<xdr:sp><xdr:nvSpPr><xdr:cNvPr id=\"").concat(frameId, "\" name=\"TextBox ").concat(frameId, "\"/><xdr:cNvSpPr txBox=\"1\"/></xdr:nvSpPr>").concat(shapePropertiesXml).concat(textBodyXml, "</xdr:sp><xdr:clientData/></xdr:twoCellAnchor>");
+    return buildDrawingAnchorXml({
+        sheet: sheet,
+        overlay: (_g = placement.textBox.position) === null || _g === void 0 ? void 0 : _g.overlayPosition,
+        fromRow: fromRow,
+        fromColumn: fromColumn,
+        offsetX: offsetX,
+        offsetY: offsetY,
+        widthPx: widthPx,
+        heightPx: heightPx,
+        body: "<xdr:sp><xdr:nvSpPr><xdr:cNvPr id=\"".concat(frameId, "\" name=\"TextBox ").concat(frameId, "\"/><xdr:cNvSpPr txBox=\"1\"/></xdr:nvSpPr>").concat(shapePropertiesXml).concat(textBodyXml, "</xdr:sp>"),
+    });
 };
 /** ColorIndex slots → canonical DrawingML scheme names (inverse of the importer's map). */
 var THEME_INDEX_TO_SCHEME = [
@@ -4462,7 +4801,7 @@ var buildShapeStyleRefXml = function (tag, ref) {
 };
 /** Export an `EmbedShapeSpec` embed as an `<xdr:sp>` two-cell anchor. */
 var createShapeAnchor = function (_a) {
-    var _b, _d, _e, _f, _g, _h, _j, _k;
+    var _b, _d, _e, _f, _g, _h, _j, _k, _l;
     var placement = _a.placement, frameId = _a.frameId, sheet = _a.sheet;
     var spec = placement.shape.spec;
     var fromRow = Math.max(0, placement.rowIndex - 1);
@@ -4471,20 +4810,6 @@ var createShapeAnchor = function (_a) {
     var offsetY = Math.max(0, (_d = placement.offsetY) !== null && _d !== void 0 ? _d : 0);
     var widthPx = Math.max(10, (_e = placement.width) !== null && _e !== void 0 ? _e : 120);
     var heightPx = Math.max(10, (_f = placement.height) !== null && _f !== void 0 ? _f : 60);
-    var toColumn = resolveAnchorEndpoint({
-        startIndex: fromColumn,
-        startOffset: offsetX,
-        span: widthPx,
-        getSize: function (index) { return getColumnWidthPx(sheet, index, true); },
-    });
-    var toRow = resolveAnchorEndpoint({
-        startIndex: fromRow,
-        startOffset: offsetY,
-        span: heightPx,
-        getSize: function (index) { return getRowHeightPx(sheet, index, true); },
-    });
-    var fromXml = "<xdr:from><xdr:col>".concat(fromColumn, "</xdr:col><xdr:colOff>").concat(Math.round(offsetX * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(fromRow, "</xdr:row><xdr:rowOff>").concat(Math.round(offsetY * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:from>");
-    var toXml = "<xdr:to><xdr:col>".concat(toColumn.index, "</xdr:col><xdr:colOff>").concat(Math.round(toColumn.offset * EMUS_PER_PIXEL), "</xdr:colOff><xdr:row>").concat(toRow.index, "</xdr:row><xdr:rowOff>").concat(Math.round(toRow.offset * EMUS_PER_PIXEL), "</xdr:rowOff></xdr:to>");
     var xfrmAttrs = [
         placement.shape.rotation
             ? " rot=\"".concat(Math.round(placement.shape.rotation * 60000), "\"")
@@ -4514,7 +4839,17 @@ var createShapeAnchor = function (_a) {
         ? 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>";
     var name = escapeXmlAttr((_k = spec.name) !== null && _k !== void 0 ? _k : "Shape ".concat(frameId));
-    return "<xdr:twoCellAnchor editAs=\"oneCell\">".concat(fromXml).concat(toXml, "<xdr:sp><xdr:nvSpPr><xdr:cNvPr id=\"").concat(frameId, "\" name=\"").concat(name, "\"/><xdr:cNvSpPr/></xdr:nvSpPr>").concat(spPr).concat(styleXml).concat(textBodyXml, "</xdr:sp><xdr:clientData/></xdr:twoCellAnchor>");
+    return buildDrawingAnchorXml({
+        sheet: sheet,
+        overlay: (_l = placement.shape.position) === null || _l === void 0 ? void 0 : _l.overlayPosition,
+        fromRow: fromRow,
+        fromColumn: fromColumn,
+        offsetX: offsetX,
+        offsetY: offsetY,
+        widthPx: widthPx,
+        heightPx: heightPx,
+        body: "<xdr:sp><xdr:nvSpPr><xdr:cNvPr id=\"".concat(frameId, "\" name=\"").concat(name, "\"/><xdr:cNvSpPr/></xdr:nvSpPr>").concat(spPr).concat(styleXml).concat(textBodyXml, "</xdr:sp>"),
+    });
 };
 var buildTextWithTabs = function (text, rPrXml) {
     var parts = text.split("\t");
@@ -4531,7 +4866,7 @@ var buildTextWithTabs = function (text, rPrXml) {
         .join("");
 };
 var buildTextBodyXml = function (spec) {
-    var e_48, _a;
+    var e_49, _a;
     var richText = spec.richText || [];
     var plainText = spec.text || "";
     // Build vertical alignment and wrap attributes
@@ -4572,12 +4907,12 @@ var buildTextBodyXml = function (spec) {
                 }
             }
         }
-        catch (e_48_1) { e_48 = { error: e_48_1 }; }
+        catch (e_49_1) { e_49 = { error: e_49_1 }; }
         finally {
             try {
                 if (richText_1_1 && !richText_1_1.done && (_a = richText_1.return)) _a.call(richText_1);
             }
-            finally { if (e_48) throw e_48.error; }
+            finally { if (e_49) throw e_49.error; }
         }
         paragraphsXml = paragraphs
             .filter(function (runs) { return runs.length > 0; })
@@ -4775,6 +5110,62 @@ var buildShapePropertiesXml = function (spec, widthPx, heightPx) {
     }
     return "<xdr:spPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"".concat(Math.round(widthPx * EMUS_PER_PIXEL), "\" cy=\"").concat(Math.round(heightPx * EMUS_PER_PIXEL), "\"/></a:xfrm><a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom>").concat(fillXml).concat(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.
+ */
+var buildDrawingAnchorXml = function (_a) {
+    var _b, _d, _e;
+    var sheet = _a.sheet, overlay = _a.overlay, fromRow = _a.fromRow, fromColumn = _a.fromColumn, offsetX = _a.offsetX, offsetY = _a.offsetY, widthPx = _a.widthPx, heightPx = _a.heightPx, body = _a.body;
+    var emu = function (px) { return Math.round(px * EMUS_PER_PIXEL); };
+    var fromXml = "<xdr:from><xdr:col>".concat(fromColumn, "</xdr:col><xdr:colOff>").concat(emu(offsetX), "</xdr:colOff><xdr:row>").concat(fromRow, "</xdr:row><xdr:rowOff>").concat(emu(offsetY), "</xdr:rowOff></xdr:from>");
+    var extXml = "<xdr:ext cx=\"".concat(emu(widthPx), "\" cy=\"").concat(emu(heightPx), "\"/>");
+    var placement = (_b = overlay === null || overlay === void 0 ? void 0 : overlay.placement) !== null && _b !== void 0 ? _b : "moveAndSize";
+    if (placement === "moveOnly") {
+        return "<xdr:oneCellAnchor>".concat(fromXml).concat(extXml).concat(body, "<xdr:clientData/></xdr:oneCellAnchor>");
+    }
+    if (placement === "absolute") {
+        var x = offsetX;
+        for (var index = 0; index < fromColumn; index++) {
+            x += getColumnWidthPx(sheet, index, true);
+        }
+        var y = offsetY;
+        for (var index = 0; index < fromRow; index++) {
+            y += getRowHeightPx(sheet, index, true);
+        }
+        return "<xdr:absoluteAnchor><xdr:pos x=\"".concat(emu(x), "\" y=\"").concat(emu(y), "\"/>").concat(extXml).concat(body, "<xdr:clientData/></xdr:absoluteAnchor>");
+    }
+    var toColumn = (overlay === null || overlay === void 0 ? void 0 : overlay.toCell)
+        ? {
+            index: Math.max(0, overlay.toCell.columnIndex - 1),
+            offset: Math.max(0, (_d = overlay.toOffsetXPixels) !== null && _d !== void 0 ? _d : 0),
+        }
+        : resolveAnchorEndpoint({
+            startIndex: fromColumn,
+            startOffset: offsetX,
+            span: widthPx,
+            getSize: function (index) { return getColumnWidthPx(sheet, index, true); },
+        });
+    var toRow = (overlay === null || overlay === void 0 ? void 0 : overlay.toCell)
+        ? {
+            index: Math.max(0, overlay.toCell.rowIndex - 1),
+            offset: Math.max(0, (_e = overlay.toOffsetYPixels) !== null && _e !== void 0 ? _e : 0),
+        }
+        : resolveAnchorEndpoint({
+            startIndex: fromRow,
+            startOffset: offsetY,
+            span: heightPx,
+            getSize: function (index) { return getRowHeightPx(sheet, index, true); },
+        });
+    var toXml = "<xdr:to><xdr:col>".concat(toColumn.index, "</xdr:col><xdr:colOff>").concat(emu(toColumn.offset), "</xdr:colOff><xdr:row>").concat(toRow.index, "</xdr:row><xdr:rowOff>").concat(emu(toRow.offset), "</xdr:rowOff></xdr:to>");
+    return "<xdr:twoCellAnchor>".concat(fromXml).concat(toXml).concat(body, "<xdr:clientData/></xdr:twoCellAnchor>");
+};
 var resolveAnchorEndpoint = function (_a) {
     var startIndex = _a.startIndex, startOffset = _a.startOffset, span = _a.span, getSize = _a.getSize;
     var index = startIndex;
@@ -5021,7 +5412,7 @@ var buildWorkbookXml = function (sheets, sheetRelIds, sheetNames, namedRanges, i
     return "".concat(XML_DECLARATION, "<workbook xmlns=\"").concat(WORKSHEET_NS, "\" xmlns:r=\"").concat(REL_NS, "\">").concat(workbookPrXml).concat(calcPrXml, "<bookViews><workbookView activeTab=\"0\" firstSheet=\"0\"/></bookViews><sheets>").concat(sheetEntries, "</sheets>").concat(definedNamesXml).concat(externalReferencesXml).concat(pivotCachesXml).concat(slicerCachesXml, "</workbook>");
 };
 var buildDefinedNamesXml = function (namedRanges, sheetNameById, printScopes) {
-    var e_49, _a, e_50, _b;
+    var e_50, _a, e_51, _b;
     var _d, _e, _f;
     if (printScopes === void 0) { printScopes = []; }
     var entries = [];
@@ -5051,12 +5442,12 @@ var buildDefinedNamesXml = function (namedRanges, sheetNameById, printScopes) {
             ], false));
         }
     }
-    catch (e_49_1) { e_49 = { error: e_49_1 }; }
+    catch (e_50_1) { e_50 = { error: e_50_1 }; }
     finally {
         try {
             if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
         }
-        finally { if (e_49) throw e_49.error; }
+        finally { if (e_50) throw e_50.error; }
     }
     printScopes.forEach(function (_a, index) {
         var _b;
@@ -5104,12 +5495,12 @@ var buildDefinedNamesXml = function (namedRanges, sheetNameById, printScopes) {
             entries.push("<definedName name=\"".concat(escapeXmlAttr(namedRange.name), "\"").concat(hiddenAttr, ">").concat(escapeXmlText(expression), "</definedName>"));
         }
     }
-    catch (e_50_1) { e_50 = { error: e_50_1 }; }
+    catch (e_51_1) { e_51 = { error: e_51_1 }; }
     finally {
         try {
             if (_k && !_k.done && (_b = _j.return)) _b.call(_j);
         }
-        finally { if (e_50) throw e_50.error; }
+        finally { if (e_51) throw e_51.error; }
     }
     if (!entries.length)
         return "";
@@ -5142,7 +5533,9 @@ var buildWorkbookSlicerCachesXml = function (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\">".concat(cacheEntries, "</x15:slicerCaches></ext></extLst>");
 };
-var buildWorkbookRelationships = function (sheetCount, slicerCacheCount, externalLinkCount, pivotCacheCount, hasPersons) {
+var buildWorkbookRelationships = function (
+/** One entry per sheet in `<sheets>` order; `target` is relative to `xl/`. */
+sheetParts, slicerCacheCount, externalLinkCount, pivotCacheCount, hasPersons) {
     if (slicerCacheCount === void 0) { slicerCacheCount = 0; }
     if (externalLinkCount === void 0) { externalLinkCount = 0; }
     if (pivotCacheCount === void 0) { pivotCacheCount = 0; }
@@ -5150,11 +5543,12 @@ var buildWorkbookRelationships = function (sheetCount, slicerCacheCount, externa
     var relationships = [];
     var sheetRelIds = [];
     var slicerCacheRelIds = [];
-    for (var i = 0; i < sheetCount; i++) {
+    var sheetCount = sheetParts.length;
+    sheetParts.forEach(function (part, i) {
         var relId = "rId".concat(i + 1);
         sheetRelIds.push(relId);
-        relationships.push("<Relationship Id=\"".concat(relId, "\" Type=\"").concat(REL_NS, "/worksheet\" Target=\"worksheets/sheet").concat(i + 1, ".xml\"/>"));
-    }
+        relationships.push("<Relationship Id=\"".concat(relId, "\" Type=\"").concat(REL_NS, "/").concat(part.chartsheet ? "chartsheet" : "worksheet", "\" Target=\"").concat(part.target, "\"/>"));
+    });
     var stylesId = "rId".concat(sheetCount + 1);
     var themeId = "rId".concat(sheetCount + 2);
     var sharedStringsId = "rId".concat(sheetCount + 3);
@@ -5199,10 +5593,13 @@ var buildWorkbookRelationships = function (sheetCount, slicerCacheCount, externa
     };
 };
 var buildContentTypesXml = function (_a) {
-    var sheetCount = _a.sheetCount, tableCount = _a.tableCount, drawingSheets = _a.drawingSheets, mediaExtensions = _a.mediaExtensions, chartCount = _a.chartCount, _b = _a.chartExCount, chartExCount = _b === void 0 ? 0 : _b, _d = _a.slicerCount, slicerCount = _d === void 0 ? 0 : _d, _e = _a.slicerCacheCount, slicerCacheCount = _e === void 0 ? 0 : _e, _f = _a.pivotTableCount, pivotTableCount = _f === void 0 ? 0 : _f, _g = _a.pivotCacheCount, pivotCacheCount = _g === void 0 ? 0 : _g, _h = _a.commentsSheets, commentsSheets = _h === void 0 ? [] : _h, _j = _a.threadedCommentsSheets, threadedCommentsSheets = _j === void 0 ? [] : _j, _k = _a.hasPersons, hasPersons = _k === void 0 ? false : _k, _l = _a.externalLinkCount, externalLinkCount = _l === void 0 ? 0 : _l, _m = _a.hasVmlDrawings, hasVmlDrawings = _m === void 0 ? false : _m, _o = _a.ctrlPropCount, ctrlPropCount = _o === void 0 ? 0 : _o;
-    var sheetOverrides = Array.from({ length: sheetCount }, function (_, index) {
+    var worksheetCount = _a.worksheetCount, _b = _a.chartsheetCount, chartsheetCount = _b === void 0 ? 0 : _b, tableCount = _a.tableCount, drawingSheets = _a.drawingSheets, mediaExtensions = _a.mediaExtensions, chartCount = _a.chartCount, _d = _a.chartExCount, chartExCount = _d === void 0 ? 0 : _d, _e = _a.slicerCount, slicerCount = _e === void 0 ? 0 : _e, _f = _a.slicerCacheCount, slicerCacheCount = _f === void 0 ? 0 : _f, _g = _a.pivotTableCount, pivotTableCount = _g === void 0 ? 0 : _g, _h = _a.pivotCacheCount, pivotCacheCount = _h === void 0 ? 0 : _h, _j = _a.commentsSheets, commentsSheets = _j === void 0 ? [] : _j, _k = _a.threadedCommentsSheets, threadedCommentsSheets = _k === void 0 ? [] : _k, _l = _a.hasPersons, hasPersons = _l === void 0 ? false : _l, _m = _a.externalLinkCount, externalLinkCount = _m === void 0 ? 0 : _m, _o = _a.hasVmlDrawings, hasVmlDrawings = _o === void 0 ? false : _o, _p = _a.ctrlPropCount, ctrlPropCount = _p === void 0 ? 0 : _p;
+    var sheetOverrides = Array.from({ length: worksheetCount }, function (_, index) {
         return "<Override PartName=\"/xl/worksheets/sheet".concat(index + 1, ".xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml\"/>");
     }).join("");
+    var chartsheetOverrides = Array.from({ length: chartsheetCount }, function (_, index) {
+        return "<Override PartName=\"/xl/chartsheets/sheet".concat(index + 1, ".xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml\"/>");
+    }).join("");
     var tableOverrides = Array.from({ length: tableCount }, function (_, index) {
         return "<Override PartName=\"/xl/tables/table".concat(index + 1, ".xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml\"/>");
     }).join("");
@@ -5257,15 +5654,32 @@ var buildContentTypesXml = function (_a) {
     var ctrlPropOverrides = Array.from({ length: ctrlPropCount }, function (_, index) {
         return "<Override PartName=\"/xl/ctrlProps/ctrlProp".concat(index + 1, ".xml\" ContentType=\"").concat(CTRL_PROP_CONTENT_TYPE, "\"/>");
     }).join("");
-    return "".concat(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\"/>").concat(vmlDefault).concat(mediaDefaults, "<Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/>").concat(sheetOverrides).concat(tableOverrides).concat(drawingOverrides).concat(chartOverrides).concat(chartExOverrides).concat(slicerOverrides).concat(slicerCacheOverrides).concat(pivotTableOverrides).concat(pivotCacheOverrides).concat(externalLinkOverrides).concat(ctrlPropOverrides).concat(commentsOverrides).concat(threadedCommentsOverrides).concat(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 "".concat(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\"/>").concat(vmlDefault).concat(mediaDefaults, "<Override PartName=\"/xl/workbook.xml\" ContentType=\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml\"/>").concat(sheetOverrides).concat(chartsheetOverrides).concat(tableOverrides).concat(drawingOverrides).concat(chartOverrides).concat(chartExOverrides).concat(slicerOverrides).concat(slicerCacheOverrides).concat(pivotTableOverrides).concat(pivotCacheOverrides).concat(externalLinkOverrides).concat(ctrlPropOverrides).concat(commentsOverrides).concat(threadedCommentsOverrides).concat(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>");
 };
 var buildRootRelationshipsXml = function () {
     return "".concat(XML_DECLARATION, "<Relationships xmlns=\"").concat(PACKAGE_REL_NS, "\"><Relationship Id=\"rId1\" Type=\"").concat(REL_NS, "/officeDocument\" Target=\"xl/workbook.xml\"/><Relationship Id=\"rId2\" Type=\"").concat(REL_NS, "/extended-properties\" Target=\"docProps/app.xml\"/><Relationship Id=\"rId3\" Type=\"").concat(REL_NS, "/core-properties\" Target=\"docProps/core.xml\"/></Relationships>");
 };
-var buildAppXml = function (sheetNames, properties) {
+var buildAppXml = function (sheetNames, isChartsheet, properties) {
     var _a;
-    var titles = sheetNames
-        .map(function (name) { return "<vt:lpstr>".concat(escapeXmlText(name), "</vt:lpstr>"); })
+    // 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.
+    var worksheetNames = sheetNames.filter(function (_, index) { return !isChartsheet[index]; });
+    var chartsheetNames = sheetNames.filter(function (_, index) { return isChartsheet[index]; });
+    var headingPairs = [
+        ["Worksheets", worksheetNames.length],
+        ["Charts", chartsheetNames.length],
+    ].filter(function (_a) {
+        var _b = __read(_a, 2), count = _b[1];
+        return count > 0;
+    });
+    var headingPairsXml = headingPairs
+        .map(function (_a) {
+        var _b = __read(_a, 2), kind = _b[0], count = _b[1];
+        return "<vt:variant><vt:lpstr>".concat(kind, "</vt:lpstr></vt:variant><vt:variant><vt:i4>").concat(count, "</vt:i4></vt:variant>");
+    })
+        .join("");
+    var titles = __spreadArray(__spreadArray([], __read(worksheetNames), false), __read(chartsheetNames), false).map(function (name) { return "<vt:lpstr>".concat(escapeXmlText(name), "</vt:lpstr>"); })
         .join("");
     var application = (_a = properties === null || properties === void 0 ? void 0 : properties.application) !== null && _a !== void 0 ? _a : CREATOR;
     var companyTag = (properties === null || properties === void 0 ? void 0 : properties.company)
@@ -5274,7 +5688,7 @@ var buildAppXml = function (sheetNames, properties) {
     var managerTag = (properties === null || properties === void 0 ? void 0 : properties.manager)
         ? "<Manager>".concat(escapeXmlText(properties.manager), "</Manager>")
         : "";
-    return "".concat(XML_DECLARATION, "<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\" xmlns:vt=\"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes\"><Application>").concat(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>").concat(sheetNames.length, "</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size=\"").concat(sheetNames.length, "\" baseType=\"lpstr\">").concat(titles, "</vt:vector></TitlesOfParts>").concat(companyTag).concat(managerTag, "</Properties>");
+    return "".concat(XML_DECLARATION, "<Properties xmlns=\"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties\" xmlns:vt=\"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes\"><Application>").concat(escapeXmlText(application), "</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size=\"").concat(headingPairs.length * 2, "\" baseType=\"variant\">").concat(headingPairsXml, "</vt:vector></HeadingPairs><TitlesOfParts><vt:vector size=\"").concat(sheetNames.length, "\" baseType=\"lpstr\">").concat(titles, "</vt:vector></TitlesOfParts>").concat(companyTag).concat(managerTag, "</Properties>");
 };
 var buildCoreXml = function (properties) {
     var _a, _b, _d, _e;