@odoo/o-spreadsheet 16.0.56 → 16.0.58

package/dist/o-spreadsheet.cjs.js

@@ -11568,15 +11568,18 @@ function dichotomicSearch(data, target, mode, sortOrder, rangeLength, getValueIn
     let currentIndex;
     let currentVal;
     let currentType;
+    const getValue = sortOrder === "desc"
+        ? (i) => getValueInData(data, rangeLength - i - 1)
+        : (i) => getValueInData(data, i);
     while (indexRight - indexLeft >= 0) {
         indexMedian = Math.floor((indexLeft + indexRight) / 2);
         currentIndex = indexMedian;
-        currentVal = 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 = getValueInData(data, currentIndex);
+            currentVal = getValue(currentIndex);
             currentType = typeof currentVal;
         }
         if (currentType !== targetType || currentVal === undefined) {
@@ -11591,8 +11594,7 @@ function dichotomicSearch(data, target, mode, sortOrder, rangeLength, getValueIn
         else if (mode === "nextSmaller" && 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;
             }
@@ -11600,15 +11602,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 {
@@ -11616,7 +11616,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.
@@ -25039,6 +25042,9 @@ function convertFigure(figure, id, sheetData) {
 }
 function convertChartData(chartData) {
     var _a;
+    if (chartData.dataSets.length === 0) {
+        return undefined;
+    }
     const labelRange = (_a = chartData.dataSets[0].label) === null || _a === void 0 ? void 0 : _a.replace(/\$/g, "");
     let dataSets = chartData.dataSets.map((data) => data.range.replace(/\$/g, ""));
     // For doughnut charts, in chartJS first dataset = outer dataset, in excel first dataset = inner dataset
@@ -27510,10 +27516,34 @@ class BordersPlugin extends CorePlugin {
                 const elements = [...cmd.elements].sort((a, b) => b - a);
                 for (const group of groupConsecutive(elements)) {
                     if (cmd.dimension === "COL") {
-                        this.shiftBordersHorizontally(cmd.sheetId, group[group.length - 1] + 1, -group.length);
+                        if (group[0] >= this.getters.getNumberCols(cmd.sheetId)) {
+                            for (let row = 0; row < this.getters.getNumberRows(cmd.sheetId); row++) {
+                                this.history.update("borders", cmd.sheetId, group[0] + 1, row, "vertical", undefined);
+                            }
+                        }
+                        if (group[group.length - 1] === 0) {
+                            for (let row = 0; row < this.getters.getNumberRows(cmd.sheetId); row++) {
+                                this.history.update("borders", cmd.sheetId, 0, row, "vertical", undefined);
+                            }
+                        }
+                        const zone = this.getters.getColsZone(cmd.sheetId, group[group.length - 1] + 1, group[0]);
+                        this.clearInsideBorders(cmd.sheetId, [zone]);
+                        this.shiftBordersHorizontally(cmd.sheetId, group[0] + 1, -group.length);
                     }
                     else {
-                        this.shiftBordersVertically(cmd.sheetId, group[group.length - 1] + 1, -group.length);
+                        if (group[0] >= this.getters.getNumberRows(cmd.sheetId)) {
+                            for (let col = 0; col < this.getters.getNumberCols(cmd.sheetId); col++) {
+                                this.history.update("borders", cmd.sheetId, col, group[0] + 1, "horizontal", undefined);
+                            }
+                        }
+                        if (group[group.length - 1] === 0) {
+                            for (let col = 0; col < this.getters.getNumberCols(cmd.sheetId); col++) {
+                                this.history.update("borders", cmd.sheetId, col, 0, "horizontal", undefined);
+                            }
+                        }
+                        const zone = this.getters.getRowsZone(cmd.sheetId, group[group.length - 1] + 1, group[0]);
+                        this.clearInsideBorders(cmd.sheetId, [zone]);
+                        this.shiftBordersVertically(cmd.sheetId, group[0] + 1, -group.length);
                     }
                 }
                 break;
@@ -27808,6 +27838,18 @@ class BordersPlugin extends CorePlugin {
             }
         }
     }
+    /**
+     * Remove the borders inside of a zone
+     */
+    clearInsideBorders(sheetId, zones) {
+        for (let zone of zones) {
+            for (let row = zone.top; row <= zone.bottom; row++) {
+                for (let col = zone.left; col <= zone.right; col++) {
+                    this.history.update("borders", sheetId, col, row, undefined);
+                }
+            }
+        }
+    }
     /**
      * Add a border to the existing one to a cell
      */
@@ -34380,12 +34422,21 @@ class RendererPlugin extends UIPlugin {
     drawGrid(renderingContext, layer) {
         switch (layer) {
             case 0 /* LAYERS.Background */:
-                this.boxes = this.getGridBoxes();
                 this.drawBackground(renderingContext);
-                this.drawCellBackground(renderingContext);
-                this.drawBorders(renderingContext);
-                this.drawTexts(renderingContext);
-                this.drawIcon(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();
+                    this.boxes = this.getGridBoxes(zone);
+                    this.drawCellBackground(renderingContext);
+                    this.drawBorders(renderingContext);
+                    this.drawTexts(renderingContext);
+                    this.drawIcon(renderingContext);
+                    ctx.restore();
+                }
                 this.drawFrozenPanes(renderingContext);
                 break;
             case 7 /* LAYERS.Headers */:
@@ -34750,7 +34801,7 @@ class RendererPlugin extends UIPlugin {
         const row = zone.top;
         const cell = this.getters.getCell(sheetId, col, row);
         const showFormula = this.getters.shouldShowFormulas();
-        const { x, y, width, height } = this.getters.getVisibleRect(zone);
+        const { x, y, width, height } = this.getters.getRect(zone);
         const box = {
             x,
             y,
@@ -34862,12 +34913,16 @@ class RendererPlugin extends UIPlugin {
         }
         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 };
@@ -35397,7 +35452,7 @@ class GridSelectionPlugin extends UIPlugin {
         ];
         state.paste(pasteTarget, { selectTarget: true });
         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 = cmd.dimension === "COL"
                 ? this.getters.getColSize(cmd.sheetId, element)
@@ -36904,7 +36959,7 @@ class InternalViewport {
      * @param zone
      * @returns Computes the absolute coordinate of a given zone inside the viewport
      */
-    getRect(zone) {
+    getVisibleRect(zone) {
         const targetZone = intersection(zone, this.zone);
         if (targetZone) {
             const x = this.getters.getColRowOffset("COL", this.zone.left, targetZone.left) +
@@ -36912,12 +36967,20 @@ class InternalViewport {
             const y = this.getters.getColRowOffset("ROW", this.zone.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 };
+        }
+        else {
+            return undefined;
+        }
+    }
+    getFullRect(zone) {
+        const targetZone = intersection(zone, this.zone);
+        if (targetZone) {
+            const x = this.getters.getColRowOffset("COL", this.zone.left, zone.left) + this.offsetCorrectionX;
+            const y = this.getters.getColRowOffset("ROW", this.zone.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 };
         }
         else {
             return undefined;
@@ -37411,21 +37474,26 @@ class SheetViewPlugin extends UIPlugin {
     getVisibleRect(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: x + this.gridOffsetX,
-            y: y + this.gridOffsetY,
-            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 };
+        }
+        return this.recomposeRect(viewportRects);
     }
     /**
      * Returns the position of the MainViewport relatively to the start of the grid (without headers)
@@ -37439,6 +37507,10 @@ class SheetViewPlugin extends UIPlugin {
         const y = this.getters.getRowDimensions(sheetId, ySplit).start;
         return { x, y };
     }
+    getAllActiveViewportsZones() {
+        const sheetId = this.getters.getActiveSheetId();
+        return this.getSubViewports(sheetId);
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -37621,6 +37693,18 @@ 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: x + this.gridOffsetX,
+            y: y + this.gridOffsetY,
+            width,
+            height,
+        };
+    }
 }
 SheetViewPlugin.getters = [
     "getColIndex",
@@ -37641,6 +37725,8 @@ SheetViewPlugin.getters = [
     "getSheetViewVisibleCols",
     "getSheetViewVisibleRows",
     "getFrozenSheetViewRatio",
+    "getAllActiveViewportsZones",
+    "getRect",
 ];
 
 class SortPlugin extends UIPlugin {
@@ -43484,6 +43570,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.56';
-__info__.date = '2024-12-19T07:45:47.250Z';
-__info__.hash = '9d0e335';
+__info__.version = '16.0.58';
+__info__.date = '2025-01-27T10:00:05.196Z';
+__info__.hash = '4886b0b';

package/dist/o-spreadsheet.d.ts

@@ -3081,6 +3081,10 @@ declare class BordersPlugin extends CorePlugin<BordersPluginState> implements Bo
      * Remove the borders of a zone
      */
     private clearBorders;
+    /**
+     * Remove the borders inside of a zone
+     */
+    private clearInsideBorders;
     /**
      * Add a border to the existing one to a cell
      */
@@ -4342,7 +4346,8 @@ declare class InternalViewport {
      * @param zone
      * @returns Computes the absolute coordinate of a given zone inside the viewport
      */
-    getRect(zone: Zone): Rect | undefined;
+    getVisibleRect(zone: Zone): Rect | undefined;
+    getFullRect(zone: Zone): Rect | undefined;
     isVisible(col: HeaderIndex, row: HeaderIndex): boolean;
     private searchHeaderIndex;
     private get zone();
@@ -4412,7 +4417,7 @@ type SheetViewports = {
  *
  */
 declare class SheetViewPlugin extends UIPlugin {
-    static getters: readonly ["getColIndex", "getRowIndex", "getActiveMainViewport", "getSheetViewDimension", "getSheetViewDimensionWithHeaders", "getMainViewportRect", "isVisibleInViewport", "getEdgeScrollCol", "getEdgeScrollRow", "getVisibleFigures", "getVisibleRect", "getColRowOffsetInViewport", "getMainViewportCoordinates", "getActiveSheetScrollInfo", "getActiveSheetDOMScrollInfo", "getSheetViewVisibleCols", "getSheetViewVisibleRows", "getFrozenSheetViewRatio"];
+    static getters: readonly ["getColIndex", "getRowIndex", "getActiveMainViewport", "getSheetViewDimension", "getSheetViewDimensionWithHeaders", "getMainViewportRect", "isVisibleInViewport", "getEdgeScrollCol", "getEdgeScrollRow", "getVisibleFigures", "getVisibleRect", "getColRowOffsetInViewport", "getMainViewportCoordinates", "getActiveSheetScrollInfo", "getActiveSheetDOMScrollInfo", "getSheetViewVisibleCols", "getSheetViewVisibleRows", "getFrozenSheetViewRatio", "getAllActiveViewportsZones", "getRect"];
     readonly viewports: Record<UID, SheetViewports | undefined>;
     /**
      * The viewport dimensions are usually set by one of the components
@@ -4474,12 +4479,18 @@ declare class SheetViewPlugin extends UIPlugin {
      * Computes the coordinates and size to draw the zone on the canvas
      */
     getVisibleRect(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)
      * situated before the pane divisions.
      */
     getMainViewportCoordinates(): DOMCoordinates;
+    getAllActiveViewportsZones(): Zone[];
     private ensureMainViewportExist;
     private getSubViewports;
     private checkPositiveDimension;
@@ -4510,6 +4521,7 @@ declare class SheetViewPlugin extends UIPlugin {
         xRatio: number;
         yRatio: number;
     };
+    private recomposeRect;
 }
 
 declare class SortPlugin extends UIPlugin {