@odoo/o-spreadsheet 16.0.33 → 16.0.35

package/dist/o-spreadsheet.cjs.js

@@ -5928,17 +5928,20 @@ rowMenuRegistry
 });
 
 function interactiveRenameSheet(env, sheetId, errorText) {
+    if (env.model.getters.isReadonly()) {
+        return;
+    }
     const placeholder = env.model.getters.getSheetName(sheetId);
     const title = _lt("Rename Sheet");
     const callback = (name) => {
         if (name === null || name === placeholder) {
             return;
         }
-        if (name === "") {
-            interactiveRenameSheet(env, sheetId, _lt("The sheet name cannot be empty."));
-        }
         const result = env.model.dispatch("RENAME_SHEET", { sheetId, name });
         if (!result.isSuccessful) {
+            if (result.reasons.includes(10 /* CommandResult.MissingSheetName */)) {
+                interactiveRenameSheet(env, sheetId, _lt("The sheet name cannot be empty."));
+            }
             if (result.reasons.includes(11 /* CommandResult.DuplicatedSheetName */)) {
                 interactiveRenameSheet(env, sheetId, _lt("A sheet with the name %s already exists. Please select another name.", name));
             }
@@ -21146,6 +21149,9 @@ class FigureComponent extends owl.Component {
                 el === null || el === void 0 ? void 0 : el.focus({ preventScroll: true });
             }
         }, () => [this.env.model.getters.getSelectedFigureId(), this.props.figure.id, this.figureRef.el]);
+        owl.onWillUnmount(() => {
+            this.props.onFigureDeleted();
+        });
     }
     clickAnchor(dirX, dirY, ev) {
         this.props.onClickAnchor(dirX, dirY, ev);
@@ -21163,6 +21169,7 @@ class FigureComponent extends owl.Component {
                 });
                 this.props.onFigureDeleted();
                 ev.preventDefault();
+                ev.stopPropagation();
                 break;
             case "ArrowDown":
             case "ArrowLeft":
@@ -21182,6 +21189,7 @@ class FigureComponent extends owl.Component {
                     y: figure.y + delta[1],
                 });
                 ev.preventDefault();
+                ev.stopPropagation();
                 break;
         }
     }
