@odoo/o-spreadsheet 16.0.18 → 16.0.20

package/dist/o-spreadsheet.cjs.js

@@ -1010,13 +1010,17 @@ function getAddHeaderStartIndex(position, base) {
     return position === "after" ? base + 1 : base;
 }
 /**
- * Compare two objects.
+ * Compares two objects.
  */
 function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
         return false;
+    if (typeof o1 !== typeof o2)
+        return false;
+    if (typeof o1 !== "object")
+        return o1 === o2;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -3689,6 +3693,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.col, position.row);
@@ -10007,9 +10014,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 });
         });
@@ -10052,6 +10059,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,
@@ -21300,9 +21314,11 @@ function useCellHovered(env, gridRef, callback) {
         }
     }
     function updateMousePosition(e) {
-        x = e.offsetX;
-        y = e.offsetY;
-        lastMoved = Date.now();
+        if (gridRef.el === e.target) {
+            x = e.offsetX;
+            y = e.offsetY;
+            lastMoved = Date.now();
+        }
     }
     function recompute() {
         const { col, row } = getPosition();
@@ -28946,7 +28962,11 @@ class HeaderSizePlugin extends CorePlugin {
                 let sizes = [...this.sizes[cmd.sheetId][cmd.dimension]];
                 const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
                 const baseSize = sizes[cmd.base];
-                sizes.splice(addIndex, 0, ...Array(cmd.quantity).fill(baseSize));
+                const sizesToInsert = range(0, cmd.quantity).map(() => ({
+                    manualSize: baseSize.manualSize,
+                    computedSize: lazy(baseSize.computedSize()),
+                }));
+                sizes.splice(addIndex, 0, ...sizesToInsert);
                 sizes = sizes.map((size, row) => {
                     if (cmd.dimension === "ROW" && row > cmd.base + cmd.quantity) {
                         // invalidate sizes
@@ -31647,7 +31667,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],
             });
         }
@@ -32062,7 +32082,7 @@ class ClipboardPlugin extends UIPlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "CUT":
-                const zones = cmd.target || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 const state = this.getClipboardState(zones, cmd.type);
                 return state.isCutAllowed(zones);
             case "PASTE":
@@ -32093,7 +32113,7 @@ class ClipboardPlugin extends UIPlugin {
         switch (cmd.type) {
             case "COPY":
             case "CUT":
-                const zones = ("target" in cmd && cmd.target) || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 this.state = this.getClipboardState(zones, cmd.type);
                 this.status = "visible";
                 break;
@@ -32711,6 +32731,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         // stores the computed styles in the format of computedStyles.sheetName[col][row] = Style
         this.computedStyles = {};
         this.computedIcons = {};
+        this.uuidGenerator = new UuidGenerator();
         /**
          * Execute the predicate to know if a conditional formatting rule should be applied to a cell
          */
@@ -33062,8 +33083,9 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                         this.adaptRules(origin.sheetId, cf, [xc], toRemoveRange);
                     }
                     else {
-                        this.adaptRules(target.sheetId, cf, [xc], []);
                         this.adaptRules(origin.sheetId, cf, [], toRemoveRange);
+                        const cfToCopyTo = this.getCFToCopyTo(target.sheetId, cf);
+                        this.adaptRules(target.sheetId, cfToCopyTo, [xc], []);
                     }
                 }
             }
@@ -33072,6 +33094,12 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
     isCellValueNumber(value) {
         return typeof value === "number";
     }
+    getCFToCopyTo(targetSheetId, originCF) {
+        const cfInTarget = this.getters
+            .getConditionalFormats(targetSheetId)
+            .find((cf) => cf.stopIfTrue === originCF.stopIfTrue && deepEquals(cf.rule, originCF.rule));
+        return cfInTarget ? cfInTarget : { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+    }
 }
 EvaluationConditionalFormatPlugin.getters = ["getConditionalIcon", "getCellComputedStyle"];
 
