@odoo/o-spreadsheet 17.0.9 → 17.0.10

package/dist/o-spreadsheet.iife.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.9
- * @date 2024-01-29T13:53:22.963Z
- * @hash 3c1209a
+ * @version 17.0.10
+ * @date 2024-02-02T13:48:28.727Z
+ * @hash be06aa9
  */
 
 (function (exports, owl) {
@@ -4933,14 +4933,8 @@
                       : undefined));
               }
           }
-          else if (zone.left === zone.right && zone.top === zone.bottom) {
-              // A single cell. If it's only the title, the dataset is not added.
-              if (!dataSetsHaveTitle) {
-                  dataSets.push(createDataSet(getters, dataSetSheetId, zone, undefined));
-              }
-          }
           else {
-              /* 1 row or 1 column */
+              /* 1 cell, 1 row or 1 column */
               dataSets.push(createDataSet(getters, dataSetSheetId, zone, dataSetsHaveTitle
                   ? {
                       top: zone.top,
@@ -4989,8 +4983,10 @@
       }
       const dataRange = ds.dataRange.clone({ zone: dataZone });
       return {
-          label: ds.labelCell ? getters.getRangeString(ds.labelCell, "forceSheetReference") : undefined,
-          range: getters.getRangeString(dataRange, "forceSheetReference"),
+          label: ds.labelCell
+              ? getters.getRangeString(ds.labelCell, "forceSheetReference", { useFixedReference: true })
+              : undefined,
+          range: getters.getRangeString(dataRange, "forceSheetReference", { useFixedReference: true }),
       };
   }
   function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
@@ -5003,7 +4999,7 @@
           zone.top = zone.top + 1;
       }
       const range = labelRange.clone({ zone });
-      return getters.getRangeString(range, "forceSheetReference");
+      return getters.getRangeString(range, "forceSheetReference", { useFixedReference: true });
   }
   /**
    * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -8593,7 +8589,7 @@
               return undefined;
           const dataSets = this.dataSets
               .map((ds) => toExcelDataset(this.getters, ds))
-              .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+              .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
           const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
           return {
               ...this.getDefinition(),
@@ -9171,7 +9167,7 @@
               return undefined;
           const dataSets = this.dataSets
               .map((ds) => toExcelDataset(this.getters, ds))
-              .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+              .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
           const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
           return {
               ...this.getDefinition(),
@@ -9477,7 +9473,7 @@
               return undefined;
           const dataSets = this.dataSets
               .map((ds) => toExcelDataset(this.getters, ds))
-              .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
+              .filter((ds) => ds.range !== "" && ds.range !== INCORRECT_RANGE_STRING);
           const labelRange = toExcelLabelRange(this.getters, this.labelRange, shouldRemoveFirstLabel(this.labelRange, this.dataSets[0], this.dataSetsHaveTitle));
           return {
               ...this.getDefinition(),
@@ -19920,19 +19916,20 @@
   const formatNumberCurrency = createFormatActionSpec({
       name: _t("Currency"),
       descriptionValue: 1000.12,
-      format: (env) => env.model.config.defaultCurrencyFormat,
+      format: (env) => env.model.config.defaultCurrencyFormat ?? DEFAULT_CURRENCY_FORMAT,
   });
   const formatNumberCurrencyRounded = {
       ...createFormatActionSpec({
           name: _t("Currency rounded"),
           descriptionValue: 1000,
-          format: (env) => roundFormat(env.model.config.defaultCurrencyFormat),
+          format: (env) => roundFormat(env.model.config.defaultCurrencyFormat ?? DEFAULT_CURRENCY_FORMAT),
       }),
       isVisible: (env) => {
           const currencyFormat = env.model.config.defaultCurrencyFormat;
-          return currencyFormat !== roundFormat(currencyFormat);
+          return currencyFormat !== roundFormat(currencyFormat ?? DEFAULT_CURRENCY_FORMAT);
       },
   };
+  const DEFAULT_CURRENCY_FORMAT = "[$$]#,##0.00";
   const EXAMPLE_DATE = parseLiteral("2023/09/26 10:43:00 PM", DEFAULT_LOCALE);
   const formatCustomCurrency = {
       name: _t("Custom currency"),
@@ -29352,6 +29349,7 @@
       GROUP_HEADERS: groupHeadersMenuRegistry,
       UNGROUP_HEADERS: unGroupHeadersMenuRegistry,
   };
+  const MODIFIER_KEYS = ["Shift", "Control", "Alt", "Meta"];
   // -----------------------------------------------------------------------------
   // JS
   // -----------------------------------------------------------------------------
@@ -29724,16 +29722,15 @@
           }
       }
       onKeydown(ev) {
-          const eventKey = ev.key.toUpperCase();
           let keyDownString = "";
-          if (isCtrlKey(ev) && eventKey !== "CTRL")
-              keyDownString += "CTRL+";
-          if (ev.metaKey)
-              keyDownString += "CTRL+";
-          if (ev.altKey && eventKey !== "ALT")
-              keyDownString += "ALT+";
-          if (ev.shiftKey && eventKey !== "SHIFT")
-              keyDownString += "SHIFT+";
+          if (!MODIFIER_KEYS.includes(ev.key)) {
+              if (isCtrlKey(ev))
+                  keyDownString += "CTRL+";
+              if (ev.altKey)
+                  keyDownString += "ALT+";
+              if (ev.shiftKey)
+                  keyDownString += "SHIFT+";
+          }
           keyDownString += ev.key.toUpperCase();
           let handler = this.keyDownMapping[keyDownString];
           if (handler) {
@@ -35571,6 +35568,9 @@
                       format: cell.format ? getItemId(cell.format, formats) : undefined,
                       content: cell.content || undefined,
                   };
+                  if (cell instanceof FormulaCellWithDependencies) {
+                      cells[xc].content = cell.contentWithFixedReferences || undefined;
+                  }
               }
               _sheet.cells = cells;
           }
@@ -35614,13 +35614,13 @@
       /*
        * Reconstructs the original formula string based on a normalized form and its dependencies
        */
