@odoo/o-spreadsheet 18.2.6 → 18.2.8

package/dist/o-spreadsheet.iife.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.6
- * @date 2025-04-04T08:41:26.115Z
- * @hash faa00e2
+ * @version 18.2.8
+ * @date 2025-04-18T16:26:20.673Z
+ * @hash 5da9ddc
  */
 
 (function (exports, owl) {
@@ -3574,6 +3574,7 @@
       "CLEAR_FORMATTING",
       "SET_BORDER",
       "SET_ZONE_BORDERS",
+      "SET_BORDERS_ON_TARGET",
       /** CHART */
       "CREATE_CHART",
       "UPDATE_CHART",
@@ -6723,6 +6724,7 @@
   }
 
   class BorderClipboardHandler extends AbstractCellClipboardHandler {
+      queuedBordersToAdd = {};
       copy(data) {
           const sheetId = data.sheetId;
           if (data.zones.length === 0) {
@@ -6753,6 +6755,7 @@
               const { left, top } = zones[0];
               this.pasteZone(sheetId, left, top, content.borders);
           }
+          this.executeQueuedChanges(sheetId);
       }
       pasteZone(sheetId, col, row, borders) {
           for (const [r, rowBorders] of borders.entries()) {
@@ -6771,7 +6774,20 @@
               ...targetBorders,
               ...originBorders,
           };
-          this.dispatch("SET_BORDER", { ...target, border });
+          const borderKey = JSON.stringify(border);
+          if (!this.queuedBordersToAdd[borderKey]) {
+              this.queuedBordersToAdd[borderKey] = [];
+          }
+          this.queuedBordersToAdd[borderKey].push(positionToZone(target));
+      }
+      executeQueuedChanges(pasteSheetTarget) {
+          for (const borderKey in this.queuedBordersToAdd) {
+              const zones = this.queuedBordersToAdd[borderKey];
+              const border = JSON.parse(borderKey);
+              const target = recomputeZones(zones, []);
+              this.dispatch("SET_BORDERS_ON_TARGET", { sheetId: pasteSheetTarget, target, border });
+          }
+          this.queuedBordersToAdd = {};
       }
   }
 
@@ -6883,6 +6899,12 @@
       }
       return null;
   }
