@odoo/o-spreadsheet 17.2.8 → 17.2.10

package/dist/o-spreadsheet.esm.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.8
- * @date 2024-05-24T11:29:49.320Z
- * @hash bfbcaa0
+ * @version 17.2.10
+ * @date 2024-06-10T09:38:54.354Z
+ * @hash 14317ee
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw } from '@odoo/owl';
@@ -293,7 +293,10 @@ function deepCopy(obj) {
  * Check if the object is a plain old javascript object.
  */
 function isPlainObject(obj) {
-    return typeof obj === "object" && obj?.constructor === Object;
+    return (typeof obj === "object" &&
+        obj !== null &&
+        // obj.constructor can be undefined when there's no prototype (`Object.create(null, {})`)
+        (obj?.constructor === Object || obj?.constructor === undefined));
 }
 /**
  * Sanitize the name of a sheet, by eventually removing quotes
@@ -2658,7 +2661,7 @@ function evaluatePredicate(value, criterion) {
         return false;
     }
     if (typeof operand === "number" && operator === "=") {
-        return toString(value) === toString(operand);
+        return value.toString() === operand.toString();
     }
     if (operator === "<>" || operator === "=") {
         let result;
@@ -2718,14 +2721,13 @@ function visitMatchingRanges(args, cb, locale, isQuery = false) {
     if (countArg % 2 === 1) {
         throw new EvaluationError(_t("Function [[FUNCTION_NAME]] expects criteria_range and criterion to be in pairs."));
     }
-    const dimRow = args[0].length;
-    const dimCol = args[0][0].length;
+    const firstArg = toMatrix(args[0]);
+    const dimRow = firstArg.length;
+    const dimCol = firstArg[0].length;
     let predicates = [];
     for (let i = 0; i < countArg - 1; i += 2) {
-        const criteriaRange = args[i];
-        if (!isMatrix(criteriaRange) ||
-            criteriaRange.length !== dimRow ||
-            criteriaRange[0].length !== dimCol) {
+        const criteriaRange = toMatrix(args[i]);
+        if (criteriaRange.length !== dimRow || criteriaRange[0].length !== dimCol) {
             throw new EvaluationError(_t("Function [[FUNCTION_NAME]] expects criteria_range to have the same dimension"));
         }
         const description = toString(args[i + 1]);
@@ -2739,7 +2741,7 @@ function visitMatchingRanges(args, cb, locale, isQuery = false) {
         for (let j = 0; j < dimCol; j++) {
             let validatedPredicates = true;
             for (let k = 0; k < countArg - 1; k += 2) {
-                const criteriaValue = args[k][i][j].value;
+                const criteriaValue = toMatrix(args[k])[i][j].value;
                 const criterion = predicates[k / 2];
                 validatedPredicates = evaluatePredicate(criteriaValue ?? undefined, criterion);
                 if (!validatedPredicates) {
@@ -4456,8 +4458,11 @@ function copyRangeWithNewSheetId(sheetIdFrom, sheetIdTo, range) {
 /**
  * Create a range from a xc. If the xc is empty, this function returns undefined.
  */
-function createRange(getters, sheetId, range) {
-    return range ? getters.getRangeFromSheetXC(sheetId, range) : undefined;
+function createValidRange(getters, sheetId, xc) {
+    if (!xc)
+        return;
+    const range = getters.getRangeFromSheetXC(sheetId, xc);
+    return !(range.invalidSheetName || range.invalidXc) ? range : undefined;
 }
 /**
  * Spread multiple colrows zone to one row/col zone and add a many new input range as needed.
@@ -9644,8 +9649,8 @@ let ScorecardChart$1 = class ScorecardChart extends AbstractChart {
     type = "scorecard";
     constructor(definition, sheetId, getters) {
         super(definition, sheetId, getters);
-        this.keyValue = createRange(getters, sheetId, definition.keyValue);
-        this.baseline = createRange(getters, sheetId, definition.baseline);
+        this.keyValue = createValidRange(getters, sheetId, definition.keyValue);
+        this.baseline = createValidRange(getters, sheetId, definition.baseline);
         this.baselineMode = definition.baselineMode;
         this.baselineDescr = definition.baselineDescr;
         this.background = definition.background;
@@ -10215,6 +10220,9 @@ function makeArg(str, description) {
     if (types.some((t) => t.startsWith("RANGE"))) {
         result.acceptMatrix = true;
     }
+    if (types.every((t) => t.startsWith("RANGE"))) {
+        result.acceptMatrixOnly = true;
+    }
     return result;
 }
 /**
@@ -10496,11 +10504,16 @@ const CHOOSECOLS = {
     compute: function (array, ...columns) {
         const _array = toMatrix(array);
         const _columns = flattenRowFirst(columns, (item) => toInteger(item?.value, this.locale));
-        assert(() => _columns.every((col) => col > 0 && col <= _array.length), _t("The columns arguments must be between 1 and %s (got %s).", _array.length.toString(), (_columns.find((col) => col <= 0 || col > _array.length) || 0).toString()));
+        const argOutOfRange = _columns.filter((col) => col === 0 || _array.length < Math.abs(col));
+        assert(() => argOutOfRange.length === 0, _t("The columns arguments must be between -%s and %s (got %s), excluding 0.", _array.length.toString(), _array.length.toString(), argOutOfRange.join(",")));
         const result = Array(_columns.length);
         for (let col = 0; col < _columns.length; col++) {
-            const colIndex = _columns[col] - 1; // -1 because columns arguments are 1-indexed
-            result[col] = _array[colIndex];
+            if (_columns[col] > 0) {
+                result[col] = _array[_columns[col] - 1]; // -1 because columns arguments are 1-indexed
+            }
+            else {
+                result[col] = _array[_array.length + _columns[col]];
+            }
         }
         return result;
     },
@@ -10521,8 +10534,14 @@ const CHOOSEROWS = {
         const _array = toMatrix(array);
         const _rows = flattenRowFirst(rows, (item) => toInteger(item?.value, this.locale));
         const _nbColumns = _array.length;
-        assert(() => _rows.every((row) => row > 0 && row <= _array[0].length), _t("The rows arguments must be between 1 and %s (got %s).", _array[0].length.toString(), (_rows.find((row) => row <= 0 || row > _array[0].length) || 0).toString()));
-        return generateMatrix(_nbColumns, _rows.length, (col, row) => _array[col][_rows[row] - 1]); // -1 because rows arguments are 1-indexed
+        const argOutOfRange = _rows.filter((row) => row === 0 || _array[0].length < Math.abs(row));
+        assert(() => argOutOfRange.length === 0, _t("The rows arguments must be between -%s and %s (got %s), excluding 0.", _array[0].length.toString(), _array[0].length.toString(), argOutOfRange.join(",")));
+        return generateMatrix(_nbColumns, _rows.length, (col, row) => {
+            if (_rows[row] > 0) {
+                return _array[col][_rows[row] - 1]; // -1 because columns arguments are 1-indexed
+            }
+            return _array[col][_array[col].length + _rows[row]];
+        });
     },
     isExported: true,
 };
@@ -11430,7 +11449,7 @@ const COUNTUNIQUEIFS = {
     compute: function (range, ...args) {
         let uniqueValues = new Set();
         visitMatchingRanges(args, (i, j) => {
-            const data = range[i][j];
+            const data = range[i]?.[j];
             if (isDefined(data)) {
                 uniqueValues.add(data.value);
             }
@@ -12060,7 +12079,7 @@ const SUMIF = {
         }
         let sum = 0;
         visitMatchingRanges([criteriaRange, criterion], (i, j) => {
-            const value = sumRange[i][j].value;
+            const value = sumRange[i]?.[j]?.value;
             if (typeof value === "number") {
                 sum += value;
             }
@@ -12085,7 +12104,7 @@ const SUMIFS = {
     compute: function (sumRange, ...criters) {
         let sum = 0;
         visitMatchingRanges(criters, (i, j) => {
-            const value = sumRange[i][j].value;
+            const value = sumRange[i]?.[j]?.value;
             if (typeof value === "number") {
                 sum += value;
             }
@@ -12632,7 +12651,7 @@ const AVERAGEIF = {
         let count = 0;
         let sum = 0;
         visitMatchingRanges([criteriaRange, criterion], (i, j) => {
-            const value = _averageRange[i][j].value;
+            const value = _averageRange[i]?.[j]?.value;
             if (typeof value === "number") {
                 count += 1;
                 sum += value;
@@ -12661,7 +12680,7 @@ const AVERAGEIFS = {
         let count = 0;
         let sum = 0;
         visitMatchingRanges(args, (i, j) => {
-            const value = _averageRange[i][j].value;
+            const value = _averageRange[i]?.[j]?.value;
             if (typeof value === "number") {
                 count += 1;
                 sum += value;
@@ -12966,7 +12985,7 @@ const MAXIFS = {
     compute: function (range, ...args) {
         let result = -Infinity;
         visitMatchingRanges(args, (i, j) => {
-            const value = range[i][j].value;
+            const value = range[i]?.[j]?.value;
             if (typeof value === "number") {
                 result = result < value ? value : result;
             }
@@ -13049,7 +13068,7 @@ const MINIFS = {
     compute: function (range, ...args) {
         let result = Infinity;
         visitMatchingRanges(args, (i, j) => {
-            const value = range[i][j].value;
+            const value = range[i]?.[j]?.value;
             if (typeof value === "number") {
                 result = result > value ? value : result;
             }
@@ -18801,6 +18820,9 @@ function addInputHandling(descr) {
                 }
                 args[i] = arg[0][0];
             }
+            if (!isMatrix(arg) && argDefinition.acceptMatrixOnly) {
+                throw new BadExpressionError(_t("Function [[FUNCTION_NAME]] expects the parameter '%s' to be reference to a cell or range.", (i + 1).toString()));
+            }
         }
         return descr.compute.apply(this, args);
     }
@@ -19753,7 +19775,7 @@ function chartToImage(runtime, figure, type) {
     if ("chartJsConfig" in runtime) {
         runtime.chartJsConfig.plugins = [backgroundColorChartJSPlugin];
         // @ts-ignore
-        const chart = new window.Chart(canvas, runtime.chartJsConfig);
+        const chart = new window.Chart(canvas, deepCopy(runtime.chartJsConfig));
         const imgContent = chart.toBase64Image();
         chart.destroy();
         div.remove();
@@ -19803,7 +19825,7 @@ class BarChart extends AbstractChart {
     constructor(definition, sheetId, getters) {
         super(definition, sheetId, getters);
         this.dataSets = createDataSets(getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-        this.labelRange = createRange(getters, sheetId, definition.labelRange);
+        this.labelRange = createValidRange(getters, sheetId, definition.labelRange);
         this.background = definition.background;
         this.verticalAxisPosition = definition.verticalAxisPosition;
         this.legendPosition = definition.legendPosition;
@@ -20047,7 +20069,7 @@ class GaugeChart extends AbstractChart {
     type = "gauge";
     constructor(definition, sheetId, getters) {
         super(definition, sheetId, getters);
-        this.dataRange = createRange(this.getters, this.sheetId, definition.dataRange);
+        this.dataRange = createValidRange(this.getters, this.sheetId, definition.dataRange);
         this.sectionRule = definition.sectionRule;
         this.background = definition.background;
     }
@@ -20568,7 +20590,7 @@ class LineChart extends AbstractChart {
     constructor(definition, sheetId, getters) {
         super(definition, sheetId, getters);
         this.dataSets = createDataSets(this.getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-        this.labelRange = createRange(this.getters, sheetId, definition.labelRange);
+        this.labelRange = createValidRange(this.getters, sheetId, definition.labelRange);
         this.background = definition.background;
         this.verticalAxisPosition = definition.verticalAxisPosition;
         this.legendPosition = definition.legendPosition;
@@ -20683,7 +20705,7 @@ class PieChart extends AbstractChart {
     constructor(definition, sheetId, getters) {
         super(definition, sheetId, getters);
         this.dataSets = createDataSets(getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-        this.labelRange = createRange(getters, sheetId, definition.labelRange);
+        this.labelRange = createValidRange(getters, sheetId, definition.labelRange);
         this.background = definition.background;
         this.legendPosition = definition.legendPosition;
         this.aggregated = definition.aggregated;
@@ -20885,7 +20907,7 @@ class ScatterChart extends AbstractChart {
     constructor(definition, sheetId, getters) {
         super(definition, sheetId, getters);
         this.dataSets = createDataSets(this.getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-        this.labelRange = createRange(this.getters, sheetId, definition.labelRange);
+        this.labelRange = createValidRange(this.getters, sheetId, definition.labelRange);
         this.background = definition.background;
         this.verticalAxisPosition = definition.verticalAxisPosition;
         this.legendPosition = definition.legendPosition;
@@ -20971,13 +20993,6 @@ function createScatterChartRuntime(chart, getters) {
     // have less options than the line chart (it only works with linear labels)
     chartJsConfig.type = "line";
     const configOptions = chartJsConfig.options;
-    configOptions.elements = {
-        point: {
-            radius: 3,
-            hoverRadius: 3,
-            hitRadius: 8,
-        },
-    };
     const locale = getters.getLocale();
     configOptions.plugins.tooltip.callbacks.title = () => "";
     configOptions.plugins.tooltip.callbacks.label = (tooltipItem) => {
@@ -21706,8 +21721,7 @@ function zoneToRect(zone) {
  */
 function useSpreadsheetRect() {
     const position = useState({ x: 0, y: 0, width: 0, height: 0 });
-    let spreadsheetElement = document.querySelector(".o-spreadsheet");
-    updatePosition();
+    let spreadsheetElement = null;
     function updatePosition() {
         if (!spreadsheetElement) {
             spreadsheetElement = document.querySelector(".o-spreadsheet");
@@ -26811,7 +26825,7 @@ class LineBarPieConfigPanel extends Component {
         }
         const getters = this.env.model.getters;
         const sheetId = getters.getActiveSheetId();
-        const labelRange = createRange(getters, sheetId, this.labelRange);
+        const labelRange = createValidRange(getters, sheetId, this.labelRange);
         const dataSets = createDataSets(getters, this.dataSeriesRanges, sheetId, this.props.definition.dataSetsHaveTitle);
         if (dataSets.length) {
             return dataSets[0].dataRange.zone.top + 1;
@@ -26840,15 +26854,23 @@ class BarConfigPanel extends LineBarPieConfigPanel {
     }
 }
 
+/**
+ * Start listening to pointer events and apply the given callbacks.
+ *
+ * @returns A function to remove the listeners.
+ */
 function startDnd(onMouseMove, onMouseUp, onMouseDown = () => { }) {
-    const _onMouseUp = (ev) => {
-        onMouseUp(ev);
+    const removeListeners = () => {
         window.removeEventListener("pointerdown", onMouseDown);
         window.removeEventListener("pointerup", _onMouseUp);
         window.removeEventListener("dragstart", _onDragStart);
         window.removeEventListener("pointermove", onMouseMove);
         window.removeEventListener("wheel", onMouseMove);
     };
+    const _onMouseUp = (ev) => {
+        onMouseUp(ev);
+        removeListeners();
+    };
     function _onDragStart(ev) {
         ev.preventDefault();
     }
@@ -26860,6 +26882,7 @@ function startDnd(onMouseMove, onMouseUp, onMouseDown = () => { }) {
     // preventDefault() is not allowed in passive event handler.
     // https://chromestatus.com/feature/6662647093133312
     window.addEventListener("wheel", onMouseMove, { passive: false });
+    return removeListeners;
 }
 /**
  * Function to be used during a pointerdown event, this function allows to
@@ -28054,6 +28077,7 @@ function useDragAndDropListItems() {
             state.itemsStyle = {};
             document.body.style.cursor = previousCursor;
             args.onCancel?.();
+            cleanUp();
         };
         const onDragEnd = (itemId, indexAtEnd) => {
             state.draggedItemId = undefined;
@@ -28074,7 +28098,8 @@ function useDragAndDropListItems() {
             onDragEnd,
             onCancel: state.cancel,
         });
-        startDnd(dndHelper.onMouseMove.bind(dndHelper), dndHelper.onMouseUp.bind(dndHelper));
+        const stopListening = startDnd(dndHelper.onMouseMove.bind(dndHelper), dndHelper.onMouseUp.bind(dndHelper));
+        cleanupFns.push(stopListening);
         const onScroll = dndHelper.onScroll.bind(dndHelper);
         args.containerEl.addEventListener("scroll", onScroll);
         cleanupFns.push(() => args.containerEl.removeEventListener("scroll", onScroll));
@@ -28151,7 +28176,7 @@ class DOMDndHelper {
         this.moveDraggedItemToPosition(this.currentMousePosition + this.scrollOffset);
     }
     onMouseMove(ev) {
-        if (ev.button !== -1) {
+        if (ev.button > 1) {
             this.onCancel();
             return;
         }
@@ -31321,14 +31346,14 @@ class FigureComponent extends Component {
     }
     onKeyDown(ev) {
         const figure = this.props.figure;
-        switch (ev.key) {
+        const keyDownShortcut = keyboardEventToShortcutString(ev);
+        switch (keyDownShortcut) {
             case "Delete":
                 this.env.model.dispatch("DELETE_FIGURE", {
                     sheetId: this.env.model.getters.getActiveSheetId(),
                     id: figure.id,
                 });
                 this.props.onFigureDeleted();
-                ev.stopPropagation();
                 ev.preventDefault();
                 ev.stopPropagation();
                 break;
@@ -31349,7 +31374,22 @@ class FigureComponent extends Component {
                     x: figure.x + delta[0],
                     y: figure.y + delta[1],
                 });
+                ev.preventDefault();
                 ev.stopPropagation();
+                break;
+            case "Ctrl+A":
+                // Maybe in the future we will implement a way to select all figures
+                ev.preventDefault();
+                ev.stopPropagation();
+                break;
+            case "Ctrl+Y":
+            case "Ctrl+Z":
+                if (keyDownShortcut === "Ctrl+Y") {
+                    this.env.model.dispatch("REQUEST_REDO");
+                }
+                else if (keyDownShortcut === "Ctrl+Z") {
+                    this.env.model.dispatch("REQUEST_UNDO");
+                }
                 ev.preventDefault();
                 ev.stopPropagation();
                 break;
@@ -32392,8 +32432,15 @@ class Composer extends Component {
     }
     onPaste(ev) {
         if (this.composerStore.editionMode !== "inactive") {
+            // let the browser clipboard work
             ev.stopPropagation();
         }
+        else {
+            // the user meant to paste in the sheet, not open the composer with the pasted content
+            // While we're not editing, we still have the focus and should therefore prevent
+            // the native "paste" to occur.
+            ev.preventDefault();
+        }
     }
     /*
      * Triggered automatically by the content-editable between the keydown and key up
@@ -32402,9 +32449,6 @@ class Composer extends Component {
         if (!this.shouldProcessInputEvents) {
             return;
         }
-        if (ev.inputType === "insertFromPaste" && this.composerStore.editionMode === "inactive") {
-            return;
-        }
         ev.stopPropagation();
         let content;
         if (this.composerStore.editionMode === "inactive") {
@@ -32771,10 +32815,7 @@ class GridComposer extends Component {
     }
     get containerStyle() {
         if (this.composerStore.editionMode === "inactive") {
-            return `
-        position: absolute;
-        z-index: -1000;
-      `;
+            return `z-index: -1000;`;
         }
         const isFormula = this.composerStore.currentContent.startsWith("=");
         const cell = this.env.model.getters.getActiveCell();
@@ -41137,12 +41178,6 @@ function compileTokens(tokens) {
                 // detect when an argument need to be evaluated as a meta argument
                 const isMeta = argTypes.includes("META");
                 const hasRange = argTypes.some((t) => isRangeType(t));
-                const isRangeOnly = argTypes.every((t) => isRangeType(t));
-                if (isRangeOnly) {
-                    if (!isRangeInput(currentArg)) {
-                        throw new BadExpressionError(_t("Function %s expects the parameter %s to be reference to a cell or range, not a %s.", functionName, (i + 1).toString(), currentArg.type.toLowerCase()));
-                    }
-                }
                 compiledArgs.push(compileAST(currentArg, isMeta, hasRange, {
                     functionName,
                     paramIndex: i + 1,
@@ -41313,16 +41348,6 @@ function assertEnoughArgs(ast) {
 function isRangeType(type) {
     return type.startsWith("RANGE");
 }
-function isRangeInput(arg) {
-    if (arg.type === "REFERENCE") {
-        return true;
-    }
-    if (arg.type === "FUNCALL") {
-        const fnDef = functions$1[arg.value.toUpperCase()];
-        return fnDef && isRangeType(fnDef.returns[0]);
-    }
-    return false;
-}
 
 const functions = functionRegistry.content;
 function isExportableToExcel(tokens) {
@@ -44060,6 +44085,9 @@ class RangeAdapter {
         if (range.invalidXc) {
             return range.invalidXc;
         }
+        if (!this.getters.tryGetSheet(range.sheetId)) {
+            return CellErrorType.InvalidReference;
+        }
         if (range.zone.bottom - range.zone.top < 0 || range.zone.right - range.zone.left < 0) {
             return CellErrorType.InvalidReference;
         }
@@ -47444,7 +47472,6 @@ class PositionSet {
  *
  */
 class SpreadingRelation {
-    createEmptyPositionSet;
     /**
      * Internal structure:
      * For something like
@@ -47475,9 +47502,6 @@ class SpreadingRelation {
      */
     resultsToArrayFormulas = new PositionMap();
     arrayFormulasToResults = new PositionMap();
-    constructor(createEmptyPositionSet) {
-        this.createEmptyPositionSet = createEmptyPositionSet;
-    }
     getFormulaPositionsSpreadingOn(resultPosition) {
         return this.resultsToArrayFormulas.get(resultPosition) || EMPTY_ARRAY;
     }
@@ -47496,13 +47520,13 @@ class SpreadingRelation {
      */
     addRelation({ arrayFormulaPosition, resultPosition, }) {
         if (!this.resultsToArrayFormulas.has(resultPosition)) {
-            this.resultsToArrayFormulas.set(resultPosition, this.createEmptyPositionSet());
+            this.resultsToArrayFormulas.set(resultPosition, []);
         }
-        this.resultsToArrayFormulas.get(resultPosition)?.add(arrayFormulaPosition);
+        this.resultsToArrayFormulas.get(resultPosition)?.push(arrayFormulaPosition);
         if (!this.arrayFormulasToResults.has(arrayFormulaPosition)) {
-            this.arrayFormulasToResults.set(arrayFormulaPosition, this.createEmptyPositionSet());
+            this.arrayFormulasToResults.set(arrayFormulaPosition, []);
         }
-        this.arrayFormulasToResults.get(arrayFormulaPosition)?.add(resultPosition);
+        this.arrayFormulasToResults.get(arrayFormulaPosition)?.push(resultPosition);
     }
     hasArrayFormulaResult(position) {
         return this.resultsToArrayFormulas.has(position);
@@ -47523,7 +47547,7 @@ class Evaluator {
     evaluatedCells = new PositionMap();
     formulaDependencies = lazy(new FormulaDependencyGraph(this.createEmptyPositionSet.bind(this)));
     blockedArrayFormulas = new PositionSet({});
-    spreadingRelations = new SpreadingRelation(this.createEmptyPositionSet.bind(this));
+    spreadingRelations = new SpreadingRelation();
     constructor(context, getters) {
         this.context = context;
         this.getters = getters;
@@ -47600,7 +47624,7 @@ class Evaluator {
     }
     buildDependencyGraph() {
         this.blockedArrayFormulas = this.createEmptyPositionSet();
-        this.spreadingRelations = new SpreadingRelation(this.createEmptyPositionSet.bind(this));
+        this.spreadingRelations = new SpreadingRelation();
         this.formulaDependencies = lazy(() => {
             const dependencies = [...this.getAllCells()].flatMap((position) => this.getDirectDependencies(position)
                 .filter((range) => !range.invalidSheetName && !range.invalidXc)
@@ -48089,16 +48113,22 @@ class EvaluationPlugin extends UIPlugin {
             let newContent = undefined;
             let newFormat = undefined;
             let isExported = true;
+            const exportedSheetData = data.sheets.find((sheet) => sheet.id === position.sheetId);
             const formulaCell = this.getCorrespondingFormulaCell(position);
             if (formulaCell) {
                 isExported = isExportableToExcel(formulaCell.compiledFormula.tokens);
                 isFormula = isExported;
                 if (!isExported) {
-                    newContent = (value ?? "").toString();
-                    newFormat = evaluatedCell.format;
+                    // If the cell contains a non-exported formula and that is evaluates to
+                    // nothing* ,we don't export it.
+                    // * non-falsy value are relevant and so are 0 and FALSE, which only leaves
+                    // the empty string.
+                    if (value !== "") {
+                        newContent = (value ?? "").toString();
+                        newFormat = evaluatedCell.format;
+                    }
                 }
             }
-            const exportedSheetData = data.sheets.find((sheet) => sheet.id === position.sheetId);
             const exportedCellData = exportedSheetData.cells[xc] || {};
             const format = newFormat
                 ? getItemId(newFormat, data.formats)
@@ -52088,7 +52118,7 @@ class ClipboardPlugin extends UIPlugin {
     paintFormatStatus = "inactive";
     originSheetId;
     copiedData;
-    _isCutOperation;
+    _isCutOperation = false;
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
@@ -52100,14 +52130,17 @@ class ClipboardPlugin extends UIPlugin {
             case "PASTE_FROM_OS_CLIPBOARD": {
                 const copiedData = this.convertOSClipboardData(cmd.text);
                 const pasteOption = cmd.pasteOption || (this.paintFormatStatus !== "inactive" ? "onlyFormat" : undefined);
-                return this.isPasteAllowed(cmd.target, copiedData, { pasteOption });
+                return this.isPasteAllowed(cmd.target, copiedData, { pasteOption, isCutOperation: false });
             }
             case "PASTE": {
                 if (!this.copiedData) {
                     return "EmptyClipboard" /* CommandResult.EmptyClipboard */;
                 }
                 const pasteOption = cmd.pasteOption || (this.paintFormatStatus !== "inactive" ? "onlyFormat" : undefined);
-                return this.isPasteAllowed(cmd.target, this.copiedData, { pasteOption });
+                return this.isPasteAllowed(cmd.target, this.copiedData, {
+                    pasteOption: pasteOption,
+                    isCutOperation: this._isCutOperation,
+                });
             }
             case "COPY_PASTE_CELLS_ABOVE": {
                 const zones = this.getters.getSelectedZones();
@@ -52125,13 +52158,13 @@ class ClipboardPlugin extends UIPlugin {
             }
             case "INSERT_CELL": {
                 const { cut, paste } = this.getInsertCellsTargets(cmd.zone, cmd.shiftDimension);
-                const copiedData = this.copy("CUT", cut);
-                return this.isPasteAllowed(paste, copiedData, {});
+                const copiedData = this.copy(cut);
+                return this.isPasteAllowed(paste, copiedData, { isCutOperation: true });
             }
             case "DELETE_CELL": {
                 const { cut, paste } = this.getDeleteCellsTargets(cmd.zone, cmd.shiftDimension);
-                const copiedData = this.copy("CUT", cut);
-                return this.isPasteAllowed(paste, copiedData, {});
+                const copiedData = this.copy(cut);
+                return this.isPasteAllowed(paste, copiedData, { isCutOperation: true });
             }
             case "ACTIVATE_PAINT_FORMAT": {
                 if (this.paintFormatStatus !== "inactive") {
@@ -52149,23 +52182,27 @@ class ClipboardPlugin extends UIPlugin {
                 const zones = this.getters.getSelectedZones();
                 this.status = "visible";
                 this.originSheetId = this.getters.getActiveSheetId();
-                this.copiedData = this.copy(cmd.type, zones);
+                this.copiedData = this.copy(zones);
+                this._isCutOperation = cmd.type === "CUT";
                 break;
             case "PASTE_FROM_OS_CLIPBOARD": {
+                this._isCutOperation = false;
                 this.copiedData = this.convertOSClipboardData(cmd.text);
                 const pasteOption = cmd.pasteOption || (this.paintFormatStatus !== "inactive" ? "onlyFormat" : undefined);
-                this.paste(cmd.target, {
+                this.paste(cmd.target, this.copiedData, {
                     pasteOption,
                     selectTarget: true,
+                    isCutOperation: false,
                 });
                 this.status = "invisible";
                 break;
             }
             case "PASTE": {
                 const pasteOption = cmd.pasteOption || (this.paintFormatStatus !== "inactive" ? "onlyFormat" : undefined);
-                this.paste(cmd.target, {
+                this.paste(cmd.target, this.copiedData, {
                     pasteOption,
                     selectTarget: true,
+                    isCutOperation: this._isCutOperation,
                 });
                 if (this.paintFormatStatus === "oneOff") {
                     this.paintFormatStatus = "inactive";
@@ -52186,9 +52223,9 @@ class ClipboardPlugin extends UIPlugin {
                         top: multipleRowsInSelection ? zone.top : zone.top - 1,
                     };
                     this.originSheetId = this.getters.getActiveSheetId();
-                    this.copiedData = this.copy("COPY", [copyTarget]);
-                    this.paste([zone], {
-                        pasteOption: undefined,
+                    const copiedData = this.copy([copyTarget]);
+                    this.paste([zone], copiedData, {
+                        isCutOperation: false,
                         selectTarget: true,
                     });
                 }
@@ -52203,9 +52240,9 @@ class ClipboardPlugin extends UIPlugin {
                         left: multipleColsInSelection ? zone.left : zone.left - 1,
                     };
                     this.originSheetId = this.getters.getActiveSheetId();
-                    this.copiedData = this.copy("COPY", [copyTarget]);
-                    this.paste([zone], {
-                        pasteOption: undefined,
+                    const copiedData = this.copy([copyTarget]);
+                    this.paste([zone], copiedData, {
+                        isCutOperation: false,
                         selectTarget: true,
                     });
                 }
@@ -52221,14 +52258,14 @@ class ClipboardPlugin extends UIPlugin {
                     }
                     break;
                 }
-                this.copiedData = this.copy("CUT", cut);
-                this.paste(paste, {});
+                const copiedData = this.copy(cut);
+                this.paste(paste, copiedData, { isCutOperation: true });
                 break;
             }
             case "INSERT_CELL": {
                 const { cut, paste } = this.getInsertCellsTargets(cmd.zone, cmd.shiftDimension);
-                this.copiedData = this.copy("CUT", cut);
-                this.paste(paste, {});
+                const copiedData = this.copy(cut);
+                this.paste(paste, copiedData, { isCutOperation: true });
                 break;
             }
             case "ADD_COLUMNS_ROWS": {
@@ -52260,7 +52297,8 @@ class ClipboardPlugin extends UIPlugin {
                 break;
             }
             case "REPEAT_PASTE": {
-                this.paste(cmd.target, {
+                this.paste(cmd.target, this.copiedData, {
+                    isCutOperation: false,
                     pasteOption: cmd.pasteOption,
                     selectTarget: true,
                 });
@@ -52268,7 +52306,7 @@ class ClipboardPlugin extends UIPlugin {
             }
             case "ACTIVATE_PAINT_FORMAT": {
                 const zones = this.getters.getSelectedZones();
-                this.copiedData = this.copy("COPY", zones);
+                this.copiedData = this.copy(zones);
                 this.status = "visible";
                 if (cmd.persistent) {
                     this.paintFormatStatus = "persistent";
@@ -52299,7 +52337,6 @@ class ClipboardPlugin extends UIPlugin {
         }
     }
     convertOSClipboardData(clipboardData) {
-        this._isCutOperation = false;
         const handlers = clipboardHandlersRegistries.figureHandlers
             .getAll()
             .map((handler) => new handler(this.getters, this.dispatch));
@@ -52337,7 +52374,6 @@ class ClipboardPlugin extends UIPlugin {
         for (const handler of this.selectClipboardHandlers(copiedData)) {
             const result = handler.isPasteAllowed(this.getters.getActiveSheetId(), target, copiedData, {
                 ...options,
-                isCutOperation: this.isCutOperation(),
             });
             if (result !== "Success" /* CommandResult.Success */) {
                 return result;
@@ -52360,9 +52396,8 @@ class ClipboardPlugin extends UIPlugin {
         }
         return false;
     }
-    copy(operation, zones) {
+    copy(zones) {
         let copiedData = {};
-        this._isCutOperation = operation === "CUT";
         const clipboardData = this.getClipboardData(zones);
         for (const handler of this.selectClipboardHandlers(clipboardData)) {
             const data = handler.copy(clipboardData);
@@ -52370,8 +52405,8 @@ class ClipboardPlugin extends UIPlugin {
         }
         return copiedData;
     }
-    paste(zones, options) {
-        if (!this.copiedData) {
+    paste(zones, copiedData, options) {
+        if (!copiedData) {
             return;
         }
         let zone = undefined;
@@ -52379,12 +52414,9 @@ class ClipboardPlugin extends UIPlugin {
         let target = {
             zones,
         };
-        const handlers = this.selectClipboardHandlers(this.copiedData);
+        const handlers = this.selectClipboardHandlers(copiedData);
         for (const handler of handlers) {
-            const currentTarget = handler.getPasteTarget(zones, this.copiedData, {
-                ...options,
-                isCutOperation: this.isCutOperation(),
-            });
+            const currentTarget = handler.getPasteTarget(zones, copiedData, options);
             if (currentTarget.figureId) {
                 target.figureId = currentTarget.figureId;
             }
@@ -52400,7 +52432,7 @@ class ClipboardPlugin extends UIPlugin {
         if (zone !== undefined) {
             this.addMissingDimensions(this.getters.getActiveSheetId(), zone.right - zone.left + 1, zone.bottom - zone.top + 1, zone.left, zone.top);
         }
-        handlers.forEach((handler) => handler.paste(target, this.copiedData, { ...options, isCutOperation: this.isCutOperation() }));
+        handlers.forEach((handler) => handler.paste(target, copiedData, options));
         if (!options?.selectTarget) {
             return;
         }
@@ -54870,6 +54902,7 @@ class BottomBarSheet extends Component {
     sheetDivRef = useRef("sheetDiv");
     sheetNameRef = useRef("sheetNameSpan");
     editionState = "initializing";
+    DOMFocusableElementStore;
     setup() {
         onMounted(() => {
             if (this.isSheetActive) {
@@ -54882,6 +54915,7 @@ class BottomBarSheet extends Component {
                 this.focusInputAndSelectContent();
             }
         });
+        this.DOMFocusableElementStore = useStore(DOMFocusableElementStore);
     }
     focusInputAndSelectContent() {
         if (!this.state.isEditing || !this.sheetNameRef.el)
@@ -54923,9 +54957,11 @@ class BottomBarSheet extends Component {
         if (ev.key === "Enter") {
             ev.preventDefault();
             this.stopEdition();
+            this.DOMFocusableElementStore.focus();
         }
         if (ev.key === "Escape") {
             this.cancelEdition();
+            this.DOMFocusableElementStore.focus();
         }
     }
     onClickSheetName(ev) {
@@ -59648,7 +59684,11 @@ function addRows(construct, data, sheet) {
                 let cellNode = escapeXml ``;
                 // Either formula or static value inside the cell
                 if (cell.isFormula) {
-                    ({ attrs: additionalAttrs, node: cellNode } = addFormula(cell));
+                    const res = addFormula(cell);
+                    if (!res) {
+                        continue;
+                    }
+                    ({ attrs: additionalAttrs, node: cellNode } = res);
                 }
                 else if (cell.content && isMarkdownLink(cell.content)) {
                     const { label } = parseMarkdownLink(cell.content);
@@ -60687,6 +60727,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "17.2.8";
-__info__.date = "2024-05-24T11:29:49.320Z";
-__info__.hash = "bfbcaa0";
+__info__.version = "17.2.10";
+__info__.date = "2024-06-10T09:38:54.354Z";
+__info__.hash = "14317ee";