@odoo/o-spreadsheet 16.1.23 → 16.1.25

package/dist/o-spreadsheet.cjs.js

@@ -26079,12 +26079,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(" "));
@@ -33020,6 +33023,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         }
         currentRanges = currentRanges.concat(toAdd);
         const newRangesXC = recomputeZones(currentRanges, toRemove);
+        if (newRangesXC.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -39037,11 +39044,19 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
-        // get deduplicated cells in zones
-        const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-            .flat()
-            .filter((cell) => cell.type !== CellValueType.empty));
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = new Set();
+        for (const zone of this.gridSelection.zones) {
+            for (const { col, row } of positions(zone)) {
+                if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                    continue; // Skip hidden cells
+                }
+                const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                if (evaluatedCell.type !== CellValueType.empty) {
+                    cells.add(evaluatedCell);
+                }
+            }
+        }
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -44420,6 +44435,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.1.23';
-__info__.date = '2023-10-10T07:27:03.376Z';
-__info__.hash = '13bfa8f';
+__info__.version = '16.1.25';
+__info__.date = '2023-10-25T10:02:09.978Z';
+__info__.hash = '708e3d8';

package/dist/o-spreadsheet.esm.js

@@ -26075,12 +26075,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(" "));
@@ -33016,6 +33019,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         }
         currentRanges = currentRanges.concat(toAdd);
         const newRangesXC = recomputeZones(currentRanges, toRemove);
+        if (newRangesXC.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -39033,11 +39040,19 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
-        // get deduplicated cells in zones
-        const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-            .flat()
-            .filter((cell) => cell.type !== CellValueType.empty));
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = new Set();
+        for (const zone of this.gridSelection.zones) {
+            for (const { col, row } of positions(zone)) {
+                if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                    continue; // Skip hidden cells
+                }
+                const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                if (evaluatedCell.type !== CellValueType.empty) {
+                    cells.add(evaluatedCell);
+                }
+            }
+        }
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -44388,6 +44403,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, 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, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.1.23';
-__info__.date = '2023-10-10T07:27:03.376Z';
-__info__.hash = '13bfa8f';
+__info__.version = '16.1.25';
+__info__.date = '2023-10-25T10:02:09.978Z';
+__info__.hash = '708e3d8';

package/dist/o-spreadsheet.iife.js

@@ -26076,12 +26076,15 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       };
   }
   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(" "));
@@ -33017,6 +33020,10 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           }
           currentRanges = currentRanges.concat(toAdd);
           const newRangesXC = recomputeZones(currentRanges, toRemove);
+          if (newRangesXC.length === 0) {
+              this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+              return;
+          }
           this.dispatch("ADD_CONDITIONAL_FORMAT", {
               cf: {
                   id: cf.id,
@@ -39034,11 +39041,19 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           }
       }
       getStatisticFnResults() {
-          // get deduplicated cells in zones
-          const cells = new Set(this.gridSelection.zones
-              .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-              .flat()
-              .filter((cell) => cell.type !== CellValueType.empty));
+          const sheetId = this.getters.getActiveSheetId();
+          const cells = new Set();
+          for (const zone of this.gridSelection.zones) {
+              for (const { col, row } of positions(zone)) {
+                  if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                      continue; // Skip hidden cells
+                  }
+                  const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                  if (evaluatedCell.type !== CellValueType.empty) {
+                      cells.add(evaluatedCell);
+                  }
+              }
+          }
           let cellsTypes = new Set();
           let cellsValues = [];
           for (let cell of cells) {
@@ -44419,9 +44434,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.1.23';
-  __info__.date = '2023-10-10T07:27:03.376Z';
-  __info__.hash = '13bfa8f';
+  __info__.version = '16.1.25';
+  __info__.date = '2023-10-25T10:02:09.978Z';
+  __info__.hash = '708e3d8';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);