@odoo/o-spreadsheet 18.0.34 → 18.0.35

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.0.34
- * @date 2025-06-19T18:26:11.726Z
- * @hash 5526881
+ * @version 18.0.35
+ * @date 2025-06-23T15:06:32.032Z
+ * @hash a38db25
  */
 
 (function (exports, owl) {
@@ -6662,6 +6662,63 @@
           data: spreadsheetContent,
       };
   }
+  /**
+   * 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;
@@ -44615,7 +44672,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";
           }
@@ -48148,15 +48205,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) {
@@ -48187,24 +48245,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)));
+          const copiedData = { zones, sheetId };
+          for (const { handlerName, handler } of this.clipboardHandlers) {
+              const handlerResult = handler.copy(getClipboardDataPositions(sheetId, zones));
+              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();
           }
@@ -53462,7 +53534,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;
@@ -53472,9 +53544,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);
@@ -65159,49 +65234,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
@@ -74460,9 +74503,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.0.34";
-  __info__.date = "2025-06-19T18:26:11.726Z";
-  __info__.hash = "5526881";
+  __info__.version = "18.0.35";
+  __info__.date = "2025-06-23T15:06:32.032Z";
+  __info__.hash = "a38db25";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);