+  /**
+    - \p{L} is for any letter (from any language)
+    - \p{N} is for any number
+    - the u flag at the end is for unicode, which enables the `\p{...}` syntax
+   */
+  const unicodeSymbolCharRegexp = /\p{L}|\p{N}|_|\.|!|\$/u;
   const SYMBOL_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.!$");
   /**
    * A "Symbol" is just basically any word-like element that can appear in a
@@ -6923,7 +6945,8 @@
               };
           }
       }
-      while (chars.current && SYMBOL_CHARS.has(chars.current)) {
+      while (chars.current &&
+          (SYMBOL_CHARS.has(chars.current) || chars.current.match(unicodeSymbolCharRegexp))) {
           result += chars.shift();
       }
       if (result.length) {
@@ -8711,12 +8734,13 @@
       }
       pasteCf(origin, target, isCutOperation) {
           if (origin?.rules && origin.rules.length > 0) {
+              const originZone = positionToZone(origin.position);
               const zone = positionToZone(target);
               for (const rule of origin.rules) {
                   const toRemoveZones = [];
                   if (isCutOperation) {
                       //remove from current rule
-                      toRemoveZones.push(positionToZone(origin.position));
+                      toRemoveZones.push(originZone);
                   }
                   if (origin.position.sheetId === target.sheetId) {
                       this.adaptCFRules(origin.position.sheetId, rule, [zone], toRemoveZones);
@@ -8830,6 +8854,7 @@
       pasteDataValidation(origin, target, isCutOperation) {
           if (origin) {
               const zone = positionToZone(target);
+              const originZone = positionToZone(origin.position);
               const rule = origin.rule;
               if (!rule) {
                   const targetRule = this.getters.getValidationRuleForCell(target);
@@ -8841,7 +8866,7 @@
               }
               const toRemoveZone = [];
               if (isCutOperation) {
-                  toRemoveZone.push(positionToZone(origin.position));
+                  toRemoveZone.push(originZone);
               }
               if (origin.position.sheetId === target.sheetId) {
                   const copyToRule = this.getDataValidationRuleToCopyTo(target.sheetId, rule, false);
@@ -8901,7 +8926,7 @@
                       continue;
                   }
                   this.dispatch("ADD_DATA_VALIDATION_RULE", {
-                      rule: dv,
+                      rule: { id: dv.id, criterion: dv.criterion, isBlocking: dv.isBlocking },
                       ranges: newDvZones.map((zone) => this.getters.getRangeDataFromZone(sheetId, zone)),
                       sheetId,
                   });
@@ -9228,7 +9253,7 @@
       if (executed.type === "ADD_COLUMNS_ROWS") {
           return expandZoneOnInsertion(zone, executed.dimension === "COL" ? "left" : "top", executed.base, executed.position, executed.quantity);
       }
-      return { ...zone };
+      return zone;
   }
   function transformRangeData(range, executed) {
       const deletedSheet = executed.type === "DELETE_SHEET" && executed.sheetId;
@@ -33619,6 +33644,12 @@ stores.inject(MyMetaStore, storeInstance);
   function isCtrlKey(ev) {
       return isMacOS() ? ev.metaKey : ev.ctrlKey;
   }
+  /**
+   * Detects if the current browser is Firefox
+   */
+  function isBrowserFirefox() {
+      return /Firefox/i.test(navigator.userAgent);
+  }
 
   /**
    * Repeatedly calls a callback function with a time delay between calls.
@@ -50414,39 +50445,6 @@ stores.inject(MyMetaStore, storeInstance);
       }
       return hoveredPosition;
   }
-  function useTouchMove(gridRef, handler, canMoveUp) {
-      let x = null;
-      let y = null;
-      function onTouchStart(ev) {
-          if (ev.touches.length !== 1)
-              return;
-          x = ev.touches[0].clientX;
-          y = ev.touches[0].clientY;
-      }
-      function onTouchEnd() {
-          x = null;
-          y = null;
-      }
-      function onTouchMove(ev) {
-          if (ev.touches.length !== 1)
-              return;
-          // On mobile browsers, swiping down is often associated with "pull to refresh".
-          // We only want this behavior if the grid is already at the top.
-          // Otherwise we only want to move the canvas up, without triggering any refresh.
-          if (canMoveUp()) {
-              ev.preventDefault();
-              ev.stopPropagation();
-          }
-          const currentX = ev.touches[0].clientX;
-          const currentY = ev.touches[0].clientY;
-          handler(x - currentX, y - currentY);
-          x = currentX;
-          y = currentY;
-      }
-      useRefListener(gridRef, "touchstart", onTouchStart);
-      useRefListener(gridRef, "touchend", onTouchEnd);
-      useRefListener(gridRef, "touchmove", onTouchMove);
-  }
   class GridOverlay extends owl.Component {
       static template = "o-spreadsheet-GridOverlay";
       static props = {
@@ -50494,10 +50492,6 @@ stores.inject(MyMetaStore, storeInstance);
           owl.onWillUnmount(() => {
               resizeObserver.disconnect();
           });
-          useTouchMove(this.gridOverlay, this.props.onGridMoved, () => {
-              const { scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
-              return scrollY > 0;
-          });
           this.cellPopovers = useStore(CellPopoverStore);
           this.paintFormatStore = useStore(PaintFormatStore);
       }
@@ -51969,6 +51963,73 @@ stores.inject(MyMetaStore, storeInstance);
       }
   }
 
+  const friction = 0.95;
+  const verticalScrollFactor = 1;
+  const horizontalScrollFactor = 1;
+  function useTouchScroll(ref, updateScroll, canMoveUp) {
+      let lastX = 0;
+      let lastY = 0;
+      let velocityX = 0;
+      let velocityY = 0;
+      let isMouseDown = false;
+      let lastTime = 0;
+      useRefListener(ref, "touchstart", onTouchStart, { capture: false });
+      useRefListener(ref, "touchmove", onTouchMove, { capture: false });
+      useRefListener(ref, "touchend", onTouchEnd, { capture: false });
+      function onTouchStart(event) {
+          isMouseDown = true;
+          ({ clientX: lastX, clientY: lastY } = event.touches[0]);
+          velocityX = 0;
+          velocityY = 0;
+      }
+      function onTouchMove(event) {
+          if (!isMouseDown)
+              return;
+          const currentTime = Date.now();
+          const { clientX, clientY } = event.touches[0];
+          let deltaX = lastX - clientX;
+          let deltaY = lastY - clientY;
+          const elapsedTime = currentTime - lastTime;
+          velocityX = deltaX / elapsedTime;
+          velocityY = deltaY / elapsedTime;
+          lastX = clientX;
+          lastY = clientY;
+          lastTime = currentTime;
+          if (canMoveUp()) {
+              if (event.cancelable) {
+                  event.preventDefault();
+              }
+              event.stopPropagation();
+          }
+          updateScroll(deltaX * horizontalScrollFactor, deltaY * verticalScrollFactor);
+      }
+      function onTouchEnd(ev) {
+          isMouseDown = false;
+          lastX = lastY = 0;
+          requestAnimationFrame(scroll);
+      }
+      function scroll() {
+          if (Math.abs(velocityX) < 0.05) {
+              velocityX = 0;
+          }
+          if (Math.abs(velocityY) < 0.05) {
+              velocityY = 0;
+          }
+          if (!velocityX && !velocityY) {
+              return;
+          }
+          const currentTime = Date.now();
+          const elapsedTime = Math.abs(currentTime - lastTime);
+          const deltaX = velocityX * elapsedTime;
+          const deltaY = velocityY * elapsedTime;
+          updateScroll(deltaX * horizontalScrollFactor, deltaY * verticalScrollFactor);
+          lastTime = currentTime;
+          velocityX *= friction;
+          velocityY *= friction;
+          requestAnimationFrame(scroll);
+      }
+  }
+
   function useWheelHandler(handler) {
       function normalize(val, deltaMode) {
           return val * (deltaMode === 0 ? 1 : DEFAULT_CELL_HEIGHT);
@@ -52309,7 +52370,7 @@ stores.inject(MyMetaStore, storeInstance);
               left: `${this.props.leftOffset + x}px`,
               bottom: "0px",
               height: `${SCROLLBAR_WIDTH}px`,
-              right: `0px`,
+              right: isBrowserFirefox() ? `${SCROLLBAR_WIDTH}px` : "0",
           };
       }
       onScroll(offset) {
@@ -52354,7 +52415,7 @@ stores.inject(MyMetaStore, storeInstance);
               top: `${this.props.topOffset + y}px`,
               right: "0px",
               width: `${SCROLLBAR_WIDTH}px`,
-              bottom: `0px`,
+              bottom: isBrowserFirefox() ? `${SCROLLBAR_WIDTH}px` : "0",
           };
       }
       onScroll(offset) {
@@ -52590,6 +52651,10 @@ stores.inject(MyMetaStore, storeInstance);
                   this.DOMFocusableElementStore.focusableElement?.focus();
               }
           }, () => [this.sidePanel.isOpen]);
+          useTouchScroll(this.gridRef, this.moveCanvas.bind(this), () => {
+              const { scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
+              return scrollY > 0;
+          });
       }
       onCellHovered({ col, row }) {
           this.hoveredCell.hover({ col, row });
@@ -53312,6 +53377,15 @@ stores.inject(MyMetaStore, storeInstance);
               case "SET_BORDER":
                   this.setBorder(cmd.sheetId, cmd.col, cmd.row, cmd.border);
                   break;
+              case "SET_BORDERS_ON_TARGET":
+                  for (const zone of cmd.target) {
+                      for (let row = zone.top; row <= zone.bottom; row++) {
+                          for (let col = zone.left; col <= zone.right; col++) {
+                              this.setBorder(cmd.sheetId, col, row, cmd.border);
+                          }
+                      }
+                  }
+                  break;
               case "SET_ZONE_BORDERS":
                   if (cmd.border) {
                       const target = cmd.target.map((zone) => this.getters.expandZone(cmd.sheetId, zone));
@@ -63074,25 +63148,6 @@ stores.inject(MyMetaStore, storeInstance);
               case "AUTOFILL_AUTO":
                   this.autofillAuto();
                   break;
-              case "AUTOFILL_CELL":
-                  this.autoFillMerge(cmd.originCol, cmd.originRow, cmd.col, cmd.row);
-                  const sheetId = this.getters.getActiveSheetId();
-                  this.dispatch("UPDATE_CELL", {
-                      sheetId,
-                      col: cmd.col,
-                      row: cmd.row,
-                      style: cmd.style || null,
-                      content: cmd.content || "",
-                      format: cmd.format || "",
-                  });
-                  this.dispatch("SET_BORDER", {
-                      sheetId,
-                      col: cmd.col,
-                      row: cmd.row,
-                      border: cmd.border,
-                  });
-                  this.autofillCF(cmd.originCol, cmd.originRow, cmd.col, cmd.row);
-                  this.autofillDV(cmd.originCol, cmd.originRow, cmd.col, cmd.row);
           }
       }
       // ---------------------------------------------------------------------------
@@ -63116,6 +63171,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           const source = this.getters.getSelectedZone();
           const target = this.autofillZone;
+          const autofillCellsData = [];
           switch (this.direction) {
               case "down" /* DIRECTION.DOWN */:
                   for (let col = source.left; col <= source.right; col++) {
@@ -63125,7 +63181,7 @@ stores.inject(MyMetaStore, storeInstance);
                       }
                       const generator = this.createGenerator(xcs);
                       for (let row = target.top; row <= target.bottom; row++) {
-                          this.computeNewCell(generator, col, row, apply);
+                          autofillCellsData.push(this.computeNewCell(generator, col, row));
                       }
                   }
                   break;
