@odoo/o-spreadsheet 16.2.29 → 16.2.31

package/dist/o-spreadsheet.esm.js

@@ -1691,6 +1691,9 @@ function parseFormat(formatString) {
 function formatValue(value, format) {
     switch (typeof value) {
         case "string":
+            if (value.includes('\\"')) {
+                return value.replace(/\\"/g, '"');
+            }
             return value;
         case "boolean":
             return value ? "TRUE" : "FALSE";
@@ -6271,14 +6274,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,
@@ -6328,8 +6325,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),
     };
 }
 /**
@@ -6854,6 +6853,9 @@ class BarChart extends AbstractChart {
             .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
         return {
             ...this.getDefinition(),
+            labelRange: this.labelRange
+                ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                : undefined,
             backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
             fontColor: toXlsxHexColor(chartFontColor(this.background)),
             dataSets,
@@ -7418,6 +7420,9 @@ class LineChart extends AbstractChart {
             .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
         return {
             ...this.getDefinition(),
+            labelRange: this.labelRange
+                ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                : undefined,
             backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
             fontColor: toXlsxHexColor(chartFontColor(this.background)),
             dataSets,
@@ -7691,6 +7696,9 @@ class PieChart extends AbstractChart {
             .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
         return {
             ...this.getDefinition(),
+            labelRange: this.labelRange
+                ? this.getters.getRangeString(this.labelRange, this.sheetId, true)
+                : undefined,
             backgroundColor: toXlsxHexColor(this.background || BACKGROUND_CHART_COLOR),
             fontColor: toXlsxHexColor(chartFontColor(this.background)),
             verticalAxisPosition: "left",
@@ -9134,6 +9142,12 @@ const INSERT_LINK = (env) => {
     let { col, row } = env.model.getters.getActivePosition();
     env.model.dispatch("OPEN_CELL_POPOVER", { col, row, popoverType: "LinkEditor" });
 };
+const INSERT_LINK_NAME = (env) => {
+    const sheetId = env.model.getters.getActiveSheetId();
+    const { col, row } = env.model.getters.getActivePosition();
+    const cell = env.model.getters.getEvaluatedCell({ sheetId, col, row });
+    return cell && cell.link ? _lt("Edit link") : _lt("Insert link");
+};
 //------------------------------------------------------------------------------
 // Filters action
 //------------------------------------------------------------------------------
@@ -9271,7 +9285,7 @@ cellMenuRegistry
     action: DELETE_CELL_SHIFT_LEFT,
 })
     .add("insert_link", {
-    name: _lt("Insert link"),
+    name: INSERT_LINK_NAME,
     separator: true,
     sequence: 150,
     action: INSERT_LINK,
@@ -19957,14 +19971,13 @@ class Composer extends Component {
     setup() {
         onMounted(() => {
             const el = this.composerRef.el;
+            if (this.props.isDefaultFocus) {
+                this.env.focusableElement.setFocusableElement(el);
+            }
             this.contentHelper.updateEl(el);
             this.processContent();
             this.contentHelper.scrollSelectionIntoView();
         });
-        onWillUnmount(() => {
-            var _a, _b;
-            (_b = (_a = this.props).onComposerUnmounted) === null || _b === void 0 ? void 0 : _b.call(_a);
-        });
         onPatched(() => {
             if (!this.isKeyStillDown) {
                 this.processContent();
@@ -19975,7 +19988,8 @@ class Composer extends Component {
     // Handlers
     // ---------------------------------------------------------------------------
     processArrowKeys(ev) {
-        if (this.env.model.getters.isSelectingForComposer()) {
+        if (this.env.model.getters.isSelectingForComposer() ||
+            this.env.model.getters.getEditionMode() === "inactive") {
             this.functionDescriptionState.showDescription = false;
             // Prevent the default content editable behavior which moves the cursor
             ev.preventDefault();
@@ -20016,21 +20030,23 @@ class Composer extends Component {
         var _a;
         ev.preventDefault();
         ev.stopPropagation();
-        if (this.autoCompleteState.showProvider) {
-            const autoCompleteValue = (_a = this.autoCompleteState.values[this.autoCompleteState.selectedIndex]) === null || _a === void 0 ? void 0 : _a.text;
-            if (autoCompleteValue) {
-                this.autoComplete(autoCompleteValue);
-                return;
+        if (this.env.model.getters.getEditionMode() !== "inactive") {
+            if (this.autoCompleteState.showProvider) {
+                const autoCompleteValue = (_a = this.autoCompleteState.values[this.autoCompleteState.selectedIndex]) === null || _a === void 0 ? void 0 : _a.text;
+                if (autoCompleteValue) {
+                    this.autoComplete(autoCompleteValue);
+                    return;
+                }
             }
-        }
-        else {
-            // when completing with tab, if there is no value to complete, the active cell will be moved to the right.
-            // we can't let the model think that it is for a ref selection.
-            // todo: check if this can be removed someday
-            this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
+            else {
+                // when completing with tab, if there is no value to complete, the active cell will be moved to the right.
+                // we can't let the model think that it is for a ref selection.
+                // todo: check if this can be removed someday
+                this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
+            }
+            this.env.model.dispatch("STOP_EDITION");
         }
         const direction = ev.shiftKey ? "left" : "right";
-        this.env.model.dispatch("STOP_EDITION");
         this.env.model.selection.moveAnchorCell(direction, 1);
     }
     processEnterKey(ev) {
@@ -20075,6 +20091,9 @@ class Composer extends Component {
         this.compositionActive = false;
     }
     onKeydown(ev) {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            return;
+        }
         let handler = this.keyMapping[ev.key];
         if (handler) {
             handler.call(this, ev);
@@ -20085,22 +20104,45 @@ class Composer extends Component {
         }
     }
     updateCursorIfNeeded() {
-        if (!this.env.model.getters.isSelectingForComposer()) {
+        const moveCursor = !this.env.model.getters.isSelectingForComposer() &&
+            !(this.env.model.getters.getEditionMode() === "inactive");
+        if (moveCursor) {
             const { start, end } = this.contentHelper.getCurrentSelection();
             this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
             this.isKeyStillDown = true;
         }
     }
+    onPaste(ev) {
+        if (this.env.model.getters.getEditionMode() !== "inactive") {
+            ev.stopPropagation();
+        }
+    }
     /*
      * Triggered automatically by the content-editable between the keydown and key up
      * */
-    onInput() {
-        if (this.props.focus === "inactive" || !this.shouldProcessInputEvents) {
+    onInput(ev) {
+        var _a, _b;
+        if (!this.shouldProcessInputEvents) {
+            return;
+        }
+        if (ev.inputType === "insertFromPaste" &&
+            this.env.model.getters.getEditionMode() === "inactive") {
             return;
         }
+        ev.stopPropagation();
+        let content;
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            content = ev.data || "";
+        }
+        else {
+            content = this.contentHelper.getText();
+        }
+        if (this.props.focus === "inactive") {
+            return (_b = (_a = this.props).onComposerCellFocused) === null || _b === void 0 ? void 0 : _b.call(_a, content);
+        }
         this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
         this.env.model.dispatch("SET_CURRENT_CONTENT", {
-            content: this.contentHelper.getText(),
+            content,
             selection: this.contentHelper.getCurrentSelection(),
         });
     }
@@ -20171,9 +20213,8 @@ class Composer extends Component {
         }
         const newSelection = this.contentHelper.getCurrentSelection();
         this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
-        if (this.props.focus === "inactive") {
-            this.props.onComposerContentFocused(newSelection);
-        }
+        this.props.onComposerContentFocused();
+        if (this.props.focus === "inactive") ;
         this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", newSelection);
         this.processTokenAtCursor();
     }
@@ -20397,14 +20438,16 @@ Composer.template = "o-spreadsheet-Composer";
 Composer.components = { TextValueProvider, FunctionDescriptionProvider };
 Composer.defaultProps = {
     inputStyle: "",
+    isDefaultFocus: false,
 };
 Composer.props = {
-    focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
-    onComposerContentFocused: Function,
     inputStyle: { type: String, optional: true },
     rect: { type: Object, optional: true },
     delimitation: { type: Object, optional: true },
-    onComposerUnmounted: { type: Function, optional: true },
+    focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
+    onComposerCellFocused: { type: Function, optional: true },
+    onComposerContentFocused: Function,
+    isDefaultFocus: { type: Boolean, optional: true },
 };
 
 const COMPOSER_BORDER_WIDTH = 3 * 0.4 * window.devicePixelRatio || 1;
@@ -20436,46 +20479,28 @@ css /* scss */ `
  * It also applies the style of the cell to the composer input.
  */
 class GridComposer extends Component {
+    constructor() {
+        super(...arguments);
+        // TODORAR see if we can keep it undefined
+        this.rect = this.defaultRect;
+        this.isEditing = false;
+    }
+    get defaultRect() {
+        return { x: 0, y: 0, width: 0, height: 0 };
+    }
     setup() {
-        this.gridComposerRef = useRef("gridComposer");
-        this.composerState = useState({
-            rect: undefined,
-            delimitation: undefined,
-        });
-        const { sheetId, col, row } = this.env.model.getters.getActivePosition();
-        this.zone = this.env.model.getters.expandZone(sheetId, positionToZone({ col, row }));
-        this.rect = this.env.model.getters.getVisibleRect(this.zone);
-        this.isCellReferenceVisible = false;
-        onMounted(() => {
-            const el = this.gridComposerRef.el;
-            this.composerState.rect = {
-                x: this.rect.x,
-                y: this.rect.y,
-                width: el.clientWidth,
-                height: el.clientHeight,
-            };
-            this.composerState.delimitation = {
-                width: el.parentElement.clientWidth,
-                height: el.parentElement.clientHeight,
-            };
-        });
         onWillUpdateProps(() => {
-            if (this.isCellReferenceVisible) {
-                return;
-            }
-            const sheetId = this.env.model.getters.getActiveSheetId();
-            const zone = this.env.model.getters.getSelectedZone();
-            const rect = this.env.model.getters.getVisibleRect(zone);
-            if (!deepEquals(rect, this.rect) ||
-                sheetId !== this.env.model.getters.getCurrentEditedCell().sheetId) {
-                this.isCellReferenceVisible = true;
-            }
+            this.updateComponentPosition();
+            this.updateCellReferenceVisibility();
         });
     }
     get shouldDisplayCellReference() {
         return this.isCellReferenceVisible;
     }
     get cellReference() {
+        if (!this.env.model.getters.getCurrentEditedCell()) {
+            return "";
+        }
         const { col, row, sheetId } = this.env.model.getters.getCurrentEditedCell();
         const prefixSheet = sheetId !== this.env.model.getters.getActiveSheetId();
         return `${prefixSheet ? getComposerSheetName(this.env.model.getters.getSheetName(sheetId)) + "!" : ""}${toXC(col, row)}`;
@@ -20487,7 +20512,27 @@ class GridComposer extends Component {
             top: `${top - GRID_CELL_REFERENCE_TOP_OFFSET}px`,
         });
     }
+    get composerProps() {
+        const { width, height } = this.env.model.getters.getSheetViewDimensionWithHeaders();
+        return {
+            rect: { ...this.rect },
+            delimitation: {
+                width,
+                height,
+            },
+            focus: this.props.focus,
+            isDefaultFocus: true,
+            onComposerContentFocused: this.props.onComposerContentFocused,
+            onComposerCellFocused: this.props.onComposerCellFocused,
+        };
+    }
     get containerStyle() {
+        if (this.env.model.getters.getEditionMode() === "inactive" || !this.rect) {
+            return `
+        position: absolute;
+        z-index: -1000;
+      `;
+        }
         const isFormula = this.env.model.getters.getCurrentContent().startsWith("=");
         const cell = this.env.model.getters.getActiveCell();
         const position = this.env.model.getters.getActivePosition();
@@ -20507,6 +20552,8 @@ class GridComposer extends Component {
         if (!isFormula) {
             textAlign = style.align || cell.defaultAlign;
         }
+        const maxHeight = this.props.gridDims.height - this.rect.y;
+        const maxWidth = this.props.gridDims.width - this.rect.x;
         /**
          * min-size is on the container, not the composer element, because we want to have the same size as the cell by default,
          * including all the paddings/margins of the composer
@@ -20518,6 +20565,8 @@ class GridComposer extends Component {
             top: `${top}px`,
             "min-width": `${width + 1}px`,
             "min-height": `${height + 1}px`,
+            "max-width": `${maxWidth}px`,
+            "max-height": `${maxHeight}px`,
             background,
             color,
             "font-size": `${fontSizeInPixels(fontSize)}px`,
@@ -20527,22 +20576,40 @@ class GridComposer extends Component {
             "text-align": textAlign,
         });
     }
-    get composerStyle() {
-        const maxHeight = this.props.gridDims.height - this.rect.y;
-        const maxWidth = this.props.gridDims.width - this.rect.x;
-        return cssPropertiesToCss({
-            "max-width": `${maxWidth}px`,
-            "max-height": `${maxHeight}px`,
-        });
+    updateComponentPosition() {
+        const isEditing = this.env.model.getters.getEditionMode() !== "inactive";
+        if (this.isEditing !== isEditing) {
+            this.isEditing = isEditing;
+            if (!isEditing) {
+                this.rect = this.defaultRect;
+                this.env.focusableElement.focus();
+                return;
+            }
+            const position = this.env.model.getters.getActivePosition();
+            const zone = this.env.model.getters.expandZone(position.sheetId, positionToZone(position));
+            this.rect = this.env.model.getters.getVisibleRect(zone);
+        }
+    }
+    updateCellReferenceVisibility() {
+        if (this.isCellReferenceVisible || this.env.model.getters.getEditionMode() === "inactive") {
+            return;
+        }
+        const sheetId = this.env.model.getters.getActiveSheetId();
+        const zone = this.env.model.getters.getSelectedZone();
+        const rect = this.env.model.getters.getVisibleRect(zone);
+        if (!deepEquals(rect, this.rect) ||
+            sheetId !== this.env.model.getters.getCurrentEditedCell().sheetId) {
+            this.isCellReferenceVisible = true;
+        }
     }
 }
 GridComposer.template = "o-spreadsheet-GridComposer";
 GridComposer.components = { Composer };
 GridComposer.props = {
     focus: { validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value) },
-    onComposerUnmounted: Function,
     onComposerContentFocused: Function,
     gridDims: Object,
+    onComposerCellFocused: Function,
 };
 
 const CSS$1 = css /* scss */ `
@@ -21133,7 +21200,6 @@ class GridOverlay extends Component {
         this.props.onCellDoubleClicked(col, row);
     }
     onContextMenu(ev) {
-        ev.preventDefault();
         const [col, row] = this.getCartesianCoordinates(ev);
         this.props.onCellRightClicked(col, row, { x: ev.clientX, y: ev.clientY });
     }
@@ -22360,17 +22426,16 @@ class Grid extends Component {
             menuItems: [],
         });
         this.gridRef = useRef("grid");
