@odoo/o-spreadsheet 16.0.18 → 16.0.19

package/dist/o-spreadsheet.cjs.js

@@ -1010,13 +1010,17 @@ function getAddHeaderStartIndex(position, base) {
     return position === "after" ? base + 1 : base;
 }
 /**
- * Compare two objects.
+ * Compares two objects.
  */
 function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
         return false;
+    if (typeof o1 !== typeof o2)
+        return false;
+    if (typeof o1 !== "object")
+        return o1 === o2;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -21300,9 +21304,11 @@ function useCellHovered(env, gridRef, callback) {
         }
     }
     function updateMousePosition(e) {
-        x = e.offsetX;
-        y = e.offsetY;
-        lastMoved = Date.now();
+        if (gridRef.el === e.target) {
+            x = e.offsetX;
+            y = e.offsetY;
+            lastMoved = Date.now();
+        }
     }
     function recompute() {
         const { col, row } = getPosition();
@@ -28946,7 +28952,11 @@ class HeaderSizePlugin extends CorePlugin {
                 let sizes = [...this.sizes[cmd.sheetId][cmd.dimension]];
                 const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
                 const baseSize = sizes[cmd.base];
-                sizes.splice(addIndex, 0, ...Array(cmd.quantity).fill(baseSize));
+                const sizesToInsert = range(0, cmd.quantity).map(() => ({
+                    manualSize: baseSize.manualSize,
+                    computedSize: lazy(baseSize.computedSize()),
+                }));
+                sizes.splice(addIndex, 0, ...sizesToInsert);
                 sizes = sizes.map((size, row) => {
                     if (cmd.dimension === "ROW" && row > cmd.base + cmd.quantity) {
                         // invalidate sizes
@@ -32062,7 +32072,7 @@ class ClipboardPlugin extends UIPlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "CUT":
-                const zones = cmd.target || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 const state = this.getClipboardState(zones, cmd.type);
                 return state.isCutAllowed(zones);
             case "PASTE":
@@ -32093,7 +32103,7 @@ class ClipboardPlugin extends UIPlugin {
         switch (cmd.type) {
             case "COPY":
             case "CUT":
-                const zones = ("target" in cmd && cmd.target) || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 this.state = this.getClipboardState(zones, cmd.type);
                 this.status = "visible";
                 break;
@@ -32711,6 +32721,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         // stores the computed styles in the format of computedStyles.sheetName[col][row] = Style
         this.computedStyles = {};
         this.computedIcons = {};
+        this.uuidGenerator = new UuidGenerator();
         /**
          * Execute the predicate to know if a conditional formatting rule should be applied to a cell
          */
@@ -33062,8 +33073,9 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                         this.adaptRules(origin.sheetId, cf, [xc], toRemoveRange);
                     }
                     else {
-                        this.adaptRules(target.sheetId, cf, [xc], []);
                         this.adaptRules(origin.sheetId, cf, [], toRemoveRange);
+                        const cfToCopyTo = this.getCFToCopyTo(target.sheetId, cf);
+                        this.adaptRules(target.sheetId, cfToCopyTo, [xc], []);
                     }
                 }
             }
@@ -33072,6 +33084,12 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
     isCellValueNumber(value) {
         return typeof value === "number";
     }
+    getCFToCopyTo(targetSheetId, originCF) {
+        const cfInTarget = this.getters
+            .getConditionalFormats(targetSheetId)
+            .find((cf) => cf.stopIfTrue === originCF.stopIfTrue && deepEquals(cf.rule, originCF.rule));
+        return cfInTarget ? cfInTarget : { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+    }
 }
 EvaluationConditionalFormatPlugin.getters = ["getConditionalIcon", "getCellComputedStyle"];
 
@@ -34839,26 +34857,24 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
-        this.dispatch("CUT", {
-            target: [
-                {
-                    left: isCol ? start + deltaCol : 0,
-                    right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? start + deltaRow : 0,
-                    bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
-        this.dispatch("PASTE", {
-            target: [
-                {
-                    left: isCol ? cmd.base : 0,
-                    right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? cmd.base : 0,
-                    bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
+        const target = [
+            {
+                left: isCol ? start + deltaCol : 0,
+                right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? start + deltaRow : 0,
+                bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const pasteTarget = [
+            {
+                left: isCol ? cmd.base : 0,
+                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? cmd.base : 0,
+                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        state.paste(pasteTarget, { selectTarget: true });
         const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = cmd.base;
         for (const element of toRemove) {
@@ -42906,6 +42922,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.18';
-__info__.date = '2023-09-12T11:42:03.083Z';
-__info__.hash = '41fd4fa';
+__info__.version = '16.0.19';
+__info__.date = '2023-09-21T15:56:31.776Z';
+__info__.hash = '229c563';

package/dist/o-spreadsheet.d.ts

@@ -1729,8 +1729,6 @@ interface CopyCommand {
 }
 interface CutCommand {
     type: "CUT";
-    /** Zones to cut. If none were given, will copy the zones in the selection*/
-    target?: Zone[];
 }
 interface PasteCommand {
     type: "PASTE";
@@ -3916,6 +3914,7 @@ declare class EvaluationConditionalFormatPlugin extends UIPlugin {
     private isStale;
     private computedStyles;
     private computedIcons;
+    private uuidGenerator;
     handle(cmd: Command): void;
     finalize(): void;
     getCellComputedStyle(sheetId: UID, col: HeaderIndex, row: HeaderIndex): Style;
@@ -3947,6 +3946,7 @@ declare class EvaluationConditionalFormatPlugin extends UIPlugin {
     private adaptRules;
     private pasteCf;
     private isCellValueNumber;
+    private getCFToCopyTo;
 }
 
 declare class FilterEvaluationPlugin extends UIPlugin {

package/dist/o-spreadsheet.esm.js

@@ -1006,13 +1006,17 @@ function getAddHeaderStartIndex(position, base) {
     return position === "after" ? base + 1 : base;
 }
 /**
- * Compare two objects.
+ * Compares two objects.
  */
 function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
         return false;
+    if (typeof o1 !== typeof o2)
+        return false;
+    if (typeof o1 !== "object")
+        return o1 === o2;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -21296,9 +21300,11 @@ function useCellHovered(env, gridRef, callback) {
         }
     }
     function updateMousePosition(e) {
-        x = e.offsetX;
-        y = e.offsetY;
-        lastMoved = Date.now();
+        if (gridRef.el === e.target) {
+            x = e.offsetX;
+            y = e.offsetY;
+            lastMoved = Date.now();
+        }
     }
     function recompute() {
         const { col, row } = getPosition();
@@ -28942,7 +28948,11 @@ class HeaderSizePlugin extends CorePlugin {
                 let sizes = [...this.sizes[cmd.sheetId][cmd.dimension]];
                 const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
                 const baseSize = sizes[cmd.base];
-                sizes.splice(addIndex, 0, ...Array(cmd.quantity).fill(baseSize));
+                const sizesToInsert = range(0, cmd.quantity).map(() => ({
+                    manualSize: baseSize.manualSize,
+                    computedSize: lazy(baseSize.computedSize()),
+                }));
+                sizes.splice(addIndex, 0, ...sizesToInsert);
                 sizes = sizes.map((size, row) => {
                     if (cmd.dimension === "ROW" && row > cmd.base + cmd.quantity) {
                         // invalidate sizes
@@ -32058,7 +32068,7 @@ class ClipboardPlugin extends UIPlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "CUT":
-                const zones = cmd.target || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 const state = this.getClipboardState(zones, cmd.type);
                 return state.isCutAllowed(zones);
             case "PASTE":
@@ -32089,7 +32099,7 @@ class ClipboardPlugin extends UIPlugin {
         switch (cmd.type) {
             case "COPY":
             case "CUT":
-                const zones = ("target" in cmd && cmd.target) || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 this.state = this.getClipboardState(zones, cmd.type);
                 this.status = "visible";
                 break;
@@ -32707,6 +32717,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         // stores the computed styles in the format of computedStyles.sheetName[col][row] = Style
         this.computedStyles = {};
         this.computedIcons = {};
+        this.uuidGenerator = new UuidGenerator();
         /**
          * Execute the predicate to know if a conditional formatting rule should be applied to a cell
          */
@@ -33058,8 +33069,9 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
                         this.adaptRules(origin.sheetId, cf, [xc], toRemoveRange);
                     }
                     else {
-                        this.adaptRules(target.sheetId, cf, [xc], []);
                         this.adaptRules(origin.sheetId, cf, [], toRemoveRange);
+                        const cfToCopyTo = this.getCFToCopyTo(target.sheetId, cf);
+                        this.adaptRules(target.sheetId, cfToCopyTo, [xc], []);
                     }
                 }
             }
@@ -33068,6 +33080,12 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
     isCellValueNumber(value) {
         return typeof value === "number";
     }
+    getCFToCopyTo(targetSheetId, originCF) {
+        const cfInTarget = this.getters
+            .getConditionalFormats(targetSheetId)
+            .find((cf) => cf.stopIfTrue === originCF.stopIfTrue && deepEquals(cf.rule, originCF.rule));
+        return cfInTarget ? cfInTarget : { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+    }
 }
 EvaluationConditionalFormatPlugin.getters = ["getConditionalIcon", "getCellComputedStyle"];
 
@@ -34835,26 +34853,24 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
-        this.dispatch("CUT", {
-            target: [
-                {
-                    left: isCol ? start + deltaCol : 0,
-                    right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? start + deltaRow : 0,
-                    bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
-        this.dispatch("PASTE", {
-            target: [
-                {
-                    left: isCol ? cmd.base : 0,
-                    right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? cmd.base : 0,
-                    bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
+        const target = [
+            {
+                left: isCol ? start + deltaCol : 0,
+                right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? start + deltaRow : 0,
+                bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const pasteTarget = [
+            {
+                left: isCol ? cmd.base : 0,
+                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? cmd.base : 0,
+                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        state.paste(pasteTarget, { selectTarget: true });
         const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = cmd.base;
         for (const element of toRemove) {
@@ -42874,6 +42890,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.18';
-__info__.date = '2023-09-12T11:42:03.083Z';
-__info__.hash = '41fd4fa';
+__info__.version = '16.0.19';
+__info__.date = '2023-09-21T15:56:31.776Z';
+__info__.hash = '229c563';

package/dist/o-spreadsheet.iife.js

@@ -1007,13 +1007,17 @@
       return position === "after" ? base + 1 : base;
   }
   /**
-   * Compare two objects.
+   * Compares two objects.
    */
   function deepEquals(o1, o2) {
       if (o1 === o2)
           return true;
       if ((o1 && !o2) || (o2 && !o1))
           return false;
+      if (typeof o1 !== typeof o2)
+          return false;
+      if (typeof o1 !== "object")
+          return o1 === o2;
       // Objects can have different keys if the values are undefined
       const keys = new Set();
       Object.keys(o1).forEach((key) => keys.add(key));
@@ -21297,9 +21301,11 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           }
       }
       function updateMousePosition(e) {
-          x = e.offsetX;
-          y = e.offsetY;
-          lastMoved = Date.now();
+          if (gridRef.el === e.target) {
+              x = e.offsetX;
+              y = e.offsetY;
+              lastMoved = Date.now();
+          }
       }
       function recompute() {
           const { col, row } = getPosition();
@@ -28943,7 +28949,11 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   let sizes = [...this.sizes[cmd.sheetId][cmd.dimension]];
                   const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
                   const baseSize = sizes[cmd.base];
-                  sizes.splice(addIndex, 0, ...Array(cmd.quantity).fill(baseSize));
+                  const sizesToInsert = range(0, cmd.quantity).map(() => ({
+                      manualSize: baseSize.manualSize,
+                      computedSize: lazy(baseSize.computedSize()),
+                  }));
+                  sizes.splice(addIndex, 0, ...sizesToInsert);
                   sizes = sizes.map((size, row) => {
                       if (cmd.dimension === "ROW" && row > cmd.base + cmd.quantity) {
                           // invalidate sizes
@@ -32059,7 +32069,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       allowDispatch(cmd) {
           switch (cmd.type) {
               case "CUT":
-                  const zones = cmd.target || this.getters.getSelectedZones();
+                  const zones = this.getters.getSelectedZones();
                   const state = this.getClipboardState(zones, cmd.type);
                   return state.isCutAllowed(zones);
               case "PASTE":
@@ -32090,7 +32100,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           switch (cmd.type) {
               case "COPY":
               case "CUT":
-                  const zones = ("target" in cmd && cmd.target) || this.getters.getSelectedZones();
+                  const zones = this.getters.getSelectedZones();
                   this.state = this.getClipboardState(zones, cmd.type);
                   this.status = "visible";
                   break;
@@ -32708,6 +32718,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           // stores the computed styles in the format of computedStyles.sheetName[col][row] = Style
           this.computedStyles = {};
           this.computedIcons = {};
+          this.uuidGenerator = new UuidGenerator();
           /**
            * Execute the predicate to know if a conditional formatting rule should be applied to a cell
            */
@@ -33059,8 +33070,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                           this.adaptRules(origin.sheetId, cf, [xc], toRemoveRange);
                       }
                       else {
-                          this.adaptRules(target.sheetId, cf, [xc], []);
                           this.adaptRules(origin.sheetId, cf, [], toRemoveRange);
+                          const cfToCopyTo = this.getCFToCopyTo(target.sheetId, cf);
+                          this.adaptRules(target.sheetId, cfToCopyTo, [xc], []);
                       }
                   }
               }
@@ -33069,6 +33081,12 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       isCellValueNumber(value) {
           return typeof value === "number";
       }
+      getCFToCopyTo(targetSheetId, originCF) {
+          const cfInTarget = this.getters
+              .getConditionalFormats(targetSheetId)
+              .find((cf) => cf.stopIfTrue === originCF.stopIfTrue && deepEquals(cf.rule, originCF.rule));
+          return cfInTarget ? cfInTarget : { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+      }
   }
   EvaluationConditionalFormatPlugin.getters = ["getConditionalIcon", "getCellComputedStyle"];
 
@@ -34836,26 +34854,24 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           const isBasedBefore = cmd.base < start;
           const deltaCol = isBasedBefore && isCol ? thickness : 0;
           const deltaRow = isBasedBefore && !isCol ? thickness : 0;
-          this.dispatch("CUT", {
-              target: [
-                  {
-                      left: isCol ? start + deltaCol : 0,
-                      right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
-                      top: !isCol ? start + deltaRow : 0,
-                      bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
-                  },
-              ],
-          });
-          this.dispatch("PASTE", {
-              target: [
-                  {
-                      left: isCol ? cmd.base : 0,
-                      right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                      top: !isCol ? cmd.base : 0,
-                      bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
-                  },
-              ],
-          });
+          const target = [
+              {
+                  left: isCol ? start + deltaCol : 0,
+                  right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
+                  top: !isCol ? start + deltaRow : 0,
+                  bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
+              },
+          ];
+          const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+          const pasteTarget = [
+              {
+                  left: isCol ? cmd.base : 0,
+                  right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                  top: !isCol ? cmd.base : 0,
+                  bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+              },
+          ];
+          state.paste(pasteTarget, { selectTarget: true });
           const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
           let currentIndex = cmd.base;
           for (const element of toRemove) {
@@ -42905,9 +42921,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.18';
-  __info__.date = '2023-09-12T11:42:03.083Z';
-  __info__.hash = '41fd4fa';
+  __info__.version = '16.0.19';
+  __info__.date = '2023-09-21T15:56:31.776Z';
+  __info__.hash = '229c563';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);