@odoo/o-spreadsheet 16.4.33 → 16.4.36

package/dist/o-spreadsheet.iife.js

@@ -3233,8 +3233,11 @@
   /**
    * Create a range from a xc. If the xc is empty, this function returns undefined.
    */
-  function createRange(getters, sheetId, range) {
-      return range ? getters.getRangeFromSheetXC(sheetId, range) : undefined;
+  function createValidRange(getters, sheetId, xc) {
+      if (!xc)
+          return;
+      const range = getters.getRangeFromSheetXC(sheetId, xc);
+      return !(range.invalidSheetName || range.invalidXc) ? range : undefined;
   }
   /**
    * Spread multiple colrows zone to one row/col zone and add a many new input range as needed.
@@ -5701,6 +5704,7 @@
   };
 
   const macRegex = /Mac/i;
+  const MODIFIER_KEYS = ["Shift", "Control", "Alt", "Meta"];
   /**
    * Return true if the event was triggered from
    * a child element.
@@ -5739,6 +5743,31 @@
   function getOpenedMenus() {
       return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
   }
+  const letterRegex = /^[a-zA-Z]$/;
+  /**
+   * Transform a keyboard event into a shortcut string that represent this event. The letters keys will be uppercased.
+   *
+   * @argument ev - The keyboard event to transform
+   * @argument mode - Use either ev.key of ev.code to get the string shortcut
+   *
+   * @example
+   * event : { ctrlKey: true, key: "a" } => "Ctrl+A"
+   * event : { shift: true, alt: true, key: "Home" } => "Alt+Shift+Home"
+   */
+  function keyboardEventToShortcutString(ev, mode = "key") {
+      let keyDownString = "";
+      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;
+  }
   function isMacOS() {
       return Boolean(macRegex.test(navigator.userAgent));
   }
@@ -5757,8 +5786,7 @@
    */
   function useSpreadsheetRect() {
       const position = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
-      let spreadsheetElement = document.querySelector(".o-spreadsheet");
-      updatePosition();
+      let spreadsheetElement = null;
       function updatePosition() {
           if (!spreadsheetElement) {
               spreadsheetElement = document.querySelector(".o-spreadsheet");
@@ -16539,7 +16567,7 @@
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
           this.dataSets = createDataSets(getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-          this.labelRange = createRange(getters, sheetId, definition.labelRange);
+          this.labelRange = createValidRange(getters, sheetId, definition.labelRange);
           this.background = definition.background;
           this.verticalAxisPosition = definition.verticalAxisPosition;
           this.legendPosition = definition.legendPosition;
@@ -16784,7 +16812,7 @@
       type = "gauge";
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
-          this.dataRange = createRange(this.getters, this.sheetId, definition.dataRange);
+          this.dataRange = createValidRange(this.getters, this.sheetId, definition.dataRange);
           this.sectionRule = definition.sectionRule;
           this.background = definition.background;
       }
@@ -17123,7 +17151,7 @@
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
           this.dataSets = createDataSets(this.getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-          this.labelRange = createRange(this.getters, sheetId, definition.labelRange);
+          this.labelRange = createValidRange(this.getters, sheetId, definition.labelRange);
           this.background = definition.background;
           this.verticalAxisPosition = definition.verticalAxisPosition;
           this.legendPosition = definition.legendPosition;
@@ -17421,7 +17449,7 @@
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
           this.dataSets = createDataSets(getters, definition.dataSets, sheetId, definition.dataSetsHaveTitle);
-          this.labelRange = createRange(getters, sheetId, definition.labelRange);
+          this.labelRange = createValidRange(getters, sheetId, definition.labelRange);
           this.background = definition.background;
           this.legendPosition = definition.legendPosition;
           this.aggregated = definition.aggregated;
@@ -17589,8 +17617,8 @@
       type = "scorecard";
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
-          this.keyValue = createRange(getters, sheetId, definition.keyValue);
-          this.baseline = createRange(getters, sheetId, definition.baseline);
+          this.keyValue = createValidRange(getters, sheetId, definition.keyValue);
+          this.baseline = createValidRange(getters, sheetId, definition.baseline);
           this.baselineMode = definition.baselineMode;
           this.baselineDescr = definition.baselineDescr;
           this.background = definition.background;
@@ -20949,7 +20977,7 @@
           }
           const getters = this.env.model.getters;
           const sheetId = getters.getActiveSheetId();
-          const labelRange = createRange(getters, sheetId, this.labelRange);
+          const labelRange = createValidRange(getters, sheetId, this.labelRange);
           const dataSets = createDataSets(getters, this.dataSeriesRanges, sheetId, this.props.definition.dataSetsHaveTitle);
           if (dataSets.length) {
               return dataSets[0].dataRange.zone.top + 1;
@@ -23414,14 +23442,14 @@
       }
       onKeyDown(ev) {
           const figure = this.props.figure;
-          switch (ev.key) {
+          const keyDownShortcut = keyboardEventToShortcutString(ev);
+          switch (keyDownShortcut) {
               case "Delete":
                   this.env.model.dispatch("DELETE_FIGURE", {
                       sheetId: this.env.model.getters.getActiveSheetId(),
                       id: figure.id,
                   });
                   this.props.onFigureDeleted();
-                  ev.stopPropagation();
                   ev.preventDefault();
                   ev.stopPropagation();
                   break;
@@ -23442,7 +23470,22 @@
                       x: figure.x + delta[0],
                       y: figure.y + delta[1],
                   });
+                  ev.preventDefault();
                   ev.stopPropagation();
+                  break;
+              case "Ctrl+A":
+                  // Maybe in the future we will implement a way to select all figures
+                  ev.preventDefault();
+                  ev.stopPropagation();
+                  break;
+              case "Ctrl+Y":
+              case "Ctrl+Z":
+                  if (keyDownShortcut === "Ctrl+Y") {
+                      this.env.model.dispatch("REQUEST_REDO");
+                  }
+                  else if (keyDownShortcut === "Ctrl+Z") {
+                      this.env.model.dispatch("REQUEST_UNDO");
+                  }
                   ev.preventDefault();
                   ev.stopPropagation();
                   break;
@@ -24167,7 +24210,7 @@
           Enter: this.processEnterKey,
           Escape: this.processEscapeKey,
           F2: () => console.warn("Not implemented"),
-          F4: this.processF4Key,
+          F4: (ev) => this.processF4Key(ev),
           Tab: (ev) => this.processTabKey(ev),
       };
       keyCodeMapping = {
@@ -24269,9 +24312,10 @@
       processEscapeKey() {
           this.env.model.dispatch("STOP_EDITION", { cancel: true });
       }
-      processF4Key() {
+      processF4Key(ev) {
           this.env.model.dispatch("CYCLE_EDITION_REFERENCES");
           this.processContent();
+          ev.stopPropagation();
       }
       processNumpadDecimal(ev) {
           ev.stopPropagation();
@@ -24312,8 +24356,15 @@
       }
       onPaste(ev) {
           if (this.env.model.getters.getEditionMode() !== "inactive") {
+              // let the browser clipboard work
               ev.stopPropagation();
           }
+          else {
+              // the user meant to paste in the sheet, not open the composer with the pasted content
+              // While we're not editing, we still have the focus and should therefore prevent
+              // the native "paste" to occur.
+              ev.preventDefault();
+          }
       }
       /*
        * Triggered automatically by the content-editable between the keydown and key up
@@ -24322,10 +24373,6 @@
           if (!this.shouldProcessInputEvents) {
               return;
           }
-          if (ev.inputType === "insertFromPaste" &&
-              this.env.model.getters.getEditionMode() === "inactive") {
-              return;
-          }
           ev.stopPropagation();
           let content;
           if (this.env.model.getters.getEditionMode() === "inactive") {
@@ -24756,10 +24803,7 @@
       }
       get containerStyle() {
           if (this.env.model.getters.getEditionMode() === "inactive" || !this.rect) {
-              return `
-        position: absolute;
-        z-index: -1000;
-      `;
+              return `z-index: -1000;`;
           }
           const isFormula = this.env.model.getters.getCurrentContent().startsWith("=");
           const cell = this.env.model.getters.getActiveCell();
@@ -33987,7 +34031,12 @@
        * if they have at least a common cell
        */
       doesIntersectMerge(sheetId, zone) {
-          return positions(zone).some(({ col, row }) => this.getMerge({ sheetId, col, row }) !== undefined);
+          for (const merge of this.getMerges(sheetId)) {
+              if (overlap(zone, merge)) {
+                  return true;
+              }
+          }
+          return false;
       }
       /**
        * Returns true if two columns have at least one merge in common
@@ -34584,6 +34633,9 @@
           if (range.invalidXc) {
               return range.invalidXc;
           }
+          if (!this.getters.tryGetSheet(range.sheetId)) {
+              return INCORRECT_RANGE_STRING;
+          }
           if (range.zone.bottom - range.zone.top < 0 || range.zone.right - range.zone.left < 0) {
               return INCORRECT_RANGE_STRING;
           }
@@ -37635,16 +37687,22 @@
               let newContent = undefined;
               let newFormat = undefined;
               let isExported = true;
+              const exportedSheetData = data.sheets.find((sheet) => sheet.id === position.sheetId);
               const formulaCell = this.getCorrespondingFormulaCell(position);
               if (formulaCell) {
                   isExported = isExportableToExcel(formulaCell.compiledFormula.tokens);
                   isFormula = isExported;
                   if (!isExported) {
-                      newContent = value.toString();
-                      newFormat = evaluatedCell.format;
+                      // If the cell contains a non-exported formula and that is evaluates to
+                      // nothing* ,we don't export it.
+                      // * non-falsy value are relevant and so are 0 and FALSE, which only leaves
+                      // the empty string.
+                      if (value !== "") {
+                          newContent = value.toString();
+                          newFormat = evaluatedCell.format;
+                      }
                   }
               }
-              const exportedSheetData = data.sheets.find((sheet) => sheet.id === position.sheetId);
               const exportedCellData = exportedSheetData.cells[xc] || {};
               const format = newFormat
                   ? getItemId(newFormat, data.formats)
@@ -43428,7 +43486,7 @@
               case "ADD_COLUMNS_ROWS": {
                   this.status = "invisible";
                   // If we add a col/row inside or before the cut area, we invalidate the clipboard
-                  if (this.state?.operation !== "CUT") {
+                  if (this.state?.operation !== "CUT" || cmd.sheetId !== this.state?.sheetId) {
                       return;
                   }
                   const isClipboardDirty = this.state.isColRowDirtyingClipboard(cmd.position === "before" ? cmd.base : cmd.base + 1, cmd.dimension);
@@ -43440,7 +43498,7 @@
               case "REMOVE_COLUMNS_ROWS": {
                   this.status = "invisible";
                   // If we remove a col/row inside or before the cut area, we invalidate the clipboard
-                  if (this.state?.operation !== "CUT") {
+                  if (this.state?.operation !== "CUT" || cmd.sheetId !== this.state?.sheetId) {
                       return;
                   }
                   for (let el of cmd.elements) {
@@ -46515,9 +46573,11 @@
           if (ev.key === "Enter") {
               ev.preventDefault();
               this.stopEdition();
+              this.env.focusableElement.focus();
           }
           if (ev.key === "Escape") {
               this.cancelEdition();
+              this.env.focusableElement.focus();
           }
       }
       onClickSheetName(ev) {
@@ -48279,6 +48339,10 @@
           });
           owl.useExternalListener(window, "resize", () => this.render(true));
           owl.useExternalListener(window, "beforeunload", this.unbindModelEvents.bind(this));
+          // For some reason, the wheel event is not properly registered inside templates
+          // in Chromium-based browsers based on chromium 125
+          // This hack ensures the event declared in the template is properly registered/working
+          owl.useExternalListener(document.body, "wheel", () => { });
           this.bindModelEvents();
           owl.onMounted(() => {
               this.checkViewportSize();
@@ -51129,7 +51193,11 @@
                   let cellNode = escapeXml ``;
                   // Either formula or static value inside the cell
                   if (cell.isFormula) {
-                      ({ attrs: additionalAttrs, node: cellNode } = addFormula(cell));
+                      const res = addFormula(cell);
+                      if (!res) {
+                          continue;
+                      }
+                      ({ attrs: additionalAttrs, node: cellNode } = res);
                   }
                   else if (cell.content && isMarkdownLink(cell.content)) {
                       const { label } = parseMarkdownLink(cell.content);
@@ -52126,9 +52194,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.4.33';
-  __info__.date = '2024-05-15T09:17:20.683Z';
-  __info__.hash = '53b07e5';
+  __info__.version = '16.4.36';
+  __info__.date = '2024-06-10T09:33:43.623Z';
+  __info__.hash = '3b15ed5';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);