@odoo/o-spreadsheet 16.0.55 → 16.0.57

package/dist/o-spreadsheet.cjs.js

@@ -10688,15 +10688,23 @@ class ChartFigure extends owl.Component {
 ChartFigure.template = "o-spreadsheet-ChartFigure";
 ChartFigure.components = { Menu };
 
+/**
+ * Start listening to pointer events and apply the given callbacks.
+ *
+ * @returns A function to remove the listeners.
+ */
 function startDnd(onMouseMove, onMouseUp, onMouseDown = () => { }) {
-    const _onMouseUp = (ev) => {
-        onMouseUp(ev);
+    const removeListeners = () => {
         window.removeEventListener("mousedown", onMouseDown);
         window.removeEventListener("mouseup", _onMouseUp);
         window.removeEventListener("dragstart", _onDragStart);
         window.removeEventListener("mousemove", onMouseMove);
         window.removeEventListener("wheel", onMouseMove);
     };
+    const _onMouseUp = (ev) => {
+        onMouseUp(ev);
+        removeListeners();
+    };
     function _onDragStart(ev) {
         ev.preventDefault();
     }
@@ -10705,6 +10713,7 @@ function startDnd(onMouseMove, onMouseUp, onMouseDown = () => { }) {
     window.addEventListener("dragstart", _onDragStart);
     window.addEventListener("mousemove", onMouseMove);
     window.addEventListener("wheel", onMouseMove);
+    return removeListeners;
 }
 /**
  * Function to be used during a mousedown event, this function allows to
@@ -18399,13 +18408,12 @@ function tokenizeSymbol(chars) {
 }
 const whiteSpaceRegexp = /\s/;
 function tokenizeSpace(chars) {
-    let length = 0;
+    let spaces = "";
     while (chars[0] && chars[0].match(whiteSpaceRegexp)) {
-        length++;
-        chars.shift();
+        spaces += chars.shift();
     }
-    if (length) {
-        return { type: "SPACE", value: " ".repeat(length) };
+    if (spaces) {
+        return { type: "SPACE", value: spaces };
     }
     return null;
 }
@@ -20432,11 +20440,11 @@ css /* scss */ `
   }
 
   /* Custom css to highlight topbar composer on focus */
-  .o-topbar-toolbar .o-composer-container:focus-within {
-    border: 1px solid ${SELECTION_BORDER_COLOR};
+  .o-topbar-toolbar .o-composer-container[active] {
+    border: 1px solid ${SELECTION_BORDER_COLOR} !important;
   }
 
-  .o-topbar-toolbar .o-composer-container {
+  .o-topbar-toolbar .o-composer-container[active] {
     z-index: ${ComponentsImportance.TopBarComposer};
   }
 `;
@@ -21385,6 +21393,7 @@ class FiguresContainer extends owl.Component {
             y: 0,
             width: 0,
             height: 0,
+            cancelDnd: undefined,
         });
     }
     setup() {
@@ -21398,11 +21407,24 @@ class FiguresContainer extends owl.Component {
             // new rendering
             this.render();
         });
+        owl.onWillUpdateProps(() => {
+            const sheetId = this.env.model.getters.getActiveSheetId();
+            if (this.dnd.figId && !this.env.model.getters.getFigure(sheetId, this.dnd.figId)) {
+                if (this.dnd.cancelDnd) {
+                    this.dnd.cancelDnd();
+                }
+                this.dnd.figId = undefined;
+                this.dnd.cancelDnd = undefined;
+            }
+        });
     }
     getVisibleFigures() {
         const visibleFigures = this.env.model.getters.getVisibleFigures();
         if (this.dnd.figId && !visibleFigures.some((figure) => figure.id === this.dnd.figId)) {
-            visibleFigures.push(this.env.model.getters.getFigure(this.env.model.getters.getActiveSheetId(), this.dnd.figId));
+            const draggedFigure = this.env.model.getters.getFigure(this.env.model.getters.getActiveSheetId(), this.dnd.figId);
+            if (draggedFigure) {
+                visibleFigures.push(draggedFigure);
+            }
         }
         return visibleFigures;
     }
@@ -21515,7 +21537,7 @@ class FiguresContainer extends owl.Component {
             this.dnd.figId = undefined;
             this.env.model.dispatch("UPDATE_FIGURE", { sheetId, id: figure.id, x, y });
         };
-        startDnd(onMouseMove, onMouseUp);
+        this.dnd.cancelDnd = startDnd(onMouseMove, onMouseUp);
     }
     startResize(figure, dirX, dirY, ev) {
         ev.stopPropagation();
@@ -21569,7 +21591,7 @@ class FiguresContainer extends owl.Component {
                 ...update,
             });
         };
