@odoo/o-spreadsheet 17.2.33 → 17.2.35

package/dist/o-spreadsheet.iife.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.33
- * @date 2025-01-27T10:02:54.985Z
- * @hash 6ea43fb
+ * @version 17.2.35
+ * @date 2025-02-05T07:12:34.721Z
+ * @hash 76b12a1
  */
 
 (function (exports, owl) {
@@ -1783,11 +1783,11 @@
    * number from the point of view of the isNumber function.
    */
   function parseNumber(str, locale) {
+      // remove invaluable characters
+      str = str.replace(getInvaluableSymbolsRegexp(locale), "");
       if (locale.decimalSeparator !== ".") {
           str = str.replace(locale.decimalSeparator, ".");
       }
-      // remove invaluable characters
-      str = str.replace(getInvaluableSymbolsRegexp(locale), "");
       let n = Number(str);
       if (isNaN(n) && str.includes("%")) {
           n = Number(str.split("%")[0]);
@@ -17752,23 +17752,24 @@ stores.inject(MyMetaStore, storeInstance);
       description: _t("Horizontal lookup"),
       args: [
           arg("search_key (any)", _t("The value to search for. For example, 42, 'Cats', or I24.")),
-          arg("range (range)", _t("The range to consider for the search. The first row in the range is searched for the key specified in search_key.")),
+          arg("range (any, range)", _t("The range to consider for the search. The first row in the range is searched for the key specified in search_key.")),
           arg("index (number)", _t("The row index of the value to be returned, where the first row in range is numbered 1.")),
           arg(`is_sorted (boolean, default=${DEFAULT_IS_SORTED})`, _t("Indicates whether the row to be searched (the first row of the specified range) is sorted, in which case the closest match for search_key will be returned.")),
       ],
       returns: ["ANY"],
       compute: function (searchKey, range, index, isSorted = { value: DEFAULT_IS_SORTED }) {
           const _index = Math.trunc(toNumber(index?.value, this.locale));
-          assert(() => 1 <= _index && _index <= range[0].length, _t("[[FUNCTION_NAME]] evaluates to an out of bounds range."));
+          const _range = toMatrix(range);
+          assert(() => 1 <= _index && _index <= _range[0].length, _t("[[FUNCTION_NAME]] evaluates to an out of bounds range."));
           if (searchKey && isEvaluationError(searchKey.value)) {
               return searchKey;
           }
           const getValueFromRange = (range, index) => range[index][0].value;
           const _isSorted = toBoolean(isSorted.value);
           const colIndex = _isSorted
-              ? dichotomicSearch(range, searchKey, "nextSmaller", "asc", range.length, getValueFromRange)
-              : linearSearch(range, searchKey, "wildcard", range.length, getValueFromRange);
-          const col = range[colIndex];
+              ? dichotomicSearch(_range, searchKey, "nextSmaller", "asc", _range.length, getValueFromRange)
+              : linearSearch(_range, searchKey, "wildcard", _range.length, getValueFromRange);
+          const col = _range[colIndex];
           if (col === undefined) {
               return valueNotAvailable(searchKey);
           }
@@ -17877,36 +17878,38 @@ stores.inject(MyMetaStore, storeInstance);
       description: _t("Look up a value."),
       args: [
           arg("search_key (any)", _t("The value to search for. For example, 42, 'Cats', or I24.")),
-          arg("search_array (range)", _t("One method of using this function is to provide a single sorted row or column search_array to look through for the search_key with a second argument result_range. The other way is to combine these two arguments into one search_array where the first row or column is searched and a value is returned from the last row or column in the array. If search_key is not found, a non-exact match may be returned.")),
-          arg("result_range (range, optional)", _t("The range from which to return a result. The value returned corresponds to the location where search_key is found in search_range. This range must be only a single row or column and should not be used if using the search_result_array method.")),
+          arg("search_array (any, range)", _t("One method of using this function is to provide a single sorted row or column search_array to look through for the search_key with a second argument result_range. The other way is to combine these two arguments into one search_array where the first row or column is searched and a value is returned from the last row or column in the array. If search_key is not found, a non-exact match may be returned.")),
+          arg("result_range (any, range, optional)", _t("The range from which to return a result. The value returned corresponds to the location where search_key is found in search_range. This range must be only a single row or column and should not be used if using the search_result_array method.")),
       ],
       returns: ["ANY"],
       compute: function (searchKey, searchArray, resultRange) {
-          let nbCol = searchArray.length;
-          let nbRow = searchArray[0].length;
+          const _searchArray = toMatrix(searchArray);
+          const _resultRange = toMatrix(resultRange);
+          let nbCol = _searchArray.length;
+          let nbRow = _searchArray[0].length;
           const verticalSearch = nbRow >= nbCol;
           const getElement = verticalSearch
               ? (range, index) => range[0][index].value
               : (range, index) => range[index][0].value;
           const rangeLength = verticalSearch ? nbRow : nbCol;
-          const index = dichotomicSearch(searchArray, searchKey, "nextSmaller", "asc", rangeLength, getElement);
+          const index = dichotomicSearch(_searchArray, searchKey, "nextSmaller", "asc", rangeLength, getElement);
           if (index === -1 ||
-              (verticalSearch && searchArray[0][index] === undefined) ||
-              (!verticalSearch && searchArray[index][nbRow - 1] === undefined)) {
+              (verticalSearch && _searchArray[0][index] === undefined) ||
+              (!verticalSearch && _searchArray[index][nbRow - 1] === undefined)) {
               return valueNotAvailable(searchKey);
           }
-          if (resultRange === undefined) {
-              return verticalSearch ? searchArray[nbCol - 1][index] : searchArray[index][nbRow - 1];
+          if (_resultRange[0].length === 0) {
+              return verticalSearch ? _searchArray[nbCol - 1][index] : _searchArray[index][nbRow - 1];
           }
-          nbCol = resultRange.length;
-          nbRow = resultRange[0].length;
+          nbCol = _resultRange.length;
+          nbRow = _resultRange[0].length;
           assert(() => nbCol === 1 || nbRow === 1, _t("The result_range must be a single row or a single column."));
           if (nbCol > 1) {
               assert(() => index <= nbCol - 1, _t("[[FUNCTION_NAME]] evaluates to an out of range row value %s.", (index + 1).toString()));
-              return resultRange[index][0];
+              return _resultRange[index][0];
           }
           assert(() => index <= nbRow - 1, _t("[[FUNCTION_NAME]] evaluates to an out of range column value %s.", (index + 1).toString()));
-          return resultRange[0][index];
+          return _resultRange[0][index];
       },
       isExported: true,
   };
@@ -17924,28 +17927,29 @@ stores.inject(MyMetaStore, storeInstance);
       returns: ["NUMBER"],
       compute: function (searchKey, range, searchType = { value: DEFAULT_SEARCH_TYPE }) {
           let _searchType = toNumber(searchType, this.locale);
-          const nbCol = range.length;
-          const nbRow = range[0].length;
+          const _range = toMatrix(range);
+          const nbCol = _range.length;
+          const nbRow = _range[0].length;
           assert(() => nbCol === 1 || nbRow === 1, _t("The range must be a single row or a single column."));
           let index = -1;
           const getElement = nbCol === 1
-              ? (range, index) => range[0][index].value
-              : (range, index) => range[index][0].value;
-          const rangeLen = nbCol === 1 ? range[0].length : range.length;
+              ? (_range, index) => _range[0][index].value
+              : (_range, index) => _range[index][0].value;
+          const rangeLen = nbCol === 1 ? _range[0].length : _range.length;
           _searchType = Math.sign(_searchType);
           switch (_searchType) {
               case 1:
-                  index = dichotomicSearch(range, searchKey, "nextSmaller", "asc", rangeLen, getElement);
+                  index = dichotomicSearch(_range, searchKey, "nextSmaller", "asc", rangeLen, getElement);
                   break;
               case 0:
-                  index = linearSearch(range, searchKey, "wildcard", rangeLen, getElement);
+                  index = linearSearch(_range, searchKey, "wildcard", rangeLen, getElement);
                   break;
               case -1:
-                  index = dichotomicSearch(range, searchKey, "nextGreater", "desc", rangeLen, getElement);
+                  index = dichotomicSearch(_range, searchKey, "nextGreater", "desc", rangeLen, getElement);
                   break;
           }
-          if ((nbCol === 1 && range[0][index] === undefined) ||
-              (nbCol !== 1 && range[index] === undefined)) {
+          if ((nbCol === 1 && _range[0][index] === undefined) ||
+              (nbCol !== 1 && _range[index] === undefined)) {
               return valueNotAvailable(searchKey);
           }
           return index + 1;
@@ -17996,16 +18000,17 @@ stores.inject(MyMetaStore, storeInstance);
       returns: ["ANY"],
       compute: function (searchKey, range, index, isSorted = { value: DEFAULT_IS_SORTED }) {
           const _index = Math.trunc(toNumber(index?.value, this.locale));
-          assert(() => 1 <= _index && _index <= range.length, _t("[[FUNCTION_NAME]] evaluates to an out of bounds range."));
+          const _range = toMatrix(range);
+          assert(() => 1 <= _index && _index <= _range.length, _t("[[FUNCTION_NAME]] evaluates to an out of bounds range."));
           if (searchKey && isEvaluationError(searchKey.value)) {
               return searchKey;
           }
           const getValueFromRange = (range, index) => range[0][index].value;
           const _isSorted = toBoolean(isSorted.value);
           const rowIndex = _isSorted
-              ? dichotomicSearch(range, searchKey, "nextSmaller", "asc", range[0].length, getValueFromRange)
-              : linearSearch(range, searchKey, "wildcard", range[0].length, getValueFromRange);
-          const value = range[_index - 1][rowIndex];
+              ? dichotomicSearch(_range, searchKey, "nextSmaller", "asc", _range[0].length, getValueFromRange)
+              : linearSearch(_range, searchKey, "wildcard", _range[0].length, getValueFromRange);
+          const value = _range[_index - 1][rowIndex];
           if (value === undefined) {
               return valueNotAvailable(searchKey);
           }
@@ -18043,30 +18048,32 @@ stores.inject(MyMetaStore, storeInstance);
       compute: function (searchKey, lookupRange, returnRange, defaultValue, matchMode = { value: DEFAULT_MATCH_MODE }, searchMode = { value: DEFAULT_SEARCH_MODE }) {
           const _matchMode = Math.trunc(toNumber(matchMode.value, this.locale));
           const _searchMode = Math.trunc(toNumber(searchMode.value, this.locale));
-          assert(() => lookupRange.length === 1 || lookupRange[0].length === 1, _t("lookup_range should be either a single row or single column."));
+          const _lookupRange = toMatrix(lookupRange);
+          const _returnRange = toMatrix(returnRange);
+          assert(() => _lookupRange.length === 1 || _lookupRange[0].length === 1, _t("lookup_range should be either a single row or single column."));
           assert(() => [-1, 1, -2, 2].includes(_searchMode), _t("search_mode should be a value in [-1, 1, -2, 2]."));
           assert(() => [-1, 0, 1, 2].includes(_matchMode), _t("match_mode should be a value in [-1, 0, 1, 2]."));
-          const lookupDirection = lookupRange.length === 1 ? "col" : "row";
+          const lookupDirection = _lookupRange.length === 1 ? "col" : "row";
           assert(() => !(_matchMode === 2 && [-2, 2].includes(_searchMode)), _t("the search and match mode combination is not supported for XLOOKUP evaluation."));
           assert(() => lookupDirection === "col"
-              ? returnRange[0].length === lookupRange[0].length
-              : returnRange.length === lookupRange.length, _t("return_range should have the same dimensions as lookup_range."));
+              ? _returnRange[0].length === _lookupRange[0].length
+              : _returnRange.length === _lookupRange.length, _t("return_range should have the same dimensions as lookup_range."));
           if (searchKey && isEvaluationError(searchKey.value)) {
               return [[searchKey]];
           }
           const getElement = lookupDirection === "col"
               ? (range, index) => range[0][index].value
               : (range, index) => range[index][0].value;
-          const rangeLen = lookupDirection === "col" ? lookupRange[0].length : lookupRange.length;
+          const rangeLen = lookupDirection === "col" ? _lookupRange[0].length : _lookupRange.length;
           const mode = MATCH_MODE[_matchMode];
           const reverseSearch = _searchMode === -1;
           const index = _searchMode === 2 || _searchMode === -2
-              ? dichotomicSearch(lookupRange, searchKey, mode, _searchMode === 2 ? "asc" : "desc", rangeLen, getElement)
-              : linearSearch(lookupRange, searchKey, mode, rangeLen, getElement, reverseSearch);
+              ? dichotomicSearch(_lookupRange, searchKey, mode, _searchMode === 2 ? "asc" : "desc", rangeLen, getElement)
+              : linearSearch(_lookupRange, searchKey, mode, rangeLen, getElement, reverseSearch);
           if (index !== -1) {
               return lookupDirection === "col"
-                  ? returnRange.map((col) => [col[index]])
-                  : [returnRange[index]];
+                  ? _returnRange.map((col) => [col[index]])
+                  : [_returnRange[index]];
           }
           if (defaultValue === undefined) {
               return valueNotAvailable(searchKey);
@@ -34696,11 +34703,10 @@ stores.inject(MyMetaStore, storeInstance);
           switch (layer) {
               case "Background":
                   this.drawGlobalBackground(renderingContext);
-                  for (const zone of this.getters.getAllActiveViewportsZones()) {
+                  for (const { zone, rect } of this.getters.getAllActiveViewportsZonesAndRect()) {
                       const { ctx } = renderingContext;
                       ctx.save();
                       ctx.beginPath();
-                      const rect = this.getters.getVisibleRect(zone);
                       ctx.rect(rect.x, rect.y, rect.width, rect.height);
                       ctx.clip();
                       const boxes = this.getGridBoxes(zone);
@@ -34970,10 +34976,8 @@ stores.inject(MyMetaStore, storeInstance);
           const { ctx, thinLineWidth } = renderingContext;
           const visibleCols = this.getters.getSheetViewVisibleCols();
           const left = visibleCols[0];
-          const right = visibleCols[visibleCols.length - 1];
           const visibleRows = this.getters.getSheetViewVisibleRows();
           const top = visibleRows[0];
-          const bottom = visibleRows[visibleRows.length - 1];
           const { width, height } = this.getters.getSheetViewDimensionWithHeaders();
           const selection = this.getters.getSelectedZones();
           const selectedCols = getZonesCols(selection);
@@ -34989,7 +34993,7 @@ stores.inject(MyMetaStore, storeInstance);
           ctx.lineWidth = thinLineWidth;
           ctx.strokeStyle = "#333";
           // Columns headers background
-          for (let col = left; col <= right; col++) {
+          for (const col of visibleCols) {
               const colZone = { left: col, right: col, top: 0, bottom: numberOfRows - 1 };
               const { x, width } = this.getters.getVisibleRect(colZone);
               const isColActive = activeCols.has(col);
@@ -35006,7 +35010,7 @@ stores.inject(MyMetaStore, storeInstance);
               ctx.fillRect(x, 0, width, HEADER_HEIGHT);
           }
           // Rows headers background
-          for (let row = top; row <= bottom; row++) {
+          for (const row of visibleRows) {
               const rowZone = { top: row, bottom: row, left: 0, right: numberOfCols - 1 };
               const { y, height } = this.getters.getVisibleRect(rowZone);
               const isRowActive = activeRows.has(row);
@@ -35032,21 +35036,21 @@ stores.inject(MyMetaStore, storeInstance);
           ctx.stroke();
           ctx.beginPath();
           // column text + separator
-          for (const i of visibleCols) {
-              const colSize = this.getters.getColSize(sheetId, i);
-              const colName = numberToLetters(i);
-              ctx.fillStyle = activeCols.has(i) ? "#fff" : TEXT_HEADER_COLOR;
-              let colStart = this.getHeaderOffset("COL", left, i);
+          for (const col of visibleCols) {
+              const colSize = this.getters.getColSize(sheetId, col);
+              const colName = numberToLetters(col);
+              ctx.fillStyle = activeCols.has(col) ? "#fff" : TEXT_HEADER_COLOR;
+              let colStart = this.getHeaderOffset("COL", left, col);
               ctx.fillText(colName, colStart + colSize / 2, HEADER_HEIGHT / 2);
               ctx.moveTo(colStart + colSize, 0);
               ctx.lineTo(colStart + colSize, HEADER_HEIGHT);
           }
           // row text + separator
-          for (const i of visibleRows) {
-              const rowSize = this.getters.getRowSize(sheetId, i);
-              ctx.fillStyle = activeRows.has(i) ? "#fff" : TEXT_HEADER_COLOR;
-              let rowStart = this.getHeaderOffset("ROW", top, i);
-              ctx.fillText(String(i + 1), HEADER_WIDTH / 2, rowStart + rowSize / 2);
+          for (const row of visibleRows) {
+              const rowSize = this.getters.getRowSize(sheetId, row);
+              ctx.fillStyle = activeRows.has(row) ? "#fff" : TEXT_HEADER_COLOR;
+              let rowStart = this.getHeaderOffset("ROW", top, row);
+              ctx.fillText(String(row + 1), HEADER_WIDTH / 2, rowStart + rowSize / 2);
               ctx.moveTo(0, rowStart + rowSize);
               ctx.lineTo(HEADER_WIDTH, rowStart + rowSize);
           }
@@ -35338,6 +35342,9 @@ stores.inject(MyMetaStore, storeInstance);
           canvas.width = width * dpr;
           canvas.height = height * dpr;
           canvas.setAttribute("style", `width:${width}px;height:${height}px;`);
+          if (width === 0 || height === 0) {
+              return;
+          }
           // Imagine each pixel as a large square. The whole-number coordinates (0, 1, 2…)
           // are the edges of the squares. If you draw a one-unit-wide line between whole-number
           // coordinates, it will overlap opposite sides of the pixel square, and the resulting
@@ -40895,7 +40902,7 @@ stores.inject(MyMetaStore, storeInstance);
       getCommonSides(border1, border2) {
           const commonBorder = {};
           for (let side of ["top", "bottom", "left", "right"]) {
-              if (border1[side] && border1[side] === border2[side]) {
+              if (border1[side] && deepEquals(border1[side], border2[side])) {
                   commonBorder[side] = border1[side];
               }
           }
@@ -51464,14 +51471,12 @@ stores.inject(MyMetaStore, storeInstance);
                   }
                   break;
               case "AUTORESIZE_ROWS":
-                  for (let row of cmd.rows) {
-                      this.dispatch("RESIZE_COLUMNS_ROWS", {
-                          elements: [row],
-                          dimension: "ROW",
-                          size: null,
-                          sheetId: cmd.sheetId,
-                      });
-                  }
+                  this.dispatch("RESIZE_COLUMNS_ROWS", {
+                      elements: cmd.rows,
+                      dimension: "ROW",
+                      size: null,
+                      sheetId: cmd.sheetId,
+                  });
                   break;
           }
       }
@@ -53808,8 +53813,17 @@ stores.inject(MyMetaStore, storeInstance);
           this.getters = getters;
           this.sheetId = sheetId;
           this.boundaries = boundaries;
-          this.viewportWidth = sizeInGrid.width;
-          this.viewportHeight = sizeInGrid.height;
+          if (sizeInGrid.width < 0 || sizeInGrid.height < 0) {
+              throw new Error("Viewport size cannot be negative");
+          }
+          this.viewportWidth = sizeInGrid.height && sizeInGrid.width;
+          this.viewportHeight = sizeInGrid.width && sizeInGrid.height;
+          this.top = boundaries.top;
+          this.bottom = boundaries.bottom;
+          this.left = boundaries.left;
+          this.right = boundaries.right;
+          this.offsetX = offsets.x;
+          this.offsetY = offsets.y;
           this.offsetScrollbarX = offsets.x;
           this.offsetScrollbarY = offsets.y;
           this.canScrollVertically = options.canScrollVertically;
@@ -53852,9 +53866,9 @@ stores.inject(MyMetaStore, storeInstance);
               Math.min(topRowSize, this.viewportHeight - lastRowSize) // Add pixels that allows the snapping at maximum vertical scroll
               );
               height = Math.max(height, this.viewportHeight); // if the viewport grid size is smaller than its client height, return client height
-          }
-          if (lastRowEnd + FOOTER_HEIGHT > height && !this.getters.isReadonly()) {
-              height += FOOTER_HEIGHT;
+              if (lastRowEnd + FOOTER_HEIGHT > height && !this.getters.isReadonly()) {
+                  height += FOOTER_HEIGHT;
+              }
           }
           return { width, height };
       }
@@ -53991,6 +54005,9 @@ stores.inject(MyMetaStore, storeInstance);
               !this.getters.isRowHidden(this.sheetId, row));
       }
       searchHeaderIndex(dimension, position, startIndex = 0) {
+          if (this.viewportWidth <= 0 || this.viewportHeight <= 0) {
+              return -1;
+          }
           const sheetId = this.sheetId;
           const headers = this.getters.getNumberHeaders(sheetId, dimension);
           // using a binary search:
@@ -54027,7 +54044,7 @@ stores.inject(MyMetaStore, storeInstance);
           this.adjustViewportZoneY();
       }
       /** Corrects the viewport's horizontal offset based on the current structure
-       *  To make sure that at least on column is visible inside the viewport.
+       *  To make sure that at least one column is visible inside the viewport.
        */
       adjustViewportOffsetX() {
           if (this.canScrollHorizontally) {
@@ -54039,7 +54056,7 @@ stores.inject(MyMetaStore, storeInstance);
           this.adjustViewportZoneX();
       }
       /** Corrects the viewport's vertical offset based on the current structure
-       *  To make sure that at least on row is visible inside the viewport.
+       *  To make sure that at least one row is visible inside the viewport.
        */
       adjustViewportOffsetY() {
           if (this.canScrollVertically) {
@@ -54056,11 +54073,14 @@ stores.inject(MyMetaStore, storeInstance);
           const sheetId = this.sheetId;
           this.left = this.searchHeaderIndex("COL", this.offsetScrollbarX, this.boundaries.left);
           this.right = Math.min(this.boundaries.right, this.searchHeaderIndex("COL", this.viewportWidth, this.left));
+          if (!this.viewportWidth) {
+              return;
+          }
           if (this.left === -1) {
               this.left = this.boundaries.left;
           }
           if (this.right === -1) {
-              this.right = this.getters.getNumberCols(sheetId) - 1;
+              this.right = this.boundaries.right;
           }
           this.offsetX =
               this.getters.getColDimensions(sheetId, this.left).start -
@@ -54072,11 +54092,14 @@ stores.inject(MyMetaStore, storeInstance);
           const sheetId = this.sheetId;
           this.top = this.searchHeaderIndex("ROW", this.offsetScrollbarY, this.boundaries.top);
           this.bottom = Math.min(this.boundaries.bottom, this.searchHeaderIndex("ROW", this.viewportHeight, this.top));
+          if (!this.viewportHeight) {
+              return;
+          }
           if (this.top === -1) {
               this.top = this.boundaries.top;
           }
           if (this.bottom === -1) {
-              this.bottom = this.getters.getNumberRows(sheetId) - 1;
+              this.bottom = this.boundaries.bottom;
           }
           this.offsetY =
               this.getters.getRowDimensions(sheetId, this.top).start -
@@ -54150,7 +54173,7 @@ stores.inject(MyMetaStore, storeInstance);
           "isPositionVisible",
           "getColDimensionsInViewport",
           "getRowDimensionsInViewport",
-          "getAllActiveViewportsZones",
+          "getAllActiveViewportsZonesAndRect",
           "getRect",
       ];
       viewports = {};
@@ -54384,12 +54407,12 @@ stores.inject(MyMetaStore, storeInstance);
           const sheetId = this.getters.getActiveSheetId();
           const viewports = this.getSubViewports(sheetId);
           //TODO ake another commit to eimprove this
-          return [...new Set(viewports.map((v) => range(v.left, v.right + 1)).flat())].filter((col) => !this.getters.isHeaderHidden(sheetId, "COL", col));
+          return [...new Set(viewports.map((v) => range(v.left, v.right + 1)).flat())].filter((col) => col >= 0 && !this.getters.isHeaderHidden(sheetId, "COL", col));
       }
       getSheetViewVisibleRows() {
           const sheetId = this.getters.getActiveSheetId();
           const viewports = this.getSubViewports(sheetId);
-          return [...new Set(viewports.map((v) => range(v.top, v.bottom + 1)).flat())].filter((row) => !this.getters.isHeaderHidden(sheetId, "ROW", row));
+          return [...new Set(viewports.map((v) => range(v.top, v.bottom + 1)).flat())].filter((row) => row >= 0 && !this.getters.isHeaderHidden(sheetId, "ROW", row));
       }
       /**
        * Get the positions of all the cells that are visible in the viewport, taking merges into account.
@@ -54432,19 +54455,19 @@ stores.inject(MyMetaStore, storeInstance);
               maxOffsetY: Math.max(0, height - viewport.viewportHeight + 1),
           };
       }
-      getColRowOffsetInViewport(dimension, referenceIndex, index) {
-          const sheetId = this.getters.getActiveSheetId();
-          const visibleCols = this.getters.getSheetViewVisibleCols();
-          const visibleRows = this.getters.getSheetViewVisibleRows();
-          if (index < referenceIndex) {
-              return -this.getColRowOffsetInViewport(dimension, index, referenceIndex);
+      getColRowOffsetInViewport(dimension, referenceHeaderIndex, targetHeaderIndex) {
+          if (targetHeaderIndex < referenceHeaderIndex) {
+              return -this.getColRowOffsetInViewport(dimension, targetHeaderIndex, referenceHeaderIndex);
           }
+          const sheetId = this.getters.getActiveSheetId();
+          const visibleHeaders = dimension === "COL"
+              ? this.getters.getSheetViewVisibleCols()
+              : this.getters.getSheetViewVisibleRows();
+          const startIndex = visibleHeaders.findIndex((header) => referenceHeaderIndex >= header);
+          const endIndex = visibleHeaders.findIndex((header) => targetHeaderIndex <= header);
+          const relevantIndexes = visibleHeaders.slice(startIndex, endIndex);
           let offset = 0;
-          const visibleIndexes = dimension === "COL" ? visibleCols : visibleRows;
-          for (let i = referenceIndex; i < index; i++) {
-              if (!visibleIndexes.includes(i)) {
-                  continue;
-              }
+          for (const i of relevantIndexes) {
               offset += this.getters.getHeaderSize(sheetId, dimension, i);
           }
           return offset;
@@ -54491,7 +54514,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return { canEdgeScroll, direction, delay };
       }
-      getEdgeScrollRow(y, previousY, tartingY) {
+      getEdgeScrollRow(y, previousY, startingY) {
           let canEdgeScroll = false;
           let direction = 0;
           let delay = 0;
@@ -54512,7 +54535,7 @@ stores.inject(MyMetaStore, storeInstance);
               delay = scrollDelay(y - height);
               direction = 1;
           }
-          else if (y < offsetCorrectionY && tartingY >= offsetCorrectionY && currentOffsetY > 0) {
+          else if (y < offsetCorrectionY && startingY >= offsetCorrectionY && currentOffsetY > 0) {
               // 2
               canEdgeScroll = true;
               delay = scrollDelay(offsetCorrectionY - y);
@@ -54538,13 +54561,7 @@ stores.inject(MyMetaStore, storeInstance);
        */
       getVisibleRectWithoutHeaders(zone) {
           const sheetId = this.getters.getActiveSheetId();
-          const viewportRects = this.getSubViewports(sheetId)
-              .map((viewport) => viewport.getVisibleRect(zone))
-              .filter(isDefined$1);
-          if (viewportRects.length === 0) {
-              return { x: 0, y: 0, width: 0, height: 0 };
-          }
-          return this.recomposeRect(viewportRects);
+          return this.mapViewportsToRect(sheetId, (viewport) => viewport.getVisibleRect(zone));
       }
       /**
        * Computes the actual size and position (:Rect) of the zone on the canvas
@@ -54552,13 +54569,7 @@ stores.inject(MyMetaStore, storeInstance);
        */
       getRect(zone) {
           const sheetId = this.getters.getActiveSheetId();
-          const viewportRects = this.getSubViewports(sheetId)
-              .map((viewport) => viewport.getFullRect(zone))
-              .filter(isDefined$1);
-          if (viewportRects.length === 0) {
-              return { x: 0, y: 0, width: 0, height: 0 };
-          }
-          const rect = this.recomposeRect(viewportRects);
+          const rect = this.mapViewportsToRect(sheetId, (viewport) => viewport.getFullRect(zone));
           return { ...rect, x: rect.x + this.gridOffsetX, y: rect.y + this.gridOffsetY };
       }
       /**
@@ -54603,9 +54614,18 @@ stores.inject(MyMetaStore, storeInstance);
               end: start + (isRowHidden ? 0 : size),
           };
       }
-      getAllActiveViewportsZones() {
+      getAllActiveViewportsZonesAndRect() {
           const sheetId = this.getters.getActiveSheetId();
-          return this.getSubViewports(sheetId);
+          return this.getSubViewports(sheetId).map((viewport) => {
+              return {
+                  zone: viewport,
+                  rect: {
+                      x: viewport.offsetCorrectionX + this.gridOffsetX,
+                      y: viewport.offsetCorrectionY + this.gridOffsetY,
+                      ...viewport.getMaxSize(),
+                  },
+              };
+          });
       }
       // ---------------------------------------------------------------------------
       // Private
@@ -54658,12 +54678,11 @@ stores.inject(MyMetaStore, storeInstance);
       }
       /** gets rid of deprecated sheetIds */
       cleanViewports() {
-          const sheetIds = this.getters.getSheetIds();
-          for (let sheetId of Object.keys(this.viewports)) {
-              if (!sheetIds.includes(sheetId)) {
-                  delete this.viewports[sheetId];
-              }
+          const newViewport = {};
+          for (const sheetId of this.getters.getSheetIds()) {
+              newViewport[sheetId] = this.viewports[sheetId];
           }
+          this.viewports = newViewport;
       }
       resizeSheetView(height, width, gridOffsetX = 0, gridOffsetY = 0) {
           this.sheetViewHeight = height;
@@ -54673,14 +54692,14 @@ stores.inject(MyMetaStore, storeInstance);
           this.recomputeViewports();
       }
       recomputeViewports() {
-          for (let sheetId of Object.keys(this.viewports)) {
+          for (const sheetId of this.getters.getSheetIds()) {
               this.resetViewports(sheetId);
           }
       }
       setSheetViewOffset(offsetX, offsetY) {
           const sheetId = this.getters.getActiveSheetId();
           const { maxOffsetX, maxOffsetY } = this.getMaximumSheetOffset();
-          Object.values(this.getSubViewports(sheetId)).forEach((viewport) => viewport.setViewportOffset(clip(offsetX, 0, maxOffsetX), clip(offsetY, 0, maxOffsetY)));
+          this.getSubViewports(sheetId).forEach((viewport) => viewport.setViewportOffset(clip(offsetX, 0, maxOffsetX), clip(offsetY, 0, maxOffsetY)));
       }
       getViewportOffset(sheetId) {
           return {
@@ -54695,8 +54714,10 @@ stores.inject(MyMetaStore, storeInstance);
           const { xSplit, ySplit } = this.getters.getPaneDivisions(sheetId);
           const nCols = this.getters.getNumberCols(sheetId);
           const nRows = this.getters.getNumberRows(sheetId);
-          const colOffset = this.getters.getColRowOffset("COL", 0, xSplit, sheetId);
-          const rowOffset = this.getters.getColRowOffset("ROW", 0, ySplit, sheetId);
+          const colOffset = Math.min(this.getters.getColRowOffset("COL", 0, xSplit, sheetId), this.sheetViewWidth);
+          const rowOffset = Math.min(this.getters.getColRowOffset("ROW", 0, ySplit, sheetId), this.sheetViewHeight);
+          const unfrozenWidth = Math.max(this.sheetViewWidth - colOffset, 0);
+          const unfrozenHeight = Math.max(this.sheetViewHeight - rowOffset, 0);
           const { xRatio, yRatio } = this.getFrozenSheetViewRatio(sheetId);
           const canScrollHorizontally = xRatio < 1.0;
           const canScrollVertically = yRatio < 1.0;
@@ -54707,14 +54728,14 @@ stores.inject(MyMetaStore, storeInstance);
                   new InternalViewport(this.getters, sheetId, { left: 0, right: xSplit - 1, top: 0, bottom: ySplit - 1 }, { width: colOffset, height: rowOffset }, { canScrollHorizontally: false, canScrollVertically: false }, { x: 0, y: 0 })) ||
                   undefined,
               topRight: (ySplit &&
-                  new InternalViewport(this.getters, sheetId, { left: xSplit, right: nCols - 1, top: 0, bottom: ySplit - 1 }, { width: this.sheetViewWidth - colOffset, height: rowOffset }, { canScrollHorizontally, canScrollVertically: false }, { x: canScrollHorizontally ? previousOffset.x : 0, y: 0 })) ||
+                  new InternalViewport(this.getters, sheetId, { left: xSplit, right: nCols - 1, top: 0, bottom: ySplit - 1 }, { width: unfrozenWidth, height: rowOffset }, { canScrollHorizontally, canScrollVertically: false }, { x: canScrollHorizontally ? previousOffset.x : 0, y: 0 })) ||
                   undefined,
               bottomLeft: (xSplit &&
-                  new InternalViewport(this.getters, sheetId, { left: 0, right: xSplit - 1, top: ySplit, bottom: nRows - 1 }, { width: colOffset, height: this.sheetViewHeight - rowOffset }, { canScrollHorizontally: false, canScrollVertically }, { x: 0, y: canScrollVertically ? previousOffset.y : 0 })) ||
+                  new InternalViewport(this.getters, sheetId, { left: 0, right: xSplit - 1, top: ySplit, bottom: nRows - 1 }, { width: colOffset, height: unfrozenHeight }, { canScrollHorizontally: false, canScrollVertically }, { x: 0, y: canScrollVertically ? previousOffset.y : 0 })) ||
                   undefined,
               bottomRight: new InternalViewport(this.getters, sheetId, { left: xSplit, right: nCols - 1, top: ySplit, bottom: nRows - 1 }, {
-                  width: this.sheetViewWidth - colOffset,
-                  height: this.sheetViewHeight - rowOffset,
+                  width: unfrozenWidth,
+                  height: unfrozenHeight,
               }, { canScrollHorizontally, canScrollVertically }, {
                   x: canScrollHorizontally ? previousOffset.x : 0,
                   y: canScrollVertically ? previousOffset.y : 0,
@@ -54726,7 +54747,7 @@ stores.inject(MyMetaStore, storeInstance);
        * Adjust the viewport such that the anchor position is visible
        */
       refreshViewport(sheetId, anchorPosition) {
-          Object.values(this.getSubViewports(sheetId)).forEach((viewport) => {
+          this.getSubViewports(sheetId).forEach((viewport) => {
               viewport.adjustViewportZone();
               viewport.adjustPosition(anchorPosition);
           });
@@ -54791,12 +54812,26 @@ stores.inject(MyMetaStore, storeInstance);
           const height = this.sheetViewHeight + this.gridOffsetY;
           return { xRatio: offsetCorrectionX / width, yRatio: offsetCorrectionY / height };
       }
-      recomposeRect(viewportRects) {
-          const x = Math.min(...viewportRects.map((rect) => rect.x));
-          const y = Math.min(...viewportRects.map((rect) => rect.y));
-          const width = Math.max(...viewportRects.map((rect) => rect.x + rect.width)) - x;
-          const height = Math.max(...viewportRects.map((rect) => rect.y + rect.height)) - y;
-          return { x, y, width, height };
+      mapViewportsToRect(sheetId, rectCallBack) {
+          let x = Infinity;
+          let y = Infinity;
+          let width = 0;
+          let height = 0;
+          let hasViewports = false;
+          for (const viewport of this.getSubViewports(sheetId)) {
+              const rect = rectCallBack(viewport);
+              if (rect) {
+                  hasViewports = true;
+                  x = Math.min(x, rect.x);
+                  y = Math.min(y, rect.y);
+                  width = Math.max(width, rect.x + rect.width);
+                  height = Math.max(height, rect.y + rect.height);
+              }
+          }
+          if (!hasViewports) {
+              return { x: 0, y: 0, width: 0, height: 0 };
+          }
+          return { x, y, width: width - x, height: height - y };
       }
   }
 
@@ -61135,9 +61170,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.2.33";
-  __info__.date = "2025-01-27T10:02:54.985Z";
-  __info__.hash = "6ea43fb";
+  __info__.version = "17.2.35";
+  __info__.date = "2025-02-05T07:12:34.721Z";
+  __info__.hash = "76b12a1";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);