-      getFormulaCellContent(sheetId, compiledFormula, dependencies) {
+      getFormulaCellContent(sheetId, compiledFormula, dependencies, useFixedReference = false) {
           const ranges = dependencies || compiledFormula.dependencies;
           let rangeIndex = 0;
           return concat(compiledFormula.tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = ranges[rangeIndex++];
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, { useFixedReference });
               }
               return token.value;
           }));
@@ -35889,6 +35889,18 @@
       get content() {
           return concat(this.compiledFormula.tokens.map((token) => token.value));
       }
+      get contentWithFixedReferences() {
+          let rangeIndex = 0;
+          return concat(this.compiledFormula.tokens.map((token) => {
+              if (token.type === "REFERENCE") {
+                  const index = rangeIndex++;
+                  return this.getRangeString(this.compiledFormula.dependencies[index], this.sheetId, {
+                      useFixedReference: true,
+                  });
+              }
+              return token.value;
+          }));
+      }
   }
   class RangeReferenceToken {
       getValue;
@@ -36193,7 +36205,13 @@
           }
       }
       exportForExcel(data) {
-          this.export(data);
+          if (data.sheets) {
+              for (let sheet of data.sheets) {
+                  if (this.cfRules[sheet.id]) {
+                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                  }
+              }
+          }
       }
       // ---------------------------------------------------------------------------
       // Getters
@@ -36258,11 +36276,11 @@
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
-      mapToConditionalFormat(sheetId, cf) {
+      mapToConditionalFormat(sheetId, cf, { useFixedReference } = { useFixedReference: false }) {
           return {
               ...cf,
               ranges: cf.ranges.map((range) => {
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, { useFixedReference });
               }),
           };
       }
@@ -38330,8 +38348,10 @@
        *
        * @param range the range (received from getRangeFromXC or getRangeFromZone)
        * @param forSheetId the id of the sheet where the range string is supposed to be used.
