@odoo/o-spreadsheet 18.2.6 → 18.2.8

package/dist/o-spreadsheet.esm.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
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -3573,6 +3573,7 @@ const coreTypes = new Set([
     "CLEAR_FORMATTING",
     "SET_BORDER",
     "SET_ZONE_BORDERS",
+    "SET_BORDERS_ON_TARGET",
     /** CHART */
     "CREATE_CHART",
     "UPDATE_CHART",
@@ -6722,6 +6723,7 @@ class AbstractCellClipboardHandler extends ClipboardHandler {
 }
 
 class BorderClipboardHandler extends AbstractCellClipboardHandler {
+    queuedBordersToAdd = {};
     copy(data) {
         const sheetId = data.sheetId;
         if (data.zones.length === 0) {
@@ -6752,6 +6754,7 @@ class BorderClipboardHandler extends AbstractCellClipboardHandler {
             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()) {
@@ -6770,7 +6773,20 @@ class BorderClipboardHandler extends AbstractCellClipboardHandler {
             ...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 = {};
     }
 }
 
@@ -6882,6 +6898,12 @@ function tokenizeString(chars) {
     }
     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
@@ -6922,7 +6944,8 @@ function tokenizeSymbol(chars) {
             };
         }
     }
-    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) {
@@ -8710,12 +8733,13 @@ class ConditionalFormatClipboardHandler extends AbstractCellClipboardHandler {
     }
     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);
@@ -8829,6 +8853,7 @@ class DataValidationClipboardHandler extends AbstractCellClipboardHandler {
     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);
@@ -8840,7 +8865,7 @@ class DataValidationClipboardHandler extends AbstractCellClipboardHandler {
             }
             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);
@@ -8900,7 +8925,7 @@ class DataValidationClipboardHandler extends AbstractCellClipboardHandler {
                     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,
                 });
@@ -9227,7 +9252,7 @@ function transformZone(zone, executed) {
     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;
@@ -33618,6 +33643,12 @@ function isMacOS() {
 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.
@@ -50413,39 +50444,6 @@ function useCellHovered(env, gridRef, callback) {
     }
     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 Component {
     static template = "o-spreadsheet-GridOverlay";
     static props = {
@@ -50493,10 +50491,6 @@ class GridOverlay extends Component {
         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);
     }
@@ -51968,6 +51962,73 @@ function useGridDrawing(refName, model, canvasSize) {
     }
 }
 
+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);
@@ -52308,7 +52369,7 @@ class HorizontalScrollBar extends Component {
             left: `${this.props.leftOffset + x}px`,
             bottom: "0px",
             height: `${SCROLLBAR_WIDTH}px`,
-            right: `0px`,
+            right: isBrowserFirefox() ? `${SCROLLBAR_WIDTH}px` : "0",
         };
     }
     onScroll(offset) {
@@ -52353,7 +52414,7 @@ class VerticalScrollBar extends Component {
             top: `${this.props.topOffset + y}px`,
             right: "0px",
             width: `${SCROLLBAR_WIDTH}px`,
-            bottom: `0px`,
+            bottom: isBrowserFirefox() ? `${SCROLLBAR_WIDTH}px` : "0",
         };
     }
     onScroll(offset) {
@@ -52589,6 +52650,10 @@ class Grid extends Component {
                 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 });
@@ -53311,6 +53376,15 @@ class BordersPlugin extends CorePlugin {
             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));
@@ -63073,25 +63147,6 @@ class AutofillPlugin extends UIPlugin {
             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);
         }
     }
     // ---------------------------------------------------------------------------
@@ -63115,6 +63170,7 @@ class AutofillPlugin extends UIPlugin {
         }
         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++) {
@@ -63124,7 +63180,7 @@ class AutofillPlugin extends UIPlugin {
                     }
                     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;
@@ -63136,7 +63192,7 @@ class AutofillPlugin extends UIPlugin {
                     }
                     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;
@@ -63148,7 +63204,7 @@ class AutofillPlugin extends UIPlugin {
                     }
                     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;
@@ -63160,12 +63216,26 @@ class AutofillPlugin extends UIPlugin {
                     }
                     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 = {};
@@ -63174,6 +63244,95 @@ class AutofillPlugin extends UIPlugin {
             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
      */
@@ -63252,22 +63411,20 @@ class AutofillPlugin extends UIPlugin {
     /**
      * 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
@@ -63335,8 +63492,8 @@ class AutofillPlugin extends UIPlugin {
             ? 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)) {
@@ -63363,35 +63520,6 @@ class AutofillPlugin extends UIPlugin {
             });
         }
     }
-    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
     // ---------------------------------------------------------------------------
@@ -63771,10 +63899,8 @@ function mergeTransformation(toTransform, executed) {
     }
     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) {
@@ -67906,24 +68032,14 @@ class InternalViewport {
             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;
@@ -68488,8 +68604,8 @@ class SheetViewPlugin extends UIPlugin {
         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) {
@@ -70011,6 +70127,10 @@ class SpreadsheetDashboard extends Component {
             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 });
@@ -71401,6 +71521,7 @@ css /* scss */ `
     > canvas {
       box-sizing: content-box;
       border-bottom: 1px solid #e2e3e3;
+      border-right: 1px solid #e2e3e3;
     }
 
     .o-grid-overlay {
@@ -76062,6 +76183,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, 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";