-        startDnd(onMouseMove, onMouseUp);
+        this.dnd.cancelDnd = startDnd(onMouseMove, onMouseUp);
     }
     getDndFigure() {
         const figure = this.getVisibleFigures().find((fig) => fig.id === this.dnd.figId);
@@ -25017,6 +25039,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
@@ -27488,10 +27513,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;
@@ -27786,6 +27835,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
      */
@@ -27938,7 +27999,6 @@ class BordersPlugin extends CorePlugin {
 }
 BordersPlugin.getters = ["getCellBorder"];
 
-const nbspRegexp = new RegExp(String.fromCharCode(160), "g");
 const LINK_STYLE = { textColor: LINK_COLOR };
 /**
  * Core Plugin
@@ -28272,13 +28332,10 @@ class CellPlugin extends CorePlugin {
         return id;
     }
     updateCell(sheetId, col, row, after) {
-        var _a;
         const before = this.getters.getCell(sheetId, col, row);
         const hasContent = "content" in after || "formula" in after;
         // Compute the new cell properties
-        const afterContent = hasContent
-            ? ((_a = after.content) === null || _a === void 0 ? void 0 : _a.replace(nbspRegexp, "")) || ""
-            : (before === null || before === void 0 ? void 0 : before.content) || "";
+        const afterContent = (hasContent ? after.content : before === null || before === void 0 ? void 0 : before.content) || "";
         let style;
         if (after.style !== undefined) {
             style = after.style || undefined;
@@ -37162,6 +37219,7 @@ class SheetViewPlugin extends UIPlugin {
                 break;
             case "DELETE_SHEET":
                 this.cleanViewports();
+                this.sheetsWithDirtyViewports.delete(cmd.sheetId);
                 break;
             case "ACTIVATE_SHEET":
                 this.setViewports();
@@ -37514,6 +37572,9 @@ class SheetViewPlugin extends UIPlugin {
         };
     }
     resetViewports(sheetId) {
+        if (!this.getters.tryGetSheet(sheetId)) {
+            return;
+        }
         const { xSplit, ySplit } = this.getters.getPaneDivisions(sheetId);
         const nCols = this.getters.getNumberCols(sheetId);
         const nRows = this.getters.getNumberRows(sheetId);
@@ -43462,6 +43523,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.55';
-__info__.date = '2024-11-13T15:02:56.109Z';
-__info__.hash = '6984990';
+__info__.version = '16.0.57';
+__info__.date = '2025-01-14T11:28:51.212Z';
+__info__.hash = '5c7bf6e';

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
      */
@@ -5721,6 +5725,7 @@ interface DndState {
     y: Pixel;
     width: Pixel;
     height: Pixel;
+    cancelDnd: (() => void) | undefined;
 }
 interface Props$e {
     sidePanelIsOpen: Boolean;

package/dist/o-spreadsheet.esm.js

@@ -10684,15 +10684,23 @@ class ChartFigure extends Component {
 ChartFigure.template = "o-spreadsheet-ChartFigure";
 ChartFigure.components = { Menu };
 
+/**
+ * Start listening to pointer events and apply the given callbacks.
+ *
+ * @returns A function to remove the listeners.
+ */
 function startDnd(onMouseMove, onMouseUp, onMouseDown = () => { }) {
-    const _onMouseUp = (ev) => {
-        onMouseUp(ev);
+    const removeListeners = () => {
         window.removeEventListener("mousedown", onMouseDown);
         window.removeEventListener("mouseup", _onMouseUp);
         window.removeEventListener("dragstart", _onDragStart);
         window.removeEventListener("mousemove", onMouseMove);
         window.removeEventListener("wheel", onMouseMove);
     };
+    const _onMouseUp = (ev) => {
+        onMouseUp(ev);
+        removeListeners();
+    };
     function _onDragStart(ev) {
         ev.preventDefault();
     }
@@ -10701,6 +10709,7 @@ function startDnd(onMouseMove, onMouseUp, onMouseDown = () => { }) {
     window.addEventListener("dragstart", _onDragStart);
     window.addEventListener("mousemove", onMouseMove);
     window.addEventListener("wheel", onMouseMove);
+    return removeListeners;
 }
 /**
  * Function to be used during a mousedown event, this function allows to
@@ -18395,13 +18404,12 @@ function tokenizeSymbol(chars) {
 }
 const whiteSpaceRegexp = /\s/;
 function tokenizeSpace(chars) {
-    let length = 0;
+    let spaces = "";
     while (chars[0] && chars[0].match(whiteSpaceRegexp)) {
-        length++;
-        chars.shift();
+        spaces += chars.shift();
     }
-    if (length) {
-        return { type: "SPACE", value: " ".repeat(length) };
+    if (spaces) {
+        return { type: "SPACE", value: spaces };
     }
     return null;
 }
@@ -20428,11 +20436,11 @@ css /* scss */ `
   }
 
   /* Custom css to highlight topbar composer on focus */
-  .o-topbar-toolbar .o-composer-container:focus-within {
-    border: 1px solid ${SELECTION_BORDER_COLOR};
+  .o-topbar-toolbar .o-composer-container[active] {
+    border: 1px solid ${SELECTION_BORDER_COLOR} !important;
   }
 
-  .o-topbar-toolbar .o-composer-container {
+  .o-topbar-toolbar .o-composer-container[active] {
     z-index: ${ComponentsImportance.TopBarComposer};
   }
 `;
@@ -21381,6 +21389,7 @@ class FiguresContainer extends Component {
             y: 0,
             width: 0,
             height: 0,
+            cancelDnd: undefined,
         });
     }
     setup() {
@@ -21394,11 +21403,24 @@ class FiguresContainer extends Component {
             // new rendering
             this.render();
         });
+        onWillUpdateProps(() => {
+            const sheetId = this.env.model.getters.getActiveSheetId();
+            if (this.dnd.figId && !this.env.model.getters.getFigure(sheetId, this.dnd.figId)) {
+                if (this.dnd.cancelDnd) {
+                    this.dnd.cancelDnd();
+                }
+                this.dnd.figId = undefined;
+                this.dnd.cancelDnd = undefined;
+            }
+        });
     }
     getVisibleFigures() {
         const visibleFigures = this.env.model.getters.getVisibleFigures();
         if (this.dnd.figId && !visibleFigures.some((figure) => figure.id === this.dnd.figId)) {
-            visibleFigures.push(this.env.model.getters.getFigure(this.env.model.getters.getActiveSheetId(), this.dnd.figId));
+            const draggedFigure = this.env.model.getters.getFigure(this.env.model.getters.getActiveSheetId(), this.dnd.figId);
+            if (draggedFigure) {
+                visibleFigures.push(draggedFigure);
+            }
         }
         return visibleFigures;
     }
@@ -21511,7 +21533,7 @@ class FiguresContainer extends Component {
             this.dnd.figId = undefined;
             this.env.model.dispatch("UPDATE_FIGURE", { sheetId, id: figure.id, x, y });
         };
-        startDnd(onMouseMove, onMouseUp);
+        this.dnd.cancelDnd = startDnd(onMouseMove, onMouseUp);
     }
     startResize(figure, dirX, dirY, ev) {
         ev.stopPropagation();
@@ -21565,7 +21587,7 @@ class FiguresContainer extends Component {
                 ...update,
             });
         };
