@odoo/o-spreadsheet 16.4.20 → 16.4.21

package/dist/o-spreadsheet.cjs.js

@@ -15975,14 +15975,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,
@@ -16031,8 +16025,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", true)
+            : undefined,
+        range: getters.getRangeString(dataRange, "forceSheetReference", true),
     };
 }
 function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
@@ -16045,7 +16041,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", true);
 }
 /**
  * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -16582,7 +16578,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(),
@@ -17170,7 +17166,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(),
@@ -17457,7 +17453,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(),
@@ -31934,6 +31930,10 @@ class CellPlugin extends CorePlugin {
                     format: cell.format ? getItemId(cell.format, formats) : undefined,
                     content: cell.content || undefined,
                 };
+                // if there is a formula but no dependencies (maybe because the cell is in error), no need to recompute the formula text
+                if (cell.isFormula && cell.dependencies.length) {
+                    cells[xc].content = this.buildFormulaContent(_sheet.id, cell, cell.dependencies, true);
+                }
             }
             _sheet.cells = cells;
         }
@@ -31968,13 +31968,13 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
-    buildFormulaContent(sheetId, cell, dependencies) {
+    buildFormulaContent(sheetId, cell, dependencies, useFixedZone = false) {
         const ranges = dependencies || cell.dependencies;
         let rangeIndex = 0;
         return concat(cell.compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const range = ranges[rangeIndex++];
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, useFixedZone);
             }
             return token.value;
         }));
@@ -32543,7 +32543,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
@@ -32608,11 +32614,11 @@ class ConditionalFormatPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
-    mapToConditionalFormat(sheetId, cf) {
+    mapToConditionalFormat(sheetId, cf, options = { useFixedReference: false }) {
         return {
             ...cf,
             ranges: cf.ranges.map((range) => {
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, options.useFixedReference);
             }),
         };
     }
@@ -34449,8 +34455,9 @@ 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 [useFixedZone=false] if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId) {
+    getRangeString(range, forSheetId, useFixedZone = false) {
         if (!range) {
             return INCORRECT_RANGE_STRING;
         }
@@ -34477,7 +34484,7 @@ class RangeAdapter {
         if (prefixSheet && !sheetName) {
             return INCORRECT_RANGE_STRING;
         }
-        let rangeString = this.getRangePartString(rangeImpl, 0);
+        let rangeString = this.getRangePartString(rangeImpl, 0, useFixedZone);
         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 ||
@@ -34487,7 +34494,7 @@ class RangeAdapter {
                 rangeImpl.parts[1].rowFixed ||
                 rangeImpl.parts[1].colFixed) {
                 rangeString += ":";
-                rangeString += this.getRangePartString(rangeImpl, 1);
+                rangeString += this.getRangePartString(rangeImpl, 1, useFixedZone);
             }
         }
         return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -34528,13 +34535,13 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part) {
+    getRangePartString(range, part, useFixedZone = 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 && !useFixedZone) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -34542,7 +34549,7 @@ class RangeAdapter {
                 str = colFixed + col;
             }
         }
-        else if (range.isFullRow) {
+        else if (range.isFullRow && !useFixedZone) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -49803,12 +49810,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) {
@@ -50627,11 +50629,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) {
@@ -51612,6 +51613,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.20';
-__info__.date = '2024-01-29T13:50:12.345Z';
-__info__.hash = '06c0ecf';
+__info__.version = '16.4.21';
+__info__.date = '2024-02-02T13:45:48.276Z';
+__info__.hash = '73662b1';

package/dist/o-spreadsheet.d.ts

@@ -2979,8 +2979,9 @@ 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 [useFixedZone=false] if true, the range will be returned with fixed row and column
      */
-    getRangeString(range: Range, forSheetId: UID): string;
+    getRangeString(range: Range, forSheetId: UID, useFixedZone?: boolean): string;
     getRangeDataFromXc(sheetId: UID, xc: string): RangeData;
     getRangeDataFromZone(sheetId: UID, zone: Zone | UnboundedZone): RangeData;
     getRangeFromZone(sheetId: UID, zone: Zone | UnboundedZone): Range;
