npm - @odoo/o-spreadsheet - Versions diffs - 17.1.0-alpha.2 → 17.1.0-alpha.4 - Mend

@odoo/o-spreadsheet 17.1.0-alpha.2 → 17.1.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/o-spreadsheet.cjs.js +818 -668
package/dist/o-spreadsheet.d.ts +169 -191
package/dist/o-spreadsheet.esm.js +817 -669
package/dist/o-spreadsheet.iife.js +818 -668
package/dist/o-spreadsheet.iife.min.js +322 -348
package/dist/o_spreadsheet.xml +99 -61
package/package.json +1 -1

package/dist/o-spreadsheet.cjs.js CHANGED Viewed

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.1.0-alpha.2
- * @date 2023-11-03T12:24:57.341Z
- * @hash 0595868
+ * @version 17.1.0-alpha.4
+ * @date 2023-11-24T13:12:24.882Z
+ * @hash 255821b
  */
 'use strict';
@@ -229,7 +229,6 @@ const DEFAULT_CELL_HEIGHT = 23;
 const SCROLLBAR_WIDTH = 15;
 const AUTOFILL_EDGE_LENGTH = 8;
 const ICON_EDGE_LENGTH = 18;
-const UNHIDE_ICON_EDGE_LENGTH = 14;
 const MIN_CF_ICON_MARGIN = 4;
 const MIN_CELL_TEXT_MARGIN = 4;
 const CF_ICON_EDGE_LENGTH = 15;