-        startDnd(onMouseMove, onMouseUp);
+        this.dnd.cancelDnd = startDnd(onMouseMove, onMouseUp);
     }
     getDndFigure() {
         const figure = this.getVisibleFigures().find((fig) => fig.id === this.dnd.figId);
@@ -25013,6 +25035,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
@@ -27484,10 +27509,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;
@@ -27782,6 +27831,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
      */
@@ -27934,7 +27995,6 @@ class BordersPlugin extends CorePlugin {
 }
 BordersPlugin.getters = ["getCellBorder"];
 
-const nbspRegexp = new RegExp(String.fromCharCode(160), "g");
 const LINK_STYLE = { textColor: LINK_COLOR };
 /**
  * Core Plugin
@@ -28268,13 +28328,10 @@ class CellPlugin extends CorePlugin {
         return id;
     }
     updateCell(sheetId, col, row, after) {
-        var _a;
         const before = this.getters.getCell(sheetId, col, row);
         const hasContent = "content" in after || "formula" in after;
         // Compute the new cell properties
-        const afterContent = hasContent
-            ? ((_a = after.content) === null || _a === void 0 ? void 0 : _a.replace(nbspRegexp, "")) || ""
-            : (before === null || before === void 0 ? void 0 : before.content) || "";
+        const afterContent = (hasContent ? after.content : before === null || before === void 0 ? void 0 : before.content) || "";
         let style;
         if (after.style !== undefined) {
             style = after.style || undefined;
@@ -37158,6 +37215,7 @@ class SheetViewPlugin extends UIPlugin {
                 break;
             case "DELETE_SHEET":
                 this.cleanViewports();
+                this.sheetsWithDirtyViewports.delete(cmd.sheetId);
                 break;
             case "ACTIVATE_SHEET":
                 this.setViewports();
@@ -37510,6 +37568,9 @@ class SheetViewPlugin extends UIPlugin {
         };
     }
     resetViewports(sheetId) {
+        if (!this.getters.tryGetSheet(sheetId)) {
+            return;
+        }
         const { xSplit, ySplit } = this.getters.getPaneDivisions(sheetId);
         const nCols = this.getters.getNumberCols(sheetId);
         const nRows = this.getters.getNumberRows(sheetId);
@@ -43430,6 +43491,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, cellTypes, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.0.55';
-__info__.date = '2024-11-13T15:02:56.109Z';
-__info__.hash = '6984990';
+__info__.version = '16.0.57';
+__info__.date = '2025-01-14T11:28:51.212Z';
+__info__.hash = '5c7bf6e';