@odoo/o-spreadsheet 16.3.18 → 16.3.24

package/dist/o-spreadsheet.iife.js

@@ -299,15 +299,80 @@
   // -----------------------------------------------------------------------------
   // 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 {
+      jsDate;
+      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();
+      }
+      toLocaleDateString() {
+          return this.jsDate.toLocaleDateString();
+      }
+      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+)?))$/;
@@ -356,7 +421,7 @@
           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;
@@ -373,13 +438,13 @@
           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;
@@ -439,7 +504,7 @@
           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,
@@ -453,7 +518,7 @@
   // -----------------------------------------------------------------------------
   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);
@@ -470,7 +535,7 @@
   }
   /** 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();
@@ -488,7 +553,7 @@
       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));
       }
@@ -648,13 +713,6 @@
   }
 
   //------------------------------------------------------------------------------
-  /**
-   * Stringify an object, like JSON.stringify, except that the first level of keys
-   * is ordered.
-   */
-  function stringify(obj) {
-      return JSON.stringify(obj, Object.keys(obj).sort());
-  }
   /**
    * Remove quotes from a quoted string
    * ```js
@@ -884,7 +942,7 @@
   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@:%_\+.~#?&//=]*)$/;
@@ -953,7 +1011,7 @@
    */
   function getItemId(item, itemsDic) {
       for (let [key, value] of Object.entries(itemsDic)) {
-          if (stringify(value) === stringify(item)) {
+          if (deepEquals(value, item)) {
               return parseInt(key, 10);
           }
       }
@@ -1953,7 +2011,7 @@
           .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");
@@ -2016,27 +2074,30 @@
   }
   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?.type === "STRING" && ["k", "m", "b"].includes(nextFormatPart.format)) {
+              i++;
+          }
+      }
       return convertInternalFormatToFormat(largeNumberFormat);
   }
   function changeDecimalPlaces(format, step) {
@@ -2200,8 +2261,10 @@
   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) */
@@ -2231,6 +2294,9 @@
   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)
@@ -2297,18 +2363,10 @@
           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;
       }
@@ -4381,69 +4439,70 @@
       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["MoreThanOneColumnSelected"] = 88] = "MoreThanOneColumnSelected";
-      CommandResult[CommandResult["EmptySplitSeparator"] = 89] = "EmptySplitSeparator";
-      CommandResult[CommandResult["SplitWillOverwriteContent"] = 90] = "SplitWillOverwriteContent";
-      CommandResult[CommandResult["NoSplitSeparatorInSelection"] = 91] = "NoSplitSeparatorInSelection";
-      CommandResult[CommandResult["NoActiveSheet"] = 92] = "NoActiveSheet";
-      CommandResult[CommandResult["NoChanges"] = 93] = "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["MoreThanOneColumnSelected"] = 89] = "MoreThanOneColumnSelected";
+      CommandResult[CommandResult["EmptySplitSeparator"] = 90] = "EmptySplitSeparator";
+      CommandResult[CommandResult["SplitWillOverwriteContent"] = 91] = "SplitWillOverwriteContent";
+      CommandResult[CommandResult["NoSplitSeparatorInSelection"] = 92] = "NoSplitSeparatorInSelection";
+      CommandResult[CommandResult["NoActiveSheet"] = 93] = "NoActiveSheet";
+      CommandResult[CommandResult["NoChanges"] = 94] = "NoChanges";
   })(exports.CommandResult || (exports.CommandResult = {}));
 
   const borderStyles = ["thin", "medium", "thick", "dashed", "dotted"];
@@ -5168,6 +5227,7 @@
       },
   };
 
+  const macRegex = /Mac/i;
   /**
    * Return true if the event was triggered from
    * a child element.
@@ -5213,6 +5273,17 @@
   }
   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;
   }
 
   /**
@@ -6391,14 +6462,8 @@
                       : undefined));
               }
           }
-          else if (zone.left === zone.right && zone.top === zone.bottom) {
-              // A single cell. If it's only the title, the dataset is not added.
-              if (!dataSetsHaveTitle) {
-                  dataSets.push(createDataSet(getters, dataSetSheetId, zone, undefined));
-              }
-          }
           else {
-              /* 1 row or 1 column */
+              /* 1 cell, 1 row or 1 column */
               dataSets.push(createDataSet(getters, dataSetSheetId, zone, dataSetsHaveTitle
                   ? {
                       top: zone.top,
@@ -6447,8 +6512,10 @@
       }
       const dataRange = ds.dataRange.clone({ zone: dataZone });
       return {
-          label: ds.labelCell ? getters.getRangeString(ds.labelCell, "forceSheetReference") : undefined,
-          range: getters.getRangeString(dataRange, "forceSheetReference"),
+          label: ds.labelCell
+              ? getters.getRangeString(ds.labelCell, "forceSheetReference", true)
+              : undefined,
+          range: getters.getRangeString(dataRange, "forceSheetReference", true),
       };
   }
   function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
@@ -6461,7 +6528,7 @@
           zone.top = zone.top + 1;
       }
       const range = labelRange.clone({ zone });