@@ -3199,7 +3200,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;
-    buildFormulaContent(sheetId: UID, cell: Pick<FormulaCell, "dependencies" | "compiledFormula">, dependencies?: Range[]): string;
+    buildFormulaContent(sheetId: UID, cell: Pick<FormulaCell, "dependencies" | "compiledFormula">, dependencies?: Range[], useFixedZone?: boolean): string;
     getFormulaCellContent(sheetId: UID, cell: FormulaCell): string;
     getCellStyle(position: CellPosition): Style;
     /**

package/dist/o-spreadsheet.esm.js

@@ -15971,14 +15971,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,
@@ -16027,8 +16021,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", true)
+            : undefined,
+        range: getters.getRangeString(dataRange, "forceSheetReference", true),
     };
 }
 function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
@@ -16041,7 +16037,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", true);
 }
 /**
  * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -16578,7 +16574,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(),
@@ -17166,7 +17162,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(),
@@ -17453,7 +17449,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(),
@@ -31930,6 +31926,10 @@ class CellPlugin extends CorePlugin {
                     format: cell.format ? getItemId(cell.format, formats) : undefined,
                     content: cell.content || undefined,
                 };
+                // if there is a formula but no dependencies (maybe because the cell is in error), no need to recompute the formula text
+                if (cell.isFormula && cell.dependencies.length) {
+                    cells[xc].content = this.buildFormulaContent(_sheet.id, cell, cell.dependencies, true);
+                }
             }
             _sheet.cells = cells;
         }
@@ -31964,13 +31964,13 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
-    buildFormulaContent(sheetId, cell, dependencies) {
+    buildFormulaContent(sheetId, cell, dependencies, useFixedZone = false) {
         const ranges = dependencies || cell.dependencies;
         let rangeIndex = 0;
         return concat(cell.compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const range = ranges[rangeIndex++];
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, useFixedZone);
             }
             return token.value;
         }));
@@ -32539,7 +32539,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
@@ -32604,11 +32610,11 @@ class ConditionalFormatPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
-    mapToConditionalFormat(sheetId, cf) {
+    mapToConditionalFormat(sheetId, cf, options = { useFixedReference: false }) {
         return {
             ...cf,
             ranges: cf.ranges.map((range) => {
-                return this.getters.getRangeString(range, sheetId);
+                return this.getters.getRangeString(range, sheetId, options.useFixedReference);
             }),
         };
     }
@@ -34445,8 +34451,9 @@ 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 [useFixedZone=false] if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId) {
+    getRangeString(range, forSheetId, useFixedZone = false) {
         if (!range) {
             return INCORRECT_RANGE_STRING;
         }
@@ -34473,7 +34480,7 @@ class RangeAdapter {
         if (prefixSheet && !sheetName) {
             return INCORRECT_RANGE_STRING;
         }
-        let rangeString = this.getRangePartString(rangeImpl, 0);
+        let rangeString = this.getRangePartString(rangeImpl, 0, useFixedZone);
         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 ||
@@ -34483,7 +34490,7 @@ class RangeAdapter {
                 rangeImpl.parts[1].rowFixed ||
                 rangeImpl.parts[1].colFixed) {
                 rangeString += ":";
-                rangeString += this.getRangePartString(rangeImpl, 1);
+                rangeString += this.getRangePartString(rangeImpl, 1, useFixedZone);
             }
         }
         return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -34524,13 +34531,13 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part) {
+    getRangePartString(range, part, useFixedZone = 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 && !useFixedZone) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -34538,7 +34545,7 @@ class RangeAdapter {
                 str = colFixed + col;
             }
         }
-        else if (range.isFullRow) {
+        else if (range.isFullRow && !useFixedZone) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -49799,12 +49806,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) {
@@ -50623,11 +50625,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) {
@@ -51576,6 +51577,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.4.20';
-__info__.date = '2024-01-29T13:50:12.345Z';
-__info__.hash = '06c0ecf';
+__info__.version = '16.4.21';
+__info__.date = '2024-02-02T13:45:48.276Z';
+__info__.hash = '73662b1';

package/dist/o-spreadsheet.iife.js

@@ -15972,14 +15972,8 @@
                       : 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,
@@ -16028,8 +16022,10 @@
       }
       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", true)
+              : undefined,
+          range: getters.getRangeString(dataRange, "forceSheetReference", true),
       };
   }
   function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
@@ -16042,7 +16038,7 @@
           zone.top = zone.top + 1;
       }
       const range = labelRange.clone({ zone });
-      return getters.getRangeString(range, "forceSheetReference");
+      return getters.getRangeString(range, "forceSheetReference", true);
   }
   /**
    * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -16579,7 +16575,7 @@
               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(),
@@ -17167,7 +17163,7 @@
               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(),
@@ -17454,7 +17450,7 @@
               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(),
@@ -31931,6 +31927,10 @@
                       format: cell.format ? getItemId(cell.format, formats) : undefined,
                       content: cell.content || undefined,
                   };
+                  // if there is a formula but no dependencies (maybe because the cell is in error), no need to recompute the formula text
+                  if (cell.isFormula && cell.dependencies.length) {
+                      cells[xc].content = this.buildFormulaContent(_sheet.id, cell, cell.dependencies, true);
+                  }
               }
               _sheet.cells = cells;
           }
@@ -31965,13 +31965,13 @@
       /*
        * Reconstructs the original formula string based on a normalized form and its dependencies
        */
