@odoo/o-spreadsheet 18.3.8 → 18.3.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 18.3.8
- * @date 2025-06-12T09:51:55.929Z
- * @hash 32dedd1
+ * @version 18.3.10
+ * @date 2025-06-23T15:05:03.747Z
+ * @hash 748e300
  */
 
 (function (exports, owl) {
@@ -142,6 +142,7 @@
   const FROZEN_PANE_BORDER_COLOR = "#DADFE8";
   const COMPOSER_ASSISTANT_COLOR = "#9B359B";
   const COLOR_TRANSPARENT = "#00000000";
+  const TABLE_HOVER_BACKGROUND_COLOR = "#017E8414";
   const CHART_WATERFALL_POSITIVE_COLOR = "#4EA7F2";
   const CHART_WATERFALL_NEGATIVE_COLOR = "#EA6175";
   const CHART_WATERFALL_SUBTOTAL_COLOR = "#AAAAAA";
@@ -7121,6 +7122,63 @@
       };
       return osClipboardContent;
   }
+  /**
+   * Applies each clipboard handler to paste its corresponding data into the target.
+   */
+  const applyClipboardHandlersPaste = (handlers, copiedData, target, options) => {
+      handlers.forEach(({ handlerName, handler }) => {
+          const data = copiedData[handlerName];
+          if (data) {
+              handler.paste(target, data, options);
+          }
+      });
+  };
+  /**
+   * Returns the paste target based on clipboard handlers.
+   * Also includes the full affected zone and the list of pasted zones for selection.
+   */
+  function getPasteTargetFromHandlers(sheetId, zones, copiedData, handlers, options) {
+      let zone = undefined;
+      let selectedZones = [];
+      let target = {
+          sheetId,
+          zones,
+      };
+      for (const { handlerName, handler } of handlers) {
+          const handlerData = copiedData[handlerName];
+          if (!handlerData) {
+              continue;
+          }
+          const currentTarget = handler.getPasteTarget(sheetId, zones, handlerData, options);
+          if (currentTarget.figureId) {
+              target.figureId = currentTarget.figureId;
+          }
+          for (const targetZone of currentTarget.zones) {
+              selectedZones.push(targetZone);
+              if (zone === undefined) {
+                  zone = targetZone;
+                  continue;
+              }
+              zone = union(zone, targetZone);
+          }
+      }
+      return {
+          target,
+          zone,
+          selectedZones,
+      };
+  }
+  /**
+   * Updates the selection after a paste operation.
+   */
+  const selectPastedZone = (selection, sourceZones, pastedZones) => {
+      const anchorCell = {
+          col: sourceZones[0].left,
+          row: sourceZones[0].top,
+      };
+      selection.getBackToDefault();
+      selection.selectZone({ cell: anchorCell, zone: union(...pastedZones) }, { scrollIntoView: false });
+  };
 
   class ClipboardHandler {
       getters;
@@ -20952,6 +21010,7 @@ stores.inject(MyMetaStore, storeInstance);
           if (isTrendLineAxis(dataset.xAxisID) || dataset.hidden) {
               continue;
           }
+          const yAxisScale = chart.scales[dataset.yAxisID];
           for (let i = 0; i < dataset._parsed.length; i++) {
               const parsedValue = dataset._parsed[i];
               const value = Number(chart.config.type === "radar" ? parsedValue.r : parsedValue.y);
@@ -20962,10 +21021,18 @@ stores.inject(MyMetaStore, storeInstance);
               const xPosition = point.x;
               let yPosition = 0;
               if (chart.config.type === "line" || chart.config.type === "radar") {
-                  yPosition = point.y - 10;
+                  yPosition = value < 0 ? point.y + 10 : point.y - 10;
               }
               else {
-                  yPosition = value < 0 ? point.y - point.height / 2 : point.y + point.height / 2;
+                  const yZeroLine = yAxisScale.getPixelForValue(0);
+                  const distanceFromAxisOrigin = Math.abs(yZeroLine - point.y);
+                  const textHeight = 12; // ChartJS default text height
+                  if (distanceFromAxisOrigin < textHeight) {
+                      yPosition = value < 0 ? yZeroLine + textHeight / 2 : yZeroLine - textHeight / 2;
+                  }
+                  else {
+                      yPosition = value < 0 ? point.y - point.height / 2 : point.y + point.height / 2;
+                  }
               }
               yPosition = Math.min(yPosition, yMax);
               yPosition = Math.max(yPosition, yMin);
@@ -20975,7 +21042,7 @@ stores.inject(MyMetaStore, storeInstance);
               }
               for (const otherPosition of textsPositions[xPosition] || []) {
                   if (Math.abs(otherPosition - yPosition) < 13) {
-                      yPosition = otherPosition - 13;
+                      yPosition = value < 0 ? otherPosition + 13 : otherPosition - 13;
                   }
               }
               textsPositions[xPosition].push(yPosition);
@@ -20994,6 +21061,8 @@ stores.inject(MyMetaStore, storeInstance);
           if (isTrendLineAxis(dataset.xAxisID)) {
               return; // ignore trend lines
           }
+          const xAxisScale = chart.scales[dataset.xAxisID];
+          const xZeroLine = xAxisScale.getPixelForValue(0);
           for (let i = 0; i < dataset._parsed.length; i++) {
               const value = Number(dataset._parsed[i].x);
               if (isNaN(value)) {
@@ -21002,17 +21071,27 @@ stores.inject(MyMetaStore, storeInstance);
               const displayValue = options.callback(value, dataset, i);
               const point = dataset.data[i];
               const yPosition = point.y;
-              let xPosition = value < 0 ? point.x + point.width / 2 : point.x - point.width / 2;
-              xPosition = Math.min(xPosition, xMax);
-              xPosition = Math.max(xPosition, xMin);
+              const textWidth = computeTextWidth(ctx, displayValue, { fontSize: 12 }, "px");
+              const distanceFromAxisOrigin = Math.abs(point.x - xZeroLine);
+              const PADDING = 3;
+              let xPosition;
+              if (distanceFromAxisOrigin < textWidth) {
+                  xPosition =
+                      value < 0 ? xZeroLine - textWidth / 2 - PADDING : xZeroLine + textWidth / 2 + PADDING;
+              }
+              else {
+                  xPosition = value < 0 ? point.x + point.width / 2 : point.x - point.width / 2;
+                  xPosition = Math.min(xPosition, xMax);
+                  xPosition = Math.max(xPosition, xMin);
+              }
               // Avoid overlapping texts with same Y
               if (!textsPositions[yPosition]) {
                   textsPositions[yPosition] = [];
               }
-              const textWidth = computeTextWidth(ctx, displayValue, { fontSize: 12 }, "px");
               for (const otherPosition of textsPositions[yPosition]) {
                   if (Math.abs(otherPosition - xPosition) < textWidth) {
-                      xPosition = otherPosition + textWidth + 3;
+                      xPosition =
+                          value < 0 ? otherPosition - textWidth - PADDING : otherPosition + textWidth + PADDING;
                   }
               }
               textsPositions[yPosition].push(xPosition);
@@ -26399,7 +26478,9 @@ stores.inject(MyMetaStore, storeInstance);
           background: definition.background,
           callback: (value, dataset) => {
               value = Math.abs(Number(value));
-              return formatChartDatasetValue(axisFormats, locale)(value, dataset.xAxisID || "x");
+              return value === 0
+                  ? ""
+                  : formatChartDatasetValue(axisFormats, locale)(value, dataset.xAxisID || "x");
           },
       };
   }
@@ -37132,6 +37213,10 @@ stores.inject(MyMetaStore, storeInstance);
       });
   };
   const CAN_REMOVE_COLUMNS_ROWS = (dimension, env) => {
+      if ((dimension === "COL" && env.model.getters.getActiveRows().size > 0) ||
+          (dimension === "ROW" && env.model.getters.getActiveCols().size > 0)) {
+          return false;
+      }
       const sheetId = env.model.getters.getActiveSheetId();
       const selectedElements = env.model.getters.getElementsFromSelection(dimension);
       const includesAllVisibleHeaders = env.model.getters.checkElementsIncludeAllVisibleHeaders(sheetId, dimension, selectedElements);
@@ -40029,11 +40114,11 @@ stores.inject(MyMetaStore, storeInstance);
        * transformation function given
        */
       addTransformation(executed, toTransforms, fn) {
-          for (let toTransform of toTransforms) {
-              if (!this.content[toTransform]) {
-                  this.content[toTransform] = new Map();
-              }
-              this.content[toTransform].set(executed, fn);
+          if (!this.content[executed]) {
+              this.content[executed] = new Map();
+          }
+          for (const toTransform of toTransforms) {
+              this.content[executed].set(toTransform, fn);
           }
           return this;
       }
@@ -40042,7 +40127,7 @@ stores.inject(MyMetaStore, storeInstance);
        * that the executed command happened.
        */
       getTransformation(toTransform, executed) {
-          return this.content[toTransform] && this.content[toTransform].get(executed);
+          return this.content[executed] && this.content[executed].get(toTransform);
       }
   }
   const otRegistry = new OTRegistry();
@@ -43332,6 +43417,12 @@ stores.inject(MyMetaStore, storeInstance);
           owl.useEffect(() => {
               this.processTokenAtCursor();
           }, () => [this.props.composerStore.editionMode !== "inactive"]);
+          owl.useEffect(() => {
+              this.contentHelper.scrollSelectionIntoView();
+          }, () => [
+              this.props.composerStore.composerSelection.start,
+              this.props.composerStore.composerSelection.end,
+          ]);
       }
       // ---------------------------------------------------------------------------
       // Handlers