+       * @param options
+       * @param options.useFixedReference if true, the range will be returned with fixed row and column
        */
-      getRangeString(range, forSheetId) {
+      getRangeString(range, forSheetId, options = { useFixedReference: false }) {
           if (!range) {
               return INCORRECT_RANGE_STRING;
           }
@@ -38358,7 +38378,7 @@
           if (prefixSheet && !sheetName) {
               return INCORRECT_RANGE_STRING;
           }
-          let rangeString = this.getRangePartString(rangeImpl, 0);
+          let rangeString = this.getRangePartString(rangeImpl, 0, options);
           if (rangeImpl.parts && rangeImpl.parts.length === 2) {
               // this if converts A2:A2 into A2 except if any part of the original range had fixed row or column (with $)
               if (rangeImpl.zone.top !== rangeImpl.zone.bottom ||
@@ -38368,7 +38388,7 @@
                   rangeImpl.parts[1].rowFixed ||
                   rangeImpl.parts[1].colFixed) {
                   rangeString += ":";
-                  rangeString += this.getRangePartString(rangeImpl, 1);
+                  rangeString += this.getRangePartString(rangeImpl, 1, options);
               }
           }
           return `${prefixSheet ? sheetName + "!" : ""}${rangeString}`;
@@ -38409,13 +38429,13 @@
       /**
        * Get a Xc string that represent a part of a range
        */
-      getRangePartString(range, part) {
+      getRangePartString(range, part, options = { useFixedReference: false }) {
           const colFixed = range.parts && range.parts[part]?.colFixed ? "$" : "";
           const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
           const rowFixed = range.parts && range.parts[part]?.rowFixed ? "$" : "";
           const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
           let str = "";
-          if (range.isFullCol) {
+          if (range.isFullCol && !options.useFixedReference) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -38423,7 +38443,7 @@
                   str = colFixed + col;
               }
           }
-          else if (range.isFullRow) {
+          else if (range.isFullRow && !options.useFixedReference) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -54950,12 +54970,7 @@
           attrs.push(["t", "str"]);
           cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
       }
-      node = escapeXml /*xml*/ `
-      <f>
-        ${XlsxFormula}
-      </f>
-      ${cycle}
-    `;
+      node = escapeXml /*xml*/ `<f>${XlsxFormula}</f>${cycle}`;
       return { attrs, node };
   }
   function addContent(content, sharedStrings, forceString = false) {
@@ -55774,11 +55789,10 @@
                       ({ attrs: additionalAttrs, node: cellNode } = addContent(cell.content, construct.sharedStrings, isTableHeader));
                   }
                   attributes.push(...additionalAttrs);
-                  cellNodes.push(escapeXml /*xml*/ `
-          <c ${formatAttributes(attributes)}>
-            ${cellNode}
-          </c>
-        `);
+                  // prettier-ignore
+                  cellNodes.push(escapeXml /*xml*/ `<c ${formatAttributes(attributes)}>
+  ${cellNode}
+</c>`);
               }
           }
           if (cellNodes.length || row.size !== DEFAULT_CELL_HEIGHT || row.isHidden) {
@@ -56374,7 +56388,6 @@
               ...config,
               mode: config.mode || "normal",
               custom: config.custom || {},
-              defaultCurrencyFormat: config.defaultCurrencyFormat || "[$$]#,##0.00",
               external: this.setupExternalConfig(config.external || {}),
               transportService,
               client,
@@ -56412,6 +56425,7 @@
               custom: this.config.custom,
               uiActions: this.config,
               session: this.session,
+              defaultCurrencyFormat: this.config.defaultCurrencyFormat,
           };
       }
       // ---------------------------------------------------------------------------
@@ -56784,9 +56798,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.0.9";
-  __info__.date = "2024-01-29T13:53:22.963Z";
-  __info__.hash = "3c1209a";
+  __info__.version = "17.0.10";
+  __info__.date = "2024-02-02T13:48:28.727Z";
+  __info__.hash = "be06aa9";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);