-      return getters.getRangeString(range, "forceSheetReference");
+      return getters.getRangeString(range, "forceSheetReference", true);
   }
   /**
    * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -6527,11 +6594,11 @@
       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 */;
@@ -6540,7 +6607,7 @@
       if (definition.labelRange) {
           const invalidLabels = !rangeReference.test(definition.labelRange || "");
           if (invalidLabels) {
-              return 33 /* CommandResult.InvalidLabelRange */;
+              return 34 /* CommandResult.InvalidLabelRange */;
           }
       }
       return 0 /* CommandResult.Success */;
@@ -6627,22 +6694,22 @@
   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"),
       },
@@ -6670,20 +6737,20 @@
       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 CustomCurrencyTerms = {
@@ -6693,9 +6760,9 @@
   const SplitToColumnsTerms = {
       Errors: {
           Unexpected: _lt("Cannot split the selection for an unknown reason"),
-          [91 /* CommandResult.NoSplitSeparatorInSelection */]: _lt("There is no match for the selected separator in the selection"),
-          [88 /* CommandResult.MoreThanOneColumnSelected */]: _lt("Only a selection from a single column can be split"),
-          [90 /* CommandResult.SplitWillOverwriteContent */]: _lt("Splitting will overwrite existing content"),
+          [92 /* CommandResult.NoSplitSeparatorInSelection */]: _lt("There is no match for the selected separator in the selection"),
+          [89 /* CommandResult.MoreThanOneColumnSelected */]: _lt("Only a selection from a single column can be split"),
+          [91 /* CommandResult.SplitWillOverwriteContent */]: _lt("Splitting will overwrite existing content"),
       },
   };
 
@@ -6998,7 +7065,7 @@
               return undefined;
           const dataSets = this.dataSets
               .map((ds) => toExcelDataset(this.getters, ds))
-              .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+              .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
           const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
           return {
               ...this.getDefinition(),
@@ -7099,7 +7166,7 @@
 
   function isDataRangeValid(definition) {
       return definition.dataRange && !rangeReference.test(definition.dataRange)
-          ? 36 /* CommandResult.InvalidGaugeDataRange */
+          ? 37 /* CommandResult.InvalidGaugeDataRange */
           : 0 /* CommandResult.Success */;
   }
   function checkRangeLimits(check, batchValidations) {
@@ -7131,7 +7198,7 @@
   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 */;
@@ -7140,9 +7207,9 @@
       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 */;
@@ -7151,13 +7218,13 @@
       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 */;
@@ -7582,7 +7649,7 @@
               return undefined;
           const dataSets = this.dataSets
               .map((ds) => toExcelDataset(this.getters, ds))
-              .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+              .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
           const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
           return {
               ...this.getDefinition(),
@@ -7867,7 +7934,7 @@
               return undefined;
           const dataSets = this.dataSets
               .map((ds) => toExcelDataset(this.getters, ds))
-              .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+              .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
           const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
           return {
               ...this.getDefinition(),
@@ -7947,12 +8014,12 @@
 
   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 {
@@ -8458,7 +8525,7 @@
   };
   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 */)) {
@@ -8708,7 +8775,7 @@
               });
           }
       }
-      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."));
@@ -8731,13 +8798,13 @@
   };
   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);
       }
   }
@@ -8759,7 +8826,7 @@
           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);
           }
       }
@@ -9599,6 +9666,9 @@
   function makeArg(str, description) {
       let parts = str.match(ARG_REGEXP);
       let name = parts[1].trim();
+      if (!name) {
+          throw new Error(`Function argument definition is missing a name: '${str}'.`);
+      }
       let types = [];
       let isOptional = false;
       let isRepeating = false;
@@ -12052,7 +12122,7 @@
           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;
@@ -12095,7 +12165,7 @@
                   // See: https://support.microsoft.com/en-us/office/datedif-function-25dba1a4-2812-480b-84dd-8b32a451b35c
                   let days = jsEndDate.getDate() - jsStartDate.getDate();
                   if (days < 0) {
-                      const monthBeforeEndMonth = new Date(jsEndDate.getFullYear(), jsEndDate.getMonth() - 1, 1);
+                      const monthBeforeEndMonth = new DateTime(jsEndDate.getFullYear(), jsEndDate.getMonth() - 1, 1);
                       const daysInMonthBeforeEndMonth = getDaysInMonth(monthBeforeEndMonth);
                       days = daysInMonthBeforeEndMonth - Math.abs(days);
                   }
@@ -12104,7 +12174,7 @@
                   if (areTwoDatesWithinOneYear(_startDate, _endDate)) {
                       return getTimeDifferenceInWholeDays(jsStartDate, jsEndDate);
                   }
-                  const endDateWithinOneYear = new Date(jsStartDate.getFullYear(), jsEndDate.getMonth(), jsEndDate.getDate());
+                  const endDateWithinOneYear = new DateTime(jsStartDate.getFullYear(), jsEndDate.getMonth(), jsEndDate.getDate());
                   let days = getTimeDifferenceInWholeDays(jsStartDate, endDateWithinOneYear);
                   if (days < 0) {
                       endDateWithinOneYear.setFullYear(jsStartDate.getFullYear() + 1);
@@ -12217,7 +12287,7 @@
           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,
@@ -12254,17 +12324,17 @@
           // 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;
@@ -12290,17 +12360,17 @@
               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;
@@ -12435,8 +12505,8 @@
               });
           }
           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;
