@odoo/o-spreadsheet 16.1.28 → 16.1.31

package/dist/o-spreadsheet.iife.js

@@ -306,15 +306,76 @@
   // -----------------------------------------------------------------------------
   // Date Type
   // -----------------------------------------------------------------------------
+  /**
+   * A DateTime object that can be used to manipulate spreadsheet dates.
+   * Conceptually, a spreadsheet date is simply a number with a date format,
+   * and it is timezone-agnostic.
+   * This DateTime object consistently uses UTC time to represent a naive date and time.
+   */
+  class DateTime {
+      constructor(year, month, day, hours = 0, minutes = 0, seconds = 0) {
+          this.jsDate = new Date(Date.UTC(year, month, day, hours, minutes, seconds, 0));
+      }
+      static fromTimestamp(timestamp) {
+          const date = new Date(timestamp);
+          return new DateTime(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds());
+      }
+      static now() {
+          const now = new Date();
+          return new DateTime(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds());
+      }
+      toString() {
+          return this.jsDate.toString();
+      }
+      getTime() {
+          return this.jsDate.getTime();
+      }
+      getFullYear() {
+          return this.jsDate.getUTCFullYear();
+      }
+      getMonth() {
+          return this.jsDate.getUTCMonth();
+      }
+      getDate() {
+          return this.jsDate.getUTCDate();
+      }
+      getDay() {
+          return this.jsDate.getUTCDay();
+      }
+      getHours() {
+          return this.jsDate.getUTCHours();
+      }
+      getMinutes() {
+          return this.jsDate.getUTCMinutes();
+      }
+      getSeconds() {
+          return this.jsDate.getUTCSeconds();
+      }
+      setFullYear(year) {
+          this.jsDate.setFullYear(year);
+      }
+      setDate(date) {
+          this.jsDate.setUTCDate(date);
+      }
+      setHours(hours) {
+          this.jsDate.setUTCHours(hours);
+      }
+      setMinutes(minutes) {
+          this.jsDate.setUTCMinutes(minutes);
+      }
+      setSeconds(seconds) {
+          this.jsDate.setUTCSeconds(seconds);
+      }
+  }
   // -----------------------------------------------------------------------------
   // Parsing
   // -----------------------------------------------------------------------------
-  const INITIAL_1900_DAY = new Date(1899, 11, 30);
+  const INITIAL_1900_DAY = new DateTime(1899, 11, 30);
   const MS_PER_DAY = 24 * 60 * 60 * 1000;
   const CURRENT_MILLENIAL = 2000; // note: don't forget to update this in 2999
-  const CURRENT_YEAR = new Date().getFullYear();
-  const INITIAL_JS_DAY = new Date(0);
-  const DATE_JS_1900_OFFSET = INITIAL_JS_DAY - INITIAL_1900_DAY;
+  const CURRENT_YEAR = DateTime.now().getFullYear();
+  const INITIAL_JS_DAY = DateTime.fromTimestamp(0);
+  const DATE_JS_1900_OFFSET = INITIAL_JS_DAY.getTime() - INITIAL_1900_DAY.getTime();
   const mdyDateRegexp = /^\d{1,2}(\/|-|\s)\d{1,2}((\/|-|\s)\d{1,4})?$/;
   const ymdDateRegexp = /^\d{3,4}(\/|-|\s)\d{1,2}(\/|-|\s)\d{1,2}$/;
   const timeRegexp = /((\d+(:\d+)?(:\d+)?\s*(AM|PM))|(\d+:\d+(:\d+)?))$/;
@@ -363,7 +424,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;
@@ -380,13 +441,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;
@@ -446,7 +507,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,
@@ -460,7 +521,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);
@@ -477,7 +538,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();
@@ -495,7 +556,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));
       }
@@ -1344,8 +1405,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) */
@@ -1375,6 +1438,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)
@@ -1873,7 +1939,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");
@@ -2164,18 +2230,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;
       }
