@odoo/o-spreadsheet 17.2.31 → 17.2.33

package/dist/o-spreadsheet.cjs.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.31
- * @date 2025-01-14T11:31:09.035Z
- * @hash 306dbf7
+ * @version 17.2.33
+ * @date 2025-01-27T10:02:54.985Z
+ * @hash 6ea43fb
  */
 
 'use strict';
@@ -2807,15 +2807,18 @@ function dichotomicSearch(data, target, mode, sortOrder, rangeLength, getValueIn
     let currentIndex;
     let currentVal;
     let currentType;
+    const getValue = sortOrder === "desc"
+        ? (i) => normalizeValue(getValueInData(data, rangeLength - i - 1))
+        : (i) => normalizeValue(getValueInData(data, i));
     while (indexRight - indexLeft >= 0) {
         indexMedian = Math.floor((indexLeft + indexRight) / 2);
         currentIndex = indexMedian;
-        currentVal = normalizeValue(getValueInData(data, currentIndex));
+        currentVal = getValue(currentIndex);
         currentType = typeof currentVal;
         // 1 - linear search to find value with the same type
         while (indexLeft < currentIndex && targetType !== currentType) {
             currentIndex--;
-            currentVal = normalizeValue(getValueInData(data, currentIndex));
+            currentVal = getValue(currentIndex);
             currentType = typeof currentVal;
         }
         if (currentType !== targetType || currentVal === undefined || currentVal === null) {
@@ -2831,8 +2834,7 @@ function dichotomicSearch(data, target, mode, sortOrder, rangeLength, getValueIn
             if (matchVal === undefined ||
                 matchVal === null ||
                 matchVal < currentVal ||
-                (matchVal === currentVal && sortOrder === "asc" && matchValIndex < currentIndex) ||
-                (matchVal === currentVal && sortOrder === "desc" && matchValIndex > currentIndex)) {
+                (matchVal === currentVal && matchValIndex < currentIndex)) {
                 matchVal = currentVal;
                 matchValIndex = currentIndex;
             }
@@ -2840,15 +2842,13 @@ function dichotomicSearch(data, target, mode, sortOrder, rangeLength, getValueIn
         else if (mode === "nextGreater" && currentVal >= _target) {
             if (matchVal === undefined ||
                 matchVal > currentVal ||
-                (matchVal === currentVal && sortOrder === "asc" && matchValIndex < currentIndex) ||
-                (matchVal === currentVal && sortOrder === "desc" && matchValIndex > currentIndex)) {
+                (matchVal === currentVal && matchValIndex < currentIndex)) {
                 matchVal = currentVal;
                 matchValIndex = currentIndex;
             }
         }
         // 3 - give new indexes for the Binary search
-        if ((sortOrder === "asc" && currentVal > _target) ||
-            (sortOrder === "desc" && currentVal <= _target)) {
+        if (currentVal > _target || (mode === "strict" && currentVal === _target)) {
             indexRight = currentIndex - 1;
         }
         else {
@@ -2856,7 +2856,10 @@ function dichotomicSearch(data, target, mode, sortOrder, rangeLength, getValueIn
         }
     }
     // note that valMinIndex could be 0
-    return matchValIndex !== undefined ? matchValIndex : -1;
+    if (matchValIndex === undefined) {
+        return -1;
+    }
+    return sortOrder === "desc" ? rangeLength - matchValIndex - 1 : matchValIndex;
 }
 /**
  * Perform a linear search and return the index of the match.
@@ -21877,6 +21880,10 @@ class Popover extends owl.Component {
             this.currentDisplayValue = newDisplay;
             if (!anchor)
                 return;
+            el.style.top = "";
+            el.style.left = "";
+            el.style["max-height"] = "";
+            el.style["max-width"] = "";
             const propsMaxSize = { width: this.props.maxWidth, height: this.props.maxHeight };
             let elDims = {
                 width: el.getBoundingClientRect().width,
@@ -32943,7 +32950,7 @@ class GridComposer extends owl.Component {
             return;
         }
         const sheetId = this.env.model.getters.getActiveSheetId();
-        const zone = this.env.model.getters.getSelectedZone();
+        const zone = positionToZone(this.env.model.getters.getSelection().anchor.cell);
         const rect = this.env.model.getters.getVisibleRect(zone);
         if (!deepEquals(rect, this.rect) || sheetId !== this.composerStore.currentEditedCell.sheetId) {
             this.isCellReferenceVisible = true;
@@ -34689,13 +34696,23 @@ class GridRenderer {
     drawLayer(renderingContext, layer) {
         switch (layer) {
             case "Background":
-                const boxes = this.getGridBoxes();
-                this.drawBackground(renderingContext, boxes);
-                this.drawOverflowingCellBackground(renderingContext, boxes);
-                this.drawCellBackground(renderingContext, boxes);
-                this.drawBorders(renderingContext, boxes);
-                this.drawTexts(renderingContext, boxes);
-                this.drawIcon(renderingContext, boxes);
+                this.drawGlobalBackground(renderingContext);
+                for (const zone of this.getters.getAllActiveViewportsZones()) {
+                    const { ctx } = renderingContext;
+                    ctx.save();
+                    ctx.beginPath();
+                    const rect = this.getters.getVisibleRect(zone);
+                    ctx.rect(rect.x, rect.y, rect.width, rect.height);
+                    ctx.clip();
+                    const boxes = this.getGridBoxes(zone);
+                    this.drawBackground(renderingContext, boxes);
+                    this.drawOverflowingCellBackground(renderingContext, boxes);
+                    this.drawCellBackground(renderingContext, boxes);
+                    this.drawBorders(renderingContext, boxes);
+                    this.drawTexts(renderingContext, boxes);
+                    this.drawIcon(renderingContext, boxes);
+                    ctx.restore();
+                }
                 this.drawFrozenPanes(renderingContext);
                 break;
             case "Headers":
@@ -34706,12 +34723,15 @@ class GridRenderer {
                 break;
         }
     }
-    drawBackground(renderingContext, boxes) {
-        const { ctx, thinLineWidth } = renderingContext;
+    drawGlobalBackground(renderingContext) {
+        const { ctx } = renderingContext;
         const { width, height } = this.getters.getSheetViewDimensionWithHeaders();
         // white background
         ctx.fillStyle = "#ffffff";
         ctx.fillRect(0, 0, width + CANVAS_SHIFT, height + CANVAS_SHIFT);
+    }
+    drawBackground(renderingContext, boxes) {
+        const { ctx, thinLineWidth } = renderingContext;
         const areGridLinesVisible = !this.getters.isDashboard() &&
             this.getters.getGridLinesVisibility(this.getters.getActiveSheetId());
         const inset = areGridLinesVisible ? 0.1 * thinLineWidth : 0;
@@ -35136,7 +35156,7 @@ class GridRenderer {
         const position = { sheetId, col, row };
         const cell = this.getters.getEvaluatedCell(position);
         const showFormula = this.getters.shouldShowFormulas();
-        const { x, y, width, height } = this.getters.getVisibleRect(zone);
+        const { x, y, width, height } = this.getters.getRect(zone);
         const { verticalAlign } = this.getters.getCellStyle(position);
         const box = {
             x,
@@ -35251,12 +35271,16 @@ class GridRenderer {
         }
         return box;
     }
-    getGridBoxes() {
+    getGridBoxes(zone) {
         const boxes = [];
-        const visibleCols = this.getters.getSheetViewVisibleCols();
+        const visibleCols = this.getters
+            .getSheetViewVisibleCols()
+            .filter((col) => col >= zone.left && col <= zone.right);
         const left = visibleCols[0];
         const right = visibleCols[visibleCols.length - 1];
-        const visibleRows = this.getters.getSheetViewVisibleRows();
+        const visibleRows = this.getters
+            .getSheetViewVisibleRows()
+            .filter((row) => row >= zone.top && row <= zone.bottom);
         const top = visibleRows[0];
         const bottom = visibleRows[visibleRows.length - 1];
         const viewport = { left, right, top, bottom };
@@ -50632,9 +50656,6 @@ class Session extends EventBus {
             }
         }
         this.acknowledge(message);
-        if (message.type === "REMOTE_REVISION" && message.clientId === this.clientId) {
-            return;
-        }
         this.trigger("collaborative-event-received");
     }
     onClientMoved(message) {
@@ -53650,8 +53671,12 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         handler.paste({ zones: pasteTarget }, data, { isCutOperation: true });
+        const selection = pasteTarget[0];
+        const col = selection.left;
+        const row = selection.top;
+        this.setSelectionMixin({ zone: selection, cell: { col, row } }, [selection]);
         const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
-        let currentIndex = cmd.base;
+        let currentIndex = isBasedBefore ? cmd.base : cmd.base + 1;
         for (const element of toRemove) {
             const size = this.getters.getHeaderSize(cmd.sheetId, cmd.dimension, element);
             this.dispatch("RESIZE_COLUMNS_ROWS", {
@@ -53930,22 +53955,33 @@ class InternalViewport {
     }
     /**
      *
-     * @param zone
-     * @returns Computes the absolute coordinate of a given zone inside the viewport
+     * Computes the visible coordinates & dimensions of a given zone inside the viewport
+     *
      */
-    getRect(zone) {
+    getVisibleRect(zone) {
         const targetZone = intersection(zone, this);
         if (targetZone) {
             const x = this.getters.getColRowOffset("COL", this.left, targetZone.left) + this.offsetCorrectionX;
             const y = this.getters.getColRowOffset("ROW", this.top, targetZone.top) + this.offsetCorrectionY;
             const width = Math.min(this.getters.getColRowOffset("COL", targetZone.left, targetZone.right + 1), this.viewportWidth);
             const height = Math.min(this.getters.getColRowOffset("ROW", targetZone.top, targetZone.bottom + 1), this.viewportHeight);
-            return {
-                x,
-                y,
-                width,
-                height,
-            };
+            return { x, y, width, height };
+        }
+        return undefined;
+    }
+    /**
+     *
+     * @returns Computes the absolute coordinates & dimensions of a given zone inside the viewport
+     *
+     */
+    getFullRect(zone) {
+        const targetZone = intersection(zone, this);
+        if (targetZone) {
+            const x = this.getters.getColRowOffset("COL", this.left, zone.left) + this.offsetCorrectionX;
+            const y = this.getters.getColRowOffset("ROW", this.top, zone.top) + this.offsetCorrectionY;
+            const width = this.getters.getColRowOffset("COL", zone.left, zone.right + 1);
+            const height = this.getters.getColRowOffset("ROW", zone.top, zone.bottom + 1);
+            return { x, y, width, height };
         }
         return undefined;
     }
@@ -54115,6 +54151,8 @@ class SheetViewPlugin extends UIPlugin {
         "isPositionVisible",
         "getColDimensionsInViewport",
         "getRowDimensionsInViewport",
+        "getAllActiveViewportsZones",
+        "getRect",
     ];
     viewports = {};
     /**
@@ -54502,16 +54540,27 @@ class SheetViewPlugin extends UIPlugin {
     getVisibleRectWithoutHeaders(zone) {
         const sheetId = this.getters.getActiveSheetId();
         const viewportRects = this.getSubViewports(sheetId)
-            .map((viewport) => viewport.getRect(zone))
+            .map((viewport) => viewport.getVisibleRect(zone))
             .filter(isDefined$1);
         if (viewportRects.length === 0) {
             return { x: 0, y: 0, width: 0, height: 0 };
         }
-        const x = Math.min(...viewportRects.map((rect) => rect.x));
-        const y = Math.min(...viewportRects.map((rect) => rect.y));
-        const width = Math.max(...viewportRects.map((rect) => rect.x + rect.width)) - x;
-        const height = Math.max(...viewportRects.map((rect) => rect.y + rect.height)) - y;
-        return { x, y, width, height };
+        return this.recomposeRect(viewportRects);
+    }
+    /**
+     * Computes the actual size and position (:Rect) of the zone on the canvas
+     * regardless of the viewport dimensions.
+     */
+    getRect(zone) {
+        const sheetId = this.getters.getActiveSheetId();
+        const viewportRects = this.getSubViewports(sheetId)
+            .map((viewport) => viewport.getFullRect(zone))
+            .filter(isDefined$1);
+        if (viewportRects.length === 0) {
+            return { x: 0, y: 0, width: 0, height: 0 };
+        }
+        const rect = this.recomposeRect(viewportRects);
+        return { ...rect, x: rect.x + this.gridOffsetX, y: rect.y + this.gridOffsetY };
     }
     /**
      * Returns the position of the MainViewport relatively to the start of the grid (without headers)
@@ -54555,6 +54604,10 @@ class SheetViewPlugin extends UIPlugin {
             end: start + (isRowHidden ? 0 : size),
         };
     }
+    getAllActiveViewportsZones() {
+        const sheetId = this.getters.getActiveSheetId();
+        return this.getSubViewports(sheetId);
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -54739,6 +54792,13 @@ class SheetViewPlugin extends UIPlugin {
         const height = this.sheetViewHeight + this.gridOffsetY;
         return { xRatio: offsetCorrectionX / width, yRatio: offsetCorrectionY / height };
     }
+    recomposeRect(viewportRects) {
+        const x = Math.min(...viewportRects.map((rect) => rect.x));
+        const y = Math.min(...viewportRects.map((rect) => rect.y));
+        const width = Math.max(...viewportRects.map((rect) => rect.x + rect.width)) - x;
+        const height = Math.max(...viewportRects.map((rect) => rect.y + rect.height)) - y;
+        return { x, y, width, height };
+    }
 }
 
 class HeaderPositionsUIPlugin extends UIPlugin {
@@ -61076,6 +61136,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.31";
-__info__.date = "2025-01-14T11:31:09.035Z";
-__info__.hash = "306dbf7";
+__info__.version = "17.2.33";
+__info__.date = "2025-01-27T10:02:54.985Z";
+__info__.hash = "6ea43fb";

package/dist/o-spreadsheet.d.ts

@@ -4342,10 +4342,16 @@ declare class InternalViewport {
     adjustViewportZone(): void;
     /**
      *
-     * @param zone
-     * @returns Computes the absolute coordinate of a given zone inside the viewport
+     * Computes the visible coordinates & dimensions of a given zone inside the viewport
+     *
      */
-    getRect(zone: Zone): Rect | undefined;
+    getVisibleRect(zone: Zone): Rect | undefined;
+    /**
+     *
+     * @returns Computes the absolute coordinates & dimensions of a given zone inside the viewport
+     *
+     */
+    getFullRect(zone: Zone): Rect | undefined;
     isVisible(col: HeaderIndex, row: HeaderIndex): boolean;
     private searchHeaderIndex;
     private setViewportOffsetX;
@@ -4414,7 +4420,7 @@ type SheetViewports = {
  *
  */
 declare class SheetViewPlugin extends UIPlugin {
-    static getters: readonly ["getColIndex", "getRowIndex", "getActiveMainViewport", "getSheetViewDimension", "getSheetViewDimensionWithHeaders", "getMainViewportRect", "isVisibleInViewport", "getEdgeScrollCol", "getEdgeScrollRow", "getVisibleFigures", "getVisibleRect", "getVisibleRectWithoutHeaders", "getVisibleCellPositions", "getColRowOffsetInViewport", "getMainViewportCoordinates", "getActiveSheetScrollInfo", "getActiveSheetDOMScrollInfo", "getSheetViewVisibleCols", "getSheetViewVisibleRows", "getFrozenSheetViewRatio", "isPositionVisible", "getColDimensionsInViewport", "getRowDimensionsInViewport"];
+    static getters: readonly ["getColIndex", "getRowIndex", "getActiveMainViewport", "getSheetViewDimension", "getSheetViewDimensionWithHeaders", "getMainViewportRect", "isVisibleInViewport", "getEdgeScrollCol", "getEdgeScrollRow", "getVisibleFigures", "getVisibleRect", "getVisibleRectWithoutHeaders", "getVisibleCellPositions", "getColRowOffsetInViewport", "getMainViewportCoordinates", "getActiveSheetScrollInfo", "getActiveSheetDOMScrollInfo", "getSheetViewVisibleCols", "getSheetViewVisibleRows", "getFrozenSheetViewRatio", "isPositionVisible", "getColDimensionsInViewport", "getRowDimensionsInViewport", "getAllActiveViewportsZones", "getRect"];
     readonly viewports: Record<UID, SheetViewports | undefined>;
     /**
      * The viewport dimensions are usually set by one of the components
@@ -4485,6 +4491,11 @@ declare class SheetViewPlugin extends UIPlugin {
      * Computes the coordinates and size to draw the zone without taking the grid offset into account
      */
     getVisibleRectWithoutHeaders(zone: Zone): Rect;
+    /**
+     * Computes the actual size and position (:Rect) of the zone on the canvas
+     * regardless of the viewport dimensions.
+     */
+    getRect(zone: Zone): Rect;
     /**
      * Returns the position of the MainViewport relatively to the start of the grid (without headers)
      * It corresponds to the summed dimensions of the visible cols/rows (in x/y respectively)
@@ -4501,6 +4512,7 @@ declare class SheetViewPlugin extends UIPlugin {
      * of the current viewport
      */
     getRowDimensionsInViewport(sheetId: UID, row: HeaderIndex): HeaderDimensions;
+    getAllActiveViewportsZones(): Zone[];
     private ensureMainViewportExist;
     private getSubViewports;
     private checkPositiveDimension;
@@ -4531,6 +4543,7 @@ declare class SheetViewPlugin extends UIPlugin {
         xRatio: number;
         yRatio: number;
     };
+    private recomposeRect;
 }
 
 /**