@@ -693,8 +692,7 @@ function removeFalsyAttributes(obj) {
  *
  * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
  */
-const whiteSpaceCharacters = [
-    " ",
+const whiteSpaceSpecialCharacters = [
     "\t",
     "\f",
     "\v",
@@ -709,8 +707,7 @@ const whiteSpaceCharacters = [
     String.fromCharCode(parseInt("3000", 16)),
     String.fromCharCode(parseInt("feff", 16)),
 ];
-const whiteSpaceRegexp = new RegExp(whiteSpaceCharacters.join("|"), "g");
-const newLineRegex = /\r\n|\r|\n/g;
+const whiteSpaceRegexp = new RegExp(whiteSpaceSpecialCharacters.join("|") + "|(\r\n|\r|\n)", "g");
 /**
  * Replace all the special spaces in a string (non-breaking, tabs, ...) by normal spaces, and all the
  * different newlines types by \n.
@@ -718,9 +715,9 @@ const newLineRegex = /\r\n|\r|\n/g;
 function replaceSpecialSpaces(text) {
     if (!text)
         return "";
-    text = text.replace(whiteSpaceRegexp, " ");
-    text = text.replace(newLineRegex, NEWLINE);
-    return text;
+    if (!whiteSpaceRegexp.test(text))
+        return text;
+    return text.replace(whiteSpaceRegexp, (match, newLine) => (newLine ? NEWLINE : " "));
 }
 /**
  * Determine if the numbers are consecutive.
@@ -2062,6 +2059,7 @@ exports.CommandResult = void 0;
     CommandResult["InvalidNumberOfCriterionValues"] = "InvalidNumberOfCriterionValues";
     CommandResult["BlockingValidationRule"] = "BlockingValidationRule";
     CommandResult["InvalidCopyPasteSelection"] = "InvalidCopyPasteSelection";
+    CommandResult["NoChanges"] = "NoChanges";
 })(exports.CommandResult || (exports.CommandResult = {}));
 const DEFAULT_LOCALES = [
@@ -2191,12 +2189,12 @@ function toString(value) {
     }
 }
 /** Normalize string by setting it to lowercase and replacing accent letters with plain letters */
-function normalizeString(str) {
+const normalizeString = memoize(function normalizeString(str) {
     return str
         .toLowerCase()
         .normalize("NFD")
         .replace(/[\u0300-\u036f]/g, "");
-}
+});
 const expectBooleanValueError = (value) => _t("The function [[FUNCTION_NAME]] expects a boolean value, but '%s' is a text, and cannot be coerced to a number.", value);
 function toBoolean(value) {
     switch (typeof value) {
@@ -3429,11 +3427,18 @@ function isSingleCellReference(xc) {
     return singleCellReference.test(xc);
 }
 function splitReference(ref) {
+    if (!ref.includes("!")) {
+        return { xc: ref };
+    }
     const parts = ref.split("!");
     const xc = parts.pop();
     const sheetName = getUnquotedSheetName(parts.join("!")) || undefined;
     return { sheetName, xc };
 }
+/** Return a reference SheetName!xc from the given arguments */
+function getFullReference(sheetName, xc) {
+    return sheetName !== undefined ? `${getCanonicalSheetName(sheetName)}!${xc}` : xc;
+}
 /**
  * Convert from a cartesian reference to a Zone
@@ -4542,14 +4547,14 @@ function drawDecoratedText(context, text, position, underline = false, strikethr
     switch (context.textBaseline) {
         case "top":
             underlineY += boxHeight - 2 * strokeWidth;
-            strikeY += boxHeight - textHeight;
+            strikeY += boxHeight / 2 - strokeWidth;
             break;
         case "middle":
             underlineY += boxHeight / 2 - strokeWidth;
             break;
         case "alphabetic":
             underlineY += 2 * strokeWidth;
-            strikeY -= textHeight / 2 - strokeWidth / 2;
+            strikeY -= 3 * strokeWidth;
             break;
         case "bottom":
             underlineY = y;
@@ -4612,6 +4617,7 @@ function createAction(item) {
     const children = item.children;
     const description = item.description;
     const icon = item.icon;
+    const secondaryIcon = item.secondaryIcon;
     return {
         id: item.id || uuidGenerator$2.uuidv4(),
         name: typeof name === "function" ? name : () => name,
@@ -4630,6 +4636,7 @@ function createAction(item) {
         isReadonlyAllowed: item.isReadonlyAllowed || false,
         separator: item.separator || false,
         icon: typeof icon === "function" ? icon : () => icon || "",
+        secondaryIcon: typeof secondaryIcon === "function" ? secondaryIcon : () => secondaryIcon || "",
         description: typeof description === "function" ? description : () => description || "",
         textColor: item.textColor,
         sequence: item.sequence || 0,
@@ -5968,7 +5975,7 @@ autofillModifiersRegistry
             return { cellData: {} };
         }
         const sheetId = data.sheetId;
-        const content = getters.getTranslatedCellFormula(sheetId, x, y, cell.compiledFormula, cell.dependencies);
+        const content = getters.getTranslatedCellFormula(sheetId, x, y, cell.compiledFormula);
         return {
             cellData: {
                 border: data.border,
@@ -6985,11 +6992,9 @@ css /* scss */ `
     padding: ${MENU_VERTICAL_PADDING}px 0px;
     width: ${MENU_WIDTH}px;
     box-sizing: border-box !important;
+    user-select: none;
     .o-menu-item {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
       box-sizing: border-box;
       height: ${MENU_ITEM_HEIGHT}px;
       padding: ${MENU_ITEM_PADDING_VERTICAL}px ${MENU_ITEM_PADDING_HORIZONTAL}px;
@@ -7000,20 +7005,12 @@ css /* scss */ `
         min-width: 40%;
       }
-      &.o-menu-root {
-        display: flex;
-        justify-content: space-between;
-      }
       .o-menu-item-icon {
         display: inline-block;
         margin: 0px 8px 0px 0px;
         width: ${MENU_ITEM_HEIGHT - 2 * MENU_ITEM_PADDING_VERTICAL}px;
         line-height: ${MENU_ITEM_HEIGHT - 2 * MENU_ITEM_PADDING_VERTICAL}px;
       }
-      .o-menu-item-root {
-        width: 10px;
-      }
       &:not(.disabled) {
         &:hover,
@@ -7356,7 +7353,7 @@ function tokenize(str, locale = DEFAULT_LOCALE) {
     return result;
 }
 function tokenizeDebugger(chars) {
-    if (chars.current() === "?") {
+    if (chars.current === "?") {
         chars.shift();
         return { type: "DEBUGGER", value: "?" };
     }
@@ -7367,7 +7364,7 @@ const misc$1 = {
     ")": "RIGHT_PAREN",
 };
 function tokenizeMisc(chars) {
-    if (chars.current() in misc$1) {
+    if (chars.current in misc$1) {
         const value = chars.shift();
         const type = misc$1[value];
         return { type, value };
@@ -7375,7 +7372,7 @@ function tokenizeMisc(chars) {
     return null;
 }
 function tokenizeArgsSeparator(chars, locale) {
-    if (chars.current() === locale.formulaArgSeparator) {
+    if (chars.current === locale.formulaArgSeparator) {
         const value = chars.shift();
         const type = "ARG_SEPARATOR";
         return { type, value };
@@ -7400,14 +7397,13 @@ function tokenizeNumber(chars, locale) {
     return null;
 }
 function tokenizeString(chars) {
-    if (chars.current() === '"') {
+    if (chars.current === '"') {
         const startChar = chars.shift();
         let letters = startChar;
-        while (chars.current() &&
-            (chars.current() !== startChar || letters[letters.length - 1] === "\\")) {
+        while (chars.current && (chars.current !== startChar || letters[letters.length - 1] === "\\")) {
             letters += chars.shift();
         }
-        if (chars.current() === '"') {
+        if (chars.current === '"') {
             letters += chars.shift();
         }
         return {
@@ -7434,14 +7430,14 @@ function tokenizeSymbol(chars) {
     let result = "";
     // there are two main cases to manage: either something which starts with
     // a ', like 'Sheet 2'A2, or a word-like element.
-    if (chars.current() === "'") {
+    if (chars.current === "'") {
         let lastChar = chars.shift();
         result += lastChar;
-        while (chars.current()) {
+        while (chars.current) {
             lastChar = chars.shift();
             result += lastChar;
             if (lastChar === "'") {
-                if (chars.current() && chars.current() === "'") {
+                if (chars.current && chars.current === "'") {
                     lastChar = chars.shift();
                     result += lastChar;
                 }
@@ -7457,7 +7453,7 @@ function tokenizeSymbol(chars) {
             };
         }
     }
-    while (chars.current() && separatorRegexp.test(chars.current())) {
+    while (chars.current && separatorRegexp.test(chars.current)) {
         result += chars.shift();
     }
     if (result.length) {
@@ -7472,14 +7468,14 @@ function tokenizeSymbol(chars) {
 }
 function tokenizeSpace(chars) {
     let length = 0;
-    while (chars.current() === NEWLINE) {
+    while (chars.current === NEWLINE) {
         length++;
         chars.shift();
     }
     if (length) {
         return { type: "SPACE", value: NEWLINE.repeat(length) };
     }
-    while (chars.current() === " ") {
+    while (chars.current === " ") {
         length++;
         chars.shift();
     }
@@ -7498,17 +7494,20 @@ function tokenizeInvalidRange(chars) {
 class TokenizingChars {
     text;
     currentIndex = 0;
+    current;
     constructor(text) {
         this.text = text;
-    }
-    current() {
-        return this.text[this.currentIndex];
+        this.current = text[0];
     }
     shift() {
-        return this.text[this.currentIndex++];
+        const current = this.current;
+        const next = this.text[++this.currentIndex];
+        this.current = next;
+        return current;
     }
     advanceBy(length) {
         this.currentIndex += length;
+        this.current = this.text[this.currentIndex];
     }
     isOver() {
         return this.currentIndex >= this.text.length;
@@ -10720,6 +10719,17 @@ const SELECTION_CONTAINS_FILTER = (env) => {
 const IS_ONLY_ONE_RANGE = (env) => {
     return env.model.getters.getSelectedZones().length === 1;
 };
+const CAN_INSERT_HEADER = (env, dimension) => {
+    if (!IS_ONLY_ONE_RANGE(env)) {
+        return false;
+    }
+    const activeHeaders = dimension === "COL" ? env.model.getters.getActiveCols() : env.model.getters.getActiveRows();
+    const ortogonalActiveHeaders = dimension === "COL" ? env.model.getters.getActiveRows() : env.model.getters.getActiveCols();
+    const sheetId = env.model.getters.getActiveSheetId();
+    const zone = env.model.getters.getSelectedZone();
+    const allSheetSelected = isEqual(zone, env.model.getters.getSheetZone(sheetId));
+    return isConsecutive(activeHeaders) && (ortogonalActiveHeaders.size === 0 || allSheetSelected);
+};
 const undo = {
     name: _t("Undo"),
@@ -11301,7 +11311,7 @@ const EXPAND = {
     ) {
         const _array = toMatrix(arg);
         const _nbRows = toInteger(rows?.value, this.locale);
-        const _nbColumns = columns !== undefined ? toInteger(columns.value, this.local) : _array.length;
+        const _nbColumns = columns !== undefined ? toInteger(columns.value, this.locale) : _array.length;
         assert(() => _nbRows >= _array[0].length, _t("The rows arguments (%s) must be greater or equal than the number of rows of the array.", _nbRows.toString()));
         assert(() => _nbColumns >= _array.length, _t("The columns arguments (%s) must be greater or equal than the number of columns of the array.", _nbColumns.toString()));
         return generateMatrix(_nbColumns, _nbRows, (col, row) => col >= _array.length || row >= _array[col].length ? padWith : _array[col][row]);
@@ -11790,6 +11800,10 @@ var misc = /*#__PURE__*/Object.freeze({
   FORMAT_LARGE_NUMBER: FORMAT_LARGE_NUMBER
 });
+function sum(values, locale) {
+    return reduceNumbers(values, (acc, a) => acc + a, 0, locale);
+}
 const DEFAULT_FACTOR = 1;
 const DEFAULT_MODE = 0;
 const DEFAULT_PLACES = 0;
@@ -12741,7 +12755,7 @@ const SUM = {
         return isMatrix(value1) ? value1[0][0]?.format : value1?.format;
     },
     compute: function (...values) {
-        return reduceNumbers(values, (acc, a) => acc + a, 0, this.locale);
+        return sum(values, this.locale);
     },
     isExported: true,
 };
@@ -12910,6 +12924,44 @@ function assertSameNumberOfElements(...args) {
     const dims = args[0].length;
     args.forEach((arg, i) => assert(() => arg.length === dims, _t("[[FUNCTION_NAME]] has mismatched dimensions for argument %s (%s vs %s).", i.toString(), dims.toString(), arg.length.toString())));
 }
+function average(values, locale) {
+    let count = 0;
+    const sum = reduceNumbers(values, (acc, a) => {
+        count += 1;
+        return acc + a;
+    }, 0, locale);
+    assert(() => count !== 0, _t("Evaluation of function [[FUNCTION_NAME]] caused a divide by zero error."));
+    return sum / count;
+}
+function countNumbers(values, locale) {
+    let count = 0;
+    for (let n of values) {
+        if (isMatrix(n)) {
+            for (let i of n) {
+                for (let j of i) {
+                    if (typeof j === "number") {
+                        count += 1;
+                    }
+                }
+            }
+        }
+        else if (typeof n !== "string" || isNumber(n, locale) || parseDateTime(n, locale)) {
+            count += 1;
+        }
+    }
+    return count;
+}
+function countAny(values) {
+    return reduceAny(values, (acc, a) => (a !== undefined && a !== null ? acc + 1 : acc), 0);
+}
+function max(values, locale) {
+    const result = reduceNumbers(values, (acc, a) => (acc < a ? a : acc), -Infinity, locale);
+    return result === -Infinity ? 0 : result;
+}
+function min(values, locale) {
+    const result = reduceNumbers(values, (acc, a) => (a < acc ? a : acc), Infinity, locale);
+    return result === Infinity ? 0 : result;
+}
 function filterAndFlatData(dataY, dataX) {
     const _flatDataY = [];
@@ -13180,13 +13232,7 @@ const AVERAGE = {
         return isMatrix(value1) ? value1[0][0]?.format : value1?.format;
     },
     compute: function (...values) {
-        let count = 0;
-        const sum = reduceNumbers(values, (acc, a) => {
-            count += 1;
-            return acc + a;
-        }, 0, this.locale);
-        assert(() => count !== 0, _t("Evaluation of function [[FUNCTION_NAME]] caused a divide by zero error."));
-        return sum / count;
+        return average(values, this.locale);
     },
     isExported: true,
 };
@@ -13344,24 +13390,7 @@ const COUNT = {
     ],
     returns: ["NUMBER"],
     compute: function (...values) {
-        let count = 0;
-        for (let n of values) {
-            if (isMatrix(n)) {
-                for (let i of n) {
-                    for (let j of i) {
-                        if (typeof j === "number") {
-                            count += 1;
-                        }
-                    }
-                }
-            }
-            else if (typeof n !== "string" ||
-                isNumber(n, this.locale) ||
-                parseDateTime(n, this.locale)) {
-                count += 1;
-            }
-        }
-        return count;
+        return countNumbers(values, this.locale);
     },
     isExported: true,
 };
@@ -13376,7 +13405,7 @@ const COUNTA = {
     ],
     returns: ["NUMBER"],
     compute: function (...values) {
-        return reduceAny(values, (acc, a) => (a !== undefined && a !== null ? acc + 1 : acc), 0);
+        return countAny(values);
     },
     isExported: true,
 };
@@ -13606,8 +13635,7 @@ const MAX = {
         return isMatrix(value1) ? value1[0][0]?.format : value1?.format;
     },
     compute: function (...values) {
-        const result = reduceNumbers(values, (acc, a) => (acc < a ? a : acc), -Infinity, this.locale);
-        return result === -Infinity ? 0 : result;
+        return max(values, this.locale);
     },
     isExported: true,
 };
@@ -13694,8 +13722,7 @@ const MIN = {
         return isMatrix(value1) ? value1[0][0]?.format : value1?.format;
     },
     compute: function (...values) {
-        const result = reduceNumbers(values, (acc, a) => (a < acc ? a : acc), Infinity, this.locale);
-        return result === Infinity ? 0 : result;
+        return min(values, this.locale);
     },
     isExported: true,
 };
@@ -17866,6 +17893,149 @@ var financial = /*#__PURE__*/Object.freeze({
   YIELDMAT: YIELDMAT
 });
+/**
+ * Change the reference types inside the given token, if the token represent a range or a cell
+ *
+ * Eg. :
+ *   A1 => $A$1 => A$1 => $A1 => A1
+ *   A1:$B$1 => $A$1:B$1 => A$1:$B1 => $A1:B1 => A1:$B$1
+ */
+function loopThroughReferenceType(token) {
+    if (token.type !== "REFERENCE")
+        return token;
+    const { xc, sheetName } = splitReference(token.value);
+    const [left, right] = xc.split(":");
+    const updatedLeft = getTokenNextReferenceType(left);
+    const updatedRight = right ? `:${getTokenNextReferenceType(right)}` : "";
+    return { ...token, value: getFullReference(sheetName, updatedLeft + updatedRight) };
+}
+/**
+ * Get a new token with a changed type of reference from the given cell token symbol.
+ * Undefined behavior if given a token other than a cell or if the Xc contains a sheet reference
+ *
+ * A1 => $A$1 => A$1 => $A1 => A1
+ */
+function getTokenNextReferenceType(xc) {
+    switch (getReferenceType(xc)) {
+        case "none":
+            xc = setXcToFixedReferenceType(xc, "colrow");
+            break;
+        case "colrow":
+            xc = setXcToFixedReferenceType(xc, "row");
+            break;
+        case "row":
+            xc = setXcToFixedReferenceType(xc, "col");
+            break;
+        case "col":
+            xc = setXcToFixedReferenceType(xc, "none");
+            break;
+    }
+    return xc;
+}
+/**
+ * Returns the given XC with the given reference type. The XC string should not contain a sheet name.
+ */
+function setXcToFixedReferenceType(xc, referenceType) {
+    if (xc.includes("!")) {
+        throw new Error("The given XC should not contain a sheet name");
+    }
+    xc = xc.replace(/\$/g, "");
+    let indexOfNumber;
+    switch (referenceType) {
+        case "col":
+            return "$" + xc;
+        case "row":
+            indexOfNumber = xc.search(/[0-9]/);
+            return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
+        case "colrow":
+            indexOfNumber = xc.search(/[0-9]/);
+            xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
+            return "$" + xc;
+        case "none":
+            return xc;
+    }
+}
+/**
+ * Return the type of reference used in the given XC of a cell.
+ * Undefined behavior if the XC have a sheet reference
+ */
+function getReferenceType(xcCell) {
+    if (isColAndRowFixed(xcCell)) {
+        return "colrow";
+    }
+    else if (isColFixed(xcCell)) {
+        return "col";
+    }
+    else if (isRowFixed(xcCell)) {
+        return "row";
+    }
+    return "none";
+}
+function isColFixed(xc) {
+    return xc.startsWith("$");
+}
+function isRowFixed(xc) {
+    return xc.includes("$", 1);
+}
+function isColAndRowFixed(xc) {
+    return xc.startsWith("$") && xc.length > 1 && xc.slice(1).includes("$");
+}
+// -----------------------------------------------------------------------------
+// CELL
+// -----------------------------------------------------------------------------
+// NOTE: missing from Excel: "color", "filename", "parentheses", "prefix", "protect" and "width"
+const CELL_INFO_TYPES = ["address", "col", "contents", "format", "row", "type"];
+const CELL = {
+    description: _t("Gets information about a cell."),
+    args: [
+        arg("info_type (string)", _t("The type of information requested. Can be one of %s", CELL_INFO_TYPES.join(", "))),
+        arg("reference (meta)", _t("The reference to the cell.")),
+    ],
+    returns: ["ANY"],
+    compute: function (info, reference) {
+        const _info = toString(info).toLowerCase();
+        assert(() => CELL_INFO_TYPES.includes(_info), _t("The info_type should be one of %s.", CELL_INFO_TYPES.join(", ")));
+        const sheetId = this.__originSheetId;
+        const topLeftReference = reference.includes(":") ? reference.split(":")[0] : reference;
+        let { sheetName, xc } = splitReference(topLeftReference);
+        // only put the sheet name if the referenced range is in another sheet than the cell the formula is on
+        sheetName = sheetName === this.getters.getSheetName(sheetId) ? undefined : sheetName;
+        const fixedRef = getFullReference(sheetName, setXcToFixedReferenceType(xc, "colrow"));
+        const range = this.getters.getRangeFromSheetXC(sheetId, fixedRef);
+        switch (_info) {
+            case "address":
+                return this.getters.getRangeString(range, sheetId);
+            case "col":
+                return range.zone.left + 1;
+            case "contents": {
+                const position = { sheetId: range.sheetId, col: range.zone.left, row: range.zone.top };
+                return this.getters.getEvaluatedCell(position).value;
+            }
+            case "format": {
+                const position = { sheetId: range.sheetId, col: range.zone.left, row: range.zone.top };
+                return this.getters.getEvaluatedCell(position).format || "";
+            }
+            case "row":
+                return range.zone.top + 1;
+            case "type": {
+                const position = { sheetId: range.sheetId, col: range.zone.left, row: range.zone.top };
+                const type = this.getters.getEvaluatedCell(position).type;
+                if (type === CellValueType.empty) {
+                    return "b"; // blank
+                }
+                else if (type === CellValueType.text) {
+                    return "l"; // label
+                }
+                else {
+                    return "v"; // value
+                }
+            }
+        }
+        return "";
+    },
+    isExported: true,
+};
 // -----------------------------------------------------------------------------
 // ISERR
 // -----------------------------------------------------------------------------
@@ -18021,6 +18191,7 @@ const NA = {
 var info = /*#__PURE__*/Object.freeze({
   __proto__: null,
+  CELL: CELL,
   ISBLANK: ISBLANK,
   ISERR: ISERR,
   ISERROR: ISERROR,
@@ -18312,7 +18483,7 @@ const ADDRESS = {
             cellReference = rowPart + colPart;
         }
         if (sheet !== undefined) {
-            return `${getCanonicalSheetName(toString(sheet))}!${cellReference}`;
+            return getFullReference(toString(sheet), cellReference);
         }
         return cellReference;
     },
@@ -18328,7 +18499,7 @@ const COLUMN = {
     ],
     returns: ["NUMBER"],
     compute: function (cellReference) {
-        const _cellReference = cellReference || this.__originCellXC?.();
+        const _cellReference = cellReference || this.__originCellXC();
         assert(() => !!_cellReference, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
         const zone = toZone(_cellReference);
         return zone.left + 1;
@@ -18495,7 +18666,7 @@ const ROW = {
     ],
     returns: ["NUMBER"],
     compute: function (cellReference) {
-        cellReference = cellReference || this.__originCellXC?.();
+        cellReference = cellReference || this.__originCellXC();
         assert(() => !!cellReference, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
         const zone = toZone(cellReference);
         return zone.top + 1;
@@ -19397,9 +19568,7 @@ const insertRow = {
         const number = getRowsNumber(env);
         return number === 1 ? _t("Insert row") : _t("Insert %s rows", number.toString());
     },
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW",
 };
 const rowInsertRowBefore = {
@@ -19408,9 +19577,7 @@ const rowInsertRowBefore = {
         return number === 1 ? _t("Insert row above") : _t("Insert %s rows above", number.toString());
     },
     execute: INSERT_ROWS_BEFORE_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW_BEFORE",
 };
 const topBarInsertRowsBefore = {
@@ -19441,9 +19608,7 @@ const rowInsertRowsAfter = {
         const number = getRowsNumber(env);
         return number === 1 ? _t("Insert row below") : _t("Insert %s rows below", number.toString());
     },
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW_AFTER",
 };
 const topBarInsertRowsAfter = {
@@ -19461,9 +19626,7 @@ const insertCol = {
         const number = getColumnsNumber(env);
         return number === 1 ? _t("Insert column") : _t("Insert %s columns", number.toString());
     },
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL",
 };
 const colInsertColsBefore = {
@@ -19474,9 +19637,7 @@ const colInsertColsBefore = {
             : _t("Insert %s columns left", number.toString());
     },
     execute: INSERT_COLUMNS_BEFORE_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL_BEFORE",
 };
 const topBarInsertColsBefore = {
@@ -19509,9 +19670,7 @@ const colInsertColsAfter = {
             : _t("Insert %s columns right", number.toString());
     },
     execute: INSERT_COLUMNS_AFTER_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL_AFTER",
 };
 const topBarInsertColsAfter = {
@@ -23852,38 +24011,72 @@ css /* scss */ `
       }
       .o-input-count {
         width: fit-content;
-        padding: 4 0 4 4;
+        padding: 4px 0 4px 4px;
       }
     }
   }
 `;
 class FindAndReplacePanel extends owl.Component {
     static template = "o-spreadsheet-FindAndReplacePanel";
-    state = owl.useState(this.initialState());
+    static components = { SelectionInput };
     debounceTimeoutId;
-    showFormulaState = false;
+    initialShowFormulaState = false;
+    dataRange = "";
     searchInput = owl.useRef("searchInput");
+    replaceInput = owl.useRef("replaceInput");
     get hasSearchResult() {
         return this.env.model.getters.getCurrentSelectedMatchIndex() !== null;
     }
     get pendingSearch() {
         return this.debounceTimeoutId !== undefined;
     }
+    get searchOptions() {
+        return this.env.model.getters.getSearchOptions();
+    }
+    get toSearch() {
+        return this.searchInput.el?.value || "";
+    }
+    get toReplace() {
+        return this.replaceInput.el?.value || "";
+    }
+    get allSheetsMatchesCount() {
+        return _t("%s in all sheets", this.env.model.getters.getAllSheetMatchesCount());
+    }
+    get currentSheetMatchesCount() {
+        return _t("%(matches)s in sheet %(sheetName)s", {
+            matches: this.env.model.getters.getActiveSheetMatchesCount(),
+            sheetName: this.env.model.getters.getSheetName(this.env.model.getters.getActiveSheetId()),
+        });
+    }
+    get specificRangeMatchesCount() {
+        const range = this.searchOptions.specificRange;
+        if (!range) {
+            return "";
+        }
+        const { _sheetId, _zone } = range;
+        return _t("%(matches)s in range %(range)s of sheet %(sheetName)s", {
+            matches: this.env.model.getters.getSpecificRangeMatchesCount().toString(),
+            range: zoneToXc(_zone),
+            sheetName: this.env.model.getters.getSheetName(_sheetId),
+        });
+    }
     setup() {
-        this.showFormulaState = this.env.model.getters.shouldShowFormulas();
+        this.initialShowFormulaState = this.env.model.getters.shouldShowFormulas();
         owl.onMounted(() => this.searchInput.el?.focus());
         owl.onWillUnmount(() => {
             clearTimeout(this.debounceTimeoutId);
             this.env.model.dispatch("CLEAR_SEARCH");
-            this.env.model.dispatch("SET_FORMULA_VISIBILITY", { show: this.showFormulaState });
+            this.env.model.dispatch("SET_FORMULA_VISIBILITY", { show: this.initialShowFormulaState });
         });
         owl.useEffect(() => {
-            this.state.searchOptions.searchFormulas = this.env.model.getters.shouldShowFormulas();
-            this.searchFormulas();
+            const showFormula = this.env.model.getters.shouldShowFormulas();
+            this.updateSearch({ searchFormulas: showFormula });
         }, () => [this.env.model.getters.shouldShowFormulas()]);
     }
-    onInput(ev) {
-        this.state.toSearch = ev.target.value;
+    onFocusSearch() {
+        this.updateDataRange();
+    }
+    onInput() {
         this.debouncedUpdateSearch();
     }
     onKeydownSearch(ev) {
@@ -23900,11 +24093,36 @@ class FindAndReplacePanel extends owl.Component {
             this.replace();
         }
     }
-    searchFormulas() {
+    searchFormulas(ev) {
+        const showFormula = ev.target.checked;
         this.env.model.dispatch("SET_FORMULA_VISIBILITY", {
-            show: this.state.searchOptions.searchFormulas,
+            show: showFormula,
         });
-        this.updateSearch();
+        this.updateSearch({ searchFormulas: showFormula });
+    }
+    searchExactMatch(ev) {
+        const exactMatch = ev.target.checked;
+        this.updateSearch({ exactMatch });
+    }
+    searchMatchCase(ev) {
+        const matchCase = ev.target.checked;
+        this.updateSearch({ matchCase });
+    }
+    changeSearchScope(ev) {
+        const searchScope = ev.target.value;
+        this.updateSearch({ searchScope });
+    }
+    onSearchRangeChanged(ranges) {
+        this.dataRange = ranges[0];
+    }
+    updateDataRange() {
+        if (!this.dataRange) {
+            return;
+        }
+        if (this.searchOptions.searchScope === "specificRange") {
+            const specificRange = this.env.model.getters.getRangeFromSheetXC(this.env.model.getters.getActiveSheetId(), this.dataRange).rangeData;
+            this.updateSearch({ specificRange });
+        }
     }
     onSelectPreviousCell() {
         this.env.model.dispatch("SELECT_SEARCH_PREVIOUS_MATCH");
@@ -23912,10 +24130,14 @@ class FindAndReplacePanel extends owl.Component {
     onSelectNextCell() {
         this.env.model.dispatch("SELECT_SEARCH_NEXT_MATCH");
     }
-    updateSearch() {
+    updateSearch(updateSearchOptions) {
+        const searchOptions = {
+            ...this.env.model.getters.getSearchOptions(),
+            ...updateSearchOptions,
+        };
         this.env.model.dispatch("UPDATE_SEARCH", {
-            toSearch: this.state.toSearch,
-            searchOptions: this.state.searchOptions,
+            toSearch: this.toSearch,
+            searchOptions,
         });
     }
     debouncedUpdateSearch() {
@@ -23927,28 +24149,14 @@ class FindAndReplacePanel extends owl.Component {
     }
     replace() {
         this.env.model.dispatch("REPLACE_SEARCH", {
-            replaceWith: this.state.replaceWith,
+            replaceWith: this.toReplace,
         });
     }
     replaceAll() {
         this.env.model.dispatch("REPLACE_ALL_SEARCH", {
-            replaceWith: this.state.replaceWith,
+            replaceWith: this.toReplace,
         });
     }
-    // ---------------------------------------------------------------------------
-    // Private
-    // ---------------------------------------------------------------------------
-    initialState() {
-        return {
-            toSearch: "",
-            replaceWith: "",
-            searchOptions: {
-                matchCase: false,
-                exactMatch: false,
-                searchFormulas: false,
-            },
-        };
-    }
 }
 FindAndReplacePanel.props = {
     onCloseSidePanel: Function,
@@ -27094,7 +27302,7 @@ class GridComposer extends owl.Component {
     get cellReference() {
         const { col, row, sheetId } = this.env.model.getters.getCurrentEditedCell();
         const prefixSheet = sheetId !== this.env.model.getters.getActiveSheetId();
-        return `${prefixSheet ? getCanonicalSheetName(this.env.model.getters.getSheetName(sheetId)) + "!" : ""}${toXC(col, row)}`;
+        return getFullReference(prefixSheet ? this.env.model.getters.getSheetName(sheetId) : undefined, toXC(col, row));
     }
     get cellReferenceStyle() {
         const { x: left, y: top } = this.rect;
@@ -28537,22 +28745,15 @@ css /* scss */ `
       height: 10000px;
       background-color: ${SELECTION_BORDER_COLOR};
     }
-    .o-unhide {
-      width: ${UNHIDE_ICON_EDGE_LENGTH}px;
-      height: ${UNHIDE_ICON_EDGE_LENGTH}px;
-      position: absolute;
-      overflow: hidden;
-      border-radius: 2px;
-      top: calc(${HEADER_HEIGHT}px / 2 - ${UNHIDE_ICON_EDGE_LENGTH}px / 2);
+    .o-unhide-buttons {
+      width: fit-content;
+      gap: 5px;
+      transform: translate(-50%, 0);
     }
     .o-unhide:hover {
       z-index: ${ComponentsImportance.Grid + 1};
       background-color: lightgrey;
     }
-    .o-unhide > svg {
-      position: relative;
-      top: calc(${UNHIDE_ICON_EDGE_LENGTH}px / 2 - ${ICON_EDGE_LENGTH}px / 2);
-    }
   }
 `;
 AbstractResizer.props = {
@@ -28662,8 +28863,8 @@ class ColResizer extends AbstractResizer {
             dimension: "COL",
         });
     }
-    unhideStyleValue(hiddenIndex) {
-        return this._getDimensionsInViewport(hiddenIndex).start;
+    getUnhideButtonStyle(hiddenIndex) {
+        return cssPropertiesToCss({ left: this._getDimensionsInViewport(hiddenIndex).start + "px" });
     }
 }
 css /* scss */ `
@@ -28709,18 +28910,9 @@ css /* scss */ `
       height: 1px;
       background-color: ${SELECTION_BORDER_COLOR};
     }
-    .o-unhide {
-      width: ${UNHIDE_ICON_EDGE_LENGTH}px;
-      height: ${UNHIDE_ICON_EDGE_LENGTH}px;
-      position: absolute;
-      overflow: hidden;
-      border-radius: 2px;
-      left: calc(${HEADER_WIDTH}px - ${UNHIDE_ICON_EDGE_LENGTH}px - 2px);
-    }
-    .o-unhide > svg {
-      position: relative;
-      left: calc(${UNHIDE_ICON_EDGE_LENGTH}px / 2 - ${ICON_EDGE_LENGTH}px / 2);
-      top: calc(${UNHIDE_ICON_EDGE_LENGTH}px / 2 - ${ICON_EDGE_LENGTH}px / 2);
+    .o-unhide-buttons {
+      height: fit-content;
+      transform: translate(0, -50%);
     }
     .o-unhide:hover {
       z-index: ${ComponentsImportance.Grid + 1};
@@ -28835,8 +29027,8 @@ class RowResizer extends AbstractResizer {
             elements: hiddenElements,
         });
     }
-    unhideStyleValue(hiddenIndex) {
-        return this._getDimensionsInViewport(hiddenIndex).start;
+    getUnhideButtonStyle(hiddenIndex) {
+        return cssPropertiesToCss({ top: this._getDimensionsInViewport(hiddenIndex).start + "px" });
     }
 }
 css /* scss */ `
@@ -29343,7 +29535,6 @@ class Grid extends owl.Component {
         owl.onMounted(() => this.focus());
         this.props.exposeFocus(() => this.focus());
         useGridDrawing("canvas", this.env.model, () => this.env.model.getters.getSheetViewDimensionWithHeaders());
-        owl.useEffect(() => this.focus(), () => [this.env.model.getters.getActiveSheetId()]);
         this.onMouseWheel = useWheelHandler((deltaX, deltaY) => {
             this.moveCanvas(deltaX, deltaY);
             this.hoveredCell.col = undefined;
@@ -29780,6 +29971,7 @@ class Grid extends owl.Component {
             const content = clipboardData.getData(ClipboardMIMEType.PlainText);
             const target = this.env.model.getters.getSelectedZones();
             const clipboardString = this.env.model.getters.getClipboardTextContent();
+            const isCutOperation = this.env.model.getters.isCutOperation();
             if (clipboardString === content) {
                 // the paste actually comes from o-spreadsheet itself
                 interactivePaste(this.env, target);
@@ -29787,7 +29979,7 @@ class Grid extends owl.Component {
             else {
                 interactivePasteFromOS(this.env, target, content);
             }
-            if (this.env.model.getters.isCutOperation()) {
+            if (isCutOperation) {
                 await this.env.clipboard.write({ [ClipboardMIMEType.PlainText]: "" });
             }
         }
@@ -31400,12 +31592,6 @@ function convertChartData(chartData) {
 }
 function convertExcelRangeToSheetXC(range, dataSetsHaveTitle) {
     let { sheetName, xc } = splitReference(range);
-    if (sheetName) {
-        sheetName = getCanonicalSheetName(sheetName) + "!";
-    }
-    else {
-        sheetName = "";
-    }
     let zone = toUnboundedZone(xc);
     if (dataSetsHaveTitle && zone.bottom !== undefined && zone.right !== undefined) {
         const height = zone.bottom - zone.top + 1;
@@ -31418,7 +31604,7 @@ function convertExcelRangeToSheetXC(range, dataSetsHaveTitle) {
         }
     }
     const dataXC = zoneToXc(zone);
-    return sheetName + dataXC;
+    return getFullReference(sheetName, dataXC);
 }
 /**
@@ -34081,6 +34267,14 @@ class BordersPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
+    allowDispatch(cmd) {
+        switch (cmd.type) {
+            case "SET_BORDER":
+                return this.checkBordersUnchanged(cmd);
+            default:
+                return "Success" /* CommandResult.Success */;
+        }
+    }
     handle(cmd) {
         switch (cmd.type) {
             case "ADD_MERGE":
@@ -34500,6 +34694,14 @@ class BordersPlugin extends CorePlugin {
             this.setBorders(sheetId, [{ ...zone, left: right }], "right", bordersTopLeft.right);
         }
     }
+    checkBordersUnchanged(cmd) {
+        const currentBorder = this.getCellBorder(cmd);
+        const areAllNewBordersUndefined = !cmd.border?.bottom && !cmd.border?.left && !cmd.border?.right && !cmd.border?.top;
+        if ((!currentBorder && areAllNewBordersUndefined) || deepEquals(currentBorder, cmd.border)) {
+            return "NoChanges" /* CommandResult.NoChanges */;
+        }
+        return "Success" /* CommandResult.Success */;
+    }
     // ---------------------------------------------------------------------------
     // Import/Export
     // ---------------------------------------------------------------------------
@@ -34968,6 +35170,9 @@ const functionCache = {};
 // -----------------------------------------------------------------------------
 function compile(formula) {
     const tokens = rangeTokenize(formula);
+    return compileTokens(tokens);
+}
+function compileTokens(tokens) {
     const { dependencies, constantValues } = formulaArguments(tokens);
     const cacheKey = compilationCacheKey(tokens, dependencies, constantValues);
     if (!functionCache[cacheKey]) {
@@ -35323,7 +35528,6 @@ class CellPlugin extends CorePlugin {
     static getters = [
         "zoneToXC",
         "getCells",
-        "getFormulaCellContent",
         "getTranslatedCellFormula",
         "getCellStyle",
         "getCellById",
@@ -35334,11 +35538,11 @@ class CellPlugin extends CorePlugin {
         for (const sheet of Object.keys(this.cells)) {
             for (const cell of Object.values(this.cells[sheet] || {})) {
                 if (cell.isFormula) {
-                    for (const range of cell.dependencies) {
+                    for (const range of cell.compiledFormula.dependencies) {
                         if (!sheetId || range.sheetId === sheetId) {
                             const change = applyChange(range);
                             if (change.changeType !== "NONE") {
-                                this.history.update("cells", sheet, cell.id, "dependencies", cell.dependencies.indexOf(range), change.range);
+                                this.history.update("cells", sheet, cell.id, "compiledFormula", "dependencies", cell.compiledFormula.dependencies.indexOf(range), change.range);
                             }
                         }
                     }
@@ -35352,8 +35556,9 @@ class CellPlugin extends CorePlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "UPDATE_CELL":
+                return this.checkCellOutOfSheet(cmd);
             case "CLEAR_CELL":
-                return this.checkCellOutOfSheet(cmd.sheetId, cmd.col, cmd.row);
+                return this.checkValidations(cmd, this.chainValidations(this.checkCellOutOfSheet, this.checkUselessClearCell));
             default:
                 return "Success" /* CommandResult.Success */;
         }
@@ -35522,24 +35727,18 @@ class CellPlugin extends CorePlugin {
      */
     getCellById(cellId) {
         // this must be as fast as possible
-        for (const sheetId in this.cells) {
-            const sheet = this.cells[sheetId];
-            const cell = sheet[cellId];
-            if (cell) {
-                return cell;
-            }
-        }
-        return undefined;
+        const position = this.getters.getCellPosition(cellId);
+        const sheet = this.cells[position.sheetId];
+        return sheet[cellId];
     }
     /*
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
-    getFormulaCellContent(sheetId, cell, dependencies) {
-        const ranges = dependencies || cell.dependencies;
+    getFormulaCellContent(sheetId, compiledFormula, dependencies) {
         let rangeIndex = 0;
-        return concat(cell.compiledFormula.tokens.map((token) => {
+        return concat(compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
-                const range = ranges[rangeIndex++];
+                const range = dependencies[rangeIndex++];
                 return this.getters.getRangeString(range, sheetId);
             }
             return token.value;
@@ -35548,12 +35747,9 @@ class CellPlugin extends CorePlugin {
     /*
      * Constructs a formula string based on an initial formula and a translation vector
      */
-    getTranslatedCellFormula(sheetId, offsetX, offsetY, compiledFormula, dependencies) {
-        const adaptedDependencies = this.getters.createAdaptedRanges(dependencies, offsetX, offsetY, sheetId);
-        return this.getFormulaCellContent(sheetId, {
-            compiledFormula,
-            dependencies: adaptedDependencies,
-        });
+    getTranslatedCellFormula(sheetId, offsetX, offsetY, compiledFormula) {
+        const adaptedDependencies = this.getters.createAdaptedRanges(compiledFormula.dependencies, offsetX, offsetY, sheetId);
+        return this.getFormulaCellContent(sheetId, compiledFormula, adaptedDependencies);
     }
     getCellStyle(position) {
         return this.getters.getCell(position)?.style || {};
@@ -35733,8 +35929,10 @@ class CellPlugin extends CorePlugin {
             style,
             format,
             isFormula: true,
-            compiledFormula,
-            dependencies: [],
+            compiledFormula: {
+                ...compiledFormula,
+                dependencies: [],
+            },
         };
     }
     /**
@@ -35743,7 +35941,7 @@ class CellPlugin extends CorePlugin {
      */
     createFormulaCellWithDependencies(id, compiledFormula, format, style, sheetId) {
         const dependencies = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getFormulaCellContent.bind(this));
+        return new FormulaCellWithDependencies(id, compiledFormula, format, style, dependencies, sheetId, this.getters.getRangeString.bind(this));
     }
     createErrorFormula(id, content, format, style, error) {
         return {
@@ -35753,46 +35951,72 @@ class CellPlugin extends CorePlugin {
             format,
             isFormula: true,
             compiledFormula: {
-                dependencies: [],
                 tokens: tokenize(content),
+                dependencies: [],
                 execute: function () {
                     throw error;
                 },
             },
-            dependencies: [],
         };
     }
-    checkCellOutOfSheet(sheetId, col, row) {
+    checkCellOutOfSheet(cmd) {
+        const { sheetId, col, row } = cmd;
         const sheet = this.getters.tryGetSheet(sheetId);
         if (!sheet)
             return "InvalidSheetId" /* CommandResult.InvalidSheetId */;
         const sheetZone = this.getters.getSheetZone(sheetId);
         return isInside(col, row, sheetZone) ? "Success" /* CommandResult.Success */ : "TargetOutOfSheet" /* CommandResult.TargetOutOfSheet */;
     }
+    checkUselessClearCell(cmd) {
+        const cell = this.getters.getCell(cmd);
+        if (!cell)
+            return "NoChanges" /* CommandResult.NoChanges */;
+        if (!cell.content && !cell.style && !cell.format) {
+            return "NoChanges" /* CommandResult.NoChanges */;
+        }
+        return "Success" /* CommandResult.Success */;
+    }
 }
 class FormulaCellWithDependencies {
     id;
-    compiledFormula;
     format;
     style;
-    dependencies;
     sheetId;
-    getFormulaCellContent;
+    getRangeString;
     isFormula = true;
-    constructor(id, compiledFormula, format, style, dependencies, sheetId, getFormulaCellContent) {
+    compiledFormula;
+    constructor(id, compiledFormula, format, style, dependencies, sheetId, getRangeString) {
         this.id = id;
-        this.compiledFormula = compiledFormula;
         this.format = format;
         this.style = style;
-        this.dependencies = dependencies;
         this.sheetId = sheetId;
-        this.getFormulaCellContent = getFormulaCellContent;
+        this.getRangeString = getRangeString;
+        let rangeIndex = 0;
+        const tokens = compiledFormula.tokens.map((token) => {
+            if (token.type === "REFERENCE") {
+                const index = rangeIndex++;
+                return new RangeReferenceToken(() => this.getRangeString(dependencies[index], this.sheetId));
+            }
+            return token;
+        });
+        this.compiledFormula = {
+            ...compiledFormula,
+            dependencies,
+            tokens,
+        };
     }
     get content() {
-        return this.getFormulaCellContent(this.sheetId, {
-            dependencies: this.dependencies,
-            compiledFormula: this.compiledFormula,
-        });
+        return concat(this.compiledFormula.tokens.map((token) => token.value));
+    }
+}
+class RangeReferenceToken {
+    getValue;
+    type = "REFERENCE";
+    constructor(getValue) {
+        this.getValue = getValue;
+    }
+    get value() {
+        return this.getValue();
     }
 }
@@ -36441,6 +36665,9 @@ class DataValidationPlugin extends CorePlugin {
         return this.rules[sheetId].find((rule) => rule.id === id);
     }
     getValidationRuleForCell({ sheetId, col, row }) {
+        if (!this.rules[sheetId]) {
+            return undefined;
+        }
         for (const rule of this.rules[sheetId]) {
             for (const range of rule.ranges) {
                 if (isInside(col, row, range.zone)) {
@@ -36937,6 +37164,13 @@ class FiltersPlugin extends CorePlugin {
     }
     onDeleteColumnsRows(cmd) {
         for (const table of this.getFilterTables(cmd.sheetId)) {
+            // Remove the filter tables whose data filter headers are in the removed rows.
+            if (cmd.dimension === "ROW" && cmd.elements.includes(table.zone.top)) {
+                const tables = { ...this.tables[cmd.sheetId] };
+                delete tables[table.id];
+                this.history.update("tables", cmd.sheetId, tables);
+                continue;
+            }
             const zone = reduceZoneOnDeletion(table.zone, cmd.dimension === "COL" ? "left" : "top", cmd.elements);
             if (!zone) {
                 const tables = { ...this.tables[cmd.sheetId] };
@@ -37606,7 +37840,7 @@ class MergePlugin extends CorePlugin {
         const rangeString = this.getters.getRangeString(expandedRange, forSheetId);
         if (this.isSingleCellOrMerge(rangeImpl.sheetId, rangeImpl.zone)) {
             const { sheetName, xc } = splitReference(rangeString);
-            return `${sheetName !== undefined ? getCanonicalSheetName(sheetName) + "!" : ""}${xc.split(":")[0]}`;
+            return getFullReference(sheetName, xc.split(":")[0]);
         }
         return rangeString;
     }
@@ -39031,10 +39265,13 @@ class SheetPlugin extends CorePlugin {
         // begin with the end.
         rows.sort((a, b) => b - a);
         for (let group of groupConsecutive(rows)) {
+            // indexes are sorted in the descending order
+            const from = group[group.length - 1];
+            const to = group[0];
             // Move the cells.
-            this.moveCellOnRowsDeletion(sheet, group[group.length - 1], group[0]);
-            // Effectively delete the element and recompute the left-right/top-bottom.
-            group.map((row) => this.updateRowsStructureOnDeletion(row, sheet));
+            this.moveCellOnRowsDeletion(sheet, from, to);
+            // Effectively delete the rows
+            this.updateRowsStructureOnDeletion(sheet, from, to);
         }
         const count = rows.filter((row) => row < sheet.panes.ySplit).length;
         if (count) {
@@ -39056,8 +39293,6 @@ class SheetPlugin extends CorePlugin {
         this.addEmptyRows(sheet, quantity);
         // Move the cells.
         this.moveCellsOnAddition(sheet, index, quantity, "rows");
-        // Recompute the left-right/top-bottom.
-        this.updateRowsStructureOnAddition(sheet, row, quantity);
         if (index < sheet.panes.ySplit) {
             this.setPaneDivisions(sheet.id, sheet.panes.ySplit + quantity, "ROW");
         }
@@ -39158,35 +39393,20 @@ class SheetPlugin extends CorePlugin {
             }
         }
     }
-    updateRowsStructureOnDeletion(index, sheet) {
+    updateRowsStructureOnDeletion(sheet, deleteFromRow, deleteToRow) {
         const rows = [];
-        const cellsQueue = sheet.rows.map((row) => row.cells);
+        const cellsQueue = sheet.rows.map((row) => row.cells).reverse();
         for (let i in sheet.rows) {
-            if (Number(i) === index) {
+            const row = Number(i);
+            if (row >= deleteFromRow && row <= deleteToRow) {
                 continue;
             }
             rows.push({
-                cells: cellsQueue.shift(),
+                cells: cellsQueue.pop(),
             });
         }
         this.history.update("sheets", sheet.id, "rows", rows);
     }
-    /**
-     * Update the rows of the sheet after an addition:
-     * - Rename the rows
-     *
-     * @param sheet Sheet on which the deletion occurs
-     * @param addedRow Index of the added row
-     * @param rowsToAdd Number of the rows to add
-     */
-    updateRowsStructureOnAddition(sheet, addedRow, rowsToAdd) {
-        const rows = [];
-        const cellsQueue = sheet.rows.map((row) => row.cells);
-        sheet.rows.forEach(() => rows.push({
-            cells: cellsQueue.shift(),
-        }));
-        this.history.update("sheets", sheet.id, "rows", rows);
-    }
     /**
      * Add empty rows at the end of the rows
      *
@@ -39713,6 +39933,7 @@ class CompilationParametersBuilder {
     getters;
     computeCell;
     evalContext;
+    rangeCache = {};
     constructor(context, getters, computeCell) {
         this.getters = getters;
         this.computeCell = computeCell;
@@ -39735,7 +39956,8 @@ class CompilationParametersBuilder {
     refFn(range, isMeta, functionName, paramNumber) {
         if (isMeta) {
             // Use zoneToXc of zone instead of getRangeString to avoid sending unbounded ranges
-            return { value: zoneToXc(range.zone) };
+            const sheetName = this.getters.getSheetName(range.sheetId);
+            return { value: getFullReference(sheetName, zoneToXc(range.zone)) };
         }
         if (!isZoneValid(range.zone)) {
             throw new InvalidReferenceError();
@@ -39798,17 +40020,24 @@ class CompilationParametersBuilder {
         if (!_zone) {
             return [[]];
         }
+        const { top, left, bottom, right } = zone;
+        const cacheKey = `${sheetId}-${top}-${left}-${bottom}-${right}`;
+        if (cacheKey in this.rangeCache) {
+            return this.rangeCache[cacheKey];
+        }
         const height = _zone.bottom - _zone.top + 1;
         const width = _zone.right - _zone.left + 1;
-        const matrix = Array.from({ length: width }, () => Array.from({ length: height }));
+        const matrix = new Array(width);
         // Performance issue: nested loop is faster than a map here
         for (let col = _zone.left; col <= _zone.right; col++) {
+            const colIndex = col - _zone.left;
+            matrix[colIndex] = new Array(height);
             for (let row = _zone.top; row <= _zone.bottom; row++) {
-                const colIndex = col - _zone.left;
                 const rowIndex = row - _zone.top;
                 matrix[colIndex][rowIndex] = this.readCell({ sheetId, col, row });
             }
         }
+        this.rangeCache[cacheKey] = matrix;
         return matrix;
     }
 }
@@ -39985,6 +40214,13 @@ class Evaluator {
         return (this.evaluatedCells.get(this.encodePosition(position)) ||
             createEvaluatedCell("", { locale: this.getters.getLocale() }));
     }
+    getSpreadPositionsOf(position) {
+        const positionId = this.encodePosition(position);
+        if (!this.spreadingRelations.isArrayFormula(positionId)) {
+            return [];
+        }
+        return Array.from(this.spreadingRelations.getArrayResultPositionIds(positionId)).map(this.decodePosition.bind(this));
+    }
     getArrayFormulaSpreadingOn(position) {
         const positionId = this.encodePosition(position);
         const formulaPosition = this.getArrayFormulaSpreadingOnId(positionId);
@@ -40007,6 +40243,7 @@ class Evaluator {
         this.formulaDependencies().addDependencies(positionId, dependencies);
     }
     updateCompilationParameters() {
+        // rebuild the compilation parameters (with a clean cache)
         this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     evaluateCells(positions) {
@@ -40050,6 +40287,16 @@ class Evaluator {
         this.evaluatedCells = new Map();
         this.evaluate(this.getAllCells());
     }
+    evaluateFormula(sheetId, formulaString) {
+        const compiledFormula = compile(formulaString);
+        const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
+        this.updateCompilationParameters();
+        const result = updateEvalContextAndExecute({ ...compiledFormula, dependencies: ranges }, this.compilationParams, sheetId);
+        if (isMatrix(result)) {
+            return matrixMap(result, (cell) => cell.value);
+        }
+        return result.value;
+    }
     getAllCells() {
         const positionIds = new JetSet();
         for (const sheetId of this.getters.getSheetIds()) {
@@ -40076,6 +40323,7 @@ class Evaluator {
         this.nextPositionsToUpdate = cells;
         let currentIteration = 0;
         while (this.nextPositionsToUpdate.size && currentIteration++ < MAX_ITERATION) {
+            this.updateCompilationParameters();
             const positionIds = Array.from(this.nextPositionsToUpdate);
             this.nextPositionsToUpdate.clear();
             for (let i = 0; i < positionIds.length; ++i) {
@@ -40099,7 +40347,8 @@ class Evaluator {
         if (!this.blockedArrayFormulas.has(positionId)) {
             this.invalidateSpreading(positionId);
         }
-        const cell = this.getCell(positionId);
+        const cellPosition = this.decodePosition(positionId);
+        const cell = this.getters.getCell(cellPosition);
         if (cell === undefined) {
             return createEvaluatedCell("", { locale: this.getters.getLocale() });
         }
@@ -40110,7 +40359,7 @@ class Evaluator {
             }
             this.cellsBeingComputed.add(cellId);
             return cell.isFormula
-                ? this.computeFormulaCell(cell)
+                ? this.computeFormulaCell(cellPosition.sheetId, cell)
                 : evaluateLiteral(cell.content, { format: cell.format, locale: this.getters.getLocale() });
         }
         catch (e) {
@@ -40136,14 +40385,9 @@ class Evaluator {
         e.message = e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled);
         return errorCell(e);
     }
-    computeFormulaCell(cellData) {
+    computeFormulaCell(sheetId, cellData) {
         const cellId = cellData.id;
-        this.compilationParams[2].__originCellXC = () => {
-            // compute the value lazily for performance reasons
-            const position = this.compilationParams[2].getters.getCellPosition(cellId);
-            return toXC(position.col, position.row);
-        };
-        const formulaReturn = cellData.compiledFormula.execute(cellData.dependencies, ...this.compilationParams);
+        const formulaReturn = updateEvalContextAndExecute(cellData.compiledFormula, this.compilationParams, sheetId, cellId);
         if (!isMatrix(formulaReturn)) {
             return createEvaluatedCell(formulaReturn.value, {
                 format: cellData.format || formulaReturn.format,
@@ -40243,7 +40487,7 @@ class Evaluator {
             return [];
         }
         const dependencies = [];
-        for (const range of cell.dependencies) {
+        for (const range of cell.compiledFormula.dependencies) {
             if (range.invalidSheetName || range.invalidXc) {
                 continue;
             }
@@ -40345,6 +40589,18 @@ class PositionBitsEncoder {
         return sheetId;
     }
 }
+function updateEvalContextAndExecute(compiledFormula, compilationParams, sheetId, cellId) {
+    compilationParams[2].__originCellXC = lazy(() => {
+        if (!cellId) {
+            return undefined;
+        }
+        // compute the value lazily for performance reasons
+        const position = compilationParams[2].getters.getCellPosition(cellId);
+        return toXC(position.col, position.row);
+    });
+    compilationParams[2].__originSheetId = sheetId;
+    return compiledFormula.execute(compiledFormula.dependencies, ...compilationParams);
+}
 //#region
 // ---------------------------------------------------------------------------
@@ -40439,7 +40695,6 @@ class PositionBitsEncoder {
 // of other cells depending on it, at the next iteration.
 //#endregion
 class EvaluationPlugin extends UIPlugin {
-    config;
     static getters = [
         "evaluateFormula",
         "getCorrespondingFormulaCell",
@@ -40449,15 +40704,14 @@ class EvaluationPlugin extends UIPlugin {
         "getEvaluatedCell",
         "getEvaluatedCells",
         "getEvaluatedCellsInZone",
+        "getSpreadPositionsOf",
+        "getArrayFormulaSpreadingOn",
     ];
     shouldRebuildDependenciesGraph = true;
     evaluator;
-    compilationParams;
     positionsToUpdate = [];
     constructor(config) {
         super(config);
-        this.config = config;
-        this.compilationParams = this.getCompilationParameters();
         this.evaluator = new Evaluator(config.custom, this.getters);
     }
     // ---------------------------------------------------------------------------
@@ -40482,10 +40736,6 @@ class EvaluationPlugin extends UIPlugin {
             case "EVALUATE_CELLS":
                 this.evaluator.evaluateAllCells();
                 break;
-            case "UPDATE_LOCALE":
-                this.compilationParams = this.getCompilationParameters();
-                this.evaluator.updateCompilationParameters();
-                break;
         }
     }
     finalize() {
@@ -40503,16 +40753,7 @@ class EvaluationPlugin extends UIPlugin {
     // Getters
     // ---------------------------------------------------------------------------
     evaluateFormula(sheetId, formulaString) {
-        const compiledFormula = compile(formulaString);
-        const ranges = [];
-        for (let xc of compiledFormula.dependencies) {
-            ranges.push(this.getters.getRangeFromSheetXC(sheetId, xc));
-        }
-        const array = compiledFormula.execute(ranges, ...this.compilationParams);
-        if (isMatrix(array)) {
-            return array.map((col) => col.map((row) => row.value));
-        }
-        return array.value;
+        return this.evaluator.evaluateFormula(sheetId, formulaString);
     }
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
@@ -40558,6 +40799,12 @@ class EvaluationPlugin extends UIPlugin {
     getEvaluatedCellsInZone(sheetId, zone) {
         return positions(zone).map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId, col, row }));
     }
+    getSpreadPositionsOf(position) {
+        return this.evaluator.getSpreadPositionsOf(position);
+    }
+    getArrayFormulaSpreadingOn(position) {
+        return this.evaluator.getArrayFormulaSpreadingOn(position);
+    }
     // ---------------------------------------------------------------------------
     // Export
     // ---------------------------------------------------------------------------
@@ -40595,13 +40842,13 @@ class EvaluationPlugin extends UIPlugin {
      */
     getCorrespondingFormulaCell(position) {
         const cell = this.getters.getCell(position);
-        if (cell && cell.content) {
-            if (cell.isFormula && !isBadExpression(cell.content)) {
-                return cell;
-            }
+        if (cell && cell.isFormula) {
+            return isBadExpression(cell.compiledFormula.tokens) ? undefined : cell;
+        }
+        else if (cell && cell.content) {
             return undefined;
         }
-        const spreadingFormulaPosition = this.evaluator.getArrayFormulaSpreadingOn(position);
+        const spreadingFormulaPosition = this.getArrayFormulaSpreadingOn(position);
         if (spreadingFormulaPosition === undefined) {
             return undefined;
         }
@@ -40611,13 +40858,10 @@ class EvaluationPlugin extends UIPlugin {
         }
         return undefined;
     }
-    getCompilationParameters() {
-        return buildCompilationParameters(this.config.custom, this.getters, (position) => this.evaluator.getEvaluatedCell(position));
-    }
 }
-function isBadExpression(formula) {
+function isBadExpression(tokens) {
     try {
-        compile(formula);
+        compileTokens(tokens);
         return false;
     }
     catch (error) {
@@ -40786,22 +41030,20 @@ class EvaluationChartPlugin extends UIPlugin {
             invalidateCFEvaluationCommands.has(cmd.type) ||
             cmd.type === "EVALUATE_CELLS" ||
             cmd.type === "UPDATE_CELL") {
-            if (cmd.type !== "UNDO" && cmd.type !== "REDO") {
-                for (const chartId in this.charts) {
-                    this.history.update("charts", chartId, undefined);
-                }
+            for (const chartId in this.charts) {
+                this.charts[chartId] = undefined;
             }
         }
         switch (cmd.type) {
             case "UPDATE_CHART":
             case "CREATE_CHART":
             case "DELETE_FIGURE":
-                this.history.update("charts", cmd.id, undefined);
+                this.charts[cmd.id] = undefined;
                 break;
             case "DELETE_SHEET":
                 for (let chartId in this.charts) {
                     if (!this.getters.isChartDefined(chartId)) {
-                        this.history.update("charts", chartId, undefined);
+                        this.charts[chartId] = undefined;
                     }
                 }
                 break;
@@ -40813,8 +41055,7 @@ class EvaluationChartPlugin extends UIPlugin {
             if (!chart) {
                 throw new Error(`No chart for the given id: ${figureId}`);
             }
-            const runtime = this.createRuntimeChart(chart);
-            this.history.update("charts", figureId, runtime);
+            this.charts[figureId] = this.createRuntimeChart(chart);
         }
         return this.charts[figureId];
     }
@@ -40966,7 +41207,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                                     const values = cf.rule.values.map((value, i) => {
                                         const compiledFormula = formulas[i];
                                         if (compiledFormula) {
-                                            return this.getters.getTranslatedCellFormula(sheetId, col - zone.left, row - zone.top, compiledFormula, compiledFormula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)));
+                                            return this.getters.getTranslatedCellFormula(sheetId, col - zone.left, row - zone.top, {
+                                                ...compiledFormula,
+                                                dependencies: compiledFormula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)),
+                                            });
                                         }
                                         return value;
                                     });
@@ -41338,7 +41582,10 @@ class EvaluationDataValidationPlugin extends UIPlugin {
             }
             try {
                 const formula = compile(value);
-                const translatedFormula = this.getters.getTranslatedCellFormula(sheetId, offset.col, offset.row, formula, formula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)));
+                const translatedFormula = this.getters.getTranslatedCellFormula(sheetId, offset.col, offset.row, {
+                    ...formula,
+                    dependencies: formula.dependencies.map((d) => this.getters.getRangeFromSheetXC(sheetId, d)),
+                });
                 const evaluated = this.getters.evaluateFormula(sheetId, translatedFormula);
                 return evaluated && !isMatrix(evaluated) ? evaluated.toString() : "";
             }
@@ -43309,11 +43556,26 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             let cellsInRow = [];
             for (let col of columnsIndex) {
                 const position = { col, row, sheetId };
+                const spreader = getters.getArrayFormulaSpreadingOn(position);
+                let cell = getters.getCell(position);
+                const evaluatedCell = getters.getEvaluatedCell(position);
+                if (spreader) {
+                    const isSpreaderCopied = rowsIndex.includes(spreader.row) && columnsIndex.includes(spreader.col);
+                    const content = isSpreaderCopied
+                        ? ""
+                        : formatValue(evaluatedCell.value, { locale: getters.getLocale() });
+                    cell = {
+                        id: cell?.id || "",
+                        style: cell?.style,
+                        format: evaluatedCell.format,
+                        content,
+                        isFormula: false,
+                    };
+                }
                 cellsInRow.push({
-                    cell: getters.getCell(position),
-                    style: getters.getCellComputedStyle(position),
-                    evaluatedCell: getters.getEvaluatedCell(position),
+                    cell,
                     border: getters.getCellBorder(position) || undefined,
+                    evaluatedCell,
                     position,
                 });
             }
@@ -43435,13 +43697,6 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             });
         }
         this.pasteCopiedTables(target);
-        this.cells.forEach((row) => {
-            row.forEach((c) => {
-                if (c.cell) {
-                    c.cell = undefined;
-                }
-            });
-        });
     }
     /**
      * The clipped zone is copied as many times as it fits in the target.
@@ -43515,7 +43770,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
     clearClippedZones() {
         for (const row of this.cells) {
             for (const cell of row) {
-                if (cell.cell) {
+                if (cell?.cell) {
                     this.dispatch("CLEAR_CELL", cell.position);
                 }
             }
@@ -43541,6 +43796,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             const rowCells = this.cells[r];
             for (let c = 0; c < width; c++) {
                 const origin = rowCells[c];
+                if (!origin) {
+                    continue;
+                }
                 const position = { col: col + c, row: row + r, sheetId: sheetId };
                 // TODO: refactor this part. the "Paste merge" action is also executed with
                 // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
@@ -43564,53 +43822,42 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
     pasteCell(origin, target, operation, clipboardOption) {
         const { sheetId, col, row } = target;
         const targetCell = this.getters.getEvaluatedCell(target);
-        if (clipboardOption?.pasteOption !== "onlyValue") {
-            const targetBorders = this.getters.getCellBorder(target);
-            const originBorders = origin.border;
-            const border = {
-                top: targetBorders?.top || originBorders?.top,
-                bottom: targetBorders?.bottom || originBorders?.bottom,
-                left: targetBorders?.left || originBorders?.left,
-                right: targetBorders?.right || originBorders?.right,
-            };
-            this.dispatch("SET_BORDER", { sheetId, col, row, border });
+        if (clipboardOption?.pasteOption === "onlyValue") {
+            const locale = this.getters.getLocale();
+            const content = formatValue(origin.evaluatedCell.value, { locale });
+            this.dispatch("UPDATE_CELL", { ...target, content });
+            return;
         }
-        if (origin.cell) {
-            if (clipboardOption?.pasteOption === "onlyFormat") {
-                this.dispatch("UPDATE_CELL", {
-                    ...target,
-                    style: origin.cell.style,
-                    format: origin.evaluatedCell.format,
-                });
-                return;
-            }
-            if (clipboardOption?.pasteOption === "onlyValue") {
-                const locale = this.getters.getLocale();
-                const content = formatValue(origin.evaluatedCell.value, { locale });
-                this.dispatch("UPDATE_CELL", { ...target, content });
-                return;
-            }
-            let content = origin.cell.content;
-            if (origin.cell.isFormula && operation === "COPY") {
-                content = this.getters.getTranslatedCellFormula(sheetId, col - origin.position.col, row - origin.position.row, origin.cell.compiledFormula, origin.cell.dependencies);
-            }
+        const targetBorders = this.getters.getCellBorder(target);
+        const originBorders = origin.border;
+        const border = {
+            top: targetBorders?.top || originBorders?.top,
+            bottom: targetBorders?.bottom || originBorders?.bottom,
+            left: targetBorders?.left || originBorders?.left,
+            right: targetBorders?.right || originBorders?.right,
+        };
+        this.dispatch("SET_BORDER", { sheetId, col, row, border });
+        if (clipboardOption?.pasteOption === "onlyFormat") {
+            this.dispatch("UPDATE_CELL", {
+                ...target,
+                style: origin.cell?.style ?? null,
+                format: origin.cell?.format ?? origin.evaluatedCell.format ?? targetCell.format,
+            });
+            return;
+        }
+        const content = origin.cell && origin.cell.isFormula && operation === "COPY"
+            ? this.getters.getTranslatedCellFormula(sheetId, col - origin.position.col, row - origin.position.row, origin.cell.compiledFormula)
+            : origin.cell?.content;
+        if (content !== "" || origin.cell?.format || origin.cell?.style) {
             this.dispatch("UPDATE_CELL", {
                 ...target,
                 content,
-                style: origin.cell.style || null,
-                format: origin.cell.format,
+                style: origin.cell?.style || null,
+                format: origin.cell?.format,
             });
         }
         else if (targetCell) {
-            if (clipboardOption?.pasteOption === "onlyValue") {
-                this.dispatch("UPDATE_CELL", { ...target, content: "" });
-            }
-            else if (clipboardOption?.pasteOption === "onlyFormat") {
-                this.dispatch("UPDATE_CELL", { ...target, style: null, format: "" });
-            }
-            else {
-                this.dispatch("CLEAR_CELL", target);
-            }
+            this.dispatch("CLEAR_CELL", target);
         }
     }
     /**
@@ -43672,22 +43919,28 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         return (this.cells
             .map((cells) => {
             return cells
-                .map((c) => this.getters.shouldShowFormulas() && c.cell?.isFormula
+                .map((c) => this.getters.shouldShowFormulas() && c?.cell?.isFormula
                 ? c.cell?.content || ""
-                : c.evaluatedCell?.formattedValue || "")
+                : c?.evaluatedCell?.formattedValue || "")
                 .join("\t");
         })
             .join("\n") || "\t");
     }
     getHTMLContent() {
         if (this.cells.length === 1 && this.cells[0].length === 1) {
+            if (!this.cells[0][0]) {
+                return "";
+            }
             return this.getters.getCellText(this.cells[0][0].position);
         }
         let htmlTable = '<table border="1" style="border-collapse:collapse">';
         for (const row of this.cells) {
             htmlTable += "<tr>";
             for (const cell of row) {
-                const cssStyle = cssPropertiesToCss(cellStyleToCss(cell.style));
+                if (!cell) {
+                    continue;
+                }
+                const cssStyle = cssPropertiesToCss(cellStyleToCss(this.getters.getCellComputedStyle(cell.position)));
                 const cellText = this.getters.getCellText(cell.position);
                 htmlTable += `<td style="${cssStyle}">` + xmlEscape(cellText) + "</td>";
             }
@@ -44015,24 +44268,49 @@ var Direction;
  */
 class FindAndReplacePlugin extends UIPlugin {
     static layers = [3 /* LAYERS.Search */];
-    static getters = ["getSearchMatches", "getCurrentSelectedMatchIndex"];
-    searchMatches = [];
+    static getters = [
+        "getSearchMatches",
+        "getCurrentSelectedMatchIndex",
+        "getSearchOptions",
+        "getAllSheetMatchesCount",
+        "getActiveSheetMatchesCount",
+        "getSpecificRangeMatchesCount",
+    ];
+    allSheetsMatches = [];
+    activeSheetMatches = [];
+    specificRangeMatches = [];
+    // fixme: why do we make selectedMatchIndex on top of a selected
+    // property in the matches?
     selectedMatchIndex = null;
     currentSearchRegex = null;
     searchOptions = {
         matchCase: false,
         exactMatch: false,
         searchFormulas: false,
+        searchScope: "allSheets",
+        specificRange: undefined,
     };
     toSearch = "";
     isSearchDirty = false;
+    get searchMatches() {
+        switch (this.searchOptions.searchScope) {
+            case "allSheets":
+                return this.allSheetsMatches;
+            case "activeSheet":
+                return this.activeSheetMatches;
+            case "specificRange":
+                return this.specificRangeMatches;
+        }
+    }
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
     handle(cmd) {
         switch (cmd.type) {
             case "UPDATE_SEARCH":
-                this.updateSearch(cmd.toSearch, cmd.searchOptions);
+                const rangeData = cmd.searchOptions.specificRange;
+                const specificRange = rangeData && this.getters.getRangeFromRangeData(rangeData);
+                this.updateSearch(cmd.toSearch, { ...cmd.searchOptions, specificRange });
                 break;
             case "CLEAR_SEARCH":
                 this.clearSearch();
@@ -44062,7 +44340,9 @@ class FindAndReplacePlugin extends UIPlugin {
                 this.isSearchDirty = true;
                 break;
             case "ACTIVATE_SHEET":
-                this.refreshSearch();
+                if (this.searchOptions.searchScope === "activeSheet") {
+                    this.isSearchDirty = true;
+                }
                 break;
         }
     }
@@ -44081,6 +44361,18 @@ class FindAndReplacePlugin extends UIPlugin {
     getCurrentSelectedMatchIndex() {
         return this.selectedMatchIndex;
     }
+    getSearchOptions() {
+        return { ...this.searchOptions, specificRange: this.searchOptions.specificRange?.rangeData };
+    }
+    getAllSheetMatchesCount() {
+        return this.allSheetsMatches.length;
+    }
+    getActiveSheetMatchesCount() {
+        return this.activeSheetMatches.length;
+    }
+    getSpecificRangeMatchesCount() {
+        return this.specificRangeMatches.length;
+    }
     // ---------------------------------------------------------------------------
     // Search
     // ---------------------------------------------------------------------------
@@ -44101,8 +44393,8 @@ class FindAndReplacePlugin extends UIPlugin {
      * refresh the matches according to the current search options
      */
     refreshSearch() {
-        const matches = this.findMatches();
-        this.searchMatches = matches;
+        this.selectedMatchIndex = null;
+        this.findMatches();
         this.selectNextCell(Direction.current);
     }
     /**
@@ -44117,36 +44409,65 @@ class FindAndReplacePlugin extends UIPlugin {
         }
         this.currentSearchRegex = RegExp(searchValue, flags);
     }
+    getSheetsInSearchOrder() {
+        switch (this.searchOptions.searchScope) {
+            case "allSheets":
+                const sheetIds = this.getters.getSheetIds();
+                const activeSheetIndex = sheetIds.findIndex((id) => id === this.getters.getActiveSheetId());
+                return [
+                    sheetIds[activeSheetIndex],
+                    ...sheetIds.slice(activeSheetIndex + 1),
+                    ...sheetIds.slice(0, activeSheetIndex),
+                ];
+            case "activeSheet":
+                return [this.getters.getActiveSheetId()];
+            case "specificRange":
+                const specificRange = this.searchOptions.specificRange;
+                if (!specificRange) {
+                    return [];
+                }
+                return specificRange ? [specificRange.sheetId] : [];
+        }
+    }
     /**
      * Find matches using the current regex
      */
     findMatches() {
-        const sheetId = this.getters.getActiveSheetId();
-        const cells = this.getters.getCells(sheetId);
         const matches = [];
         if (this.toSearch) {
-            for (const cell of Object.values(cells)) {
-                const { col, row } = this.getters.getCellPosition(cell.id);
+            for (const sheetId of this.getters.getSheetIds()) {
+                matches.push(...this.findMatchesInSheet(sheetId));
+            }
+        }
+        // set results
+        this.allSheetsMatches = matches;
+        this.activeSheetMatches = matches.filter((match) => match.sheetId === this.getters.getActiveSheetId());
+        if (this.searchOptions.specificRange) {
+            const { sheetId, zone } = this.searchOptions.specificRange;
+            this.specificRangeMatches = matches.filter((match) => match.sheetId === sheetId && isInside(match.col, match.row, zone));
+        }
+        else {
+            this.specificRangeMatches = [];
+        }
+    }
+    findMatchesInSheet(sheetId) {
+        const matches = [];
+        const { left, right, top, bottom } = this.getters.getSheetZone(sheetId);
+        for (let row = top; row <= bottom; row++) {
+            for (let col = left; col <= right; col++) {
                 const isColHidden = this.getters.isColHidden(sheetId, col);
                 const isRowHidden = this.getters.isRowHidden(sheetId, row);
                 if (isColHidden || isRowHidden) {
                     continue;
                 }
-                if (cell &&
-                    this.currentSearchRegex &&
-                    this.currentSearchRegex.test(this.getSearchableString({ sheetId, col, row }))) {
-                    const match = { col, row, selected: false };
+                const cellPosition = { sheetId, col, row };
+                if (this.currentSearchRegex?.test(this.getSearchableString(cellPosition))) {
+                    const match = { sheetId, col, row };
                     matches.push(match);
                 }
             }
         }
-        return matches.sort(this.sortByRowThenColumn);
-    }
-    sortByRowThenColumn(a, b) {
-        if (a.row === b.row) {
-            return a.col - b.col;
-        }
-        return a.row > b.row ? 1 : -1;
+        return matches;
     }
     /**
      * Changes the selected search cell. Given a direction it will
@@ -44164,30 +44485,47 @@ class FindAndReplacePlugin extends UIPlugin {
         }
         let nextIndex;
         if (this.selectedMatchIndex === null) {
-            nextIndex = 0;
+            let nextMatchIndex = -1;
+            // if search is not available in current sheet will select in next sheet
+            for (const sheetId of this.getSheetsInSearchOrder()) {
+                nextMatchIndex = matches.findIndex((match) => match.sheetId === sheetId);
+                if (nextMatchIndex !== -1) {
+                    break;
+                }
+            }
+            nextIndex = nextMatchIndex;
         }
         else {
             nextIndex = this.selectedMatchIndex + indexChange;
         }
-        //modulo of negative value to be able to cycle in both directions with previous and next
-        nextIndex = ((nextIndex % matches.length) + matches.length) % matches.length;
+        // loop index value inside the array (index -1 => last index)
+        nextIndex = (nextIndex + matches.length) % matches.length;
         this.selectedMatchIndex = nextIndex;
+        const selectedMatch = matches[nextIndex];
+        // Switch to the sheet where the match is located
+        if (this.getters.getActiveSheetId() !== selectedMatch.sheetId) {
+            this.dispatch("ACTIVATE_SHEET", {
+                sheetIdFrom: this.getters.getActiveSheetId(),
+                sheetIdTo: selectedMatch.sheetId,
+            });
+        }
         // we want grid selection to capture the selection stream
         this.selection.getBackToDefault();
-        this.selection.selectCell(matches[nextIndex].col, matches[nextIndex].row);
-        for (let index = 0; index < this.searchMatches.length; index++) {
-            this.searchMatches[index].selected = index === this.selectedMatchIndex;
-        }
+        this.selection.selectCell(selectedMatch.col, selectedMatch.row);
     }
     clearSearch() {
         this.toSearch = "";
-        this.searchMatches = [];
         this.selectedMatchIndex = null;
         this.currentSearchRegex = null;
+        this.allSheetsMatches = [];
+        this.activeSheetMatches = [];
+        this.specificRangeMatches = [];
         this.searchOptions = {
             matchCase: false,
             exactMatch: false,
             searchFormulas: false,
+            searchScope: "allSheets",
+            specificRange: undefined,
         };
     }
     // ---------------------------------------------------------------------------
@@ -44197,17 +44535,18 @@ class FindAndReplacePlugin extends UIPlugin {
         if (!this.currentSearchRegex) {
             return;
         }
-        const sheetId = this.getters.getActiveSheetId();
-        const cell = this.getters.getCell({ sheetId, ...selectedMatch });
-        const { col, row } = selectedMatch;
+        const cell = this.getters.getCell(selectedMatch);
+        if (!cell?.content) {
+            return;
+        }
         if (cell?.isFormula && !this.searchOptions.searchFormulas) {
             return;
         }
         const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
-        const toReplace = this.getSearchableString({ sheetId, col, row });
+        const toReplace = this.getSearchableString(selectedMatch);
         const content = toReplace.replace(replaceRegex, replaceWith);
         const canonicalContent = canonicalizeNumberContent(content, this.getters.getLocale());
-        this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
+        this.dispatch("UPDATE_CELL", { ...selectedMatch, content: canonicalContent });
     }
     /**
      * Replace the value of the currently selected match
@@ -44238,7 +44577,10 @@ class FindAndReplacePlugin extends UIPlugin {
     drawGrid(renderingContext) {
         const { ctx } = renderingContext;
         const sheetId = this.getters.getActiveSheetId();
-        for (const match of this.searchMatches) {
+        for (const [index, match] of this.searchMatches.entries()) {
+            if (match.sheetId !== sheetId) {
+                continue; // Skip drawing matches from other sheets
+            }
             const merge = this.getters.getMerge({ sheetId, col: match.col, row: match.row });
             const left = merge ? merge.left : match.col;
             const right = merge ? merge.right : match.col;
@@ -44248,12 +44590,21 @@ class FindAndReplacePlugin extends UIPlugin {
             if (width > 0 && height > 0) {
                 ctx.fillStyle = BACKGROUND_COLOR;
                 ctx.fillRect(x, y, width, height);
-                if (match.selected) {
+                if (index === this.selectedMatchIndex) {
                     ctx.strokeStyle = BORDER_COLOR;
                     ctx.strokeRect(x, y, width, height);
                 }
             }
         }
+        if (this.searchOptions.searchScope === "specificRange") {
+            const range = this.searchOptions.specificRange;
+            if (!range || range.sheetId !== sheetId) {
+                return;
+            }
+            const { x, y, width, height } = this.getters.getVisibleRect(range.zone);
+            ctx.strokeStyle = BORDER_COLOR;
+            ctx.strokeRect(x, y, width, height);
+        }
     }
 }
@@ -45536,7 +45887,6 @@ class SelectionInputsManagerPlugin extends UIPlugin {
 }
 class SortPlugin extends UIPlugin {
-    static getters = ["getContiguousZone"];
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "SORT_CELLS":
@@ -45584,143 +45934,6 @@ class SortPlugin extends UIPlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
-    // getContiguousZone helpers
-    /**
-     * safe-version of expandZone to make sure we don't get out of the grid
-     */
-    expand(sheetId, z) {
-        const { left, right, top, bottom } = this.getters.expandZone(sheetId, z);
-        return {
-            left: Math.max(0, left),
-            right: Math.min(this.getters.getNumberCols(sheetId) - 1, right),
-            top: Math.max(0, top),
-            bottom: Math.min(this.getters.getNumberRows(sheetId) - 1, bottom),
-        };
-    }
-    /**
-     * verifies the presence of at least one non-empty cell in the given zone
-     */
-    checkExpandedValues(sheetId, z) {
-        const expandedZone = this.expand(sheetId, z);
-        let cell;
-        if (this.getters.doesIntersectMerge(sheetId, expandedZone)) {
-            const { left, right, top, bottom } = expandedZone;
-            for (let c = left; c <= right; c++) {
-                for (let r = top; r <= bottom; r++) {
-                    const { col, row } = this.getters.getMainCellPosition({ sheetId, col: c, row: r });
-                    cell = this.getters.getEvaluatedCell({ sheetId, col, row });
-                    if (cell.formattedValue) {
-                        return true;
-                    }
-                }
-            }
-        }
-        else {
-            for (let cell of this.getters.getEvaluatedCellsInZone(sheetId, expandedZone)) {
-                if (cell.formattedValue) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    /**
-     * This function will expand the provided zone in directions (top, bottom, left, right) for which there
-     * are non-null cells on the external boundary of the zone in the given direction.
-     *
-     * Example:
-     *          A     B     C     D     E
-     *         ___   ___   ___   ___   ___
-     *    1  |     |  D  |     |     |     |
-     *         ___   ___   ___   ___   ___
-     *    2  |  5  |     |  1  |  D  |     |
-     *         ___   ___   ___   ___   ___
-     *    3  |     |     |  A  |  X  |     |
-     *         ___   ___   ___   ___   ___
-     *    4  |     |     |     |     |     |
-     *         ___   ___   ___   ___   ___
-     *
-     *  Let's consider a provided zone corresponding to (C2:D3) - (left:2, right: 3, top:1, bottom:2)
-     *  - the top external boundary is (B1:E1)
-     *    Since we have B1='D' != "", we expand to the top: => (C1:D3)
-     *    The top boundary having reached the top of the grid, we cannot expand in that direction anymore
-     *
-     *  - the left boundary is (B1:B4)
-     *    since we have B1 again, we expand to the left  => (B1:D3)
-     *
-     *  - the right and bottom boundaries are a dead end for now as (E1:E4) and (A4:E4) are empty.
-     *
-     *  - the left boundary is now (A1:A4)
-     *    Since we have A2=5 != "", we can therefore expand to the left => (A1:D3)
-     *
-     *  This will be the final zone as left and top have reached the boundaries of the grid and
-     *  the other boundaries (E1:E4) and (A4:E4) are empty.
-     *
-     * @param sheetId UID of concerned sheet
-     * @param zone Zone
-     *
-     */
-    getContiguousZone(sheetId, zone) {
-        let { top, bottom, left, right } = zone;
-        let canExpand;
-        let stop = false;
-        while (!stop) {
-            stop = true;
-            /** top row external boundary */
-            if (top > 0) {
-                canExpand = this.checkExpandedValues(sheetId, {
-                    left: left - 1,
-                    right: right + 1,
-                    top: top - 1,
-                    bottom: top - 1,
-                });
-                if (canExpand) {
-                    stop = false;
-                    top--;
-                }
-            }
-            /** left column external boundary */
-            if (left > 0) {
-                canExpand = this.checkExpandedValues(sheetId, {
-                    left: left - 1,
-                    right: left - 1,
-                    top: top - 1,
-                    bottom: bottom + 1,
-                });
-                if (canExpand) {
-                    stop = false;
-                    left--;
-                }
-            }
-            /** right column external boundary */
-            if (right < this.getters.getNumberCols(sheetId) - 1) {
-                canExpand = this.checkExpandedValues(sheetId, {
-                    left: right + 1,
-                    right: right + 1,
-                    top: top - 1,
-                    bottom: bottom + 1,
-                });
-                if (canExpand) {
-                    stop = false;
-                    right++;
-                }
-            }
-            /** bottom row external boundary */
-            if (bottom < this.getters.getNumberRows(sheetId) - 1) {
-                canExpand = this.checkExpandedValues(sheetId, {
-                    left: left - 1,
-                    right: right + 1,
-                    top: bottom + 1,
-                    bottom: bottom + 1,
-                });
-                if (canExpand) {
-                    stop = false;
-                    bottom++;
-                }
-            }
-        }
-        return { left, right, top, bottom };
-    }
     /**
      * This function evaluates if the top row of a provided zone can be considered as a `header`
      * by checking the following criteria:
@@ -45785,7 +45998,7 @@ class SortPlugin extends UIPlugin {
                     if (cell.isFormula) {
                         const position = this.getters.getCellPosition(cell.id);
                         // we only have a vertical offset
-                        content = this.getters.getTranslatedCellFormula(sheetId, 0, newRow - position.row, cell.compiledFormula, cell.dependencies);
+                        content = this.getters.getTranslatedCellFormula(sheetId, 0, newRow - position.row, cell.compiledFormula);
                     }
                     newCellValues.style = cell.style;
                     newCellValues.content = content;
@@ -45854,6 +46067,8 @@ class SheetUIPlugin extends UIPlugin {
         "getTextWidth",
         "getCellText",
         "getCellMultiLineText",
+        "getContiguousZone",
+        "isCellEmpty",
     ];
     ctx = document.createElement("canvas").getContext("2d");
     // ---------------------------------------------------------------------------
@@ -45943,9 +46158,52 @@ class SheetUIPlugin extends UIPlugin {
         const hasListIcon = !this.getters.isReadonly() && this.getters.cellHasListDataValidationIcon(position);
         return isFilterHeader || hasListIcon;
     }
-    // ---------------------------------------------------------------------------
-    // Grid manipulation
-    // ---------------------------------------------------------------------------
+    /**
+     * Expands the given zone until bordered by empty cells or reached the sheet boundaries.
+     */
+    getContiguousZone(sheetId, zoneToExpand) {
+        /** Try to expand the zone by one col/row in any direction to include a new non-empty cell */
+        const expandZone = (zone) => {
+            for (const col of range(zone.left, zone.right + 1)) {
+                if (!this.isCellEmpty({ sheetId, col, row: zone.top - 1 })) {
+                    return { ...zone, top: zone.top - 1 };
+                }
+                if (!this.isCellEmpty({ sheetId, col, row: zone.bottom + 1 })) {
+                    return { ...zone, bottom: zone.bottom + 1 };
+                }
+            }
+            for (const row of range(zone.top, zone.bottom + 1)) {
+                if (!this.isCellEmpty({ sheetId, col: zone.left - 1, row })) {
+                    return { ...zone, left: zone.left - 1 };
+                }
+                if (!this.isCellEmpty({ sheetId, col: zone.right + 1, row })) {
+                    return { ...zone, right: zone.right + 1 };
+                }
+            }
+            return zone;
+        };
+        let hasExpanded = false;
+        let zone = zoneToExpand;
+        do {
+            hasExpanded = false;
+            const newZone = expandZone(zone);
+            if (!isEqual(zone, newZone)) {
+                hasExpanded = true;
+                zone = newZone;
+                continue;
+            }
+        } while (hasExpanded);
+        return zone;
+    }
+    /**
+     * Check if a cell is empty. If the cell is part of a merge,
+     * check if the merge containing the cell is empty.
+     */
+    isCellEmpty(position) {
+        const mainPosition = this.getters.getMainCellPosition(position);
+        const cell = this.getters.getEvaluatedCell(mainPosition);
+        return cell.type === CellValueType.empty;
+    }
     getColMaxWidth(sheetId, index) {
         const cellsPositions = positions(this.getters.getColsZone(sheetId, index, index));
         const sizes = cellsPositions.map((position) => this.getCellWidth({ sheetId, ...position }));
@@ -46812,11 +47070,14 @@ class ClipboardPlugin extends UIPlugin {
                 }
                 const pasteOption = cmd.pasteOption || (this.paintFormatStatus !== "inactive" ? "onlyFormat" : undefined);
                 this.state.paste(cmd.target, { pasteOption, shouldPasteCF: true, selectTarget: true });
+                if (this.state.operation === "CUT") {
+                    this.state = undefined;
+                }
                 this.lastPasteState = this.state;
                 if (this.paintFormatStatus === "oneOff") {
                     this.paintFormatStatus = "inactive";
-                    this.status = "invisible";
                 }
+                this.status = "invisible";
                 break;
             case "COPY_PASTE_CELLS_ABOVE":
                 {
@@ -47043,92 +47304,6 @@ class ClipboardPlugin extends UIPlugin {
     }
 }
-/**
- * Change the reference types inside the given token, if the token represent a range or a cell
- *
- * Eg. :
- *   A1 => $A$1 => A$1 => $A1 => A1
- *   A1:$B$1 => $A$1:B$1 => A$1:$B1 => $A1:B1 => A1:$B$1
- */
-function loopThroughReferenceType(token) {
-    if (token.type !== "REFERENCE")
-        return token;
-    const { xc, sheetName } = splitReference(token.value);
-    const [left, right] = xc.split(":");
-    const sheetRef = sheetName ? `${getCanonicalSheetName(sheetName)}!` : "";
-    const updatedLeft = getTokenNextReferenceType(left);
-    const updatedRight = right ? `:${getTokenNextReferenceType(right)}` : "";
-    return { ...token, value: sheetRef + updatedLeft + updatedRight };
-}
-/**
- * Get a new token with a changed type of reference from the given cell token symbol.
- * Undefined behavior if given a token other than a cell or if the Xc contains a sheet reference
- *
- * A1 => $A$1 => A$1 => $A1 => A1
- */
-function getTokenNextReferenceType(xc) {
-    switch (getReferenceType(xc)) {
-        case "none":
-            xc = setXcToReferenceType(xc, "colrow");
-            break;
-        case "colrow":
-            xc = setXcToReferenceType(xc, "row");
-            break;
-        case "row":
-            xc = setXcToReferenceType(xc, "col");
-            break;
-        case "col":
-            xc = setXcToReferenceType(xc, "none");
-            break;
-    }
-    return xc;
-}
-/**
- * Returns the given XC with the given reference type.
- */
-function setXcToReferenceType(xc, referenceType) {
-    xc = xc.replace(/\$/g, "");
-    let indexOfNumber;
-    switch (referenceType) {
-        case "col":
-            return "$" + xc;
-        case "row":
-            indexOfNumber = xc.search(/[0-9]/);
-            return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
-        case "colrow":
-            indexOfNumber = xc.search(/[0-9]/);
-            xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
-            return "$" + xc;
-        case "none":
-            return xc;
-    }
-}
-/**
- * Return the type of reference used in the given XC of a cell.
- * Undefined behavior if the XC have a sheet reference
- */
-function getReferenceType(xcCell) {
-    if (isColAndRowFixed(xcCell)) {
-        return "colrow";
-    }
-    else if (isColFixed(xcCell)) {
-        return "col";
-    }
-    else if (isRowFixed(xcCell)) {
-        return "row";
-    }
-    return "none";
-}
-function isColFixed(xc) {
-    return xc.startsWith("$");
-}
-function isRowFixed(xc) {
-    return xc.includes("$", 1);
-}
-function isColAndRowFixed(xc) {
-    return xc.startsWith("$") && xc.length > 1 && xc.slice(1).includes("$");
-}
 const CELL_DELETED_MESSAGE = _t("The cell you are trying to edit has been deleted.");
 class EditionPlugin extends UIPlugin {
     static getters = [
@@ -47850,6 +48025,8 @@ class FilterEvaluationPlugin extends UIPlugin {
             case "EVALUATE_CELLS":
             case "ACTIVATE_SHEET":
             case "REMOVE_FILTER_TABLE":
+            case "ADD_COLUMNS_ROWS":
+            case "REMOVE_COLUMNS_ROWS":
                 this.isEvaluationDirty = true;
                 break;
             case "START":
@@ -48044,32 +48221,32 @@ const selectionStatisticFunctions = [
     {
         name: _t("Sum"),
         types: [CellValueType.number],
-        compute: (values, locale) => SUM.compute.bind({ locale })([values]),
+        compute: (values, locale) => sum([[values]], locale),
     },
     {
         name: _t("Avg"),
         types: [CellValueType.number],
-        compute: (values, locale) => AVERAGE.compute.bind({ locale })([values]),
+        compute: (values, locale) => average([[values]], locale),
     },
     {
         name: _t("Min"),
         types: [CellValueType.number],
-        compute: (values, locale) => MIN.compute.bind({ locale })([values]),
+        compute: (values, locale) => min([[values]], locale),
     },
     {
         name: _t("Max"),
         types: [CellValueType.number],
-        compute: (values, locale) => MAX.compute.bind({ locale })([values]),
+        compute: (values, locale) => max([[values]], locale),
     },
     {
         name: _t("Count"),
         types: [CellValueType.number, CellValueType.text, CellValueType.boolean, CellValueType.error],
-        compute: (values, locale) => COUNTA.compute.bind({ locale })([values]),
+        compute: (values) => countAny([[values]]),
     },
     {
         name: _t("Count Numbers"),
         types: [CellValueType.number, CellValueType.text, CellValueType.boolean, CellValueType.error],
-        compute: (values, locale) => COUNT.compute.bind({ locale })([values]),
+        compute: (values, locale) => countNumbers([[values]], locale),
     },
 ];
 /**
@@ -51984,6 +52161,7 @@ class Spreadsheet extends owl.Component {
     };
     sidePanel;
     composer;
+    spreadsheetRef = owl.useRef("spreadsheet");
     _focusGrid;
     keyDownMapping;
     isViewportTooSmall = false;
@@ -52018,6 +52196,18 @@ class Spreadsheet extends owl.Component {
             clipboard: this.env.clipboard || instantiateClipboard(),
             startCellEdition: (content) => this.onGridComposerCellFocused(content),
         });
+        owl.useEffect(() => {
+            /**
+             * Only refocus the grid if the active element is not a child of the spreadsheet
+             * (i.e. activeElement is outside of the spreadsheetRef component)
+             * and spreadsheet is a child of that element. Anything else means that the focus
+             * is on an element that needs to keep it.
+             */
+            if (!this.spreadsheetRef.el.contains(document.activeElement) &&
+                document.activeElement?.contains(this.spreadsheetRef.el)) {
+                this.focusGrid();
+            }
+        }, () => [this.env.model.getters.getActiveSheetId()]);
         owl.useExternalListener(window, "resize", () => this.render(true));
         owl.useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this));
         this.bindModelEvents();
@@ -52099,7 +52289,7 @@ class Spreadsheet extends owl.Component {
     }
     focusGrid() {
         if (!this._focusGrid) {
-            throw new Error("_focusGrid should be exposed by the grid component");
+            return;
         }
         this._focusGrid();
     }
@@ -53368,7 +53558,7 @@ class SelectionStreamProcessorImpl {
                 scrollIntoView: false,
             });
         }
-        const tableZone = this.expandZoneToTable(anchor.zone);
+        const tableZone = this.getters.getContiguousZone(sheetId, anchor.zone);
         return !deepEquals(tableZone, anchor.zone)
             ? this.modifyAnchor({ ...anchor, zone: tableZone }, "updateAnchor", {
                 scrollIntoView: false,
@@ -53381,7 +53571,8 @@ class SelectionStreamProcessorImpl {
      * cells bordering it
      */
     selectTableAroundSelection() {
-        const tableZone = this.expandZoneToTable(this.anchor.zone);
+        const sheetId = this.getters.getActiveSheetId();
+        const tableZone = this.getters.getContiguousZone(sheetId, this.anchor.zone);
         return this.modifyAnchor({ ...this.anchor, zone: tableZone }, "updateAnchor", {
             scrollIntoView: false,
         });
@@ -53558,11 +53749,12 @@ class SelectionStreamProcessorImpl {
      * next cluster if the given cell is outside a cluster or at the border of a cluster in the given direction.
      */
     getEndOfCluster(startPosition, dim, dir) {
-        const sheet = this.getters.getActiveSheet();
+        const sheetId = this.getters.getActiveSheetId();
         let currentPosition = startPosition;
         // If both the current cell and the next cell are not empty, we want to go to the end of the cluster
         const nextCellPosition = this.getNextCellPosition(startPosition, dim, dir);
-        let mode = !this.isCellEmpty(currentPosition, sheet.id) && !this.isCellEmpty(nextCellPosition, sheet.id)
+        let mode = !this.getters.isCellEmpty({ ...currentPosition, sheetId }) &&
+            !this.getters.isCellEmpty({ ...nextCellPosition, sheetId })
             ? "endOfCluster"
             : "nextCluster";
         while (true) {
@@ -53572,7 +53764,7 @@ class SelectionStreamProcessorImpl {
                 currentPosition.row === nextCellPosition.row) {
                 break;
             }
-            const isNextCellEmpty = this.isCellEmpty(nextCellPosition, sheet.id);
+            const isNextCellEmpty = this.getters.isCellEmpty({ ...nextCellPosition, sheetId });
             if (mode === "endOfCluster" && isNextCellEmpty) {
                 break;
             }
@@ -53585,15 +53777,6 @@ class SelectionStreamProcessorImpl {
         }
         return dim === "cols" ? currentPosition.col : currentPosition.row;
     }
-    /**
-     * Check if a cell is empty or undefined in the model. If the cell is part of a merge,
-     * check if the merge containing the cell is empty.
-     */
-    isCellEmpty({ col, row }, sheetId = this.getters.getActiveSheetId()) {
-        const position = this.getters.getMainCellPosition({ sheetId, col, row });
-        const cell = this.getters.getEvaluatedCell(position);
-        return cell.type === CellValueType.empty;
-    }
     /** Computes the next cell position in the given direction by crossing through merges and skipping hidden cells.
      *
      * This has the same behaviour as getNextAvailablePosition() for certain arguments, but use this method instead
@@ -53612,45 +53795,6 @@ class SelectionStreamProcessorImpl {
     getPosition() {
         return { ...this.anchor.cell };
     }
-    /**
-     * Expand the given zone to a table.
-     * We define a table by the smallest zone that contain the anchor and that have only empty
-     * cells bordering it
-     */
-    expandZoneToTable(zoneToExpand) {
-        /** Try to expand the zone by one col/row in any direction to include a new non-empty cell */
-        const expandZone = (zone) => {
-            for (const col of range(zone.left, zone.right + 1)) {
-                if (!this.isCellEmpty({ col, row: zone.top - 1 })) {
-                    return { ...zone, top: zone.top - 1 };
-                }
-                if (!this.isCellEmpty({ col, row: zone.bottom + 1 })) {
-                    return { ...zone, bottom: zone.bottom + 1 };
-                }
-            }
-            for (const row of range(zone.top, zone.bottom + 1)) {
-                if (!this.isCellEmpty({ col: zone.left - 1, row })) {
-                    return { ...zone, left: zone.left - 1 };
-                }
-                if (!this.isCellEmpty({ col: zone.right + 1, row })) {
-                    return { ...zone, right: zone.right + 1 };
-                }
-            }
-            return zone;
-        };
-        let hasExpanded = false;
-        let zone = zoneToExpand;
-        do {
-            hasExpanded = false;
-            const newZone = expandZone(zone);
-            if (!isEqual(zone, newZone)) {
-                hasExpanded = true;
-                zone = newZone;
-                continue;
-            }
-        } while (hasExpanded);
-        return zone;
-    }
 }
 class StateObserver {
@@ -55538,19 +55682,22 @@ class Model extends EventBus {
      * Check if the given command is allowed by all the plugins and the history.
      */
     checkDispatchAllowed(command) {
-        if (isCoreCommand(command)) {
-            return this.checkDispatchAllowedCoreCommand(command);
+        const results = isCoreCommand(command)
+            ? this.checkDispatchAllowedCoreCommand(command)
+            : this.checkDispatchAllowedLocalCommand(command);
+        if (results.some((r) => r !== "Success" /* CommandResult.Success */)) {
+            return new DispatchResult(results.flat());
         }
-        return this.checkDispatchAllowedLocalCommand(command);
+        return DispatchResult.Success;
     }
     checkDispatchAllowedCoreCommand(command) {
         const results = this.corePlugins.map((handler) => handler.allowDispatch(command));
         results.push(this.range.allowDispatch(command));
-        return new DispatchResult(results.flat());
+        return results;
     }
     checkDispatchAllowedLocalCommand(command) {
         const results = this.uiHandlers.map((handler) => handler.allowDispatch(command));
-        return new DispatchResult(results.flat());
+        return results;
     }
     finalize() {
         this.status = 3 /* Status.Finalizing */;
@@ -55845,6 +55992,7 @@ const components = {
     FigureComponent,
     Menu,
     SelectionInput,
+    ValidationMessages,
 };
 const hooks = {
     useDragAndDropListItems,
@@ -55873,6 +56021,7 @@ exports.__info__ = __info__;
 exports.addFunction = addFunction;
 exports.astToFormula = astToFormula;
 exports.compile = compile;
+exports.compileTokens = compileTokens;
 exports.components = components;
 exports.constants = constants;
 exports.convertAstNodes = convertAstNodes;
@@ -55888,6 +56037,7 @@ exports.iterateAstNodes = iterateAstNodes;
 exports.links = links;
 exports.load = load;
 exports.parse = parse;
+exports.parseTokens = parseTokens;
 exports.readonlyAllowedCommands = readonlyAllowedCommands;
 exports.registries = registries;
 exports.setDefaultSheetViewSize = setDefaultSheetViewSize;
@@ -55895,6 +56045,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
-__info__.version = "17.1.0-alpha.2";
-__info__.date = "2023-11-03T12:24:57.341Z";
-__info__.hash = "0595868";
+__info__.version = "17.1.0-alpha.4";
+__info__.date = "2023-11-24T13:12:24.882Z";
+__info__.hash = "255821b";