@odoo/o-spreadsheet 15.2.8 → 15.2.10

package/dist/o-spreadsheet.cjs.js

@@ -2965,6 +2965,36 @@ function lazy(fn) {
     };
     lazyValue.map = (callback) => lazy(() => callback(lazyValue()));
     return lazyValue;
+}
+/**
+ * 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));
+    Object.keys(o2).forEach((key) => keys.add(key));
+    for (let key of keys) {
+        if (typeof o1[key] !== typeof o1[key])
+            return false;
+        if (typeof o1[key] === "object") {
+            if (!deepEquals(o1[key], o2[key]))
+                return false;
+        }
+        else {
+            if (o1[key] !== o2[key])
+                return false;
+        }
+    }
+    return true;
 }
 
 function createDefaultCols(colNumber) {
@@ -19201,6 +19231,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
          */
@@ -19554,13 +19585,20 @@ 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], []);
                     }
                 }
             }
         }
     }
+    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 = ["getConditionalStyle", "getConditionalIcon"];
 EvaluationConditionalFormatPlugin.modes = ["normal"];
@@ -27438,6 +27476,7 @@ class Composer extends owl.Component {
                 this.autocompleteAPI.moveDown();
             }
         }
+        this.updateCursorIfNeeded();
     }
     processTabKey(ev) {
         ev.preventDefault();
@@ -27491,9 +27530,12 @@ class Composer extends owl.Component {
         }
         else {
             ev.stopPropagation();
+            this.updateCursorIfNeeded();
         }
-        const { start, end } = this.contentHelper.getCurrentSelection();
+    }
+    updateCursorIfNeeded() {
         if (!this.getters.isSelectingForComposer()) {
+            const { start, end } = this.contentHelper.getCurrentSelection();
             this.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
             this.isKeyStillDown = true;
         }
@@ -31336,6 +31378,6 @@ exports.registries = registries;
 exports.setTranslationMethod = setTranslationMethod;
 
 
-__info__.version = '15.2.8';
-__info__.date = '2023-06-02T10:11:55.097Z';
-__info__.hash = '3e00f8b';
+__info__.version = '15.2.10';
+__info__.date = '2023-09-21T15:55:12.568Z';
+__info__.hash = '85387c4';

package/dist/o-spreadsheet.d.ts

@@ -2988,6 +2988,7 @@ declare class EvaluationConditionalFormatPlugin extends UIPlugin {
     private isStale;
     private computedStyles;
     private computedIcons;
+    private uuidGenerator;
     handle(cmd: Command): void;
     finalize(): void;
     /**
@@ -3022,6 +3023,7 @@ declare class EvaluationConditionalFormatPlugin extends UIPlugin {
      */
     private adaptRules;
     private pasteCf;
+    private getCFToCopyTo;
 }
 
 /**
@@ -4787,6 +4789,7 @@ declare class Composer extends Component<Props$a, SpreadsheetEnv> {
     onCompositionStart(): void;
     onCompositionEnd(): void;
     onKeydown(ev: KeyboardEvent): void;
+    private updateCursorIfNeeded;
     onInput(): void;
     onKeyup(ev: KeyboardEvent): void;
     onMousedown(ev: MouseEvent): void;

package/dist/o-spreadsheet.esm.js

@@ -2942,6 +2942,36 @@ function lazy(fn) {
     };
     lazyValue.map = (callback) => lazy(() => callback(lazyValue()));
     return lazyValue;
+}
+/**
+ * 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));
+    Object.keys(o2).forEach((key) => keys.add(key));
+    for (let key of keys) {
+        if (typeof o1[key] !== typeof o1[key])
+            return false;
+        if (typeof o1[key] === "object") {
+            if (!deepEquals(o1[key], o2[key]))
+                return false;
+        }
+        else {
+            if (o1[key] !== o2[key])
+                return false;
+        }
+    }
+    return true;
 }
 
 function createDefaultCols(colNumber) {
@@ -19178,6 +19208,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
          */
@@ -19531,13 +19562,20 @@ 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], []);
                     }
                 }
             }
         }
     }
+    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 = ["getConditionalStyle", "getConditionalIcon"];
 EvaluationConditionalFormatPlugin.modes = ["normal"];
@@ -27415,6 +27453,7 @@ class Composer extends Component {
                 this.autocompleteAPI.moveDown();
             }
         }
+        this.updateCursorIfNeeded();
     }
     processTabKey(ev) {
         ev.preventDefault();
@@ -27468,9 +27507,12 @@ class Composer extends Component {
         }
         else {
             ev.stopPropagation();
+            this.updateCursorIfNeeded();
         }
-        const { start, end } = this.contentHelper.getCurrentSelection();
+    }
+    updateCursorIfNeeded() {
         if (!this.getters.isSelectingForComposer()) {
+            const { start, end } = this.contentHelper.getCurrentSelection();
             this.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
             this.isKeyStillDown = true;
         }
@@ -31290,6 +31332,6 @@ const helpers = {
 export { CommandResult, CorePlugin, DATETIME_FORMAT, DataSource, DispatchResult, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, DEBUG as __DEBUG__, __info__, astToFormula, cellTypes, compile, convertAstNodes, coreTypes, functionCache, helpers, invalidateEvaluationCommands, parse, readonlyAllowedCommands, registries, setTranslationMethod };
 
 
-__info__.version = '15.2.8';
-__info__.date = '2023-06-02T10:11:55.097Z';
-__info__.hash = '3e00f8b';
+__info__.version = '15.2.10';
+__info__.date = '2023-09-21T15:55:12.568Z';
+__info__.hash = '85387c4';

package/dist/o-spreadsheet.iife.js

@@ -2962,6 +2962,36 @@
       };
       lazyValue.map = (callback) => lazy(() => callback(lazyValue()));
       return lazyValue;
+  }
+  /**
+   * 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));
+      Object.keys(o2).forEach((key) => keys.add(key));
+      for (let key of keys) {
+          if (typeof o1[key] !== typeof o1[key])
+              return false;
+          if (typeof o1[key] === "object") {
+              if (!deepEquals(o1[key], o2[key]))
+                  return false;
+          }
+          else {
+              if (o1[key] !== o2[key])
+                  return false;
+          }
+      }
+      return true;
   }
 
   function createDefaultCols(colNumber) {
@@ -19198,6 +19228,7 @@
           // 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
            */
@@ -19551,13 +19582,20 @@
                           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], []);
                       }
                   }
               }
           }
       }
+      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 = ["getConditionalStyle", "getConditionalIcon"];
   EvaluationConditionalFormatPlugin.modes = ["normal"];
@@ -27435,6 +27473,7 @@
                   this.autocompleteAPI.moveDown();
               }
           }
+          this.updateCursorIfNeeded();
       }
       processTabKey(ev) {
           ev.preventDefault();
@@ -27488,9 +27527,12 @@
           }
           else {
               ev.stopPropagation();
+              this.updateCursorIfNeeded();
           }
-          const { start, end } = this.contentHelper.getCurrentSelection();
+      }
+      updateCursorIfNeeded() {
           if (!this.getters.isSelectingForComposer()) {
+              const { start, end } = this.contentHelper.getCurrentSelection();
               this.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
               this.isKeyStillDown = true;
           }
@@ -31335,9 +31377,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.2.8';
-  __info__.date = '2023-06-02T10:11:55.097Z';
-  __info__.hash = '3e00f8b';
+  __info__.version = '15.2.10';
+  __info__.date = '2023-09-21T15:55:12.568Z';
+  __info__.hash = '85387c4';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);