@odoo/o-spreadsheet 16.1.7 → 16.1.8

package/dist/o-spreadsheet.cjs.js

@@ -33073,48 +33073,66 @@ class InternalViewport {
             this.adjustPositionY(row);
         }
     }
-    adjustPositionX(col) {
+    adjustPositionX(targetCol) {
         const sheetId = this.sheetId;
-        const { start, end } = this.getters.getColDimensions(sheetId, col);
-        while (end > this.offsetX + this.offsetCorrectionX + this.viewportWidth &&
-            this.offsetX + this.offsetCorrectionX < start) {
-            this.offsetX = this.getters.getColDimensions(sheetId, this.left).end - this.offsetCorrectionX;
-            this.offsetScrollbarX = this.offsetX;
-            this.adjustViewportZoneX();
-        }
-        while (col < this.left) {
-            let leftCol;
-            for (leftCol = this.left; leftCol >= 0; leftCol--) {
-                if (!this.getters.isColHidden(sheetId, leftCol)) {
+        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();
+            }
+        }
+        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();
             }
-            this.offsetX =
-                this.getters.getColDimensions(sheetId, leftCol - 1).start - this.offsetCorrectionX;
-            this.offsetScrollbarX = this.offsetX;
-            this.adjustViewportZoneX();
         }
     }
