@odoo/o-spreadsheet 17.2.7 → 17.2.9

package/dist/o-spreadsheet.esm.js

@@ -3,12 +3,12 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.7
- * @date 2024-05-15T09:20:44.429Z
- * @hash 57e89fa
+ * @version 17.2.9
+ * @date 2024-06-03T14:56:21.684Z
+ * @hash 086af6d
  */
 
-import { reactive, useEnv, useSubEnv, useState, onWillUnmount, markRaw, toRaw, Component, useRef, onMounted, useEffect, onPatched, useComponent, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv } from '@odoo/owl';
+import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw } from '@odoo/owl';
 
 const CANVAS_SHIFT = 0.5;
 // Colors
@@ -502,6 +502,26 @@ function debounce(func, wait, immediate) {
     };
     return debounced;
 }
+/**
+ * Creates a batched version of a callback so that all calls to it in the same
+ * microtick will only call the original callback once.
+ *
+ * @param callback the callback to batch
+ * @returns a batched version of the original callback
+ *
+ * Copied from odoo/owl repo.
+ */
+function batched(callback) {
+    let scheduled = false;
+    return async (...args) => {
+        if (!scheduled) {
+            scheduled = true;
+            await Promise.resolve();
+            scheduled = false;
+            callback(...args);
+        }
+    };
+}
 /*
  * Concatenate an array of strings.
  */
@@ -576,8 +596,9 @@ function deepEquals(o1, o2, ignoreFunctions) {
                 return false;
         }
         else {
-            if (ignoreFunctions && typeOfO1Key === "function")
-                return true;
+            if (ignoreFunctions && typeOfO1Key === "function") {
+                continue;
+            }
             if (o1[key] !== o2[key])
                 return false;
         }
@@ -1828,7 +1849,7 @@ class LazyTranslatedString extends String {
     }
     valueOf() {
         const str = super.valueOf();
-        return _loaded() ? sprintf(_translate(str), ...this.values) : str;
+        return _loaded() ? sprintf(_translate(str), ...this.values) : sprintf(str, ...this.values);
     }
     toString() {
         return this.valueOf();
@@ -2637,7 +2658,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;
@@ -2697,14 +2718,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]);
@@ -2718,7 +2738,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) {
@@ -4435,8 +4455,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.
@@ -8012,10 +8035,66 @@ function getDateCriterionFormattedValues(criterion, getters) {
     });
 }
 
+/**
+ * This is a generic event bus based on the Owl event bus.
+ * This bus however ensures type safety across events and subscription callbacks.
+ */
+class EventBus {
+    subscriptions = {};
+    /**
+     * Add a listener for the 'eventType' events.
+     *
+     * Note that the 'owner' of this event can be anything, but will more likely
+     * be a component or a class. The idea is that the callback will be called with
+     * the proper owner bound.
+     *
+     * Also, the owner should be kind of unique. This will be used to remove the
+     * listener.
+     */
+    on(type, owner, callback) {
+        if (!callback) {
+            throw new Error("Missing callback");
+        }
+        if (!this.subscriptions[type]) {
+            this.subscriptions[type] = [];
+        }
+        this.subscriptions[type].push({
+            owner,
+            callback,
+        });
+    }
+    /**
+     * Emit an event of type 'eventType'.  Any extra arguments will be passed to
+     * the listeners callback.
+     */
+    trigger(type, payload) {
+        const subs = this.subscriptions[type] || [];
+        for (let i = 0, iLen = subs.length; i < iLen; i++) {
+            const sub = subs[i];
+            sub.callback.call(sub.owner, payload);
+        }
+    }
+    /**
+     * Remove a listener
+     */
+    off(eventType, owner) {
+        const subs = this.subscriptions[eventType];
+        if (subs) {
+            this.subscriptions[eventType] = subs.filter((s) => s.owner !== owner);
+        }
+    }
+    /**
+     * Remove all subscriptions.
+     */
+    clear() {
+        this.subscriptions = {};
+    }
+}
+
 /**
  * A type-safe dependency container
  */