@@ -12460,8 +12530,7 @@
       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;
@@ -12531,8 +12600,8 @@
       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,
@@ -12587,10 +12656,10 @@
           }
           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) {
@@ -12644,7 +12713,7 @@
                   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);
@@ -12706,7 +12775,7 @@
           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);
       },
   };
@@ -12744,7 +12813,7 @@
       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);
       },
   };
@@ -12759,7 +12828,7 @@
       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);
       },
   };
@@ -12773,7 +12842,7 @@
       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);
       },
   };
@@ -12787,7 +12856,7 @@
       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);
       },
   };
@@ -12835,8 +12904,8 @@
   const DELTA = {
       description: _lt("Compare two numeric values, returning 1 if they're equal."),
       args: [
-          arg(" (number)", _lt("The first number to compare.")),
-          arg(` (number, default=${DEFAULT_DELTA_ARG})`, _lt("The second number to compare.")),
+          arg("number1 (number)", _lt("The first number to compare.")),
+          arg(`number2 (number, default=${DEFAULT_DELTA_ARG})`, _lt("The second number to compare.")),
       ],
       returns: ["NUMBER"],
       compute: function (number1, number2 = DEFAULT_DELTA_ARG) {
@@ -12922,7 +12991,7 @@
   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()));
   }
@@ -13057,7 +13126,7 @@
           arg("salvage (number)", _lt("The value of the asset at the end of depreciation.")),
           arg("period (number)", _lt("The single period within life for which to calculate depreciation.")),
           arg("rate (number)", _lt("The deprecation rate.")),
-          arg(" (number, optional)", _lt("An indicator of what day count method to use.")),
+          arg("day_count_convention (number, optional)", _lt("An indicator of what day count method to use.")),
       ],
       returns: ["NUMBER"],
       compute: function (cost, purchaseDate, firstPeriodEnd, salvage, period, rate, dayCountConvention = DEFAULT_DAY_COUNT_CONVENTION) {
@@ -16040,8 +16109,8 @@
       description: _lt("A segment of a string."),
       args: [
           arg("text (string)", _lt("The string to extract a segment from.")),
-          arg(" (number)", _lt("The index from the left of string from which to begin extracting. The first character in string has the index 1.")),
-          arg(" (number)", _lt("The length of the segment to extract.")),
+          arg("starting_at (number)", _lt("The index from the left of string from which to begin extracting. The first character in string has the index 1.")),
+          arg("extract_length (number)", _lt("The length of the segment to extract.")),
       ],
       returns: ["STRING"],
       compute: function (text, starting_at, extract_length) {
@@ -16915,7 +16984,7 @@
       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);
       }
   }
@@ -17710,10 +17779,10 @@
   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);
       }
   }
 
