@odoo/o-spreadsheet 18.2.0-alpha.5 → 18.2.0-alpha.6

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.0-alpha.5
- * @date 2025-01-31T07:59:30.667Z
- * @hash efce841
+ * @version 18.2.0-alpha.6
+ * @date 2025-02-05T06:50:47.008Z
+ * @hash dae9ab2
  */
 
 'use strict';
@@ -18634,19 +18634,20 @@ const HLOOKUP = {
     description: _t("Horizontal lookup"),
     args: [
         arg("search_key (string, number, boolean)", _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.")),
     ],
     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."));
         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);
         }
@@ -18738,35 +18739,37 @@ const LOOKUP = {
     description: _t("Look up a value."),
     args: [
         arg("search_key (string, number, boolean)", _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.")),
     ],
     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,
 };
@@ -18783,28 +18786,29 @@ const MATCH = {
     ],
     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;
@@ -18859,13 +18863,14 @@ const VLOOKUP = {
     ],
     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."));
         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);
         }
@@ -18902,27 +18907,29 @@ const XLOOKUP = {
     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."));
         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);
@@ -28458,11 +28465,7 @@ function interpolateData(config, values, labels, newLabels) {
     if (values.length < 2 || labels.length < 2 || newLabels.length === 0) {
         return [];
     }
-    const labelMin = Math.min(...labels);
-    const labelMax = Math.max(...labels);
-    const labelRange = labelMax - labelMin;
-    const normalizedLabels = labels.map((v) => (v - labelMin) / labelRange);
-    const normalizedNewLabels = newLabels.map((v) => (v - labelMin) / labelRange);
+    const { normalizedLabels, normalizedNewLabels } = normalizeLabels(labels, newLabels, config);
     try {
         switch (config.type) {
             case "polynomial": {
@@ -28507,6 +28510,30 @@ function interpolateData(config, values, labels, newLabels) {
         return newLabels.map((x) => ({ x, y: NaN }));
     }
 }
+function normalizeLabels(labels, newLabels, config) {
+    let normalizedLabels = [];
+    let normalizedNewLabels = [];
+    if (config.type === "logarithmic") {
+        // Logarithmic trends in charts are used to visualize proportional growth or
+        // relative changes. Therefore, we change the normalization technique for
+        // logarithmic trend lines for a better fit. The method used here is Max Absolute
+        // Scaling. This Technique is ideal for data spanning several orders of magnitude,
+        // as it balances differences between small and large values by compressing larger
+        // values while preserving proportionality and ensuring all values are scaled relative
+        // to the largest magnitude.
+        const labelMax = Math.max(...labels.map(Math.abs));
+        normalizedLabels = labels.map((l) => l / labelMax);
+        normalizedNewLabels = newLabels.map((l) => l / labelMax);
+    }
+    else {
+        const labelMax = Math.max(...labels);
+        const labelMin = Math.min(...labels);
+        const labelRange = labelMax - labelMin;
+        normalizedLabels = labels.map((l) => (l - labelMax) / labelRange);
+        normalizedNewLabels = newLabels.map((l) => (l - labelMax) / labelRange);
+    }
+    return { normalizedLabels, normalizedNewLabels };
+}
 function getChartAxisType(chart, labelRange, getters) {
     if (isDateChart(chart, labelRange, getters) && isLuxonTimeAdapterInstalled()) {
         return "time";
@@ -37174,7 +37201,7 @@ function dragAndDropBeyondTheViewport(env, cbMouseMove, cbMouseUp, only = false)
         }
         const { x: offsetCorrectionX, y: offsetCorrectionY } = getters.getMainViewportCoordinates();
         let { top, left, bottom, right } = getters.getActiveMainViewport();
-        let { scrollX, scrollY } = getters.getActiveSheetDOMScrollInfo();
+        let { scrollX, scrollY } = getters.getActiveSheetScrollInfo();
         const { xSplit, ySplit } = getters.getPaneDivisions(sheetId);
         let canEdgeScroll = false;
         let timeoutDelay = MAX_DELAY;
@@ -41347,6 +41374,16 @@ class StandaloneComposerStore extends AbstractComposerStore {
         }
         return providersDefinitions;
     }
+    /**
+     * Replace the current reference selected by the new one.
+     * */
+    getZoneReference(zone) {
+        const res = super.getZoneReference(zone);
+        if (this.args().defaultStatic) {
+            return setXcToFixedReferenceType(res, "colrow");
+        }
+        return res;
+    }
     getComposerContent() {
         if (this.editionMode === "inactive") {
             // References in the content might not be linked to the current active sheet
@@ -41412,6 +41449,7 @@ class StandaloneComposer extends owl.Component {
     static props = {
         composerContent: { type: String, optional: true },
         defaultRangeSheetId: { type: String, optional: true },
+        defaultStatic: { type: Boolean, optional: true },
         onConfirm: Function,
         contextualAutocomplete: { type: Object, optional: true },
         placeholder: { type: String, optional: true },
@@ -41422,6 +41460,7 @@ class StandaloneComposer extends owl.Component {
     static components = { Composer };
     static defaultProps = {
         composerContent: "",
+        defaultStatic: false,
     };
     composerFocusStore;
     standaloneComposerStore;
@@ -41432,6 +41471,7 @@ class StandaloneComposer extends owl.Component {
         const standaloneComposerStore = useLocalStore(StandaloneComposerStore, () => ({
             onConfirm: this.props.onConfirm,
             content: this.props.composerContent,
+            defaultStatic: this.props.defaultStatic ?? false,
             contextualAutocomplete: this.props.contextualAutocomplete,
             defaultRangeSheetId: this.props.defaultRangeSheetId,
             getContextualColoredSymbolToken: this.props.getContextualColoredSymbolToken,
@@ -42167,6 +42207,7 @@ class ConditionalFormattingEditor extends owl.Component {
             },
             composerContent: this.state.rules.cellIs.values[valueIndex],
             placeholder: _t("Value or formula"),
+            defaultStatic: true,
             invalid: isInvalid,
             class: "o-sidePanel-composer",
             defaultRangeSheetId: this.env.model.getters.getActiveSheetId(),
@@ -42185,6 +42226,7 @@ class ConditionalFormattingEditor extends owl.Component {
             },
             composerContent: threshold.value || "",
             placeholder: _t("Formula"),
+            defaultStatic: true,
             invalid: isInvalid,
             class: "o-sidePanel-composer",
             defaultRangeSheetId: this.env.model.getters.getActiveSheetId(),
@@ -42200,6 +42242,7 @@ class ConditionalFormattingEditor extends owl.Component {
             },
             composerContent: inflection.value || "",
             placeholder: _t("Formula"),
+            defaultStatic: true,
             invalid: isInvalid,
             class: "o-sidePanel-composer",
             defaultRangeSheetId: this.env.model.getters.getActiveSheetId(),
@@ -49808,7 +49851,7 @@ class GridAddRowsFooter extends owl.Component {
         });
         this.props.focusGrid();
         // After adding new rows, scroll down to the new last row
-        const { scrollX } = this.env.model.getters.getActiveSheetDOMScrollInfo();
+        const { scrollX } = this.env.model.getters.getActiveSheetScrollInfo();
         const { end } = this.env.model.getters.getRowDimensions(activeSheetId, rowNumber + quantity - 1);
         this.env.model.dispatch("SET_VIEWPORT_OFFSET", {
             offsetX: scrollX,
@@ -50066,7 +50109,7 @@ class GridOverlay extends owl.Component {
             resizeObserver.disconnect();
         });
         useTouchMove(this.gridOverlay, this.props.onGridMoved, () => {
-            const { scrollY } = this.env.model.getters.getActiveSheetDOMScrollInfo();
+            const { scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
             return scrollY > 0;
         });
         this.cellPopovers = useStore(CellPopoverStore);
@@ -50720,17 +50763,6 @@ class GridRenderer {
     get renderingLayers() {
         return ["Background", "Headers"];
     }
-    /**
-     * Get the offset of a header (see getColRowOffsetInViewport), adjusted with the header
-     * size (HEADER_HEIGHT and HEADER_WIDTH)
-     */
-    getHeaderOffset(dimension, start, index) {
-        let size = this.getters.getColRowOffsetInViewport(dimension, start, index);
-        if (!this.getters.isDashboard()) {
-            size += dimension === "ROW" ? HEADER_HEIGHT : HEADER_WIDTH;
-        }
-        return size;
-    }
     // ---------------------------------------------------------------------------
     // Grid rendering
     // ---------------------------------------------------------------------------
@@ -50738,11 +50770,10 @@ class GridRenderer {
         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);
@@ -51018,10 +51049,8 @@ class GridRenderer {
         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);
@@ -51037,7 +51066,7 @@ class GridRenderer {
         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);
@@ -51054,7 +51083,7 @@ class GridRenderer {
             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);
@@ -51078,27 +51107,41 @@ class GridRenderer {
         ctx.lineTo(width, HEADER_HEIGHT);
         ctx.strokeStyle = HEADER_BORDER_COLOR;
         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 colName = numberToLetters(col);
+            ctx.fillStyle = activeCols.has(col) ? "#fff" : TEXT_HEADER_COLOR;
+            const zone = { left: col, right: col, top: top, bottom: top };
+            const { x: colStart, width: colSize } = this.getters.getRect(zone);
+            const { x, width } = this.getters.getVisibleRect(zone);
+            ctx.save();
+            ctx.beginPath();
+            ctx.rect(x, 0, width, HEADER_HEIGHT);
+            ctx.clip();
             ctx.fillText(colName, colStart + colSize / 2, HEADER_HEIGHT / 2);
+            ctx.restore();
+            ctx.beginPath();
             ctx.moveTo(colStart + colSize, 0);
             ctx.lineTo(colStart + colSize, HEADER_HEIGHT);
+            ctx.stroke();
         }
         // 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) {
+            ctx.fillStyle = activeRows.has(row) ? "#fff" : TEXT_HEADER_COLOR;
+            const zone = { top: row, bottom: row, left: left, right: left };
+            const { y: rowStart, height: rowSize } = this.getters.getRect(zone);
+            const { y, height } = this.getters.getVisibleRect(zone);
+            ctx.save();
+            ctx.beginPath();
+            ctx.rect(0, y, HEADER_WIDTH, height);
+            ctx.clip();
+            ctx.fillText(String(row + 1), HEADER_WIDTH / 2, rowStart + rowSize / 2);
+            ctx.restore();
+            ctx.beginPath();
             ctx.moveTo(0, rowStart + rowSize);
             ctx.lineTo(HEADER_WIDTH, rowStart + rowSize);
+            ctx.stroke();
         }
-        ctx.stroke();
     }
     drawFrozenPanesHeaders(renderingContext) {
         const { ctx, thinLineWidth } = renderingContext;
@@ -51401,6 +51444,9 @@ function useGridDrawing(refName, model, canvasSize) {
         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
@@ -51744,7 +51790,7 @@ class HorizontalScrollBar extends owl.Component {
         leftOffset: 0,
     };
     get offset() {
-        return this.env.model.getters.getActiveSheetDOMScrollInfo().scrollX;
+        return this.env.model.getters.getActiveSheetScrollInfo().scrollX;
     }
     get width() {
         return this.env.model.getters.getMainViewportRect().width;
@@ -51763,7 +51809,7 @@ class HorizontalScrollBar extends owl.Component {
         };
     }
     onScroll(offset) {
-        const { scrollY } = this.env.model.getters.getActiveSheetDOMScrollInfo();
+        const { scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
         this.env.model.dispatch("SET_VIEWPORT_OFFSET", {
             offsetX: offset,
             offsetY: scrollY, // offsetY is the same
@@ -51789,7 +51835,7 @@ class VerticalScrollBar extends owl.Component {
         topOffset: 0,
     };
     get offset() {
-        return this.env.model.getters.getActiveSheetDOMScrollInfo().scrollY;
+        return this.env.model.getters.getActiveSheetScrollInfo().scrollY;
     }
     get height() {
         return this.env.model.getters.getMainViewportRect().height;
@@ -51808,7 +51854,7 @@ class VerticalScrollBar extends owl.Component {
         };
     }
     onScroll(offset) {
-        const { scrollX } = this.env.model.getters.getActiveSheetDOMScrollInfo();
+        const { scrollX } = this.env.model.getters.getActiveSheetScrollInfo();
         this.env.model.dispatch("SET_VIEWPORT_OFFSET", {
             offsetX: scrollX, // offsetX is the same
             offsetY: offset,
@@ -52279,7 +52325,7 @@ class Grid extends owl.Component {
         });
     }
     moveCanvas(deltaX, deltaY) {
-        const { scrollX, scrollY } = this.env.model.getters.getActiveSheetDOMScrollInfo();
+        const { scrollX, scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
         this.env.model.dispatch("SET_VIEWPORT_OFFSET", {
             offsetX: scrollX + deltaX,
             offsetY: scrollY + deltaY,
@@ -67160,8 +67206,6 @@ class InternalViewport {
     right;
     offsetX;
     offsetY;
-    offsetScrollbarX;
-    offsetScrollbarY;
     canScrollVertically;
     canScrollHorizontally;
     viewportWidth;
@@ -67172,10 +67216,17 @@ class InternalViewport {
         this.getters = getters;
         this.sheetId = sheetId;
         this.boundaries = boundaries;
-        this.viewportWidth = sizeInGrid.width;
-        this.viewportHeight = sizeInGrid.height;
-        this.offsetScrollbarX = offsets.x;
-        this.offsetScrollbarY = offsets.y;
+        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.canScrollVertically = options.canScrollVertically;
         this.canScrollHorizontally = options.canScrollHorizontally;
         this.offsetCorrectionX = this.getters.getColDimensions(this.sheetId, this.boundaries.left).start;
@@ -67216,9 +67267,9 @@ class InternalViewport {
             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 };
     }
@@ -67231,7 +67282,7 @@ class InternalViewport {
         if (x < this.offsetCorrectionX || x > this.offsetCorrectionX + this.viewportWidth) {
             return -1;
         }
-        return this.searchHeaderIndex("COL", x - this.offsetCorrectionX, this.left);
+        return this.searchHeaderIndex("COL", x - this.offsetCorrectionX + this.snapCorrection.x, this.left);
     }
     /**
      * Return the index of a row given an offset y, based on the pane top
@@ -67242,7 +67293,7 @@ class InternalViewport {
         if (y < this.offsetCorrectionY || y > this.offsetCorrectionY + this.viewportHeight) {
             return -1;
         }
-        return this.searchHeaderIndex("ROW", y - this.offsetCorrectionY, this.top);
+        return this.searchHeaderIndex("ROW", y - this.offsetCorrectionY + this.snapCorrection.y, this.top);
     }
     /**
      * This function will make sure that the provided cell position (or current selected position) is part of
@@ -67262,55 +67313,29 @@ class InternalViewport {
     }
     adjustPositionX(targetCol) {
         const sheetId = this.sheetId;
-        const { end } = this.getters.getColDimensions(sheetId, targetCol);
-        if (this.offsetX + this.offsetCorrectionX + this.viewportWidth < end) {
-            const maxCol = this.getters.getNumberCols(sheetId);
-            let finalTarget = targetCol;
-            while (this.getters.isColHidden(sheetId, finalTarget) && finalTarget < maxCol) {
-                finalTarget++;
-            }
-            const finalTargetEnd = this.getters.getColDimensions(sheetId, finalTarget).end;
-            const startIndex = this.searchHeaderIndex("COL", finalTargetEnd - this.viewportWidth - this.offsetCorrectionX, this.boundaries.left);
-            this.offsetScrollbarX =
-                this.getters.getColDimensions(sheetId, startIndex).end - this.offsetCorrectionX;
-        }
-        else if (this.left > targetCol) {
-            let finalTarget = targetCol;
-            while (this.getters.isColHidden(sheetId, finalTarget) && finalTarget > 0) {
-                finalTarget--;
-            }
-            this.offsetScrollbarX =
-                this.getters.getColDimensions(sheetId, finalTarget).start - this.offsetCorrectionX;
+        const { start, end } = this.getters.getColDimensions(sheetId, targetCol);
+        if (this.offsetX + this.viewportWidth + this.offsetCorrectionX < end) {
+            this.offsetX = end - this.viewportWidth;
+        }
+        else if (this.offsetX + this.offsetCorrectionX > start) {
+            this.offsetX = start - this.offsetCorrectionX;
         }
         this.adjustViewportZoneX();
     }
     adjustPositionY(targetRow) {
         const sheetId = this.sheetId;
-        const { end } = this.getters.getRowDimensions(sheetId, targetRow);
+        const { start, end } = this.getters.getRowDimensions(sheetId, targetRow);
         if (this.offsetY + this.viewportHeight + this.offsetCorrectionY < end) {
-            const maxRow = this.getters.getNumberRows(sheetId);
-            let finalTarget = targetRow;
-            while (this.getters.isRowHidden(sheetId, finalTarget) && finalTarget < maxRow) {
-                finalTarget++;
-            }
-            const finalTargetEnd = this.getters.getRowDimensions(sheetId, finalTarget).end;
-            const startIndex = this.searchHeaderIndex("ROW", finalTargetEnd - this.viewportHeight - this.offsetCorrectionY, this.boundaries.top);
-            this.offsetScrollbarY =
-                this.getters.getRowDimensions(sheetId, startIndex).end - this.offsetCorrectionY;
+            this.offsetY = end - this.viewportHeight;
         }
-        else if (this.top > targetRow) {
-            let finalTarget = targetRow;
-            while (this.getters.isRowHidden(sheetId, finalTarget) && finalTarget > 0) {
-                finalTarget--;
-            }
-            this.offsetScrollbarY =
-                this.getters.getRowDimensions(sheetId, finalTarget).start - this.offsetCorrectionY;
+        else if (this.offsetY + this.offsetCorrectionY > start) {
+            this.offsetY = start - this.offsetCorrectionY;
         }
         this.adjustViewportZoneY();
     }
     willNewOffsetScrollViewport(offsetX, offsetY) {
-        return ((this.canScrollHorizontally && this.offsetScrollbarX !== offsetX) ||
-            (this.canScrollVertically && this.offsetScrollbarY !== offsetY));
+        return ((this.canScrollHorizontally && this.offsetX !== offsetX) ||
+            (this.canScrollVertically && this.offsetY !== offsetY));
     }
     setViewportOffset(offsetX, offsetY) {
         this.setViewportOffsetX(offsetX);
@@ -67327,11 +67352,19 @@ class InternalViewport {
      */
     getVisibleRect(zone) {
         const targetZone = intersection(zone, this);
+        const scrollDeltaX = this.snapCorrection.x;
+        const scrollDeltaY = this.snapCorrection.y;
         if (targetZone) {
-            const x = this.getters.getColRowOffset("COL", this.left, targetZone.left) + this.offsetCorrectionX;
-            const y = this.getters.getColRowOffset("ROW", this.top, targetZone.top) + this.offsetCorrectionY;
-            const width = Math.min(this.getters.getColRowOffset("COL", targetZone.left, targetZone.right + 1), this.viewportWidth);
-            const height = Math.min(this.getters.getColRowOffset("ROW", targetZone.top, targetZone.bottom + 1), this.viewportHeight);
+            const x = this.getters.getColRowOffset("COL", this.left, targetZone.left) +
+                this.offsetCorrectionX -
+                (this.left !== targetZone.left ? scrollDeltaX : 0);
+            const y = this.getters.getColRowOffset("ROW", this.top, targetZone.top) +
+                this.offsetCorrectionY -
+                (this.top !== targetZone.top ? scrollDeltaY : 0);
+            const width = Math.min(this.getters.getColRowOffset("COL", targetZone.left, targetZone.right + 1) -
+                (this.left === targetZone.left ? scrollDeltaX : 0), this.viewportWidth);
+            const height = Math.min(this.getters.getColRowOffset("ROW", targetZone.top, targetZone.bottom + 1) -
+                (this.top === targetZone.top ? scrollDeltaY : 0), this.viewportHeight);
             return { x, y, width, height };
         }
         return undefined;
@@ -67343,12 +67376,14 @@ class InternalViewport {
      */
     getFullRect(zone) {
         const targetZone = intersection(zone, this);
+        const scrollDeltaX = this.snapCorrection.x;
+        const scrollDeltaY = this.snapCorrection.y;
         if (targetZone) {
             const x = this.getters.getColRowOffset("COL", this.left, zone.left) + this.offsetCorrectionX;
             const y = this.getters.getColRowOffset("ROW", this.top, zone.top) + this.offsetCorrectionY;
             const width = this.getters.getColRowOffset("COL", zone.left, zone.right + 1);
             const height = this.getters.getColRowOffset("ROW", zone.top, zone.bottom + 1);
-            return { x, y, width, height };
+            return { x: x - scrollDeltaX, y: y - scrollDeltaY, width, height };
         }
         return undefined;
     }
@@ -67359,6 +67394,9 @@ class InternalViewport {
             !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:
@@ -67384,36 +67422,36 @@ class InternalViewport {
         if (!this.canScrollHorizontally) {
             return;
         }
-        this.offsetScrollbarX = offsetX;
+        this.offsetX = offsetX;
         this.adjustViewportZoneX();
     }
     setViewportOffsetY(offsetY) {
         if (!this.canScrollVertically) {
             return;
         }
-        this.offsetScrollbarY = offsetY;
+        this.offsetY = offsetY;
         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) {
             const { width: viewportWidth } = this.getMaxSize();
-            if (this.viewportWidth + this.offsetScrollbarX > viewportWidth) {
-                this.offsetScrollbarX = Math.max(0, viewportWidth - this.viewportWidth);
+            if (this.viewportWidth + this.offsetX > viewportWidth) {
+                this.offsetX = Math.max(0, viewportWidth - this.viewportWidth);
             }
         }
         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) {
             const { height: paneHeight } = this.getMaxSize();
-            if (this.viewportHeight + this.offsetScrollbarY > paneHeight) {
-                this.offsetScrollbarY = Math.max(0, paneHeight - this.viewportHeight);
+            if (this.viewportHeight + this.offsetY > paneHeight) {
+                this.offsetY = Math.max(0, paneHeight - this.viewportHeight);
             }
         }
         this.adjustViewportZoneY();
@@ -67421,34 +67459,47 @@ class InternalViewport {
     /** Updates the pane zone and snapped offset based on its horizontal
      * offset (will find Left) and its width (will find Right) */
     adjustViewportZoneX() {
-        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));
+        this.left = this.searchHeaderIndex("COL", this.offsetX, this.boundaries.left);
+        this.right = Math.min(this.boundaries.right, this.searchHeaderIndex("COL", 
+        // if we hit the border of two cells, we want to match the previous
+        Math.max(this.viewportWidth + this.snapCorrection.x - 0.1), 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 -
-                this.getters.getColDimensions(sheetId, this.boundaries.left).start;
     }
     /** Updates the pane zone and snapped offset based on its vertical
      * offset (will find Top) and its width (will find Bottom) */
     adjustViewportZoneY() {
-        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));
+        this.top = this.searchHeaderIndex("ROW", this.offsetY, this.boundaries.top);
+        this.bottom = Math.min(this.boundaries.bottom, this.searchHeaderIndex("ROW", 
+        // if we hit the border of two cells, we want to match the previous
+        Math.max(this.viewportHeight + this.snapCorrection.y - 0.1, 0), 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 -
-                this.getters.getRowDimensions(sheetId, this.boundaries.top).start;
+    }
+    /** represents the part of the header on the topLeft that could be partially
+     * hidden due to the scroll
+     * */
+    get snapCorrection() {
+        return {
+            x: Math.abs(this.offsetX -
+                this.getters.getColRowOffset("COL", this.boundaries.left, Math.max(0, this.left))),
+            y: Math.abs(this.offsetY -
+                this.getters.getColRowOffset("ROW", this.boundaries.top, Math.max(0, this.top))),
+        };
     }
 }
 
@@ -67511,14 +67562,13 @@ class SheetViewPlugin extends UIPlugin {
         "getColRowOffsetInViewport",
         "getMainViewportCoordinates",
         "getActiveSheetScrollInfo",
-        "getActiveSheetDOMScrollInfo",
         "getSheetViewVisibleCols",
         "getSheetViewVisibleRows",
         "getFrozenSheetViewRatio",
         "isPixelPositionVisible",
         "getColDimensionsInViewport",
         "getRowDimensionsInViewport",
-        "getAllActiveViewportsZones",
+        "getAllActiveViewportsZonesAndRect",
         "getRect",
     ];
     viewports = {};
@@ -67721,8 +67771,8 @@ class SheetViewPlugin extends UIPlugin {
         return this.getMainViewport(sheetId);
     }
     /**
-     * Return the scroll info of the active sheet, ie. the offset between the viewport left/top side and
-     * the grid left/top side, snapped to the columns/rows.
+     * Return the DOM scroll info of the active sheet, ie. the offset between the viewport left/top side and
+     * the grid left/top side, corresponding to the scroll of the scrollbars and not snapped to the grid.
      */
     getActiveSheetScrollInfo() {
         const sheetId = this.getters.getActiveSheetId();
@@ -67732,28 +67782,16 @@ class SheetViewPlugin extends UIPlugin {
             scrollY: viewport.offsetY,
         };
     }
-    /**
-     * Return the DOM scroll info of the active sheet, ie. the offset between the viewport left/top side and
-     * the grid left/top side, corresponding to the scroll of the scrollbars and not snapped to the grid.
-     */
-    getActiveSheetDOMScrollInfo() {
-        const sheetId = this.getters.getActiveSheetId();
-        const viewport = this.getMainInternalViewport(sheetId);
-        return {
-            scrollX: viewport.offsetScrollbarX,
-            scrollY: viewport.offsetScrollbarY,
-        };
-    }
     getSheetViewVisibleCols() {
         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.
@@ -67796,19 +67834,19 @@ class SheetViewPlugin extends UIPlugin {
             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;
@@ -67855,7 +67893,7 @@ class SheetViewPlugin extends UIPlugin {
         }
         return { canEdgeScroll, direction, delay };
     }
-    getEdgeScrollRow(y, previousY, tartingY) {
+    getEdgeScrollRow(y, previousY, startingY) {
         let canEdgeScroll = false;
         let direction = 0;
         let delay = 0;
@@ -67876,7 +67914,7 @@ class SheetViewPlugin extends UIPlugin {
             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);
@@ -67902,13 +67940,7 @@ class SheetViewPlugin extends UIPlugin {
      */
     getVisibleRectWithoutHeaders(zone) {
         const sheetId = this.getters.getActiveSheetId();
-        const viewportRects = this.getSubViewports(sheetId)
-            .map((viewport) => viewport.getVisibleRect(zone))
-            .filter(isDefined);
-        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
@@ -67916,13 +67948,7 @@ class SheetViewPlugin extends UIPlugin {
      */
     getRect(zone) {
         const sheetId = this.getters.getActiveSheetId();
-        const viewportRects = this.getSubViewports(sheetId)
-            .map((viewport) => viewport.getFullRect(zone))
-            .filter(isDefined);
-        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 };
     }
     /**
@@ -67942,34 +67968,43 @@ class SheetViewPlugin extends UIPlugin {
      * column of the current viewport
      */
     getColDimensionsInViewport(sheetId, col) {
-        const left = largeMin(this.getters.getSheetViewVisibleCols());
-        const start = this.getters.getColRowOffsetInViewport("COL", left, col);
-        const size = this.getters.getColSize(sheetId, col);
-        const isColHidden = this.getters.isColHidden(sheetId, col);
-        return {
-            start,
-            size: size,
-            end: start + (isColHidden ? 0 : size),
+        const zone = {
+            left: col,
+            right: col,
+            top: 0,
+            bottom: this.getters.getNumberRows(sheetId) - 1,
         };
+        const { x, width } = this.getVisibleRect(zone);
+        const start = x - this.gridOffsetX;
+        return { start, size: width, end: start + width };
     }
     /**
      * Returns the size, start and end coordinates of a row relative to the top row
      * of the current viewport
      */
     getRowDimensionsInViewport(sheetId, row) {
-        const top = largeMin(this.getters.getSheetViewVisibleRows());
-        const start = this.getters.getColRowOffsetInViewport("ROW", top, row);
-        const size = this.getters.getRowSize(sheetId, row);
-        const isRowHidden = this.getters.isRowHidden(sheetId, row);
-        return {
-            start,
-            size: size,
-            end: start + (isRowHidden ? 0 : size),
+        const zone = {
+            left: 0,
+            right: this.getters.getNumberCols(sheetId) - 1,
+            top: row,
+            bottom: row,
         };
+        const { y, height } = this.getVisibleRect(zone);
+        const start = y - this.gridOffsetY;
+        return { start, size: height, end: start + height };
     }
-    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
@@ -68028,12 +68063,11 @@ class SheetViewPlugin extends UIPlugin {
     }
     /** 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;
@@ -68043,7 +68077,7 @@ class SheetViewPlugin extends UIPlugin {
         this.recomputeViewports();
     }
     recomputeViewports() {
-        for (let sheetId of Object.keys(this.viewports)) {
+        for (const sheetId of this.getters.getSheetIds()) {
             this.resetViewports(sheetId);
         }
     }
@@ -68054,8 +68088,8 @@ class SheetViewPlugin extends UIPlugin {
     }
     getViewportOffset(sheetId) {
         return {
-            x: this.viewports[sheetId]?.bottomRight.offsetScrollbarX || 0,
-            y: this.viewports[sheetId]?.bottomRight.offsetScrollbarY || 0,
+            x: this.viewports[sheetId]?.bottomRight.offsetX || 0,
+            y: this.viewports[sheetId]?.bottomRight.offsetY || 0,
         };
     }
     resetViewports(sheetId) {
@@ -68065,8 +68099,10 @@ class SheetViewPlugin extends UIPlugin {
         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;
@@ -68077,14 +68113,14 @@ class SheetViewPlugin extends UIPlugin {
                 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,
@@ -68161,12 +68197,26 @@ class SheetViewPlugin extends UIPlugin {
         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 };
     }
 }
 
@@ -69341,7 +69391,7 @@ class SpreadsheetDashboard extends owl.Component {
         });
     }
     moveCanvas(deltaX, deltaY) {
-        const { scrollX, scrollY } = this.env.model.getters.getActiveSheetDOMScrollInfo();
+        const { scrollX, scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
         this.env.model.dispatch("SET_VIEWPORT_OFFSET", {
             offsetX: scrollX + deltaX,
             offsetY: scrollY + deltaY,
@@ -75329,6 +75379,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.2.0-alpha.5";
-__info__.date = "2025-01-31T07:59:30.667Z";
-__info__.hash = "efce841";
+__info__.version = "18.2.0-alpha.6";
+__info__.date = "2025-02-05T06:50:47.008Z";
+__info__.hash = "dae9ab2";