@odoo/o-spreadsheet 16.0.42 → 16.0.44

package/dist/o-spreadsheet.iife.js

@@ -2298,8 +2298,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;
   }
 
   /** Methods from Odoo Web Utils  */
@@ -4020,6 +4023,7 @@
   }
 
   const macRegex = /Mac/i;
+  const MODIFIER_KEYS = ["Shift", "Control", "Alt", "Meta"];
   /**
    * Return true if the event was triggered from
    * a child element.
@@ -4038,6 +4042,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));
   }
@@ -6972,8 +7001,8 @@
       const dataSets = [];
       for (const sheetXC of dataSetsString) {
           const dataRange = getters.getRangeFromSheetXC(sheetId, sheetXC);
-          const { unboundedZone: zone, sheetId: dataSetSheetId, invalidSheetName } = dataRange;
-          if (invalidSheetName) {
+          const { unboundedZone: zone, sheetId: dataSetSheetId, invalidSheetName, invalidXc } = dataRange;
+          if (invalidSheetName || invalidXc) {
               continue;
           }
           // It's a rectangle. We treat all columns (arbitrary) as different data series.
@@ -7366,7 +7395,7 @@
           super(definition, sheetId, getters);
           this.type = "bar";
           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;
@@ -7662,7 +7691,7 @@
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
           this.type = "gauge";
-          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;
       }
@@ -7993,7 +8022,7 @@
           super(definition, sheetId, getters);
           this.type = "line";
           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;
@@ -8267,7 +8296,7 @@
           super(definition, sheetId, getters);
           this.type = "pie";
           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;
       }
@@ -8425,8 +8454,8 @@
       constructor(definition, sheetId, getters) {
           super(definition, sheetId, getters);
           this.type = "scorecard";
-          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;
@@ -20579,8 +20608,15 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       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
@@ -20590,10 +20626,6 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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") {
@@ -20910,10 +20942,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       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();
@@ -21199,7 +21228,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       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(),
@@ -21229,6 +21259,22 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   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;
           }
       }
   }
@@ -23251,15 +23297,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   }
   class LinkCell extends AbstractCell {
       constructor(id, content, properties = {}) {
-          var _a;
           const link = parseMarkdownLink(content);
-          properties = {
-              ...properties,
-              style: {
-                  ...properties.style,
-                  textColor: ((_a = properties.style) === null || _a === void 0 ? void 0 : _a.textColor) || LINK_COLOR,
-              },
-          };
           link.label = _t(link.label);
           super(id, lazy({ value: link.label, type: CellValueType.text }), properties);
           this.link = link;
@@ -27825,6 +27863,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   BordersPlugin.getters = ["getCellBorder"];
 
   const nbspRegexp = new RegExp(String.fromCharCode(160), "g");
+  const LINK_STYLE = { textColor: LINK_COLOR };
   /**
    * Core Plugin
    *
@@ -28059,7 +28098,11 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           return this.buildFormulaContent(sheetId, cell);
       }
       getCellStyle(cell) {
-          return (cell && cell.style) || {};
+          if (!cell) {
+              return {};
+          }
+          const linkStyle = cell.isLink() ? LINK_STYLE : {};
+          return { ...linkStyle, ...cell.style };
       }
       /**
        * Converts a zone to a XC coordinate system
@@ -40628,6 +40671,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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;
           }
@@ -41766,6 +41812,12 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       else {
           // Shouldn't we always output the value then ?
           const value = cell.value;
+          // 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 === "")
+              return undefined;
           const type = getCellType(value);
           attrs.push(["t", type]);
           node = escapeXml /*xml*/ `<v>${value}</v>`;
@@ -42488,7 +42540,11 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   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);
@@ -43326,9 +43382,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.42';
-  __info__.date = '2024-05-24T11:24:56.581Z';
-  __info__.hash = 'fd11d19';
+  __info__.version = '16.0.44';
+  __info__.date = '2024-06-10T09:32:19.116Z';
+  __info__.hash = '25d16f6';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);