@odoo/o-spreadsheet 17.0.9 → 17.0.10

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.9
- * @date 2024-01-29T13:53:22.963Z
- * @hash 3c1209a
+ * @version 17.0.10
+ * @date 2024-02-02T13:48:28.727Z
+ * @hash be06aa9
  */
 
 'use strict';
@@ -4934,14 +4934,8 @@ function createDataSets(getters, dataSetsString, sheetId, dataSetsHaveTitle) {
                     : undefined));
             }
         }
-        else if (zone.left === zone.right && zone.top === zone.bottom) {
-            // A single cell. If it's only the title, the dataset is not added.
-            if (!dataSetsHaveTitle) {
-                dataSets.push(createDataSet(getters, dataSetSheetId, zone, undefined));
-            }
-        }
         else {
-            /* 1 row or 1 column */
+            /* 1 cell, 1 row or 1 column */
             dataSets.push(createDataSet(getters, dataSetSheetId, zone, dataSetsHaveTitle
                 ? {
                     top: zone.top,
@@ -4990,8 +4984,10 @@ function toExcelDataset(getters, ds) {
     }
     const dataRange = ds.dataRange.clone({ zone: dataZone });
     return {
-        label: ds.labelCell ? getters.getRangeString(ds.labelCell, "forceSheetReference") : undefined,
-        range: getters.getRangeString(dataRange, "forceSheetReference"),
+        label: ds.labelCell
+            ? getters.getRangeString(ds.labelCell, "forceSheetReference", { useFixedReference: true })
+            : undefined,
+        range: getters.getRangeString(dataRange, "forceSheetReference", { useFixedReference: true }),
     };
 }
 function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
@@ -5004,7 +5000,7 @@ function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
         zone.top = zone.top + 1;
     }
     const range = labelRange.clone({ zone });
-    return getters.getRangeString(range, "forceSheetReference");
+    return getters.getRangeString(range, "forceSheetReference", { useFixedReference: true });
 }
 /**
  * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -8594,7 +8590,7 @@ class BarChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -9172,7 +9168,7 @@ class LineChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -9478,7 +9474,7 @@ class PieChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -19921,19 +19917,20 @@ const formatNumberPercent = createFormatActionSpec({
 const formatNumberCurrency = createFormatActionSpec({
     name: _t("Currency"),
     descriptionValue: 1000.12,
-    format: (env) => env.model.config.defaultCurrencyFormat,
+    format: (env) => env.model.config.defaultCurrencyFormat ?? DEFAULT_CURRENCY_FORMAT,
 });
 const formatNumberCurrencyRounded = {
     ...createFormatActionSpec({
         name: _t("Currency rounded"),
         descriptionValue: 1000,
-        format: (env) => roundFormat(env.model.config.defaultCurrencyFormat),
+        format: (env) => roundFormat(env.model.config.defaultCurrencyFormat ?? DEFAULT_CURRENCY_FORMAT),
     }),
     isVisible: (env) => {
         const currencyFormat = env.model.config.defaultCurrencyFormat;
-        return currencyFormat !== roundFormat(currencyFormat);
+        return currencyFormat !== roundFormat(currencyFormat ?? DEFAULT_CURRENCY_FORMAT);
     },
 };
+const DEFAULT_CURRENCY_FORMAT = "[$$]#,##0.00";
 const EXAMPLE_DATE = parseLiteral("2023/09/26 10:43:00 PM", DEFAULT_LOCALE);
 const formatCustomCurrency = {
     name: _t("Custom currency"),
@@ -29353,6 +29350,7 @@ const registries$1 = {
     GROUP_HEADERS: groupHeadersMenuRegistry,
     UNGROUP_HEADERS: unGroupHeadersMenuRegistry,
 };
+const MODIFIER_KEYS = ["Shift", "Control", "Alt", "Meta"];
 // -----------------------------------------------------------------------------
 // JS
 // -----------------------------------------------------------------------------
@@ -29725,16 +29723,15 @@ class Grid extends owl.Component {
         }
     }
     onKeydown(ev) {
-        const eventKey = ev.key.toUpperCase();
         let keyDownString = "";
-        if (isCtrlKey(ev) && eventKey !== "CTRL")
-            keyDownString += "CTRL+";
-        if (ev.metaKey)
-            keyDownString += "CTRL+";
-        if (ev.altKey && eventKey !== "ALT")
-            keyDownString += "ALT+";
-        if (ev.shiftKey && eventKey !== "SHIFT")
-            keyDownString += "SHIFT+";
+        if (!MODIFIER_KEYS.includes(ev.key)) {
+            if (isCtrlKey(ev))
+                keyDownString += "CTRL+";
+            if (ev.altKey)
+                keyDownString += "ALT+";
+            if (ev.shiftKey)
+                keyDownString += "SHIFT+";
+        }
         keyDownString += ev.key.toUpperCase();
         let handler = this.keyDownMapping[keyDownString];
         if (handler) {
@@ -35572,6 +35569,9 @@ class CellPlugin extends CorePlugin {
                     format: cell.format ? getItemId(cell.format, formats) : undefined,
                     content: cell.content || undefined,
                 };
+                if (cell instanceof FormulaCellWithDependencies) {
+                    cells[xc].content = cell.contentWithFixedReferences || undefined;
+                }
             }
             _sheet.cells = cells;
         }
@@ -35615,13 +35615,13 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
-    getFormulaCellContent(sheetId, compiledFormula, dependencies) {
+    getFormulaCellContent(sheetId, compiledFormula, dependencies, useFixedReference = false) {
         const ranges = dependencies || compiledFormula.dependencies;
         let rangeIndex = 0;
         return concat(compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const range = ranges[rangeIndex++];
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, { useFixedReference });
             }
             return token.value;
         }));
@@ -35890,6 +35890,18 @@ class FormulaCellWithDependencies {
     get content() {
         return concat(this.compiledFormula.tokens.map((token) => token.value));
     }
+    get contentWithFixedReferences() {
+        let rangeIndex = 0;
+        return concat(this.compiledFormula.tokens.map((token) => {
+            if (token.type === "REFERENCE") {
+                const index = rangeIndex++;
+                return this.getRangeString(this.compiledFormula.dependencies[index], this.sheetId, {
+                    useFixedReference: true,
+                });
+            }
+            return token.value;
+        }));
+    }
 }
 class RangeReferenceToken {
     getValue;
@@ -36194,7 +36206,13 @@ class ConditionalFormatPlugin extends CorePlugin {
         }
     }
     exportForExcel(data) {
-        this.export(data);
+        if (data.sheets) {
+            for (let sheet of data.sheets) {
+                if (this.cfRules[sheet.id]) {
+                    sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                }
+            }
+        }
     }
     // ---------------------------------------------------------------------------
     // Getters
@@ -36259,11 +36277,11 @@ class ConditionalFormatPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
-    mapToConditionalFormat(sheetId, cf) {
+    mapToConditionalFormat(sheetId, cf, { useFixedReference } = { useFixedReference: false }) {
         return {
             ...cf,
             ranges: cf.ranges.map((range) => {
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, { useFixedReference });
             }),
         };
     }
@@ -38331,8 +38349,10 @@ class RangeAdapter {
      *
      * @param range the range (received from getRangeFromXC or getRangeFromZone)
      * @param forSheetId the id of the sheet where the range string is supposed to be used.
+     * @param options
+     * @param options.useFixedReference if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId) {
+    getRangeString(range, forSheetId, options = { useFixedReference: false }) {
         if (!range) {
             return INCORRECT_RANGE_STRING;
         }
@@ -38359,7 +38379,7 @@ class RangeAdapter {
         if (prefixSheet && !sheetName) {
             return INCORRECT_RANGE_STRING;
         }
-        let rangeString = this.getRangePartString(rangeImpl, 0);
+        let rangeString = this.getRangePartString(rangeImpl, 0, options);
         if (rangeImpl.parts && rangeImpl.parts.length === 2) {
             // this if converts A2:A2 into A2 except if any part of the original range had fixed row or column (with $)
             if (rangeImpl.zone.top !== rangeImpl.zone.bottom ||
@@ -38369,7 +38389,7 @@ class RangeAdapter {
                 rangeImpl.parts[1].rowFixed ||
                 rangeImpl.parts[1].colFixed) {
                 rangeString += ":";
-                rangeString += this.getRangePartString(rangeImpl, 1);
+                rangeString += this.getRangePartString(rangeImpl, 1, options);
             }
         }
         return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -38410,13 +38430,13 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part) {
+    getRangePartString(range, part, options = { useFixedReference: false }) {
         const colFixed = range.parts && range.parts[part]?.colFixed ? "$" : "";
         const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
         const rowFixed = range.parts && range.parts[part]?.rowFixed ? "$" : "";
         const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
         let str = "";
-        if (range.isFullCol) {
+        if (range.isFullCol && !options.useFixedReference) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -38424,7 +38444,7 @@ class RangeAdapter {
                 str = colFixed + col;
             }
         }
-        else if (range.isFullRow) {
+        else if (range.isFullRow && !options.useFixedReference) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -54951,12 +54971,7 @@ function addFormula(cell) {
         attrs.push(["t", "str"]);
         cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
     }
-    node = escapeXml /*xml*/ `
-      <f>
-        ${XlsxFormula}
-      </f>
-      ${cycle}
-    `;
+    node = escapeXml /*xml*/ `<f>${XlsxFormula}</f>${cycle}`;
     return { attrs, node };
 }
 function addContent(content, sharedStrings, forceString = false) {
@@ -55775,11 +55790,10 @@ function addRows(construct, data, sheet) {
                     ({ attrs: additionalAttrs, node: cellNode } = addContent(cell.content, construct.sharedStrings, isTableHeader));
                 }
                 attributes.push(...additionalAttrs);
-                cellNodes.push(escapeXml /*xml*/ `
-          <c ${formatAttributes(attributes)}>
-            ${cellNode}
-          </c>
-        `);
+                // prettier-ignore
+                cellNodes.push(escapeXml /*xml*/ `<c ${formatAttributes(attributes)}>
+  ${cellNode}
+</c>`);
             }
         }
         if (cellNodes.length || row.size !== DEFAULT_CELL_HEIGHT || row.isHidden) {
@@ -56375,7 +56389,6 @@ class Model extends EventBus {
             ...config,
             mode: config.mode || "normal",
             custom: config.custom || {},
-            defaultCurrencyFormat: config.defaultCurrencyFormat || "[$$]#,##0.00",
             external: this.setupExternalConfig(config.external || {}),
             transportService,
             client,
@@ -56413,6 +56426,7 @@ class Model extends EventBus {
             custom: this.config.custom,
             uiActions: this.config,
             session: this.session,
+            defaultCurrencyFormat: this.config.defaultCurrencyFormat,
         };
     }
     // ---------------------------------------------------------------------------
@@ -56785,6 +56799,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.9";
-__info__.date = "2024-01-29T13:53:22.963Z";
-__info__.hash = "3c1209a";
+__info__.version = "17.0.10";
+__info__.date = "2024-02-02T13:48:28.727Z";
+__info__.hash = "be06aa9";

package/dist/o-spreadsheet.d.ts

@@ -1190,7 +1190,7 @@ interface ModelConfig {
     readonly custom: Readonly<{
         [key: string]: any;
     }>;
-    readonly defaultCurrencyFormat: Format;
+    readonly defaultCurrencyFormat?: Format;
     /**
      * External dependencies required to enable some features
      * such as uploading images.
@@ -1441,6 +1441,7 @@ interface UIPluginConfig {
     readonly uiActions: UIActions;
     readonly custom: ModelConfig["custom"];
     readonly session: Session;
+    readonly defaultCurrencyFormat?: Format;
 }
 interface UIPluginConstructor {
     new (config: UIPluginConfig): UIPlugin;
@@ -3197,8 +3198,12 @@ declare class RangeAdapter implements CommandHandler<CoreCommand> {
      *
      * @param range the range (received from getRangeFromXC or getRangeFromZone)
      * @param forSheetId the id of the sheet where the range string is supposed to be used.
+     * @param options
+     * @param options.useFixedReference if true, the range will be returned with fixed row and column
      */
-    getRangeString(range: Range, forSheetId: UID): string;
+    getRangeString(range: Range, forSheetId: UID, options?: {
+        useFixedReference: boolean;
+    }): string;
     getRangeDataFromXc(sheetId: UID, xc: string): RangeData;
     getRangeDataFromZone(sheetId: UID, zone: Zone | UnboundedZone): RangeData;
     getRangeFromZone(sheetId: UID, zone: Zone | UnboundedZone): Range;
@@ -3418,7 +3423,7 @@ declare class CellPlugin extends CorePlugin<CoreState> implements CoreState {
      * starting an async evaluation even if it has been moved or re-allocated
      */
     getCellById(cellId: UID): Cell | undefined;
-    getFormulaCellContent(sheetId: UID, compiledFormula: RangeCompiledFormula, dependencies?: Range[]): string;
+    getFormulaCellContent(sheetId: UID, compiledFormula: RangeCompiledFormula, dependencies?: Range[], useFixedReference?: boolean): string;
     getTranslatedCellFormula(sheetId: UID, offsetX: number, offsetY: number, compiledFormula: RangeCompiledFormula): string;
     getCellStyle(position: CellPosition): Style;
     /**

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.9
- * @date 2024-01-29T13:53:22.963Z
- * @hash 3c1209a
+ * @version 17.0.10
+ * @date 2024-02-02T13:48:28.727Z
+ * @hash be06aa9
  */
 
 import { Component, useRef, onMounted, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillUnmount, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -4932,14 +4932,8 @@ function createDataSets(getters, dataSetsString, sheetId, dataSetsHaveTitle) {
                     : undefined));
             }
         }
-        else if (zone.left === zone.right && zone.top === zone.bottom) {
-            // A single cell. If it's only the title, the dataset is not added.
-            if (!dataSetsHaveTitle) {
-                dataSets.push(createDataSet(getters, dataSetSheetId, zone, undefined));
-            }
-        }
         else {
-            /* 1 row or 1 column */
+            /* 1 cell, 1 row or 1 column */
             dataSets.push(createDataSet(getters, dataSetSheetId, zone, dataSetsHaveTitle
                 ? {
                     top: zone.top,
@@ -4988,8 +4982,10 @@ function toExcelDataset(getters, ds) {
     }
     const dataRange = ds.dataRange.clone({ zone: dataZone });
     return {
-        label: ds.labelCell ? getters.getRangeString(ds.labelCell, "forceSheetReference") : undefined,
-        range: getters.getRangeString(dataRange, "forceSheetReference"),
+        label: ds.labelCell
+            ? getters.getRangeString(ds.labelCell, "forceSheetReference", { useFixedReference: true })
+            : undefined,
+        range: getters.getRangeString(dataRange, "forceSheetReference", { useFixedReference: true }),
     };
 }
 function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
@@ -5002,7 +4998,7 @@ function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
         zone.top = zone.top + 1;
     }
     const range = labelRange.clone({ zone });
-    return getters.getRangeString(range, "forceSheetReference");
+    return getters.getRangeString(range, "forceSheetReference", { useFixedReference: true });
 }
 /**
  * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -8592,7 +8588,7 @@ class BarChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -9170,7 +9166,7 @@ class LineChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -9476,7 +9472,7 @@ class PieChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -19919,19 +19915,20 @@ const formatNumberPercent = createFormatActionSpec({
 const formatNumberCurrency = createFormatActionSpec({
     name: _t("Currency"),
     descriptionValue: 1000.12,
-    format: (env) => env.model.config.defaultCurrencyFormat,
+    format: (env) => env.model.config.defaultCurrencyFormat ?? DEFAULT_CURRENCY_FORMAT,
 });
 const formatNumberCurrencyRounded = {
     ...createFormatActionSpec({
         name: _t("Currency rounded"),
         descriptionValue: 1000,
-        format: (env) => roundFormat(env.model.config.defaultCurrencyFormat),
+        format: (env) => roundFormat(env.model.config.defaultCurrencyFormat ?? DEFAULT_CURRENCY_FORMAT),
     }),
     isVisible: (env) => {
         const currencyFormat = env.model.config.defaultCurrencyFormat;
-        return currencyFormat !== roundFormat(currencyFormat);
+        return currencyFormat !== roundFormat(currencyFormat ?? DEFAULT_CURRENCY_FORMAT);
     },
 };
+const DEFAULT_CURRENCY_FORMAT = "[$$]#,##0.00";
 const EXAMPLE_DATE = parseLiteral("2023/09/26 10:43:00 PM", DEFAULT_LOCALE);
 const formatCustomCurrency = {
     name: _t("Custom currency"),
@@ -29351,6 +29348,7 @@ const registries$1 = {
     GROUP_HEADERS: groupHeadersMenuRegistry,
     UNGROUP_HEADERS: unGroupHeadersMenuRegistry,
 };
+const MODIFIER_KEYS = ["Shift", "Control", "Alt", "Meta"];
 // -----------------------------------------------------------------------------
 // JS
 // -----------------------------------------------------------------------------
@@ -29723,16 +29721,15 @@ class Grid extends Component {
         }
     }
     onKeydown(ev) {
-        const eventKey = ev.key.toUpperCase();
         let keyDownString = "";
-        if (isCtrlKey(ev) && eventKey !== "CTRL")
-            keyDownString += "CTRL+";
-        if (ev.metaKey)
-            keyDownString += "CTRL+";
-        if (ev.altKey && eventKey !== "ALT")
-            keyDownString += "ALT+";
-        if (ev.shiftKey && eventKey !== "SHIFT")
-            keyDownString += "SHIFT+";
+        if (!MODIFIER_KEYS.includes(ev.key)) {
+            if (isCtrlKey(ev))
+                keyDownString += "CTRL+";
+            if (ev.altKey)
+                keyDownString += "ALT+";
+            if (ev.shiftKey)
+                keyDownString += "SHIFT+";
+        }
         keyDownString += ev.key.toUpperCase();
         let handler = this.keyDownMapping[keyDownString];
         if (handler) {
@@ -35570,6 +35567,9 @@ class CellPlugin extends CorePlugin {
                     format: cell.format ? getItemId(cell.format, formats) : undefined,
                     content: cell.content || undefined,
                 };
+                if (cell instanceof FormulaCellWithDependencies) {
+                    cells[xc].content = cell.contentWithFixedReferences || undefined;
+                }
             }
             _sheet.cells = cells;
         }
@@ -35613,13 +35613,13 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
-    getFormulaCellContent(sheetId, compiledFormula, dependencies) {
+    getFormulaCellContent(sheetId, compiledFormula, dependencies, useFixedReference = false) {
         const ranges = dependencies || compiledFormula.dependencies;
         let rangeIndex = 0;
         return concat(compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const range = ranges[rangeIndex++];
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, { useFixedReference });
             }
             return token.value;
         }));
@@ -35888,6 +35888,18 @@ class FormulaCellWithDependencies {
     get content() {
         return concat(this.compiledFormula.tokens.map((token) => token.value));
     }
+    get contentWithFixedReferences() {
+        let rangeIndex = 0;
+        return concat(this.compiledFormula.tokens.map((token) => {
+            if (token.type === "REFERENCE") {
+                const index = rangeIndex++;
+                return this.getRangeString(this.compiledFormula.dependencies[index], this.sheetId, {
+                    useFixedReference: true,
+                });
+            }
+            return token.value;
+        }));
+    }
 }
 class RangeReferenceToken {
     getValue;
@@ -36192,7 +36204,13 @@ class ConditionalFormatPlugin extends CorePlugin {
         }
     }
     exportForExcel(data) {
-        this.export(data);
+        if (data.sheets) {
+            for (let sheet of data.sheets) {
+                if (this.cfRules[sheet.id]) {
+                    sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                }
+            }
+        }
     }
     // ---------------------------------------------------------------------------
     // Getters
@@ -36257,11 +36275,11 @@ class ConditionalFormatPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
-    mapToConditionalFormat(sheetId, cf) {
+    mapToConditionalFormat(sheetId, cf, { useFixedReference } = { useFixedReference: false }) {
         return {
             ...cf,
             ranges: cf.ranges.map((range) => {
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, { useFixedReference });
             }),
         };
     }
@@ -38329,8 +38347,10 @@ class RangeAdapter {
      *
      * @param range the range (received from getRangeFromXC or getRangeFromZone)
      * @param forSheetId the id of the sheet where the range string is supposed to be used.
+     * @param options
+     * @param options.useFixedReference if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId) {
+    getRangeString(range, forSheetId, options = { useFixedReference: false }) {
         if (!range) {
             return INCORRECT_RANGE_STRING;
         }
@@ -38357,7 +38377,7 @@ class RangeAdapter {
         if (prefixSheet && !sheetName) {
             return INCORRECT_RANGE_STRING;
         }
-        let rangeString = this.getRangePartString(rangeImpl, 0);
+        let rangeString = this.getRangePartString(rangeImpl, 0, options);
         if (rangeImpl.parts && rangeImpl.parts.length === 2) {
             // this if converts A2:A2 into A2 except if any part of the original range had fixed row or column (with $)
             if (rangeImpl.zone.top !== rangeImpl.zone.bottom ||
@@ -38367,7 +38387,7 @@ class RangeAdapter {
                 rangeImpl.parts[1].rowFixed ||
                 rangeImpl.parts[1].colFixed) {
                 rangeString += ":";
-                rangeString += this.getRangePartString(rangeImpl, 1);
+                rangeString += this.getRangePartString(rangeImpl, 1, options);
             }
         }
         return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -38408,13 +38428,13 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part) {
+    getRangePartString(range, part, options = { useFixedReference: false }) {
         const colFixed = range.parts && range.parts[part]?.colFixed ? "$" : "";
         const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
         const rowFixed = range.parts && range.parts[part]?.rowFixed ? "$" : "";
         const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
         let str = "";
-        if (range.isFullCol) {
+        if (range.isFullCol && !options.useFixedReference) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -38422,7 +38442,7 @@ class RangeAdapter {
                 str = colFixed + col;
             }
         }
-        else if (range.isFullRow) {
+        else if (range.isFullRow && !options.useFixedReference) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -54949,12 +54969,7 @@ function addFormula(cell) {
         attrs.push(["t", "str"]);
         cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
     }
-    node = escapeXml /*xml*/ `
-      <f>
-        ${XlsxFormula}
-      </f>
-      ${cycle}
-    `;
+    node = escapeXml /*xml*/ `<f>${XlsxFormula}</f>${cycle}`;
     return { attrs, node };
 }
 function addContent(content, sharedStrings, forceString = false) {
@@ -55773,11 +55788,10 @@ function addRows(construct, data, sheet) {
                     ({ attrs: additionalAttrs, node: cellNode } = addContent(cell.content, construct.sharedStrings, isTableHeader));
                 }
                 attributes.push(...additionalAttrs);
-                cellNodes.push(escapeXml /*xml*/ `
-          <c ${formatAttributes(attributes)}>
-            ${cellNode}
-          </c>
-        `);
+                // prettier-ignore
+                cellNodes.push(escapeXml /*xml*/ `<c ${formatAttributes(attributes)}>
+  ${cellNode}
+</c>`);
             }
         }
         if (cellNodes.length || row.size !== DEFAULT_CELL_HEIGHT || row.isHidden) {
@@ -56373,7 +56387,6 @@ class Model extends EventBus {
             ...config,
             mode: config.mode || "normal",
             custom: config.custom || {},
-            defaultCurrencyFormat: config.defaultCurrencyFormat || "[$$]#,##0.00",
             external: this.setupExternalConfig(config.external || {}),
             transportService,
             client,
@@ -56411,6 +56424,7 @@ class Model extends EventBus {
             custom: this.config.custom,
             uiActions: this.config,
             session: this.session,
+            defaultCurrencyFormat: this.config.defaultCurrencyFormat,
         };
     }
     // ---------------------------------------------------------------------------
@@ -56748,6 +56762,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = "17.0.9";
-__info__.date = "2024-01-29T13:53:22.963Z";
-__info__.hash = "3c1209a";
+__info__.version = "17.0.10";
+__info__.date = "2024-02-02T13:48:28.727Z";
+__info__.hash = "be06aa9";