-        this.hiddenInput = useRef("hiddenInput");
         this.canvasPosition = useAbsoluteBoundingRect(this.gridRef);
         this.hoveredCell = useState({ col: undefined, row: undefined });
         useChildSubEnv({ getPopoverContainerRect: () => this.getGridRect() });
         useExternalListener(document.body, "cut", this.copy.bind(this, true));
         useExternalListener(document.body, "copy", this.copy.bind(this, false));
         useExternalListener(document.body, "paste", this.paste);
-        onMounted(() => this.focus());
-        this.props.exposeFocus(() => this.focus());
+        onMounted(() => this.focusDefaultElement());
+        this.props.exposeFocus(() => this.focusDefaultElement());
         useGridDrawing("canvas", this.env.model, () => this.env.model.getters.getSheetViewDimensionWithHeaders());
-        useEffect(() => this.focus(), () => [this.env.model.getters.getActiveSheetId()]);
+        useEffect(() => this.focusDefaultElement(), () => [this.env.model.getters.getActiveSheetId()]);
         this.onMouseWheel = useWheelHandler((deltaX, deltaY) => {
             this.moveCanvas(deltaX, deltaY);
             this.hoveredCell.col = undefined;
@@ -22393,13 +22458,12 @@ class Grid extends Component {
         if (this.env.model.getters.hasOpenedPopover()) {
             this.closeOpenedPopover();
         }
-        this.focus();
+        this.focusDefaultElement();
     }
-    focus() {
-        var _a;
+    focusDefaultElement() {
         if (!this.env.model.getters.getSelectedFigureId() &&
             this.env.model.getters.getEditionMode() === "inactive") {
-            (_a = this.hiddenInput.el) === null || _a === void 0 ? void 0 : _a.focus();
+            this.env.focusableElement.focus();
         }
     }
     get gridEl() {
@@ -22544,19 +22608,6 @@ class Grid extends Component {
             return;
         }
     }
-    onInput(ev) {
-        // the user meant to paste in the sheet, not open the composer with the pasted content
-        if (!ev.isComposing && ev.inputType === "insertFromPaste") {
-            return;
-        }
-        if (ev.data) {
-            // if the user types a character on the grid, it means he wants to start composing the selected cell with that
-            // character
-            ev.preventDefault();
-            ev.stopPropagation();
-            this.props.onGridComposerCellFocused(ev.data);
-        }
-    }
     // ---------------------------------------------------------------------------
     // Context Menu
     // ---------------------------------------------------------------------------
@@ -22653,7 +22704,7 @@ class Grid extends Component {
     }
     closeMenu() {
         this.menuState.isOpen = false;
-        this.focus();
+        this.focusDefaultElement();
     }
 }
 Grid.template = "o-spreadsheet-Grid";
@@ -27005,7 +27056,7 @@ function normalizeV9(formula) {
  * a breaking change is made in the way the state is handled, and an upgrade
  * function should be defined
  */
-const CURRENT_VERSION = 12;
+const CURRENT_VERSION = 12.5;
 const INITIAL_SHEET_ID = "Sheet1";
 /**
  * This function tries to load anything that could look like a valid
@@ -27271,6 +27322,31 @@ const MIGRATIONS = [
             return data;
         },
     },
+    {
+        description: "Fix datafilter duplication",
+        from: 12,
+        to: 12.5,
+        applyMigration(data) {
+            for (let sheet of data.sheets || []) {
+                let knownDataFilterZones = [];
+                for (let filterTable of sheet.filterTables || []) {
+                    const zone = toZone(filterTable.range);
+                    // See commit message for the details
+                    const intersectZoneIndex = knownDataFilterZones.findIndex((knownZone) => overlap(knownZone, zone));
+                    if (intersectZoneIndex !== -1) {
+                        knownDataFilterZones[intersectZoneIndex] = zone;
+                    }
+                    else {
+                        knownDataFilterZones.push(zone);
+                    }
+                }
+                sheet.filterTables = knownDataFilterZones.map((zone) => ({
+                    range: zoneToXc(zone),
+                }));
+            }
+            return data;
+        },
+    },
 ];
 /**
  * This function is used to repair faulty data independently of the migration.
@@ -28291,13 +28367,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;
         }));
@@ -28867,7 +28943,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
@@ -28917,11 +28999,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);
             }),
         };
     }
@@ -30850,8 +30932,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;
         }
@@ -30878,7 +30961,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 ||
@@ -30888,7 +30971,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}`;
@@ -30918,14 +31001,14 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part) {
+    getRangePartString(range, part, useFixedZone = false) {
         var _a, _b;
         const colFixed = range.parts && ((_a = range.parts[part]) === null || _a === void 0 ? void 0 : _a.colFixed) ? "$" : "";
         const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
         const rowFixed = range.parts && ((_b = range.parts[part]) === null || _b === void 0 ? void 0 : _b.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;
             }
@@ -30933,7 +31016,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;
             }
@@ -32322,6 +32405,10 @@ class EvaluationPlugin extends UIPlugin {
                     if (cell.format !== evaluatedCell.format) {
                         exportedCellData.computedFormat = evaluatedCell.format;
                     }
+                    // 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) {
+                        exportedCellData.content = this.getters.buildFormulaContent(sheet.id, cell, cell.dependencies, true);
+                    }
                 }
             }
         }
@@ -39913,6 +40000,19 @@ class ImageProvider {
     }
 }
 
+class FocusableElement {
+    constructor() {
+        this.focusableElement = undefined;
+    }
+    setFocusableElement(element) {
+        this.focusableElement = element;
+    }
+    focus() {
+        var _a;
+        (_a = this.focusableElement) === null || _a === void 0 ? void 0 : _a.focus();
+    }
+}
+
 const RIPPLE_KEY_FRAMES = [
     { transform: "scale(0)" },
     { transform: "scale(0.8)", offset: 0.33 },
@@ -41888,6 +41988,7 @@ class Spreadsheet extends Component {
             _t: Spreadsheet._t,
             clipboard: this.env.clipboard || instantiateClipboard(),
             startCellEdition: (content) => this.onGridComposerCellFocused(content),
+            focusableElement: new FocusableElement(),
         });
         useExternalListener(window, "resize", () => this.render(true));
         useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this));
@@ -41986,17 +42087,18 @@ class Spreadsheet extends Component {
         this.model.dispatch("UNFOCUS_SELECTION_INPUT");
         this.composer.topBarFocus = "contentFocus";
         this.composer.gridFocusMode = "inactive";
-        this.setComposerContent({ selection } || {});
+        this.setComposerContent({ selection });
     }
-    onGridComposerContentFocused() {
+    onGridComposerContentFocused(selection) {
         if (this.model.getters.isReadonly()) {
             return;
         }
         this.model.dispatch("UNFOCUS_SELECTION_INPUT");
         this.composer.topBarFocus = "inactive";
         this.composer.gridFocusMode = "contentFocus";
-        this.setComposerContent({});
+        this.setComposerContent({ selection });
     }
+    // TODO: either both are defined or none of them. change those args to an object
     onGridComposerCellFocused(content, selection) {
         if (this.model.getters.isReadonly()) {
             return;
@@ -43972,12 +44074,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 };
     }
     else {
@@ -44773,11 +44870,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) {
@@ -45643,6 +45739,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, links, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.2.29';
-__info__.date = '2024-01-29T13:49:36.240Z';
-__info__.hash = '27b2ec1';
+__info__.version = '16.2.31';
+__info__.date = '2024-02-09T13:05:40.161Z';
+__info__.hash = '2e76bdf';