-      buildFormulaContent(sheetId, cell, dependencies) {
+      buildFormulaContent(sheetId, cell, dependencies, useFixedZone = false) {
           const ranges = dependencies || cell.dependencies;
           let rangeIndex = 0;
           return concat(cell.compiledFormula.tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = ranges[rangeIndex++];
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, useFixedZone);
               }
               return token.value;
           }));
@@ -32540,7 +32540,13 @@
           }
       }
       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
@@ -32605,11 +32611,11 @@
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
-      mapToConditionalFormat(sheetId, cf) {
+      mapToConditionalFormat(sheetId, cf, options = { useFixedReference: false }) {
           return {
               ...cf,
               ranges: cf.ranges.map((range) => {
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, options.useFixedReference);
               }),
           };
       }
@@ -34446,8 +34452,9 @@
        *
        * @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 [useFixedZone=false] if true, the range will be returned with fixed row and column
        */
-      getRangeString(range, forSheetId) {
+      getRangeString(range, forSheetId, useFixedZone = false) {
           if (!range) {
               return INCORRECT_RANGE_STRING;
           }
@@ -34474,7 +34481,7 @@
           if (prefixSheet && !sheetName) {
               return INCORRECT_RANGE_STRING;
           }
-          let rangeString = this.getRangePartString(rangeImpl, 0);
+          let rangeString = this.getRangePartString(rangeImpl, 0, useFixedZone);
           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 ||
@@ -34484,7 +34491,7 @@
                   rangeImpl.parts[1].rowFixed ||
                   rangeImpl.parts[1].colFixed) {
                   rangeString += ":";
-                  rangeString += this.getRangePartString(rangeImpl, 1);
+                  rangeString += this.getRangePartString(rangeImpl, 1, useFixedZone);
               }
           }
           return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -34525,13 +34532,13 @@
       /**
        * Get a Xc string that represent a part of a range
        */
-      getRangePartString(range, part) {
+      getRangePartString(range, part, useFixedZone = 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 && !useFixedZone) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -34539,7 +34546,7 @@
                   str = colFixed + col;
               }
           }
-          else if (range.isFullRow) {
+          else if (range.isFullRow && !useFixedZone) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -49800,12 +49807,7 @@
           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) {
@@ -50624,11 +50626,10 @@
                       ({ 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) {
@@ -51611,9 +51612,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.4.20';
-  __info__.date = '2024-01-29T13:50:12.345Z';
-  __info__.hash = '06c0ecf';
+  __info__.version = '16.4.21';
+  __info__.date = '2024-02-02T13:45:48.276Z';
+  __info__.hash = '73662b1';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);