@odoo/o-spreadsheet 16.4.7 → 16.4.9

package/dist/o-spreadsheet.cjs.js

@@ -1197,7 +1197,17 @@ const timeRegexp = /((\d+(:\d+)?(:\d+)?\s*(AM|PM))|(\d+:\d+(:\d+)?))$/;
 function isDateTime(str, locale) {
     return parseDateTime(str, locale) !== null;
 }
+const CACHE = new Map();
 function parseDateTime(str, locale) {
+    if (!CACHE.has(locale)) {
+        CACHE.set(locale, new Map());
+    }
+    if (!CACHE.get(locale).has(str)) {
+        CACHE.get(locale).set(str, _parseDateTime(str, locale));
+    }
+    return CACHE.get(locale).get(str);
+}
+function _parseDateTime(str, locale) {
     str = str.trim();
     let time = null;
     const timeMatch = str.match(timeRegexp);
@@ -3016,8 +3026,9 @@ class RangeImpl {
     }
     get zone() {
         const { left, top, bottom, right } = this._zone;
-        if (right !== undefined && bottom !== undefined)
-            return { left, top, right, bottom };
+        if (right !== undefined && bottom !== undefined) {
+            return this._zone;
+        }
         else if (bottom === undefined && right !== undefined) {
             return { right, top, left, bottom: this.getSheetSize(this.sheetId).numberOfRows - 1 };
         }
@@ -4287,7 +4298,7 @@ var LAYERS;
 const SORT_TYPES_ORDER = ["number", "string", "boolean", "undefined"];
 function assert(condition, message) {
     if (!condition()) {
-        throw new Error(message);
+        throw new EvaluationError(CellErrorType.GenericError, message);
     }
 }
 // -----------------------------------------------------------------------------
@@ -4932,7 +4943,7 @@ function _createEvaluatedCell(value, localeFormat) {
         return textCell((value || "").toString(), localeFormat);
     }
     catch (error) {
-        return errorCell((value || "").toString(), new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
+        return errorCell(new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
     }
 }
 function textCell(value, localeFormat) {
@@ -4999,7 +5010,7 @@ function booleanCell(value, localeFormat) {
         formattedValue,
     };
 }
-function errorCell(content, error) {
+function errorCell(error) {
     return {
         type: CellValueType.error,
         value: error.errorType,
@@ -5449,6 +5460,9 @@ class FilterMenu extends owl.Component {
         });
         this.state.values = this.getFilterValues(this.props.filterPosition);
     }
+    get isReadonly() {
+        return this.env.model.getters.isReadonly();
+    }
     getFilterValues(position) {
         const sheetId = this.env.model.getters.getActiveSheetId();
         const filter = this.env.model.getters.getFilter({ sheetId, ...position });
@@ -22798,7 +22812,6 @@ class FindAndReplacePanel extends owl.Component {
     state = owl.useState(this.initialState());
     debounceTimeoutId;
     showFormulaState = false;
-    debouncedUpdateSearch;
     findAndReplaceRef = owl.useRef("findAndReplace");
     get hasSearchResult() {
         return this.env.model.getters.getCurrentSelectedMatchIndex() !== null;
@@ -22808,9 +22821,9 @@ class FindAndReplacePanel extends owl.Component {
     }
     setup() {
         this.showFormulaState = this.env.model.getters.shouldShowFormulas();
-        this.debouncedUpdateSearch = debounce(this.updateSearch.bind(this), 200);
         owl.onMounted(() => this.focusInput());
         owl.onWillUnmount(() => {
+            clearTimeout(this.debounceTimeoutId);
             this.env.model.dispatch("CLEAR_SEARCH");
             this.env.model.dispatch("SET_FORMULA_VISIBILITY", { show: this.showFormulaState });
         });
@@ -22855,6 +22868,13 @@ class FindAndReplacePanel extends owl.Component {
             searchOptions: this.state.searchOptions,
         });
     }
+    debouncedUpdateSearch() {
+        clearTimeout(this.debounceTimeoutId);
+        this.debounceTimeoutId = setTimeout(() => {
+            this.updateSearch();
+            this.debounceTimeoutId = undefined;
+        }, 200);
+    }
     replace() {
         this.env.model.dispatch("REPLACE_SEARCH", {
             replaceWith: this.state.replaceWith,
@@ -31812,10 +31832,11 @@ class CellPlugin extends CorePlugin {
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
     buildFormulaContent(sheetId, cell, dependencies) {
-        const ranges = dependencies || [...cell.dependencies];
+        const ranges = dependencies || cell.dependencies;
+        let rangeIndex = 0;
         return concat(cell.compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
-                const range = ranges.shift();
+                const range = ranges[rangeIndex++];
                 return this.getters.getRangeString(range, sheetId);
             }
             return token.value;
@@ -35423,7 +35444,7 @@ class CompilationParametersBuilder {
         const evaluatedCell = this.getEvaluatedCell(position);
         if (evaluatedCell.type === CellValueType.empty) {
             const cell = this.getters.getCell(position);
-            if (!cell || cell.content === "") {
+            if (!cell || (!cell.isFormula && cell.content === "")) {
                 return undefined;
             }
         }
@@ -35643,7 +35664,7 @@ class Evaluator {
     constructor(context, getters) {
         this.context = context;
         this.getters = getters;
-        this.compilationParams = buildCompilationParameters(context, getters, (position) => this.computeCell(this.encodePosition(position)));
+        this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     getEvaluatedCell(position) {
         return (this.evaluatedCells.get(this.encodePosition(position)) ||
@@ -35671,7 +35692,7 @@ class Evaluator {
         this.formulaDependencies().addDependencies(positionId, dependencies);
     }
     updateCompilationParameters() {
-        this.compilationParams = buildCompilationParameters(this.context, this.getters, (position) => this.computeCell(this.encodePosition(position)));
+        this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     evaluateCells(positions) {
         const cells = positions.map(this.encodePosition.bind(this));
@@ -35787,15 +35808,21 @@ class Evaluator {
             this.cellsBeingComputed.delete(cellId);
         }
     }
+    computeAndSave(position) {
+        const positionId = this.encodePosition(position);
+        const evaluatedCell = this.computeCell(positionId);
+        if (!this.evaluatedCells.has(positionId)) {
+            this.setEvaluatedCell(positionId, evaluatedCell);
+        }
+        return evaluatedCell;
+    }
     handleError(e, cell) {
-        if (!(e instanceof Error)) {
-            e = new Error(e);
+        if (!(e instanceof EvaluationError)) {
+            e = new EvaluationError(CellErrorType.GenericError, e.message);
         }
-        const msg = e?.errorType || CellErrorType.GenericError;
-        // apply function name
         const __lastFnCalled = this.compilationParams[2].__lastFnCalled || "";
-        const error = new EvaluationError(msg, e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled), e.logLevel !== undefined ? e.logLevel : CellErrorLevel.error);
-        return errorCell(cell.content, error);
+        e.message = e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled);
+        return errorCell(e);
     }
     computeFormulaCell(cellData) {
         const cellId = cellData.id;
@@ -38694,14 +38721,10 @@ class FindAndReplacePlugin extends UIPlugin {
             case "REPLACE_ALL_SEARCH":
                 this.replaceAll(cmd.replaceWith);
                 break;
-            case "EVALUATE_CELLS":
-            case "UPDATE_CELL":
-            case "REMOVE_FILTER_TABLE":
-            case "UPDATE_FILTER":
-                this.isSearchDirty = true;
-                break;
             case "UNDO":
             case "REDO":
+            case "REMOVE_FILTER_TABLE":
+            case "UPDATE_FILTER":
             case "REMOVE_COLUMNS_ROWS":
             case "HIDE_COLUMNS_ROWS":
             case "UNHIDE_COLUMNS_ROWS":
@@ -41362,7 +41385,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         });
         for (const filterTable of this.copiedTables) {
             this.dispatch("REMOVE_FILTER_TABLE", {
-                sheetId: this.getters.getActiveSheetId(),
+                sheetId: this.sheetId,
                 target: [filterTable.zone],
             });
         }
@@ -43903,30 +43926,26 @@ class InternalViewport {
         const { end } = this.getters.getColDimensions(sheetId, targetCol);
         const maxCol = this.getters.getNumberCols(sheetId);
         if (this.offsetX + this.offsetCorrectionX + this.viewportWidth < end) {
-            for (let col = this.left; this.offsetX + this.offsetCorrectionX + this.viewportWidth < end; col++) {
-                if (col > maxCol) {
-                    break;
-                }
-                if (this.getters.isColHidden(sheetId, col)) {
-                    continue;
-                }
-                this.offsetX = this.getters.getColDimensions(sheetId, col).end - this.offsetCorrectionX;
-                this.offsetScrollbarX = this.offsetX;
-                this.adjustViewportZoneX();
+            let finalTarget = targetCol;
+            while (this.getters.isColHidden(sheetId, finalTarget) && targetCol < maxCol) {
+                finalTarget++;
             }
+            const finalTargetEnd = this.getters.getColDimensions(sheetId, finalTarget).end;
+            const startIndex = this.searchHeaderIndex("COL", finalTargetEnd - this.viewportWidth - this.offsetCorrectionX, this.boundaries.left, true);
+            this.offsetX =
+                this.getters.getColDimensions(sheetId, startIndex).end - this.offsetCorrectionX;
+            this.offsetScrollbarX = this.offsetX;
+            this.adjustViewportZoneX();
         }
         else if (this.left > targetCol) {
-            for (let col = this.left; col >= targetCol; col--) {
-                if (col < 0) {
-                    break;
-                }
-                if (this.getters.isColHidden(sheetId, col)) {
-                    continue;
-                }
-                this.offsetX = this.getters.getColDimensions(sheetId, col).start - this.offsetCorrectionX;
-                this.offsetScrollbarX = this.offsetX;
-                this.adjustViewportZoneX();
+            let finalTarget = targetCol;
+            while (this.getters.isColHidden(sheetId, finalTarget) && targetCol > 0) {
+                finalTarget--;
             }
+            this.offsetX =
+                this.getters.getColDimensions(sheetId, finalTarget).start - this.offsetCorrectionX;
+            this.offsetScrollbarX = this.offsetX;
+            this.adjustViewportZoneX();
         }
     }
     adjustPositionY(targetRow) {
@@ -43934,30 +43953,26 @@ class InternalViewport {
         const { end } = this.getters.getRowDimensions(sheetId, targetRow);
         const maxRow = this.getters.getNumberRows(sheetId);
         if (this.offsetY + this.viewportHeight + this.offsetCorrectionY < end) {
-            for (let row = this.top; this.offsetY + this.viewportHeight + this.offsetCorrectionY < end; row++) {
-                if (row > maxRow) {
-                    break;
-                }
-                if (this.getters.isRowHidden(sheetId, row)) {
-                    continue;
-                }
-                this.offsetY = this.getters.getRowDimensions(sheetId, row).end - this.offsetCorrectionY;
-                this.offsetScrollbarY = this.offsetY;
-                this.adjustViewportZoneY();
+            let finalTarget = targetRow;
+            while (this.getters.isRowHidden(sheetId, finalTarget) && targetRow < maxRow) {
+                finalTarget++;
             }
+            const finalTargetEnd = this.getters.getRowDimensions(sheetId, finalTarget).end;
+            const startIndex = this.searchHeaderIndex("ROW", finalTargetEnd - this.viewportHeight - this.offsetCorrectionY, this.boundaries.top, true);
+            this.offsetY =
+                this.getters.getRowDimensions(sheetId, startIndex).end - this.offsetCorrectionY;
+            this.offsetScrollbarY = this.offsetY;
+            this.adjustViewportZoneY();
         }
         else if (this.top > targetRow) {
-            for (let row = this.top; row >= targetRow; row--) {
-                if (row < 0) {
-                    break;
-                }
-                if (this.getters.isRowHidden(sheetId, row)) {
-                    continue;
-                }
-                this.offsetY = this.getters.getRowDimensions(sheetId, row).start - this.offsetCorrectionY;
-                this.offsetScrollbarY = this.offsetY;
-                this.adjustViewportZoneY();
+            let finalTarget = targetRow;
+            while (this.getters.isRowHidden(sheetId, finalTarget) && targetRow > 0) {
+                finalTarget--;
             }
+            this.offsetY =
+                this.getters.getRowDimensions(sheetId, finalTarget).start - this.offsetCorrectionY;
+            this.offsetScrollbarY = this.offsetY;
+            this.adjustViewportZoneY();
         }
     }
     setViewportOffset(offsetX, offsetY) {
@@ -50696,6 +50711,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.7';
-__info__.date = '2023-09-21T15:58:11.039Z';
-__info__.hash = 'eccdcce';
+__info__.version = '16.4.9';
+__info__.date = '2023-10-10T07:28:12.772Z';
+__info__.hash = '998c612';

package/dist/o-spreadsheet.d.ts

@@ -962,7 +962,7 @@ declare class RangeImpl implements Range {
     constructor(args: ConstructorArgs, getSheetSize: (sheetId: UID) => ZoneDimension);
     static fromRange(range: Range, getters: CoreGetters): RangeImpl;
     get unboundedZone(): UnboundedZone;
-    get zone(): Zone;
+    get zone(): Readonly<Zone>;
     static getRangeParts(xc: string, zone: UnboundedZone): RangePart[];
     get isFullCol(): boolean;
     get isFullRow(): boolean;

package/dist/o-spreadsheet.esm.js

@@ -1193,7 +1193,17 @@ const timeRegexp = /((\d+(:\d+)?(:\d+)?\s*(AM|PM))|(\d+:\d+(:\d+)?))$/;
 function isDateTime(str, locale) {
     return parseDateTime(str, locale) !== null;
 }
+const CACHE = new Map();
 function parseDateTime(str, locale) {
+    if (!CACHE.has(locale)) {
+        CACHE.set(locale, new Map());
+    }
+    if (!CACHE.get(locale).has(str)) {
+        CACHE.get(locale).set(str, _parseDateTime(str, locale));
+    }
+    return CACHE.get(locale).get(str);
+}
+function _parseDateTime(str, locale) {
     str = str.trim();
     let time = null;
     const timeMatch = str.match(timeRegexp);
@@ -3012,8 +3022,9 @@ class RangeImpl {
     }
     get zone() {
         const { left, top, bottom, right } = this._zone;
-        if (right !== undefined && bottom !== undefined)
-            return { left, top, right, bottom };
+        if (right !== undefined && bottom !== undefined) {
+            return this._zone;
+        }
         else if (bottom === undefined && right !== undefined) {
             return { right, top, left, bottom: this.getSheetSize(this.sheetId).numberOfRows - 1 };
         }
@@ -4283,7 +4294,7 @@ var LAYERS;
 const SORT_TYPES_ORDER = ["number", "string", "boolean", "undefined"];
 function assert(condition, message) {
     if (!condition()) {
-        throw new Error(message);
+        throw new EvaluationError(CellErrorType.GenericError, message);
     }
 }
 // -----------------------------------------------------------------------------
@@ -4928,7 +4939,7 @@ function _createEvaluatedCell(value, localeFormat) {
         return textCell((value || "").toString(), localeFormat);
     }
     catch (error) {
-        return errorCell((value || "").toString(), new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
+        return errorCell(new EvaluationError(CellErrorType.GenericError, error.message || DEFAULT_ERROR_MESSAGE));
     }
 }
 function textCell(value, localeFormat) {
@@ -4995,7 +5006,7 @@ function booleanCell(value, localeFormat) {
         formattedValue,
     };
 }
-function errorCell(content, error) {
+function errorCell(error) {
     return {
         type: CellValueType.error,
         value: error.errorType,
@@ -5445,6 +5456,9 @@ class FilterMenu extends Component {
         });
         this.state.values = this.getFilterValues(this.props.filterPosition);
     }
+    get isReadonly() {
+        return this.env.model.getters.isReadonly();
+    }
     getFilterValues(position) {
         const sheetId = this.env.model.getters.getActiveSheetId();
         const filter = this.env.model.getters.getFilter({ sheetId, ...position });
@@ -22794,7 +22808,6 @@ class FindAndReplacePanel extends Component {
     state = useState(this.initialState());
     debounceTimeoutId;
     showFormulaState = false;
-    debouncedUpdateSearch;
     findAndReplaceRef = useRef("findAndReplace");
     get hasSearchResult() {
         return this.env.model.getters.getCurrentSelectedMatchIndex() !== null;
@@ -22804,9 +22817,9 @@ class FindAndReplacePanel extends Component {
     }
     setup() {
         this.showFormulaState = this.env.model.getters.shouldShowFormulas();
-        this.debouncedUpdateSearch = debounce(this.updateSearch.bind(this), 200);
         onMounted(() => this.focusInput());
         onWillUnmount(() => {
+            clearTimeout(this.debounceTimeoutId);
             this.env.model.dispatch("CLEAR_SEARCH");
             this.env.model.dispatch("SET_FORMULA_VISIBILITY", { show: this.showFormulaState });
         });
@@ -22851,6 +22864,13 @@ class FindAndReplacePanel extends Component {
             searchOptions: this.state.searchOptions,
         });
     }
+    debouncedUpdateSearch() {
+        clearTimeout(this.debounceTimeoutId);
+        this.debounceTimeoutId = setTimeout(() => {
+            this.updateSearch();
+            this.debounceTimeoutId = undefined;
+        }, 200);
+    }
     replace() {
         this.env.model.dispatch("REPLACE_SEARCH", {
             replaceWith: this.state.replaceWith,
@@ -31808,10 +31828,11 @@ class CellPlugin extends CorePlugin {
      * Reconstructs the original formula string based on a normalized form and its dependencies
      */
     buildFormulaContent(sheetId, cell, dependencies) {
-        const ranges = dependencies || [...cell.dependencies];
+        const ranges = dependencies || cell.dependencies;
+        let rangeIndex = 0;
         return concat(cell.compiledFormula.tokens.map((token) => {
             if (token.type === "REFERENCE") {
-                const range = ranges.shift();
+                const range = ranges[rangeIndex++];
                 return this.getters.getRangeString(range, sheetId);
             }
             return token.value;
@@ -35419,7 +35440,7 @@ class CompilationParametersBuilder {
         const evaluatedCell = this.getEvaluatedCell(position);
         if (evaluatedCell.type === CellValueType.empty) {
             const cell = this.getters.getCell(position);
-            if (!cell || cell.content === "") {
+            if (!cell || (!cell.isFormula && cell.content === "")) {
                 return undefined;
             }
         }
@@ -35639,7 +35660,7 @@ class Evaluator {
     constructor(context, getters) {
         this.context = context;
         this.getters = getters;
-        this.compilationParams = buildCompilationParameters(context, getters, (position) => this.computeCell(this.encodePosition(position)));
+        this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     getEvaluatedCell(position) {
         return (this.evaluatedCells.get(this.encodePosition(position)) ||
@@ -35667,7 +35688,7 @@ class Evaluator {
         this.formulaDependencies().addDependencies(positionId, dependencies);
     }
     updateCompilationParameters() {
-        this.compilationParams = buildCompilationParameters(this.context, this.getters, (position) => this.computeCell(this.encodePosition(position)));
+        this.compilationParams = buildCompilationParameters(this.context, this.getters, this.computeAndSave.bind(this));
     }
     evaluateCells(positions) {
         const cells = positions.map(this.encodePosition.bind(this));
@@ -35783,15 +35804,21 @@ class Evaluator {
             this.cellsBeingComputed.delete(cellId);
         }
     }
+    computeAndSave(position) {
+        const positionId = this.encodePosition(position);
+        const evaluatedCell = this.computeCell(positionId);
+        if (!this.evaluatedCells.has(positionId)) {
+            this.setEvaluatedCell(positionId, evaluatedCell);
+        }
+        return evaluatedCell;
+    }
     handleError(e, cell) {
-        if (!(e instanceof Error)) {
-            e = new Error(e);
+        if (!(e instanceof EvaluationError)) {
+            e = new EvaluationError(CellErrorType.GenericError, e.message);
         }
-        const msg = e?.errorType || CellErrorType.GenericError;
-        // apply function name
         const __lastFnCalled = this.compilationParams[2].__lastFnCalled || "";
-        const error = new EvaluationError(msg, e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled), e.logLevel !== undefined ? e.logLevel : CellErrorLevel.error);
-        return errorCell(cell.content, error);
+        e.message = e.message.replace("[[FUNCTION_NAME]]", __lastFnCalled);
+        return errorCell(e);
     }
     computeFormulaCell(cellData) {
         const cellId = cellData.id;
@@ -38690,14 +38717,10 @@ class FindAndReplacePlugin extends UIPlugin {
             case "REPLACE_ALL_SEARCH":
                 this.replaceAll(cmd.replaceWith);
                 break;
-            case "EVALUATE_CELLS":
-            case "UPDATE_CELL":
-            case "REMOVE_FILTER_TABLE":
-            case "UPDATE_FILTER":
-                this.isSearchDirty = true;
-                break;
             case "UNDO":
             case "REDO":
+            case "REMOVE_FILTER_TABLE":
+            case "UPDATE_FILTER":
             case "REMOVE_COLUMNS_ROWS":
             case "HIDE_COLUMNS_ROWS":
             case "UNHIDE_COLUMNS_ROWS":
@@ -41358,7 +41381,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         });
         for (const filterTable of this.copiedTables) {
             this.dispatch("REMOVE_FILTER_TABLE", {
-                sheetId: this.getters.getActiveSheetId(),
+                sheetId: this.sheetId,
                 target: [filterTable.zone],
             });
         }
@@ -43899,30 +43922,26 @@ class InternalViewport {
         const { end } = this.getters.getColDimensions(sheetId, targetCol);
         const maxCol = this.getters.getNumberCols(sheetId);
         if (this.offsetX + this.offsetCorrectionX + this.viewportWidth < end) {
-            for (let col = this.left; this.offsetX + this.offsetCorrectionX + this.viewportWidth < end; col++) {
-                if (col > maxCol) {
-                    break;
-                }
-                if (this.getters.isColHidden(sheetId, col)) {
-                    continue;
-                }
-                this.offsetX = this.getters.getColDimensions(sheetId, col).end - this.offsetCorrectionX;
-                this.offsetScrollbarX = this.offsetX;
-                this.adjustViewportZoneX();
+            let finalTarget = targetCol;
+            while (this.getters.isColHidden(sheetId, finalTarget) && targetCol < maxCol) {
+                finalTarget++;
             }
+            const finalTargetEnd = this.getters.getColDimensions(sheetId, finalTarget).end;
+            const startIndex = this.searchHeaderIndex("COL", finalTargetEnd - this.viewportWidth - this.offsetCorrectionX, this.boundaries.left, true);
+            this.offsetX =
+                this.getters.getColDimensions(sheetId, startIndex).end - this.offsetCorrectionX;
+            this.offsetScrollbarX = this.offsetX;
+            this.adjustViewportZoneX();
         }
         else if (this.left > targetCol) {
-            for (let col = this.left; col >= targetCol; col--) {
-                if (col < 0) {
-                    break;
-                }
-                if (this.getters.isColHidden(sheetId, col)) {
-                    continue;
-                }
-                this.offsetX = this.getters.getColDimensions(sheetId, col).start - this.offsetCorrectionX;
-                this.offsetScrollbarX = this.offsetX;
-                this.adjustViewportZoneX();
+            let finalTarget = targetCol;
+            while (this.getters.isColHidden(sheetId, finalTarget) && targetCol > 0) {
+                finalTarget--;
             }
+            this.offsetX =
+                this.getters.getColDimensions(sheetId, finalTarget).start - this.offsetCorrectionX;
+            this.offsetScrollbarX = this.offsetX;
+            this.adjustViewportZoneX();
         }
     }
     adjustPositionY(targetRow) {
@@ -43930,30 +43949,26 @@ class InternalViewport {
         const { end } = this.getters.getRowDimensions(sheetId, targetRow);
         const maxRow = this.getters.getNumberRows(sheetId);
         if (this.offsetY + this.viewportHeight + this.offsetCorrectionY < end) {
-            for (let row = this.top; this.offsetY + this.viewportHeight + this.offsetCorrectionY < end; row++) {
-                if (row > maxRow) {
-                    break;
-                }
-                if (this.getters.isRowHidden(sheetId, row)) {
-                    continue;
-                }
-                this.offsetY = this.getters.getRowDimensions(sheetId, row).end - this.offsetCorrectionY;
-                this.offsetScrollbarY = this.offsetY;
-                this.adjustViewportZoneY();
+            let finalTarget = targetRow;
+            while (this.getters.isRowHidden(sheetId, finalTarget) && targetRow < maxRow) {
+                finalTarget++;
             }
+            const finalTargetEnd = this.getters.getRowDimensions(sheetId, finalTarget).end;
+            const startIndex = this.searchHeaderIndex("ROW", finalTargetEnd - this.viewportHeight - this.offsetCorrectionY, this.boundaries.top, true);
+            this.offsetY =
+                this.getters.getRowDimensions(sheetId, startIndex).end - this.offsetCorrectionY;
+            this.offsetScrollbarY = this.offsetY;
+            this.adjustViewportZoneY();
         }
         else if (this.top > targetRow) {
-            for (let row = this.top; row >= targetRow; row--) {
-                if (row < 0) {
-                    break;
-                }
-                if (this.getters.isRowHidden(sheetId, row)) {
-                    continue;
-                }
-                this.offsetY = this.getters.getRowDimensions(sheetId, row).start - this.offsetCorrectionY;
-                this.offsetScrollbarY = this.offsetY;
-                this.adjustViewportZoneY();
+            let finalTarget = targetRow;
+            while (this.getters.isRowHidden(sheetId, finalTarget) && targetRow > 0) {
+                finalTarget--;
             }
+            this.offsetY =
+                this.getters.getRowDimensions(sheetId, finalTarget).start - this.offsetCorrectionY;
+            this.offsetScrollbarY = this.offsetY;
+            this.adjustViewportZoneY();
         }
     }
     setViewportOffset(offsetX, offsetY) {
@@ -50660,6 +50675,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.4.7';
-__info__.date = '2023-09-21T15:58:11.039Z';
-__info__.hash = 'eccdcce';
+__info__.version = '16.4.9';
+__info__.date = '2023-10-10T07:28:12.772Z';
+__info__.hash = '998c612';