@@ -34839,26 +34867,24 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
-        this.dispatch("CUT", {
-            target: [
-                {
-                    left: isCol ? start + deltaCol : 0,
-                    right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? start + deltaRow : 0,
-                    bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
-        this.dispatch("PASTE", {
-            target: [
-                {
-                    left: isCol ? cmd.base : 0,
-                    right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? cmd.base : 0,
-                    bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
+        const target = [
+            {
+                left: isCol ? start + deltaCol : 0,
+                right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? start + deltaRow : 0,
+                bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const pasteTarget = [
+            {
+                left: isCol ? cmd.base : 0,
+                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? cmd.base : 0,
+                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        state.paste(pasteTarget, { selectTarget: true });
         const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = cmd.base;
         for (const element of toRemove) {
@@ -36300,30 +36326,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) {
@@ -36331,30 +36353,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) {
@@ -42906,6 +42924,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.18';
-__info__.date = '2023-09-12T11:42:03.083Z';
-__info__.hash = '41fd4fa';
+__info__.version = '16.0.20';
+__info__.date = '2023-10-03T12:43:02.601Z';
+__info__.hash = '3be5a75';

package/dist/o-spreadsheet.d.ts

@@ -1729,8 +1729,6 @@ interface CopyCommand {
 }
 interface CutCommand {
     type: "CUT";
-    /** Zones to cut. If none were given, will copy the zones in the selection*/
-    target?: Zone[];
 }
 interface PasteCommand {
     type: "PASTE";
@@ -3916,6 +3914,7 @@ declare class EvaluationConditionalFormatPlugin extends UIPlugin {
     private isStale;
     private computedStyles;
     private computedIcons;
+    private uuidGenerator;
     handle(cmd: Command): void;
     finalize(): void;
     getCellComputedStyle(sheetId: UID, col: HeaderIndex, row: HeaderIndex): Style;
@@ -3947,6 +3946,7 @@ declare class EvaluationConditionalFormatPlugin extends UIPlugin {
     private adaptRules;
     private pasteCf;
     private isCellValueNumber;
+    private getCFToCopyTo;
 }
 
 declare class FilterEvaluationPlugin extends UIPlugin {

package/dist/o-spreadsheet.esm.js

@@ -1006,13 +1006,17 @@ function getAddHeaderStartIndex(position, base) {
     return position === "after" ? base + 1 : base;
 }
 /**
- * Compare two objects.
+ * Compares two objects.
  */
 function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
         return false;
+    if (typeof o1 !== typeof o2)
+        return false;
+    if (typeof o1 !== "object")
+        return o1 === o2;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -3685,6 +3689,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.col, position.row);
@@ -10003,9 +10010,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 });
         });
@@ -10048,6 +10055,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,
@@ -21296,9 +21310,11 @@ function useCellHovered(env, gridRef, callback) {
         }
     }
     function updateMousePosition(e) {
-        x = e.offsetX;
-        y = e.offsetY;
-        lastMoved = Date.now();
+        if (gridRef.el === e.target) {
+            x = e.offsetX;
+            y = e.offsetY;
+            lastMoved = Date.now();
+        }
     }
     function recompute() {
         const { col, row } = getPosition();
@@ -28942,7 +28958,11 @@ class HeaderSizePlugin extends CorePlugin {
                 let sizes = [...this.sizes[cmd.sheetId][cmd.dimension]];
                 const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
                 const baseSize = sizes[cmd.base];
-                sizes.splice(addIndex, 0, ...Array(cmd.quantity).fill(baseSize));
+                const sizesToInsert = range(0, cmd.quantity).map(() => ({
+                    manualSize: baseSize.manualSize,
+                    computedSize: lazy(baseSize.computedSize()),
+                }));
+                sizes.splice(addIndex, 0, ...sizesToInsert);
                 sizes = sizes.map((size, row) => {
                     if (cmd.dimension === "ROW" && row > cmd.base + cmd.quantity) {
                         // invalidate sizes
@@ -31643,7 +31663,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],
             });
         }
@@ -32058,7 +32078,7 @@ class ClipboardPlugin extends UIPlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "CUT":
-                const zones = cmd.target || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 const state = this.getClipboardState(zones, cmd.type);
                 return state.isCutAllowed(zones);
             case "PASTE":
@@ -32089,7 +32109,7 @@ class ClipboardPlugin extends UIPlugin {
         switch (cmd.type) {
             case "COPY":
             case "CUT":
-                const zones = ("target" in cmd && cmd.target) || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 this.state = this.getClipboardState(zones, cmd.type);
                 this.status = "visible";
                 break;
@@ -32707,6 +32727,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         // stores the computed styles in the format of computedStyles.sheetName[col][row] = Style
         this.computedStyles = {};
         this.computedIcons = {};
+        this.uuidGenerator = new UuidGenerator();
         /**
          * Execute the predicate to know if a conditional formatting rule should be applied to a cell
          */
@@ -33058,8 +33079,9 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                         this.adaptRules(origin.sheetId, cf, [xc], toRemoveRange);
                     }
                     else {
-                        this.adaptRules(target.sheetId, cf, [xc], []);
                         this.adaptRules(origin.sheetId, cf, [], toRemoveRange);
+                        const cfToCopyTo = this.getCFToCopyTo(target.sheetId, cf);
+                        this.adaptRules(target.sheetId, cfToCopyTo, [xc], []);
                     }
                 }
             }
@@ -33068,6 +33090,12 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
     isCellValueNumber(value) {
         return typeof value === "number";
     }
+    getCFToCopyTo(targetSheetId, originCF) {
+        const cfInTarget = this.getters
+            .getConditionalFormats(targetSheetId)
+            .find((cf) => cf.stopIfTrue === originCF.stopIfTrue && deepEquals(cf.rule, originCF.rule));
+        return cfInTarget ? cfInTarget : { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+    }
 }
 EvaluationConditionalFormatPlugin.getters = ["getConditionalIcon", "getCellComputedStyle"];
 
@@ -34835,26 +34863,24 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
-        this.dispatch("CUT", {
-            target: [
-                {
-                    left: isCol ? start + deltaCol : 0,
-                    right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? start + deltaRow : 0,
-                    bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
-        this.dispatch("PASTE", {
-            target: [
-                {
-                    left: isCol ? cmd.base : 0,
-                    right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? cmd.base : 0,
-                    bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
+        const target = [
+            {
+                left: isCol ? start + deltaCol : 0,
+                right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? start + deltaRow : 0,
+                bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const pasteTarget = [
+            {
+                left: isCol ? cmd.base : 0,
+                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? cmd.base : 0,
+                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        state.paste(pasteTarget, { selectTarget: true });
         const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = cmd.base;
         for (const element of toRemove) {
@@ -36296,30 +36322,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) {
@@ -36327,30 +36349,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) {
@@ -42874,6 +42892,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, cellTypes, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.0.18';
-__info__.date = '2023-09-12T11:42:03.083Z';
-__info__.hash = '41fd4fa';
+__info__.version = '16.0.20';
+__info__.date = '2023-10-03T12:43:02.601Z';
+__info__.hash = '3be5a75';