@@ -17938,10 +18007,10 @@
           return cancelledReasons.map((error) => ChartTerms.Errors[error] || ChartTerms.Errors.Unexpected);
       }
       get isDatasetInvalid() {
-          return !!this.state.datasetDispatchResult?.isCancelledBecause(32 /* CommandResult.InvalidDataSet */);
+          return !!this.state.datasetDispatchResult?.isCancelledBecause(33 /* CommandResult.InvalidDataSet */);
       }
       get isLabelInvalid() {
-          return !!this.state.labelsDispatchResult?.isCancelledBecause(33 /* CommandResult.InvalidLabelRange */);
+          return !!this.state.labelsDispatchResult?.isCancelledBecause(34 /* CommandResult.InvalidLabelRange */);
       }
       onUpdateDataSetsHaveTitle(ev) {
           this.props.updateChart(this.props.figureId, {
@@ -18383,7 +18452,7 @@
           return cancelledReasons.map((error) => ChartTerms.Errors[error] || ChartTerms.Errors.Unexpected);
       }
       get isDataRangeInvalid() {
-          return !!this.state.dataRangeDispatchResult?.isCancelledBecause(36 /* CommandResult.InvalidGaugeDataRange */);
+          return !!this.state.dataRangeDispatchResult?.isCancelledBecause(37 /* CommandResult.InvalidGaugeDataRange */);
       }
       onDataRangeChanged(ranges) {
           this.dataRange = ranges[0];
@@ -18457,25 +18526,25 @@
           });
       }
       isRangeMinInvalid() {
-          return !!(this.state.sectionRuleDispatchResult?.isCancelledBecause(37 /* CommandResult.EmptyGaugeRangeMin */) ||
-              this.state.sectionRuleDispatchResult?.isCancelledBecause(38 /* CommandResult.GaugeRangeMinNaN */) ||
-              this.state.sectionRuleDispatchResult?.isCancelledBecause(41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */));
+          return !!(this.state.sectionRuleDispatchResult?.isCancelledBecause(38 /* CommandResult.EmptyGaugeRangeMin */) ||
+              this.state.sectionRuleDispatchResult?.isCancelledBecause(39 /* CommandResult.GaugeRangeMinNaN */) ||
+              this.state.sectionRuleDispatchResult?.isCancelledBecause(42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */));
       }
       isRangeMaxInvalid() {
-          return !!(this.state.sectionRuleDispatchResult?.isCancelledBecause(39 /* CommandResult.EmptyGaugeRangeMax */) ||
-              this.state.sectionRuleDispatchResult?.isCancelledBecause(40 /* CommandResult.GaugeRangeMaxNaN */) ||
-              this.state.sectionRuleDispatchResult?.isCancelledBecause(41 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */));
+          return !!(this.state.sectionRuleDispatchResult?.isCancelledBecause(40 /* CommandResult.EmptyGaugeRangeMax */) ||
+              this.state.sectionRuleDispatchResult?.isCancelledBecause(41 /* CommandResult.GaugeRangeMaxNaN */) ||
+              this.state.sectionRuleDispatchResult?.isCancelledBecause(42 /* CommandResult.GaugeRangeMinBiggerThanRangeMax */));
       }
       // ---------------------------------------------------------------------------
       // COLOR_SECTION_TEMPLATE
       // ---------------------------------------------------------------------------
       get isLowerInflectionPointInvalid() {
-          return !!(this.state.sectionRuleDispatchResult?.isCancelledBecause(42 /* CommandResult.GaugeLowerInflectionPointNaN */) ||
-              this.state.sectionRuleDispatchResult?.isCancelledBecause(44 /* CommandResult.GaugeLowerBiggerThanUpper */));
+          return !!(this.state.sectionRuleDispatchResult?.isCancelledBecause(43 /* CommandResult.GaugeLowerInflectionPointNaN */) ||
+              this.state.sectionRuleDispatchResult?.isCancelledBecause(45 /* CommandResult.GaugeLowerBiggerThanUpper */));
       }
       get isUpperInflectionPointInvalid() {
-          return !!(this.state.sectionRuleDispatchResult?.isCancelledBecause(43 /* CommandResult.GaugeUpperInflectionPointNaN */) ||
-              this.state.sectionRuleDispatchResult?.isCancelledBecause(44 /* CommandResult.GaugeLowerBiggerThanUpper */));
+          return !!(this.state.sectionRuleDispatchResult?.isCancelledBecause(44 /* CommandResult.GaugeUpperInflectionPointNaN */) ||
+              this.state.sectionRuleDispatchResult?.isCancelledBecause(45 /* CommandResult.GaugeLowerBiggerThanUpper */));
       }
       updateInflectionPointValue(attr, ev) {
           const sectionRule = deepCopy(this.props.definition.sectionRule);
@@ -18583,10 +18652,10 @@
           return cancelledReasons.map((error) => ChartTerms.Errors[error] || ChartTerms.Errors.Unexpected);
       }
       get isKeyValueInvalid() {
-          return !!this.state.keyValueDispatchResult?.isCancelledBecause(34 /* CommandResult.InvalidScorecardKeyValue */);
+          return !!this.state.keyValueDispatchResult?.isCancelledBecause(35 /* CommandResult.InvalidScorecardKeyValue */);
       }
       get isBaselineInvalid() {
-          return !!this.state.keyValueDispatchResult?.isCancelledBecause(35 /* CommandResult.InvalidScorecardBaseline */);
+          return !!this.state.keyValueDispatchResult?.isCancelledBecause(36 /* CommandResult.InvalidScorecardBaseline */);
       }
       onKeyValueRangeChanged(ranges) {
           this.keyValue = ranges[0];
@@ -19446,10 +19515,10 @@
        * Cell Is Rule
        ****************************************************************************/
       get isValue1Invalid() {
-          return !!this.state.errors?.includes(51 /* CommandResult.FirstArgMissing */);
+          return !!this.state.errors?.includes(52 /* CommandResult.FirstArgMissing */);
       }
       get isValue2Invalid() {
-          return !!this.state.errors?.includes(52 /* CommandResult.SecondArgMissing */);
+          return !!this.state.errors?.includes(53 /* CommandResult.SecondArgMissing */);
       }
       toggleStyle(tool) {
           const style = this.state.rules.cellIs.style;
@@ -19466,17 +19535,17 @@
       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;
           }
@@ -19524,13 +19593,13 @@
       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;
           }
