@odoo/o-spreadsheet 16.4.14 → 16.4.16

package/dist/o-spreadsheet.cjs.js

@@ -301,13 +301,6 @@ const NEWLINE = "\n";
 const FONT_SIZES = [6, 7, 8, 9, 10, 11, 12, 14, 18, 24, 36];
 
 //------------------------------------------------------------------------------
-/**
- * Stringify an object, like JSON.stringify, except that the first level of keys
- * is ordered.
- */
-function stringify(obj) {
-    return JSON.stringify(obj, Object.keys(obj).sort());
-}
 /**
  * Remove quotes from a quoted string
  * ```js
@@ -527,7 +520,7 @@ function isObjectEmptyRecursive(argument) {
  */
 function getItemId(item, itemsDic) {
     for (let [key, value] of Object.entries(itemsDic)) {
-        if (stringify(value) === stringify(item)) {
+        if (deepEquals(value, item)) {
             return parseInt(key, 10);
         }
     }
@@ -672,8 +665,7 @@ function transpose2dArray(matrix, callback = (val) => val) {
  *
  * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
  */
-const whiteSpaceCharacters = [
-    " ",
+const whiteSpaceSpecialCharacters = [
     "\t",
     "\f",
     "\v",
@@ -688,8 +680,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.
@@ -697,9 +688,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.
@@ -2347,8 +2338,10 @@ function convertInternalFormatToFormat(internalFormat) {
 const cellReference = new RegExp(/\$?([A-Z]{1,3})\$?([0-9]{1,7})/, "i");
 // Same as above, but matches the exact string (nothing before or after)
 const singleCellReference = new RegExp(/^\$?([A-Z]{1,3})\$?([0-9]{1,7})$/, "i");
-/** Reference of a column header (eg. A, AB) */
-const colHeader = new RegExp(/^([A-Z]{1,3})+$/, "i");
+/** Reference of a column header (eg. A, AB, $A) */
+const colHeader = new RegExp(/^\$?([A-Z]{1,3})+$/, "i");
+/** Reference of a row header (eg. 1, $1) */
+const rowHeader = new RegExp(/^\$?([0-9]{1,7})+$/, "i");
 /** Reference of a column (eg. A, $CA, Sheet1!B) */
 const colReference = new RegExp(/^\s*('.+'!|[^']+!)?\$?([A-Z]{1,3})$/, "i");
 /** Reference of a row (eg. 1, 59, Sheet1!9) */
@@ -2378,6 +2371,9 @@ function isRowReference(xc) {
 function isColHeader(str) {
     return colHeader.test(str);
 }
+function isRowHeader(str) {
+    return rowHeader.test(str);
+}
 /**
  * Return true if the given xc is the reference of a single cell,
  * without any specified sheet (e.g. A1)
@@ -3050,18 +3046,10 @@ class RangeImpl {
         if (isFullCol) {
             parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
             parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-            if (zone.left === zone.right) {
-                parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
-                parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-            }
         }
         if (isFullRow) {
             parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
             parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-            if (zone.top === zone.bottom) {
-                parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-                parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-            }
         }
         return parts;
     }
@@ -4269,6 +4257,7 @@ exports.CommandResult = void 0;
     CommandResult[CommandResult["NoActiveSheet"] = 94] = "NoActiveSheet";
     CommandResult[CommandResult["InvalidLocale"] = 95] = "InvalidLocale";
     CommandResult[CommandResult["AlreadyInPaintingFormatMode"] = 96] = "AlreadyInPaintingFormatMode";
+    CommandResult[CommandResult["NoChanges"] = 97] = "NoChanges";
 })(exports.CommandResult || (exports.CommandResult = {}));
 
 const borderStyles = ["thin", "medium", "thick", "dashed", "dotted"];
@@ -4358,12 +4347,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, "");
-}
+});
 /**
  * Normalize a value.
  * If the cell value is a string, this will set it to lowercase and replacing accent letters with plain letters
@@ -5649,6 +5638,9 @@ function* iterateChildren(el) {
 }
 function getOpenedMenus() {
     return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
+}
+function isMacOS() {
+    return navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;
 }
 
 /**
@@ -14174,7 +14166,7 @@ function tokenize(str, locale = DEFAULT_LOCALE) {
     return result;
 }
 function tokenizeDebugger(chars) {
-    if (chars.current() === "?") {
+    if (chars.current === "?") {
         chars.shift();
         return { type: "DEBUGGER", value: "?" };
     }
@@ -14185,7 +14177,7 @@ const misc = {
     ")": "RIGHT_PAREN",
 };
 function tokenizeMisc(chars) {
-    if (chars.current() in misc) {
+    if (chars.current in misc) {
         const value = chars.shift();
         const type = misc[value];
         return { type, value };
@@ -14193,7 +14185,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 };
@@ -14218,14 +14210,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 {
@@ -14252,14 +14243,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;
                 }
@@ -14275,7 +14266,7 @@ function tokenizeSymbol(chars) {
             };
         }
     }
-    while (chars.current() && separatorRegexp.test(chars.current())) {
+    while (chars.current && separatorRegexp.test(chars.current)) {
         result += chars.shift();
     }
     if (result.length) {
@@ -14290,14 +14281,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();
     }
@@ -14316,17 +14307,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;
@@ -14703,7 +14697,7 @@ const machine = {
         SPACE: goTo(State.RightRef),
         NUMBER: goTo(State.Found),
         REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value) || isRowHeader(token.value)),
     },
     [State.RightColumnRef]: {
         SPACE: goTo(State.RightColumnRef),
@@ -14714,6 +14708,7 @@ const machine = {
         SPACE: goTo(State.RightRowRef),
         NUMBER: goTo(State.Found),
         REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isRowHeader(token.value)),
     },
     [State.Found]: {},
 };
@@ -16871,7 +16866,7 @@ function createGaugeChartRuntime(chart, getters) {
     });
     return {
         chartJsConfig: config,
-        background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+        background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
     };
 }
 
@@ -17595,7 +17590,7 @@ function createScorecardChartRuntime(chart, getters) {
         };
         baselineCell = getters.getEvaluatedCell(baselinePosition);
     }
-    const background = getters.getBackgroundOfSingleCellChart(chart.background, chart.keyValue);
+    const { background, fontColor } = getters.getStyleOfSingleCellChart(chart.background, chart.keyValue);
     const locale = getters.getLocale();
     return {
         title: _t(chart.title),
@@ -17604,7 +17599,7 @@ function createScorecardChartRuntime(chart, getters) {
         baselineArrow: getBaselineArrowDirection(baselineCell, keyValueCell, chart.baselineMode),
         baselineColor: getBaselineColor(baselineCell, chart.baselineMode, keyValueCell, chart.baselineColorUp, chart.baselineColorDown),
         baselineDescr: chart.baselineDescr ? _t(chart.baselineDescr) : "",
-        fontColor: chartFontColor(background),
+        fontColor,
         background,
         baselineStyle: chart.baselineMode !== "percentage" && baseline
             ? getters.getCellStyle({
@@ -25620,6 +25615,7 @@ class AbstractResizer extends owl.Component {
         draggerShadowThickness: 0,
         delta: 0,
         base: 0,
+        position: "before",
     });
     _computeHandleDisplay(ev) {
         const position = this._getEvOffset(ev);
@@ -25744,11 +25740,13 @@ class AbstractResizer extends owl.Component {
                     this.state.draggerLinePosition = dimensions.start;
                     this.state.draggerShadowPosition = dimensions.start;
                     this.state.base = elementIndex;
+                    this.state.position = "before";
                 }
                 else if (this._getSelectedZoneEnd() < elementIndex) {
                     this.state.draggerLinePosition = dimensions.end;
                     this.state.draggerShadowPosition = dimensions.end - this.state.draggerShadowThickness;
-                    this.state.base = elementIndex + 1;
+                    this.state.base = elementIndex;
+                    this.state.position = "after";
                 }
                 else {
                     this.state.draggerLinePosition = startDimensions.start;
@@ -25931,6 +25929,7 @@ class ColResizer extends AbstractResizer {
             dimension: "COL",
             base: this.state.base,
             elements,
+            position: this.state.position,
         });
         if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
             this.env.raiseError(MergeErrorMessage);
@@ -26104,6 +26103,7 @@ class RowResizer extends AbstractResizer {
             dimension: "ROW",
             base: this.state.base,
             elements,
+            position: this.state.position,
         });
         if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
             this.env.raiseError(MergeErrorMessage);
@@ -26211,8 +26211,8 @@ function useWheelHandler(handler) {
         return val * (deltaMode === 0 ? 1 : DEFAULT_CELL_HEIGHT);
     }
     const onMouseWheel = (ev) => {
-        const deltaX = normalize(ev.shiftKey ? ev.deltaY : ev.deltaX, ev.deltaMode);
-        const deltaY = normalize(ev.shiftKey ? ev.deltaX : ev.deltaY, ev.deltaMode);
+        const deltaX = normalize(ev.shiftKey && !isMacOS() ? ev.deltaY : ev.deltaX, ev.deltaMode);
+        const deltaY = normalize(ev.shiftKey && !isMacOS() ? ev.deltaX : ev.deltaY, ev.deltaMode);
         handler(deltaX, deltaY);
     };
     return onMouseWheel;
@@ -31170,6 +31170,14 @@ class BordersPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
+    allowDispatch(cmd) {
+        switch (cmd.type) {
+            case "SET_BORDER":
+                return this.checkBordersUnchanged(cmd);
+            default:
+                return 0 /* CommandResult.Success */;
+        }
+    }
     handle(cmd) {
         switch (cmd.type) {
             case "ADD_MERGE":
@@ -31589,6 +31597,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 97 /* CommandResult.NoChanges */;
+        }
+        return 0 /* CommandResult.Success */;
+    }
     // ---------------------------------------------------------------------------
     // Import/Export
     // ---------------------------------------------------------------------------
@@ -31625,7 +31641,7 @@ class BordersPlugin extends CorePlugin {
          */
         function getBorderId(border) {
             for (let [key, value] of Object.entries(borders)) {
-                if (stringify(value) === stringify(border)) {
+                if (deepEquals(value, border)) {
                     return parseInt(key, 10);
                 }
             }
@@ -31696,8 +31712,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 0 /* CommandResult.Success */;
         }
@@ -31856,14 +31873,9 @@ 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
@@ -32089,13 +32101,23 @@ class CellPlugin extends CorePlugin {
             dependencies: [],
         };
     }
-    checkCellOutOfSheet(sheetId, col, row) {
+    checkCellOutOfSheet(cmd) {
+        const { sheetId, col, row } = cmd;
         const sheet = this.getters.tryGetSheet(sheetId);
         if (!sheet)
             return 28 /* CommandResult.InvalidSheetId */;
         const sheetZone = this.getters.getSheetZone(sheetId);
         return isInside(col, row, sheetZone) ? 0 /* CommandResult.Success */ : 19 /* CommandResult.TargetOutOfSheet */;
     }
+    checkUselessClearCell(cmd) {
+        const cell = this.getters.getCell(cmd);
+        if (!cell)
+            return 97 /* CommandResult.NoChanges */;
+        if (!cell.content && !cell.style && !cell.format) {
+            return 97 /* CommandResult.NoChanges */;
+        }
+        return 0 /* CommandResult.Success */;
+    }
 }
 class FormulaCellWithDependencies {
     id;
@@ -34528,7 +34550,7 @@ class SheetPlugin extends CorePlugin {
                 const elements = cmd.dimension === "COL"
                     ? this.getNumberCols(cmd.sheetId)
                     : this.getNumberRows(cmd.sheetId);
-                if (cmd.base < 0 || cmd.base > elements) {
+                if (cmd.base < 0 || cmd.base >= elements) {
                     return 88 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else if (cmd.quantity <= 0) {
@@ -35164,10 +35186,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) {
@@ -35189,8 +35214,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");
         }
@@ -35291,35 +35314,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
      *
@@ -35435,6 +35443,7 @@ class CompilationParametersBuilder {
     getters;
     computeCell;
     evalContext;
+    rangeCache = {};
     constructor(context, getters, computeCell) {
         this.getters = getters;
         this.computeCell = computeCell;
@@ -35482,10 +35491,13 @@ class CompilationParametersBuilder {
         if (evaluatedCell === undefined) {
             return { value: null, format: this.getters.getCell(position)?.format };
         }
+        if (evaluatedCell.type === CellValueType.error) {
+            throw evaluatedCell.error;
+        }
         return evaluatedCell;
     }
     getEvaluatedCellIfNotEmpty(position) {
-        const evaluatedCell = this.getEvaluatedCell(position);
+        const evaluatedCell = this.computeCell(position);
         if (evaluatedCell.type === CellValueType.empty) {
             const cell = this.getters.getCell(position);
             if (!cell || (!cell.isFormula && cell.content === "")) {
@@ -35494,13 +35506,6 @@ class CompilationParametersBuilder {
         }
         return evaluatedCell;
     }
-    getEvaluatedCell(position) {
-        const evaluatedCell = this.computeCell(position);
-        if (evaluatedCell.type === CellValueType.error) {
-            throw evaluatedCell.error;
-        }
-        return evaluatedCell;
-    }
     /**
      * Return the values of the cell(s) used in reference, but always in the format of a range even
      * if a single cell is referenced. It is a list of col values. This is useful for the formulas that describe parameters as
@@ -35520,25 +35525,40 @@ class CompilationParametersBuilder {
         if (!_zone) {
             return { value: [[]], format: [[]] };
         }
+        const { top, left, bottom, right } = zone;
+        const cacheKey = `${sheetId}-${top}-${left}-${bottom}-${right}`;
+        if (cacheKey in this.rangeCache) {
+            const result = this.rangeCache[cacheKey];
+            if (result instanceof EvaluationError) {
+                throw result;
+            }
+            return result;
+        }
         const height = _zone.bottom - _zone.top + 1;
         const width = _zone.right - _zone.left + 1;
-        const value = Array.from({ length: width }, () => Array.from({ length: height }));
-        const format = Array.from({ length: width }, () => Array.from({ length: height }));
+        const value = new Array(width);
+        const format = 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;
+            value[colIndex] = new Array(height);
+            format[colIndex] = new Array(height);
             for (let row = _zone.top; row <= _zone.bottom; row++) {
-                const evaluatedCell = this.getEvaluatedCellIfNotEmpty({ sheetId: sheetId, col, row });
-                if (evaluatedCell) {
-                    const colIndex = col - _zone.left;
-                    const rowIndex = row - _zone.top;
-                    value[colIndex][rowIndex] = evaluatedCell.value;
-                    if (evaluatedCell.format !== undefined) {
-                        format[colIndex][rowIndex] = evaluatedCell.format;
-                    }
+                const evaluatedCell = this.getEvaluatedCellIfNotEmpty({ sheetId, col, row });
+                if (evaluatedCell?.type === CellValueType.error) {
+                    this.rangeCache[cacheKey] = evaluatedCell.error;
+                    throw evaluatedCell.error;
+                }
+                const rowIndex = row - _zone.top;
+                value[colIndex][rowIndex] = evaluatedCell?.value;
+                if (evaluatedCell?.format !== undefined) {
+                    format[colIndex][rowIndex] = evaluatedCell.format;
                 }
             }
         }
-        return { value, format };
+        const result = { value, format };
+        this.rangeCache[cacheKey] = result;
+        return result;
     }
 }
 
@@ -35736,6 +35756,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) {
@@ -35779,6 +35800,15 @@ class Evaluator {
         this.evaluatedCells = new Map();
         this.evaluate(this.getAllCells());
     }
+    evaluateFormula(sheetId, formulaString) {
+        const compiledFormula = compile(formulaString);
+        const ranges = [];
+        for (let xc of compiledFormula.dependencies) {
+            ranges.push(this.getters.getRangeFromSheetXC(sheetId, xc));
+        }
+        this.updateCompilationParameters();
+        return compiledFormula.execute(ranges, ...this.compilationParams).value;
+    }
     getAllCells() {
         const positionIds = new JetSet();
         for (const sheetId of this.getters.getSheetIds()) {
@@ -35805,6 +35835,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) {
@@ -36189,7 +36220,6 @@ class PositionBitsEncoder {
 // of other cells depending on it, at the next iteration.
 //#endregion
 class EvaluationPlugin extends UIPlugin {
-    config;
     static getters = [
         "evaluateFormula",
         "getRangeFormattedValues",
@@ -36201,12 +36231,9 @@ class EvaluationPlugin extends UIPlugin {
     ];
     shouldRebuildDependenciesGraph = true;
     evaluator;
-    compilationParams;
     positionsToUpdate = [];
     constructor(config) {
         super(config);
-        this.config = config;
-        this.compilationParams = this.getCompilationParameters();
         this.evaluator = new Evaluator(config.custom, this.getters);
     }
     // ---------------------------------------------------------------------------
@@ -36231,10 +36258,6 @@ class EvaluationPlugin extends UIPlugin {
             case "EVALUATE_CELLS":
                 this.evaluator.evaluateAllCells();
                 break;
-            case "UPDATE_LOCALE":
-                this.compilationParams = this.getCompilationParameters();
-                this.evaluator.updateCompilationParameters();
-                break;
         }
     }
     finalize() {
@@ -36252,12 +36275,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));
-        }
-        return compiledFormula.execute(ranges, ...this.compilationParams).value;
+        return this.evaluator.evaluateFormula(sheetId, formulaString);
     }
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
@@ -36356,9 +36374,6 @@ class EvaluationPlugin extends UIPlugin {
         }
         return undefined;
     }
-    getCompilationParameters() {
-        return buildCompilationParameters(this.config.custom, this.getters, (position) => this.evaluator.getEvaluatedCell(position));
-    }
 }
 function isBadExpression(formula) {
     try {
@@ -36523,7 +36538,7 @@ class CustomColorsPlugin extends UIPlugin {
 }
 
 class EvaluationChartPlugin extends UIPlugin {
-    static getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+    static getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
     charts = {};
     createRuntimeChart = chartRuntimeFactory(this.getters);
     handle(cmd) {
@@ -36561,25 +36576,26 @@ class EvaluationChartPlugin extends UIPlugin {
         return this.charts[figureId];
     }
     /**
-     * Get the background color of a chart based on the color of the first cell of the main range
-     * of the chart. In order of priority, it will return :
-     *
-     *  - the chart background color if one is defined
-     *  - the fill color of the cell if one is defined
-     *  - the fill color of the cell from conditional formats if one is defined
-     *  - the default chart color if no other color is defined
+     * Get the background and textColor of a chart based on the color of the first cell of the main range of the chart.
      */
-    getBackgroundOfSingleCellChart(chartBackground, mainRange) {
+    getStyleOfSingleCellChart(chartBackground, mainRange) {
         if (chartBackground)
-            return chartBackground;
+            return { background: chartBackground, fontColor: chartFontColor(chartBackground) };
         if (!mainRange) {
-            return BACKGROUND_CHART_COLOR;
+            return {
+                background: BACKGROUND_CHART_COLOR,
+                fontColor: chartFontColor(BACKGROUND_CHART_COLOR),
+            };
         }
         const col = mainRange.zone.left;
         const row = mainRange.zone.top;
         const sheetId = mainRange.sheetId;
         const style = this.getters.getCellComputedStyle({ sheetId, col, row });
-        return style.fillColor || BACKGROUND_CHART_COLOR;
+        const background = style.fillColor || BACKGROUND_CHART_COLOR;
+        return {
+            background,
+            fontColor: style.textColor || chartFontColor(background),
+        };
     }
 }
 
@@ -37278,19 +37294,21 @@ class AutofillPlugin extends UIPlugin {
         let col = zone.left;
         let row = zone.bottom;
         if (col > 0) {
-            let left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
-            while (left.type !== CellValueType.empty) {
+            let leftPosition = { sheetId, col: col - 1, row };
+            while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+                this.getters.getCell(leftPosition)?.content) {
                 row += 1;
-                left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
+                leftPosition = { sheetId, col: col - 1, row };
             }
         }
         if (row === zone.bottom) {
             col = zone.right;
             if (col <= this.getters.getNumberCols(sheetId)) {
-                let right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
-                while (right.type !== CellValueType.empty) {
+                let rightPosition = { sheetId, col: col + 1, row };
+                while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                    this.getters.getCell(rightPosition)?.content) {
                     row += 1;
-                    right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                    rightPosition = { sheetId, col: col + 1, row };
                 }
             }
         }
@@ -40208,6 +40226,9 @@ class SelectionInputsManagerPlugin extends UIPlugin {
     // Other
     // ---------------------------------------------------------------------------
     initInput(id, initialRanges, inputHasSingleRange = false) {
+        if (this.inputs[id]) {
+            this.unfocus();
+        }
         this.inputs[id] = new SelectionInputPlugin(this.config, initialRanges, inputHasSingleRange);
         if (initialRanges.length === 0) {
             const input = this.inputs[id];
@@ -42075,8 +42096,8 @@ class ClipboardPlugin extends UIPlugin {
                 this.lastPasteState = this.state;
                 if (this.paintFormatStatus === "oneOff") {
                     this.paintFormatStatus = "inactive";
-                    this.status = "invisible";
                 }
+                this.status = "invisible";
                 break;
             case "CLEAN_CLIPBOARD_HIGHLIGHT":
                 this.status = "invisible";
@@ -42323,6 +42344,10 @@ function setXcToReferenceType(xc, referenceType) {
             return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
         case "colrow":
             indexOfNumber = xc.search(/[0-9]/);
+            if (indexOfNumber === -1 || indexOfNumber === 0) {
+                // no row number (eg. A) or no column (eg. 1)
+                return "$" + xc;
+            }
             xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
             return "$" + xc;
         case "none":
@@ -43738,7 +43763,7 @@ class GridSelectionPlugin extends UIPlugin {
             sheetId: cmd.sheetId,
             base: cmd.base,
             quantity: thickness,
-            position: "before",
+            position: cmd.position,
         });
         const isCol = cmd.dimension === "COL";
         const start = cmd.elements[0];
@@ -43755,12 +43780,13 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const base = isBasedBefore ? cmd.base : cmd.base + 1;
         const pasteTarget = [
             {
-                left: isCol ? cmd.base : 0,
-                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                top: !isCol ? cmd.base : 0,
-                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+                left: isCol ? base : 0,
+                right: isCol ? base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? base : 0,
+                bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
             },
         ];
         state.paste(pasteTarget, { selectTarget: true });
@@ -43797,6 +43823,11 @@ class GridSelectionPlugin extends UIPlugin {
             doesElementsHaveCommonMerges(id, cmd.base - 1, cmd.base)) {
             return 2 /* CommandResult.WillRemoveExistingMerge */;
         }
+        const headers = [cmd.base, ...cmd.elements];
+        const maxHeaderValue = isCol ? this.getters.getNumberCols(id) : this.getters.getNumberRows(id);
+        if (headers.some((h) => h < 0 || h >= maxHeaderValue)) {
+            return 88 /* CommandResult.InvalidHeaderIndex */;
+        }
         return 0 /* CommandResult.Success */;
     }
     //-------------------------------------------
@@ -47893,9 +47924,9 @@ function revertChanges(revisions) {
  * Apply the changes of the given HistoryChange to the state
  */
 function applyChange(change, target) {
-    let val = change.root;
-    let key = change.path[change.path.length - 1];
-    for (let pathIndex = 0; pathIndex < change.path.slice(0, -1).length; pathIndex++) {
+    let val = change.path[0];
+    const key = change.path[change.path.length - 1];
+    for (let pathIndex = 1; pathIndex < change.path.slice(0, -1).length; pathIndex++) {
         const p = change.path[pathIndex];
         if (val[p] === undefined) {
             const nextPath = change.path[pathIndex + 1];
@@ -48576,13 +48607,14 @@ class StateObserver {
     }
     addChange(...args) {
         const val = args.pop();
-        const [root, ...path] = args;
+        const root = args[0];
         let value = root;
-        let key = path[path.length - 1];
-        for (let pathIndex = 0; pathIndex <= path.length - 2; pathIndex++) {
-            const p = path[pathIndex];
+        let key = args[args.length - 1];
+        const pathLength = args.length - 2;
+        for (let pathIndex = 1; pathIndex <= pathLength; pathIndex++) {
+            const p = args[pathIndex];
             if (value[p] === undefined) {
-                const nextPath = path[pathIndex + 1];
+                const nextPath = args[pathIndex + 1];
                 value[p] = createEmptyStructure(nextPath);
             }
             value = value[p];
@@ -48591,8 +48623,7 @@ class StateObserver {
             return;
         }
         this.changes.push({
-            root,
-            path,
+            path: args,
             before: value[key],
             after: val,
         });
@@ -50442,19 +50473,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 !== 0 /* 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 */;
@@ -50778,6 +50812,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.14';
-__info__.date = '2023-11-16T11:59:51.900Z';
-__info__.hash = '66c6f47';
+__info__.version = '16.4.16';
+__info__.date = '2023-12-05T09:37:14.210Z';
+__info__.hash = '1abbb92';