-    adjustPositionY(row) {
+    adjustPositionY(targetRow) {
         const sheetId = this.sheetId;
-        while (this.getters.getRowDimensions(sheetId, row).end >
-            this.offsetY + this.viewportHeight + this.offsetCorrectionY &&
-            this.offsetY + this.offsetCorrectionY < this.getters.getRowDimensions(sheetId, row).start) {
-            this.offsetY = this.getters.getRowDimensions(sheetId, this.top).end - this.offsetCorrectionY;
-            this.offsetScrollbarY = this.offsetY;
-            this.adjustViewportZoneY();
-        }
-        while (row < this.top) {
-            let topRow;
-            for (topRow = this.top; topRow >= 0; topRow--) {
-                if (!this.getters.isRowHidden(sheetId, topRow)) {
+        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();
+            }
+        }
+        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();
             }
-            this.offsetY =
-                this.getters.getRowDimensions(sheetId, topRow - 1).start - this.offsetCorrectionY;
-            this.offsetScrollbarY = this.offsetY;
-            this.adjustViewportZoneY();
         }
     }
     setViewportOffset(offsetX, offsetY) {
@@ -44024,6 +44042,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.1.7';
-__info__.date = '2023-04-13T08:29:52.140Z';
-__info__.hash = '3141a6d';
+__info__.version = '16.1.8';
+__info__.date = '2023-04-14T12:46:41.355Z';
+__info__.hash = '4399770';

package/dist/o-spreadsheet.d.ts

@@ -3953,8 +3953,8 @@ declare class InternalViewport {
      * until it contains the cell completely.
      */
     adjustPosition(position?: Position$1): void;
-    adjustPositionX(col: HeaderIndex): void;
-    adjustPositionY(row: HeaderIndex): void;
+    adjustPositionX(targetCol: HeaderIndex): void;
+    adjustPositionY(targetRow: HeaderIndex): void;
     setViewportOffset(offsetX: Pixel, offsetY: Pixel): void;
     adjustViewportZone(): void;
     /**

package/dist/o-spreadsheet.esm.js

@@ -33069,48 +33069,66 @@ class InternalViewport {
             this.adjustPositionY(row);
         }
     }
-    adjustPositionX(col) {
+    adjustPositionX(targetCol) {
         const sheetId = this.sheetId;
-        const { start, end } = this.getters.getColDimensions(sheetId, col);
-        while (end > this.offsetX + this.offsetCorrectionX + this.viewportWidth &&
-            this.offsetX + this.offsetCorrectionX < start) {
-            this.offsetX = this.getters.getColDimensions(sheetId, this.left).end - this.offsetCorrectionX;
-            this.offsetScrollbarX = this.offsetX;
-            this.adjustViewportZoneX();
-        }
-        while (col < this.left) {
-            let leftCol;
-            for (leftCol = this.left; leftCol >= 0; leftCol--) {
-                if (!this.getters.isColHidden(sheetId, leftCol)) {
+        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();
+            }
+        }
+        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();
             }
-            this.offsetX =
-                this.getters.getColDimensions(sheetId, leftCol - 1).start - this.offsetCorrectionX;
-            this.offsetScrollbarX = this.offsetX;
-            this.adjustViewportZoneX();
         }
     }
-    adjustPositionY(row) {
+    adjustPositionY(targetRow) {
         const sheetId = this.sheetId;
-        while (this.getters.getRowDimensions(sheetId, row).end >
-            this.offsetY + this.viewportHeight + this.offsetCorrectionY &&
-            this.offsetY + this.offsetCorrectionY < this.getters.getRowDimensions(sheetId, row).start) {
-            this.offsetY = this.getters.getRowDimensions(sheetId, this.top).end - this.offsetCorrectionY;
-            this.offsetScrollbarY = this.offsetY;
-            this.adjustViewportZoneY();
-        }
-        while (row < this.top) {
-            let topRow;
-            for (topRow = this.top; topRow >= 0; topRow--) {
-                if (!this.getters.isRowHidden(sheetId, topRow)) {
+        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();
+            }
+        }
+        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();
             }
-            this.offsetY =
-                this.getters.getRowDimensions(sheetId, topRow - 1).start - this.offsetCorrectionY;
-            this.offsetScrollbarY = this.offsetY;
-            this.adjustViewportZoneY();
         }
     }
     setViewportOffset(offsetX, offsetY) {
@@ -43992,6 +44010,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, links, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.1.7';
-__info__.date = '2023-04-13T08:29:52.140Z';
-__info__.hash = '3141a6d';
+__info__.version = '16.1.8';
+__info__.date = '2023-04-14T12:46:41.355Z';
+__info__.hash = '4399770';

package/dist/o-spreadsheet.iife.js

@@ -33070,48 +33070,66 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               this.adjustPositionY(row);
           }
       }
-      adjustPositionX(col) {
+      adjustPositionX(targetCol) {
           const sheetId = this.sheetId;
-          const { start, end } = this.getters.getColDimensions(sheetId, col);
-          while (end > this.offsetX + this.offsetCorrectionX + this.viewportWidth &&
-              this.offsetX + this.offsetCorrectionX < start) {
-              this.offsetX = this.getters.getColDimensions(sheetId, this.left).end - this.offsetCorrectionX;
-              this.offsetScrollbarX = this.offsetX;
-              this.adjustViewportZoneX();
-          }
-          while (col < this.left) {
-              let leftCol;
-              for (leftCol = this.left; leftCol >= 0; leftCol--) {
-                  if (!this.getters.isColHidden(sheetId, leftCol)) {
+          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();
+              }
+          }
+          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();
               }
-              this.offsetX =
-                  this.getters.getColDimensions(sheetId, leftCol - 1).start - this.offsetCorrectionX;
-              this.offsetScrollbarX = this.offsetX;
-              this.adjustViewportZoneX();
           }
       }
-      adjustPositionY(row) {
+      adjustPositionY(targetRow) {
           const sheetId = this.sheetId;
-          while (this.getters.getRowDimensions(sheetId, row).end >
-              this.offsetY + this.viewportHeight + this.offsetCorrectionY &&
-              this.offsetY + this.offsetCorrectionY < this.getters.getRowDimensions(sheetId, row).start) {
-              this.offsetY = this.getters.getRowDimensions(sheetId, this.top).end - this.offsetCorrectionY;
-              this.offsetScrollbarY = this.offsetY;
-              this.adjustViewportZoneY();
-          }
-          while (row < this.top) {
-              let topRow;
-              for (topRow = this.top; topRow >= 0; topRow--) {
-                  if (!this.getters.isRowHidden(sheetId, topRow)) {
+          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();
+              }
+          }
+          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();
               }
-              this.offsetY =
-                  this.getters.getRowDimensions(sheetId, topRow - 1).start - this.offsetCorrectionY;
-              this.offsetScrollbarY = this.offsetY;
-              this.adjustViewportZoneY();
           }
       }
       setViewportOffset(offsetX, offsetY) {
@@ -44023,9 +44041,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.1.7';
-  __info__.date = '2023-04-13T08:29:52.140Z';
-  __info__.hash = '3141a6d';
+  __info__.version = '16.1.8';
+  __info__.date = '2023-04-14T12:46:41.355Z';
+  __info__.hash = '4399770';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);