@node-projects/excelforge 2.3.0 → 3.0.0

package/dist/core/Worksheet.js

@@ -1,4 +1,16 @@
+import { CellError, } from '../core/types.js';
 import { colIndexToLetter, indicesToCellRef, cellRefToIndices, parseRange, escapeXml, dateToSerial, pxToEmu, } from '../utils/helpers.js';
+const _xmlContentRe = /[&<>]/g;
+const _xmlContentEsc = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
+function escapeXmlContent(s) {
+    return _xmlContentRe.test(s) ? (_xmlContentRe.lastIndex = 0, s.replace(_xmlContentRe, ch => _xmlContentEsc[ch])) : s;
+}
+function colorEl(c) {
+    if (c.startsWith('theme:'))
+        return `<color theme="${c.slice(6)}"/>`;
+    const rgb = c.startsWith('#') ? 'FF' + c.slice(1) : c;
+    return `<color rgb="${rgb}"/>`;
+}
 const SUBTOTAL_FN = {
     average: 101, count: 102, countNums: 103, max: 104, min: 105,
     stdDev: 107, sum: 109, var: 110, vars: 111,
@@ -8,34 +20,64 @@ export class Worksheet {
         this.cells = new Map();
         this.merges = [];
         this.images = [];
+        this.cellImages = [];
         this.charts = [];
         this.conditionalFormats = [];
         this.tables = [];
+        this.pivotTables = [];
         this.sparklines = [];
+        this.formControls = [];
+        this.shapes = [];
+        this.wordArt = [];
+        this.queryTables = [];
+        this.tableSlicers = [];
+        this.mathEquations = [];
         this.colDefs = new Map();
         this.rowDefs = new Map();
         this.dataValidations = new Map();
+        this.rowBreaks = [];
+        this.colBreaks = [];
+        this.preservedXml = [];
+        this._nextSharedIdx = 0;
+        this._isChartSheet = false;
+        this._isDialogSheet = false;
         this.sheetIndex = 0;
         this.rId = '';
         this.drawingRId = '';
         this.legacyDrawingRId = '';
         this.tableRIds = [];
+        this.ctrlPropRIds = [];
+        this.slicerRId = '';
+        this._slicerDrawingInfo = [];
+        this._cellImageVm = new Map();
+        this.ignoreErrors = [];
         this.name = name;
         this.options = { ...options, name };
     }
-    key(row, col) { return `${row},${col}`; }
     getCell(row, col) {
-        const k = this.key(row, col);
-        if (!this.cells.has(k))
-            this.cells.set(k, {});
-        return this.cells.get(k);
+        let rowMap = this.cells.get(row);
+        if (!rowMap) {
+            rowMap = new Map();
+            this.cells.set(row, rowMap);
+        }
+        let cell = rowMap.get(col);
+        if (!cell) {
+            cell = {};
+            rowMap.set(col, cell);
+        }
+        return cell;
     }
     getCellByRef(ref) {
         const { row, col } = cellRefToIndices(ref);
         return this.getCell(row, col);
     }
     setCell(row, col, cell) {
-        this.cells.set(this.key(row, col), cell);
+        let rowMap = this.cells.get(row);
+        if (!rowMap) {
+            rowMap = new Map();
+            this.cells.set(row, rowMap);
+        }
+        rowMap.set(col, cell);
         return this;
     }
     setValue(row, col, value) {
@@ -46,6 +88,29 @@ export class Worksheet {
         this.getCell(row, col).formula = formula;
         return this;
     }
+    setDynamicArrayFormula(row, col, formula) {
+        const cell = this.getCell(row, col);
+        cell.arrayFormula = formula;
+        cell._dynamic = true;
+        return this;
+    }
+    setSharedFormula(masterRow, masterCol, formula, rangeRef) {
+        const si = this._nextSharedIdx++;
+        const master = this.getCell(masterRow, masterCol);
+        master.formula = formula;
+        master._sharedRef = rangeRef;
+        master._sharedIdx = si;
+        const { startRow, startCol, endRow, endCol } = parseRange(rangeRef);
+        for (let r = startRow; r <= endRow; r++) {
+            for (let c = startCol; c <= endCol; c++) {
+                if (r === masterRow && c === masterCol)
+                    continue;
+                const dep = this.getCell(r, c);
+                dep._sharedIdx = si;
+            }
+        }
+        return this;
+    }
     setStyle(row, col, style) {
         this.getCell(row, col).style = style;
         return this;
@@ -94,17 +159,24 @@ export class Worksheet {
         const ec = cellRefToIndices(e);
         return this.merge(sc.row, sc.col, ec.row, ec.col);
     }
+    getMerges() { return this.merges; }
     addImage(img) {
         this.images.push(img);
         return this;
     }
     getImages() { return this.images; }
+    addCellImage(img) {
+        this.cellImages.push(img);
+        return this;
+    }
+    getCellImages() { return this.cellImages; }
     getComments() {
         const out = [];
-        for (const [key, cell] of this.cells) {
-            if (cell.comment) {
-                const [r, c] = key.split(',').map(Number);
-                out.push({ row: r, col: c, comment: cell.comment });
+        for (const [r, rowMap] of this.cells) {
+            for (const [c, cell] of rowMap) {
+                if (cell.comment) {
+                    out.push({ row: r, col: c, comment: cell.comment });
+                }
             }
         }
         return out;
@@ -118,6 +190,8 @@ export class Worksheet {
         this.conditionalFormats.push(cf);
         return this;
     }
+    getConditionalFormats() { return this.conditionalFormats; }
+    getDataValidations() { return this.dataValidations; }
     addTable(table) {
         this.tables.push(table);
         if (table.totalsRow && table.columns?.length) {
@@ -141,14 +215,348 @@ export class Worksheet {
         return this;
     }
     getTables() { return this.tables; }
+    addPivotTable(pt) {
+        this.pivotTables.push(pt);
+        return this;
+    }
+    getPivotTables() { return this.pivotTables; }
+    readRange(ref) {
+        const { startRow, startCol, endRow, endCol } = parseRange(ref);
+        const result = [];
+        for (let r = startRow; r <= endRow; r++) {
+            const row = [];
+            const rowMap = this.cells.get(r);
+            for (let c = startCol; c <= endCol; c++) {
+                const cell = rowMap?.get(c);
+                row.push(cell?.value ?? null);
+            }
+            result.push(row);
+        }
+        return result;
+    }
+    readAllCells() {
+        const out = [];
+        for (const [r, rowMap] of this.cells) {
+            for (const [c, cell] of rowMap) {
+                out.push({ row: r, col: c, cell });
+            }
+        }
+        return out;
+    }
+    getUsedRange() {
+        let minR = Infinity, maxR = 0, minC = Infinity, maxC = 0;
+        for (const [r, rowMap] of this.cells) {
+            for (const [c] of rowMap) {
+                if (r < minR)
+                    minR = r;
+                if (r > maxR)
+                    maxR = r;
+                if (c < minC)
+                    minC = c;
+                if (c > maxC)
+                    maxC = c;
+            }
+        }
+        return maxR === 0 ? null : { startRow: minR, startCol: minC, endRow: maxR, endCol: maxC };
+    }
+    getColumn(col) {
+        return this.colDefs.get(col);
+    }
+    getRow(row) {
+        return this.rowDefs.get(row);
+    }
+    insertRows(atRow, count) {
+        const rows = [...this.cells.keys()].filter(r => r >= atRow).sort((a, b) => b - a);
+        for (const r of rows) {
+            const rowMap = this.cells.get(r);
+            this.cells.delete(r);
+            this.cells.set(r + count, rowMap);
+        }
+        const rdKeys = [...this.rowDefs.keys()].filter(r => r >= atRow).sort((a, b) => b - a);
+        for (const r of rdKeys) {
+            const d = this.rowDefs.get(r);
+            this.rowDefs.delete(r);
+            this.rowDefs.set(r + count, d);
+        }
+        for (const m of this.merges) {
+            if (m.startRow >= atRow)
+                m.startRow += count;
+            if (m.endRow >= atRow)
+                m.endRow += count;
+        }
+        return this;
+    }
+    deleteRows(atRow, count) {
+        for (let r = atRow; r < atRow + count; r++) {
+            this.cells.delete(r);
+            this.rowDefs.delete(r);
+        }
+        const rows = [...this.cells.keys()].filter(r => r >= atRow + count).sort((a, b) => a - b);
+        for (const r of rows) {
+            const rowMap = this.cells.get(r);
+            this.cells.delete(r);
+            this.cells.set(r - count, rowMap);
+        }
+        const rdKeys = [...this.rowDefs.keys()].filter(r => r >= atRow + count).sort((a, b) => a - b);
+        for (const r of rdKeys) {
+            const d = this.rowDefs.get(r);
+            this.rowDefs.delete(r);
+            this.rowDefs.set(r - count, d);
+        }
+        this.merges = this.merges.filter(m => !(m.startRow >= atRow && m.endRow < atRow + count));
+        for (const m of this.merges) {
+            if (m.startRow >= atRow + count)
+                m.startRow -= count;
+            if (m.endRow >= atRow + count)
+                m.endRow -= count;
+        }
+        return this;
+    }
+    insertColumns(atCol, count) {
+        for (const [, rowMap] of this.cells) {
+            const cols = [...rowMap.keys()].filter(c => c >= atCol).sort((a, b) => b - a);
+            for (const c of cols) {
+                const cell = rowMap.get(c);
+                rowMap.delete(c);
+                rowMap.set(c + count, cell);
+            }
+        }
+        const cdKeys = [...this.colDefs.keys()].filter(c => c >= atCol).sort((a, b) => b - a);
+        for (const c of cdKeys) {
+            const d = this.colDefs.get(c);
+            this.colDefs.delete(c);
+            this.colDefs.set(c + count, d);
+        }
+        for (const m of this.merges) {
+            if (m.startCol >= atCol)
+                m.startCol += count;
+            if (m.endCol >= atCol)
+                m.endCol += count;
+        }
+        return this;
+    }
+    copyRange(srcRef, targetRow, targetCol) {
+        const { startRow, startCol, endRow, endCol } = parseRange(srcRef);
+        for (let r = startRow; r <= endRow; r++) {
+            for (let c = startCol; c <= endCol; c++) {
+                const src = this.getCell(r, c);
+                const dr = targetRow + (r - startRow);
+                const dc = targetCol + (c - startCol);
+                if (src.value != null)
+                    this.setValue(dr, dc, src.value);
+                if (src.formula)
+                    this.setFormula(dr, dc, src.formula);
+                if (src.style)
+                    this.setStyle(dr, dc, { ...src.style });
+            }
+        }
+        return this;
+    }
+    moveRange(srcRef, targetRow, targetCol) {
+        const { startRow, startCol, endRow, endCol } = parseRange(srcRef);
+        this.copyRange(srcRef, targetRow, targetCol);
+        const tEndRow = targetRow + (endRow - startRow);
+        const tEndCol = targetCol + (endCol - startCol);
+        for (let r = startRow; r <= endRow; r++) {
+            for (let c = startCol; c <= endCol; c++) {
+                const dr = targetRow + (r - startRow);
+                const dc = targetCol + (c - startCol);
+                if (dr === r && dc === c)
+                    continue;
+                const rowMap = this.cells.get(r);
+                if (rowMap)
+                    rowMap.delete(c);
+            }
+        }
+        return this;
+    }
+    sortRange(ref, sortCol, order = 'asc') {
+        const { startRow, startCol, endRow, endCol } = parseRange(ref);
+        const rows = [];
+        for (let r = startRow; r <= endRow; r++) {
+            const rowMap = this.cells.get(r);
+            const subset = new Map();
+            for (let c = startCol; c <= endCol; c++) {
+                const cell = rowMap?.get(c);
+                if (cell)
+                    subset.set(c, { ...cell });
+            }
+            rows.push({ rowIdx: r, cells: subset });
+        }
+        rows.sort((a, b) => {
+            const va = a.cells.get(sortCol)?.value;
+            const vb = b.cells.get(sortCol)?.value;
+            const na = typeof va === 'number' ? va : typeof va === 'string' ? va : '';
+            const nb = typeof vb === 'number' ? vb : typeof vb === 'string' ? vb : '';
+            let cmp = 0;
+            if (typeof na === 'number' && typeof nb === 'number')
+                cmp = na - nb;
+            else
+                cmp = String(na).localeCompare(String(nb));
+            return order === 'desc' ? -cmp : cmp;
+        });
+        for (let i = 0; i < rows.length; i++) {
+            const r = startRow + i;
+            for (let c = startCol; c <= endCol; c++) {
+                const cell = rows[i].cells.get(c);
+                const rowMap = this.cells.get(r) ?? new Map();
+                if (!this.cells.has(r))
+                    this.cells.set(r, rowMap);
+                if (cell)
+                    rowMap.set(c, cell);
+                else
+                    rowMap.delete(c);
+            }
+        }
+        return this;
+    }
+    fillNumber(startRow, col, count, startValue = 0, step = 1) {
+        for (let i = 0; i < count; i++) {
+            this.setValue(startRow + i, col, startValue + i * step);
+        }
+        return this;
+    }
+    fillDate(startRow, col, count, startDate, unit = 'day', step = 1) {
+        for (let i = 0; i < count; i++) {
+            const d = new Date(startDate);
+            switch (unit) {
+                case 'day':
+                    d.setDate(d.getDate() + i * step);
+                    break;
+                case 'week':
+                    d.setDate(d.getDate() + i * step * 7);
+                    break;
+                case 'month':
+                    d.setMonth(d.getMonth() + i * step);
+                    break;
+                case 'year':
+                    d.setFullYear(d.getFullYear() + i * step);
+                    break;
+            }
+            this.setValue(startRow + i, col, d);
+        }
+        return this;
+    }
+    fillList(startRow, col, list, count) {
+        for (let i = 0; i < count; i++) {
+            this.setValue(startRow + i, col, list[i % list.length]);
+        }
+        return this;
+    }
+    autoFitColumns(minWidth = 8, maxWidth = 60) {
+        const range = this.getUsedRange();
+        if (!range)
+            return this;
+        for (let c = range.startCol; c <= range.endCol; c++) {
+            let maxLen = 0;
+            for (let r = range.startRow; r <= range.endRow; r++) {
+                const cell = this.cells.get(r)?.get(c);
+                if (cell?.value != null) {
+                    const s = String(cell.value);
+                    if (s.length > maxLen)
+                        maxLen = s.length;
+                }
+                if (cell?.richText) {
+                    const s = cell.richText.map(r => r.text).join('');
+                    if (s.length > maxLen)
+                        maxLen = s.length;
+                }
+            }
+            if (maxLen > 0) {
+                const w = Math.max(minWidth, Math.min(maxWidth, maxLen * 1.2 + 2));
+                this.setColumn(c, { ...(this.colDefs.get(c) ?? {}), width: w, customWidth: true });
+            }
+        }
+        return this;
+    }
+    duplicateRow(sourceRow, targetRow) {
+        this.insertRows(targetRow, 1);
+        const srcMap = this.cells.get(sourceRow >= targetRow ? sourceRow + 1 : sourceRow);
+        if (srcMap) {
+            const newMap = new Map();
+            for (const [c, cell] of srcMap) {
+                newMap.set(c, { ...cell, style: cell.style ? { ...cell.style } : undefined });
+            }
+            this.cells.set(targetRow, newMap);
+        }
+        const srcDef = this.rowDefs.get(sourceRow >= targetRow ? sourceRow + 1 : sourceRow);
+        if (srcDef)
+            this.rowDefs.set(targetRow, { ...srcDef });
+        return this;
+    }
+    spliceRows(startRow, deleteCount, newRows) {
+        if (deleteCount > 0)
+            this.deleteRows(startRow, deleteCount);
+        if (newRows && newRows.length > 0) {
+            this.insertRows(startRow, newRows.length);
+            for (let i = 0; i < newRows.length; i++) {
+                this.writeRow(startRow + i, 1, newRows[i]);
+            }
+        }
+        return this;
+    }
+    setAutoFilter(ref, opts) {
+        this.autoFilter = { ref };
+        if (opts?.columns) {
+            this._filterColumns = opts.columns;
+        }
+        return this;
+    }
     addSparkline(s) {
         this.sparklines.push(s);
         return this;
     }
+    getSparklines() { return this.sparklines; }
     addDataValidation(sqref, dv) {
         this.dataValidations.set(sqref, dv);
         return this;
     }
+    addRowBreak(row, manual = true) {
+        this.rowBreaks.push({ id: row, manual });
+        return this;
+    }
+    addColBreak(col, manual = true) {
+        this.colBreaks.push({ id: col, manual });
+        return this;
+    }
+    getRowBreaks() { return this.rowBreaks; }
+    getColBreaks() { return this.colBreaks; }
+    addFormControl(ctrl) {
+        if (!ctrl.to && (ctrl.width || ctrl.height)) {
+            const COL_PX = 64, ROW_PX = 20;
+            const w = ctrl.width ?? 100, h = ctrl.height ?? 30;
+            const endColFrac = ctrl.from.col + w / COL_PX;
+            const endRowFrac = ctrl.from.row + h / ROW_PX;
+            ctrl = { ...ctrl, to: {
+                    col: Math.floor(endColFrac),
+                    row: Math.floor(endRowFrac),
+                    colOff: Math.round((endColFrac % 1) * COL_PX),
+                    rowOff: Math.round((endRowFrac % 1) * ROW_PX),
+                } };
+        }
+        this.formControls.push(ctrl);
+        return this;
+    }
+    getFormControls() { return this.formControls; }
+    addShape(shape) { this.shapes.push(shape); return this; }
+    getShapes() { return this.shapes; }
+    addWordArt(wa) { this.wordArt.push(wa); return this; }
+    getWordArt() { return this.wordArt; }
+    addQueryTable(qt) { this.queryTables.push(qt); return this; }
+    getQueryTables() { return this.queryTables; }
+    addTableSlicer(slicer) { this.tableSlicers.push(slicer); return this; }
+    getTableSlicers() { return this.tableSlicers; }
+    addMathEquation(eq) { this.mathEquations.push(eq); return this; }
+    getMathEquations() { return this.mathEquations; }
+    addIgnoredError(sqref, opts) {
+        this.ignoreErrors.push({ sqref, ...opts });
+        return this;
+    }
+    getIgnoredErrors() { return this.ignoreErrors; }
+    addPreservedXml(xml) {
+        this.preservedXml.push(xml);
+        return this;
+    }
     freeze(row, col) {
         this.freezePane = { row, col };
         return this;
@@ -165,27 +573,38 @@ export class Worksheet {
         const mergesXml = this._mergesXml();
         const cfXml = this._conditionalFormatXml(styles);
         const dvXml = this._dataValidationsXml();
-        const autoFilterXml = this.autoFilter ? `<autoFilter ref="${this.autoFilter.ref}"/>` : '';
+        const autoFilterXml = this.autoFilter && !this.tables.some(t => t.ref === this.autoFilter.ref)
+            ? this._autoFilterXml() : '';
         const tablePartsXml = this.tables.length
             ? `<tableParts count="${this.tables.length}">${this.tableRIds.map(rId => `<tablePart r:id="${rId}"/>`).join('')}</tableParts>`
             : '';
-        const drawingXml = (this.images.length || this.charts.length) && this.drawingRId
+        const drawingXml = this.drawingRId
             ? `<drawing r:id="${this.drawingRId}"/>`
             : '';
         const legacyDrawingXml = this.legacyDrawingRId
             ? `<legacyDrawing r:id="${this.legacyDrawingRId}"/>`
             : '';
+        const controlsXml = this._formControlsXml();
         const sparklineXml = this._sparklineXml();
+        const customIconExtXml = this._customIconExtXml();
+        const slicerExtXml = this.slicerRId
+            ? `<extLst><ext uri="{A8765BA9-456A-4dab-B4F3-ACF838C121DE}" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"><x14:slicerList><x14:slicer r:id="${this.slicerRId}"/></x14:slicerList></ext></extLst>`
+            : '';
+        const ignoredErrorsXml = this._ignoredErrorsXml();
         const protectionXml = this._protectionXml();
         const pageSetupXml = this._pageSetupXml();
         const pageMarginsXml = this._pageMarginsXml();
         const headerFooterXml = this._headerFooterXml();
         const printOptionsXml = this._printOptionsXml();
+        const rowBreaksXml = this._pageBreaksXml('rowBreaks', this.rowBreaks, 16383);
+        const colBreaksXml = this._pageBreaksXml('colBreaks', this.colBreaks, 1048575);
         return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
   xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
   xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"
-  xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision">
+  xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision"
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing">
 ${sheetPrXml}
 ${sheetViewXml}
 ${colsXml}
@@ -199,11 +618,45 @@ ${printOptionsXml}
 ${pageMarginsXml}
 ${pageSetupXml}
 ${headerFooterXml}
+${rowBreaksXml}
+${colBreaksXml}
+${ignoredErrorsXml}
 ${drawingXml}
 ${legacyDrawingXml}
+${controlsXml}
 ${sparklineXml}
+${customIconExtXml}
 ${tablePartsXml}
+${slicerExtXml}
+${this.preservedXml.join('\n')}
 </worksheet>`;
+    }
+    toChartSheetXml() {
+        const pageMarginsXml = this._pageMarginsXml();
+        const pageSetupXml = this._pageSetupXml();
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<chartsheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+<sheetPr/>
+<sheetViews><sheetView zoomScale="99" workbookViewId="0" zoomToFit="1"/></sheetViews>
+${pageMarginsXml || '<pageMargins left="0.7" right="0.7" top="0.78740157499999996" bottom="0.78740157499999996" header="0.3" footer="0.3"/>'}
+${pageSetupXml}
+<drawing r:id="${this.drawingRId}"/>
+</chartsheet>`;
+    }
+    toDialogSheetXml(_styles, _shared) {
+        const pageMarginsXml = this._pageMarginsXml();
+        const legacyDrawingXml = this.legacyDrawingRId
+            ? `<legacyDrawing r:id="${this.legacyDrawingRId}"/>` : '';
+        return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<dialogsheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+  xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+<sheetViews><sheetView showRowColHeaders="0" showZeros="0" showOutlineSymbols="0" workbookViewId="0"/></sheetViews>
+<sheetFormatPr baseColWidth="10" defaultColWidth="1" defaultRowHeight="5.65" customHeight="1"/>
+<sheetProtection sheet="1"/>
+${pageMarginsXml || '<pageMargins left="0.7" right="0.7" top="0.78740157499999996" bottom="0.78740157499999996" header="0.3" footer="0.3"/>'}
+${legacyDrawingXml}
+</dialogsheet>`;
     }
     _sheetViewXml() {
         const v = this.view ?? {};
@@ -247,68 +700,85 @@ ${tablePartsXml}
         return `<cols>${items.join('')}</cols>`;
     }
     _sheetDataXml(styles, shared) {
-        const rows = new Map();
-        for (const [key, cell] of this.cells) {
-            const [r, c] = key.split(',').map(Number);
-            if (!rows.has(r))
-                rows.set(r, []);
-            rows.get(r).push([c, cell]);
-        }
-        const sortedRows = [...rows.entries()].sort((a, b) => a[0] - b[0]);
-        const rowsXml = sortedRows.map(([rowIdx, cells]) => {
+        const sortedRows = [...this.cells.entries()].sort((a, b) => a[0] - b[0]);
+        const out = ['<sheetData>'];
+        for (let ri = 0; ri < sortedRows.length; ri++) {
+            const [rowIdx, colMap] = sortedRows[ri];
             const rowDef = this.rowDefs.get(rowIdx);
             const rowStyleIdx = rowDef?.style ? styles.register(rowDef.style) : 0;
-            const rowAttrs = [
-                `r="${rowIdx}"`,
-                rowDef?.height ? `ht="${rowDef.height}" customHeight="1"` : '',
-                rowDef?.hidden ? `hidden="1"` : '',
-                rowDef?.outlineLevel ? `outlineLevel="${rowDef.outlineLevel}"` : '',
-                rowDef?.collapsed ? `collapsed="1"` : '',
-                rowStyleIdx ? `s="${rowStyleIdx}" customFormat="1"` : '',
-                rowDef?.thickTop ? `thickTop="1"` : '',
-                rowDef?.thickBot ? `thickBot="1"` : '',
-            ].filter(Boolean).join(' ');
-            const sortedCells = cells.sort((a, b) => a[0] - b[0]);
-            const cellsXml = sortedCells.map(([colIdx, cell]) => this._cellXml(rowIdx, colIdx, cell, styles, shared)).join('');
-            return `<row ${rowAttrs}>${cellsXml}</row>`;
-        });
-        return `<sheetData>${rowsXml.join('')}</sheetData>`;
+            let attrs = `r="${rowIdx}"`;
+            if (rowDef?.height)
+                attrs += ` ht="${rowDef.height}" customHeight="1"`;
+            if (rowDef?.hidden)
+                attrs += ' hidden="1"';
+            if (rowDef?.outlineLevel)
+                attrs += ` outlineLevel="${rowDef.outlineLevel}"`;
+            if (rowDef?.collapsed)
+                attrs += ' collapsed="1"';
+            if (rowStyleIdx)
+                attrs += ` s="${rowStyleIdx}" customFormat="1"`;
+            if (rowDef?.thickTop)
+                attrs += ' thickTop="1"';
+            if (rowDef?.thickBot)
+                attrs += ' thickBot="1"';
+            out.push(`<row ${attrs}>`);
+            const sortedCells = [...colMap.entries()].sort((a, b) => a[0] - b[0]);
+            for (let ci = 0; ci < sortedCells.length; ci++) {
+                out.push(this._cellXml(rowIdx, sortedCells[ci][0], sortedCells[ci][1], styles, shared));
+            }
+            out.push('</row>');
+        }
+        out.push('</sheetData>');
+        return out.join('');
     }
     _cellXml(row, col, cell, styles, shared) {
         const ref = `${colIndexToLetter(col)}${row}`;
         const styleIdx = cell.style ? styles.register(cell.style) : 0;
         const sAttr = styleIdx ? ` s="${styleIdx}"` : '';
+        const vmIdx = this._cellImageVm.get(ref);
+        const vmAttr = vmIdx !== undefined ? ` vm="${vmIdx}"` : '';
         if (cell.arrayFormula) {
-            const fml = `<f t="array" ref="${ref}">${escapeXml(cell.arrayFormula)}</f>`;
-            return `<c r="${ref}"${sAttr}>${fml}<v>0</v></c>`;
+            const fml = `<f t="array" ref="${ref}">${escapeXmlContent(cell.arrayFormula)}</f>`;
+            return `<c r="${ref}"${sAttr}${vmAttr}>${fml}<v>0</v></c>`;
+        }
+        if (cell._sharedIdx !== undefined) {
+            const si = cell._sharedIdx;
+            const sharedRef = cell._sharedRef;
+            if (cell.formula && sharedRef) {
+                const fml = `<f t="shared" ref="${sharedRef}" si="${si}">${escapeXmlContent(cell.formula)}</f>`;
+                return `<c r="${ref}"${sAttr}${vmAttr}>${fml}</c>`;
+            }
+            return `<c r="${ref}"${sAttr}${vmAttr}><f t="shared" si="${si}"/></c>`;
         }
         if (cell.formula) {
-            const fml = `<f>${escapeXml(cell.formula)}</f>`;
-            return `<c r="${ref}"${sAttr}>${fml}</c>`;
+            const fml = `<f>${escapeXmlContent(cell.formula)}</f>`;
+            return `<c r="${ref}"${sAttr}${vmAttr}>${fml}</c>`;
         }
         if (cell.richText) {
             const si = shared.internRichText(cell.richText);
-            return `<c r="${ref}" t="s"${sAttr}><v>${si}</v></c>`;
+            return `<c r="${ref}" t="s"${sAttr}${vmAttr}><v>${si}</v></c>`;
         }
         const v = cell.value;
         if (v === null || v === undefined) {
+            if (vmAttr)
+                return `<c r="${ref}"${sAttr} t="e"${vmAttr}><v>#VALUE!</v></c>`;
             return styleIdx ? `<c r="${ref}"${sAttr}/>` : '';
         }
+        if (v instanceof CellError) {
+            return `<c r="${ref}" t="e"${sAttr}${vmAttr}><v>${escapeXml(v.error)}</v></c>`;
+        }
         if (typeof v === 'boolean') {
-            return `<c r="${ref}" t="b"${sAttr}><v>${v ? 1 : 0}</v></c>`;
+            return `<c r="${ref}" t="b"${sAttr}${vmAttr}><v>${v ? 1 : 0}</v></c>`;
         }
         if (v instanceof Date) {
             const serial = dateToSerial(v);
-            return `<c r="${ref}"${sAttr}><v>${serial}</v></c>`;
+            return `<c r="${ref}"${sAttr}${vmAttr}><v>${serial}</v></c>`;
         }
         if (typeof v === 'number') {
-            return `<c r="${ref}"${sAttr}><v>${v}</v></c>`;
-        }
-        if (typeof v === 'string' && v.startsWith('=')) {
-            return `<c r="${ref}"${sAttr}><f>${escapeXml(v.slice(1))}</f></c>`;
+            return `<c r="${ref}"${sAttr}${vmAttr}><v>${v}</v></c>`;
         }
         const si = shared.intern(v);
-        return `<c r="${ref}" t="s"${sAttr}><v>${si}</v></c>`;
+        return `<c r="${ref}" t="s"${sAttr}${vmAttr}><v>${si}</v></c>`;
     }
     _mergesXml() {
         if (!this.merges.length)
@@ -327,7 +797,7 @@ ${tablePartsXml}
             if (cf.colorScale?.type === 'colorScale') {
                 const cs = cf.colorScale;
                 const cfvos = cs.cfvo.map(v => `<cfvo type="${v.type}"${v.val ? ` val="${v.val}"` : ''}/>`).join('');
-                const colors = cs.color.map(c => `<color rgb="${c.startsWith('#') ? 'FF' + c.slice(1) : c}"/>`).join('');
+                const colors = cs.color.map(c => colorEl(c)).join('');
                 inner = `<colorScale>${cfvos}${colors}</colorScale>`;
             }
             else if (cf.dataBar?.type === 'dataBar') {
@@ -335,8 +805,7 @@ ${tablePartsXml}
                 const minCfvo = `<cfvo type="${db.minType ?? 'min'}"${db.minVal != null ? ` val="${db.minVal}"` : ''}/>`;
                 const maxCfvo = `<cfvo type="${db.maxType ?? 'max'}"${db.maxVal != null ? ` val="${db.maxVal}"` : ''}/>`;
                 const color = db.color ?? db.minColor ?? 'FF638EC6';
-                const rgb = color.startsWith('#') ? 'FF' + color.slice(1) : color;
-                inner = `<dataBar${db.showValue === false ? ' showValue="0"' : ''}>${minCfvo}${maxCfvo}<color rgb="${rgb}"/></dataBar>`;
+                inner = `<dataBar${db.showValue === false ? ' showValue="0"' : ''}>${minCfvo}${maxCfvo}${colorEl(color)}</dataBar>`;
             }
             else if (cf.iconSet?.type === 'iconSet') {
                 const is = cf.iconSet;
@@ -458,6 +927,32 @@ ${tablePartsXml}
         ].filter(Boolean).join(' ');
         return attrs ? `<printOptions ${attrs}/>` : '';
     }
+    _pageBreaksXml(tag, breaks, maxVal) {
+        if (!breaks.length)
+            return '';
+        const manualCount = breaks.filter(b => b.manual !== false).length;
+        const brks = breaks.map(b => `<brk id="${b.id}" max="${maxVal}"${b.manual !== false ? ' man="1"' : ''}/>`).join('');
+        return `<${tag} count="${breaks.length}" manualBreakCount="${manualCount}">${brks}</${tag}>`;
+    }
+    _formControlsXml() {
+        if (!this.formControls.length || !this.ctrlPropRIds.length)
+            return '';
+        const baseShapeId = 1025 + this.sheetIndex * 1000;
+        let commentCount = 0;
+        for (const rowMap of this.cells.values())
+            for (const c of rowMap.values())
+                if (c.comment)
+                    commentCount++;
+        const controls = this.formControls.map((ctrl, i) => {
+            const shapeId = ctrl._shapeId ?? (baseShapeId + commentCount + i);
+            const ctrlPropRId = this.ctrlPropRIds[i];
+            if (!ctrlPropRId)
+                return '';
+            const name = ctrl.text ?? `${ctrl.type} ${i + 1}`;
+            return `<mc:AlternateContent><mc:Choice Requires="x14"><control shapeId="${shapeId}" r:id="${ctrlPropRId}" name="${escapeXml(name)}"><controlPr defaultSize="0" print="0" autoFill="0" autoPict="0"${ctrl.macro ? ` macro="${escapeXml(ctrl.macro)}"` : ''}><anchor moveWithCells="1"><from><xdr:col>${ctrl.from.col}</xdr:col><xdr:colOff>${ctrl.from.colOff ?? 0}</xdr:colOff><xdr:row>${ctrl.from.row}</xdr:row><xdr:rowOff>${ctrl.from.rowOff ?? 0}</xdr:rowOff></from><to><xdr:col>${ctrl.to.col}</xdr:col><xdr:colOff>${ctrl.to.colOff ?? 0}</xdr:colOff><xdr:row>${ctrl.to.row}</xdr:row><xdr:rowOff>${ctrl.to.rowOff ?? 0}</xdr:rowOff></to></anchor></controlPr></control></mc:Choice></mc:AlternateContent>`;
+        }).join('');
+        return `<mc:AlternateContent><mc:Choice Requires="x14"><controls>${controls}</controls></mc:Choice></mc:AlternateContent>`;
+    }
     _sparklineXml() {
         if (!this.sparklines.length)
             return '';
@@ -497,23 +992,117 @@ ${tablePartsXml}
         const inner = `<x14:sparklineGroups xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main">${groups.join('')}</x14:sparklineGroups>`;
         return `<extLst><ext uri="{05C60535-1F16-4fd2-B633-F4F36F0B64E0}" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main">${inner}</ext></extLst>`;
     }
+    _customIconExtXml() {
+        const customCFs = this.conditionalFormats.filter(cf => cf.iconSet?.type === 'iconSet' && 'custom' in cf.iconSet && cf.iconSet.custom?.length);
+        if (!customCFs.length)
+            return '';
+        const rules = customCFs.map((cf, i) => {
+            const is = cf.iconSet;
+            const cfvos = is.cfvo.map(v => `<x14:cfvo type="${v.type}"${v.val ? ` val="${v.val}"` : ''}/>`).join('');
+            const icons = is.custom.map(ci => `<x14:cfIcon iconSet="${ci.iconSet}" iconId="${ci.iconId}"/>`).join('');
+            return `<x14:conditionalFormatting xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main"><x14:cfRule type="iconSet" id="{${this._uuid()}}"><x14:iconSet iconSet="${is.iconSet}" custom="1"${is.showValue === false ? ' showValue="0"' : ''}${is.reverse ? ' reverse="1"' : ''}>${cfvos}${icons}</x14:iconSet></x14:cfRule><xm:sqref>${cf.sqref}</xm:sqref></x14:conditionalFormatting>`;
+        }).join('');
+        return `<extLst><ext uri="{78C0D931-6437-407d-A8EE-F0AAD7539E65}" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main">${rules}</ext></extLst>`;
+    }
+    _uuid() {
+        const h = '0123456789ABCDEF';
+        let u = '';
+        for (let i = 0; i < 36; i++) {
+            if (i === 8 || i === 13 || i === 18 || i === 23)
+                u += '-';
+            else if (i === 14)
+                u += '4';
+            else if (i === 19)
+                u += h[(Math.random() * 4 | 0) + 8];
+            else
+                u += h[Math.random() * 16 | 0];
+        }
+        return u;
+    }
+    _autoFilterXml() {
+        if (!this.autoFilter)
+            return '';
+        const cols = this._filterColumns;
+        if (!cols || cols.length === 0)
+            return `<autoFilter ref="${this.autoFilter.ref}"/>`;
+        const colXml = cols.map(fc => {
+            const colId = fc.col - 1;
+            let inner = '';
+            if (fc.type === 'custom') {
+                const op = fc.operator ?? 'greaterThan';
+                inner = `<customFilters><customFilter operator="${op}" val="${fc.val ?? ''}"/></customFilters>`;
+            }
+            else if (fc.type === 'top10') {
+                const attrs = [
+                    fc.top === false ? 'top="0"' : '',
+                    fc.percent ? 'percent="1"' : '',
+                    `val="${fc.val ?? 10}"`,
+                ].filter(Boolean).join(' ');
+                inner = `<top10 ${attrs}/>`;
+            }
+            else if (fc.type === 'value' && fc.items) {
+                inner = `<filters>${fc.items.map(v => `<filter val="${escapeXml(String(v))}"/>`).join('')}</filters>`;
+            }
+            else if (fc.type === 'dynamic') {
+                inner = `<dynamicFilter type="${fc.dynamicType ?? 'aboveAverage'}"/>`;
+            }
+            return `<filterColumn colId="${colId}">${inner}</filterColumn>`;
+        }).join('');
+        return `<autoFilter ref="${this.autoFilter.ref}">${colXml}</autoFilter>`;
+    }
+    _ignoredErrorsXml() {
+        if (!this.ignoreErrors.length)
+            return '';
+        const items = this.ignoreErrors.map(ie => {
+            const attrs = [`sqref="${ie.sqref}"`];
+            if (ie.numberStoredAsText)
+                attrs.push('numberStoredAsText="1"');
+            if (ie.formula)
+                attrs.push('formula="1"');
+            if (ie.formulaRange)
+                attrs.push('formulaRange="1"');
+            if (ie.unlockedFormula)
+                attrs.push('unlockedFormula="1"');
+            if (ie.evalError)
+                attrs.push('evalError="1"');
+            if (ie.twoDigitTextYear)
+                attrs.push('twoDigitTextYear="1"');
+            if (ie.emptyRef)
+                attrs.push('emptyRef="1"');
+            if (ie.listDataValidation)
+                attrs.push('listDataValidation="1"');
+            if (ie.calculatedColumn)
+                attrs.push('calculatedColumn="1"');
+            return `<ignoredError ${attrs.join(' ')}/>`;
+        });
+        return `<ignoredErrors>${items.join('')}</ignoredErrors>`;
+    }
     toDrawingXml(imageRIds, chartRIds) {
         const parts = [];
         const EMU = pxToEmu;
         this.images.forEach((img, i) => {
             const rId = imageRIds[i];
-            const from = img.from;
-            const to = img.to;
-            const fromXml = `<xdr:from><xdr:col>${from.col}</xdr:col><xdr:colOff>${from.colOff ?? 0}</xdr:colOff><xdr:row>${from.row}</xdr:row><xdr:rowOff>${from.rowOff ?? 0}</xdr:rowOff></xdr:from>`;
+            const w = EMU(img.width ?? 100);
+            const h = EMU(img.height ?? 100);
             let anchor;
-            if (to) {
-                const toXml = `<xdr:to><xdr:col>${to.col}</xdr:col><xdr:colOff>${to.colOff ?? 0}</xdr:colOff><xdr:row>${to.row}</xdr:row><xdr:rowOff>${to.rowOff ?? 0}</xdr:rowOff></xdr:to>`;
-                anchor = `<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}`;
+            let closeTag;
+            if (img.position) {
+                anchor = `<xdr:absoluteAnchor><xdr:pos x="${EMU(img.position.x)}" y="${EMU(img.position.y)}"/><xdr:ext cx="${w}" cy="${h}"/>`;
+                closeTag = `</xdr:absoluteAnchor>`;
             }
             else {
-                const w = EMU(img.width ?? 100);
-                const h = EMU(img.height ?? 100);
-                anchor = `<xdr:oneCellAnchor>${fromXml}<xdr:ext cx="${w}" cy="${h}"/>`;
+                const from = img.from;
+                const to = img.to;
+                const fromXml = `<xdr:from><xdr:col>${from.col}</xdr:col><xdr:colOff>${from.colOff ?? 0}</xdr:colOff><xdr:row>${from.row}</xdr:row><xdr:rowOff>${from.rowOff ?? 0}</xdr:rowOff></xdr:from>`;
+                if (to) {
+                    const toXml = `<xdr:to><xdr:col>${to.col}</xdr:col><xdr:colOff>${to.colOff ?? 0}</xdr:colOff><xdr:row>${to.row}</xdr:row><xdr:rowOff>${to.rowOff ?? 0}</xdr:rowOff></xdr:to>`;
+                    anchor = `<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}`;
+                    closeTag = `</xdr:twoCellAnchor>`;
+                }
+                else {
+                    anchor = `<xdr:oneCellAnchor>${fromXml}<xdr:ext cx="${w}" cy="${h}"/>`;
+                    closeTag = `</xdr:oneCellAnchor>`;
+                }
             }
             const picXml = `<xdr:pic>
   <xdr:nvPicPr>
@@ -526,29 +1115,166 @@ ${tablePartsXml}
   </xdr:blipFill>
   <xdr:spPr>
     <a:xfrm xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
-      <a:off x="0" y="0"/><a:ext cx="${EMU(img.width ?? 100)}" cy="${EMU(img.height ?? 100)}"/>
+      <a:off x="0" y="0"/><a:ext cx="${w}" cy="${h}"/>
     </a:xfrm>
     <a:prstGeom xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" prst="rect"><a:avLst/></a:prstGeom>
   </xdr:spPr>
 </xdr:pic>`;
-            const closeTag = to ? `</xdr:twoCellAnchor>` : `</xdr:oneCellAnchor>`;
             parts.push(`${anchor}${picXml}<xdr:clientData/>${closeTag}`);
         });
         this.charts.forEach((chart, i) => {
             const rId = chartRIds[i];
             const from = chart.from;
             const to = chart.to;
-            const fromXml = `<xdr:from><xdr:col>${from.col}</xdr:col><xdr:colOff>${from.colOff ?? 0}</xdr:colOff><xdr:row>${from.row}</xdr:row><xdr:rowOff>${from.rowOff ?? 0}</xdr:rowOff></xdr:from>`;
-            const toXml = `<xdr:to><xdr:col>${to.col}</xdr:col><xdr:colOff>${to.colOff ?? 0}</xdr:colOff><xdr:row>${to.row}</xdr:row><xdr:rowOff>${to.rowOff ?? 0}</xdr:rowOff></xdr:to>`;
             const graphicXml = `<a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
   <a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart">
     <c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" r:id="${rId}"/>
   </a:graphicData>
 </a:graphic>`;
-            parts.push(`<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}<xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="${this.images.length + i + 2}" name="Chart ${i + 1}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" x="0" y="0"/><a:ext xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" cx="0" cy="0"/></xdr:xfrm>${graphicXml}</xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor>`);
+            if (this._isChartSheet) {
+                parts.push(`<xdr:absoluteAnchor><xdr:pos x="0" y="0"/><xdr:ext cx="9294091" cy="6003636"/><xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="${this.images.length + i + 2}" name="Chart ${i + 1}"/><xdr:cNvGraphicFramePr><a:graphicFrameLocks xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" noGrp="1"/></xdr:cNvGraphicFramePr></xdr:nvGraphicFramePr><xdr:xfrm><a:off xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" x="0" y="0"/><a:ext xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" cx="0" cy="0"/></xdr:xfrm>${graphicXml}</xdr:graphicFrame><xdr:clientData/></xdr:absoluteAnchor>`);
+            }
+            else {
+                const fromXml = `<xdr:from><xdr:col>${from.col}</xdr:col><xdr:colOff>${from.colOff ?? 0}</xdr:colOff><xdr:row>${from.row}</xdr:row><xdr:rowOff>${from.rowOff ?? 0}</xdr:rowOff></xdr:from>`;
+                const toXml = `<xdr:to><xdr:col>${to.col}</xdr:col><xdr:colOff>${to.colOff ?? 0}</xdr:colOff><xdr:row>${to.row}</xdr:row><xdr:rowOff>${to.rowOff ?? 0}</xdr:rowOff></xdr:to>`;
+                parts.push(`<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}<xdr:graphicFrame macro=""><xdr:nvGraphicFramePr><xdr:cNvPr id="${this.images.length + i + 2}" name="Chart ${i + 1}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" x="0" y="0"/><a:ext xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" cx="0" cy="0"/></xdr:xfrm>${graphicXml}</xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor>`);
+            }
+        });
+        let shapeCounter = this.images.length + this.charts.length + 2;
+        const toHex6 = (c) => { let h = c.replace(/^#/, ''); if (h.length === 8)
+            h = h.substring(2); return h; };
+        this.shapes.forEach(shape => {
+            const id = shapeCounter++;
+            const from = shape.from;
+            const to = shape.to;
+            const fromXml = `<xdr:from><xdr:col>${from.col}</xdr:col><xdr:colOff>${from.colOff ?? 0}</xdr:colOff><xdr:row>${from.row}</xdr:row><xdr:rowOff>${from.rowOff ?? 0}</xdr:rowOff></xdr:from>`;
+            const toXml = `<xdr:to><xdr:col>${to.col}</xdr:col><xdr:colOff>${to.colOff ?? 0}</xdr:colOff><xdr:row>${to.row}</xdr:row><xdr:rowOff>${to.rowOff ?? 0}</xdr:rowOff></xdr:to>`;
+            const fillXml = shape.fillColor
+                ? `<a:solidFill><a:srgbClr val="${toHex6(shape.fillColor)}"/></a:solidFill>`
+                : '<a:noFill/>';
+            const lineXml = shape.lineColor
+                ? `<a:ln${shape.lineWidth ? ` w="${shape.lineWidth * 12700}"` : ''}><a:solidFill><a:srgbClr val="${toHex6(shape.lineColor)}"/></a:solidFill></a:ln>`
+                : '';
+            const rotAttr = shape.rotation ? ` rot="${shape.rotation * 60000}"` : '';
+            const textXml = shape.text ? `<xdr:txBody><a:bodyPr vertOverflow="clip" wrap="square" rtlCol="0" anchor="ctr"/><a:lstStyle/><a:p><a:pPr algn="ctr"/><a:r><a:rPr lang="en-US"${shape.font?.bold ? ' b="1"' : ''}${shape.font?.size ? ` sz="${shape.font.size * 100}"` : ''}/><a:t>${escapeXml(shape.text)}</a:t></a:r></a:p></xdr:txBody>` : '';
+            parts.push(`<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}<xdr:sp><xdr:nvSpPr><xdr:cNvPr id="${id}" name="Shape ${id}"/><xdr:cNvSpPr/></xdr:nvSpPr><xdr:spPr><a:xfrm${rotAttr}><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></a:xfrm><a:prstGeom prst="${shape.type}"><a:avLst/></a:prstGeom>${fillXml}${lineXml}</xdr:spPr>${textXml}</xdr:sp><xdr:clientData/></xdr:twoCellAnchor>`);
         });
+        this.wordArt.forEach(wa => {
+            const id = shapeCounter++;
+            const from = wa.from;
+            const to = wa.to;
+            const fromXml = `<xdr:from><xdr:col>${from.col}</xdr:col><xdr:colOff>${from.colOff ?? 0}</xdr:colOff><xdr:row>${from.row}</xdr:row><xdr:rowOff>${from.rowOff ?? 0}</xdr:rowOff></xdr:from>`;
+            const toXml = `<xdr:to><xdr:col>${to.col}</xdr:col><xdr:colOff>${to.colOff ?? 0}</xdr:colOff><xdr:row>${to.row}</xdr:row><xdr:rowOff>${to.rowOff ?? 0}</xdr:rowOff></xdr:to>`;
+            const preset = wa.preset ?? 'textPlain';
+            const fontSize = wa.font?.size ? wa.font.size * 100 : 3600;
+            const fillHex = wa.fillColor ? toHex6(wa.fillColor) : '';
+            const outlineHex = wa.outlineColor ? toHex6(wa.outlineColor) : '';
+            const textFillXml = fillHex
+                ? `<a:solidFill><a:srgbClr val="${fillHex}"/></a:solidFill>`
+                : '<a:solidFill><a:schemeClr val="tx1"/></a:solidFill>';
+            const textOutlineXml = outlineHex
+                ? `<a:ln w="12700"><a:solidFill><a:srgbClr val="${outlineHex}"/></a:solidFill><a:prstDash val="solid"/></a:ln>`
+                : '';
+            const effectXml = `<a:effectLst><a:outerShdw dist="38100" dir="2700000" algn="bl" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="40000"/></a:srgbClr></a:outerShdw></a:effectLst>`;
+            const fontAttrs = [
+                'lang="en-US"',
+                `sz="${fontSize}"`,
+                wa.font?.bold ? 'b="1"' : 'b="1"',
+                wa.font?.italic ? 'i="1"' : '',
+                'cap="none" spc="0"',
+            ].filter(Boolean).join(' ');
+            const fontFace = wa.font?.name ?? 'Calibri';
+            const prstWarpXml = preset !== 'textPlain'
+                ? `<a:prstTxWarp prst="${preset}"><a:avLst/></a:prstTxWarp>`
+                : '';
+            parts.push(`<xdr:twoCellAnchor editAs="oneCell">${fromXml}${toXml}<xdr:sp macro="" textlink=""><xdr:nvSpPr><xdr:cNvPr id="${id}" name="WordArt ${id}"/><xdr:cNvSpPr/></xdr:nvSpPr><xdr:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom><a:noFill/></xdr:spPr><xdr:txBody><a:bodyPr wrap="square" lIns="91440" tIns="45720" rIns="91440" bIns="45720">${prstWarpXml}<a:spAutoFit/></a:bodyPr><a:lstStyle/><a:p><a:pPr algn="ctr"/><a:r><a:rPr ${fontAttrs}>${textOutlineXml}${textFillXml}${effectXml}<a:latin typeface="${escapeXml(fontFace)}"/></a:rPr><a:t>${escapeXml(wa.text)}</a:t></a:r></a:p></xdr:txBody></xdr:sp><xdr:clientData/></xdr:twoCellAnchor>`);
+        });
+        this.mathEquations.forEach(eq => {
+            const id = shapeCounter++;
+            const from = eq.from;
+            const fromXml = `<xdr:from><xdr:col>${from.col}</xdr:col><xdr:colOff>${from.colOff ?? 0}</xdr:colOff><xdr:row>${from.row}</xdr:row><xdr:rowOff>${from.rowOff ?? 0}</xdr:rowOff></xdr:from>`;
+            const w = eq.width ?? 1800000;
+            const h = eq.height ?? 500000;
+            const extXml = `<xdr:ext cx="${w}" cy="${h}"/>`;
+            const fontSize = eq.fontSize ? eq.fontSize * 100 : 1100;
+            const fontName = eq.fontName ?? 'Cambria Math';
+            const rPr = `<a:rPr lang="en-US" sz="${fontSize}" i="1"><a:latin typeface="${escapeXml(fontName)}" panose="02040503050406030204" pitchFamily="18" charset="0"/></a:rPr>`;
+            const ctrlPr = `<m:ctrlPr>${rPr}</m:ctrlPr>`;
+            const buildOmml = (el) => {
+                switch (el.type) {
+                    case 'text':
+                        return `<m:r>${rPr}<m:t>${escapeXml(el.text ?? '')}</m:t></m:r>`;
+                    case 'frac':
+                        return `<m:f><m:fPr>${el.hideDegree ? '<m:type m:val="noBar"/>' : ''}${ctrlPr}</m:fPr><m:num>${(el.base ?? []).map(buildOmml).join('')}</m:num><m:den>${(el.argument ?? []).map(buildOmml).join('')}</m:den></m:f>`;
+                    case 'sup':
+                        return `<m:sSup><m:sSupPr>${ctrlPr}</m:sSupPr><m:e>${(el.base ?? []).map(buildOmml).join('')}</m:e><m:sup>${(el.argument ?? []).map(buildOmml).join('')}</m:sup></m:sSup>`;
+                    case 'sub':
+                        return `<m:sSub><m:sSubPr>${ctrlPr}</m:sSubPr><m:e>${(el.base ?? []).map(buildOmml).join('')}</m:e><m:sub>${(el.argument ?? []).map(buildOmml).join('')}</m:sub></m:sSub>`;
+                    case 'subSup':
+                        return `<m:sSubSup><m:sSubSupPr>${ctrlPr}</m:sSubSupPr><m:e>${(el.base ?? []).map(buildOmml).join('')}</m:e><m:sub>${(el.subscript ?? []).map(buildOmml).join('')}</m:sub><m:sup>${(el.superscript ?? []).map(buildOmml).join('')}</m:sup></m:sSubSup>`;
+                    case 'nary': {
+                        const chr = el.operator ?? '∑';
+                        return `<m:nary><m:naryPr><m:chr m:val="${escapeXml(chr)}"/>${ctrlPr}</m:naryPr><m:sub>${(el.lower ?? []).map(buildOmml).join('')}</m:sub><m:sup>${(el.upper ?? []).map(buildOmml).join('')}</m:sup><m:e>${(el.body ?? []).map(buildOmml).join('')}</m:e></m:nary>`;
+                    }
+                    case 'rad':
+                        return `<m:rad><m:radPr>${el.hideDegree ? '<m:degHide m:val="1"/>' : ''}${ctrlPr}</m:radPr><m:deg>${(el.degree ?? []).map(buildOmml).join('')}</m:deg><m:e>${(el.body ?? []).map(buildOmml).join('')}</m:e></m:rad>`;
+                    case 'delim': {
+                        const open = el.open ?? '(';
+                        const close = el.close ?? ')';
+                        return `<m:d><m:dPr>${open !== '(' ? `<m:begChr m:val="${escapeXml(open)}"/>` : ''}${close !== ')' ? `<m:endChr m:val="${escapeXml(close)}"/>` : ''}${ctrlPr}</m:dPr><m:e>${(el.body ?? []).map(buildOmml).join('')}</m:e></m:d>`;
+                    }
+                    case 'func':
+                        return `<m:func><m:funcPr>${ctrlPr}</m:funcPr><m:fName>${(el.base ?? []).map(buildOmml).join('')}</m:fName><m:e>${(el.argument ?? []).map(buildOmml).join('')}</m:e></m:func>`;
+                    case 'accent':
+                        return `<m:acc><m:accPr>${el.operator ? `<m:chr m:val="${escapeXml(el.operator)}"/>` : ''}${ctrlPr}</m:accPr><m:e>${(el.body ?? []).map(buildOmml).join('')}</m:e></m:acc>`;
+                    case 'bar':
+                        return `<m:bar><m:barPr>${ctrlPr}</m:barPr><m:e>${(el.body ?? []).map(buildOmml).join('')}</m:e></m:bar>`;
+                    case 'matrix':
+                        return `<m:m><m:mPr>${ctrlPr}</m:mPr>${(el.rows ?? []).map(row => `<m:mr>${row.map(c => `<m:e>${buildOmml(c)}</m:e>`).join('')}</m:mr>`).join('')}</m:m>`;
+                    case 'eqArr':
+                        return `<m:eqArr><m:eqArrPr>${ctrlPr}</m:eqArrPr>${(el.rows ?? []).map(row => `<m:e>${row.map(buildOmml).join('')}</m:e>`).join('')}</m:eqArr>`;
+                    case 'limLow':
+                        return `<m:limLow><m:limLowPr>${ctrlPr}</m:limLowPr><m:e>${(el.base ?? []).map(buildOmml).join('')}</m:e><m:lim>${(el.argument ?? []).map(buildOmml).join('')}</m:lim></m:limLow>`;
+                    case 'limUpp':
+                        return `<m:limUpp><m:limUppPr>${ctrlPr}</m:limUppPr><m:e>${(el.base ?? []).map(buildOmml).join('')}</m:e><m:lim>${(el.argument ?? []).map(buildOmml).join('')}</m:lim></m:limUpp>`;
+                    case 'groupChar':
+                        return `<m:groupChr><m:groupChrPr>${el.operator ? `<m:chr m:val="${escapeXml(el.operator)}"/>` : ''}${ctrlPr}</m:groupChrPr><m:e>${(el.body ?? []).map(buildOmml).join('')}</m:e></m:groupChr>`;
+                    default:
+                        return `<m:r>${rPr}<m:t>${escapeXml(el.text ?? '')}</m:t></m:r>`;
+                }
+            };
+            const ommlBody = eq.elements.map(buildOmml).join('');
+            const ommlXml = `<m:oMathPara xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"><m:oMathParaPr><m:jc m:val="centerGroup"/></m:oMathParaPr><m:oMath xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math">${ommlBody}</m:oMath></m:oMathPara>`;
+            const flattenText = (el) => {
+                if (el.text)
+                    return el.text;
+                const parts = [el.base, el.argument, el.body, el.lower, el.upper, el.superscript, el.subscript, el.degree]
+                    .filter(Boolean).map(arr => arr.map(flattenText).join('')).join('');
+                if (el.type === 'frac')
+                    return `(${(el.base ?? []).map(flattenText).join('')})/(${(el.argument ?? []).map(flattenText).join('')})`;
+                if (el.type === 'sup')
+                    return `${(el.base ?? []).map(flattenText).join('')}^${(el.argument ?? []).map(flattenText).join('')}`;
+                if (el.type === 'nary')
+                    return `${el.operator ?? '∑'}(${(el.body ?? []).map(flattenText).join('')})`;
+                if (el.type === 'delim')
+                    return `${el.open ?? '('}${(el.body ?? []).map(flattenText).join('')}${el.close ?? ')'}`;
+                if (el.type === 'rad')
+                    return `√(${(el.body ?? []).map(flattenText).join('')})`;
+                return parts;
+            };
+            const fallbackText = eq.elements.map(flattenText).join('');
+            parts.push(`<xdr:oneCellAnchor>${fromXml}${extXml}<mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"><mc:Choice xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main" Requires="a14"><xdr:sp macro="" textlink=""><xdr:nvSpPr><xdr:cNvPr id="${id}" name="MathEq ${id}"/><xdr:cNvSpPr txBox="1"/></xdr:nvSpPr><xdr:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${w}" cy="${h}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom><a:noFill/></xdr:spPr><xdr:txBody><a:bodyPr vertOverflow="clip" horzOverflow="clip" wrap="none" lIns="0" tIns="0" rIns="0" bIns="0" rtlCol="0" anchor="t"><a:spAutoFit/></a:bodyPr><a:lstStyle/><a:p><a14:m>${ommlXml}</a14:m><a:endParaRPr lang="en-US" sz="${fontSize}"/></a:p></xdr:txBody></xdr:sp></mc:Choice><mc:Fallback><xdr:sp macro="" textlink=""><xdr:nvSpPr><xdr:cNvPr id="${id}" name="MathEq ${id}"/><xdr:cNvSpPr txBox="1"/></xdr:nvSpPr><xdr:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="${w}" cy="${h}"/></a:xfrm><a:prstGeom prst="rect"><a:avLst/></a:prstGeom><a:noFill/></xdr:spPr><xdr:txBody><a:bodyPr vertOverflow="clip" horzOverflow="clip" wrap="none" lIns="0" tIns="0" rIns="0" bIns="0" rtlCol="0" anchor="t"><a:spAutoFit/></a:bodyPr><a:lstStyle/><a:p><a:r><a:rPr lang="en-US" sz="${fontSize}" i="0"><a:latin typeface="${escapeXml(fontName)}" panose="02040503050406030204" pitchFamily="18" charset="0"/></a:rPr><a:t>${escapeXml(fallbackText)}</a:t></a:r><a:endParaRPr lang="en-US" sz="${fontSize}"/></a:p></xdr:txBody></xdr:sp></mc:Fallback></mc:AlternateContent><xdr:clientData/></xdr:oneCellAnchor>`);
+        });
+        for (const slicerInfo of this._slicerDrawingInfo) {
+            const id = shapeCounter++;
+            const { row: sRow, col: sCol } = slicerInfo.cell ? cellRefToIndices(slicerInfo.cell) : { row: 1, col: 6 };
+            const fromCol = sCol - 1, fromRow = sRow - 1;
+            const toCol = fromCol + 2, toRow = fromRow + 12;
+            parts.push(`<xdr:twoCellAnchor editAs="oneCell"><xdr:from><xdr:col>${fromCol}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${fromRow}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>${toCol}</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>${toRow}</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to><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="${id}" name="${escapeXml(slicerInfo.name)}"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></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="${escapeXml(slicerInfo.name)}"/></a:graphicData></a:graphic></xdr:graphicFrame></mc:Choice><mc:Fallback/></mc:AlternateContent><xdr:clientData/></xdr:twoCellAnchor>`);
+        }
         return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xdr:wsDr xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
+  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
   xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
 ${parts.join('\n')}
 </xdr:wsDr>`;