@@ -19841,7 +19910,7 @@
   };
   function interactiveSplitToColumns(env, separator, addNewColumns) {
       let result = env.model.dispatch("SPLIT_TEXT_INTO_COLUMNS", { separator, addNewColumns });
-      if (result.isCancelledBecause(90 /* CommandResult.SplitWillOverwriteContent */)) {
+      if (result.isCancelledBecause(91 /* CommandResult.SplitWillOverwriteContent */)) {
           env.askConfirmation(SplitToColumnsInteractiveContent.SplitIsDestructive, () => {
               result = env.model.dispatch("SPLIT_TEXT_INTO_COLUMNS", {
                   separator,
@@ -19904,8 +19973,8 @@
           const errors = new Set();
           for (const reason of cancelledReasons) {
               switch (reason) {
-                  case 90 /* CommandResult.SplitWillOverwriteContent */:
-                  case 89 /* CommandResult.EmptySplitSeparator */:
+                  case 91 /* CommandResult.SplitWillOverwriteContent */:
+                  case 90 /* CommandResult.EmptySplitSeparator */:
                       break;
                   default:
                       errors.add(SplitToColumnsTerms.Errors[reason] || SplitToColumnsTerms.Errors.Unexpected);
@@ -19920,8 +19989,8 @@
               addNewColumns: this.state.addNewColumns,
               force: false,
           }).reasons;
-          if (cancelledReasons.includes(90 /* CommandResult.SplitWillOverwriteContent */)) {
-              warnings.push(SplitToColumnsTerms.Errors[90 /* CommandResult.SplitWillOverwriteContent */]);
+          if (cancelledReasons.includes(91 /* CommandResult.SplitWillOverwriteContent */)) {
+              warnings.push(SplitToColumnsTerms.Errors[91 /* CommandResult.SplitWillOverwriteContent */]);
           }
           return warnings;
       }
@@ -22410,7 +22479,10 @@
               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);
@@ -22483,6 +22555,7 @@
           draggerShadowThickness: 0,
           delta: 0,
           base: 0,
+          position: "before",
       });
       _computeHandleDisplay(ev) {
           const position = this._getEvOffset(ev);
@@ -22607,11 +22680,13 @@
                       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;
@@ -22635,7 +22710,7 @@
               this._increaseSelection(index);
           }
           else {
-              this._selectElement(index, ev.ctrlKey);
+              this._selectElement(index, isCtrlKey(ev));
           }
           this.lastSelectedElementIndex = index;
           const mouseMoveSelect = (col, row) => {
@@ -22648,7 +22723,7 @@
           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);
@@ -22794,13 +22869,14 @@
               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");
@@ -22967,13 +23043,14 @@
               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");
@@ -23074,8 +23151,8 @@
           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;
@@ -23777,8 +23854,8 @@
       // ---------------------------------------------------------------------------
       // 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()) {
@@ -23787,10 +23864,10 @@
           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 {
@@ -23852,9 +23929,7 @@
               return;
           }
           let keyDownString = "";
-          if (ev.ctrlKey)
-              keyDownString += "CTRL+";
-          if (ev.metaKey)
+          if (isCtrlKey(ev))
               keyDownString += "CTRL+";
           if (ev.altKey)
               keyDownString += "ALT+";
@@ -25762,7 +25837,7 @@
           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),
@@ -25773,6 +25848,7 @@
           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]: {},
   };
@@ -29440,7 +29516,7 @@
           const currentBorder = this.getCellBorder(cmd);
           const areAllNewBordersUndefined = !cmd.border?.bottom && !cmd.border?.left && !cmd.border?.right && !cmd.border?.top;
           if ((!currentBorder && areAllNewBordersUndefined) || deepEquals(currentBorder, cmd.border)) {
-              return 93 /* CommandResult.NoChanges */;
+              return 94 /* CommandResult.NoChanges */;
           }
           return 0 /* CommandResult.Success */;
       }
@@ -29480,7 +29556,7 @@
            */
           function getBorderId(border) {
               for (let [key, value] of Object.entries(borders)) {
-                  if (stringify(value) === stringify(border)) {
+                  if (deepEquals(value, border)) {
                       return parseInt(key, 10);
                   }
               }
@@ -29685,6 +29761,10 @@
                       format: cell.format ? getItemId(cell.format, formats) : undefined,
                       content: cell.content || undefined,
                   };
+                  // if there is a formula but no dependencies (maybe because the cell is in error), no need to recompute the formula text
+                  if (cell.isFormula && cell.dependencies.length) {
+                      cells[xc].content = this.buildFormulaContent(_sheet.id, cell, cell.dependencies, true);
+                  }
               }
               _sheet.cells = cells;
           }
@@ -29719,13 +29799,13 @@
       /*
        * Reconstructs the original formula string based on a normalized form and its dependencies
        */
