@odoo/o-spreadsheet 18.0.33 → 18.0.35

package/dist/o-spreadsheet.esm.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.33
- * @date 2025-06-12T09:17:53.747Z
- * @hash c1d64fb
+ * @version 18.0.35
+ * @date 2025-06-23T15:06:32.032Z
+ * @hash a38db25
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -6661,6 +6661,63 @@ function parseOSClipboardContent(content) {
         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;
@@ -33668,6 +33725,10 @@ const REMOVE_ROWS_ACTION = (env) => {
     });
 };
 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);
@@ -36388,11 +36449,11 @@ class OTRegistry extends Registry {
      * 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;
     }
@@ -36401,7 +36462,7 @@ class OTRegistry extends Registry {
      * 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();
@@ -44610,7 +44671,7 @@ class SpreadsheetPivot {
     }
     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";
         }
@@ -48143,15 +48204,16 @@ class GridAddRowsFooter extends Component {
     }
 }
 
+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) {
@@ -48182,24 +48244,38 @@ class PaintFormatStore extends SpreadsheetStore {
     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();
         }
@@ -53457,7 +53533,7 @@ class DataValidationPlugin extends CorePlugin {
         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;
@@ -53467,9 +53543,12 @@ class DataValidationPlugin extends CorePlugin {
             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);
@@ -62200,10 +62279,20 @@ function transform(toTransform, executed) {
  */
 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;
 }
@@ -62689,7 +62778,6 @@ class Session extends EventBus {
         if (this.waitingAck) {
             return;
         }
-        this.waitingAck = true;
         this.sendPendingMessage();
     }
     /**
@@ -62719,6 +62807,7 @@ class Session extends EventBus {
             throw new Error(`Trying to send a new revision while replaying initial revision. This can lead to endless dispatches every time the spreadsheet is open.
       ${JSON.stringify(message)}`);
         }
+        this.waitingAck = true;
         this.transportService.sendMessage({
             ...message,
             serverRevisionId: this.serverRevisionId,
@@ -63859,7 +63948,7 @@ class SheetUIPlugin extends UIPlugin {
                 }
                 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) {
@@ -65144,49 +65233,17 @@ class ClipboardPlugin extends UIPlugin {
         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
@@ -74402,6 +74459,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "18.0.33";
-__info__.date = "2025-06-12T09:17:53.747Z";
-__info__.hash = "c1d64fb";
+__info__.version = "18.0.35";
+__info__.date = "2025-06-23T15:06:32.032Z";
+__info__.hash = "a38db25";

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.33
- * @date 2025-06-12T09:17:53.747Z
- * @hash c1d64fb
+ * @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;
@@ -33669,6 +33726,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);
@@ -36389,11 +36450,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;
       }
@@ -36402,7 +36463,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();
@@ -44611,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";
           }
@@ -48144,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) {
@@ -48183,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();
           }
@@ -53458,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;
@@ -53468,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);
@@ -62201,10 +62280,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;
   }
@@ -62690,7 +62779,6 @@ stores.inject(MyMetaStore, storeInstance);
           if (this.waitingAck) {
               return;
           }
-          this.waitingAck = true;
           this.sendPendingMessage();
       }
       /**
@@ -62720,6 +62808,7 @@ stores.inject(MyMetaStore, storeInstance);
               throw new Error(`Trying to send a new revision while replaying initial revision. This can lead to endless dispatches every time the spreadsheet is open.
       ${JSON.stringify(message)}`);
           }
+          this.waitingAck = true;
           this.transportService.sendMessage({
               ...message,
               serverRevisionId: this.serverRevisionId,
@@ -63860,7 +63949,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) {
@@ -65145,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
@@ -74446,9 +74503,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.0.33";
-  __info__.date = "2025-06-12T09:17:53.747Z";
-  __info__.hash = "c1d64fb";
+  __info__.version = "18.0.35";
+  __info__.date = "2025-06-23T15:06:32.032Z";
+  __info__.hash = "a38db25";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);