@@ -21406,6 +21414,7 @@ class FiguresContainer extends owl.Component {
         ev.stopPropagation();
         const initialX = ev.clientX;
         const initialY = ev.clientY;
+        const { scrollX, scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
         const { x: dndInitialX, y: dndInitialY } = this.internalToScreenCoordinates(figure);
         this.dnd.x = dndInitialX;
         this.dnd.y = dndInitialY;
@@ -21424,13 +21433,14 @@ class FiguresContainer extends owl.Component {
             if (dirY < 0) {
                 this.dnd.y = dndInitialY - deltaY;
             }
-            if (this.dnd.x < 0) {
-                this.dnd.width += this.dnd.x;
-                this.dnd.x = 0;
+            // Adjusts figure dimensions to ensure it remains within header boundaries and viewport during resizing.
+            if (this.dnd.x + scrollX <= 0) {
+                this.dnd.width = this.dnd.width + this.dnd.x + scrollX;
+                this.dnd.x = -scrollX;
             }
-            if (this.dnd.y < 0) {
-                this.dnd.height += this.dnd.y;
-                this.dnd.y = 0;
+            if (this.dnd.y + scrollY <= 0) {
+                this.dnd.height = this.dnd.height + this.dnd.y + scrollY;
+                this.dnd.y = -scrollY;
             }
         };
         const onMouseUp = (ev) => {
@@ -28800,6 +28810,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":
@@ -34948,6 +34967,7 @@ class GridSelectionPlugin extends UIPlugin {
                 this.gridSelection.zones = this.gridSelection.zones.map((z) => this.getters.expandZone(sheetId, z));
                 this.gridSelection.anchor.zone = this.getters.expandZone(sheetId, this.gridSelection.anchor.zone);
                 this.setSelectionMixin(this.gridSelection.anchor, this.gridSelection.zones);
+                this.selectedFigureId = null;
                 break;
         }
         /** Any change to the selection has to be  reflected in the selection processor. */
@@ -43271,6 +43291,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.33';
-__info__.date = '2024-02-16T14:49:10.674Z';
-__info__.hash = 'c0cefe8';
+__info__.version = '16.0.35';
+__info__.date = '2024-03-15T10:57:14.362Z';
+__info__.hash = '5cba28b';

package/dist/o-spreadsheet.d.ts

@@ -3328,6 +3328,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 updateFigure;
     private addFigure;

package/dist/o-spreadsheet.esm.js

@@ -5924,17 +5924,20 @@ rowMenuRegistry
 });
 
 function interactiveRenameSheet(env, sheetId, errorText) {
+    if (env.model.getters.isReadonly()) {
+        return;
+    }
     const placeholder = env.model.getters.getSheetName(sheetId);
     const title = _lt("Rename Sheet");
     const callback = (name) => {
         if (name === null || name === placeholder) {
             return;
         }
-        if (name === "") {
-            interactiveRenameSheet(env, sheetId, _lt("The sheet name cannot be empty."));
-        }
         const result = env.model.dispatch("RENAME_SHEET", { sheetId, name });
         if (!result.isSuccessful) {
+            if (result.reasons.includes(10 /* CommandResult.MissingSheetName */)) {
+                interactiveRenameSheet(env, sheetId, _lt("The sheet name cannot be empty."));
+            }
             if (result.reasons.includes(11 /* CommandResult.DuplicatedSheetName */)) {
                 interactiveRenameSheet(env, sheetId, _lt("A sheet with the name %s already exists. Please select another name.", name));
             }
@@ -21142,6 +21145,9 @@ class FigureComponent extends Component {
                 el === null || el === void 0 ? void 0 : el.focus({ preventScroll: true });
             }
         }, () => [this.env.model.getters.getSelectedFigureId(), this.props.figure.id, this.figureRef.el]);
+        onWillUnmount(() => {
+            this.props.onFigureDeleted();
+        });
     }
     clickAnchor(dirX, dirY, ev) {
         this.props.onClickAnchor(dirX, dirY, ev);
@@ -21159,6 +21165,7 @@ class FigureComponent extends Component {
                 });
                 this.props.onFigureDeleted();
                 ev.preventDefault();
+                ev.stopPropagation();
                 break;
             case "ArrowDown":
             case "ArrowLeft":
@@ -21178,6 +21185,7 @@ class FigureComponent extends Component {
                     y: figure.y + delta[1],
                 });
                 ev.preventDefault();
+                ev.stopPropagation();
                 break;
         }
     }