-      buildFormulaContent(sheetId, cell, dependencies) {
+      buildFormulaContent(sheetId, cell, dependencies, useFixedZone = false) {
           const ranges = dependencies || cell.dependencies;
           let rangeIndex = 0;
           return concat(cell.compiledFormula.tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = ranges[rangeIndex++];
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, useFixedZone);
               }
               return token.value;
           }));
@@ -29962,9 +30042,9 @@
       checkUselessClearCell(cmd) {
           const cell = this.getters.getCell(cmd);
           if (!cell)
-              return 93 /* CommandResult.NoChanges */;
+              return 94 /* CommandResult.NoChanges */;
           if (!cell.content && !cell.style && !cell.format) {
-              return 93 /* CommandResult.NoChanges */;
+              return 94 /* CommandResult.NoChanges */;
           }
           return 0 /* CommandResult.Success */;
       }
@@ -30164,13 +30244,13 @@
       }
       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 */;
       }
   }
 
@@ -30275,7 +30355,13 @@
           }
       }
       exportForExcel(data) {
-          this.export(data);
+          if (data.sheets) {
+              for (let sheet of data.sheets) {
+                  if (this.cfRules[sheet.id]) {
+                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                  }
+              }
+          }
       }
       // ---------------------------------------------------------------------------
       // Getters
@@ -30324,11 +30410,11 @@
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
-      mapToConditionalFormat(sheetId, cf) {
+      mapToConditionalFormat(sheetId, cf, options = { useFixedReference: false }) {
           return {
               ...cf,
               ranges: cf.ranges.map((range) => {
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, options.useFixedReference);
               }),
           };
       }
@@ -30361,10 +30447,10 @@
               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 */;
       }
@@ -30405,10 +30491,10 @@
                   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 */;
               }
@@ -30420,15 +30506,15 @@
               (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 */;
@@ -30442,15 +30528,15 @@
           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 */;
@@ -30467,7 +30553,7 @@
           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 */;
       }
@@ -30477,7 +30563,7 @@
           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 */;
       }
@@ -30488,7 +30574,7 @@
               ["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 */;
       }
@@ -30499,7 +30585,7 @@
               ["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 */;
       }
@@ -30629,13 +30715,13 @@
       }
       checkFigureExists(sheetId, figureId) {
           if (this.figures[sheetId]?.[figureId] === undefined) {
-              return 70 /* CommandResult.FigureDoesNotExist */;
+              return 71 /* CommandResult.FigureDoesNotExist */;
           }
           return 0 /* CommandResult.Success */;
       }
       checkFigureDuplicate(figureId) {
           if (Object.values(this.figures).find((sheet) => sheet?.[figureId])) {
-              return 82 /* CommandResult.DuplicatedFigureId */;
+              return 83 /* CommandResult.DuplicatedFigureId */;
           }
           return 0 /* CommandResult.Success */;
       }
@@ -30745,12 +30831,12 @@
           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 */;
                   };
@@ -30758,7 +30844,7 @@
                       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 */;
@@ -30768,7 +30854,7 @@
                   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 */;
                           }
                       }
                   }
@@ -31253,10 +31339,10 @@
                       : 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 */;
@@ -31799,7 +31885,7 @@
           for (const zone of target) {
               for (const zone2 of target) {
                   if (zone !== zone2 && overlap(zone, zone2)) {
-                      return 65 /* CommandResult.MergeOverlap */;
+                      return 66 /* CommandResult.MergeOverlap */;
                   }
               }
           }
@@ -31813,7 +31899,7 @@
           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 */;
@@ -32271,8 +32357,9 @@
        *
        * @param range the range (received from getRangeFromXC or getRangeFromZone)
        * @param forSheetId the id of the sheet where the range string is supposed to be used.
+       * @param [useFixedZone=false] if true, the range will be returned with fixed row and column
        */
