@odoo/o-spreadsheet 16.1.28 → 16.1.33

package/dist/o-spreadsheet.esm.js

@@ -305,15 +305,76 @@ for (let font of fontSizes) {
 // -----------------------------------------------------------------------------
 // Date Type
 // -----------------------------------------------------------------------------
+/**
+ * A DateTime object that can be used to manipulate spreadsheet dates.
+ * Conceptually, a spreadsheet date is simply a number with a date format,
+ * and it is timezone-agnostic.
+ * This DateTime object consistently uses UTC time to represent a naive date and time.
+ */
+class DateTime {
+    constructor(year, month, day, hours = 0, minutes = 0, seconds = 0) {
+        this.jsDate = new Date(Date.UTC(year, month, day, hours, minutes, seconds, 0));
+    }
+    static fromTimestamp(timestamp) {
+        const date = new Date(timestamp);
+        return new DateTime(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds());
+    }
+    static now() {
+        const now = new Date();
+        return new DateTime(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds());
+    }
+    toString() {
+        return this.jsDate.toString();
+    }
+    getTime() {
+        return this.jsDate.getTime();
+    }
+    getFullYear() {
+        return this.jsDate.getUTCFullYear();
+    }
+    getMonth() {
+        return this.jsDate.getUTCMonth();
+    }
+    getDate() {
+        return this.jsDate.getUTCDate();
+    }
+    getDay() {
+        return this.jsDate.getUTCDay();
+    }
+    getHours() {
+        return this.jsDate.getUTCHours();
+    }
+    getMinutes() {
+        return this.jsDate.getUTCMinutes();
+    }
+    getSeconds() {
+        return this.jsDate.getUTCSeconds();
+    }
+    setFullYear(year) {
+        this.jsDate.setFullYear(year);
+    }
+    setDate(date) {
+        this.jsDate.setUTCDate(date);
+    }
+    setHours(hours) {
+        this.jsDate.setUTCHours(hours);
+    }
+    setMinutes(minutes) {
+        this.jsDate.setUTCMinutes(minutes);
+    }
+    setSeconds(seconds) {
+        this.jsDate.setUTCSeconds(seconds);
+    }
+}
 // -----------------------------------------------------------------------------
 // Parsing
 // -----------------------------------------------------------------------------
-const INITIAL_1900_DAY = new Date(1899, 11, 30);
+const INITIAL_1900_DAY = new DateTime(1899, 11, 30);
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 const CURRENT_MILLENIAL = 2000; // note: don't forget to update this in 2999
-const CURRENT_YEAR = new Date().getFullYear();
-const INITIAL_JS_DAY = new Date(0);
-const DATE_JS_1900_OFFSET = INITIAL_JS_DAY - INITIAL_1900_DAY;
+const CURRENT_YEAR = DateTime.now().getFullYear();
+const INITIAL_JS_DAY = DateTime.fromTimestamp(0);
+const DATE_JS_1900_OFFSET = INITIAL_JS_DAY.getTime() - INITIAL_1900_DAY.getTime();
 const mdyDateRegexp = /^\d{1,2}(\/|-|\s)\d{1,2}((\/|-|\s)\d{1,4})?$/;
 const ymdDateRegexp = /^\d{3,4}(\/|-|\s)\d{1,2}(\/|-|\s)\d{1,2}$/;
 const timeRegexp = /((\d+(:\d+)?(:\d+)?\s*(AM|PM))|(\d+:\d+(:\d+)?))$/;
@@ -362,7 +423,7 @@ function _parseDateTime(str) {
         return {
             value: date.value + time.value,
             format: date.format + " " + (time.format === "hhhh:mm:ss" ? "hh:mm:ss" : time.format),
-            jsDate: new Date(date.jsDate.getFullYear() + time.jsDate.getFullYear() - 1899, date.jsDate.getMonth() + time.jsDate.getMonth() - 11, date.jsDate.getDate() + time.jsDate.getDate() - 30, date.jsDate.getHours() + time.jsDate.getHours(), date.jsDate.getMinutes() + time.jsDate.getMinutes(), date.jsDate.getSeconds() + time.jsDate.getSeconds()),
+            jsDate: new DateTime(date.jsDate.getFullYear() + time.jsDate.getFullYear() - 1899, date.jsDate.getMonth() + time.jsDate.getMonth() - 11, date.jsDate.getDate() + time.jsDate.getDate() - 30, date.jsDate.getHours() + time.jsDate.getHours(), date.jsDate.getMinutes() + time.jsDate.getMinutes(), date.jsDate.getSeconds() + time.jsDate.getSeconds()),
         };
     }
     return date || time;
@@ -379,13 +440,13 @@ function parseDate(str, dateFormat) {
         const day = Number(parts[dayIndex]);
         const leadingZero = (parts[monthIndex].length === 2 && month < 10) || (parts[dayIndex].length === 2 && day < 10);
         const year = parts[yearIndex] ? inferYear(parts[yearIndex]) : CURRENT_YEAR;
-        const jsDate = new Date(year, month - 1, day);
+        const jsDate = new DateTime(year, month - 1, day);
         const sep = str.match(/\/|-|\s/)[0];
         if (jsDate.getMonth() !== month - 1 || jsDate.getDate() !== day) {
             // invalid date
             return null;
         }
-        const delta = jsDate - INITIAL_1900_DAY;
+        const delta = jsDate.getTime() - INITIAL_1900_DAY.getTime();
         let format = leadingZero ? `mm${sep}dd` : `m${sep}d`;
         if (parts[yearIndex]) {
             format = isMDY ? format + sep + "yyyy" : "yyyy" + sep + format;
@@ -445,7 +506,7 @@ function parseTime(str) {
         if (hours >= 24) {
             format = "hhhh:mm:ss";
         }
-        const jsDate = new Date(1899, 11, 30, hours, minutes, seconds);
+        const jsDate = new DateTime(1899, 11, 30, hours, minutes, seconds);
         return {
             value: hours / 24 + minutes / 1440 + seconds / 86400,
             format: format,
@@ -459,7 +520,7 @@ function parseTime(str) {
 // -----------------------------------------------------------------------------
 function numberToJsDate(value) {
     const truncValue = Math.trunc(value);
-    let date = new Date(truncValue * MS_PER_DAY - DATE_JS_1900_OFFSET);
+    let date = DateTime.fromTimestamp(truncValue * MS_PER_DAY - DATE_JS_1900_OFFSET);
     let time = value - truncValue;
     time = time < 0 ? 1 + time : time;
     const hours = Math.round(time * 24);
@@ -476,7 +537,7 @@ function jsDateToRoundNumber(date) {
 }
 /** Return the number of days in the current month of the given date */
 function getDaysInMonth(date) {
-    return new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate();
+    return new DateTime(date.getFullYear(), date.getMonth() + 1, 0).getDate();
 }
 function isLastDayOfMonth(date) {
     return getDaysInMonth(date) === date.getDate();
@@ -494,7 +555,7 @@ function addMonthsToDate(date, months, keepEndOfMonth) {
     const yStart = date.getFullYear();
     const mStart = date.getMonth();
     const dStart = date.getDate();
-    const jsDate = new Date(yStart, mStart + months);
+    const jsDate = new DateTime(yStart, mStart + months, 1);
     if (keepEndOfMonth && dStart === getDaysInMonth(date)) {
         jsDate.setDate(getDaysInMonth(jsDate));
     }
@@ -848,7 +909,7 @@ function isBoolean(str) {
 function isDateTime(str) {
     return parseDateTime(str) !== null;
 }
-const MARKDOWN_LINK_REGEX = /^\[([^\[]+)\]\((.+)\)$/;
+const MARKDOWN_LINK_REGEX = /^\[(.+)\]\((.+)\)$/;
 //link must start with http or https
 //https://stackoverflow.com/a/3809435/4760614
 const WEB_LINK_REGEX = /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/;
@@ -1343,8 +1404,10 @@ function isSameColor(color1, color2) {
 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) */
@@ -1374,6 +1437,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)
@@ -1872,7 +1938,7 @@ function formatJSTime(jsDate, format) {
         .map((p) => {
         switch (p) {
             case "hhhh":
-                const helapsedHours = Math.floor((jsDate.getTime() - INITIAL_1900_DAY) / (60 * 60 * 1000));
+                const helapsedHours = Math.floor((jsDate.getTime() - INITIAL_1900_DAY.getTime()) / (60 * 60 * 1000));
                 return helapsedHours.toString();
             case "hh":
                 return hours.toString().padStart(2, "0");
@@ -1935,27 +2001,30 @@ function detectFormat(content) {
 }
 function createLargeNumberFormat(format, magnitude, postFix) {
     const internalFormat = parseFormat(format || "#,##0");
-    const largeNumberFormat = internalFormat
-        .map((formatPart) => {
-        if (formatPart.type === "NUMBER") {
-            return [
-                {
-                    ...formatPart,
-                    format: {
-                        ...formatPart.format,
-                        magnitude,
-                        decimalPart: undefined,
-                    },
-                },
-                {
-                    type: "STRING",
-                    format: postFix,
-                },
-            ];
+    const largeNumberFormat = [];
+    for (let i = 0; i < internalFormat.length; i++) {
+        const formatPart = internalFormat[i];
+        if (formatPart.type !== "NUMBER") {
+            largeNumberFormat.push(formatPart);
+            continue;
         }
-        return formatPart;
-    })
-        .flat();
+        largeNumberFormat.push({
+            ...formatPart,
+            format: {
+                ...formatPart.format,
+                magnitude,
+                decimalPart: undefined,
+            },
+        });
+        largeNumberFormat.push({
+            type: "STRING",
+            format: postFix,
+        });
+        const nextFormatPart = internalFormat[i + 1];
+        if ((nextFormatPart === null || nextFormatPart === void 0 ? void 0 : nextFormatPart.type) === "STRING" && ["k", "m", "b"].includes(nextFormatPart.format)) {
+            i++;
+        }
+    }
     return convertInternalFormatToFormat(largeNumberFormat);
 }
 function changeDecimalPlaces(format, step) {
@@ -2163,18 +2232,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;
     }
@@ -3608,64 +3669,65 @@ var CommandResult;
     CommandResult[CommandResult["InvalidFigureId"] = 28] = "InvalidFigureId";
     CommandResult[CommandResult["InputAlreadyFocused"] = 29] = "InputAlreadyFocused";
     CommandResult[CommandResult["MaximumRangesReached"] = 30] = "MaximumRangesReached";
-    CommandResult[CommandResult["InvalidChartDefinition"] = 31] = "InvalidChartDefinition";
-    CommandResult[CommandResult["InvalidDataSet"] = 32] = "InvalidDataSet";
-    CommandResult[CommandResult["InvalidLabelRange"] = 33] = "InvalidLabelRange";
-    CommandResult[CommandResult["InvalidScorecardKeyValue"] = 34] = "InvalidScorecardKeyValue";
-    CommandResult[CommandResult["InvalidScorecardBaseline"] = 35] = "InvalidScorecardBaseline";
-    CommandResult[CommandResult["InvalidGaugeDataRange"] = 36] = "InvalidGaugeDataRange";
-    CommandResult[CommandResult["EmptyGaugeRangeMin"] = 37] = "EmptyGaugeRangeMin";
-    CommandResult[CommandResult["GaugeRangeMinNaN"] = 38] = "GaugeRangeMinNaN";
-    CommandResult[CommandResult["EmptyGaugeRangeMax"] = 39] = "EmptyGaugeRangeMax";
-    CommandResult[CommandResult["GaugeRangeMaxNaN"] = 40] = "GaugeRangeMaxNaN";
-    CommandResult[CommandResult["GaugeRangeMinBiggerThanRangeMax"] = 41] = "GaugeRangeMinBiggerThanRangeMax";
-    CommandResult[CommandResult["GaugeLowerInflectionPointNaN"] = 42] = "GaugeLowerInflectionPointNaN";
-    CommandResult[CommandResult["GaugeUpperInflectionPointNaN"] = 43] = "GaugeUpperInflectionPointNaN";
-    CommandResult[CommandResult["GaugeLowerBiggerThanUpper"] = 44] = "GaugeLowerBiggerThanUpper";
-    CommandResult[CommandResult["InvalidAutofillSelection"] = 45] = "InvalidAutofillSelection";
-    CommandResult[CommandResult["WrongComposerSelection"] = 46] = "WrongComposerSelection";
-    CommandResult[CommandResult["MinBiggerThanMax"] = 47] = "MinBiggerThanMax";
-    CommandResult[CommandResult["LowerBiggerThanUpper"] = 48] = "LowerBiggerThanUpper";
-    CommandResult[CommandResult["MidBiggerThanMax"] = 49] = "MidBiggerThanMax";
-    CommandResult[CommandResult["MinBiggerThanMid"] = 50] = "MinBiggerThanMid";
-    CommandResult[CommandResult["FirstArgMissing"] = 51] = "FirstArgMissing";
-    CommandResult[CommandResult["SecondArgMissing"] = 52] = "SecondArgMissing";
-    CommandResult[CommandResult["MinNaN"] = 53] = "MinNaN";
-    CommandResult[CommandResult["MidNaN"] = 54] = "MidNaN";
-    CommandResult[CommandResult["MaxNaN"] = 55] = "MaxNaN";
-    CommandResult[CommandResult["ValueUpperInflectionNaN"] = 56] = "ValueUpperInflectionNaN";
-    CommandResult[CommandResult["ValueLowerInflectionNaN"] = 57] = "ValueLowerInflectionNaN";
-    CommandResult[CommandResult["MinInvalidFormula"] = 58] = "MinInvalidFormula";
-    CommandResult[CommandResult["MidInvalidFormula"] = 59] = "MidInvalidFormula";
-    CommandResult[CommandResult["MaxInvalidFormula"] = 60] = "MaxInvalidFormula";
-    CommandResult[CommandResult["ValueUpperInvalidFormula"] = 61] = "ValueUpperInvalidFormula";
-    CommandResult[CommandResult["ValueLowerInvalidFormula"] = 62] = "ValueLowerInvalidFormula";
-    CommandResult[CommandResult["InvalidSortZone"] = 63] = "InvalidSortZone";
-    CommandResult[CommandResult["WaitingSessionConfirmation"] = 64] = "WaitingSessionConfirmation";
-    CommandResult[CommandResult["MergeOverlap"] = 65] = "MergeOverlap";
-    CommandResult[CommandResult["TooManyHiddenElements"] = 66] = "TooManyHiddenElements";
-    CommandResult[CommandResult["Readonly"] = 67] = "Readonly";
-    CommandResult[CommandResult["InvalidViewportSize"] = 68] = "InvalidViewportSize";
-    CommandResult[CommandResult["InvalidScrollingDirection"] = 69] = "InvalidScrollingDirection";
-    CommandResult[CommandResult["FigureDoesNotExist"] = 70] = "FigureDoesNotExist";
-    CommandResult[CommandResult["InvalidConditionalFormatId"] = 71] = "InvalidConditionalFormatId";
-    CommandResult[CommandResult["InvalidCellPopover"] = 72] = "InvalidCellPopover";
-    CommandResult[CommandResult["EmptyTarget"] = 73] = "EmptyTarget";
-    CommandResult[CommandResult["InvalidFreezeQuantity"] = 74] = "InvalidFreezeQuantity";
-    CommandResult[CommandResult["FrozenPaneOverlap"] = 75] = "FrozenPaneOverlap";
-    CommandResult[CommandResult["ValuesNotChanged"] = 76] = "ValuesNotChanged";
-    CommandResult[CommandResult["InvalidFilterZone"] = 77] = "InvalidFilterZone";
-    CommandResult[CommandResult["FilterOverlap"] = 78] = "FilterOverlap";
-    CommandResult[CommandResult["FilterNotFound"] = 79] = "FilterNotFound";
-    CommandResult[CommandResult["MergeInFilter"] = 80] = "MergeInFilter";
-    CommandResult[CommandResult["NonContinuousTargets"] = 81] = "NonContinuousTargets";
-    CommandResult[CommandResult["DuplicatedFigureId"] = 82] = "DuplicatedFigureId";
-    CommandResult[CommandResult["InvalidSelectionStep"] = 83] = "InvalidSelectionStep";
-    CommandResult[CommandResult["DuplicatedChartId"] = 84] = "DuplicatedChartId";
-    CommandResult[CommandResult["ChartDoesNotExist"] = 85] = "ChartDoesNotExist";
-    CommandResult[CommandResult["InvalidHeaderIndex"] = 86] = "InvalidHeaderIndex";
-    CommandResult[CommandResult["InvalidQuantity"] = 87] = "InvalidQuantity";
-    CommandResult[CommandResult["NoChanges"] = 88] = "NoChanges";
+    CommandResult[CommandResult["InvalidInputId"] = 31] = "InvalidInputId";
+    CommandResult[CommandResult["InvalidChartDefinition"] = 32] = "InvalidChartDefinition";
+    CommandResult[CommandResult["InvalidDataSet"] = 33] = "InvalidDataSet";
+    CommandResult[CommandResult["InvalidLabelRange"] = 34] = "InvalidLabelRange";
+    CommandResult[CommandResult["InvalidScorecardKeyValue"] = 35] = "InvalidScorecardKeyValue";
+    CommandResult[CommandResult["InvalidScorecardBaseline"] = 36] = "InvalidScorecardBaseline";
+    CommandResult[CommandResult["InvalidGaugeDataRange"] = 37] = "InvalidGaugeDataRange";
+    CommandResult[CommandResult["EmptyGaugeRangeMin"] = 38] = "EmptyGaugeRangeMin";
+    CommandResult[CommandResult["GaugeRangeMinNaN"] = 39] = "GaugeRangeMinNaN";
+    CommandResult[CommandResult["EmptyGaugeRangeMax"] = 40] = "EmptyGaugeRangeMax";
+    CommandResult[CommandResult["GaugeRangeMaxNaN"] = 41] = "GaugeRangeMaxNaN";
+    CommandResult[CommandResult["GaugeRangeMinBiggerThanRangeMax"] = 42] = "GaugeRangeMinBiggerThanRangeMax";
+    CommandResult[CommandResult["GaugeLowerInflectionPointNaN"] = 43] = "GaugeLowerInflectionPointNaN";
+    CommandResult[CommandResult["GaugeUpperInflectionPointNaN"] = 44] = "GaugeUpperInflectionPointNaN";
+    CommandResult[CommandResult["GaugeLowerBiggerThanUpper"] = 45] = "GaugeLowerBiggerThanUpper";
+    CommandResult[CommandResult["InvalidAutofillSelection"] = 46] = "InvalidAutofillSelection";
+    CommandResult[CommandResult["WrongComposerSelection"] = 47] = "WrongComposerSelection";
+    CommandResult[CommandResult["MinBiggerThanMax"] = 48] = "MinBiggerThanMax";
+    CommandResult[CommandResult["LowerBiggerThanUpper"] = 49] = "LowerBiggerThanUpper";
+    CommandResult[CommandResult["MidBiggerThanMax"] = 50] = "MidBiggerThanMax";
+    CommandResult[CommandResult["MinBiggerThanMid"] = 51] = "MinBiggerThanMid";
+    CommandResult[CommandResult["FirstArgMissing"] = 52] = "FirstArgMissing";
+    CommandResult[CommandResult["SecondArgMissing"] = 53] = "SecondArgMissing";
+    CommandResult[CommandResult["MinNaN"] = 54] = "MinNaN";
+    CommandResult[CommandResult["MidNaN"] = 55] = "MidNaN";
+    CommandResult[CommandResult["MaxNaN"] = 56] = "MaxNaN";
+    CommandResult[CommandResult["ValueUpperInflectionNaN"] = 57] = "ValueUpperInflectionNaN";
+    CommandResult[CommandResult["ValueLowerInflectionNaN"] = 58] = "ValueLowerInflectionNaN";
+    CommandResult[CommandResult["MinInvalidFormula"] = 59] = "MinInvalidFormula";
+    CommandResult[CommandResult["MidInvalidFormula"] = 60] = "MidInvalidFormula";
+    CommandResult[CommandResult["MaxInvalidFormula"] = 61] = "MaxInvalidFormula";
+    CommandResult[CommandResult["ValueUpperInvalidFormula"] = 62] = "ValueUpperInvalidFormula";
+    CommandResult[CommandResult["ValueLowerInvalidFormula"] = 63] = "ValueLowerInvalidFormula";
+    CommandResult[CommandResult["InvalidSortZone"] = 64] = "InvalidSortZone";
+    CommandResult[CommandResult["WaitingSessionConfirmation"] = 65] = "WaitingSessionConfirmation";
+    CommandResult[CommandResult["MergeOverlap"] = 66] = "MergeOverlap";
+    CommandResult[CommandResult["TooManyHiddenElements"] = 67] = "TooManyHiddenElements";
+    CommandResult[CommandResult["Readonly"] = 68] = "Readonly";
+    CommandResult[CommandResult["InvalidViewportSize"] = 69] = "InvalidViewportSize";
+    CommandResult[CommandResult["InvalidScrollingDirection"] = 70] = "InvalidScrollingDirection";
+    CommandResult[CommandResult["FigureDoesNotExist"] = 71] = "FigureDoesNotExist";
+    CommandResult[CommandResult["InvalidConditionalFormatId"] = 72] = "InvalidConditionalFormatId";
+    CommandResult[CommandResult["InvalidCellPopover"] = 73] = "InvalidCellPopover";
+    CommandResult[CommandResult["EmptyTarget"] = 74] = "EmptyTarget";
+    CommandResult[CommandResult["InvalidFreezeQuantity"] = 75] = "InvalidFreezeQuantity";
+    CommandResult[CommandResult["FrozenPaneOverlap"] = 76] = "FrozenPaneOverlap";
+    CommandResult[CommandResult["ValuesNotChanged"] = 77] = "ValuesNotChanged";
+    CommandResult[CommandResult["InvalidFilterZone"] = 78] = "InvalidFilterZone";
+    CommandResult[CommandResult["FilterOverlap"] = 79] = "FilterOverlap";
+    CommandResult[CommandResult["FilterNotFound"] = 80] = "FilterNotFound";
+    CommandResult[CommandResult["MergeInFilter"] = 81] = "MergeInFilter";
+    CommandResult[CommandResult["NonContinuousTargets"] = 82] = "NonContinuousTargets";
+    CommandResult[CommandResult["DuplicatedFigureId"] = 83] = "DuplicatedFigureId";
+    CommandResult[CommandResult["InvalidSelectionStep"] = 84] = "InvalidSelectionStep";
+    CommandResult[CommandResult["DuplicatedChartId"] = 85] = "DuplicatedChartId";
+    CommandResult[CommandResult["ChartDoesNotExist"] = 86] = "ChartDoesNotExist";
+    CommandResult[CommandResult["InvalidHeaderIndex"] = 87] = "InvalidHeaderIndex";
+    CommandResult[CommandResult["InvalidQuantity"] = 88] = "InvalidQuantity";
+    CommandResult[CommandResult["NoChanges"] = 89] = "NoChanges";
 })(CommandResult || (CommandResult = {}));
 
 function isMatrix(x) {
@@ -3939,11 +4001,11 @@ function checkDataset(definition) {
     if (definition.dataSets) {
         const invalidRanges = definition.dataSets.find((range) => !rangeReference.test(range)) !== undefined;
         if (invalidRanges) {
-            return 32 /* CommandResult.InvalidDataSet */;
+            return 33 /* CommandResult.InvalidDataSet */;
         }
         const zones = definition.dataSets.map(toUnboundedZone);
         if (zones.some((zone) => zone.top !== zone.bottom && isFullRow(zone))) {
-            return 32 /* CommandResult.InvalidDataSet */;
+            return 33 /* CommandResult.InvalidDataSet */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -3952,7 +4014,7 @@ function checkLabelRange(definition) {
     if (definition.labelRange) {
         const invalidLabels = !rangeReference.test(definition.labelRange || "");
         if (invalidLabels) {
-            return 33 /* CommandResult.InvalidLabelRange */;
+            return 34 /* CommandResult.InvalidLabelRange */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -4025,22 +4087,22 @@ function getChartPositionAtCenterOfViewport(getters, chartSize) {
 const CfTerms = {
     Errors: {
         [25 /* CommandResult.InvalidRange */]: _lt("The range is invalid"),
-        [51 /* CommandResult.FirstArgMissing */]: _lt("The argument is missing. Please provide a value"),
-        [52 /* CommandResult.SecondArgMissing */]: _lt("The second argument is missing. Please provide a value"),
-        [53 /* CommandResult.MinNaN */]: _lt("The minpoint must be a number"),
-        [54 /* CommandResult.MidNaN */]: _lt("The midpoint must be a number"),
-        [55 /* CommandResult.MaxNaN */]: _lt("The maxpoint must be a number"),
-        [56 /* CommandResult.ValueUpperInflectionNaN */]: _lt("The first value must be a number"),
-        [57 /* CommandResult.ValueLowerInflectionNaN */]: _lt("The second value must be a number"),
-        [47 /* CommandResult.MinBiggerThanMax */]: _lt("Minimum must be smaller then Maximum"),
-        [50 /* CommandResult.MinBiggerThanMid */]: _lt("Minimum must be smaller then Midpoint"),
-        [49 /* CommandResult.MidBiggerThanMax */]: _lt("Midpoint must be smaller then Maximum"),
-        [48 /* CommandResult.LowerBiggerThanUpper */]: _lt("Lower inflection point must be smaller than upper inflection point"),
-        [58 /* CommandResult.MinInvalidFormula */]: _lt("Invalid Minpoint formula"),
-        [60 /* CommandResult.MaxInvalidFormula */]: _lt("Invalid Maxpoint formula"),
-        [59 /* CommandResult.MidInvalidFormula */]: _lt("Invalid Midpoint formula"),
-        [61 /* CommandResult.ValueUpperInvalidFormula */]: _lt("Invalid upper inflection point formula"),
-        [62 /* CommandResult.ValueLowerInvalidFormula */]: _lt("Invalid lower inflection point formula"),
+        [52 /* CommandResult.FirstArgMissing */]: _lt("The argument is missing. Please provide a value"),
+        [53 /* CommandResult.SecondArgMissing */]: _lt("The second argument is missing. Please provide a value"),
+        [54 /* CommandResult.MinNaN */]: _lt("The minpoint must be a number"),
+        [55 /* CommandResult.MidNaN */]: _lt("The midpoint must be a number"),
+        [56 /* CommandResult.MaxNaN */]: _lt("The maxpoint must be a number"),
+        [57 /* CommandResult.ValueUpperInflectionNaN */]: _lt("The first value must be a number"),
+        [58 /* CommandResult.ValueLowerInflectionNaN */]: _lt("The second value must be a number"),
+        [48 /* CommandResult.MinBiggerThanMax */]: _lt("Minimum must be smaller then Maximum"),
+        [51 /* CommandResult.MinBiggerThanMid */]: _lt("Minimum must be smaller then Midpoint"),
+        [50 /* CommandResult.MidBiggerThanMax */]: _lt("Midpoint must be smaller then Maximum"),
+        [49 /* CommandResult.LowerBiggerThanUpper */]: _lt("Lower inflection point must be smaller than upper inflection point"),
+        [59 /* CommandResult.MinInvalidFormula */]: _lt("Invalid Minpoint formula"),
+        [61 /* CommandResult.MaxInvalidFormula */]: _lt("Invalid Maxpoint formula"),
+        [60 /* CommandResult.MidInvalidFormula */]: _lt("Invalid Midpoint formula"),
+        [62 /* CommandResult.ValueUpperInvalidFormula */]: _lt("Invalid upper inflection point formula"),
+        [63 /* CommandResult.ValueLowerInvalidFormula */]: _lt("Invalid lower inflection point formula"),
         [24 /* CommandResult.EmptyRange */]: _lt("A range needs to be defined"),
         Unexpected: _lt("The rule is invalid for an unknown reason"),
     },
@@ -4068,20 +4130,20 @@ const ChartTerms = {
     Errors: {
         Unexpected: _lt("The chart definition is invalid for an unknown reason"),
         // BASIC CHART ERRORS (LINE | BAR | PIE)
-        [32 /* CommandResult.InvalidDataSet */]: _lt("The dataset is invalid"),
-        [33 /* CommandResult.InvalidLabelRange */]: _lt("Labels are invalid"),
+        [33 /* CommandResult.InvalidDataSet */]: _lt("The dataset is invalid"),
+        [34 /* CommandResult.InvalidLabelRange */]: _lt("Labels are invalid"),
         // SCORECARD CHART ERRORS
-        [34 /* CommandResult.InvalidScorecardKeyValue */]: _lt("The key value is invalid"),
-        [35 /* CommandResult.InvalidScorecardBaseline */]: _lt("The baseline value is invalid"),
+        [35 /* CommandResult.InvalidScorecardKeyValue */]: _lt("The key value is invalid"),
+        [36 /* CommandResult.InvalidScorecardBaseline */]: _lt("The baseline value is invalid"),
         // GAUGE CHART ERRORS
-        [36 /* CommandResult.InvalidGaugeDataRange */]: _lt("The data range is invalid"),
-        [37 /* CommandResult.EmptyGaugeRangeMin */]: _lt("A minimum range limit value is needed"),
-        [38 /* CommandResult.GaugeRangeMinNaN */]: _lt("The minimum range limit value must be a number"),
-        [39 /* CommandResult.EmptyGaugeRangeMax */]: _lt("A maximum range limit value is needed"),
-        [40 /* CommandResult.GaugeRangeMaxNaN */]: _lt("The maximum range limit value must be a number"),
-        [41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */]: _lt("Minimum range limit must be smaller than maximum range limit"),
-        [42 /* CommandResult.GaugeLowerInflectionPointNaN */]: _lt("The lower inflection point value must be a number"),
-        [43 /* CommandResult.GaugeUpperInflectionPointNaN */]: _lt("The upper inflection point value must be a number"),
+        [37 /* CommandResult.InvalidGaugeDataRange */]: _lt("The data range is invalid"),
+        [38 /* CommandResult.EmptyGaugeRangeMin */]: _lt("A minimum range limit value is needed"),
+        [39 /* CommandResult.GaugeRangeMinNaN */]: _lt("The minimum range limit value must be a number"),
+        [40 /* CommandResult.EmptyGaugeRangeMax */]: _lt("A maximum range limit value is needed"),
+        [41 /* CommandResult.GaugeRangeMaxNaN */]: _lt("The maximum range limit value must be a number"),
+        [42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */]: _lt("Minimum range limit must be smaller than maximum range limit"),
+        [43 /* CommandResult.GaugeLowerInflectionPointNaN */]: _lt("The lower inflection point value must be a number"),
+        [44 /* CommandResult.GaugeUpperInflectionPointNaN */]: _lt("The upper inflection point value must be a number"),
     },
 };
 const NumberFormatTerms = {
@@ -4453,7 +4515,7 @@ function createBarChartRuntime(chart, getters) {
 
 function isDataRangeValid(definition) {
     return definition.dataRange && !rangeReference.test(definition.dataRange)
-        ? 36 /* CommandResult.InvalidGaugeDataRange */
+        ? 37 /* CommandResult.InvalidGaugeDataRange */
         : 0 /* CommandResult.Success */;
 }
 function checkRangeLimits(check, batchValidations) {
@@ -4485,7 +4547,7 @@ function checkInflectionPointsValue(check, batchValidations) {
 function checkRangeMinBiggerThanRangeMax(definition) {
     if (definition.sectionRule) {
         if (Number(definition.sectionRule.rangeMin) >= Number(definition.sectionRule.rangeMax)) {
-            return 41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */;
+            return 42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -4494,9 +4556,9 @@ function checkEmpty(value, valueName) {
     if (value === "") {
         switch (valueName) {
             case "rangeMin":
-                return 37 /* CommandResult.EmptyGaugeRangeMin */;
+                return 38 /* CommandResult.EmptyGaugeRangeMin */;
             case "rangeMax":
-                return 39 /* CommandResult.EmptyGaugeRangeMax */;
+                return 40 /* CommandResult.EmptyGaugeRangeMax */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -4505,13 +4567,13 @@ function checkNaN(value, valueName) {
     if (isNaN(value)) {
         switch (valueName) {
             case "rangeMin":
-                return 38 /* CommandResult.GaugeRangeMinNaN */;
+                return 39 /* CommandResult.GaugeRangeMinNaN */;
             case "rangeMax":
-                return 40 /* CommandResult.GaugeRangeMaxNaN */;
+                return 41 /* CommandResult.GaugeRangeMaxNaN */;
             case "lowerInflectionPointValue":
-                return 42 /* CommandResult.GaugeLowerInflectionPointNaN */;
+                return 43 /* CommandResult.GaugeLowerInflectionPointNaN */;
             case "upperInflectionPointValue":
-                return 43 /* CommandResult.GaugeUpperInflectionPointNaN */;
+                return 44 /* CommandResult.GaugeUpperInflectionPointNaN */;
         }
     }
     return 0 /* CommandResult.Success */;
@@ -5262,12 +5324,12 @@ function createPieChartRuntime(chart, getters) {
 
 function checkKeyValue(definition) {
     return definition.keyValue && !rangeReference.test(definition.keyValue)
-        ? 34 /* CommandResult.InvalidScorecardKeyValue */
+        ? 35 /* CommandResult.InvalidScorecardKeyValue */
         : 0 /* CommandResult.Success */;
 }
 function checkBaseline(definition) {
     return definition.baseline && !rangeReference.test(definition.baseline)
-        ? 35 /* CommandResult.InvalidScorecardBaseline */
+        ? 36 /* CommandResult.InvalidScorecardBaseline */
         : 0 /* CommandResult.Success */;
 }
 class ScorecardChart extends AbstractChart {
@@ -5701,6 +5763,7 @@ function getMenuDescription(node) {
     return node.description ? node.description : "";
 }
 
+const macRegex = /Mac/i;
 /**
  * Return true if the event was triggered from
  * a child element.
@@ -5718,6 +5781,17 @@ function gridOverlayPosition() {
 }
 function getOpenedMenus() {
     return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
+}
+function isMacOS() {
+    return Boolean(macRegex.test(navigator.userAgent));
+}
+/**
+ * @param {KeyboardEvent | MouseEvent} ev
+ * @returns Returns true if the event was triggered with the "ctrl" modifier pressed.
+ * On Mac, this is the "meta" or "command" key.
+ */
+function isCtrlKey(ev) {
+    return isMacOS() ? ev.metaKey : ev.ctrlKey;
 }
 
 /**
@@ -6297,7 +6371,7 @@ function handlePasteResult(env, result) {
         else if (result.reasons.includes(22 /* CommandResult.WrongFigurePasteOption */)) {
             env.raiseError(PasteInteractiveContent.wrongFigurePasteOption);
         }
-        else if (result.reasons.includes(75 /* CommandResult.FrozenPaneOverlap */)) {
+        else if (result.reasons.includes(76 /* CommandResult.FrozenPaneOverlap */)) {
             env.raiseError(PasteInteractiveContent.frozenPaneOverlap);
         }
     }
@@ -6584,7 +6658,7 @@ function interactiveSortSelection(env, sheetId, anchor, zone, sortDirection) {
             });
         }
     }
-    if (result.isCancelledBecause(63 /* CommandResult.InvalidSortZone */)) {
+    if (result.isCancelledBecause(64 /* CommandResult.InvalidSortZone */)) {
         const { col, row } = anchor;
         env.model.selection.selectZone({ cell: { col, row }, zone });
         env.raiseError(_lt("Cannot sort. To sort, select only cells or only merges that have the same size."));
@@ -6598,13 +6672,13 @@ const AddFilterInteractiveContent = {
 };
 function interactiveAddFilter(env, sheetId, target) {
     const result = env.model.dispatch("CREATE_FILTER_TABLE", { target, sheetId });
-    if (result.isCancelledBecause(78 /* CommandResult.FilterOverlap */)) {
+    if (result.isCancelledBecause(79 /* CommandResult.FilterOverlap */)) {
         env.raiseError(AddFilterInteractiveContent.filterOverlap);
     }
-    else if (result.isCancelledBecause(80 /* CommandResult.MergeInFilter */)) {
+    else if (result.isCancelledBecause(81 /* CommandResult.MergeInFilter */)) {
         env.raiseError(AddFilterInteractiveContent.mergeInFilter);
     }
-    else if (result.isCancelledBecause(81 /* CommandResult.NonContinuousTargets */)) {
+    else if (result.isCancelledBecause(82 /* CommandResult.NonContinuousTargets */)) {
         env.raiseError(AddFilterInteractiveContent.nonContinuousTargets);
     }
 }
@@ -10878,7 +10952,7 @@ const DATE = {
         if (_year < 1900) {
             _year += 1900;
         }
-        const jsDate = new Date(_year, _month - 1, _day);
+        const jsDate = new DateTime(_year, _month - 1, _day);
         const result = jsDateToRoundNumber(jsDate);
         assert(() => result >= 0, _lt(`The function [[FUNCTION_NAME]] result must be greater than or equal 01/01/1900.`));
         return result;
@@ -10990,7 +11064,7 @@ const EOMONTH = {
         const _months = Math.trunc(toNumber(months));
         const yStart = _startDate.getFullYear();
         const mStart = _startDate.getMonth();
-        const jsDate = new Date(yStart, mStart + _months + 1, 0);
+        const jsDate = new DateTime(yStart, mStart + _months + 1, 0);
         return jsDateToRoundNumber(jsDate);
     },
     isExported: true,
@@ -11029,17 +11103,17 @@ const ISOWEEKNUM = {
         // The first week of the year is the week that contains the first
         // Thursday of the year.
         let firstThursday = 1;
-        while (new Date(y, 0, firstThursday).getDay() !== 4) {
+        while (new DateTime(y, 0, firstThursday).getDay() !== 4) {
             firstThursday += 1;
         }
-        const firstDayOfFirstWeek = new Date(y, 0, firstThursday - 3);
+        const firstDayOfFirstWeek = new DateTime(y, 0, firstThursday - 3);
         // The last week of the year is the week that contains the last Thursday of
         // the year.
         let lastThursday = 31;
-        while (new Date(y, 11, lastThursday).getDay() !== 4) {
+        while (new DateTime(y, 11, lastThursday).getDay() !== 4) {
             lastThursday -= 1;
         }
-        const lastDayOfLastWeek = new Date(y, 11, lastThursday + 3);
+        const lastDayOfLastWeek = new DateTime(y, 11, lastThursday + 3);
         // B - If our date > lastDayOfLastWeek then it's in the weeks of the year after
         // If our date < firstDayOfFirstWeek then it's in the weeks of the year before
         let offsetYear;
@@ -11065,17 +11139,17 @@ const ISOWEEKNUM = {
             case 1:
                 // firstDay is the 1st day of the 1st week of the year after
                 // firstDay = lastDayOfLastWeek + 1 Day
-                firstDay = new Date(y, 11, lastThursday + 3 + 1);
+                firstDay = new DateTime(y, 11, lastThursday + 3 + 1);
                 break;
             case -1:
                 // firstDay is the 1st day of the 1st week of the previous year.
                 // The first week of the previous year is the week that contains the
                 // first Thursday of the previous year.
                 let firstThursdayPreviousYear = 1;
-                while (new Date(y - 1, 0, firstThursdayPreviousYear).getDay() !== 4) {
+                while (new DateTime(y - 1, 0, firstThursdayPreviousYear).getDay() !== 4) {
                     firstThursdayPreviousYear += 1;
                 }
-                firstDay = new Date(y - 1, 0, firstThursdayPreviousYear - 3);
+                firstDay = new DateTime(y - 1, 0, firstThursdayPreviousYear - 3);
                 break;
         }
         const diff = (_date.getTime() - firstDay.getTime()) / MS_PER_DAY;
@@ -11214,8 +11288,8 @@ const NETWORKDAYS_INTL = {
             });
         }
         const invertDate = _startDate.getTime() > _endDate.getTime();
-        const stopDate = new Date((invertDate ? _startDate : _endDate).getTime());
-        let stepDate = new Date((invertDate ? _endDate : _startDate).getTime());
+        const stopDate = DateTime.fromTimestamp((invertDate ? _startDate : _endDate).getTime());
+        let stepDate = DateTime.fromTimestamp((invertDate ? _endDate : _startDate).getTime());
         const timeStopDate = stopDate.getTime();
         let timeStepDate = stepDate.getTime();
         let netWorkingDay = 0;
@@ -11239,8 +11313,7 @@ const NOW = {
     returns: ["DATE"],
     computeFormat: () => "m/d/yyyy hh:mm:ss",
     compute: function () {
-        let today = new Date();
-        today.setMilliseconds(0);
+        let today = DateTime.now();
         const delta = today.getTime() - INITIAL_1900_DAY.getTime();
         const time = today.getHours() / 24 + today.getMinutes() / 1440 + today.getSeconds() / 86400;
         return Math.floor(delta / MS_PER_DAY) + time;
@@ -11314,8 +11387,8 @@ const TODAY = {
     returns: ["DATE"],
     computeFormat: () => "m/d/yyyy",
     compute: function () {
-        const today = new Date();
-        const jsDate = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+        const today = DateTime.now();
+        const jsDate = new DateTime(today.getFullYear(), today.getMonth(), today.getDate());
         return jsDateToRoundNumber(jsDate);
     },
     isExported: true,
@@ -11370,10 +11443,10 @@ const WEEKNUM = {
         }
         const y = _date.getFullYear();
         let dayStart = 1;
-        let startDayOfFirstWeek = new Date(y, 0, dayStart);
+        let startDayOfFirstWeek = new DateTime(y, 0, dayStart);
         while (startDayOfFirstWeek.getDay() !== startDayOfWeek) {
             dayStart += 1;
-            startDayOfFirstWeek = new Date(y, 0, dayStart);
+            startDayOfFirstWeek = new DateTime(y, 0, dayStart);
         }
         const dif = (_date.getTime() - startDayOfFirstWeek.getTime()) / MS_PER_DAY;
         if (dif < 0) {
@@ -11427,7 +11500,7 @@ const WORKDAY_INTL = {
                 timesHoliday.add(holiday.getTime());
             });
         }
-        let stepDate = new Date(_startDate.getTime());
+        let stepDate = DateTime.fromTimestamp(_startDate.getTime());
         let timeStepDate = stepDate.getTime();
         const unitDay = Math.sign(_numDays);
         let stepDay = Math.abs(_numDays);
@@ -11493,7 +11566,7 @@ const MONTH_START = {
         const _startDate = toJsDate(date);
         const yStart = _startDate.getFullYear();
         const mStart = _startDate.getMonth();
-        const jsDate = new Date(yStart, mStart, 1);
+        const jsDate = new DateTime(yStart, mStart, 1);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -11537,7 +11610,7 @@ const QUARTER_START = {
     compute: function (date) {
         const quarter = QUARTER.compute(date);
         const year = YEAR.compute(date);
-        const jsDate = new Date(year, (quarter - 1) * 3, 1);
+        const jsDate = new DateTime(year, (quarter - 1) * 3, 1);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -11554,7 +11627,7 @@ const QUARTER_END = {
     compute: function (date) {
         const quarter = QUARTER.compute(date);
         const year = YEAR.compute(date);
-        const jsDate = new Date(year, quarter * 3, 0);
+        const jsDate = new DateTime(year, quarter * 3, 0);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -11570,7 +11643,7 @@ const YEAR_START = {
     computeFormat: () => "m/d/yyyy",
     compute: function (date) {
         const year = YEAR.compute(date);
-        const jsDate = new Date(year, 0, 1);
+        const jsDate = new DateTime(year, 0, 1);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -11586,7 +11659,7 @@ const YEAR_END = {
     computeFormat: () => "m/d/yyyy",
     compute: function (date) {
         const year = YEAR.compute(date);
-        const jsDate = new Date(year + 1, 0, 0);
+        const jsDate = new DateTime(year + 1, 0, 0);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -11720,7 +11793,7 @@ function assertDeprecationFactorStrictlyPositive(factor) {
 function assertSettlementLessThanOneYearBeforeMaturity(settlement, maturity) {
     const startDate = toJsDate(settlement);
     const endDate = toJsDate(maturity);
-    const startDatePlusOneYear = new Date(startDate);
+    const startDatePlusOneYear = toJsDate(settlement);
     startDatePlusOneYear.setFullYear(startDate.getFullYear() + 1);
     assert(() => endDate.getTime() <= startDatePlusOneYear.getTime(), _lt("The settlement date (%s) must at most one year after the maturity date (%s).", settlement.toString(), maturity.toString()));
 }
@@ -15646,7 +15719,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),
@@ -15657,6 +15730,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]: {},
 };
@@ -16166,6 +16240,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":
@@ -16551,7 +16629,7 @@ class EditionPlugin extends UIPlugin {
     validateSelection(length, start, end) {
         return start >= 0 && start <= length && end >= 0 && end <= length
             ? 0 /* CommandResult.Success */
-            : 46 /* CommandResult.WrongComposerSelection */;
+            : 47 /* CommandResult.WrongComposerSelection */;
     }
     onColumnsRemoved(cmd) {
         if (cmd.elements.includes(this.col) && this.mode !== "inactive") {
@@ -16865,9 +16943,10 @@ class EditionPlugin extends UIPlugin {
      */
     getReferencedRanges() {
         const editionSheetId = this.getters.getEditionSheet();
-        return this.currentTokens
+        const referenceRanges = this.currentTokens
             .filter((token) => token.type === "REFERENCE")
             .map((token) => this.getters.getRangeFromSheetXC(editionSheetId, token.value));
+        return referenceRanges.filter((range) => !range.invalidSheetName && !range.invalidXc);
     }
     /**
      * Function used to determine when composer selection can start.
@@ -16939,10 +17018,10 @@ const arrowMap = {
 function updateSelectionWithArrowKeys(ev, selection) {
     const direction = arrowMap[ev.key];
     if (ev.shiftKey) {
-        selection.resizeAnchorZone(direction, ev.ctrlKey ? "end" : 1);
+        selection.resizeAnchorZone(direction, isCtrlKey(ev) ? "end" : 1);
     }
     else {
-        selection.moveAnchorCell(direction, ev.ctrlKey ? "end" : 1);
+        selection.moveAnchorCell(direction, isCtrlKey(ev) ? "end" : 1);
     }
 }
 
@@ -19305,7 +19384,7 @@ function interactiveFreezeColumnsRows(env, dimension, base) {
     const sheetId = env.model.getters.getActiveSheetId();
     const cmd = dimension === "COL" ? "FREEZE_COLUMNS" : "FREEZE_ROWS";
     const result = env.model.dispatch(cmd, { sheetId, quantity: base });
-    if (result.isCancelledBecause(65 /* CommandResult.MergeOverlap */)) {
+    if (result.isCancelledBecause(66 /* CommandResult.MergeOverlap */)) {
         env.raiseError(MergeErrorMessage);
     }
 }
@@ -20020,11 +20099,11 @@ class LineBarPieConfigPanel extends Component {
     }
     get isDatasetInvalid() {
         var _a;
-        return !!((_a = this.state.datasetDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(32 /* CommandResult.InvalidDataSet */));
+        return !!((_a = this.state.datasetDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(33 /* CommandResult.InvalidDataSet */));
     }
     get isLabelInvalid() {
         var _a;
-        return !!((_a = this.state.labelsDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(33 /* CommandResult.InvalidLabelRange */));
+        return !!((_a = this.state.labelsDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(34 /* CommandResult.InvalidLabelRange */));
     }
     onUpdateDataSetsHaveTitle(ev) {
         this.props.updateChart(this.props.figureId, {
@@ -20397,7 +20476,7 @@ class GaugeChartConfigPanel extends Component {
     }
     get isDataRangeInvalid() {
         var _a;
-        return !!((_a = this.state.dataRangeDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(36 /* CommandResult.InvalidGaugeDataRange */));
+        return !!((_a = this.state.dataRangeDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(37 /* CommandResult.InvalidGaugeDataRange */));
     }
     onDataRangeChanged(ranges) {
         this.dataRange = ranges[0];
@@ -20489,28 +20568,28 @@ class GaugeChartDesignPanel extends Component {
     }
     isRangeMinInvalid() {
         var _a, _b, _c;
-        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(37 /* CommandResult.EmptyGaugeRangeMin */)) ||
-            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(38 /* CommandResult.GaugeRangeMinNaN */)) ||
-            ((_c = this.state.sectionRuleDispatchResult) === null || _c === void 0 ? void 0 : _c.isCancelledBecause(41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */)));
+        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(38 /* CommandResult.EmptyGaugeRangeMin */)) ||
+            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(39 /* CommandResult.GaugeRangeMinNaN */)) ||
+            ((_c = this.state.sectionRuleDispatchResult) === null || _c === void 0 ? void 0 : _c.isCancelledBecause(42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */)));
     }
     isRangeMaxInvalid() {
         var _a, _b, _c;
-        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(39 /* CommandResult.EmptyGaugeRangeMax */)) ||
-            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(40 /* CommandResult.GaugeRangeMaxNaN */)) ||
-            ((_c = this.state.sectionRuleDispatchResult) === null || _c === void 0 ? void 0 : _c.isCancelledBecause(41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */)));
+        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(40 /* CommandResult.EmptyGaugeRangeMax */)) ||
+            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(41 /* CommandResult.GaugeRangeMaxNaN */)) ||
+            ((_c = this.state.sectionRuleDispatchResult) === null || _c === void 0 ? void 0 : _c.isCancelledBecause(42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */)));
     }
     // ---------------------------------------------------------------------------
     // COLOR_SECTION_TEMPLATE
     // ---------------------------------------------------------------------------
     get isLowerInflectionPointInvalid() {
         var _a, _b;
-        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(42 /* CommandResult.GaugeLowerInflectionPointNaN */)) ||
-            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(44 /* CommandResult.GaugeLowerBiggerThanUpper */)));
+        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(43 /* CommandResult.GaugeLowerInflectionPointNaN */)) ||
+            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(45 /* CommandResult.GaugeLowerBiggerThanUpper */)));
     }
     get isUpperInflectionPointInvalid() {
         var _a, _b;
-        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(43 /* CommandResult.GaugeUpperInflectionPointNaN */)) ||
-            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(44 /* CommandResult.GaugeLowerBiggerThanUpper */)));
+        return !!(((_a = this.state.sectionRuleDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(44 /* CommandResult.GaugeUpperInflectionPointNaN */)) ||
+            ((_b = this.state.sectionRuleDispatchResult) === null || _b === void 0 ? void 0 : _b.isCancelledBecause(45 /* CommandResult.GaugeLowerBiggerThanUpper */)));
     }
     updateInflectionPointValue(attr, ev) {
         const sectionRule = deepCopy(this.props.definition.sectionRule);
@@ -20623,11 +20702,11 @@ class ScorecardChartConfigPanel extends Component {
     }
     get isKeyValueInvalid() {
         var _a;
-        return !!((_a = this.state.keyValueDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(34 /* CommandResult.InvalidScorecardKeyValue */));
+        return !!((_a = this.state.keyValueDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(35 /* CommandResult.InvalidScorecardKeyValue */));
     }
     get isBaselineInvalid() {
         var _a;
-        return !!((_a = this.state.keyValueDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(35 /* CommandResult.InvalidScorecardBaseline */));
+        return !!((_a = this.state.keyValueDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(36 /* CommandResult.InvalidScorecardBaseline */));
     }
     onKeyValueRangeChanged(ranges) {
         this.keyValue = ranges[0];
@@ -21483,11 +21562,11 @@ class ConditionalFormattingPanel extends Component {
      ****************************************************************************/
     get isValue1Invalid() {
         var _a;
-        return !!((_a = this.state.errors) === null || _a === void 0 ? void 0 : _a.includes(51 /* CommandResult.FirstArgMissing */));
+        return !!((_a = this.state.errors) === null || _a === void 0 ? void 0 : _a.includes(52 /* CommandResult.FirstArgMissing */));
     }
     get isValue2Invalid() {
         var _a;
-        return !!((_a = this.state.errors) === null || _a === void 0 ? void 0 : _a.includes(52 /* CommandResult.SecondArgMissing */));
+        return !!((_a = this.state.errors) === null || _a === void 0 ? void 0 : _a.includes(53 /* CommandResult.SecondArgMissing */));
     }
     toggleStyle(tool) {
         const style = this.state.rules.cellIs.style;
@@ -21504,17 +21583,17 @@ class ConditionalFormattingPanel extends Component {
     isValueInvalid(threshold) {
         switch (threshold) {
             case "minimum":
-                return (this.state.errors.includes(58 /* CommandResult.MinInvalidFormula */) ||
-                    this.state.errors.includes(50 /* CommandResult.MinBiggerThanMid */) ||
-                    this.state.errors.includes(47 /* CommandResult.MinBiggerThanMax */) ||
-                    this.state.errors.includes(53 /* CommandResult.MinNaN */));
+                return (this.state.errors.includes(59 /* CommandResult.MinInvalidFormula */) ||
+                    this.state.errors.includes(51 /* CommandResult.MinBiggerThanMid */) ||
+                    this.state.errors.includes(48 /* CommandResult.MinBiggerThanMax */) ||
+                    this.state.errors.includes(54 /* CommandResult.MinNaN */));
             case "midpoint":
-                return (this.state.errors.includes(59 /* CommandResult.MidInvalidFormula */) ||
-                    this.state.errors.includes(54 /* CommandResult.MidNaN */) ||
-                    this.state.errors.includes(49 /* CommandResult.MidBiggerThanMax */));
+                return (this.state.errors.includes(60 /* CommandResult.MidInvalidFormula */) ||
+                    this.state.errors.includes(55 /* CommandResult.MidNaN */) ||
+                    this.state.errors.includes(50 /* CommandResult.MidBiggerThanMax */));
             case "maximum":
-                return (this.state.errors.includes(60 /* CommandResult.MaxInvalidFormula */) ||
-                    this.state.errors.includes(55 /* CommandResult.MaxNaN */));
+                return (this.state.errors.includes(61 /* CommandResult.MaxInvalidFormula */) ||
+                    this.state.errors.includes(56 /* CommandResult.MaxNaN */));
             default:
                 return false;
         }
@@ -21563,13 +21642,13 @@ class ConditionalFormattingPanel extends Component {
     isInflectionPointInvalid(inflectionPoint) {
         switch (inflectionPoint) {
             case "lowerInflectionPoint":
-                return (this.state.errors.includes(57 /* CommandResult.ValueLowerInflectionNaN */) ||
-                    this.state.errors.includes(62 /* CommandResult.ValueLowerInvalidFormula */) ||
-                    this.state.errors.includes(48 /* CommandResult.LowerBiggerThanUpper */));
+                return (this.state.errors.includes(58 /* CommandResult.ValueLowerInflectionNaN */) ||
+                    this.state.errors.includes(63 /* CommandResult.ValueLowerInvalidFormula */) ||
+                    this.state.errors.includes(49 /* CommandResult.LowerBiggerThanUpper */));
             case "upperInflectionPoint":
-                return (this.state.errors.includes(56 /* CommandResult.ValueUpperInflectionNaN */) ||
-                    this.state.errors.includes(61 /* CommandResult.ValueUpperInvalidFormula */) ||
-                    this.state.errors.includes(48 /* CommandResult.LowerBiggerThanUpper */));
+                return (this.state.errors.includes(57 /* CommandResult.ValueUpperInflectionNaN */) ||
+                    this.state.errors.includes(62 /* CommandResult.ValueUpperInvalidFormula */) ||
+                    this.state.errors.includes(49 /* CommandResult.LowerBiggerThanUpper */));
             default:
                 return true;
         }
@@ -22599,7 +22678,10 @@ class GridOverlay extends Component {
             return;
         }
         const [col, row] = this.getCartesianCoordinates(ev);
-        this.props.onCellClicked(col, row, { shiftKey: ev.shiftKey, ctrlKey: ev.ctrlKey });
+        this.props.onCellClicked(col, row, {
+            expandZone: ev.shiftKey,
+            addZone: isCtrlKey(ev),
+        });
     }
     onDoubleClick(ev) {
         const [col, row] = this.getCartesianCoordinates(ev);
@@ -22687,6 +22769,7 @@ class AbstractResizer extends Component {
             draggerShadowThickness: 0,
             delta: 0,
             base: 0,
+            position: "before",
         });
     }
     _computeHandleDisplay(ev) {
@@ -22812,11 +22895,13 @@ class AbstractResizer extends 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;
@@ -22840,7 +22925,7 @@ class AbstractResizer extends Component {
             this._increaseSelection(index);
         }
         else {
-            this._selectElement(index, ev.ctrlKey);
+            this._selectElement(index, isCtrlKey(ev));
         }
         this.lastSelectedElementIndex = index;
         const mouseMoveSelect = (col, row) => {
@@ -22853,7 +22938,7 @@ class AbstractResizer extends Component {
         const mouseUpSelect = () => {
             this.state.isSelecting = false;
             this.lastSelectedElementIndex = null;
-            this.env.model.dispatch(ev.ctrlKey ? "PREPARE_SELECTION_INPUT_EXPANSION" : "STOP_SELECTION_INPUT");
+            this.env.model.dispatch(isCtrlKey(ev) ? "PREPARE_SELECTION_INPUT_EXPANSION" : "STOP_SELECTION_INPUT");
             this._computeGrabDisplay(ev);
         };
         dragAndDropBeyondTheViewport(this.env, mouseMoveSelect, mouseUpSelect);
@@ -22997,13 +23082,14 @@ 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);
         }
     }
-    _selectElement(index, ctrlKey) {
-        this.env.model.selection.selectColumn(index, ctrlKey ? "newAnchor" : "overrideSelection");
+    _selectElement(index, addDistinctHeader) {
+        this.env.model.selection.selectColumn(index, addDistinctHeader ? "newAnchor" : "overrideSelection");
     }
     _increaseSelection(index) {
         this.env.model.selection.selectColumn(index, "updateAnchor");
@@ -23169,13 +23255,14 @@ 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);
         }
     }
-    _selectElement(index, ctrlKey) {
-        this.env.model.selection.selectRow(index, ctrlKey ? "newAnchor" : "overrideSelection");
+    _selectElement(index, addDistinctHeader) {
+        this.env.model.selection.selectRow(index, addDistinctHeader ? "newAnchor" : "overrideSelection");
     }
     _increaseSelection(index) {
         this.env.model.selection.selectRow(index, "updateAnchor");
@@ -23277,8 +23364,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;
@@ -23922,8 +24009,8 @@ class Grid extends Component {
     // ---------------------------------------------------------------------------
     // Zone selection with mouse
     // ---------------------------------------------------------------------------
-    onCellClicked(col, row, { ctrlKey, shiftKey }) {
-        if (ctrlKey) {
+    onCellClicked(col, row, { addZone, expandZone }) {
+        if (addZone) {
             this.env.model.dispatch("PREPARE_SELECTION_INPUT_EXPANSION");
         }
         if (this.env.model.getters.hasOpenedPopover()) {
@@ -23932,10 +24019,10 @@ class Grid extends Component {
         if (this.env.model.getters.getEditionMode() === "editing") {
             this.env.model.dispatch("STOP_EDITION");
         }
-        if (shiftKey) {
+        if (expandZone) {
             this.env.model.selection.setAnchorCorner(col, row);
         }
-        else if (ctrlKey) {
+        else if (addZone) {
             this.env.model.selection.addCellToSelection(col, row);
         }
         else {
@@ -23997,9 +24084,7 @@ class Grid extends Component {
             return;
         }
         let keyDownString = "";
-        if (ev.ctrlKey)
-            keyDownString += "CTRL+";
-        if (ev.metaKey)
+        if (isCtrlKey(ev))
             keyDownString += "CTRL+";
         if (ev.altKey)
             keyDownString += "ALT+";
@@ -28359,7 +28444,7 @@ class BordersPlugin extends CorePlugin {
         const currentBorder = this.getCellBorder(cmd);
         const areAllNewBordersUndefined = !((_a = cmd.border) === null || _a === void 0 ? void 0 : _a.bottom) && !((_b = cmd.border) === null || _b === void 0 ? void 0 : _b.left) && !((_c = cmd.border) === null || _c === void 0 ? void 0 : _c.right) && !((_d = cmd.border) === null || _d === void 0 ? void 0 : _d.top);
         if ((!currentBorder && areAllNewBordersUndefined) || deepEquals(currentBorder, cmd.border)) {
-            return 88 /* CommandResult.NoChanges */;
+            return 89 /* CommandResult.NoChanges */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -28881,9 +28966,9 @@ class CellPlugin extends CorePlugin {
     checkUselessClearCell(cmd) {
         const cell = this.getters.getCell(cmd);
         if (!cell)
-            return 88 /* CommandResult.NoChanges */;
+            return 89 /* CommandResult.NoChanges */;
         if (!cell.content && !cell.style && !cell.format) {
-            return 88 /* CommandResult.NoChanges */;
+            return 89 /* CommandResult.NoChanges */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29092,13 +29177,13 @@ class ChartPlugin extends CorePlugin {
     }
     checkChartDuplicate(cmd) {
         return this.getters.getFigureSheetId(cmd.id)
-            ? 84 /* CommandResult.DuplicatedChartId */
+            ? 85 /* CommandResult.DuplicatedChartId */
             : 0 /* CommandResult.Success */;
     }
     checkChartExists(cmd) {
         return this.getters.getFigureSheetId(cmd.id)
             ? 0 /* CommandResult.Success */
-            : 85 /* CommandResult.ChartDoesNotExist */;
+            : 86 /* CommandResult.ChartDoesNotExist */;
     }
 }
 ChartPlugin.getters = [
@@ -29300,10 +29385,10 @@ class ConditionalFormatPlugin extends CorePlugin {
             return 27 /* CommandResult.InvalidSheetId */;
         const ruleIndex = this.cfRules[sheetId].findIndex((cf) => cf.id === cfId);
         if (ruleIndex === -1)
-            return 71 /* CommandResult.InvalidConditionalFormatId */;
+            return 72 /* CommandResult.InvalidConditionalFormatId */;
         const cfIndex2 = direction === "up" ? ruleIndex - 1 : ruleIndex + 1;
         if (cfIndex2 < 0 || cfIndex2 >= this.cfRules[sheetId].length) {
-            return 71 /* CommandResult.InvalidConditionalFormatId */;
+            return 72 /* CommandResult.InvalidConditionalFormatId */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29344,10 +29429,10 @@ class ConditionalFormatPlugin extends CorePlugin {
                 const errors = [];
                 const isEmpty = (value) => value === undefined || value === "";
                 if (expectedNumber >= 1 && isEmpty(rule.values[0])) {
-                    errors.push(51 /* CommandResult.FirstArgMissing */);
+                    errors.push(52 /* CommandResult.FirstArgMissing */);
                 }
                 if (expectedNumber >= 2 && isEmpty(rule.values[1])) {
-                    errors.push(52 /* CommandResult.SecondArgMissing */);
+                    errors.push(53 /* CommandResult.SecondArgMissing */);
                 }
                 return errors.length ? errors : 0 /* CommandResult.Success */;
             }
@@ -29359,15 +29444,15 @@ class ConditionalFormatPlugin extends CorePlugin {
             (threshold.value === "" || isNaN(threshold.value))) {
             switch (thresholdName) {
                 case "min":
-                    return 53 /* CommandResult.MinNaN */;
+                    return 54 /* CommandResult.MinNaN */;
                 case "max":
-                    return 55 /* CommandResult.MaxNaN */;
+                    return 56 /* CommandResult.MaxNaN */;
                 case "mid":
-                    return 54 /* CommandResult.MidNaN */;
+                    return 55 /* CommandResult.MidNaN */;
                 case "upperInflectionPoint":
-                    return 56 /* CommandResult.ValueUpperInflectionNaN */;
+                    return 57 /* CommandResult.ValueUpperInflectionNaN */;
                 case "lowerInflectionPoint":
-                    return 57 /* CommandResult.ValueLowerInflectionNaN */;
+                    return 58 /* CommandResult.ValueLowerInflectionNaN */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -29381,15 +29466,15 @@ class ConditionalFormatPlugin extends CorePlugin {
         catch (error) {
             switch (thresholdName) {
                 case "min":
-                    return 58 /* CommandResult.MinInvalidFormula */;
+                    return 59 /* CommandResult.MinInvalidFormula */;
                 case "max":
-                    return 60 /* CommandResult.MaxInvalidFormula */;
+                    return 61 /* CommandResult.MaxInvalidFormula */;
                 case "mid":
-                    return 59 /* CommandResult.MidInvalidFormula */;
+                    return 60 /* CommandResult.MidInvalidFormula */;
                 case "upperInflectionPoint":
-                    return 61 /* CommandResult.ValueUpperInvalidFormula */;
+                    return 62 /* CommandResult.ValueUpperInvalidFormula */;
                 case "lowerInflectionPoint":
-                    return 62 /* CommandResult.ValueLowerInvalidFormula */;
+                    return 63 /* CommandResult.ValueLowerInvalidFormula */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -29406,7 +29491,7 @@ class ConditionalFormatPlugin extends CorePlugin {
         if (["number", "percentage", "percentile"].includes(rule.lowerInflectionPoint.type) &&
             rule.lowerInflectionPoint.type === rule.upperInflectionPoint.type &&
             Number(minValue) > Number(maxValue)) {
-            return 48 /* CommandResult.LowerBiggerThanUpper */;
+            return 49 /* CommandResult.LowerBiggerThanUpper */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29416,7 +29501,7 @@ class ConditionalFormatPlugin extends CorePlugin {
         if (["number", "percentage", "percentile"].includes(rule.minimum.type) &&
             rule.minimum.type === rule.maximum.type &&
             stringToNumber(minValue) >= stringToNumber(maxValue)) {
-            return 47 /* CommandResult.MinBiggerThanMax */;
+            return 48 /* CommandResult.MinBiggerThanMax */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29428,7 +29513,7 @@ class ConditionalFormatPlugin extends CorePlugin {
             ["number", "percentage", "percentile"].includes(rule.midpoint.type) &&
             rule.midpoint.type === rule.maximum.type &&
             stringToNumber(midValue) >= stringToNumber(maxValue)) {
-            return 49 /* CommandResult.MidBiggerThanMax */;
+            return 50 /* CommandResult.MidBiggerThanMax */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29440,7 +29525,7 @@ class ConditionalFormatPlugin extends CorePlugin {
             ["number", "percentage", "percentile"].includes(rule.midpoint.type) &&
             rule.minimum.type === rule.midpoint.type &&
             stringToNumber(minValue) >= stringToNumber(midValue)) {
-            return 50 /* CommandResult.MinBiggerThanMid */;
+            return 51 /* CommandResult.MinBiggerThanMid */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29541,13 +29626,13 @@ class FigurePlugin extends CorePlugin {
     checkFigureExists(sheetId, figureId) {
         var _a;
         if (((_a = this.figures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) === undefined) {
-            return 70 /* CommandResult.FigureDoesNotExist */;
+            return 71 /* CommandResult.FigureDoesNotExist */;
         }
         return 0 /* CommandResult.Success */;
     }
     checkFigureDuplicate(figureId) {
         if (Object.values(this.figures).find((sheet) => sheet === null || sheet === void 0 ? void 0 : sheet[figureId])) {
-            return 82 /* CommandResult.DuplicatedFigureId */;
+            return 83 /* CommandResult.DuplicatedFigureId */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -29649,12 +29734,12 @@ class FiltersPlugin extends CorePlugin {
         switch (cmd.type) {
             case "CREATE_FILTER_TABLE":
                 if (!areZonesContinuous(...cmd.target)) {
-                    return 81 /* CommandResult.NonContinuousTargets */;
+                    return 82 /* CommandResult.NonContinuousTargets */;
                 }
                 const zone = union(...cmd.target);
                 const checkFilterOverlap = () => {
                     if (this.getFilterTables(cmd.sheetId).some((filter) => overlap(filter.zone, zone))) {
-                        return 78 /* CommandResult.FilterOverlap */;
+                        return 79 /* CommandResult.FilterOverlap */;
                     }
                     return 0 /* CommandResult.Success */;
                 };
@@ -29662,7 +29747,7 @@ class FiltersPlugin extends CorePlugin {
                     const mergesInTarget = this.getters.getMergesInZone(cmd.sheetId, zone);
                     for (let merge of mergesInTarget) {
                         if (overlap(zone, merge)) {
-                            return 80 /* CommandResult.MergeInFilter */;
+                            return 81 /* CommandResult.MergeInFilter */;
                         }
                     }
                     return 0 /* CommandResult.Success */;
@@ -29672,7 +29757,7 @@ class FiltersPlugin extends CorePlugin {
                 for (let merge of cmd.target) {
                     for (let filterTable of this.getFilterTables(cmd.sheetId)) {
                         if (overlap(filterTable.zone, merge)) {
-                            return 80 /* CommandResult.MergeInFilter */;
+                            return 81 /* CommandResult.MergeInFilter */;
                         }
                     }
                 }
@@ -30172,10 +30257,10 @@ class HeaderVisibilityPlugin extends CorePlugin {
                     : this.getters.getNumberRows(cmd.sheetId);
                 const hiddenElements = new Set((hiddenGroup || []).flat().concat(cmd.elements));
                 if (hiddenElements.size >= elements) {
-                    return 66 /* CommandResult.TooManyHiddenElements */;
+                    return 67 /* CommandResult.TooManyHiddenElements */;
                 }
                 else if (Math.min(...cmd.elements) < 0 || Math.max(...cmd.elements) > elements) {
-                    return 86 /* CommandResult.InvalidHeaderIndex */;
+                    return 87 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else {
                     return 0 /* CommandResult.Success */;
@@ -30701,7 +30786,7 @@ class MergePlugin extends CorePlugin {
         for (const zone of target) {
             for (const zone2 of target) {
                 if (zone !== zone2 && overlap(zone, zone2)) {
-                    return 65 /* CommandResult.MergeOverlap */;
+                    return 66 /* CommandResult.MergeOverlap */;
                 }
             }
         }
@@ -30715,7 +30800,7 @@ class MergePlugin extends CorePlugin {
         for (const zone of target) {
             if ((zone.left < xSplit && zone.right >= xSplit) ||
                 (zone.top < ySplit && zone.bottom >= ySplit)) {
-                return 75 /* CommandResult.FrozenPaneOverlap */;
+                return 76 /* CommandResult.FrozenPaneOverlap */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -31247,9 +31332,10 @@ class RangeAdapter {
      * Get a Xc string that represent a part of a range
      */
     getRangePartString(range, part) {
-        const colFixed = range.parts && range.parts[part].colFixed ? "$" : "";
+        var _a, _b;
+        const colFixed = range.parts && ((_a = range.parts[part]) === null || _a === void 0 ? void 0 : _a.colFixed) ? "$" : "";
         const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
-        const rowFixed = range.parts && range.parts[part].rowFixed ? "$" : "";
+        const rowFixed = range.parts && ((_b = range.parts[part]) === null || _b === void 0 ? void 0 : _b.rowFixed) ? "$" : "";
         const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
         let str = "";
         if (range.isFullCol) {
@@ -31347,11 +31433,11 @@ class SheetPlugin extends CorePlugin {
                 const elements = cmd.dimension === "COL"
                     ? this.getNumberCols(cmd.sheetId)
                     : this.getNumberRows(cmd.sheetId);
-                if (cmd.base < 0 || cmd.base > elements) {
-                    return 86 /* CommandResult.InvalidHeaderIndex */;
+                if (cmd.base < 0 || cmd.base >= elements) {
+                    return 87 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else if (cmd.quantity <= 0) {
-                    return 87 /* CommandResult.InvalidQuantity */;
+                    return 88 /* CommandResult.InvalidQuantity */;
                 }
                 return 0 /* CommandResult.Success */;
             case "REMOVE_COLUMNS_ROWS": {
@@ -31359,7 +31445,7 @@ class SheetPlugin extends CorePlugin {
                     ? this.getNumberCols(cmd.sheetId)
                     : this.getNumberRows(cmd.sheetId);
                 if (Math.min(...cmd.elements) < 0 || Math.max(...cmd.elements) > elements) {
-                    return 86 /* CommandResult.InvalidHeaderIndex */;
+                    return 87 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else if (this.checkElementsIncludeAllNonFrozenHeaders(cmd.sheetId, cmd.dimension, cmd.elements)) {
                     return 8 /* CommandResult.NotEnoughElements */;
@@ -31803,18 +31889,18 @@ class SheetPlugin extends CorePlugin {
     checkRowFreezeQuantity(cmd) {
         return cmd.quantity >= 1 && cmd.quantity < this.getNumberRows(cmd.sheetId)
             ? 0 /* CommandResult.Success */
-            : 74 /* CommandResult.InvalidFreezeQuantity */;
+            : 75 /* CommandResult.InvalidFreezeQuantity */;
     }
     checkColFreezeQuantity(cmd) {
         return cmd.quantity >= 1 && cmd.quantity < this.getNumberCols(cmd.sheetId)
             ? 0 /* CommandResult.Success */
-            : 74 /* CommandResult.InvalidFreezeQuantity */;
+            : 75 /* CommandResult.InvalidFreezeQuantity */;
     }
     checkRowFreezeOverlapMerge(cmd) {
         const merges = this.getters.getMerges(cmd.sheetId);
         for (let merge of merges) {
             if (merge.top < cmd.quantity && cmd.quantity <= merge.bottom) {
-                return 65 /* CommandResult.MergeOverlap */;
+                return 66 /* CommandResult.MergeOverlap */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -31823,7 +31909,7 @@ class SheetPlugin extends CorePlugin {
         const merges = this.getters.getMerges(cmd.sheetId);
         for (let merge of merges) {
             if (merge.left < cmd.quantity && cmd.quantity <= merge.right) {
-                return 65 /* CommandResult.MergeOverlap */;
+                return 66 /* CommandResult.MergeOverlap */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -32370,13 +32456,18 @@ class EvaluationPlugin extends UIPlugin {
     // Getters
     // ---------------------------------------------------------------------------
     evaluateFormula(formulaString, sheetId = this.getters.getActiveSheetId()) {
-        const compiledFormula = compile(formulaString);
-        const params = this.getCompilationParameters((cell) => this.getEvaluatedCell(this.getters.getCellPosition(cell.id)));
-        const ranges = [];
-        for (let xc of compiledFormula.dependencies) {
-            ranges.push(this.getters.getRangeFromSheetXC(sheetId, xc));
+        try {
+            const compiledFormula = compile(formulaString);
+            const params = this.getCompilationParameters((cell) => this.getEvaluatedCell(this.getters.getCellPosition(cell.id)));
+            const ranges = [];
+            for (let xc of compiledFormula.dependencies) {
+                ranges.push(this.getters.getRangeFromSheetXC(sheetId, xc));
+            }
+            return compiledFormula.execute(ranges, ...params).value;
+        }
+        catch (error) {
+            return error instanceof EvaluationError ? error.errorType : CellErrorType.GenericError;
         }
-        return compiledFormula.execute(ranges, ...params).value;
     }
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
@@ -32555,10 +32646,8 @@ class EvaluationPlugin extends UIPlugin {
          * that are actually present in the grid.
          */
         function range(range) {
+            assertRangeValid(range);
             const sheetId = range.sheetId;
-            if (!isZoneValid(range.zone)) {
-                throw new InvalidReferenceError();
-            }
             // Performance issue: Avoid fetching data on positions that are out of the spreadsheet
             // e.g. A1:ZZZ9999 in a sheet with 10 cols and 10 rows should ignore everything past J10 and return a 10x10 array
             const sheetZone = getters.getSheetZone(sheetId);
@@ -32593,23 +32682,26 @@ class EvaluationPlugin extends UIPlugin {
          *        The `compute` of the formula's function must process it completely
          */
         function refFn(range, isMeta, functionName, paramNumber) {
+            assertRangeValid(range);
             if (isMeta) {
                 // Use zoneToXc of zone instead of getRangeString to avoid sending unbounded ranges
                 return { value: zoneToXc(range.zone) };
             }
-            if (!isZoneValid(range.zone)) {
-                throw new InvalidReferenceError();
-            }
             // if the formula definition could have accepted a range, we would pass through the _range function and not here
             if (range.zone.bottom !== range.zone.top || range.zone.left !== range.zone.right) {
                 throw new Error(paramNumber
                     ? _lt("Function %s expects the parameter %s to be a single value or a single cell reference, not a range.", functionName.toString(), paramNumber.toString())
                     : _lt("Function %s expects its parameters to be single values or single cell references, not ranges.", functionName.toString()));
             }
+            return readCell(range);
+        }
+        function assertRangeValid(range) {
+            if (!isZoneValid(range.zone)) {
+                throw new InvalidReferenceError();
+            }
             if (range.invalidSheetName) {
                 throw new Error(_lt("Invalid sheet name: %s", range.invalidSheetName));
             }
-            return readCell(range);
         }
         return [refFn, range, evalContext];
     }
@@ -32868,39 +32960,34 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         this.computedIcons[sheetId] = {};
         const computedStyle = this.computedStyles[sheetId];
         for (let cf of this.getters.getConditionalFormats(sheetId).reverse()) {
-            try {
-                switch (cf.rule.type) {
-                    case "ColorScaleRule":
-                        for (let range of cf.ranges) {
-                            this.applyColorScale(range, cf.rule);
-                        }
-                        break;
-                    case "IconSetRule":
-                        for (let range of cf.ranges) {
-                            this.applyIcon(range, cf.rule);
-                        }
-                        break;
-                    default:
-                        for (let ref of cf.ranges) {
-                            const zone = this.getters.getRangeFromSheetXC(sheetId, ref).zone;
-                            for (let row = zone.top; row <= zone.bottom; row++) {
-                                for (let col = zone.left; col <= zone.right; col++) {
-                                    const pr = this.rulePredicate[cf.rule.type];
-                                    let cell = this.getters.getEvaluatedCell({ sheetId, col, row });
-                                    if (pr && pr(cell, cf.rule)) {
-                                        if (!computedStyle[col])
-                                            computedStyle[col] = [];
-                                        // we must combine all the properties of all the CF rules applied to the given cell
-                                        computedStyle[col][row] = Object.assign(((_a = computedStyle[col]) === null || _a === void 0 ? void 0 : _a[row]) || {}, cf.rule.style);
-                                    }
+            switch (cf.rule.type) {
+                case "ColorScaleRule":
+                    for (let range of cf.ranges) {
+                        this.applyColorScale(range, cf.rule);
+                    }
+                    break;
+                case "IconSetRule":
+                    for (let range of cf.ranges) {
+                        this.applyIcon(range, cf.rule);
+                    }
+                    break;
+                default:
+                    for (let ref of cf.ranges) {
+                        const zone = this.getters.getRangeFromSheetXC(sheetId, ref).zone;
+                        for (let row = zone.top; row <= zone.bottom; row++) {
+                            for (let col = zone.left; col <= zone.right; col++) {
+                                const pr = this.rulePredicate[cf.rule.type];
+                                let cell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                                if (pr && pr(cell, cf.rule)) {
+                                    if (!computedStyle[col])
+                                        computedStyle[col] = [];
+                                    // we must combine all the properties of all the CF rules applied to the given cell
+                                    computedStyle[col][row] = Object.assign(((_a = computedStyle[col]) === null || _a === void 0 ? void 0 : _a[row]) || {}, cf.rule.style);
                                 }
                             }
                         }
-                        break;
-                }
-            }
-            catch (_) {
-                // we don't care about the errors within the evaluation of a rule
+                    }
+                    break;
             }
         }
     }
@@ -32925,7 +33012,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                 return percentile(rangeValues, Number(threshold.value) / 100, true);
             case "formula":
                 const value = threshold.value && this.getters.evaluateFormula(threshold.value);
-                return !(value instanceof Promise) ? value : null;
+                return typeof value === "number" ? value : null;
             default:
                 return null;
         }
@@ -33113,7 +33200,7 @@ class FilterEvaluationPlugin extends UIPlugin {
         switch (cmd.type) {
             case "UPDATE_FILTER":
                 if (!this.getters.getFilterId(cmd)) {
-                    return 79 /* CommandResult.FilterNotFound */;
+                    return 80 /* CommandResult.FilterNotFound */;
                 }
                 break;
         }
@@ -34059,7 +34146,7 @@ class SheetViewPlugin extends UIPlugin {
     }
     checkPositiveDimension(cmd) {
         if (cmd.width < 0 || cmd.height < 0) {
-            return 68 /* CommandResult.InvalidViewportSize */;
+            return 69 /* CommandResult.InvalidViewportSize */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -34069,7 +34156,7 @@ class SheetViewPlugin extends UIPlugin {
             cmd.gridOffsetY === this.gridOffsetY &&
             cmd.width === width &&
             cmd.height === height) {
-            return 76 /* CommandResult.ValuesNotChanged */;
+            return 77 /* CommandResult.ValuesNotChanged */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -34077,7 +34164,7 @@ class SheetViewPlugin extends UIPlugin {
         const pane = this.getMainInternalViewport(this.getters.getActiveSheetId());
         if ((!pane.canScrollHorizontally && offsetX > 0) ||
             (!pane.canScrollVertically && offsetY > 0)) {
-            return 69 /* CommandResult.InvalidScrollingDirection */;
+            return 70 /* CommandResult.InvalidScrollingDirection */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -34333,7 +34420,7 @@ class AutofillPlugin extends UIPlugin {
                 if (this.lastCellSelected.col !== undefined && this.lastCellSelected.row !== undefined) {
                     return 0 /* CommandResult.Success */;
                 }
-                return 45 /* CommandResult.InvalidAutofillSelection */;
+                return 46 /* CommandResult.InvalidAutofillSelection */;
             case "AUTOFILL_AUTO":
                 const zone = this.getters.getSelectedZone();
                 return zone.top === zone.bottom
@@ -34487,24 +34574,27 @@ class AutofillPlugin extends UIPlugin {
      * autofiller
      */
     autofillAuto() {
+        var _a, _b;
         const zone = this.getters.getSelectedZone();
         const sheetId = this.getters.getActiveSheetId();
         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 ||
+                ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.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 ||
+                    ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content)) {
                     row += 1;
-                    right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                    rightPosition = { sheetId, col: col + 1, row };
                 }
             }
         }
@@ -34932,7 +35022,7 @@ class CellPopoverPlugin extends UIPlugin {
                     cellPopoverRegistry.get(cmd.popoverType);
                 }
                 catch (error) {
-                    return 72 /* CommandResult.InvalidCellPopover */;
+                    return 73 /* CommandResult.InvalidCellPopover */;
                 }
                 return 0 /* CommandResult.Success */;
             default:
@@ -36135,21 +36225,6 @@ class SelectionInputPlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     // Command Handling
     // ---------------------------------------------------------------------------
-    allowDispatch(cmd) {
-        switch (cmd.type) {
-            case "ADD_EMPTY_RANGE":
-                if (this.inputHasSingleRange && this.ranges.length === 1) {
-                    return 30 /* CommandResult.MaximumRangesReached */;
-                }
-                break;
-            case "CHANGE_RANGE":
-                if (this.inputHasSingleRange && cmd.value.split(",").length > 1) {
-                    return 30 /* CommandResult.MaximumRangesReached */;
-                }
-                break;
-        }
-        return 0 /* CommandResult.Success */;
-    }
     handleEvent(event) {
         const xc = zoneToXc(event.anchor.zone);
         const inputSheetId = this.activeSheet;
@@ -36361,6 +36436,15 @@ class SelectionInputsManagerPlugin extends UIPlugin {
     // ---------------------------------------------------------------------------
     allowDispatch(cmd) {
         var _a, _b;
+        switch (cmd.type) {
+            case "FOCUS_RANGE":
+            case "CHANGE_RANGE":
+            case "ADD_EMPTY_RANGE":
+            case "REMOVE_RANGE":
+                if (!this.inputs[cmd.id]) {
+                    return 31 /* CommandResult.InvalidInputId */;
+                }
+        }
         switch (cmd.type) {
             case "FOCUS_RANGE":
                 const index = (_a = this.currentInput) === null || _a === void 0 ? void 0 : _a.getIndex(cmd.rangeId);
@@ -36368,9 +36452,19 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                     return 29 /* CommandResult.InputAlreadyFocused */;
                 }
                 break;
-        }
-        if (this.currentInput) {
-            return this.currentInput.allowDispatch(cmd);
+            case "ADD_EMPTY_RANGE":
+                const input = this.inputs[cmd.id];
+                if (input.inputHasSingleRange && input.ranges.length === 1) {
+                    return 30 /* CommandResult.MaximumRangesReached */;
+                }
+                break;
+            case "CHANGE_RANGE": {
+                const input = this.inputs[cmd.id];
+                if (input.inputHasSingleRange && cmd.value.split(",").length > 1) {
+                    return 30 /* CommandResult.MaximumRangesReached */;
+                }
+                break;
+            }
         }
         return 0 /* CommandResult.Success */;
     }
@@ -37353,7 +37447,7 @@ class SortPlugin extends UIPlugin {
         /*Test the presence of single cells*/
         const singleCells = positions(zone).some(({ col, row }) => !this.getters.isInMerge({ sheetId, col, row }));
         if (singleCells) {
-            return 63 /* CommandResult.InvalidSortZone */;
+            return 64 /* CommandResult.InvalidSortZone */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -37372,7 +37466,7 @@ class SortPlugin extends UIPlugin {
             ];
             return widthCurrent === widthFirst && heightCurrent === heightFirst;
         })) {
-            return 63 /* CommandResult.InvalidSortZone */;
+            return 64 /* CommandResult.InvalidSortZone */;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -38000,7 +38094,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         for (const zone of this.getPasteZones(target)) {
             if ((zone.left < xSplit && zone.right >= xSplit) ||
                 (zone.top < ySplit && zone.bottom >= ySplit)) {
-                return 75 /* CommandResult.FrozenPaneOverlap */;
+                return 76 /* CommandResult.FrozenPaneOverlap */;
             }
         }
         return 0 /* CommandResult.Success */;
@@ -38388,7 +38482,7 @@ class ClipboardFigureState {
     }
     isPasteAllowed(target, option) {
         if (target.length === 0) {
-            return 73 /* CommandResult.EmptyTarget */;
+            return 74 /* CommandResult.EmptyTarget */;
         }
         if ((option === null || option === void 0 ? void 0 : option.pasteOption) !== undefined) {
             return 22 /* CommandResult.WrongFigurePasteOption */;
@@ -39236,7 +39330,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];
@@ -39253,12 +39347,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 });
@@ -39295,6 +39390,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 87 /* CommandResult.InvalidHeaderIndex */;
+        }
         return 0 /* CommandResult.Success */;
     }
     //-------------------------------------------
@@ -40101,7 +40201,7 @@ const AddMergeInteractiveContent = {
 };
 function interactiveAddMerge(env, sheetId, target) {
     const result = env.model.dispatch("ADD_MERGE", { sheetId, target });
-    if (result.isCancelledBecause(80 /* CommandResult.MergeInFilter */)) {
+    if (result.isCancelledBecause(81 /* CommandResult.MergeInFilter */)) {
         env.raiseError(AddMergeInteractiveContent.MergeInFilter);
     }
     else if (result.isCancelledBecause(3 /* CommandResult.MergeIsDestructive */)) {
@@ -40848,7 +40948,7 @@ class Spreadsheet extends Component {
     }
     onKeydown(ev) {
         let keyDownString = "";
-        if (ev.ctrlKey || ev.metaKey) {
+        if (isCtrlKey(ev)) {
             keyDownString += "CTRL+";
         }
         keyDownString += ev.key.toUpperCase();
@@ -41976,7 +42076,7 @@ class SelectionStreamProcessor {
      */
     moveAnchorCell(direction, step = 1) {
         if (step !== "end" && step <= 0) {
-            return new DispatchResult(83 /* CommandResult.InvalidSelectionStep */);
+            return new DispatchResult(84 /* CommandResult.InvalidSelectionStep */);
         }
         const { col, row } = this.getNextAvailablePosition(direction, step);
         return this.selectCell(col, row);
@@ -42022,7 +42122,7 @@ class SelectionStreamProcessor {
      */
     resizeAnchorZone(direction, step = 1) {
         if (step !== "end" && step <= 0) {
-            return new DispatchResult(83 /* CommandResult.InvalidSelectionStep */);
+            return new DispatchResult(84 /* CommandResult.InvalidSelectionStep */);
         }
         const sheetId = this.getters.getActiveSheetId();
         const anchor = this.anchor;
@@ -43982,10 +44082,10 @@ class Model extends EventBus {
             const command = { ...payload, type };
             let status = this.status;
             if (this.getters.isReadonly() && !canExecuteInReadonly(command)) {
-                return new DispatchResult(67 /* CommandResult.Readonly */);
+                return new DispatchResult(68 /* CommandResult.Readonly */);
             }
             if (!this.session.canApplyOptimisticUpdate()) {
-                return new DispatchResult(64 /* CommandResult.WaitingSessionConfirmation */);
+                return new DispatchResult(65 /* CommandResult.WaitingSessionConfirmation */);
             }
             switch (status) {
                 case 0 /* Status.Ready */:
@@ -44445,6 +44545,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, links, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.1.28';
-__info__.date = '2023-11-24T13:11:01.992Z';
-__info__.hash = '257f369';
+__info__.version = '16.1.33';
+__info__.date = '2024-01-29T13:49:43.259Z';
+__info__.hash = 'd3b27dd';