-class DependencyContainer {
+class DependencyContainer extends EventBus {
     dependencies = new Map();
     factory = new StoreFactory(this.get.bind(this));
     /**
@@ -8092,15 +8171,12 @@ stores.inject(MyMetaStore, storeInstance);
     }
     return MetaStore;
 }
-class ReactiveStore {
+class DisposableStore {
     get;
+    disposeCallbacks = [];
     constructor(get) {
         this.get = get;
-        return reactive(this);
     }
-}
-class DisposableStore extends ReactiveStore {
-    disposeCallbacks = [];
     onDispose(callback) {
         this.disposeCallbacks.push(callback);
     }
@@ -8120,7 +8196,10 @@ function useStoreProvider() {
     const container = new DependencyContainer();
     useSubEnv({
         __spreadsheet_stores__: container,
-        getStore: container.get.bind(container),
+        getStore: (Store) => {
+            const store = container.get(Store);
+            return proxifyStoreMutation(store, () => container.trigger("store-updated"));
+        },
     });
     return container;
 }
@@ -8130,14 +8209,57 @@ function useStoreProvider() {
 function useStore(Store) {
     const env = useEnv();
     const container = getDependencyContainer(env);
-    return useState(container.get(Store));
+    const store = container.get(Store);
+    return useStoreRenderProxy(container, store);
 }
 function useLocalStore(Store, ...args) {
     const env = useEnv();
     const container = getDependencyContainer(env);
-    const store = useState(container.instantiate(Store, ...args));
+    const store = container.instantiate(Store, ...args);
     onWillUnmount(() => store.dispose());
-    return store;
+    return useStoreRenderProxy(container, store);
+}
+/**
+ * Trigger an event to re-render the app (deep render) when
+ * a store is mutated by invoking one of its mutator methods.
+ */
+function useStoreRenderProxy(container, store) {
+    const component = useComponent();
+    const proxy = proxifyStoreMutation(store, () => {
+        if (status(component) === "mounted") {
+            container.trigger("store-updated");
+        }
+    });
+    return proxy;
+}
+/**
+ * Creates a proxied version of a store object with mutation tracking.
+ * Whenever a mutator method of the store is called, the provided callback function is invoked.
+ */
+function proxifyStoreMutation(store, callback) {
+    const proxy = new Proxy(store, {
+        get(target, property, receiver) {
+            const thisStore = target;
+            // The third argument is `thisStore` (target) instead of `receiver`.
+            // The goal is to always have the same `this` value in getter functions
+            // (when `target[property]` is an accessor property).
+            // `thisStore` is always the same object reference. `receiver` however is the
+            // object on which the property is called, which is the Proxy object which is different for each component.
+            const value = Reflect.get(target, property, thisStore);
+            if (store.mutators.includes(property)) {
+                const functionProxy = new Proxy(value, {
+                    // trap the function call
+                    apply(target, thisArg, argArray) {
+                        Reflect.apply(target, thisStore, argArray);
+                        callback();
+                    },
+                });
+                return functionProxy;
+            }
+            return value;
+        },
+    });
+    return proxy;
 }
 function getDependencyContainer(env) {
     const container = env.__spreadsheet_stores__;
@@ -8149,7 +8271,8 @@ function getDependencyContainer(env) {
 
 const ModelStore = createAbstractStore("Model");
 
-class RendererStore extends ReactiveStore {
+class RendererStore {
+    mutators = ["register", "unRegister"];
     renderers = {};
     register(renderer) {
         if (!renderer.renderingLayers.length) {
@@ -8183,7 +8306,7 @@ class RendererStore extends ReactiveStore {
 class SpreadsheetStore extends DisposableStore {
     // cast the model store as Model to allow model.dispatch to return the DispatchResult
     model = this.get(ModelStore);
-    getters = markRaw(this.model.getters);
+    getters = this.model.getters;
     renderer = this.get(RendererStore);
     constructor(get) {
         super(get);
@@ -8230,6 +8353,7 @@ function drawHighlight(renderingContext, highlight, rect) {
 }
 
 class HighlightStore extends SpreadsheetStore {
+    mutators = ["register", "unRegister"];
     providers = [];
     constructor(get) {
         super(get);
@@ -8260,7 +8384,7 @@ class HighlightStore extends SpreadsheetStore {
         this.providers.push(highlightProvider);
     }
     unRegister(highlightProvider) {
-        this.providers = this.providers.filter((h) => toRaw(h) !== toRaw(highlightProvider));
+        this.providers = this.providers.filter((h) => h !== highlightProvider);
     }
     drawLayer(ctx, layer) {
         if (layer === "Highlights") {
@@ -8276,6 +8400,16 @@ const NotificationStore = createAbstractStore("Notifications");
 
 const CELL_DELETED_MESSAGE = _t("The cell you are trying to edit has been deleted.");
 class ComposerStore extends SpreadsheetStore {
+    mutators = [
+        "startEdition",
+        "setCurrentContent",
+        "stopEdition",
+        "stopComposerRangeSelection",
+        "cancelEdition",
+        "cycleReferences",
+        "changeComposerCursorSelection",
+        "replaceComposerCursorSelection",
+    ];
     col = 0;
     row = 0;
     editionMode = "inactive";
@@ -8290,9 +8424,9 @@ class ComposerStore extends SpreadsheetStore {
     highlightStore = this.get(HighlightStore);
     constructor(get) {
         super(get);
-        this.highlightStore.register(toRaw(this));
+        this.highlightStore.register(this);
         this.onDispose(() => {
-            this.highlightStore.unRegister(toRaw(this));
+            this.highlightStore.unRegister(this);
         });
     }
     canStopEdition() {
@@ -8419,7 +8553,7 @@ class ComposerStore extends SpreadsheetStore {
                 if (this.isSelectingRange) {
                     this.editionMode = "editing";
                 }
-                this.model.selection.resetAnchor(toRaw(this), {
+                this.model.selection.resetAnchor(this, {
                     cell: { col: left, row: top },
                     zone: cmd.zone,
                 });
@@ -8437,7 +8571,7 @@ class ComposerStore extends SpreadsheetStore {
                         row: activePosition.row,
                     });
                     const zone = this.getters.expandZone(cmd.sheetIdTo, positionToZone({ col, row }));
-                    this.model.selection.resetAnchor(toRaw(this), { cell: { col, row }, zone });
+                    this.model.selection.resetAnchor(this, { cell: { col, row }, zone });
                 }
                 break;
             case "DELETE_SHEET":
@@ -8536,7 +8670,7 @@ class ComposerStore extends SpreadsheetStore {
     startComposerRangeSelection() {
         if (this.sheetId === this.getters.getActiveSheetId()) {
             const zone = positionToZone({ col: this.col, row: this.row });
-            this.model.selection.resetAnchor(toRaw(this), {
+            this.model.selection.resetAnchor(this, {
                 cell: { col: this.col, row: this.row },
                 zone,
             });
@@ -8565,7 +8699,7 @@ class ComposerStore extends SpreadsheetStore {
         this.setContent(str || this.initialContent, selection);
         this.colorIndexByRange = {};
         const zone = positionToZone({ col: this.col, row: this.row });
-        this.model.selection.capture(toRaw(this), { cell: { col: this.col, row: this.row }, zone }, {
+        this.model.selection.capture(this, { cell: { col: this.col, row: this.row }, zone }, {
             handleEvent: this.handleEvent.bind(this),
             release: () => {
                 this._stopEdition();
@@ -8673,7 +8807,7 @@ class ComposerStore extends SpreadsheetStore {
             return;
         }
         this.editionMode = "inactive";
-        this.model.selection.release(toRaw(this));
+        this.model.selection.release(this);
     }
     /**
      * Reset the current content to the active cell content
@@ -8995,6 +9129,7 @@ class ComposerStore extends SpreadsheetStore {
 }
 
 class ComposerFocusStore extends SpreadsheetStore {
+    mutators = ["focusTopBarComposer", "focusGridComposerContent", "focusGridComposerCell"];
     composerStore = this.get(ComposerStore);
     topBarFocus = "inactive";
     gridFocusMode = "inactive";
@@ -9511,8 +9646,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;
@@ -10082,6 +10217,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;
 }
 /**
@@ -10363,11 +10501,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;
     },
@@ -10388,8 +10531,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,
 };
@@ -11297,7 +11446,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);
             }
@@ -11927,7 +12076,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;
             }
@@ -11952,7 +12101,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;
             }
@@ -12499,7 +12648,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;
@@ -12528,7 +12677,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;
@@ -12833,7 +12982,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;
             }
@@ -12916,7 +13065,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;
             }
@@ -18668,6 +18817,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);
     }
@@ -19670,7 +19822,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;
@@ -19914,7 +20066,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;
     }
@@ -20435,7 +20587,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;
@@ -20550,7 +20702,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;
@@ -20752,7 +20904,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;
@@ -20838,13 +20990,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) => {
@@ -21451,6 +21596,7 @@ function interactiveAddMerge(env, sheetId, target) {
 }
 
 class HoveredCellStore extends SpreadsheetStore {
+    mutators = ["clear", "hover"];
     col;
     row;
     handle(cmd) {
@@ -21470,6 +21616,7 @@ class HoveredCellStore extends SpreadsheetStore {
 }
 
 class CellPopoverStore extends SpreadsheetStore {
+    mutators = ["open", "close"];
     persistentPopover;
     hoveredCell = this.get(HoveredCellStore);
     handle(cmd) {
@@ -25961,12 +26108,13 @@ function updateSelectionWithArrowKeys(ev, selection) {
 
 // The name is misleading and can be confused with the DOM focus.
 class FocusStore {
+    mutators = ["focus", "unfocus"];
     focusedElement = null;
     focus(element) {
         this.focusedElement = element;
     }
     unfocus(element) {
-        if (this.focusedElement && toRaw(this.focusedElement) === toRaw(element)) {
+        if (this.focusedElement && this.focusedElement === element) {
             this.focusedElement = null;
         }
     }
@@ -25982,6 +26130,16 @@ class FocusStore {
 class SelectionInputStore extends SpreadsheetStore {
     initialRanges;
     inputHasSingleRange;
+    mutators = [
+        "resetWithRanges",
+        "focusById",
+        "unfocus",
+        "addEmptyRange",
+        "removeRange",
+        "changeRange",
+        "reset",
+        "confirm",
+    ];
     ranges = [];
     focusedRangeIndex = null;
     inputSheetId;
@@ -26041,7 +26199,7 @@ class SelectionInputStore extends SpreadsheetStore {
                         row: 0,
                     });
                     const zone = this.getters.expandZone(cmd.sheetIdTo, positionToZone({ col, row }));
-                    this.model.selection.resetAnchor(toRaw(this), { cell: { col, row }, zone });
+                    this.model.selection.resetAnchor(this, { cell: { col, row }, zone });
                 }
                 break;
             }
@@ -26060,7 +26218,7 @@ class SelectionInputStore extends SpreadsheetStore {
                 if (focusIndex !== -1) {
                     this.focus(focusIndex);
                     const { left, top } = newZone;
-                    this.model.selection.resetAnchor(toRaw(this), {
+                    this.model.selection.resetAnchor(this, {
                         cell: { col: left, row: top },
                         zone: newZone,
                     });
@@ -26151,7 +26309,7 @@ class SelectionInputStore extends SpreadsheetStore {
     }
     get hasMainFocus() {
         const focusedElement = this.focusStore.focusedElement;
-        return !!focusedElement && toRaw(focusedElement) === toRaw(this);
+        return !!focusedElement && focusedElement === this;
     }
     get highlights() {
         if (!this.hasMainFocus) {
@@ -26180,7 +26338,7 @@ class SelectionInputStore extends SpreadsheetStore {
     unfocus() {
         this.focusedRangeIndex = null;
         this.focusStore.unfocus(this);
-        this.model.selection.release(toRaw(this));
+        this.model.selection.release(this);
     }
     captureSelection() {
         if (this.focusedRangeIndex === null) {
@@ -26189,7 +26347,7 @@ class SelectionInputStore extends SpreadsheetStore {
         const range = this.ranges[this.focusedRangeIndex];
         const sheetId = this.getters.getActiveSheetId();
         const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
-        this.model.selection.capture(toRaw(this), { cell: { col: zone.left, row: zone.top }, zone }, {
+        this.model.selection.capture(this, { cell: { col: zone.left, row: zone.top }, zone }, {
             handleEvent: this.handleEvent.bind(this),
             release: this.unfocus.bind(this),
         });
@@ -26665,7 +26823,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;
@@ -26694,15 +26852,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();
     }
@@ -26714,6 +26880,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
@@ -27657,6 +27824,7 @@ chartSidePanelComponentRegistry
 });
 
 class MainChartPanelStore extends SpreadsheetStore {
+    mutators = ["activatePanel"];
     panel = "configuration";
     activatePanel(panel) {
         this.panel = panel;
@@ -27907,6 +28075,7 @@ function useDragAndDropListItems() {
             state.itemsStyle = {};
             document.body.style.cursor = previousCursor;
             args.onCancel?.();
+            cleanUp();
         };
         const onDragEnd = (itemId, indexAtEnd) => {
             state.draggedItemId = undefined;
@@ -27927,7 +28096,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));
@@ -28004,7 +28174,7 @@ class DOMDndHelper {
         this.moveDraggedItemToPosition(this.currentMousePosition + this.scrollOffset);
     }
     onMouseMove(ev) {
-        if (ev.button !== -1) {
+        if (ev.button > 1) {
             this.onCancel();
             return;
         }
@@ -28195,14 +28365,14 @@ function useHoveredElement(ref) {
 
 function useHighlightsOnHover(ref, highlightProvider) {
     const hoverState = useHoveredElement(ref);
-    const env = useEnv();
+    const stores = useStoreProvider();
     useHighlights({
         get highlights() {
             return hoverState.hovered ? highlightProvider.highlights : [];
         },
     });
     useEffect(() => {
-        env.model.dispatch("RENDER_CANVAS");
+        stores.trigger("store-updated");
     }, () => [hoverState.hovered]);
 }
 function useHighlights(highlightProvider) {
@@ -29658,6 +29828,14 @@ var Direction;
     Direction[Direction["next"] = 1] = "next";
 })(Direction || (Direction = {}));
 class FindAndReplaceStore extends SpreadsheetStore {
+    mutators = [
+        "updateSearchOptions",
+        "updateSearchContent",
+        "searchFormulas",
+        "selectPreviousMatch",
+        "selectNextMatch",
+        "replace",
+    ];
     allSheetsMatches = [];
     activeSheetMatches = [];
     specificRangeMatches = [];
@@ -29682,11 +29860,11 @@ class FindAndReplaceStore extends SpreadsheetStore {
         this.initialShowFormulaState = this.model.getters.shouldShowFormulas();
         this.searchOptions.searchFormulas = this.initialShowFormulaState;
         const highlightStore = get(HighlightStore);
-        highlightStore.register(toRaw(this));
+        highlightStore.register(this);
         this.onDispose(() => {
             this.model.dispatch("SET_FORMULA_VISIBILITY", { show: this.initialShowFormulaState });
             this.updateSearchContent.stopDebounce();
-            highlightStore.unRegister(toRaw(this));
+            highlightStore.unRegister(this);
         });
     }
     get searchMatches() {
@@ -31166,14 +31344,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;
@@ -31194,7 +31372,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;
@@ -31329,6 +31522,7 @@ unGroupHeadersMenuRegistry
 });
 
 class DOMFocusableElementStore {
+    mutators = ["setFocusableElement", "focus"];
     focusableElement = undefined;
     setFocusableElement(element) {
         this.focusableElement = element;
@@ -32065,7 +32259,7 @@ class Composer extends Component {
         "Ctrl+Enter": this.processNewLineEvent,
         Escape: this.processEscapeKey,
         F2: () => console.warn("Not implemented"),
-        F4: this.processF4Key,
+        F4: (ev) => this.processF4Key(ev),
         Tab: (ev) => this.processTabKey(ev, "right"),
         "Shift+Tab": (ev) => this.processTabKey(ev, "left"),
     };
@@ -32187,7 +32381,8 @@ class Composer extends Component {
     processEscapeKey() {
         this.composerStore.cancelEdition();
     }
-    processF4Key() {
+    processF4Key(ev) {
+        ev.stopPropagation();
         this.composerStore.cycleReferences();
         this.processContent();
     }
@@ -34390,13 +34585,6 @@ class GridRenderer {
         this.getters = get(ModelStore).getters;
         this.renderer = get(RendererStore);
         this.renderer.register(this);
-        /**
-         * Mark the instance as raw to avoid reactivity as this class is instanciated
-         * as a Store by `useGridDrawing` (which casts it as reactive).
-         *
-         * Calling `this.` on a reactive instance is significantly slower than on a raw object.
-         */
-        markRaw(this);
     }
     get renderingLayers() {
         return ["Background", "Headers"];
@@ -35026,7 +35214,7 @@ class GridRenderer {
 function useGridDrawing(refName, model, canvasSize) {
     const canvasRef = useRef(refName);
     useEffect(drawGrid);
-    const rendererManager = useStore(RendererStore);
+    const rendererStore = useStore(RendererStore);
     useStore(GridRenderer);
     function drawGrid() {
         const canvas = canvasRef.el;
@@ -35054,7 +35242,11 @@ function useGridDrawing(refName, model, canvasSize) {
         ctx.scale(dpr, dpr);
         for (const layer of OrderedLayers()) {
             model.drawLayer(renderingContext, layer);
-            rendererManager.drawLayer(renderingContext, layer);
+            // @ts-ignore 'drawLayer' is not declated as a mutator because:
+            // it does not mutate anything. Most importantly it's used
+            // during rendering. Invoking a mutator during rendering would
+            // trigger another rendering, ultimately resulting in an infinite loop.
+            rendererStore.drawLayer(renderingContext, layer);
         }
     }
 }
@@ -35456,6 +35648,7 @@ class VerticalScrollBar extends Component {
 }
 
 class SidePanelStore extends SpreadsheetStore {
+    mutators = ["open", "toggle", "close"];
     initialPanelProps = {};
     componentTag = "";
     get isOpen() {
@@ -40982,12 +41175,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,
@@ -41158,16 +41345,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) {
@@ -43284,7 +43461,12 @@ class MergePlugin extends CorePlugin {
      * if they have at least a common cell
      */
     doesIntersectMerge(sheetId, zone) {
-        return positions(zone).some(({ col, row }) => this.getMerge({ sheetId, col, row }) !== undefined);
+        for (const merge of this.getMerges(sheetId)) {
+            if (overlap(zone, merge)) {
+                return true;
+            }
+        }
+        return false;
     }
     /**
      * Returns true if two columns have at least one merge in common
@@ -43900,6 +44082,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;
         }
@@ -47284,7 +47469,6 @@ class PositionSet {
  *
  */
 class SpreadingRelation {
-    createEmptyPositionSet;
     /**
      * Internal structure:
      * For something like
@@ -47315,9 +47499,6 @@ class SpreadingRelation {
      */
     resultsToArrayFormulas = new PositionMap();
     arrayFormulasToResults = new PositionMap();
-    constructor(createEmptyPositionSet) {
-        this.createEmptyPositionSet = createEmptyPositionSet;
-    }
     getFormulaPositionsSpreadingOn(resultPosition) {
         return this.resultsToArrayFormulas.get(resultPosition) || EMPTY_ARRAY;
     }
@@ -47336,13 +47517,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);
@@ -47363,7 +47544,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;
@@ -47440,7 +47621,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)
@@ -47929,16 +48110,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)
@@ -49604,62 +49791,6 @@ class AutomaticSumPlugin extends UIPlugin {
     }
 }
 
-/**
- * This is a generic event bus based on the Owl event bus.
- * This bus however ensures type safety across events and subscription callbacks.
- */
-class EventBus {
-    subscriptions = {};
-    /**
-     * Add a listener for the 'eventType' events.
-     *
-     * Note that the 'owner' of this event can be anything, but will more likely
-     * be a component or a class. The idea is that the callback will be called with
-     * the proper owner bound.
-     *
-     * Also, the owner should be kind of unique. This will be used to remove the
-     * listener.
-     */
-    on(type, owner, callback) {
-        if (!callback) {
-            throw new Error("Missing callback");
-        }
-        if (!this.subscriptions[type]) {
-            this.subscriptions[type] = [];
-        }
-        this.subscriptions[type].push({
-            owner,
-            callback,
-        });
-    }
-    /**
-     * Emit an event of type 'eventType'.  Any extra arguments will be passed to
-     * the listeners callback.
-     */
-    trigger(type, payload) {
-        const subs = this.subscriptions[type] || [];
-        for (let i = 0, iLen = subs.length; i < iLen; i++) {
-            const sub = subs[i];
-            sub.callback.call(sub.owner, payload);
-        }
-    }
-    /**
-     * Remove a listener
-     */
-    off(eventType, owner) {
-        const subs = this.subscriptions[eventType];
-        if (subs) {
-            this.subscriptions[eventType] = subs.filter((s) => s.owner !== owner);
-        }
-    }
-    /**
-     * Remove all subscriptions.
-     */
-    clear() {
-        this.subscriptions = {};
-    }
-}
-
 /*
  * This file contains the specifics transformations
  */
@@ -51984,7 +52115,7 @@ class ClipboardPlugin extends UIPlugin {
     paintFormatStatus = "inactive";
     originSheetId;
     copiedData;
-    _isCutOperation;
+    _isCutOperation = false;
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
@@ -51996,14 +52127,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();
@@ -52021,13 +52155,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") {
@@ -52045,23 +52179,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";
@@ -52082,9 +52220,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,
                     });
                 }
@@ -52099,9 +52237,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,
                     });
                 }
@@ -52117,20 +52255,20 @@ 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": {
                 this.status = "invisible";
                 // If we add a col/row inside or before the cut area, we invalidate the clipboard
-                if (this._isCutOperation !== true) {
+                if (this._isCutOperation !== true || cmd.sheetId !== this.copiedData?.sheetId) {
                     return;
                 }
                 const isClipboardDirty = this.isColRowDirtyingClipboard(cmd.position === "before" ? cmd.base : cmd.base + 1, cmd.dimension);
@@ -52142,7 +52280,7 @@ class ClipboardPlugin extends UIPlugin {
             case "REMOVE_COLUMNS_ROWS": {
                 this.status = "invisible";
                 // If we remove a col/row inside or before the cut area, we invalidate the clipboard
-                if (this._isCutOperation !== true) {
+                if (this._isCutOperation !== true || cmd.sheetId !== this.copiedData?.sheetId) {
                     return;
                 }
                 for (let el of cmd.elements) {
@@ -52156,7 +52294,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,
                 });
@@ -52164,7 +52303,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";
@@ -52195,7 +52334,6 @@ class ClipboardPlugin extends UIPlugin {
         }
     }
     convertOSClipboardData(clipboardData) {
-        this._isCutOperation = false;
         const handlers = clipboardHandlersRegistries.figureHandlers
             .getAll()
             .map((handler) => new handler(this.getters, this.dispatch));
@@ -52233,7 +52371,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;
@@ -52256,9 +52393,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);
@@ -52266,8 +52402,8 @@ class ClipboardPlugin extends UIPlugin {
         }
         return copiedData;
     }
-    paste(zones, options) {
-        if (!this.copiedData) {
+    paste(zones, copiedData, options) {
+        if (!copiedData) {
             return;
         }
         let zone = undefined;
@@ -52275,12 +52411,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;
             }
@@ -52296,7 +52429,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;
         }
@@ -54766,6 +54899,7 @@ class BottomBarSheet extends Component {
     sheetDivRef = useRef("sheetDiv");
     sheetNameRef = useRef("sheetNameSpan");
     editionState = "initializing";
+    DOMFocusableElementStore;
     setup() {
         onMounted(() => {
             if (this.isSheetActive) {
@@ -54778,6 +54912,7 @@ class BottomBarSheet extends Component {
                 this.focusInputAndSelectContent();
             }
         });
+        this.DOMFocusableElementStore = useStore(DOMFocusableElementStore);
     }
     focusInputAndSelectContent() {
         if (!this.state.isEditing || !this.sheetNameRef.el)
@@ -54819,9 +54954,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) {
@@ -56777,16 +56914,25 @@ class Spreadsheet extends Component {
             }
         }, () => [this.env.model.getters.getActiveSheetId()]);
         useExternalListener(window, "resize", () => this.render(true));
+        // For some reason, the wheel event is not properly registered inside templates
+        // in Chromium-based browsers based on chromium 125
+        // This hack ensures the event declared in the template is properly registered/working
+        useExternalListener(document.body, "wheel", () => { });
         this.bindModelEvents();
         onWillUpdateProps((nextProps) => {
             if (nextProps.model !== this.props.model) {
                 throw new Error("Changing the props model is not supported at the moment.");
             }
         });
+        const render = batched(this.render.bind(this, true));
         onMounted(() => {
             this.checkViewportSize();
+            stores.on("store-updated", this, render);
+        });
+        onWillUnmount(() => {
+            this.unbindModelEvents();
+            stores.off("store-updated", this);
         });
-        onWillUnmount(() => this.unbindModelEvents());
         onPatched(() => {
             this.checkViewportSize();
         });
@@ -59535,7 +59681,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);
@@ -60574,6 +60724,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.7";
-__info__.date = "2024-05-15T09:20:44.429Z";
-__info__.hash = "57e89fa";
+__info__.version = "17.2.9";
+__info__.date = "2024-06-03T14:56:21.684Z";
+__info__.hash = "086af6d";