-      getRangeString(range, forSheetId) {
+      getRangeString(range, forSheetId, useFixedZone = false) {
           if (!range) {
               return INCORRECT_RANGE_STRING;
           }
@@ -32299,7 +32386,7 @@
           if (prefixSheet && !sheetName) {
               return INCORRECT_RANGE_STRING;
           }
-          let rangeString = this.getRangePartString(rangeImpl, 0);
+          let rangeString = this.getRangePartString(rangeImpl, 0, useFixedZone);
           if (rangeImpl.parts && rangeImpl.parts.length === 2) {
               // this if converts A2:A2 into A2 except if any part of the original range had fixed row or column (with $)
               if (rangeImpl.zone.top !== rangeImpl.zone.bottom ||
@@ -32309,7 +32396,7 @@
                   rangeImpl.parts[1].rowFixed ||
                   rangeImpl.parts[1].colFixed) {
                   rangeString += ":";
-                  rangeString += this.getRangePartString(rangeImpl, 1);
+                  rangeString += this.getRangePartString(rangeImpl, 1, useFixedZone);
               }
           }
           return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -32339,13 +32426,13 @@
       /**
        * Get a Xc string that represent a part of a range
        */
-      getRangePartString(range, part) {
-          const colFixed = range.parts && range.parts[part].colFixed ? "$" : "";
+      getRangePartString(range, part, useFixedZone = false) {
+          const colFixed = range.parts && range.parts[part]?.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 && range.parts[part]?.rowFixed ? "$" : "";
           const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
           let str = "";
-          if (range.isFullCol) {
+          if (range.isFullCol && !useFixedZone) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -32353,7 +32440,7 @@
                   str = colFixed + col;
               }
           }
-          else if (range.isFullRow) {
+          else if (range.isFullRow && !useFixedZone) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -32448,11 +32535,11 @@
                   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": {
@@ -32460,7 +32547,7 @@
                       ? 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 */;
@@ -32926,18 +33013,18 @@
       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 */;
@@ -32946,7 +33033,7 @@
           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 */;
@@ -33481,13 +33568,18 @@
       // 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.
@@ -33672,10 +33764,8 @@
            * 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);
@@ -33710,23 +33800,26 @@
            *        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];
       }
@@ -33912,39 +34005,34 @@
           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(computedStyle[col]?.[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(computedStyle[col]?.[row] || {}, cf.rule.style);
                                   }
                               }
                           }
-                          break;
-                  }
-              }
-              catch (_) {
-                  // we don't care about the errors within the evaluation of a rule
+                      }
+                      break;
               }
           }
       }
@@ -33969,7 +34057,7 @@
                   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;
           }
@@ -34216,7 +34304,7 @@
           switch (cmd.type) {
               case "UPDATE_FILTER":
                   if (!this.getters.getFilterId(cmd)) {
-                      return 79 /* CommandResult.FilterNotFound */;
+                      return 80 /* CommandResult.FilterNotFound */;
                   }
                   break;
           }
@@ -35186,7 +35274,7 @@
       }
       checkPositiveDimension(cmd) {
           if (cmd.width < 0 || cmd.height < 0) {
-              return 68 /* CommandResult.InvalidViewportSize */;
+              return 69 /* CommandResult.InvalidViewportSize */;
           }
           return 0 /* CommandResult.Success */;
       }
@@ -35196,7 +35284,7 @@
               cmd.gridOffsetY === this.gridOffsetY &&
               cmd.width === width &&
               cmd.height === height) {
-              return 76 /* CommandResult.ValuesNotChanged */;
+              return 77 /* CommandResult.ValuesNotChanged */;
           }
           return 0 /* CommandResult.Success */;
       }
@@ -35204,7 +35292,7 @@
           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 */;
       }
@@ -35459,7 +35547,7 @@
                   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
@@ -35618,19 +35706,21 @@
           let col = zone.left;
           let row = zone.bottom;
           if (col > 0) {
-              let left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
-              while (left.type !== CellValueType.empty) {
+              let leftPosition = { sheetId, col: col - 1, row };
+              while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+                  this.getters.getCell(leftPosition)?.content) {
                   row += 1;
-                  left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
+                  leftPosition = { sheetId, col: col - 1, row };
               }
           }
           if (row === zone.bottom) {
               col = zone.right;
               if (col <= this.getters.getNumberCols(sheetId)) {
-                  let right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
-                  while (right.type !== CellValueType.empty) {
+                  let rightPosition = { sheetId, col: col + 1, row };
+                  while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                      this.getters.getCell(rightPosition)?.content) {
                       row += 1;
-                      right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                      rightPosition = { sheetId, col: col + 1, row };
                   }
               }
           }
@@ -36061,7 +36151,7 @@
                       cellPopoverRegistry.get(cmd.popoverType);
                   }
                   catch (error) {
-                      return 72 /* CommandResult.InvalidCellPopover */;
+                      return 73 /* CommandResult.InvalidCellPopover */;
                   }
                   return 0 /* CommandResult.Success */;
               default:
@@ -38197,21 +38287,6 @@
       // ---------------------------------------------------------------------------
       // 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;
@@ -38427,6 +38502,15 @@
       // Command Handling
       // ---------------------------------------------------------------------------
       allowDispatch(cmd) {
+          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 = this.currentInput?.getIndex(cmd.rangeId);
@@ -38434,9 +38518,19 @@
                       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 */;
       }
@@ -38560,7 +38654,7 @@
           /*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 */;
       }
@@ -38579,7 +38673,7 @@
               ];
               return widthCurrent === widthFirst && heightCurrent === heightFirst;
           })) {
-              return 63 /* CommandResult.InvalidSortZone */;
+              return 64 /* CommandResult.InvalidSortZone */;
           }
           return 0 /* CommandResult.Success */;
       }
