@odoo/o-spreadsheet 16.3.26 → 16.3.29

package/dist/o-spreadsheet.cjs.js

@@ -4794,8 +4794,8 @@ function getGroup(cell, cells, filter) {
         if (x === cell) {
             found = true;
         }
-        const cellValue = evaluateLiteral(x?.content);
-        if (filter(cellValue)) {
+        const cellValue = x?.isFormula ? undefined : evaluateLiteral(x?.content);
+        if (cellValue && filter(cellValue)) {
             group.push(cellValue);
         }
         else {
@@ -17875,7 +17875,7 @@ class SelectionInput extends owl.Component {
             : this.props.ranges
                 ? this.props.ranges.map((xc, id) => ({
                     xc,
-                    id,
+                    id: id + 1,
                     isFocused: false,
                 }))
                 : [];
@@ -21662,7 +21662,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();
@@ -21823,7 +21827,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);
@@ -21850,14 +21854,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 };
 }
@@ -22274,7 +22278,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;
@@ -28795,7 +28799,7 @@ const MIGRATIONS = [
     },
     {
         description: "Change Border description structure",
-        from: 12,
+        from: 12.5,
         to: 13,
         applyMigration(data) {
             for (const borderId in data.borders) {
@@ -30704,6 +30708,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":
@@ -38635,9 +38648,9 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                 break;
             case "FOCUS_RANGE":
             case "CHANGE_RANGE":
-                if (cmd.id !== this.focusedInputId) {
-                    const input = this.inputs[cmd.id];
-                    const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                const input = this.inputs[cmd.id];
+                const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                if (range) {
                     const sheetId = this.getters.getActiveSheetId();
                     const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
                     this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
@@ -42450,6 +42463,9 @@ class BottomBarSheet extends owl.Component {
         this.scrollToSheet();
     }
     onDblClick() {
+        if (this.env.model.getters.isReadonly()) {
+            return;
+        }
         this.startEdition();
     }
     onKeyDown(ev) {
@@ -48033,6 +48049,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.3.26';
-__info__.date = '2024-02-16T14:22:11.270Z';
-__info__.hash = 'ab9abb6';
+__info__.version = '16.3.29';
+__info__.date = '2024-03-15T10:57:27.142Z';
+__info__.hash = 'd86234a';

package/dist/o-spreadsheet.d.ts

@@ -3349,6 +3349,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;

package/dist/o-spreadsheet.esm.js

@@ -4790,8 +4790,8 @@ function getGroup(cell, cells, filter) {
         if (x === cell) {
             found = true;
         }
-        const cellValue = evaluateLiteral(x?.content);
-        if (filter(cellValue)) {
+        const cellValue = x?.isFormula ? undefined : evaluateLiteral(x?.content);
+        if (cellValue && filter(cellValue)) {
             group.push(cellValue);
         }
         else {
@@ -17871,7 +17871,7 @@ class SelectionInput extends Component {
             : this.props.ranges
                 ? this.props.ranges.map((xc, id) => ({
                     xc,
-                    id,
+                    id: id + 1,
                     isFocused: false,
                 }))
                 : [];
@@ -21658,7 +21658,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();
@@ -21819,7 +21823,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);
@@ -21846,14 +21850,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 };
 }
@@ -22270,7 +22274,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;
@@ -28791,7 +28795,7 @@ const MIGRATIONS = [
     },
     {
         description: "Change Border description structure",
-        from: 12,
+        from: 12.5,
         to: 13,
         applyMigration(data) {
             for (const borderId in data.borders) {
@@ -30700,6 +30704,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":
@@ -38631,9 +38644,9 @@ class SelectionInputsManagerPlugin extends UIPlugin {
                 break;
             case "FOCUS_RANGE":
             case "CHANGE_RANGE":
-                if (cmd.id !== this.focusedInputId) {
-                    const input = this.inputs[cmd.id];
-                    const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                const input = this.inputs[cmd.id];
+                const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                if (range) {
                     const sheetId = this.getters.getActiveSheetId();
                     const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
                     this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
@@ -42446,6 +42459,9 @@ class BottomBarSheet extends Component {
         this.scrollToSheet();
     }
     onDblClick() {
+        if (this.env.model.getters.isReadonly()) {
+            return;
+        }
         this.startEdition();
     }
     onKeyDown(ev) {
@@ -48001,6 +48017,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.3.26';
-__info__.date = '2024-02-16T14:22:11.270Z';
-__info__.hash = 'ab9abb6';
+__info__.version = '16.3.29';
+__info__.date = '2024-03-15T10:57:27.142Z';
+__info__.hash = 'd86234a';

package/dist/o-spreadsheet.iife.js

@@ -4791,8 +4791,8 @@
           if (x === cell) {
               found = true;
           }
-          const cellValue = evaluateLiteral(x?.content);
-          if (filter(cellValue)) {
+          const cellValue = x?.isFormula ? undefined : evaluateLiteral(x?.content);
+          if (cellValue && filter(cellValue)) {
               group.push(cellValue);
           }
           else {
@@ -17872,7 +17872,7 @@
               : this.props.ranges
                   ? this.props.ranges.map((xc, id) => ({
                       xc,
-                      id,
+                      id: id + 1,
                       isFocused: false,
                   }))
                   : [];
@@ -21659,7 +21659,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();
@@ -21820,7 +21824,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);
@@ -21847,14 +21851,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 };
   }
@@ -22271,7 +22275,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;
@@ -28792,7 +28796,7 @@
       },
       {
           description: "Change Border description structure",
-          from: 12,
+          from: 12.5,
           to: 13,
           applyMigration(data) {
               for (const borderId in data.borders) {
@@ -30701,6 +30705,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":
@@ -38632,9 +38645,9 @@
                   break;
               case "FOCUS_RANGE":
               case "CHANGE_RANGE":
-                  if (cmd.id !== this.focusedInputId) {
-                      const input = this.inputs[cmd.id];
-                      const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                  const input = this.inputs[cmd.id];
+                  const range = input.ranges.find((range) => range.id === cmd.rangeId);
+                  if (range) {
                       const sheetId = this.getters.getActiveSheetId();
                       const zone = this.getters.getRangeFromSheetXC(sheetId, range?.xc || "A1").zone;
                       this.selection.capture(input, { cell: { col: zone.left, row: zone.top }, zone }, { handleEvent: input.handleEvent.bind(input) });
@@ -42447,6 +42460,9 @@
           this.scrollToSheet();
       }
       onDblClick() {
+          if (this.env.model.getters.isReadonly()) {
+              return;
+          }
           this.startEdition();
       }
       onKeyDown(ev) {
@@ -48032,9 +48048,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.3.26';
-  __info__.date = '2024-02-16T14:22:11.270Z';
-  __info__.hash = 'ab9abb6';
+  __info__.version = '16.3.29';
+  __info__.date = '2024-03-15T10:57:27.142Z';
+  __info__.hash = 'd86234a';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);