@@ -21402,6 +21410,7 @@ class FiguresContainer extends Component {
         ev.stopPropagation();
         const initialX = ev.clientX;
         const initialY = ev.clientY;
+        const { scrollX, scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
         const { x: dndInitialX, y: dndInitialY } = this.internalToScreenCoordinates(figure);
         this.dnd.x = dndInitialX;
         this.dnd.y = dndInitialY;
@@ -21420,13 +21429,14 @@ class FiguresContainer extends Component {
             if (dirY < 0) {
                 this.dnd.y = dndInitialY - deltaY;
             }
-            if (this.dnd.x < 0) {
-                this.dnd.width += this.dnd.x;
-                this.dnd.x = 0;
+            // Adjusts figure dimensions to ensure it remains within header boundaries and viewport during resizing.
+            if (this.dnd.x + scrollX <= 0) {
+                this.dnd.width = this.dnd.width + this.dnd.x + scrollX;
+                this.dnd.x = -scrollX;
             }
-            if (this.dnd.y < 0) {
-                this.dnd.height += this.dnd.y;
-                this.dnd.y = 0;
+            if (this.dnd.y + scrollY <= 0) {
+                this.dnd.height = this.dnd.height + this.dnd.y + scrollY;
+                this.dnd.y = -scrollY;
             }
         };
         const onMouseUp = (ev) => {
@@ -28796,6 +28806,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":
@@ -34944,6 +34963,7 @@ class GridSelectionPlugin extends UIPlugin {
                 this.gridSelection.zones = this.gridSelection.zones.map((z) => this.getters.expandZone(sheetId, z));
                 this.gridSelection.anchor.zone = this.getters.expandZone(sheetId, this.gridSelection.anchor.zone);
                 this.setSelectionMixin(this.gridSelection.anchor, this.gridSelection.zones);
+                this.selectedFigureId = null;
                 break;
         }
         /** Any change to the selection has to be  reflected in the selection processor. */
@@ -43239,6 +43259,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.33';
-__info__.date = '2024-02-16T14:49:10.674Z';
-__info__.hash = 'c0cefe8';
+__info__.version = '16.0.35';
+__info__.date = '2024-03-15T10:57:14.362Z';
+__info__.hash = '5cba28b';

package/dist/o-spreadsheet.iife.js

@@ -5925,17 +5925,20 @@
   });
 
   function interactiveRenameSheet(env, sheetId, errorText) {
+      if (env.model.getters.isReadonly()) {
+          return;
+      }
       const placeholder = env.model.getters.getSheetName(sheetId);
       const title = _lt("Rename Sheet");
       const callback = (name) => {
           if (name === null || name === placeholder) {
               return;
           }
-          if (name === "") {
-              interactiveRenameSheet(env, sheetId, _lt("The sheet name cannot be empty."));
-          }
           const result = env.model.dispatch("RENAME_SHEET", { sheetId, name });
           if (!result.isSuccessful) {
+              if (result.reasons.includes(10 /* CommandResult.MissingSheetName */)) {
+                  interactiveRenameSheet(env, sheetId, _lt("The sheet name cannot be empty."));
+              }
               if (result.reasons.includes(11 /* CommandResult.DuplicatedSheetName */)) {
                   interactiveRenameSheet(env, sheetId, _lt("A sheet with the name %s already exists. Please select another name.", name));
               }
@@ -21143,6 +21146,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   el === null || el === void 0 ? void 0 : el.focus({ preventScroll: true });
               }
           }, () => [this.env.model.getters.getSelectedFigureId(), this.props.figure.id, this.figureRef.el]);
+          owl.onWillUnmount(() => {
+              this.props.onFigureDeleted();
+          });
       }
       clickAnchor(dirX, dirY, ev) {
           this.props.onClickAnchor(dirX, dirY, ev);
@@ -21160,6 +21166,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   });
                   this.props.onFigureDeleted();
                   ev.preventDefault();
+                  ev.stopPropagation();
                   break;
               case "ArrowDown":
               case "ArrowLeft":
@@ -21179,6 +21186,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                       y: figure.y + delta[1],
                   });
                   ev.preventDefault();
+                  ev.stopPropagation();
                   break;
           }
       }
@@ -21403,6 +21411,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           ev.stopPropagation();
           const initialX = ev.clientX;
           const initialY = ev.clientY;
+          const { scrollX, scrollY } = this.env.model.getters.getActiveSheetScrollInfo();
           const { x: dndInitialX, y: dndInitialY } = this.internalToScreenCoordinates(figure);
           this.dnd.x = dndInitialX;
           this.dnd.y = dndInitialY;
@@ -21421,13 +21430,14 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               if (dirY < 0) {
                   this.dnd.y = dndInitialY - deltaY;
               }
-              if (this.dnd.x < 0) {
-                  this.dnd.width += this.dnd.x;
-                  this.dnd.x = 0;
+              // Adjusts figure dimensions to ensure it remains within header boundaries and viewport during resizing.
+              if (this.dnd.x + scrollX <= 0) {
+                  this.dnd.width = this.dnd.width + this.dnd.x + scrollX;
+                  this.dnd.x = -scrollX;
               }
-              if (this.dnd.y < 0) {
-                  this.dnd.height += this.dnd.y;
-                  this.dnd.y = 0;
+              if (this.dnd.y + scrollY <= 0) {
+                  this.dnd.height = this.dnd.height + this.dnd.y + scrollY;
+                  this.dnd.y = -scrollY;
               }
           };
           const onMouseUp = (ev) => {
@@ -28797,6 +28807,15 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   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":
@@ -34945,6 +34964,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   this.gridSelection.zones = this.gridSelection.zones.map((z) => this.getters.expandZone(sheetId, z));
                   this.gridSelection.anchor.zone = this.getters.expandZone(sheetId, this.gridSelection.anchor.zone);
                   this.setSelectionMixin(this.gridSelection.anchor, this.gridSelection.zones);
+                  this.selectedFigureId = null;
                   break;
           }
           /** Any change to the selection has to be  reflected in the selection processor. */
@@ -43270,9 +43290,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.33';
-  __info__.date = '2024-02-16T14:49:10.674Z';
-  __info__.hash = 'c0cefe8';
+  __info__.version = '16.0.35';
+  __info__.date = '2024-03-15T10:57:14.362Z';
+  __info__.hash = '5cba28b';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);