@odoo/o-spreadsheet 17.1.3 → 17.1.4

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.1.3
- * @date 2024-02-02T13:46:54.332Z
- * @hash 798f979
+ * @version 17.1.4
+ * @date 2024-02-09T13:09:13.430Z
+ * @hash 16d3ece
  */
 
 'use strict';
@@ -2940,6 +2940,9 @@ function formatValue(value, { format, locale }) {
     }
     switch (typeof value) {
         case "string":
+            if (value.includes('\\"')) {
+                return value.replace(/\\"/g, '"');
+            }
             return value;
         case "boolean":
             return value ? "TRUE" : "FALSE";
@@ -4993,14 +4996,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,
@@ -7443,7 +7440,7 @@ function tokenize(str, locale = DEFAULT_LOCALE) {
     while (!chars.isOver()) {
         let token = tokenizeSpace(chars) ||
             tokenizeArgsSeparator(chars, locale) ||
-            tokenizeMisc(chars) ||
+            tokenizeParenthesis(chars) ||
             tokenizeOperator(chars) ||
             tokenizeString(chars) ||
             tokenizeDebugger(chars) ||
@@ -7464,15 +7461,14 @@ function tokenizeDebugger(chars) {
     }
     return null;
 }
-const misc$1 = {
-    "(": "LEFT_PAREN",
-    ")": "RIGHT_PAREN",
+const parenthesis = {
+    "(": { type: "LEFT_PAREN", value: "(" },
+    ")": { type: "RIGHT_PAREN", value: ")" },
 };
-function tokenizeMisc(chars) {
-    if (chars.current in misc$1) {
+function tokenizeParenthesis(chars) {
+    if (chars.current === "(" || chars.current === ")") {
         const value = chars.shift();
-        const type = misc$1[value];
-        return { type, value };
+        return parenthesis[value];
     }
     return null;
 }
@@ -7493,7 +7489,12 @@ function tokenizeOperator(chars) {
     }
     return null;
 }
+const FIRST_POSSIBLE_NUMBER_CHARS = new Set("0123456789");
 function tokenizeNumber(chars, locale) {
+    if (!FIRST_POSSIBLE_NUMBER_CHARS.has(chars.current) &&
+        chars.current !== locale.decimalSeparator) {
+        return null;
+    }
     const match = chars.remaining().match(getFormulaNumberRegex(locale.decimalSeparator));
     if (match) {
         chars.advanceBy(match[0].length);
@@ -7518,7 +7519,7 @@ function tokenizeString(chars) {
     }
     return null;
 }
-const separatorRegexp = /\w|\.|!|\$/;
+const separatorRegexp = /^[\w\.!\$]+/;
 /**
  * A "Symbol" is just basically any word-like element that can appear in a
  * formula, which is not a string. So:
@@ -7558,8 +7559,11 @@ function tokenizeSymbol(chars) {
             };
         }
     }
-    while (chars.current && separatorRegexp.test(chars.current)) {
-        result += chars.shift();
+    const match = chars.remaining().match(separatorRegexp);
+    if (match) {
+        const value = match[0];
+        result += value;
+        chars.advanceBy(value.length);
     }
     if (result.length) {
         const value = result;
@@ -7621,7 +7625,10 @@ class TokenizingChars {
         return this.text.substring(this.currentIndex);
     }
     currentStartsWith(str) {
-        for (let j = 0; j < str.length; j++) {
+        if (this.current !== str[0]) {
+            return false;
+        }
+        for (let j = 1; j < str.length; j++) {
             if (this.text[this.currentIndex + j] !== str[j]) {
                 return false;
             }
@@ -8653,7 +8660,7 @@ class BarChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== CellErrorType.InvalidReference ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -9231,7 +9238,7 @@ class LineChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== CellErrorType.InvalidReference ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -9537,7 +9544,7 @@ class PieChart extends AbstractChart {
             return undefined;
         const dataSets = this.dataSets
             .map((ds) => toExcelDataset(this.getters, ds))
-            .filter((ds) => ds.range !== ""); // && range !== CellErrorType.InvalidReference ? show incorrect #ref ?
+            .filter((ds) => ds.range !== "" && ds.range !== CellErrorType.InvalidReference);
         const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
         return {
             ...this.getDefinition(),
@@ -18684,6 +18691,9 @@ const HLOOKUP = {
     compute: function (searchKey, range, index, isSorted = { value: DEFAULT_IS_SORTED }) {
         const _index = Math.trunc(toNumber(index?.value, this.locale));
         assert(() => 1 <= _index && _index <= range[0].length, _t("[[FUNCTION_NAME]] evaluates to an out of bounds range."));
+        if (searchKey && isEvaluationError(searchKey.value)) {
+            return searchKey;
+        }
         const getValueFromRange = (range, index) => range[index][0].value;
         const _isSorted = toBoolean(isSorted.value);
         const colIndex = _isSorted
@@ -18851,6 +18861,9 @@ const VLOOKUP = {
     compute: function (searchKey, range, index, isSorted = { value: DEFAULT_IS_SORTED }) {
         const _index = Math.trunc(toNumber(index?.value, this.locale));
         assert(() => 1 <= _index && _index <= range.length, _t("[[FUNCTION_NAME]] evaluates to an out of bounds range."));
+        if (searchKey && isEvaluationError(searchKey.value)) {
+            return searchKey;
+        }
         const getValueFromRange = (range, index) => range[0][index].value;
         const _isSorted = toBoolean(isSorted.value);
         const rowIndex = _isSorted
@@ -18890,6 +18903,9 @@ const XLOOKUP = {
         assert(() => lookupDirection === "col"
             ? returnRange[0].length === lookupRange[0].length
             : returnRange.length === lookupRange.length, _t("return_range should have the same dimensions as lookup_range."));
+        if (searchKey && isEvaluationError(searchKey.value)) {
+            return [[searchKey]];
+        }
         const getElement = lookupDirection === "col"
             ? (range, index) => range[0][index].value
             : (range, index) => range[index][0].value;
@@ -26971,15 +26987,17 @@ class Composer extends owl.Component {
         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 },
+        onComposerCellFocused: { type: Function, optional: true },
+        onComposerContentFocused: Function,
+        isDefaultFocus: { type: Boolean, optional: true },
     };
     static components = { TextValueProvider, FunctionDescriptionProvider };
     static defaultProps = {
         inputStyle: "",
+        isDefaultFocus: false,
     };
     composerRef = owl.useRef("o_composer");
     contentHelper = new ContentEditableHelper(this.composerRef.el);
@@ -27036,7 +27054,6 @@ class Composer extends owl.Component {
         F4: this.processF4Key,
         Tab: (ev) => this.processTabKey(ev, "right"),
         "Shift+Tab": (ev) => this.processTabKey(ev, "left"),
-        "Ctrl+ ": this.processSpaceKey,
     };
     keyCodeMapping = {
         NumpadDecimal: this.processNumpadDecimal,
@@ -27044,12 +27061,12 @@ class Composer extends owl.Component {
     setup() {
         owl.onMounted(() => {
             const el = this.composerRef.el;
+            if (this.props.isDefaultFocus) {
+                this.env.focusableElement.setFocusableElement(el);
+            }
             this.contentHelper.updateEl(el);
             this.processTokenAtCursor();
         });
-        owl.onWillUnmount(() => {
-            this.props.onComposerUnmounted?.();
-        });
         owl.useEffect(() => {
             this.processContent();
         });
@@ -27058,7 +27075,8 @@ class Composer extends owl.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();
@@ -27101,23 +27119,19 @@ class Composer extends owl.Component {
     processTabKey(ev, direction) {
         ev.preventDefault();
         ev.stopPropagation();
-        const state = this.autoCompleteState;
-        if (state.showProvider && state.selectedIndex !== undefined) {
-            const autoCompleteValue = this.autoCompleteState.values[state.selectedIndex]?.text;
-            if (autoCompleteValue) {
-                this.autoComplete(autoCompleteValue);
-                return;
+        if (this.env.model.getters.getEditionMode() !== "inactive") {
+            const state = this.autoCompleteState;
+            if (state.showProvider && state.selectedIndex !== undefined) {
+                const autoCompleteValue = this.autoCompleteState.values[state.selectedIndex]?.text;
+                if (autoCompleteValue) {
+                    this.autoComplete(autoCompleteValue);
+                    return;
+                }
             }
+            interactiveStopEdition(this.env);
         }
-        interactiveStopEdition(this.env);
         this.env.model.selection.moveAnchorCell(direction, 1);
     }
-    processSpaceKey(ev) {
-        ev.preventDefault();
-        ev.stopPropagation();
-        this.showFunctionAutocomplete("");
-        this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
-    }
     processEnterKey(ev, direction) {
         ev.preventDefault();
         ev.stopPropagation();
@@ -27179,6 +27193,9 @@ class Composer extends owl.Component {
         this.compositionActive = false;
     }
     onKeydown(ev) {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            return;
+        }
         if (ev.key.startsWith("Arrow")) {
             this.processArrowKeys(ev);
             return;
@@ -27192,14 +27209,33 @@ class Composer extends owl.Component {
             ev.stopPropagation();
         }
     }
+    onPaste(ev) {
+        if (this.env.model.getters.getEditionMode() !== "inactive") {
+            ev.stopPropagation();
+        }
+    }
     /*
      * Triggered automatically by the content-editable between the keydown and key up
      * */
     onInput(ev) {
-        if (this.props.focus === "inactive" || !this.shouldProcessInputEvents) {
+        if (!this.shouldProcessInputEvents) {
+            return;
+        }
+        if (ev.inputType === "insertFromPaste" &&
+            this.env.model.getters.getEditionMode() === "inactive") {
             return;
         }
-        let content = this.contentHelper.getText();
+        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 this.props.onComposerCellFocused?.(content);
+        }
         let selection = this.contentHelper.getCurrentSelection();
         this.env.model.dispatch("STOP_COMPOSER_RANGE_SELECTION");
         this.env.model.dispatch("SET_CURRENT_CONTENT", {
@@ -27275,9 +27311,8 @@ class Composer extends owl.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();
     }
@@ -27444,7 +27479,7 @@ class Composer extends owl.Component {
         const highlights = this.env.model.getters.getHighlights();
         const refSheet = sheetName
             ? this.env.model.getters.getSheetIdByName(sheetName)
-            : this.env.model.getters.getCurrentEditedCell().sheetId;
+            : this.env.model.getters.getCurrentEditedCell()?.sheetId;
         const highlight = highlights.find((highlight) => {
             if (highlight.sheetId !== refSheet)
                 return false;
@@ -27571,56 +27606,30 @@ class GridComposer extends owl.Component {
         focus: {
             validate: (value) => ["inactive", "cellFocus", "contentFocus"].includes(value),
         },
-        onComposerUnmounted: Function,
+        onComposerCellFocused: Function,
         onComposerContentFocused: Function,
         gridDims: Object,
     };
     static components = { Composer };
-    gridComposerRef;
-    zone;
-    rect;
+    rect = this.defaultRect;
+    isEditing = false;
     isCellReferenceVisible;
-    composerState;
+    get defaultRect() {
+        return { x: 0, y: 0, width: 0, height: 0 };
+    }
     setup() {
-        this.gridComposerRef = owl.useRef("gridComposer");
-        this.composerState = owl.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;
-        owl.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: this.props.gridDims.width,
-                height: this.props.gridDims.height,
-            };
-        });
         owl.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 getFullReference(prefixSheet ? this.env.model.getters.getSheetName(sheetId) : undefined, toXC(col, row));
@@ -27632,7 +27641,27 @@ class GridComposer extends owl.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();
@@ -27652,6 +27681,8 @@ class GridComposer extends owl.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
@@ -27663,6 +27694,8 @@ class GridComposer extends owl.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`,
@@ -27672,13 +27705,31 @@ class GridComposer extends owl.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;
+        }
     }
 }
 
@@ -28778,7 +28829,6 @@ class GridOverlay extends owl.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 });
     }
@@ -29843,7 +29893,6 @@ class Grid extends owl.Component {
     HEADER_WIDTH = HEADER_WIDTH;
     menuState;
     gridRef;
-    hiddenInput;
     onMouseWheel;
     canvasPosition;
     hoveredCell;
@@ -29854,15 +29903,14 @@ class Grid extends owl.Component {
             menuItems: [],
         });
         this.gridRef = owl.useRef("grid");
-        this.hiddenInput = owl.useRef("hiddenInput");
         this.canvasPosition = useAbsoluteBoundingRect(this.gridRef);
         this.hoveredCell = owl.useState({ col: undefined, row: undefined });
         owl.useChildSubEnv({ getPopoverContainerRect: () => this.getGridRect() });
         owl.useExternalListener(document.body, "cut", this.copy.bind(this, true));
         owl.useExternalListener(document.body, "copy", this.copy.bind(this, false));
         owl.useExternalListener(document.body, "paste", this.paste);
-        owl.onMounted(() => this.focus());
-        this.props.exposeFocus(() => this.focus());
+        owl.onMounted(() => this.focusDefaultElement());
+        this.props.exposeFocus(() => this.focusDefaultElement());
         useGridDrawing("canvas", this.env.model, () => this.env.model.getters.getSheetViewDimensionWithHeaders());
         this.onMouseWheel = useWheelHandler((deltaX, deltaY) => {
             this.moveCanvas(deltaX, deltaY);
@@ -29886,7 +29934,7 @@ class Grid extends owl.Component {
         if (this.env.model.getters.hasOpenedPopover()) {
             this.closeOpenedPopover();
         }
-        this.focus();
+        this.focusDefaultElement();
     }
     // this map will handle most of the actions that should happen on key down. The arrow keys are managed in the key
     // down itself
@@ -30065,10 +30113,10 @@ class Grid extends owl.Component {
         "Alt+Shift+ArrowUp": () => this.processHeaderGroupingKey("up"),
         "Alt+Shift+ArrowDown": () => this.processHeaderGroupingKey("down"),
     };
-    focus() {
+    focusDefaultElement() {
         if (!this.env.model.getters.getSelectedFigureId() &&
             this.env.model.getters.getEditionMode() === "inactive") {
-            this.hiddenInput.el?.focus();
+            this.env.focusableElement.focus();
         }
     }
     get gridEl() {
@@ -30204,19 +30252,6 @@ class Grid extends owl.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
     // ---------------------------------------------------------------------------
@@ -30331,7 +30366,7 @@ class Grid extends owl.Component {
     }
     closeMenu() {
         this.menuState.isOpen = false;
-        this.focus();
+        this.focusDefaultElement();
     }
     processHeaderGroupingKey(direction) {
         if (this.env.model.getters.getSelectedZones().length !== 1) {
@@ -34248,6 +34283,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;
+        },
+    },
     {
         description: "Change Border description structure",
         from: 12,
@@ -36034,9 +36094,6 @@ 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;
         }
@@ -36288,8 +36345,11 @@ class CellPlugin extends CorePlugin {
      * being a computed property to rebuild the dependencies XC.
      */
     createFormulaCellWithDependencies(id, compiledFormula, format, style, sheetId) {
-        const dependencies = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getters.getRangeString.bind(this));
+        const dependencies = [];
+        for (const xc of compiledFormula.dependencies) {
+            dependencies.push(this.getters.getRangeFromSheetXC(sheetId, xc));
+        }
+        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getters.getRangeString);
     }
     createErrorFormula(id, content, format, style, error) {
         return {
@@ -36343,7 +36403,7 @@ class FormulaCellWithDependencies {
         const tokens = compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const index = rangeIndex++;
-                return new RangeReferenceToken(() => this.getRangeString(dependencies[index], this.sheetId));
+                return new RangeReferenceToken(dependencies, index, this.sheetId, this.getRangeString);
             }
             return token;
         });
@@ -36370,13 +36430,20 @@ class FormulaCellWithDependencies {
     }
 }
 class RangeReferenceToken {
-    getValue;
+    ranges;
+    rangeIndex;
+    sheetId;
+    getRangeString;
     type = "REFERENCE";
-    constructor(getValue) {
-        this.getValue = getValue;
+    constructor(ranges, rangeIndex, sheetId, getRangeString) {
+        this.ranges = ranges;
+        this.rangeIndex = rangeIndex;
+        this.sheetId = sheetId;
+        this.getRangeString = getRangeString;
     }
     get value() {
-        return this.getValue();
+        const range = this.ranges[this.rangeIndex];
+        return this.getRangeString(range, this.sheetId);
     }
 }
 
@@ -41911,7 +41978,13 @@ class EvaluationPlugin extends UIPlugin {
             const format = newFormat
                 ? getItemId(newFormat, data.formats)
                 : exportedCellData.format;
-            const content = !isExported ? newContent : exportedCellData.content;
+            let content;
+            if (formulaCell instanceof FormulaCellWithDependencies) {
+                content = formulaCell.contentWithFixedReferences;
+            }
+            else {
+                content = !isExported ? newContent : exportedCellData.content;
+            }
             exportedSheetData.cells[xc] = { ...exportedCellData, value, isFormula, content, format };
         }
     }
@@ -51095,6 +51168,16 @@ class ImageProvider {
     }
 }
 
+class FocusableElement {
+    focusableElement = undefined;
+    setFocusableElement(element) {
+        this.focusableElement = element;
+    }
+    focus() {
+        this.focusableElement?.focus();
+    }
+}
+
 const RIPPLE_KEY_FRAMES = [
     { transform: "scale(0)" },
     { transform: "scale(0.8)", offset: 0.33 },
@@ -53249,6 +53332,7 @@ class Spreadsheet extends owl.Component {
             toggleSidePanel: this.toggleSidePanel.bind(this),
             clipboard: this.env.clipboard || instantiateClipboard(),
             startCellEdition: (content) => this.onGridComposerCellFocused(content),
+            focusableElement: new FocusableElement(),
         });
         owl.useEffect(() => {
             /**
@@ -53367,16 +53451,17 @@ class Spreadsheet extends owl.Component {
         }
         this.composer.topBarFocus = "contentFocus";
         this.composer.gridFocusMode = "inactive";
-        this.setComposerContent({ selection } || {});
+        this.setComposerContent({ selection });
     }
-    onGridComposerContentFocused() {
+    onGridComposerContentFocused(selection) {
         if (this.model.getters.isReadonly()) {
             return;
         }
         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;
@@ -57100,6 +57185,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.1.3";
-__info__.date = "2024-02-02T13:46:54.332Z";
-__info__.hash = "798f979";
+__info__.version = "17.1.4";
+__info__.date = "2024-02-09T13:09:13.430Z";
+__info__.hash = "16d3ece";