@odoo/o-spreadsheet 16.4.16 → 16.4.18

package/dist/o-spreadsheet.esm.js

@@ -1166,16 +1166,81 @@ function toXC(col, row, rangePart = { colFixed: false, rowFixed: false }) {
 }
 
 // -----------------------------------------------------------------------------
+/**
+ * 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 CURRENT_MONTH = new Date().getMonth();
-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 CURRENT_MONTH = DateTime.now().getMonth();
+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 dateSeparatorsRegex = /\/|-|\s/;
@@ -1222,7 +1287,7 @@ function _parseDateTime(str, locale) {
         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;
@@ -1294,12 +1359,12 @@ function parseDate(parts, separator) {
     // month + 1: months are 0-indexed in JS
     const leadingZero = (monthStr?.length === 2 && month + 1 < 10) || (dayStr?.length === 2 && day < 10);
     const fullYear = yearStr?.length !== 2;
-    const jsDate = new Date(year, month, day);
+    const jsDate = new DateTime(year, month, day);
     if (jsDate.getMonth() !== month || jsDate.getDate() !== day) {
         // invalid date
         return null;
     }
-    const delta = jsDate - INITIAL_1900_DAY;
+    const delta = jsDate.getTime() - INITIAL_1900_DAY.getTime();
     const format = getFormatFromDateParts(parts, separator, leadingZero, fullYear);
     return {
         value: Math.round(delta / MS_PER_DAY),
@@ -1390,7 +1455,7 @@ function parseTime(str) {
         if (hours >= 24) {
             format = "hhhh:mm:ss";
         }
-        const jsDate = new Date(1899, 11, 30, hours, minutes, seconds);
+        const jsDate = new DateTime(1899, 11, 30, hours, minutes, seconds);
         return {
             value: hours / 24 + minutes / 1440 + seconds / 86400,
             format: format,
@@ -1404,7 +1469,7 @@ function parseTime(str) {
 // -----------------------------------------------------------------------------
 function numberToJsDate(value) {
     const truncValue = Math.trunc(value);
-    let date = new Date(truncValue * MS_PER_DAY - DATE_JS_1900_OFFSET);
+    let date = DateTime.fromTimestamp(truncValue * MS_PER_DAY - DATE_JS_1900_OFFSET);
     let time = value - truncValue;
     time = time < 0 ? 1 + time : time;
     const hours = Math.round(time * 24);
@@ -1421,7 +1486,7 @@ function jsDateToRoundNumber(date) {
 }
 /** Return the number of days in the current month of the given date */
 function getDaysInMonth(date) {
-    return new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate();
+    return new DateTime(date.getFullYear(), date.getMonth() + 1, 0).getDate();
 }
 function isLastDayOfMonth(date) {
     return getDaysInMonth(date) === date.getDate();
@@ -1439,7 +1504,7 @@ function addMonthsToDate(date, months, keepEndOfMonth) {
     const yStart = date.getFullYear();
     const mStart = date.getMonth();
     const dStart = date.getDate();
-    const jsDate = new Date(yStart, mStart + months);
+    const jsDate = new DateTime(yStart, mStart + months, 1);
     if (keepEndOfMonth && dStart === getDaysInMonth(date)) {
         jsDate.setDate(getDaysInMonth(jsDate));
     }
@@ -2043,7 +2108,7 @@ function formatJSTime(jsDate, format) {
         .map((p) => {
         switch (p) {
             case "hhhh":
-                const helapsedHours = Math.floor((jsDate.getTime() - INITIAL_1900_DAY) / (60 * 60 * 1000));
+                const helapsedHours = Math.floor((jsDate.getTime() - INITIAL_1900_DAY.getTime()) / (60 * 60 * 1000));
                 return helapsedHours.toString();
             case "hh":
                 return hours.toString().padStart(2, "0");
@@ -5597,6 +5662,7 @@ const FilterMenuPopoverBuilder = {
     },
 };
 
+const macRegex = /Mac/i;
 /**
  * Return true if the event was triggered from
  * a child element.
@@ -5636,7 +5702,15 @@ function getOpenedMenus() {
     return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
 }
 function isMacOS() {
-    return navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;
+    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;
 }
 
 /**
@@ -5976,6 +6050,10 @@ css /* scss */ `
         justify-content: space-between;
       }
 
+      .o-menu-item-name {
+        min-width: 40%;
+      }
+
       .o-menu-item-icon {
         display: inline-block;
         margin: 0px 8px 0px 0px;
@@ -6310,6 +6388,9 @@ function arg(definition, description = "") {
 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;
@@ -9560,7 +9641,7 @@ const DATE = {
         if (_year < 1900) {
             _year += 1900;
         }
-        const jsDate = new Date(_year, _month - 1, _day);
+        const jsDate = new DateTime(_year, _month - 1, _day);
         const result = jsDateToRoundNumber(jsDate);
         assert(() => result >= 0, _lt(`The function [[FUNCTION_NAME]] result must be greater than or equal 01/01/1900.`));
         return result;
@@ -9603,7 +9684,7 @@ const DATEDIF = {
                 // 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);
                 }
@@ -9612,7 +9693,7 @@ const DATEDIF = {
                 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);
@@ -9729,7 +9810,7 @@ const EOMONTH = {
         const _months = Math.trunc(toNumber(months, this.locale));
         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,
@@ -9766,17 +9847,17 @@ const ISOWEEKNUM = {
         // The first week of the year is the week that contains the first
         // Thursday of the year.
         let firstThursday = 1;
-        while (new Date(y, 0, firstThursday).getDay() !== 4) {
+        while (new DateTime(y, 0, firstThursday).getDay() !== 4) {
             firstThursday += 1;
         }
-        const firstDayOfFirstWeek = new Date(y, 0, firstThursday - 3);
+        const firstDayOfFirstWeek = new DateTime(y, 0, firstThursday - 3);
         // The last week of the year is the week that contains the last Thursday of
         // the year.
         let lastThursday = 31;
-        while (new Date(y, 11, lastThursday).getDay() !== 4) {
+        while (new DateTime(y, 11, lastThursday).getDay() !== 4) {
             lastThursday -= 1;
         }
-        const lastDayOfLastWeek = new Date(y, 11, lastThursday + 3);
+        const lastDayOfLastWeek = new DateTime(y, 11, lastThursday + 3);
         // B - If our date > lastDayOfLastWeek then it's in the weeks of the year after
         // If our date < firstDayOfFirstWeek then it's in the weeks of the year before
         let offsetYear;
@@ -9802,17 +9883,17 @@ const ISOWEEKNUM = {
             case 1:
                 // firstDay is the 1st day of the 1st week of the year after
                 // firstDay = lastDayOfLastWeek + 1 Day
-                firstDay = new Date(y, 11, lastThursday + 3 + 1);
+                firstDay = new DateTime(y, 11, lastThursday + 3 + 1);
                 break;
             case -1:
                 // firstDay is the 1st day of the 1st week of the previous year.
                 // The first week of the previous year is the week that contains the
                 // first Thursday of the previous year.
                 let firstThursdayPreviousYear = 1;
-                while (new Date(y - 1, 0, firstThursdayPreviousYear).getDay() !== 4) {
+                while (new DateTime(y - 1, 0, firstThursdayPreviousYear).getDay() !== 4) {
                     firstThursdayPreviousYear += 1;
                 }
-                firstDay = new Date(y - 1, 0, firstThursdayPreviousYear - 3);
+                firstDay = new DateTime(y - 1, 0, firstThursdayPreviousYear - 3);
                 break;
         }
         const diff = (_date.getTime() - firstDay.getTime()) / MS_PER_DAY;
@@ -9947,8 +10028,8 @@ const NETWORKDAYS_INTL = {
             });
         }
         const invertDate = _startDate.getTime() > _endDate.getTime();
-        const stopDate = new Date((invertDate ? _startDate : _endDate).getTime());
-        let stepDate = new Date((invertDate ? _endDate : _startDate).getTime());
+        const stopDate = DateTime.fromTimestamp((invertDate ? _startDate : _endDate).getTime());
+        let stepDate = DateTime.fromTimestamp((invertDate ? _endDate : _startDate).getTime());
         const timeStopDate = stopDate.getTime();
         let timeStepDate = stepDate.getTime();
         let netWorkingDay = 0;
@@ -9974,8 +10055,7 @@ const NOW = {
         return this.locale.dateFormat + " " + this.locale.timeFormat;
     },
     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;
@@ -10049,8 +10129,8 @@ const TODAY = {
         return this.locale.dateFormat;
     },
     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,
@@ -10105,10 +10185,10 @@ const WEEKNUM = {
         }
         const y = _date.getFullYear();
         let dayStart = 1;
-        let startDayOfFirstWeek = new Date(y, 0, dayStart);
+        let startDayOfFirstWeek = new DateTime(y, 0, dayStart);
         while (startDayOfFirstWeek.getDay() !== startDayOfWeek) {
             dayStart += 1;
-            startDayOfFirstWeek = new Date(y, 0, dayStart);
+            startDayOfFirstWeek = new DateTime(y, 0, dayStart);
         }
         const dif = (_date.getTime() - startDayOfFirstWeek.getTime()) / MS_PER_DAY;
         if (dif < 0) {
@@ -10166,7 +10246,7 @@ const WORKDAY_INTL = {
                 timesHoliday.add(holiday.getTime());
             });
         }
-        let stepDate = new Date(_startDate.getTime());
+        let stepDate = DateTime.fromTimestamp(_startDate.getTime());
         let timeStepDate = stepDate.getTime();
         const unitDay = Math.sign(_numDays);
         let stepDay = Math.abs(_numDays);
@@ -10230,7 +10310,7 @@ const MONTH_START = {
         const _startDate = toJsDate(date, this.locale);
         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);
     },
 };
@@ -10272,7 +10352,7 @@ const QUARTER_START = {
     compute: function (date) {
         const quarter = QUARTER.compute.bind(this)(date);
         const year = YEAR.compute.bind(this)(date);
-        const jsDate = new Date(year, (quarter - 1) * 3, 1);
+        const jsDate = new DateTime(year, (quarter - 1) * 3, 1);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -10289,7 +10369,7 @@ const QUARTER_END = {
     compute: function (date) {
         const quarter = QUARTER.compute.bind(this)(date);
         const year = YEAR.compute.bind(this)(date);
-        const jsDate = new Date(year, quarter * 3, 0);
+        const jsDate = new DateTime(year, quarter * 3, 0);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -10305,7 +10385,7 @@ const YEAR_START = {
     },
     compute: function (date) {
         const year = YEAR.compute.bind(this)(date);
-        const jsDate = new Date(year, 0, 1);
+        const jsDate = new DateTime(year, 0, 1);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -10321,7 +10401,7 @@ const YEAR_END = {
     },
     compute: function (date) {
         const year = YEAR.compute.bind(this)(date);
-        const jsDate = new Date(year + 1, 0, 0);
+        const jsDate = new DateTime(year + 1, 0, 0);
         return jsDateToRoundNumber(jsDate);
     },
 };
@@ -10369,8 +10449,8 @@ const DEFAULT_DELTA_ARG = 0;
 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) {
@@ -10539,7 +10619,7 @@ function assertDeprecationFactorStrictlyPositive(factor) {
 function assertSettlementLessThanOneYearBeforeMaturity(settlement, maturity, locale) {
     const startDate = toJsDate(settlement, locale);
     const endDate = toJsDate(maturity, locale);
-    const startDatePlusOneYear = new Date(startDate);
+    const startDatePlusOneYear = toJsDate(settlement, locale);
     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()));
 }
@@ -10674,7 +10754,7 @@ const AMORLINC = {
         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) {
@@ -13693,8 +13773,8 @@ const MID = {
     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) {
@@ -20490,10 +20570,10 @@ const arrowMap = {
 function updateSelectionWithArrowKeys(ev, selection) {
     const direction = arrowMap[ev.key];
     if (ev.shiftKey) {
-        selection.resizeAnchorZone(direction, ev.ctrlKey ? "end" : 1);
+        selection.resizeAnchorZone(direction, isCtrlKey(ev) ? "end" : 1);
     }
     else {
-        selection.moveAnchorCell(direction, ev.ctrlKey ? "end" : 1);
+        selection.moveAnchorCell(direction, isCtrlKey(ev) ? "end" : 1);
     }
 }
 
@@ -25538,7 +25618,10 @@ class GridOverlay extends Component {
             return;
         }
         const [col, row] = this.getCartesianCoordinates(ev);
-        this.props.onCellClicked(col, row, { shiftKey: ev.shiftKey, ctrlKey: ev.ctrlKey });
+        this.props.onCellClicked(col, row, {
+            expandZone: ev.shiftKey,
+            addZone: isCtrlKey(ev),
+        });
     }
     onDoubleClick(ev) {
         const [col, row] = this.getCartesianCoordinates(ev);
@@ -25766,7 +25849,7 @@ class AbstractResizer extends Component {
             this._increaseSelection(index);
         }
         else {
-            this._selectElement(index, ev.ctrlKey);
+            this._selectElement(index, isCtrlKey(ev));
         }
         this.lastSelectedElementIndex = index;
         const mouseMoveSelect = (col, row) => {
@@ -25779,7 +25862,7 @@ class AbstractResizer extends Component {
         const mouseUpSelect = () => {
             this.state.isSelecting = false;
             this.lastSelectedElementIndex = null;
-            this.env.model.dispatch(ev.ctrlKey ? "PREPARE_SELECTION_INPUT_EXPANSION" : "STOP_SELECTION_INPUT");
+            this.env.model.dispatch(isCtrlKey(ev) ? "PREPARE_SELECTION_INPUT_EXPANSION" : "STOP_SELECTION_INPUT");
             this._computeGrabDisplay(ev);
         };
         dragAndDropBeyondTheViewport(this.env, mouseMoveSelect, mouseUpSelect);
@@ -25931,8 +26014,8 @@ class ColResizer extends AbstractResizer {
             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");
@@ -26105,8 +26188,8 @@ class RowResizer extends AbstractResizer {
             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");
@@ -26912,8 +26995,8 @@ class Grid extends Component {
     // ---------------------------------------------------------------------------
     // Zone selection with mouse
     // ---------------------------------------------------------------------------
-    onCellClicked(col, row, { ctrlKey, shiftKey }) {
-        if (ctrlKey) {
+    onCellClicked(col, row, { addZone, expandZone }) {
+        if (addZone) {
             this.env.model.dispatch("PREPARE_SELECTION_INPUT_EXPANSION");
         }
         if (this.env.model.getters.hasOpenedPopover()) {
@@ -26922,10 +27005,10 @@ class Grid extends Component {
         if (this.env.model.getters.getEditionMode() === "editing") {
             this.env.model.dispatch("STOP_EDITION");
         }
-        if (shiftKey) {
+        if (expandZone) {
             this.env.model.selection.setAnchorCorner(col, row);
         }
-        else if (ctrlKey) {
+        else if (addZone) {
             this.env.model.selection.addCellToSelection(col, row);
         }
         else {
@@ -26987,9 +27070,7 @@ class Grid extends Component {
             return;
         }
         let keyDownString = "";
-        if (ev.ctrlKey)
-            keyDownString += "CTRL+";
-        if (ev.metaKey)
+        if (isCtrlKey(ev))
             keyDownString += "CTRL+";
         if (ev.altKey)
             keyDownString += "ALT+";
@@ -35558,56 +35639,758 @@ class CompilationParametersBuilder {
     }
 }
 
+function quickselect(arr, k, left, right, compare) {
+    quickselectStep(arr, k, left || 0, right || (arr.length - 1), compare || defaultCompare);
+}
+
+function quickselectStep(arr, k, left, right, compare) {
+
+    while (right > left) {
+        if (right - left > 600) {
+            var n = right - left + 1;
+            var m = k - left + 1;
+            var z = Math.log(n);
+            var s = 0.5 * Math.exp(2 * z / 3);
+            var sd = 0.5 * Math.sqrt(z * s * (n - s) / n) * (m - n / 2 < 0 ? -1 : 1);
+            var newLeft = Math.max(left, Math.floor(k - m * s / n + sd));
+            var newRight = Math.min(right, Math.floor(k + (n - m) * s / n + sd));
+            quickselectStep(arr, k, newLeft, newRight, compare);
+        }
+
+        var t = arr[k];
+        var i = left;
+        var j = right;
+
+        swap(arr, left, k);
+        if (compare(arr[right], t) > 0) swap(arr, left, right);
+
+        while (i < j) {
+            swap(arr, i, j);
+            i++;
+            j--;
+            while (compare(arr[i], t) < 0) i++;
+            while (compare(arr[j], t) > 0) j--;
+        }
+
+        if (compare(arr[left], t) === 0) swap(arr, left, j);
+        else {
+            j++;
+            swap(arr, j, right);
+        }
+
+        if (j <= k) left = j + 1;
+        if (k <= j) right = j - 1;
+    }
+}
+
+function swap(arr, i, j) {
+    var tmp = arr[i];
+    arr[i] = arr[j];
+    arr[j] = tmp;
+}
+
+function defaultCompare(a, b) {
+    return a < b ? -1 : a > b ? 1 : 0;
+}
+
+class RBush {
+    constructor(maxEntries = 9) {
+        // max entries in a node is 9 by default; min node fill is 40% for best performance
+        this._maxEntries = Math.max(4, maxEntries);
+        this._minEntries = Math.max(2, Math.ceil(this._maxEntries * 0.4));
+        this.clear();
+    }
+
+    all() {
+        return this._all(this.data, []);
+    }
+
+    search(bbox) {
+        let node = this.data;
+        const result = [];
+
+        if (!intersects(bbox, node)) return result;
+
+        const toBBox = this.toBBox;
+        const nodesToSearch = [];
+
+        while (node) {
+            for (let i = 0; i < node.children.length; i++) {
+                const child = node.children[i];
+                const childBBox = node.leaf ? toBBox(child) : child;
+
+                if (intersects(bbox, childBBox)) {
+                    if (node.leaf) result.push(child);
+                    else if (contains(bbox, childBBox)) this._all(child, result);
+                    else nodesToSearch.push(child);
+                }
+            }
+            node = nodesToSearch.pop();
+        }
+
+        return result;
+    }
+
+    collides(bbox) {
+        let node = this.data;
+
+        if (!intersects(bbox, node)) return false;
+
+        const nodesToSearch = [];
+        while (node) {
+            for (let i = 0; i < node.children.length; i++) {
+                const child = node.children[i];
+                const childBBox = node.leaf ? this.toBBox(child) : child;
+
+                if (intersects(bbox, childBBox)) {
+                    if (node.leaf || contains(bbox, childBBox)) return true;
+                    nodesToSearch.push(child);
+                }
+            }
+            node = nodesToSearch.pop();
+        }
+
+        return false;
+    }
+
+    load(data) {
+        if (!(data && data.length)) return this;
+
+        if (data.length < this._minEntries) {
+            for (let i = 0; i < data.length; i++) {
+                this.insert(data[i]);
+            }
+            return this;
+        }
+
+        // recursively build the tree with the given data from scratch using OMT algorithm
+        let node = this._build(data.slice(), 0, data.length - 1, 0);
+
+        if (!this.data.children.length) {
+            // save as is if tree is empty
+            this.data = node;
+
+        } else if (this.data.height === node.height) {
+            // split root if trees have the same height
+            this._splitRoot(this.data, node);
+
+        } else {
+            if (this.data.height < node.height) {
+                // swap trees if inserted one is bigger
+                const tmpNode = this.data;
+                this.data = node;
+                node = tmpNode;
+            }
+
+            // insert the small tree into the large tree at appropriate level
+            this._insert(node, this.data.height - node.height - 1, true);
+        }
+
+        return this;
+    }
+
+    insert(item) {
+        if (item) this._insert(item, this.data.height - 1);
+        return this;
+    }
+
+    clear() {
+        this.data = createNode([]);
+        return this;
+    }
+
+    remove(item, equalsFn) {
+        if (!item) return this;
+
+        let node = this.data;
+        const bbox = this.toBBox(item);
+        const path = [];
+        const indexes = [];
+        let i, parent, goingUp;
+
+        // depth-first iterative tree traversal
+        while (node || path.length) {
+
+            if (!node) { // go up
+                node = path.pop();
+                parent = path[path.length - 1];
+                i = indexes.pop();
+                goingUp = true;
+            }
+
+            if (node.leaf) { // check current node
+                const index = findItem(item, node.children, equalsFn);
+
+                if (index !== -1) {
+                    // item found, remove the item and condense tree upwards
+                    node.children.splice(index, 1);
+                    path.push(node);
+                    this._condense(path);
+                    return this;
+                }
+            }
+
+            if (!goingUp && !node.leaf && contains(node, bbox)) { // go down
+                path.push(node);
+                indexes.push(i);
+                i = 0;
+                parent = node;
+                node = node.children[0];
+
+            } else if (parent) { // go right
+                i++;
+                node = parent.children[i];
+                goingUp = false;
+
+            } else node = null; // nothing found
+        }
+
+        return this;
+    }
+
+    toBBox(item) { return item; }
+
+    compareMinX(a, b) { return a.minX - b.minX; }
+    compareMinY(a, b) { return a.minY - b.minY; }
+
+    toJSON() { return this.data; }
+
+    fromJSON(data) {
+        this.data = data;
+        return this;
+    }
+
+    _all(node, result) {
+        const nodesToSearch = [];
+        while (node) {
+            if (node.leaf) result.push(...node.children);
+            else nodesToSearch.push(...node.children);
+
+            node = nodesToSearch.pop();
+        }
+        return result;
+    }
+
+    _build(items, left, right, height) {
+
+        const N = right - left + 1;
+        let M = this._maxEntries;
+        let node;
+
+        if (N <= M) {
+            // reached leaf level; return leaf
+            node = createNode(items.slice(left, right + 1));
+            calcBBox(node, this.toBBox);
+            return node;
+        }
+
+        if (!height) {
+            // target height of the bulk-loaded tree
+            height = Math.ceil(Math.log(N) / Math.log(M));
+
+            // target number of root entries to maximize storage utilization
+            M = Math.ceil(N / Math.pow(M, height - 1));
+        }
+
+        node = createNode([]);
+        node.leaf = false;
+        node.height = height;
+
+        // split the items into M mostly square tiles
+
+        const N2 = Math.ceil(N / M);
+        const N1 = N2 * Math.ceil(Math.sqrt(M));
+
+        multiSelect(items, left, right, N1, this.compareMinX);
+
+        for (let i = left; i <= right; i += N1) {
+
+            const right2 = Math.min(i + N1 - 1, right);
+
+            multiSelect(items, i, right2, N2, this.compareMinY);
+
+            for (let j = i; j <= right2; j += N2) {
+
+                const right3 = Math.min(j + N2 - 1, right2);
+
+                // pack each entry recursively
+                node.children.push(this._build(items, j, right3, height - 1));
+            }
+        }
+
+        calcBBox(node, this.toBBox);
+
+        return node;
+    }
+
+    _chooseSubtree(bbox, node, level, path) {
+        while (true) {
+            path.push(node);
+
+            if (node.leaf || path.length - 1 === level) break;
+
+            let minArea = Infinity;
+            let minEnlargement = Infinity;
+            let targetNode;
+
+            for (let i = 0; i < node.children.length; i++) {
+                const child = node.children[i];
+                const area = bboxArea(child);
+                const enlargement = enlargedArea(bbox, child) - area;
+
+                // choose entry with the least area enlargement
+                if (enlargement < minEnlargement) {
+                    minEnlargement = enlargement;
+                    minArea = area < minArea ? area : minArea;
+                    targetNode = child;
+
+                } else if (enlargement === minEnlargement) {
+                    // otherwise choose one with the smallest area
+                    if (area < minArea) {
+                        minArea = area;
+                        targetNode = child;
+                    }
+                }
+            }
+
+            node = targetNode || node.children[0];
+        }
+
+        return node;
+    }
+
+    _insert(item, level, isNode) {
+        const bbox = isNode ? item : this.toBBox(item);
+        const insertPath = [];
+
+        // find the best node for accommodating the item, saving all nodes along the path too
+        const node = this._chooseSubtree(bbox, this.data, level, insertPath);
+
+        // put the item into the node
+        node.children.push(item);
+        extend(node, bbox);
+
+        // split on node overflow; propagate upwards if necessary
+        while (level >= 0) {
+            if (insertPath[level].children.length > this._maxEntries) {
+                this._split(insertPath, level);
+                level--;
+            } else break;
+        }
+
+        // adjust bboxes along the insertion path
+        this._adjustParentBBoxes(bbox, insertPath, level);
+    }
+
+    // split overflowed node into two
+    _split(insertPath, level) {
+        const node = insertPath[level];
+        const M = node.children.length;
+        const m = this._minEntries;
+
+        this._chooseSplitAxis(node, m, M);
+
+        const splitIndex = this._chooseSplitIndex(node, m, M);
+
+        const newNode = createNode(node.children.splice(splitIndex, node.children.length - splitIndex));
+        newNode.height = node.height;
+        newNode.leaf = node.leaf;
+
+        calcBBox(node, this.toBBox);
+        calcBBox(newNode, this.toBBox);
+
+        if (level) insertPath[level - 1].children.push(newNode);
+        else this._splitRoot(node, newNode);
+    }
+
+    _splitRoot(node, newNode) {
+        // split root node
+        this.data = createNode([node, newNode]);
+        this.data.height = node.height + 1;
+        this.data.leaf = false;
+        calcBBox(this.data, this.toBBox);
+    }
+
+    _chooseSplitIndex(node, m, M) {
+        let index;
+        let minOverlap = Infinity;
+        let minArea = Infinity;
+
+        for (let i = m; i <= M - m; i++) {
+            const bbox1 = distBBox(node, 0, i, this.toBBox);
+            const bbox2 = distBBox(node, i, M, this.toBBox);
+
+            const overlap = intersectionArea(bbox1, bbox2);
+            const area = bboxArea(bbox1) + bboxArea(bbox2);
+
+            // choose distribution with minimum overlap
+            if (overlap < minOverlap) {
+                minOverlap = overlap;
+                index = i;
+
+                minArea = area < minArea ? area : minArea;
+
+            } else if (overlap === minOverlap) {
+                // otherwise choose distribution with minimum area
+                if (area < minArea) {
+                    minArea = area;
+                    index = i;
+                }
+            }
+        }
+
+        return index || M - m;
+    }
+
+    // sorts node children by the best axis for split
+    _chooseSplitAxis(node, m, M) {
+        const compareMinX = node.leaf ? this.compareMinX : compareNodeMinX;
+        const compareMinY = node.leaf ? this.compareMinY : compareNodeMinY;
+        const xMargin = this._allDistMargin(node, m, M, compareMinX);
+        const yMargin = this._allDistMargin(node, m, M, compareMinY);
+
+        // if total distributions margin value is minimal for x, sort by minX,
+        // otherwise it's already sorted by minY
+        if (xMargin < yMargin) node.children.sort(compareMinX);
+    }
+
+    // total margin of all possible split distributions where each node is at least m full
+    _allDistMargin(node, m, M, compare) {
+        node.children.sort(compare);
+
+        const toBBox = this.toBBox;
+        const leftBBox = distBBox(node, 0, m, toBBox);
+        const rightBBox = distBBox(node, M - m, M, toBBox);
+        let margin = bboxMargin(leftBBox) + bboxMargin(rightBBox);
+
+        for (let i = m; i < M - m; i++) {
+            const child = node.children[i];
+            extend(leftBBox, node.leaf ? toBBox(child) : child);
+            margin += bboxMargin(leftBBox);
+        }
+
+        for (let i = M - m - 1; i >= m; i--) {
+            const child = node.children[i];
+            extend(rightBBox, node.leaf ? toBBox(child) : child);
+            margin += bboxMargin(rightBBox);
+        }
+
+        return margin;
+    }
+
+    _adjustParentBBoxes(bbox, path, level) {
+        // adjust bboxes along the given tree path
+        for (let i = level; i >= 0; i--) {
+            extend(path[i], bbox);
+        }
+    }
+
+    _condense(path) {
+        // go through the path, removing empty nodes and updating bboxes
+        for (let i = path.length - 1, siblings; i >= 0; i--) {
+            if (path[i].children.length === 0) {
+                if (i > 0) {
+                    siblings = path[i - 1].children;
+                    siblings.splice(siblings.indexOf(path[i]), 1);
+
+                } else this.clear();
+
+            } else calcBBox(path[i], this.toBBox);
+        }
+    }
+}
+
+function findItem(item, items, equalsFn) {
+    if (!equalsFn) return items.indexOf(item);
+
+    for (let i = 0; i < items.length; i++) {
+        if (equalsFn(item, items[i])) return i;
+    }
+    return -1;
+}
+
+// calculate node's bbox from bboxes of its children
+function calcBBox(node, toBBox) {
+    distBBox(node, 0, node.children.length, toBBox, node);
+}
+
+// min bounding rectangle of node children from k to p-1
+function distBBox(node, k, p, toBBox, destNode) {
+    if (!destNode) destNode = createNode(null);
+    destNode.minX = Infinity;
+    destNode.minY = Infinity;
+    destNode.maxX = -Infinity;
+    destNode.maxY = -Infinity;
+
+    for (let i = k; i < p; i++) {
+        const child = node.children[i];
+        extend(destNode, node.leaf ? toBBox(child) : child);
+    }
+
+    return destNode;
+}
+
+function extend(a, b) {
+    a.minX = Math.min(a.minX, b.minX);
+    a.minY = Math.min(a.minY, b.minY);
+    a.maxX = Math.max(a.maxX, b.maxX);
+    a.maxY = Math.max(a.maxY, b.maxY);
+    return a;
+}
+
+function compareNodeMinX(a, b) { return a.minX - b.minX; }
+function compareNodeMinY(a, b) { return a.minY - b.minY; }
+
+function bboxArea(a)   { return (a.maxX - a.minX) * (a.maxY - a.minY); }
+function bboxMargin(a) { return (a.maxX - a.minX) + (a.maxY - a.minY); }
+
+function enlargedArea(a, b) {
+    return (Math.max(b.maxX, a.maxX) - Math.min(b.minX, a.minX)) *
+           (Math.max(b.maxY, a.maxY) - Math.min(b.minY, a.minY));
+}
+
+function intersectionArea(a, b) {
+    const minX = Math.max(a.minX, b.minX);
+    const minY = Math.max(a.minY, b.minY);
+    const maxX = Math.min(a.maxX, b.maxX);
+    const maxY = Math.min(a.maxY, b.maxY);
+
+    return Math.max(0, maxX - minX) *
+           Math.max(0, maxY - minY);
+}
+
+function contains(a, b) {
+    return a.minX <= b.minX &&
+           a.minY <= b.minY &&
+           b.maxX <= a.maxX &&
+           b.maxY <= a.maxY;
+}
+
+function intersects(a, b) {
+    return b.minX <= a.maxX &&
+           b.minY <= a.maxY &&
+           b.maxX >= a.minX &&
+           b.maxY >= a.minY;
+}
+
+function createNode(children) {
+    return {
+        children,
+        height: 1,
+        leaf: true,
+        minX: Infinity,
+        minY: Infinity,
+        maxX: -Infinity,
+        maxY: -Infinity
+    };
+}
+
+// sort an array so that items come in groups of n unsorted items, with groups sorted between each other;
+// combines selection algorithm with binary divide & conquer approach
+
+function multiSelect(arr, left, right, n, compare) {
+    const stack = [left, right];
+
+    while (stack.length) {
+        right = stack.pop();
+        left = stack.pop();
+
+        if (right - left <= n) continue;
+
+        const mid = left + Math.ceil((right - left) / n / 2) * n;
+        quickselect(arr, mid, left, right, compare);
+
+        stack.push(left, mid, mid, right);
+    }
+}
+
+/**
+ * R-Tree Data Structure
+ *
+ * R-Tree is a spatial data structure used for efficient indexing and querying
+ * of multi-dimensional objects, particularly in geometric and spatial applications.
+ *
+ * It organizes objects into a tree hierarchy, grouping nearby objects together
+ * in bounding boxes. Each node in the tree represents a bounding box that
+ * contains its child nodes or leaf objects. This hierarchical structure allows
+ * for faster spatial queries.
+ *
+ * @see https://en.wikipedia.org/wiki/R-tree
+ *
+ * Consider a 2D Space with four zones: A, B, C, D
+ * +--------------------------+
+ * |                          |
+ * |   +---+     +-------+    |
+ * |   | A |     |   B   |    |
+ * |   +---+     +-------+    |
+ * |                          |
+ * |                          |
+ * |          +---+           |
+ * |          | C |           |
+ * |          +---+           |
+ * |      +-----------+       |
+ * |      |     D     |       |
+ * |      +-----------+       |
+ * |                          |
+ * +--------------------------+
+ *
+ * It groups together zones that are spatially close into a minimum bounding box.
+ * For example, A and B are grouped together in rectangle R1, and C and D are grouped
+ * in R2.
+ *
+ * R0
+ * +--------------------------+
+ * |   R1                     |
+ * |   +-----------------+    |
+ * |   | A |     |   B   |    |
+ * |   +-----------------+    |
+ * |                          |
+ * |      R2                  |
+ * |      +---+---+---+       |
+ * |      |   | C |   |       |
+ * |      |   +---+   |       |
+ * |      +-----------+       |
+ * |      |     D     |       |
+ * |      +-----------+       |
+ * |                          |
+ * +--------------------------+
+ *
+ * The tree would look like this:
+ *          R0
+ *         /  \
+ *        /    \
+ *       R1     R2
+ *       |      |
+ *      A,B    C,D
+
+ * Choosing how to group the zones is crucial for the performance of the tree.
+ * Key considerations include avoiding excessive empty space coverage and minimizing overlap
+ * to reduce the number of subtrees processed during searches.
+ *
+ * Various heuristics exist for determining the optimal grouping strategy, such as "least enlargement"
+ * which prioritizes grouping nodes resulting in the smallest increase in bounding box size. In cases where
+ * the choice cannot be made based on this criterion due to the same enlargement for different groupings,
+ * we then evaluate "least area," aiming to minimize the overall area of bounding boxes.
+ *
+ * This implementation is tailored for spreadsheet use, indexing objects associated
+ * with a zone and a sheet.
+ *
+ * It uses the RBush library under the hood. One 2D RBush R-tree per sheet.
+ * @see https://github.com/mourner/rbush
+ */
+class SpreadsheetRTree {
+    /**
+     * One 2D R-tree per sheet
+     */
+    rTrees = {};
+    /**
+     * Bulk-inserts the given items into the tree. Bulk insertion is usually ~2-3 times
+     * faster than inserting items one by one. After bulk loading (bulk insertion into
+     * an empty tree), subsequent query performance is also ~20-30% better.
+     */
+    constructor(items = []) {
+        const rangesPerSheet = {};
+        for (const item of items) {
+            const sheetId = item.boundingBox.sheetId;
+            if (!rangesPerSheet[sheetId]) {
+                rangesPerSheet[sheetId] = [];
+            }
+            rangesPerSheet[sheetId].push(item);
+        }
+        for (const sheetId in rangesPerSheet) {
+            this.rTrees[sheetId] = new ZoneRBush();
+            this.rTrees[sheetId].load(rangesPerSheet[sheetId]); // bulk-insert
+        }
+    }
+    insert(item) {
+        const sheetId = item.boundingBox.sheetId;
+        if (!this.rTrees[sheetId]) {
+            this.rTrees[sheetId] = new ZoneRBush();
+        }
+        this.rTrees[sheetId].insert(item);
+    }
+    search({ zone, sheetId }) {
+        if (!this.rTrees[sheetId]) {
+            return [];
+        }
+        return this.rTrees[sheetId].search({
+            minX: zone.left,
+            minY: zone.top,
+            maxX: zone.right,
+            maxY: zone.bottom,
+        });
+    }
+    remove(item) {
+        const sheetId = item.boundingBox.sheetId;
+        if (!this.rTrees[sheetId]) {
+            return;
+        }
+        this.rTrees[sheetId].remove(item, deepEquals);
+    }
+}
+/**
+ * RBush extension to use zones as bounding boxes
+ */
+class ZoneRBush extends RBush {
+    toBBox({ boundingBox }) {
+        const zone = boundingBox.zone;
+        return {
+            minX: zone.left,
+            minY: zone.top,
+            maxX: zone.right,
+            maxY: zone.bottom,
+        };
+    }
+    compareMinX(a, b) {
+        return a.boundingBox.zone.left - b.boundingBox.zone.left;
+    }
+    compareMinY(a, b) {
+        return a.boundingBox.zone.top - b.boundingBox.zone.top;
+    }
+}
+
 /**
- * This class is an implementation of a dependency Graph.
+ * Implementation of a dependency Graph.
  * The graph is used to evaluate the cells in the correct
  * order, and should be updated each time a cell's content is modified
  *
+ * It uses an R-Tree data structure to efficiently find dependent cells.
  */
 class FormulaDependencyGraph {
-    /**
-     * Internal structure:
-     * - key: a cell position (encoded as an integer)
-     * - value: a set of cell positions that depends on the key
-     *
-     * Given
-     * - A1:"= B1 + SQRT(B2)"
-     * - C1:"= B1";
-     * - C2:"= C1"
-     *
-     * we will have something like:
-     * - B1 ---> (A1, C1)   meaning A1 and C1 depends on B1
-     * - B2 ---> (A1)       meaning A1 depends on B2
-     * - C1 ---> (C2)       meaning C2 depends on C1
-     */
-    inverseDependencies = new Map();
+    encoder;
     dependencies = new Map();
+    rTree;
+    constructor(encoder, data = []) {
+        this.encoder = encoder;
+        this.rTree = new SpreadsheetRTree(data);
+    }
     removeAllDependencies(formulaPositionId) {
-        const dependencies = this.dependencies.get(formulaPositionId);
-        if (!dependencies) {
+        const ranges = this.dependencies.get(formulaPositionId);
+        if (!ranges) {
             return;
         }
-        for (const dependency of dependencies) {
-            this.inverseDependencies.get(dependency)?.delete(formulaPositionId);
+        for (const range of ranges) {
+            this.rTree.remove(range);
         }
         this.dependencies.delete(formulaPositionId);
     }
     addDependencies(formulaPositionId, dependencies) {
-        for (const dependency of dependencies) {
-            const inverseDependencies = this.inverseDependencies.get(dependency);
-            if (inverseDependencies) {
-                inverseDependencies.add(formulaPositionId);
-            }
-            else {
-                this.inverseDependencies.set(dependency, new Set([formulaPositionId]));
-            }
+        const rTreeItems = dependencies.map(({ sheetId, zone }) => ({
+            data: formulaPositionId,
+            boundingBox: {
+                zone,
+                sheetId,
+            },
+        }));
+        for (const item of rTreeItems) {
+            this.rTree.insert(item);
         }
         const existingDependencies = this.dependencies.get(formulaPositionId);
         if (existingDependencies) {
-            existingDependencies.push(...dependencies);
+            existingDependencies.push(...rTreeItems);
         }
         else {
-            this.dependencies.set(formulaPositionId, dependencies);
+            this.dependencies.set(formulaPositionId, rTreeItems);
         }
     }
     /**
@@ -35615,20 +36398,20 @@ class FormulaDependencyGraph {
      * in the correct order they should be evaluated.
      * This is called a topological ordering (excluding cycles)
      */
-    getCellsDependingOn(positionIds) {
+    getCellsDependingOn(ranges) {
         const visited = new JetSet();
-        const queue = Array.from(positionIds).reverse();
+        const queue = Array.from(ranges).reverse();
         while (queue.length > 0) {
-            const node = queue.pop();
-            visited.add(node);
-            const adjacentNodes = this.inverseDependencies.get(node) || new Set();
-            for (const adjacentNode of adjacentNodes) {
-                if (!visited.has(adjacentNode)) {
-                    queue.push(adjacentNode);
+            const range = queue.pop();
+            visited.add(...this.encoder.encodeBoundingBox(range));
+            const impactedPositionIds = this.rTree.search(range).map((dep) => dep.data);
+            for (const positionId of impactedPositionIds) {
+                if (!visited.has(positionId)) {
+                    queue.push(this.encoder.decodeToBoundingBox(positionId));
                 }
             }
         }
-        visited.delete(...positionIds);
+        visited.delete(...ranges.flatMap((r) => this.encoder.encodeBoundingBox(r)));
         return visited;
     }
 }
@@ -35716,9 +36499,9 @@ class Evaluator {
     context;
     getters;
     compilationParams;
-    positionEncoder = new PositionBitsEncoder();
+    encoder = new PositionBitsEncoder();
     evaluatedCells = new Map();
-    formulaDependencies = lazy(new FormulaDependencyGraph());
+    formulaDependencies = lazy(new FormulaDependencyGraph(this.encoder));
     blockedArrayFormulas = new Set();
     spreadingRelations = new SpreadingRelation();
     constructor(context, getters) {
@@ -35727,16 +36510,16 @@ class Evaluator {
         this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     getEvaluatedCell(position) {
-        return (this.evaluatedCells.get(this.encodePosition(position)) ||
+        return (this.evaluatedCells.get(this.encoder.encode(position)) ||
             createEvaluatedCell("", { locale: this.getters.getLocale() }));
     }
     getArrayFormulaSpreadingOn(position) {
-        const positionId = this.encodePosition(position);
+        const positionId = this.encoder.encode(position);
         const formulaPosition = this.getArrayFormulaSpreadingOnId(positionId);
-        return formulaPosition !== undefined ? this.decodePosition(formulaPosition) : undefined;
+        return formulaPosition !== undefined ? this.encoder.decode(formulaPosition) : undefined;
     }
     getEvaluatedPositions() {
-        return [...this.evaluatedCells.keys()].map(this.decodePosition.bind(this));
+        return [...this.evaluatedCells.keys()].map((p) => this.encoder.decode(p));
     }
     getArrayFormulaSpreadingOnId(positionId) {
         if (!this.spreadingRelations.hasArrayFormulaResult(positionId)) {
@@ -35746,7 +36529,7 @@ class Evaluator {
         return Array.from(arrayFormulas).find((positionId) => !this.blockedArrayFormulas.has(positionId));
     }
     updateDependencies(position) {
-        const positionId = this.encodePosition(position);
+        const positionId = this.encoder.encode(position);
         this.formulaDependencies().removeAllDependencies(positionId);
         const dependencies = this.getDirectDependencies(positionId);
         this.formulaDependencies().addDependencies(positionId, dependencies);
@@ -35756,12 +36539,12 @@ class Evaluator {
         this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     evaluateCells(positions) {
-        const cells = positions.map(this.encodePosition.bind(this));
+        const cells = positions.map((p) => this.encoder.encode(p));
         const cellsToCompute = new JetSet(cells);
-        const arrayFormulas = this.getArrayFormulasImpactedByChangesOf(cells);
+        const arrayFormulasPositionIds = this.getArrayFormulasImpactedByChangesOf(cells);
         cellsToCompute.add(...this.getCellsDependingOn(cells));
-        cellsToCompute.add(...arrayFormulas);
-        cellsToCompute.add(...this.getCellsDependingOn(arrayFormulas));
+        cellsToCompute.add(...arrayFormulasPositionIds);
+        cellsToCompute.add(...this.getCellsDependingOn(arrayFormulasPositionIds));
         this.evaluate(cellsToCompute);
     }
     getArrayFormulasImpactedByChangesOf(positionIds) {
@@ -35784,12 +36567,14 @@ class Evaluator {
         this.blockedArrayFormulas = new Set();
         this.spreadingRelations = new SpreadingRelation();
         this.formulaDependencies = lazy(() => {
-            const dependencyGraph = new FormulaDependencyGraph();
-            for (const positionId of this.getAllCells()) {
-                const dependencies = this.getDirectDependencies(positionId);
-                dependencyGraph.addDependencies(positionId, dependencies);
-            }
-            return dependencyGraph;
+            const dependencies = [...this.getAllCells()].flatMap((positionId) => this.getDirectDependencies(positionId).map((range) => ({
+                data: positionId,
+                boundingBox: {
+                    zone: range.zone,
+                    sheetId: range.sheetId,
+                },
+            })));
+            return new FormulaDependencyGraph(this.encoder, dependencies);
         });
     }
     evaluateAllCells() {
@@ -35810,7 +36595,7 @@ class Evaluator {
         for (const sheetId of this.getters.getSheetIds()) {
             const cellIds = this.getters.getCells(sheetId);
             for (const cellId in cellIds) {
-                positionIds.add(this.encodePosition(this.getters.getCellPosition(cellId)));
+                positionIds.add(this.encoder.encode(this.getters.getCellPosition(cellId)));
             }
         }
         return positionIds;
@@ -35877,7 +36662,7 @@ class Evaluator {
         }
     }
     computeAndSave(position) {
-        const positionId = this.encodePosition(position);
+        const positionId = this.encoder.encode(position);
         const evaluatedCell = this.computeCell(positionId);
         if (!this.evaluatedCells.has(positionId)) {
             this.setEvaluatedCell(positionId, evaluatedCell);
@@ -35938,15 +36723,15 @@ class Evaluator {
         throw new Error(_lt("Result couldn't be automatically expanded. Please insert more columns and rows."));
     }
     updateSpreadRelation({ sheetId, col, row, }) {
-        const arrayFormulaPositionId = this.encodePosition({ sheetId, col, row });
+        const arrayFormulaPositionId = this.encoder.encode({ sheetId, col, row });
         return (i, j) => {
             const position = { sheetId, col: i + col, row: j + row };
-            const resultPositionId = this.encodePosition(position);
+            const resultPositionId = this.encoder.encode(position);
             this.spreadingRelations.addRelation({ resultPositionId, arrayFormulaPositionId });
         };
     }
     checkCollision({ sheetId, col, row }) {
-        const formulaPositionId = this.encodePosition({ sheetId, col, row });
+        const formulaPositionId = this.encoder.encode({ sheetId, col, row });
         return (i, j) => {
             const position = { sheetId: sheetId, col: i + col, row: j + row };
             const rawCell = this.getters.getCell(position);
@@ -35968,7 +36753,7 @@ class Evaluator {
                 format: format || formatFromPosition(i, j),
                 locale: this.getters.getLocale(),
             });
-            const positionId = this.encodePosition(position);
+            const positionId = this.encoder.encode(position);
             this.setEvaluatedCell(positionId, evaluatedCell);
             // check if formula dependencies present in the spread zone
             // if so, they need to be recomputed
@@ -36000,29 +36785,17 @@ class Evaluator {
         if (!cell?.isFormula) {
             return [];
         }
-        const dependencies = [];
-        for (const range of cell.dependencies) {
-            if (range.invalidSheetName || range.invalidXc) {
-                continue;
-            }
-            const sheetId = range.sheetId;
-            forEachPositionsInZone(range.zone, (col, row) => {
-                dependencies.push(this.encodePosition({ sheetId, col, row }));
-            });
-        }
-        return dependencies;
+        return cell.dependencies;
     }
     getCellsDependingOn(positionIds) {
-        return this.formulaDependencies().getCellsDependingOn(positionIds);
+        const ranges = [];
+        for (const positionId of positionIds) {
+            ranges.push(this.encoder.decodeToBoundingBox(positionId));
+        }
+        return this.formulaDependencies().getCellsDependingOn(ranges);
     }
     getCell(positionId) {
-        return this.getters.getCell(this.decodePosition(positionId));
-    }
-    encodePosition(position) {
-        return this.positionEncoder.encode(position);
-    }
-    decodePosition(positionId) {
-        return this.positionEncoder.decode(positionId);
+        return this.getters.getCell(this.encoder.decode(positionId));
     }
 }
 function forEachSpreadPositionInMatrix(matrix, callback) {
@@ -36097,6 +36870,13 @@ class PositionBitsEncoder {
     encode({ sheetId, col, row }) {
         return (this.encodeSheet(sheetId) << 42n) | (BigInt(col) << 21n) | BigInt(row);
     }
+    encodeBoundingBox({ sheetId, zone }) {
+        const positions = [];
+        forEachPositionsInZone(zone, (col, row) => {
+            positions.push(this.encode({ sheetId, col, row }));
+        });
+        return positions;
+    }
     decode(id) {
         // keep only the last 21 bits by AND-ing the bit sequence with 21 ones
         const row = Number(id & 2097151n);
@@ -36104,6 +36884,10 @@ class PositionBitsEncoder {
         const sheetId = this.decodeSheet(id >> 42n);
         return { sheetId, col, row };
     }
+    decodeToBoundingBox(id) {
+        const { sheetId, col, row } = this.decode(id);
+        return { sheetId, zone: { left: col, top: row, right: col, bottom: row } };
+    }
     encodeSheet(sheetId) {
         const sheetKey = this.sheetMapping[sheetId];
         if (sheetKey === undefined) {
@@ -36218,6 +37002,7 @@ class PositionBitsEncoder {
 class EvaluationPlugin extends UIPlugin {
     static getters = [
         "evaluateFormula",
+        "getCorrespondingFormulaCell",
         "getRangeFormattedValues",
         "getRangeValues",
         "getRangeFormats",
@@ -36271,7 +37056,12 @@ class EvaluationPlugin extends UIPlugin {
     // Getters
     // ---------------------------------------------------------------------------
     evaluateFormula(sheetId, formulaString) {
-        return this.evaluator.evaluateFormula(sheetId, formulaString);
+        try {
+            return this.evaluator.evaluateFormula(sheetId, formulaString);
+        }
+        catch (error) {
+            return error instanceof EvaluationError ? error.errorType : CellErrorType.GenericError;
+        }
     }
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
@@ -36661,34 +37451,29 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
     getComputedStyles(sheetId) {
         const computedStyle = {};
         for (let cf of this.getters.getConditionalFormats(sheetId).reverse()) {
-            try {
-                switch (cf.rule.type) {
-                    case "ColorScaleRule":
-                        for (let range of cf.ranges) {
-                            this.applyColorScale(sheetId, range, cf.rule, computedStyle);
-                        }
-                        break;
-                    case "CellIsRule":
-                        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(sheetId, range, cf.rule, computedStyle);
+                    }
+                    break;
+                case "CellIsRule":
+                    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;
             }
         }
         return computedStyle;
@@ -36724,7 +37509,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                 return percentile(rangeValues, Number(threshold.value) / 100, true);
             case "formula":
                 const value = threshold.value && this.getters.evaluateFormula(sheetId, threshold.value);
-                return !(value instanceof Promise) ? value : null;
+                return typeof value === "number" ? value : null;
             default:
                 return null;
         }
@@ -37291,7 +38076,7 @@ class AutofillPlugin extends UIPlugin {
         let row = zone.bottom;
         if (col > 0) {
             let leftPosition = { sheetId, col: col - 1, row };
-            while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+            while (this.getters.getCorrespondingFormulaCell(leftPosition) ||
                 this.getters.getCell(leftPosition)?.content) {
                 row += 1;
                 leftPosition = { sheetId, col: col - 1, row };
@@ -37301,7 +38086,7 @@ class AutofillPlugin extends UIPlugin {
             col = zone.right;
             if (col <= this.getters.getNumberCols(sheetId)) {
                 let rightPosition = { sheetId, col: col + 1, row };
-                while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                while (this.getters.getCorrespondingFormulaCell(rightPosition) ||
                     this.getters.getCell(rightPosition)?.content) {
                     row += 1;
                     rightPosition = { sheetId, col: col + 1, row };
@@ -47049,7 +47834,7 @@ class Spreadsheet extends Component {
     }
     onKeydown(ev) {
         let keyDownString = "";
-        if (ev.ctrlKey || ev.metaKey) {
+        if (isCtrlKey(ev)) {
             keyDownString += "CTRL+";
         }
         keyDownString += ev.key.toUpperCase();
@@ -50776,6 +51561,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.4.16';
-__info__.date = '2023-12-05T09:37:14.210Z';
-__info__.hash = '1abbb92';
+__info__.version = '16.4.18';
+__info__.date = '2024-01-12T13:43:10.143Z';
+__info__.hash = 'f438e08';