@@ -63137,7 +63193,7 @@ stores.inject(MyMetaStore, storeInstance);
                       }
                       const generator = this.createGenerator(xcs);
                       for (let row = target.bottom; row >= target.top; row--) {
-                          this.computeNewCell(generator, col, row, apply);
+                          autofillCellsData.push(this.computeNewCell(generator, col, row));
                       }
                   }
                   break;
@@ -63149,7 +63205,7 @@ stores.inject(MyMetaStore, storeInstance);
                       }
                       const generator = this.createGenerator(xcs);
                       for (let col = target.right; col >= target.left; col--) {
-                          this.computeNewCell(generator, col, row, apply);
+                          autofillCellsData.push(this.computeNewCell(generator, col, row));
                       }
                   }
                   break;
@@ -63161,12 +63217,26 @@ stores.inject(MyMetaStore, storeInstance);
                       }
                       const generator = this.createGenerator(xcs);
                       for (let col = target.left; col <= target.right; col++) {
-                          this.computeNewCell(generator, col, row, apply);
+                          autofillCellsData.push(this.computeNewCell(generator, col, row));
                       }
                   }
                   break;
           }
           if (apply) {
+              const bordersZones = {};
+              const cfNewRanges = {};
+              const dvNewZones = {};
+              const sheetId = this.getters.getActiveSheetId();
+              for (const data of autofillCellsData) {
+                  this.collectBordersData(data, bordersZones);
+                  this.autofillMerge(sheetId, data);
+                  this.autofillCell(sheetId, data);
+                  this.collectConditionalFormatsData(sheetId, data, cfNewRanges);
+                  this.collectDataValidationsData(sheetId, data, dvNewZones);
+              }
+              this.autofillBorders(sheetId, bordersZones);
+              this.autofillConditionalFormats(sheetId, cfNewRanges);
+              this.autofillDataValidations(sheetId, dvNewZones);
               this.autofillZone = undefined;
               this.selection.resizeAnchorZone(this.direction, this.steps);
               this.lastCellSelected = {};
@@ -63175,6 +63245,95 @@ stores.inject(MyMetaStore, storeInstance);
               this.tooltip = undefined;
           }
       }
