@odoo/o-spreadsheet 17.1.2 → 17.1.3

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.1.2
- * @date 2024-01-29T13:54:42.679Z
- * @hash 043a0d5
+ * @version 17.1.3
+ * @date 2024-02-02T13:46:54.332Z
+ * @hash 798f979
  */
 
 (function (exports, owl) {
@@ -5048,8 +5048,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) {
@@ -5062,7 +5064,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)
@@ -6697,6 +6699,7 @@
   };
 
   const macRegex = /Mac/i;
+  const MODIFIER_KEYS = ["Shift", "Control", "Alt", "Meta"];
   /**
    * Return true if the event was triggered from
    * a child element.
@@ -6748,14 +6751,14 @@
    */
   function keyboardEventToShortcutString(ev, mode = "key") {
       let keyDownString = "";
-      if (isCtrlKey(ev) && ev.key !== "Ctrl")
-          keyDownString += "Ctrl+";
-      if (ev.metaKey)
-          keyDownString += "Ctrl+";
-      if (ev.altKey && ev.key !== "Alt")
-          keyDownString += "Alt+";
-      if (ev.shiftKey && ev.key !== "Shift")
-          keyDownString += "Shift+";
+      if (!MODIFIER_KEYS.includes(ev.key)) {
+          if (isCtrlKey(ev))
+              keyDownString += "Ctrl+";
+          if (ev.altKey)
+              keyDownString += "Alt+";
+          if (ev.shiftKey)
+              keyDownString += "Shift+";
+      }
       const key = mode === "key" ? ev.key : ev.code;
       keyDownString += letterRegex.test(key) ? key.toUpperCase() : key;
       return keyDownString;
@@ -20207,19 +20210,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"),
@@ -36029,6 +36033,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;
           }
@@ -36072,12 +36079,12 @@
       /*
        * Reconstructs the original formula string based on a normalized form and its dependencies
        */
-      getFormulaCellContent(sheetId, compiledFormula, dependencies) {
+      getFormulaCellContent(sheetId, compiledFormula, dependencies, useFixedReference = false) {
           let rangeIndex = 0;
           return concat(compiledFormula.tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = dependencies[rangeIndex++];
-                  return this.getters.getRangeString(range, sheetId);
+                  return this.getters.getRangeString(range, sheetId, { useFixedReference });
               }
               return token.value;
           }));
@@ -36348,6 +36355,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;
@@ -36652,7 +36671,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
@@ -36717,11 +36742,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 });
               }),
           };
       }
@@ -38789,8 +38814,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 CellErrorType.InvalidReference;
           }
@@ -38817,7 +38844,7 @@
           if (prefixSheet && !sheetName) {
               return CellErrorType.InvalidReference;
           }
-          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 ||
@@ -38827,7 +38854,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}`;
@@ -38868,13 +38895,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;
               }
@@ -38882,7 +38909,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;
               }
@@ -55234,12 +55261,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) {
@@ -56059,11 +56081,10 @@
                       ({ attrs: additionalAttrs, node: cellNode } = addContent(cell.content, construct.sharedStrings, isTableHeader || isPlainText));
                   }
                   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) {
@@ -56659,7 +56680,6 @@
               ...config,
               mode: config.mode || "normal",
               custom: config.custom || {},
-              defaultCurrencyFormat: config.defaultCurrencyFormat || "[$$]#,##0.00",
               external: this.setupExternalConfig(config.external || {}),
               transportService,
               client,
@@ -56697,6 +56717,7 @@
               custom: this.config.custom,
               uiActions: this.config,
               session: this.session,
+              defaultCurrencyFormat: this.config.defaultCurrencyFormat,
           };
       }
       // ---------------------------------------------------------------------------
@@ -57078,9 +57099,9 @@
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.1.2";
-  __info__.date = "2024-01-29T13:54:42.679Z";
-  __info__.hash = "043a0d5";
+  __info__.version = "17.1.3";
+  __info__.date = "2024-02-02T13:46:54.332Z";
+  __info__.hash = "798f979";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);