@@ -43554,6 +43645,7 @@ stores.inject(MyMetaStore, storeInstance);
               // not main button, probably a context menu
               return;
           }
+          this.debouncedHover.stopDebounce();
           this.contentHelper.removeSelection();
       }
       onMouseup() {
@@ -43632,7 +43724,6 @@ stores.inject(MyMetaStore, storeInstance);
                   const { start, end } = this.props.composerStore.composerSelection;
                   this.contentHelper.selectRange(start, end);
               }
-              this.contentHelper.scrollSelectionIntoView();
           }
           this.shouldProcessInputEvents = true;
       }
@@ -49789,7 +49880,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       getTypeFromZone(sheetId, zone) {
           const cells = this.getters.getEvaluatedCellsInZone(sheetId, zone);
-          const nonEmptyCells = cells.filter((cell) => cell.type !== CellValueType.empty);
+          const nonEmptyCells = cells.filter((cell) => !(cell.type === CellValueType.empty || cell.value === ""));
           if (nonEmptyCells.length === 0) {
               return "integer";
           }
@@ -53506,15 +53597,16 @@ stores.inject(MyMetaStore, storeInstance);
       }
   }
 
+  const PAINT_FORMAT_HANDLER_KEYS = [
+      "cell",
+      "border",
+      "table",
+      "conditionalFormat",
+      "merge",
+  ];
   class PaintFormatStore extends SpreadsheetStore {
       mutators = ["activate", "cancel", "pasteFormat"];
       highlightStore = this.get(HighlightStore);
-      clipboardHandlers = [
-          new CellClipboardHandler(this.getters, this.model.dispatch),
-          new BorderClipboardHandler(this.getters, this.model.dispatch),
-          new TableClipboardHandler(this.getters, this.model.dispatch),
-          new ConditionalFormatClipboardHandler(this.getters, this.model.dispatch),
-      ];
       status = "inactive";
       copiedData;
       constructor(get) {
@@ -53545,24 +53637,38 @@ stores.inject(MyMetaStore, storeInstance);
       get isActive() {
           return this.status !== "inactive";
       }
+      get clipboardHandlers() {
+          return PAINT_FORMAT_HANDLER_KEYS.map((handlerName) => {
+              const HandlerClass = clipboardHandlersRegistries.cellHandlers.get(handlerName);
+              return {
+                  handlerName,
+                  handler: new HandlerClass(this.getters, this.model.dispatch),
+              };
+          });
+      }
       copyFormats() {
           const sheetId = this.getters.getActiveSheetId();
           const zones = this.getters.getSelectedZones();
-          const copiedData = {};
-          for (const handler of this.clipboardHandlers) {
-              Object.assign(copiedData, handler.copy(getClipboardDataPositions(sheetId, zones), false));
+          const copiedData = { zones, sheetId };
+          for (const { handlerName, handler } of this.clipboardHandlers) {
+              const handlerResult = handler.copy(getClipboardDataPositions(sheetId, zones), false);
+              if (handlerResult !== undefined) {
+                  copiedData[handlerName] = handlerResult;
+              }
           }
           return copiedData;
       }
       paintFormat(sheetId, target) {
-          if (this.copiedData) {
-              for (const handler of this.clipboardHandlers) {
-                  handler.paste({ zones: target, sheetId }, this.copiedData, {
-                      isCutOperation: false,
-                      pasteOption: "onlyFormat",
-                  });
-              }
+          if (!this.copiedData) {
+              return;
           }
+          const options = {
+              isCutOperation: false,
+              pasteOption: "onlyFormat",
+          };
+          const { target: pasteTarget, selectedZones } = getPasteTargetFromHandlers(sheetId, target, this.copiedData, this.clipboardHandlers, options);
+          applyClipboardHandlersPaste(this.clipboardHandlers, this.copiedData, pasteTarget, options);
+          selectPastedZone(this.model.selection, target, selectedZones);
           if (this.status === "oneOff") {
               this.cancel();
           }
@@ -53609,12 +53715,8 @@ stores.inject(MyMetaStore, storeInstance);
           this.row = undefined;
       }
       computeOverlay() {
-          if (!this.getters.isDashboard()) {
-              return;
-          }
           this.overlayColors = new PositionMap();
-          const col = this.col;
-          const row = this.row;
+          const { col, row } = this;
           if (col === undefined || row === undefined) {
               return;
           }
@@ -53623,9 +53725,16 @@ stores.inject(MyMetaStore, storeInstance);
           if (!table) {
               return;
           }
-          const { left, right } = table.range.zone;
-          for (let c = left; c <= right; c++) {
-              this.overlayColors.set({ sheetId, col: c, row }, setColorAlpha("#017E84", 0.08));
+          const { left, right, top } = table.range.zone;
+          const isTableHeader = row < top + table.config.numberOfHeaders;
+          const doesTableRowHaveContent = range(left, right + 1).some((col) => {
+              return (!this.getters.isColHidden(sheetId, col) &&
+                  this.getters.getEvaluatedCell({ sheetId, col, row }).formattedValue);
+          });
+          if (!isTableHeader && doesTableRowHaveContent) {
+              for (let col = left; col <= right; col++) {
+                  this.overlayColors.set({ sheetId, col, row }, TABLE_HOVER_BACKGROUND_COLOR);
+              }
           }
       }
   }
@@ -58972,7 +59081,7 @@ stores.inject(MyMetaStore, storeInstance);
           else if (newRule.criterion.type === "isValueInList") {
               newRule.criterion.values = Array.from(new Set(newRule.criterion.values));
           }
-          const adaptedRules = this.removeRangesFromRules(sheetId, newRule.ranges, rules);
+          const adaptedRules = this.removeRangesFromRules(sheetId, newRule.ranges, rules, newRule.id);
           const ruleIndex = adaptedRules.findIndex((rule) => rule.id === newRule.id);
           if (ruleIndex !== -1) {
               adaptedRules[ruleIndex] = newRule;
@@ -58982,9 +59091,12 @@ stores.inject(MyMetaStore, storeInstance);
               this.history.update("rules", sheetId, [...adaptedRules, newRule]);
           }
       }
-      removeRangesFromRules(sheetId, ranges, rules) {
+      removeRangesFromRules(sheetId, ranges, rules, editingRuleId) {
           rules = deepCopy(rules);
           for (const rule of rules) {
+              if (rule.id === editingRuleId) {
+                  continue; // Skip the rule being edited to preserve its place in the list
+              }
               rule.ranges = this.getters.recomputeRanges(rule.ranges, ranges);
           }
           return rules.filter((rule) => rule.ranges.length > 0);
@@ -67777,10 +67889,20 @@ stores.inject(MyMetaStore, storeInstance);
    */
   function transformAll(toTransform, executed) {
       let transformedCommands = [...toTransform];
+      const possibleTransformations = new Set(otRegistry.getKeys());
       for (const executedCommand of executed) {
-          transformedCommands = transformedCommands
-              .map((cmd) => transform(cmd, executedCommand))
-              .filter(isDefined);
+          // If the executed command is not in the registry, we skip it
+          // because we know there won't be any transformation impacting the
+          // commands to transform.
+          if (possibleTransformations.has(executedCommand.type)) {
+              transformedCommands = transformedCommands.reduce((acc, cmd) => {
+                  const transformed = transform(cmd, executedCommand);
+                  if (transformed) {
+                      acc.push(transformed);
+                  }
+                  return acc;
+              }, []);
+          }
       }
       return transformedCommands;
   }
@@ -69482,7 +69604,7 @@ stores.inject(MyMetaStore, storeInstance);
                   }
                   const position = this.getters.getCellPosition(cell.id);
                   const colSize = this.getters.getColSize(sheetId, position.col);
-                  if (cell.isFormula) {
+                  if (cell.isFormula || this.getters.getArrayFormulaSpreadingOn(position)) {
                       const content = this.getters.getEvaluatedCell(position).formattedValue;
                       const evaluatedSize = getCellContentHeight(this.ctx, content, cell?.style, colSize);
                       if (evaluatedSize > evaluatedRowSize && evaluatedSize > DEFAULT_CELL_HEIGHT) {
@@ -70802,49 +70924,17 @@ stores.inject(MyMetaStore, storeInstance);
           if (!copiedData) {
               return;
           }
-          let zone = undefined;
-          let selectedZones = [];
           const sheetId = this.getters.getActiveSheetId();
-          let target = {
-              sheetId,
-              zones,
-          };
           const handlers = this.selectClipboardHandlers(copiedData);
-          for (const { handlerName, handler } of handlers) {
-              const handlerData = copiedData[handlerName];
-              if (!handlerData) {
-                  continue;
-              }
-              const currentTarget = handler.getPasteTarget(sheetId, zones, handlerData, options);
-              if (currentTarget.figureId) {
-                  target.figureId = currentTarget.figureId;
-              }
-              for (const targetZone of currentTarget.zones) {
-                  selectedZones.push(targetZone);
-                  if (zone === undefined) {
-                      zone = targetZone;
-                      continue;
-                  }
-                  zone = union(zone, targetZone);
-              }
-          }
+          const { target, zone, selectedZones } = getPasteTargetFromHandlers(sheetId, zones, copiedData, handlers, options);
           if (zone !== undefined) {
-              this.addMissingDimensions(this.getters.getActiveSheetId(), zone.right - zone.left + 1, zone.bottom - zone.top + 1, zone.left, zone.top);
+              this.addMissingDimensions(sheetId, zone.right - zone.left + 1, zone.bottom - zone.top + 1, zone.left, zone.top);
           }
-          handlers.forEach(({ handlerName, handler }) => {
-              const handlerData = copiedData[handlerName];
-              if (handlerData) {
-                  handler.paste(target, handlerData, options);
-              }
-          });
+          applyClipboardHandlersPaste(handlers, copiedData, target, options);
           if (!options?.selectTarget) {
               return;
           }
-          const selection = zones[0];
-          const col = selection.left;
-          const row = selection.top;
-          this.selection.getBackToDefault();
-          this.selection.selectZone({ cell: { col, row }, zone: union(...selectedZones) }, { scrollIntoView: false });
+          selectPastedZone(this.selection, zones, selectedZones);
       }
       /**
        * Add columns and/or rows to ensure that col + width and row + height are still
@@ -80667,9 +80757,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.3.8";
-  __info__.date = "2025-06-12T09:51:55.929Z";
-  __info__.hash = "32dedd1";
+  __info__.version = "18.3.10";
+  __info__.date = "2025-06-23T15:05:03.747Z";
+  __info__.hash = "748e300";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);