+      collectBordersData(data, bordersPositions) {
+          const key = JSON.stringify(data.border);
+          if (!(key in bordersPositions)) {
+              bordersPositions[key] = [];
+          }
+          bordersPositions[key].push(positionToZone({ col: data.col, row: data.row }));
+      }
+      collectConditionalFormatsData(sheetId, data, cfNewRanges) {
+          const { originCol, originRow, col, row } = data;
+          const cfsAtOrigin = this.getters.getRulesByCell(sheetId, originCol, originRow);
+          const xc = toXC(col, row);
+          for (const cf of cfsAtOrigin) {
+              if (!(cf.id in cfNewRanges)) {
+                  cfNewRanges[cf.id] = [];
+              }
+              cfNewRanges[cf.id].push(xc);
+          }
+      }
+      collectDataValidationsData(sheetId, data, dvNewZones) {
+          const { originCol, originRow, col, row } = data;
+          const cellPosition = { sheetId, col: originCol, row: originRow };
+          const dvsAtOrigin = this.getters.getValidationRuleForCell(cellPosition);
+          if (!dvsAtOrigin) {
+              return;
+          }
+          if (!(dvsAtOrigin.id in dvNewZones)) {
+              dvNewZones[dvsAtOrigin.id] = [];
+          }
+          dvNewZones[dvsAtOrigin.id].push(positionToZone({ col, row }));
+      }
+      autofillCell(sheetId, data) {
+          this.dispatch("UPDATE_CELL", {
+              sheetId,
+              col: data.col,
+              row: data.row,
+              content: data.content || "",
+              style: data.style || null,
+              format: data.format || "",
+          });
+          // Still usefull in odoo ATM to autofill field sync
+          this.dispatch("AUTOFILL_CELL", data);
+      }
+      autofillBorders(sheetId, bordersPositions) {
+          for (const stringifiedBorder in bordersPositions) {
+              const border = stringifiedBorder === "undefined" ? undefined : JSON.parse(stringifiedBorder);
+              this.dispatch("SET_BORDERS_ON_TARGET", {
+                  sheetId,
+                  border,
+                  target: recomputeZones(bordersPositions[stringifiedBorder]),
+              });
+          }
+      }
+      autofillConditionalFormats(sheetId, cfNewRanges) {
+          for (const cfId in cfNewRanges) {
+              const changes = cfNewRanges[cfId];
+              const cf = this.getters.getConditionalFormats(sheetId).find((cf) => cf.id === cfId);
+              if (!cf) {
+                  continue;
+              }
+              const newCfRanges = this.getters.getAdaptedCfRanges(sheetId, cf, changes.map(toZone), []);
+              if (newCfRanges) {
+                  this.dispatch("ADD_CONDITIONAL_FORMAT", {
+                      cf: {
+                          id: cf.id,
+                          rule: cf.rule,
+                          stopIfTrue: cf.stopIfTrue,
+                      },
+                      ranges: newCfRanges,
+                      sheetId,
+                  });
+              }
+          }
+      }
+      autofillDataValidations(sheetId, dvNewZones) {
+          for (const dvId in dvNewZones) {
+              const changes = dvNewZones[dvId];
+              const dvOrigin = this.getters.getDataValidationRule(sheetId, dvId);
+              if (!dvOrigin) {
+                  continue;
+              }
+              const dvRangesXcs = dvOrigin.ranges.map((range) => range.zone);
+              const newDvRanges = recomputeZones(dvRangesXcs.concat(changes), []);
+              this.dispatch("ADD_DATA_VALIDATION_RULE", {
+                  rule: dvOrigin,
+                  ranges: newDvRanges.map((zone) => this.getters.getRangeDataFromZone(sheetId, zone)),
+                  sheetId,
+              });
+          }
+      }
       /**
        * Select a cell which becomes the last cell of the autofillZone
        */
