@odoo/o-spreadsheet 15.2.9 → 15.2.11

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
          */
@@ -19529,6 +19560,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         }
         currentRanges = currentRanges.concat(toAdd);
         const newRange = recomputeZones(currentRanges, toRemove);
+        if (newRange.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -19554,13 +19589,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"];
@@ -24241,12 +24283,15 @@ function createXMLFile(doc, path, contentType) {
     };
 }
 function xmlEscape(str) {
-    return String(str)
+    return (String(str)
         .replace(/\&/g, "&")
         .replace(/\</g, "&lt;")
         .replace(/\>/g, "&gt;")
         .replace(/\"/g, "&quot;")
-        .replace(/\'/g, "&apos;");
+        .replace(/\'/g, "&apos;")
+        // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+        // They are not valid at all in XML 1.0 (even escaped)
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
 }
 function formatAttributes(attrs) {
     return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -31340,6 +31385,6 @@ exports.registries = registries;
 exports.setTranslationMethod = setTranslationMethod;
 
 
-__info__.version = '15.2.9';
-__info__.date = '2023-06-12T13:42:56.116Z';
-__info__.hash = 'e4aee80';
+__info__.version = '15.2.11';
+__info__.date = '2023-10-19T14:17:12.583Z';
+__info__.hash = 'e13740a';

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;
 }
 
 /**

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
          */
@@ -19506,6 +19537,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         }
         currentRanges = currentRanges.concat(toAdd);
         const newRange = recomputeZones(currentRanges, toRemove);
+        if (newRange.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -19531,13 +19566,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"];
@@ -24218,12 +24260,15 @@ function createXMLFile(doc, path, contentType) {
     };
 }
 function xmlEscape(str) {
-    return String(str)
+    return (String(str)
         .replace(/\&/g, "&")
         .replace(/\</g, "&lt;")
         .replace(/\>/g, "&gt;")
         .replace(/\"/g, "&quot;")
-        .replace(/\'/g, "&apos;");
+        .replace(/\'/g, "&apos;")
+        // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+        // They are not valid at all in XML 1.0 (even escaped)
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
 }
 function formatAttributes(attrs) {
     return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -31294,6 +31339,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.9';
-__info__.date = '2023-06-12T13:42:56.116Z';
-__info__.hash = 'e4aee80';
+__info__.version = '15.2.11';
+__info__.date = '2023-10-19T14:17:12.583Z';
+__info__.hash = 'e13740a';

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
            */
@@ -19526,6 +19557,10 @@
           }
           currentRanges = currentRanges.concat(toAdd);
           const newRange = recomputeZones(currentRanges, toRemove);
+          if (newRange.length === 0) {
+              this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+              return;
+          }
           this.dispatch("ADD_CONDITIONAL_FORMAT", {
               cf: {
                   id: cf.id,
@@ -19551,13 +19586,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"];
@@ -24238,12 +24280,15 @@
       };
   }
   function xmlEscape(str) {
-      return String(str)
+      return (String(str)
           .replace(/\&/g, "&")
           .replace(/\</g, "&lt;")
           .replace(/\>/g, "&gt;")
           .replace(/\"/g, "&quot;")
-          .replace(/\'/g, "&apos;");
+          .replace(/\'/g, "&apos;")
+          // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+          // They are not valid at all in XML 1.0 (even escaped)
+          .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
   }
   function formatAttributes(attrs) {
       return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -31339,9 +31384,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.2.9';
-  __info__.date = '2023-06-12T13:42:56.116Z';
-  __info__.hash = 'e4aee80';
+  __info__.version = '15.2.11';
+  __info__.date = '2023-10-19T14:17:12.583Z';
+  __info__.hash = 'e13740a';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);