@odoo/o-spreadsheet 16.0.64 → 16.0.66

package/dist/o-spreadsheet.cjs.js

@@ -7386,7 +7386,8 @@ function getChartLabelValues(getters, dataSets, labelRange) {
         }
     }
     else if (dataSets.length === 1) {
-        for (let i = 0; i < getData(getters, dataSets[0]).length; i++) {
+        const dataLength = getData(getters, dataSets[0]).length;
+        for (let i = 0; i < dataLength; i++) {
             labels.formattedValues.push("");
             labels.values.push("");
         }
@@ -19591,8 +19592,8 @@ class EditionPlugin extends UIPlugin {
                 break;
             case "STOP_EDITION":
                 if (cmd.cancel) {
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                 }
                 else {
                     this.stopEdition();
@@ -19607,8 +19608,8 @@ class EditionPlugin extends UIPlugin {
                 this.replaceSelection(cmd.text);
                 break;
             case "SELECT_FIGURE":
-                this.cancelEditionAndActivateSheet();
                 this.resetContent();
+                this.cancelEditionAndActivateSheet();
                 break;
             case "ADD_COLUMNS_ROWS":
                 this.onAddElements(cmd);
@@ -19667,8 +19668,8 @@ class EditionPlugin extends UIPlugin {
                 const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                 if (!sheetIdExists && this.mode !== "inactive") {
                     this.sheetId = this.getters.getActiveSheetId();
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                     this.ui.notifyUI({
                         type: "ERROR",
                         text: CELL_DELETED_MESSAGE,
@@ -23731,9 +23732,9 @@ const XLSX_CHART_TYPES = [
 /** In XLSX color format (no #)  */
 const AUTO_COLOR = "000000";
 const XLSX_ICONSET_MAP = {
-    arrow: "3Arrows",
+    arrows: "3Arrows",
     smiley: "3Symbols",
-    dot: "3TrafficLights1",
+    dots: "3TrafficLights1",
 };
 const NAMESPACE = {
     styleSheet: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
@@ -24122,6 +24123,7 @@ const ICON_SET_CONVERSION_MAP = {
 };
 /** Map between legend position in XLSX file and human readable position  */
 const DRAWING_LEGEND_POSITION_CONVERSION_MAP = {
+    none: "none",
     b: "bottom",
     t: "top",
     l: "left",
@@ -26299,7 +26301,7 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
                     ? "right"
                     : "left",
                 legendPosition: DRAWING_LEGEND_POSITION_CONVERSION_MAP[this.extractChildAttr(rootChartElement, "c:legendPos", "val", {
-                    default: "b",
+                    default: "none",
                 }).asString()],
                 stacked: barChartGrouping === "stacked",
                 fontColor: "000000",
@@ -32449,12 +32451,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             for (let c = 0; c < width; c++) {
                 const origin = rowCells[c];
                 const position = { col: col + c, row: row + r, sheetId: sheetId };
-                // TODO: refactor this part. the "Paste merge" action is also executed with
-                // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                // is not appropriate
-                if (this.operation !== "CUT") {
-                    this.pasteMergeIfExist(origin.position, position);
-                }
+                this.pasteMergeIfExist(origin.position, position, this.operation);
                 this.pasteCell(origin, position, this.operation, clipboardOptions);
                 if (shouldPasteCF) {
                     this.dispatch("PASTE_CONDITIONAL_FORMAT", {
@@ -32533,7 +32530,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
      * If the origin position given is the top left of a merge, merge the target
      * position.
      */
-    pasteMergeIfExist(origin, target) {
+    pasteMergeIfExist(origin, target, operation) {
         let { sheetId, col, row } = origin;
         const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(sheetId, col, row);
         if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -32541,6 +32538,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             if (!merge) {
                 return;
             }
+            if (operation === "CUT") {
+                this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+            }
             ({ sheetId, col, row } = target);
             this.dispatch("ADD_MERGE", {
                 sheetId,
@@ -42466,10 +42466,14 @@ function addIconSetRule(cf, rule) {
             continue;
         }
         const cfValueObjectNodes = cfValueObject.map((attrs) => escapeXml /*xml*/ `<cfvo ${formatAttributes(attrs)} />`);
+        const iconSetAttrs = [["iconSet", getIconSet(rule.icons)]];
+        if (isIconSetReversed(rule.icons)) {
+            iconSetAttrs.push(["reverse", "1"]);
+        }
         conditionalFormats.push(escapeXml /*xml*/ `
       <conditionalFormatting sqref="${range}">
         <cfRule ${formatAttributes(ruleAttributes)}>
-          <iconSet iconSet="${getIconSet(rule.icons)}">
+          <iconSet ${formatAttributes(iconSetAttrs)}>
             ${joinXmlNodes(cfValueObjectNodes)}
           </iconSet>
         </cfRule>
@@ -42487,9 +42491,21 @@ function commonCfAttributes(cf) {
         ["stopIfTrue", cf.stopIfTrue ? 1 : 0],
     ];
 }
+function isIconSetReversed(iconSet) {
+    const defaultIconSet = ICON_SETS[detectIconsType(iconSet)];
+    return iconSet.upper === defaultIconSet.bad && iconSet.lower === defaultIconSet.good;
+}
 function getIconSet(iconSet) {
-    return XLSX_ICONSET_MAP[Object.keys(XLSX_ICONSET_MAP).find((key) => iconSet.upper.toLowerCase().startsWith(key)) ||
-        "dots"];
+    return XLSX_ICONSET_MAP[detectIconsType(iconSet)];
+}
+/**
+ * Partial detection based on "upper" point only.
+ * We support any arbitrary icon in the set, while excel doesn't allow
+ * mixing icons from different types.
+ */
+function detectIconsType(iconSet) {
+    const type = Object.keys(ICON_SETS).find((type) => Object.values(ICON_SETS[type]).includes(iconSet.upper)) || "dots";
+    return type;
 }
 function thresholdAttributes(threshold, position) {
     const type = getExcelThresholdType(threshold.type, position);
@@ -43762,6 +43778,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.64';
-__info__.date = '2025-03-07T10:29:50.957Z';
-__info__.hash = '20def15';
+__info__.version = '16.0.66';
+__info__.date = '2025-03-26T12:44:10.381Z';
+__info__.hash = 'e2c1da2';

package/dist/o-spreadsheet.esm.js

@@ -7382,7 +7382,8 @@ function getChartLabelValues(getters, dataSets, labelRange) {
         }
     }
     else if (dataSets.length === 1) {
-        for (let i = 0; i < getData(getters, dataSets[0]).length; i++) {
+        const dataLength = getData(getters, dataSets[0]).length;
+        for (let i = 0; i < dataLength; i++) {
             labels.formattedValues.push("");
             labels.values.push("");
         }
@@ -19587,8 +19588,8 @@ class EditionPlugin extends UIPlugin {
                 break;
             case "STOP_EDITION":
                 if (cmd.cancel) {
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                 }
                 else {
                     this.stopEdition();
@@ -19603,8 +19604,8 @@ class EditionPlugin extends UIPlugin {
                 this.replaceSelection(cmd.text);
                 break;
             case "SELECT_FIGURE":
-                this.cancelEditionAndActivateSheet();
                 this.resetContent();
+                this.cancelEditionAndActivateSheet();
                 break;
             case "ADD_COLUMNS_ROWS":
                 this.onAddElements(cmd);
@@ -19663,8 +19664,8 @@ class EditionPlugin extends UIPlugin {
                 const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                 if (!sheetIdExists && this.mode !== "inactive") {
                     this.sheetId = this.getters.getActiveSheetId();
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                     this.ui.notifyUI({
                         type: "ERROR",
                         text: CELL_DELETED_MESSAGE,
@@ -23727,9 +23728,9 @@ const XLSX_CHART_TYPES = [
 /** In XLSX color format (no #)  */
 const AUTO_COLOR = "000000";
 const XLSX_ICONSET_MAP = {
-    arrow: "3Arrows",
+    arrows: "3Arrows",
     smiley: "3Symbols",
-    dot: "3TrafficLights1",
+    dots: "3TrafficLights1",
 };
 const NAMESPACE = {
     styleSheet: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
@@ -24118,6 +24119,7 @@ const ICON_SET_CONVERSION_MAP = {
 };
 /** Map between legend position in XLSX file and human readable position  */
 const DRAWING_LEGEND_POSITION_CONVERSION_MAP = {
+    none: "none",
     b: "bottom",
     t: "top",
     l: "left",
@@ -26295,7 +26297,7 @@ class XlsxChartExtractor extends XlsxBaseExtractor {
                     ? "right"
                     : "left",
                 legendPosition: DRAWING_LEGEND_POSITION_CONVERSION_MAP[this.extractChildAttr(rootChartElement, "c:legendPos", "val", {
-                    default: "b",
+                    default: "none",
                 }).asString()],
                 stacked: barChartGrouping === "stacked",
                 fontColor: "000000",
@@ -32445,12 +32447,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             for (let c = 0; c < width; c++) {
                 const origin = rowCells[c];
                 const position = { col: col + c, row: row + r, sheetId: sheetId };
-                // TODO: refactor this part. the "Paste merge" action is also executed with
-                // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                // is not appropriate
-                if (this.operation !== "CUT") {
-                    this.pasteMergeIfExist(origin.position, position);
-                }
+                this.pasteMergeIfExist(origin.position, position, this.operation);
                 this.pasteCell(origin, position, this.operation, clipboardOptions);
                 if (shouldPasteCF) {
                     this.dispatch("PASTE_CONDITIONAL_FORMAT", {
@@ -32529,7 +32526,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
      * If the origin position given is the top left of a merge, merge the target
      * position.
      */
-    pasteMergeIfExist(origin, target) {
+    pasteMergeIfExist(origin, target, operation) {
         let { sheetId, col, row } = origin;
         const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(sheetId, col, row);
         if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -32537,6 +32534,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             if (!merge) {
                 return;
             }
+            if (operation === "CUT") {
+                this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+            }
             ({ sheetId, col, row } = target);
             this.dispatch("ADD_MERGE", {
                 sheetId,
@@ -42462,10 +42462,14 @@ function addIconSetRule(cf, rule) {
             continue;
         }
         const cfValueObjectNodes = cfValueObject.map((attrs) => escapeXml /*xml*/ `<cfvo ${formatAttributes(attrs)} />`);
+        const iconSetAttrs = [["iconSet", getIconSet(rule.icons)]];
+        if (isIconSetReversed(rule.icons)) {
+            iconSetAttrs.push(["reverse", "1"]);
+        }
         conditionalFormats.push(escapeXml /*xml*/ `
       <conditionalFormatting sqref="${range}">
         <cfRule ${formatAttributes(ruleAttributes)}>
-          <iconSet iconSet="${getIconSet(rule.icons)}">
+          <iconSet ${formatAttributes(iconSetAttrs)}>
             ${joinXmlNodes(cfValueObjectNodes)}
           </iconSet>
         </cfRule>
@@ -42483,9 +42487,21 @@ function commonCfAttributes(cf) {
         ["stopIfTrue", cf.stopIfTrue ? 1 : 0],
     ];
 }
+function isIconSetReversed(iconSet) {
+    const defaultIconSet = ICON_SETS[detectIconsType(iconSet)];
+    return iconSet.upper === defaultIconSet.bad && iconSet.lower === defaultIconSet.good;
+}
 function getIconSet(iconSet) {
-    return XLSX_ICONSET_MAP[Object.keys(XLSX_ICONSET_MAP).find((key) => iconSet.upper.toLowerCase().startsWith(key)) ||
-        "dots"];
+    return XLSX_ICONSET_MAP[detectIconsType(iconSet)];
+}
+/**
+ * Partial detection based on "upper" point only.
+ * We support any arbitrary icon in the set, while excel doesn't allow
+ * mixing icons from different types.
+ */
+function detectIconsType(iconSet) {
+    const type = Object.keys(ICON_SETS).find((type) => Object.values(ICON_SETS[type]).includes(iconSet.upper)) || "dots";
+    return type;
 }
 function thresholdAttributes(threshold, position) {
     const type = getExcelThresholdType(threshold.type, position);
@@ -43730,6 +43746,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.64';
-__info__.date = '2025-03-07T10:29:50.957Z';
-__info__.hash = '20def15';
+__info__.version = '16.0.66';
+__info__.date = '2025-03-26T12:44:10.381Z';
+__info__.hash = 'e2c1da2';

package/dist/o-spreadsheet.iife.js

@@ -7383,7 +7383,8 @@
           }
       }
       else if (dataSets.length === 1) {
-          for (let i = 0; i < getData(getters, dataSets[0]).length; i++) {
+          const dataLength = getData(getters, dataSets[0]).length;
+          for (let i = 0; i < dataLength; i++) {
               labels.formattedValues.push("");
               labels.values.push("");
           }
@@ -19588,8 +19589,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   break;
               case "STOP_EDITION":
                   if (cmd.cancel) {
-                      this.cancelEditionAndActivateSheet();
                       this.resetContent();
+                      this.cancelEditionAndActivateSheet();
                   }
                   else {
                       this.stopEdition();
@@ -19604,8 +19605,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   this.replaceSelection(cmd.text);
                   break;
               case "SELECT_FIGURE":
-                  this.cancelEditionAndActivateSheet();
                   this.resetContent();
+                  this.cancelEditionAndActivateSheet();
                   break;
               case "ADD_COLUMNS_ROWS":
                   this.onAddElements(cmd);
@@ -19664,8 +19665,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                   if (!sheetIdExists && this.mode !== "inactive") {
                       this.sheetId = this.getters.getActiveSheetId();
-                      this.cancelEditionAndActivateSheet();
                       this.resetContent();
+                      this.cancelEditionAndActivateSheet();
                       this.ui.notifyUI({
                           type: "ERROR",
                           text: CELL_DELETED_MESSAGE,
@@ -23728,9 +23729,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   /** In XLSX color format (no #)  */
   const AUTO_COLOR = "000000";
   const XLSX_ICONSET_MAP = {
-      arrow: "3Arrows",
+      arrows: "3Arrows",
       smiley: "3Symbols",
-      dot: "3TrafficLights1",
+      dots: "3TrafficLights1",
   };
   const NAMESPACE = {
       styleSheet: "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
@@ -24119,6 +24120,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   };
   /** Map between legend position in XLSX file and human readable position  */
   const DRAWING_LEGEND_POSITION_CONVERSION_MAP = {
+      none: "none",
       b: "bottom",
       t: "top",
       l: "left",
@@ -26296,7 +26298,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                       ? "right"
                       : "left",
                   legendPosition: DRAWING_LEGEND_POSITION_CONVERSION_MAP[this.extractChildAttr(rootChartElement, "c:legendPos", "val", {
-                      default: "b",
+                      default: "none",
                   }).asString()],
                   stacked: barChartGrouping === "stacked",
                   fontColor: "000000",
@@ -32446,12 +32448,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               for (let c = 0; c < width; c++) {
                   const origin = rowCells[c];
                   const position = { col: col + c, row: row + r, sheetId: sheetId };
-                  // TODO: refactor this part. the "Paste merge" action is also executed with
-                  // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                  // is not appropriate
-                  if (this.operation !== "CUT") {
-                      this.pasteMergeIfExist(origin.position, position);
-                  }
+                  this.pasteMergeIfExist(origin.position, position, this.operation);
                   this.pasteCell(origin, position, this.operation, clipboardOptions);
                   if (shouldPasteCF) {
                       this.dispatch("PASTE_CONDITIONAL_FORMAT", {
@@ -32530,7 +32527,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
        * If the origin position given is the top left of a merge, merge the target
        * position.
        */
-      pasteMergeIfExist(origin, target) {
+      pasteMergeIfExist(origin, target, operation) {
           let { sheetId, col, row } = origin;
           const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(sheetId, col, row);
           if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -32538,6 +32535,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               if (!merge) {
                   return;
               }
+              if (operation === "CUT") {
+                  this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+              }
               ({ sheetId, col, row } = target);
               this.dispatch("ADD_MERGE", {
                   sheetId,
@@ -42463,10 +42463,14 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               continue;
           }
           const cfValueObjectNodes = cfValueObject.map((attrs) => escapeXml /*xml*/ `<cfvo ${formatAttributes(attrs)} />`);
+          const iconSetAttrs = [["iconSet", getIconSet(rule.icons)]];
+          if (isIconSetReversed(rule.icons)) {
+              iconSetAttrs.push(["reverse", "1"]);
+          }
           conditionalFormats.push(escapeXml /*xml*/ `
       <conditionalFormatting sqref="${range}">
         <cfRule ${formatAttributes(ruleAttributes)}>
-          <iconSet iconSet="${getIconSet(rule.icons)}">
+          <iconSet ${formatAttributes(iconSetAttrs)}>
             ${joinXmlNodes(cfValueObjectNodes)}
           </iconSet>
         </cfRule>
@@ -42484,9 +42488,21 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           ["stopIfTrue", cf.stopIfTrue ? 1 : 0],
       ];
   }
+  function isIconSetReversed(iconSet) {
+      const defaultIconSet = ICON_SETS[detectIconsType(iconSet)];
+      return iconSet.upper === defaultIconSet.bad && iconSet.lower === defaultIconSet.good;
+  }
   function getIconSet(iconSet) {
-      return XLSX_ICONSET_MAP[Object.keys(XLSX_ICONSET_MAP).find((key) => iconSet.upper.toLowerCase().startsWith(key)) ||
-          "dots"];
+      return XLSX_ICONSET_MAP[detectIconsType(iconSet)];
+  }
+  /**
+   * Partial detection based on "upper" point only.
+   * We support any arbitrary icon in the set, while excel doesn't allow
+   * mixing icons from different types.
+   */
+  function detectIconsType(iconSet) {
+      const type = Object.keys(ICON_SETS).find((type) => Object.values(ICON_SETS[type]).includes(iconSet.upper)) || "dots";
+      return type;
   }
   function thresholdAttributes(threshold, position) {
       const type = getExcelThresholdType(threshold.type, position);
@@ -43761,9 +43777,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.64';
-  __info__.date = '2025-03-07T10:29:50.957Z';
-  __info__.hash = '20def15';
+  __info__.version = '16.0.66';
+  __info__.date = '2025-03-26T12:44:10.381Z';
+  __info__.hash = 'e2c1da2';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);