@odoo/o-spreadsheet 16.4.24 → 16.4.26

package/dist/o-spreadsheet.cjs.js

@@ -5232,8 +5232,10 @@ function getGroup(cell, cells, filter) {
         if (x === cell) {
             found = true;
         }
-        const cellValue = evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
-        if (filter(cellValue)) {
+        const cellValue = x?.isFormula
+            ? undefined
+            : evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
+        if (cellValue && filter(cellValue)) {
             group.push(cellValue);
         }
         else {
@@ -24784,7 +24786,11 @@ class GridComposer extends owl.Component {
         }
     }
     updateCellReferenceVisibility() {
-        if (this.isCellReferenceVisible || this.env.model.getters.getEditionMode() === "inactive") {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            this.isCellReferenceVisible = false;
+            return;
+        }
+        if (this.isCellReferenceVisible) {
             return;
         }
         const sheetId = this.env.model.getters.getActiveSheetId();
@@ -24945,7 +24951,7 @@ function dragFigureForMove({ x: mouseX, y: mouseY }, { x: mouseInitialX, y: mous
 function clamp(value, min, max) {
     return Math.min(Math.max(value, min), max);
 }
-function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }, { x: mouseInitialX, y: mouseInitialY }, keepRatio, minFigSize) {
+function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }, { x: mouseInitialX, y: mouseInitialY }, keepRatio, minFigSize, { scrollX, scrollY }) {
     let { x, y, width, height } = initialFigure;
     if (keepRatio && dirX != 0 && dirY != 0) {
         const deltaX = Math.min(dirX * (mouseInitialX - mouseX), initialFigure.width - minFigSize);
@@ -24972,14 +24978,14 @@ function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }
             y = initialFigure.y - deltaY;
         }
     }
-    // Restrict resizing if x or y reaches header boundaries
-    if (x < 0) {
-        width += x;
-        x = 0;
+    // Adjusts figure dimensions to ensure it remains within header boundaries and viewport during resizing.
+    if (x + scrollX <= 0) {
+        width = width + x + scrollX;
+        x = -scrollX;
     }
-    if (y < 0) {
-        height += y;
-        y = 0;
+    if (y + scrollY <= 0) {
+        height = height + y + scrollY;
+        y = -scrollY;
     }
     return { ...initialFigure, x, y, width, height };
 }
@@ -25396,7 +25402,7 @@ class FiguresContainer extends owl.Component {
         const minFigSize = figureRegistry.get(figure.tag).minFigSize || MIN_FIG_SIZE;
         const onMouseMove = (ev) => {
             const currentMousePosition = { x: ev.clientX, y: ev.clientY };
-            const draggedFigure = dragFigureForResize(initialFig, dirX, dirY, currentMousePosition, initialMousePosition, keepRatio, minFigSize);
+            const draggedFigure = dragFigureForResize(initialFig, dirX, dirY, currentMousePosition, initialMousePosition, keepRatio, minFigSize, this.env.model.getters.getActiveSheetScrollInfo());
             const otherFigures = this.getOtherFigures(figure.id);
             const snapResult = snapForResize(this.env.model.getters, dirX, dirY, draggedFigure, otherFigures);
             this.dnd.draggedFigure = snapResult.snappedFigure;
@@ -32903,6 +32909,15 @@ class FigurePlugin extends CorePlugin {
                 return 0 /* CommandResult.Success */;
         }
     }
+    beforeHandle(cmd) {
+        switch (cmd.type) {
+            case "DELETE_SHEET":
+                this.getters.getFigures(cmd.sheetId).forEach((figure) => {
+                    this.dispatch("DELETE_FIGURE", { id: figure.id, sheetId: cmd.sheetId });
+                });
+                break;
+        }
+    }
     handle(cmd) {
         switch (cmd.type) {
             case "CREATE_SHEET":
@@ -34665,7 +34680,6 @@ class SheetPlugin extends CorePlugin {
         "getNumberHeaders",
         "getGridLinesVisibility",
         "getNextSheetName",
-        "isEmpty",
         "getSheetSize",
         "getSheetZone",
         "getPaneDivisions",
@@ -35041,14 +35055,6 @@ class SheetPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Row/Col manipulation
     // ---------------------------------------------------------------------------
-    /**
-     * Check if a zone only contains empty cells
-     */
-    isEmpty(sheetId, zone) {
-        return positions(zone)
-            .map(({ col, row }) => this.getCell({ sheetId, col, row }))
-            .every((cell) => !cell || cell.content === "");
-    }
     getCommandZones(cmd) {
         const zones = [];
         if ("zone" in cmd) {
@@ -37108,6 +37114,7 @@ class EvaluationPlugin extends UIPlugin {
         "getEvaluatedCell",
         "getEvaluatedCells",
         "getEvaluatedCellsInZone",
+        "isEmpty",
     ];
     shouldRebuildDependenciesGraph = true;
     evaluator;
@@ -37206,6 +37213,14 @@ class EvaluationPlugin extends UIPlugin {
     getEvaluatedCellsInZone(sheetId, zone) {
         return positions(zone).map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId, col, row }));
     }
+    /**
+     * Check if a zone only contains empty cells
+     */
+    isEmpty(sheetId, zone) {
+        return positions(zone)
+            .map(({ col, row }) => this.getEvaluatedCell({ sheetId, col, row }))
+            .every((cell) => cell.type === CellValueType.empty);
+    }
     // ---------------------------------------------------------------------------
     // Export
     // ---------------------------------------------------------------------------
@@ -46094,6 +46109,9 @@ class BottomBarSheet extends owl.Component {
         this.scrollToSheet();
     }
     onDblClick() {
+        if (this.env.model.getters.isReadonly()) {
+            return;
+        }
         this.startEdition();
     }
     onKeyDown(ev) {
@@ -51716,6 +51734,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.24';
-__info__.date = '2024-02-28T12:27:32.683Z';
-__info__.hash = '90c74d1';
+__info__.version = '16.4.26';
+__info__.date = '2024-03-15T10:58:33.088Z';
+__info__.hash = 'b8caa0f';

package/dist/o-spreadsheet.d.ts

@@ -3409,6 +3409,7 @@ declare class FigurePlugin extends CorePlugin<FigureState> implements FigureStat
         [sheet: string]: Record<UID, Figure | undefined> | undefined;
     };
     allowDispatch(cmd: CoreCommand): CommandResult;
+    beforeHandle(cmd: CoreCommand): void;
     handle(cmd: CoreCommand): void;
     private onRowColDelete;
     private onRowDeletion;
@@ -3648,7 +3649,7 @@ interface SheetState$1 {
     readonly cellPosition: Record<UID, CellPosition | undefined>;
 }
 declare class SheetPlugin extends CorePlugin<SheetState$1> implements SheetState$1 {
-    static getters: readonly ["getSheetName", "tryGetSheetName", "getSheet", "tryGetSheet", "getSheetIdByName", "getSheetIds", "getVisibleSheetIds", "isSheetVisible", "getEvaluationSheets", "doesHeaderExist", "getCell", "getCellPosition", "getColsZone", "getRowCells", "getRowsZone", "getNumberCols", "getNumberRows", "getNumberHeaders", "getGridLinesVisibility", "getNextSheetName", "isEmpty", "getSheetSize", "getSheetZone", "getPaneDivisions", "checkZonesExistInSheet", "getCommandZones", "getUnboundedZone", "checkElementsIncludeAllNonFrozenHeaders"];
+    static getters: readonly ["getSheetName", "tryGetSheetName", "getSheet", "tryGetSheet", "getSheetIdByName", "getSheetIds", "getVisibleSheetIds", "isSheetVisible", "getEvaluationSheets", "doesHeaderExist", "getCell", "getCellPosition", "getColsZone", "getRowCells", "getRowsZone", "getNumberCols", "getNumberRows", "getNumberHeaders", "getGridLinesVisibility", "getNextSheetName", "getSheetSize", "getSheetZone", "getPaneDivisions", "checkZonesExistInSheet", "getCommandZones", "getUnboundedZone", "checkElementsIncludeAllNonFrozenHeaders"];
     readonly sheetIdsMapName: Record<string, UID | undefined>;
     readonly orderedSheetIds: UID[];
     readonly sheets: Record<UID, Sheet | undefined>;
@@ -3696,10 +3697,6 @@ declare class SheetPlugin extends CorePlugin<SheetState$1> implements SheetState
      * This validation ensures that all rows or columns cannot be deleted when frozen panes exist.
      */
     checkElementsIncludeAllNonFrozenHeaders(sheetId: UID, dimension: Dimension, elements: HeaderIndex[]): boolean;
-    /**
-     * Check if a zone only contains empty cells
-     */
-    isEmpty(sheetId: UID, zone: Zone): boolean;
     getCommandZones(cmd: Command): Zone[];
     /**
      * Check if zones in the command are well formed and
@@ -3794,7 +3791,7 @@ declare class SheetPlugin extends CorePlugin<SheetState$1> implements SheetState
 }
 
 declare class EvaluationPlugin extends UIPlugin {
-    static getters: readonly ["evaluateFormula", "getCorrespondingFormulaCell", "getRangeFormattedValues", "getRangeValues", "getRangeFormats", "getEvaluatedCell", "getEvaluatedCells", "getEvaluatedCellsInZone"];
+    static getters: readonly ["evaluateFormula", "getCorrespondingFormulaCell", "getRangeFormattedValues", "getRangeValues", "getRangeFormats", "getEvaluatedCell", "getEvaluatedCells", "getEvaluatedCellsInZone", "isEmpty"];
     private shouldRebuildDependenciesGraph;
     private evaluator;
     private positionsToUpdate;
@@ -3818,6 +3815,10 @@ declare class EvaluationPlugin extends UIPlugin {
     getEvaluatedCell(position: CellPosition): EvaluatedCell;
     getEvaluatedCells(sheetId: UID): Record<UID, EvaluatedCell>;
     getEvaluatedCellsInZone(sheetId: UID, zone: Zone): EvaluatedCell[];
+    /**
+     * Check if a zone only contains empty cells
+     */
+    isEmpty(sheetId: UID, zone: Zone): boolean;
     exportForExcel(data: ExcelWorkbookData): void;
     /**
      * Returns the corresponding formula cell of a given cell

package/dist/o-spreadsheet.esm.js

@@ -5228,8 +5228,10 @@ function getGroup(cell, cells, filter) {
         if (x === cell) {
             found = true;
         }
-        const cellValue = evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
-        if (filter(cellValue)) {
+        const cellValue = x?.isFormula
+            ? undefined
+            : evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
+        if (cellValue && filter(cellValue)) {
             group.push(cellValue);
         }
         else {
@@ -24780,7 +24782,11 @@ class GridComposer extends Component {
         }
     }
     updateCellReferenceVisibility() {
-        if (this.isCellReferenceVisible || this.env.model.getters.getEditionMode() === "inactive") {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            this.isCellReferenceVisible = false;
+            return;
+        }
+        if (this.isCellReferenceVisible) {
             return;
         }
         const sheetId = this.env.model.getters.getActiveSheetId();
@@ -24941,7 +24947,7 @@ function dragFigureForMove({ x: mouseX, y: mouseY }, { x: mouseInitialX, y: mous
 function clamp(value, min, max) {
     return Math.min(Math.max(value, min), max);
 }
-function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }, { x: mouseInitialX, y: mouseInitialY }, keepRatio, minFigSize) {
+function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }, { x: mouseInitialX, y: mouseInitialY }, keepRatio, minFigSize, { scrollX, scrollY }) {
     let { x, y, width, height } = initialFigure;
     if (keepRatio && dirX != 0 && dirY != 0) {
         const deltaX = Math.min(dirX * (mouseInitialX - mouseX), initialFigure.width - minFigSize);
@@ -24968,14 +24974,14 @@ function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }
             y = initialFigure.y - deltaY;
         }
     }
-    // Restrict resizing if x or y reaches header boundaries
-    if (x < 0) {
-        width += x;
-        x = 0;
+    // Adjusts figure dimensions to ensure it remains within header boundaries and viewport during resizing.
+    if (x + scrollX <= 0) {
+        width = width + x + scrollX;
+        x = -scrollX;
     }
-    if (y < 0) {
-        height += y;
-        y = 0;
+    if (y + scrollY <= 0) {
+        height = height + y + scrollY;
+        y = -scrollY;
     }
     return { ...initialFigure, x, y, width, height };
 }
@@ -25392,7 +25398,7 @@ class FiguresContainer extends Component {
         const minFigSize = figureRegistry.get(figure.tag).minFigSize || MIN_FIG_SIZE;
         const onMouseMove = (ev) => {
             const currentMousePosition = { x: ev.clientX, y: ev.clientY };
-            const draggedFigure = dragFigureForResize(initialFig, dirX, dirY, currentMousePosition, initialMousePosition, keepRatio, minFigSize);
+            const draggedFigure = dragFigureForResize(initialFig, dirX, dirY, currentMousePosition, initialMousePosition, keepRatio, minFigSize, this.env.model.getters.getActiveSheetScrollInfo());
             const otherFigures = this.getOtherFigures(figure.id);
             const snapResult = snapForResize(this.env.model.getters, dirX, dirY, draggedFigure, otherFigures);
             this.dnd.draggedFigure = snapResult.snappedFigure;
@@ -32899,6 +32905,15 @@ class FigurePlugin extends CorePlugin {
                 return 0 /* CommandResult.Success */;
         }
     }
+    beforeHandle(cmd) {
+        switch (cmd.type) {
+            case "DELETE_SHEET":
+                this.getters.getFigures(cmd.sheetId).forEach((figure) => {
+                    this.dispatch("DELETE_FIGURE", { id: figure.id, sheetId: cmd.sheetId });
+                });
+                break;
+        }
+    }
     handle(cmd) {
         switch (cmd.type) {
             case "CREATE_SHEET":
@@ -34661,7 +34676,6 @@ class SheetPlugin extends CorePlugin {
         "getNumberHeaders",
         "getGridLinesVisibility",
         "getNextSheetName",
-        "isEmpty",
         "getSheetSize",
         "getSheetZone",
         "getPaneDivisions",
@@ -35037,14 +35051,6 @@ class SheetPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Row/Col manipulation
     // ---------------------------------------------------------------------------
-    /**
-     * Check if a zone only contains empty cells
-     */
-    isEmpty(sheetId, zone) {
-        return positions(zone)
-            .map(({ col, row }) => this.getCell({ sheetId, col, row }))
-            .every((cell) => !cell || cell.content === "");
-    }
     getCommandZones(cmd) {
         const zones = [];
         if ("zone" in cmd) {
@@ -37104,6 +37110,7 @@ class EvaluationPlugin extends UIPlugin {
         "getEvaluatedCell",
         "getEvaluatedCells",
         "getEvaluatedCellsInZone",
+        "isEmpty",
     ];
     shouldRebuildDependenciesGraph = true;
     evaluator;
@@ -37202,6 +37209,14 @@ class EvaluationPlugin extends UIPlugin {
     getEvaluatedCellsInZone(sheetId, zone) {
         return positions(zone).map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId, col, row }));
     }
+    /**
+     * Check if a zone only contains empty cells
+     */
+    isEmpty(sheetId, zone) {
+        return positions(zone)
+            .map(({ col, row }) => this.getEvaluatedCell({ sheetId, col, row }))
+            .every((cell) => cell.type === CellValueType.empty);
+    }
     // ---------------------------------------------------------------------------
     // Export
     // ---------------------------------------------------------------------------
@@ -46090,6 +46105,9 @@ class BottomBarSheet extends Component {
         this.scrollToSheet();
     }
     onDblClick() {
+        if (this.env.model.getters.isReadonly()) {
+            return;
+        }
         this.startEdition();
     }
     onKeyDown(ev) {
@@ -51680,6 +51698,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.4.24';
-__info__.date = '2024-02-28T12:27:32.683Z';
-__info__.hash = '90c74d1';
+__info__.version = '16.4.26';
+__info__.date = '2024-03-15T10:58:33.088Z';
+__info__.hash = 'b8caa0f';

package/dist/o-spreadsheet.iife.js

@@ -5229,8 +5229,10 @@
           if (x === cell) {
               found = true;
           }
-          const cellValue = evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
-          if (filter(cellValue)) {
+          const cellValue = x?.isFormula
+              ? undefined
+              : evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
+          if (cellValue && filter(cellValue)) {
               group.push(cellValue);
           }
           else {
@@ -24781,7 +24783,11 @@
           }
       }
       updateCellReferenceVisibility() {
-          if (this.isCellReferenceVisible || this.env.model.getters.getEditionMode() === "inactive") {
+          if (this.env.model.getters.getEditionMode() === "inactive") {
+              this.isCellReferenceVisible = false;
+              return;
+          }
+          if (this.isCellReferenceVisible) {
               return;
           }
           const sheetId = this.env.model.getters.getActiveSheetId();
@@ -24942,7 +24948,7 @@
   function clamp(value, min, max) {
       return Math.min(Math.max(value, min), max);
   }
-  function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }, { x: mouseInitialX, y: mouseInitialY }, keepRatio, minFigSize) {
+  function dragFigureForResize(initialFigure, dirX, dirY, { x: mouseX, y: mouseY }, { x: mouseInitialX, y: mouseInitialY }, keepRatio, minFigSize, { scrollX, scrollY }) {
       let { x, y, width, height } = initialFigure;
       if (keepRatio && dirX != 0 && dirY != 0) {
           const deltaX = Math.min(dirX * (mouseInitialX - mouseX), initialFigure.width - minFigSize);
@@ -24969,14 +24975,14 @@
               y = initialFigure.y - deltaY;
           }
       }
-      // Restrict resizing if x or y reaches header boundaries
-      if (x < 0) {
-          width += x;
-          x = 0;
+      // Adjusts figure dimensions to ensure it remains within header boundaries and viewport during resizing.
+      if (x + scrollX <= 0) {
+          width = width + x + scrollX;
+          x = -scrollX;
       }
-      if (y < 0) {
-          height += y;
-          y = 0;
+      if (y + scrollY <= 0) {
+          height = height + y + scrollY;
+          y = -scrollY;
       }
       return { ...initialFigure, x, y, width, height };
   }
@@ -25393,7 +25399,7 @@
           const minFigSize = figureRegistry.get(figure.tag).minFigSize || MIN_FIG_SIZE;
           const onMouseMove = (ev) => {
               const currentMousePosition = { x: ev.clientX, y: ev.clientY };
-              const draggedFigure = dragFigureForResize(initialFig, dirX, dirY, currentMousePosition, initialMousePosition, keepRatio, minFigSize);
+              const draggedFigure = dragFigureForResize(initialFig, dirX, dirY, currentMousePosition, initialMousePosition, keepRatio, minFigSize, this.env.model.getters.getActiveSheetScrollInfo());
               const otherFigures = this.getOtherFigures(figure.id);
               const snapResult = snapForResize(this.env.model.getters, dirX, dirY, draggedFigure, otherFigures);
               this.dnd.draggedFigure = snapResult.snappedFigure;
@@ -32900,6 +32906,15 @@
                   return 0 /* CommandResult.Success */;
           }
       }
+      beforeHandle(cmd) {
+          switch (cmd.type) {
+              case "DELETE_SHEET":
+                  this.getters.getFigures(cmd.sheetId).forEach((figure) => {
+                      this.dispatch("DELETE_FIGURE", { id: figure.id, sheetId: cmd.sheetId });
+                  });
+                  break;
+          }
+      }
       handle(cmd) {
           switch (cmd.type) {
               case "CREATE_SHEET":
@@ -34662,7 +34677,6 @@
           "getNumberHeaders",
           "getGridLinesVisibility",
           "getNextSheetName",
-          "isEmpty",
           "getSheetSize",
           "getSheetZone",
           "getPaneDivisions",
@@ -35038,14 +35052,6 @@
       // ---------------------------------------------------------------------------
       // Row/Col manipulation
       // ---------------------------------------------------------------------------
-      /**
-       * Check if a zone only contains empty cells
-       */
-      isEmpty(sheetId, zone) {
-          return positions(zone)
-              .map(({ col, row }) => this.getCell({ sheetId, col, row }))
-              .every((cell) => !cell || cell.content === "");
-      }
       getCommandZones(cmd) {
           const zones = [];
           if ("zone" in cmd) {
@@ -37105,6 +37111,7 @@
           "getEvaluatedCell",
           "getEvaluatedCells",
           "getEvaluatedCellsInZone",
+          "isEmpty",
       ];
       shouldRebuildDependenciesGraph = true;
       evaluator;
@@ -37203,6 +37210,14 @@
       getEvaluatedCellsInZone(sheetId, zone) {
           return positions(zone).map(({ col, row }) => this.getters.getEvaluatedCell({ sheetId, col, row }));
       }
+      /**
+       * Check if a zone only contains empty cells
+       */
+      isEmpty(sheetId, zone) {
+          return positions(zone)
+              .map(({ col, row }) => this.getEvaluatedCell({ sheetId, col, row }))
+              .every((cell) => cell.type === CellValueType.empty);
+      }
       // ---------------------------------------------------------------------------
       // Export
       // ---------------------------------------------------------------------------
@@ -46091,6 +46106,9 @@
           this.scrollToSheet();
       }
       onDblClick() {
+          if (this.env.model.getters.isReadonly()) {
+              return;
+          }
           this.startEdition();
       }
       onKeyDown(ev) {
@@ -51715,9 +51733,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.4.24';
-  __info__.date = '2024-02-28T12:27:32.683Z';
-  __info__.hash = '90c74d1';
+  __info__.version = '16.4.26';
+  __info__.date = '2024-03-15T10:58:33.088Z';
+  __info__.hash = 'b8caa0f';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);