@@ -63253,22 +63412,20 @@ stores.inject(MyMetaStore, storeInstance);
       /**
        * Generate the next cell
        */
-      computeNewCell(generator, col, row, apply) {
+      computeNewCell(generator, col, row) {
           const { cellData, tooltip, origin } = generator.next();
           const { content, style, border, format } = cellData;
           this.tooltip = tooltip;
-          if (apply) {
-              this.dispatch("AUTOFILL_CELL", {
-                  originCol: origin.col,
-                  originRow: origin.row,
-                  col,
-                  row,
-                  content,
-                  style,
-                  border,
-                  format,
-              });
-          }
+          return {
+              originCol: origin.col,
+              originRow: origin.row,
+              col,
+              row,
+              content,
+              style,
+              border,
+              format,
+          };
       }
       /**
        * Get the rule associated to the current cell
@@ -63336,8 +63493,8 @@ stores.inject(MyMetaStore, storeInstance);
               ? position[first].value
               : position[second].value;
       }
-      autoFillMerge(originCol, originRow, col, row) {
-          const sheetId = this.getters.getActiveSheetId();
+      autofillMerge(sheetId, data) {
+          const { originCol, originRow, col, row } = data;
           const position = { sheetId, col, row };
           const originPosition = { sheetId, col: originCol, row: originRow };
           if (this.getters.isInMerge(position) && !this.getters.isInMerge(originPosition)) {
@@ -63364,35 +63521,6 @@ stores.inject(MyMetaStore, storeInstance);
               });
           }
       }
-      autofillCF(originCol, originRow, col, row) {
-          const sheetId = this.getters.getActiveSheetId();
-          const cfOrigin = this.getters.getRulesByCell(sheetId, originCol, originRow);
-          for (const cf of cfOrigin) {
-              const newCfRanges = this.getters.getAdaptedCfRanges(sheetId, cf, [positionToZone({ col, row })], []);
-              if (newCfRanges) {
-                  this.dispatch("ADD_CONDITIONAL_FORMAT", {
-                      cf: deepCopy(cf),
-                      ranges: newCfRanges,
-                      sheetId,
-                  });
-              }
-          }
-      }
-      autofillDV(originCol, originRow, col, row) {
-          const sheetId = this.getters.getActiveSheetId();
-          const cellPosition = { sheetId, col: originCol, row: originRow };
-          const dvOrigin = this.getters.getValidationRuleForCell(cellPosition);
-          if (!dvOrigin) {
-              return;
-          }
-          const dvRangesZones = dvOrigin.ranges.map((range) => range.zone);
-          const newDvRanges = recomputeZones(dvRangesZones.concat(positionToZone({ col, row })), []);
-          this.dispatch("ADD_DATA_VALIDATION_RULE", {
-              rule: dvOrigin,
-              ranges: newDvRanges.map((zone) => this.getters.getRangeDataFromZone(sheetId, zone)),
-              sheetId,
-          });
-      }
       // ---------------------------------------------------------------------------
       // Grid rendering
       // ---------------------------------------------------------------------------
@@ -63772,10 +63900,8 @@ stores.inject(MyMetaStore, storeInstance);
       }
       const target = [];
       for (const zone1 of toTransform.target) {
-          for (const zone2 of executed.target) {
-              if (!overlap(zone1, zone2)) {
-                  target.push({ ...zone1 });
-              }
+          if (executed.target.every((zone2) => !overlap(zone1, zone2))) {
+              target.push(zone1);
           }
       }
       if (target.length) {
@@ -67907,24 +68033,14 @@ stores.inject(MyMetaStore, storeInstance);
               first: this.boundaries.top,
               last: this.boundaries.bottom,
           });
-          const { end: lastColEnd, size: lastColSize } = this.getters.getColDimensions(this.sheetId, lastCol);
-          const { end: lastRowEnd, size: lastRowSize } = this.getters.getRowDimensions(this.sheetId, lastRow);
-          const leftColIndex = this.searchHeaderIndex("COL", lastColEnd - this.viewportWidth, 0);
-          const leftColSize = this.getters.getColSize(this.sheetId, leftColIndex);
-          const leftRowIndex = this.searchHeaderIndex("ROW", lastRowEnd - this.viewportHeight, 0);
-          const topRowSize = this.getters.getRowSize(this.sheetId, leftRowIndex);
+          const { end: lastColEnd } = this.getters.getColDimensions(this.sheetId, lastCol);
+          const { end: lastRowEnd } = this.getters.getRowDimensions(this.sheetId, lastRow);
           let width = lastColEnd - this.offsetCorrectionX;
           if (this.canScrollHorizontally) {
-              width += Math.max(DEFAULT_CELL_WIDTH, // leave some minimal space to let the user know they scrolled all the way
-              Math.min(leftColSize, this.viewportWidth - lastColSize) // Add pixels that allows the snapping at maximum horizontal scroll
-              );
               width = Math.max(width, this.viewportWidth); // if the viewport grid size is smaller than its client width, return client width
           }
           let height = lastRowEnd - this.offsetCorrectionY;
           if (this.canScrollVertically) {
-              height += Math.max(DEFAULT_CELL_HEIGHT + 5, // leave some space to let the user know they scrolled all the way
-              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;
@@ -68489,8 +68605,8 @@ stores.inject(MyMetaStore, storeInstance);
           const { width, height } = this.getMainViewportRect();
           const viewport = this.getMainInternalViewport(sheetId);
           return {
-              maxOffsetX: Math.max(0, width - viewport.viewportWidth + 1),
-              maxOffsetY: Math.max(0, height - viewport.viewportHeight + 1),
+              maxOffsetX: Math.max(0, width - viewport.viewportWidth),
+              maxOffsetY: Math.max(0, height - viewport.viewportHeight),
           };
       }
       getColRowOffsetInViewport(dimension, referenceHeaderIndex, targetHeaderIndex) {
@@ -70012,6 +70128,10 @@ stores.inject(MyMetaStore, storeInstance);
               this.hoveredCell.clear();
           });
           this.cellPopovers = useStore(CellPopoverStore);
+          useTouchScroll(gridRef, this.moveCanvas.bind(this), () => {
+              const { scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
+              return scrollY > 0;
+          });
       }
       onCellHovered({ col, row }) {
           this.hoveredCell.hover({ col, row });
@@ -71402,6 +71522,7 @@ stores.inject(MyMetaStore, storeInstance);
     > canvas {
       box-sizing: content-box;
       border-bottom: 1px solid #e2e3e3;
+      border-right: 1px solid #e2e3e3;
     }
 
     .o-grid-overlay {
@@ -76108,9 +76229,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.2.6";
-  __info__.date = "2025-04-04T08:41:26.115Z";
-  __info__.hash = "faa00e2";
+  __info__.version = "18.2.8";
+  __info__.date = "2025-04-18T16:26:20.673Z";
+  __info__.hash = "5da9ddc";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);