@@ -39082,7 +39176,7 @@
           const sheetId = "sheetId" in cmd ? cmd.sheetId : this.getters.tryGetActiveSheetId();
           const zones = this.getters.getCommandZones(cmd);
           if (!sheetId && zones.length > 0) {
-              return 92 /* CommandResult.NoActiveSheet */;
+              return 93 /* CommandResult.NoActiveSheet */;
           }
           if (sheetId && zones.length > 0) {
               return this.getters.checkZonesExistInSheet(sheetId, zones);
@@ -39564,13 +39658,13 @@
       }
       checkSingleColSelected() {
           if (!this.getters.isSingleColSelected()) {
-              return 88 /* CommandResult.MoreThanOneColumnSelected */;
+              return 89 /* CommandResult.MoreThanOneColumnSelected */;
           }
           return 0 /* CommandResult.Success */;
       }
       checkNonEmptySelector(cmd) {
           if (cmd.separator === "") {
-              return 89 /* CommandResult.EmptySplitSeparator */;
+              return 90 /* CommandResult.EmptySplitSeparator */;
           }
           return 0 /* CommandResult.Success */;
       }
@@ -39581,7 +39675,7 @@
           const selection = this.getters.getSelectedZones()[0];
           const splitted = this.getSplittedCols(selection, cmd.separator);
           if (this.willSplittedColsOverwriteContent(selection, splitted)) {
-              return 90 /* CommandResult.SplitWillOverwriteContent */;
+              return 91 /* CommandResult.SplitWillOverwriteContent */;
           }
           return 0 /* CommandResult.Success */;
       }
@@ -39592,7 +39686,7 @@
                   return 0 /* CommandResult.Success */;
               }
           }
-          return 91 /* CommandResult.NoSplitSeparatorInSelection */;
+          return 92 /* CommandResult.NoSplitSeparatorInSelection */;
       }
   }
 
@@ -39739,7 +39833,7 @@
           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 */;
@@ -40133,7 +40227,7 @@
       }
       isPasteAllowed(target, option) {
           if (target.length === 0) {
-              return 73 /* CommandResult.EmptyTarget */;
+              return 74 /* CommandResult.EmptyTarget */;
           }
           if (option?.pasteOption !== undefined) {
               return 22 /* CommandResult.WrongFigurePasteOption */;
@@ -40578,6 +40672,10 @@
               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":
@@ -40870,7 +40968,7 @@
       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") {
@@ -41181,9 +41279,10 @@
        */
       getReferencedRanges() {
           const editionSheetId = this.getters.getCurrentEditedCell().sheetId;
-          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.
@@ -41759,7 +41858,7 @@
               sheetId: cmd.sheetId,
               base: cmd.base,
               quantity: thickness,
-              position: "before",
+              position: cmd.position,
           });
           const isCol = cmd.dimension === "COL";
           const start = cmd.elements[0];
@@ -41776,12 +41875,13 @@
               },
           ];
           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 });
@@ -41818,6 +41918,11 @@
               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 */;
       }
       //-------------------------------------------
@@ -44099,7 +44204,7 @@
       }
       onKeydown(ev) {
           let keyDownString = "";
-          if (ev.ctrlKey || ev.metaKey) {
+          if (isCtrlKey(ev)) {
               keyDownString += "CTRL+";
           }
           keyDownString += ev.key.toUpperCase();
@@ -45165,7 +45270,7 @@
        */
       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);
@@ -45211,7 +45316,7 @@
        */
       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;
@@ -46038,12 +46143,7 @@
               attrs.push(["t", "str"]);
               cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
           }
-          node = escapeXml /*xml*/ `
-      <f>
-        ${XlsxFormula}
-      </f>
-      ${cycle}
-    `;
+          node = escapeXml /*xml*/ `<f> ${XlsxFormula} </f> ${cycle}`;
           return { attrs, node };
       }
       else {
@@ -46865,11 +46965,10 @@
                       ({ attrs: additionalAttrs, node: cellNode } = addContent(cell.content, construct.sharedStrings, isTableHeader));
                   }
                   attributes.push(...additionalAttrs);
-                  cellNodes.push(escapeXml /*xml*/ `
-          <c ${formatAttributes(attributes)}>
-            ${cellNode}
-          </c>
-        `);
+                  // prettier-ignore
+                  cellNodes.push(escapeXml /*xml*/ `<c ${formatAttributes(attributes)}>
+  ${cellNode}
+</c>`);
               }
           }
           if (cellNodes.length || row.size !== DEFAULT_CELL_HEIGHT || row.isHidden) {
@@ -47554,10 +47653,10 @@
           const command = createCommand(type, payload);
           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 */:
@@ -47838,9 +47937,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.3.18';
-  __info__.date = '2023-11-24T13:10:15.278Z';
-  __info__.hash = '45f745e';
+  __info__.version = '16.3.24';
+  __info__.date = '2024-02-02T13:45:48.440Z';
+  __info__.hash = '0bf5f45';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);