@@ -5702,6 +5760,7 @@
       return node.description ? node.description : "";
   }
 
+  const macRegex = /Mac/i;
   /**
    * Return true if the event was triggered from
    * a child element.
@@ -5719,6 +5778,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;
   }
 
   /**
@@ -10879,7 +10949,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;
@@ -10991,7 +11061,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,
@@ -11030,17 +11100,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;
@@ -11066,17 +11136,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;
@@ -11215,8 +11285,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;
@@ -11240,8 +11310,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;
@@ -11315,8 +11384,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,
@@ -11371,10 +11440,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) {
@@ -11428,7 +11497,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);
@@ -11494,7 +11563,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);
       },
   };
@@ -11538,7 +11607,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);
       },
   };
@@ -11555,7 +11624,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);
       },
   };
@@ -11571,7 +11640,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);
       },
   };
@@ -11587,7 +11656,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);
       },
   };
@@ -11721,7 +11790,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()));
   }
@@ -15647,7 +15716,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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),
@@ -15658,6 +15727,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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]: {},
   };
@@ -16167,6 +16237,10 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               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":
@@ -16940,10 +17014,10 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   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);
       }
   }
 
@@ -22600,7 +22674,10 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               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);
@@ -22688,6 +22765,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               draggerShadowThickness: 0,
               delta: 0,
               base: 0,
+              position: "before",
           });
       }
       _computeHandleDisplay(ev) {
@@ -22813,11 +22891,13 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                       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;
@@ -22841,7 +22921,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               this._increaseSelection(index);
           }
           else {
-              this._selectElement(index, ev.ctrlKey);
+              this._selectElement(index, isCtrlKey(ev));
           }
           this.lastSelectedElementIndex = index;
           const mouseMoveSelect = (col, row) => {
@@ -22854,7 +22934,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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);
@@ -22998,13 +23078,14 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               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");
@@ -23170,13 +23251,14 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               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");
@@ -23278,8 +23360,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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;
@@ -23923,8 +24005,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       // ---------------------------------------------------------------------------
       // 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()) {
@@ -23933,10 +24015,10 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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 {
@@ -23998,9 +24080,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               return;
           }
           let keyDownString = "";
-          if (ev.ctrlKey)
-              keyDownString += "CTRL+";
-          if (ev.metaKey)
+          if (isCtrlKey(ev))
               keyDownString += "CTRL+";
           if (ev.altKey)
               keyDownString += "ALT+";
@@ -31348,7 +31428,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   const elements = cmd.dimension === "COL"
                       ? this.getNumberCols(cmd.sheetId)
                       : this.getNumberRows(cmd.sheetId);
-                  if (cmd.base < 0 || cmd.base > elements) {
+                  if (cmd.base < 0 || cmd.base >= elements) {
                       return 86 /* CommandResult.InvalidHeaderIndex */;
                   }
                   else if (cmd.quantity <= 0) {
@@ -32371,13 +32451,18 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       // 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.
@@ -32869,39 +32954,34 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           this.computedIcons[sheetId] = {};
           const computedStyle = this.computedStyles[sheetId];
           for (let cf of this.getters.getConditionalFormats(sheetId).reverse()) {
-              try {
-                  switch (cf.rule.type) {
-                      case "ColorScaleRule":
-                          for (let range of cf.ranges) {
-                              this.applyColorScale(range, cf.rule);
-                          }
-                          break;
-                      case "IconSetRule":
-                          for (let range of cf.ranges) {
-                              this.applyIcon(range, cf.rule);
-                          }
-                          break;
-                      default:
-                          for (let ref of cf.ranges) {
-                              const zone = this.getters.getRangeFromSheetXC(sheetId, ref).zone;
-                              for (let row = zone.top; row <= zone.bottom; row++) {
-                                  for (let col = zone.left; col <= zone.right; col++) {
-                                      const pr = this.rulePredicate[cf.rule.type];
-                                      let cell = this.getters.getEvaluatedCell({ sheetId, col, row });
-                                      if (pr && pr(cell, cf.rule)) {
-                                          if (!computedStyle[col])
-                                              computedStyle[col] = [];
-                                          // we must combine all the properties of all the CF rules applied to the given cell
-                                          computedStyle[col][row] = Object.assign(((_a = computedStyle[col]) === null || _a === void 0 ? void 0 : _a[row]) || {}, cf.rule.style);
-                                      }
+              switch (cf.rule.type) {
+                  case "ColorScaleRule":
+                      for (let range of cf.ranges) {
+                          this.applyColorScale(range, cf.rule);
+                      }
+                      break;
+                  case "IconSetRule":
+                      for (let range of cf.ranges) {
+                          this.applyIcon(range, cf.rule);
+                      }
+                      break;
+                  default:
+                      for (let ref of cf.ranges) {
+                          const zone = this.getters.getRangeFromSheetXC(sheetId, ref).zone;
+                          for (let row = zone.top; row <= zone.bottom; row++) {
+                              for (let col = zone.left; col <= zone.right; col++) {
+                                  const pr = this.rulePredicate[cf.rule.type];
+                                  let cell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                                  if (pr && pr(cell, cf.rule)) {
+                                      if (!computedStyle[col])
+                                          computedStyle[col] = [];
+                                      // we must combine all the properties of all the CF rules applied to the given cell
+                                      computedStyle[col][row] = Object.assign(((_a = computedStyle[col]) === null || _a === void 0 ? void 0 : _a[row]) || {}, cf.rule.style);
                                   }
                               }
                           }
-                          break;
-                  }
-              }
-              catch (_) {
-                  // we don't care about the errors within the evaluation of a rule
+                      }
+                      break;
               }
           }
       }
@@ -32926,7 +33006,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   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;
           }
@@ -34488,24 +34568,27 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
        * autofiller
        */
       autofillAuto() {
+          var _a, _b;
           const zone = this.getters.getSelectedZone();
           const sheetId = this.getters.getActiveSheetId();
           let col = zone.left;
           let row = zone.bottom;
           if (col > 0) {
-              let left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
-              while (left.type !== CellValueType.empty) {
+              let leftPosition = { sheetId, col: col - 1, row };
+              while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+                  ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.content)) {
                   row += 1;
-                  left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
+                  leftPosition = { sheetId, col: col - 1, row };
               }
           }
           if (row === zone.bottom) {
               col = zone.right;
               if (col <= this.getters.getNumberCols(sheetId)) {
-                  let right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
-                  while (right.type !== CellValueType.empty) {
+                  let rightPosition = { sheetId, col: col + 1, row };
+                  while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                      ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content)) {
                       row += 1;
-                      right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                      rightPosition = { sheetId, col: col + 1, row };
                   }
               }
           }
@@ -39237,7 +39320,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               sheetId: cmd.sheetId,
               base: cmd.base,
               quantity: thickness,
-              position: "before",
+              position: cmd.position,
           });
           const isCol = cmd.dimension === "COL";
           const start = cmd.elements[0];
@@ -39254,12 +39337,13 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               },
           ];
           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 });
@@ -39296,6 +39380,11 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               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 86 /* CommandResult.InvalidHeaderIndex */;
+          }
           return 0 /* CommandResult.Success */;
       }
       //-------------------------------------------
@@ -40849,7 +40938,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       onKeydown(ev) {
           let keyDownString = "";
-          if (ev.ctrlKey || ev.metaKey) {
+          if (isCtrlKey(ev)) {
               keyDownString += "CTRL+";
           }
           keyDownString += ev.key.toUpperCase();
@@ -44476,9 +44565,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.1.28';
-  __info__.date = '2023-11-24T13:11:01.992Z';
-  __info__.hash = '257f369';
+  __info__.version = '16.1.31';
+  __info__.date = '2024-01-12T13:42:11.001Z';
+  __info__.hash = 'f51befa';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);