@odoo/o-spreadsheet 16.0.64 → 16.0.65

package/dist/o-spreadsheet.cjs.js

@@ -19591,8 +19591,8 @@ class EditionPlugin extends UIPlugin {
                 break;
             case "STOP_EDITION":
                 if (cmd.cancel) {
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                 }
                 else {
                     this.stopEdition();
@@ -19607,8 +19607,8 @@ class EditionPlugin extends UIPlugin {
                 this.replaceSelection(cmd.text);
                 break;
             case "SELECT_FIGURE":
-                this.cancelEditionAndActivateSheet();
                 this.resetContent();
+                this.cancelEditionAndActivateSheet();
                 break;
             case "ADD_COLUMNS_ROWS":
                 this.onAddElements(cmd);
@@ -19667,8 +19667,8 @@ class EditionPlugin extends UIPlugin {
                 const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                 if (!sheetIdExists && this.mode !== "inactive") {
                     this.sheetId = this.getters.getActiveSheetId();
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                     this.ui.notifyUI({
                         type: "ERROR",
                         text: CELL_DELETED_MESSAGE,
@@ -32449,12 +32449,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             for (let c = 0; c < width; c++) {
                 const origin = rowCells[c];
                 const position = { col: col + c, row: row + r, sheetId: sheetId };
-                // TODO: refactor this part. the "Paste merge" action is also executed with
-                // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                // is not appropriate
-                if (this.operation !== "CUT") {
-                    this.pasteMergeIfExist(origin.position, position);
-                }
+                this.pasteMergeIfExist(origin.position, position, this.operation);
                 this.pasteCell(origin, position, this.operation, clipboardOptions);
                 if (shouldPasteCF) {
                     this.dispatch("PASTE_CONDITIONAL_FORMAT", {
@@ -32533,7 +32528,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
      * If the origin position given is the top left of a merge, merge the target
      * position.
      */
-    pasteMergeIfExist(origin, target) {
+    pasteMergeIfExist(origin, target, operation) {
         let { sheetId, col, row } = origin;
         const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(sheetId, col, row);
         if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -32541,6 +32536,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             if (!merge) {
                 return;
             }
+            if (operation === "CUT") {
+                this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+            }
             ({ sheetId, col, row } = target);
             this.dispatch("ADD_MERGE", {
                 sheetId,
@@ -43762,6 +43760,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.64';
-__info__.date = '2025-03-07T10:29:50.957Z';
-__info__.hash = '20def15';
+__info__.version = '16.0.65';
+__info__.date = '2025-03-19T08:14:11.320Z';
+__info__.hash = '4e495e9';

package/dist/o-spreadsheet.esm.js

@@ -19587,8 +19587,8 @@ class EditionPlugin extends UIPlugin {
                 break;
             case "STOP_EDITION":
                 if (cmd.cancel) {
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                 }
                 else {
                     this.stopEdition();
@@ -19603,8 +19603,8 @@ class EditionPlugin extends UIPlugin {
                 this.replaceSelection(cmd.text);
                 break;
             case "SELECT_FIGURE":
-                this.cancelEditionAndActivateSheet();
                 this.resetContent();
+                this.cancelEditionAndActivateSheet();
                 break;
             case "ADD_COLUMNS_ROWS":
                 this.onAddElements(cmd);
@@ -19663,8 +19663,8 @@ class EditionPlugin extends UIPlugin {
                 const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                 if (!sheetIdExists && this.mode !== "inactive") {
                     this.sheetId = this.getters.getActiveSheetId();
-                    this.cancelEditionAndActivateSheet();
                     this.resetContent();
+                    this.cancelEditionAndActivateSheet();
                     this.ui.notifyUI({
                         type: "ERROR",
                         text: CELL_DELETED_MESSAGE,
@@ -32445,12 +32445,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             for (let c = 0; c < width; c++) {
                 const origin = rowCells[c];
                 const position = { col: col + c, row: row + r, sheetId: sheetId };
-                // TODO: refactor this part. the "Paste merge" action is also executed with
-                // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                // is not appropriate
-                if (this.operation !== "CUT") {
-                    this.pasteMergeIfExist(origin.position, position);
-                }
+                this.pasteMergeIfExist(origin.position, position, this.operation);
                 this.pasteCell(origin, position, this.operation, clipboardOptions);
                 if (shouldPasteCF) {
                     this.dispatch("PASTE_CONDITIONAL_FORMAT", {
@@ -32529,7 +32524,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
      * If the origin position given is the top left of a merge, merge the target
      * position.
      */
-    pasteMergeIfExist(origin, target) {
+    pasteMergeIfExist(origin, target, operation) {
         let { sheetId, col, row } = origin;
         const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(sheetId, col, row);
         if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -32537,6 +32532,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             if (!merge) {
                 return;
             }
+            if (operation === "CUT") {
+                this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+            }
             ({ sheetId, col, row } = target);
             this.dispatch("ADD_MERGE", {
                 sheetId,
@@ -43730,6 +43728,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, cellTypes, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.0.64';
-__info__.date = '2025-03-07T10:29:50.957Z';
-__info__.hash = '20def15';
+__info__.version = '16.0.65';
+__info__.date = '2025-03-19T08:14:11.320Z';
+__info__.hash = '4e495e9';

package/dist/o-spreadsheet.iife.js

@@ -19588,8 +19588,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   break;
               case "STOP_EDITION":
                   if (cmd.cancel) {
-                      this.cancelEditionAndActivateSheet();
                       this.resetContent();
+                      this.cancelEditionAndActivateSheet();
                   }
                   else {
                       this.stopEdition();
@@ -19604,8 +19604,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   this.replaceSelection(cmd.text);
                   break;
               case "SELECT_FIGURE":
-                  this.cancelEditionAndActivateSheet();
                   this.resetContent();
+                  this.cancelEditionAndActivateSheet();
                   break;
               case "ADD_COLUMNS_ROWS":
                   this.onAddElements(cmd);
@@ -19664,8 +19664,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   const sheetIdExists = !!this.getters.tryGetSheet(this.sheetId);
                   if (!sheetIdExists && this.mode !== "inactive") {
                       this.sheetId = this.getters.getActiveSheetId();
-                      this.cancelEditionAndActivateSheet();
                       this.resetContent();
+                      this.cancelEditionAndActivateSheet();
                       this.ui.notifyUI({
                           type: "ERROR",
                           text: CELL_DELETED_MESSAGE,
@@ -32446,12 +32446,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               for (let c = 0; c < width; c++) {
                   const origin = rowCells[c];
                   const position = { col: col + c, row: row + r, sheetId: sheetId };
-                  // TODO: refactor this part. the "Paste merge" action is also executed with
-                  // MOVE_RANGES in pasteFromCut. Adding a condition on the operation type here
-                  // is not appropriate
-                  if (this.operation !== "CUT") {
-                      this.pasteMergeIfExist(origin.position, position);
-                  }
+                  this.pasteMergeIfExist(origin.position, position, this.operation);
                   this.pasteCell(origin, position, this.operation, clipboardOptions);
                   if (shouldPasteCF) {
                       this.dispatch("PASTE_CONDITIONAL_FORMAT", {
@@ -32530,7 +32525,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
        * If the origin position given is the top left of a merge, merge the target
        * position.
        */
-      pasteMergeIfExist(origin, target) {
+      pasteMergeIfExist(origin, target, operation) {
           let { sheetId, col, row } = origin;
           const { col: mainCellColOrigin, row: mainCellRowOrigin } = this.getters.getMainCellPosition(sheetId, col, row);
           if (mainCellColOrigin === col && mainCellRowOrigin === row) {
@@ -32538,6 +32533,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               if (!merge) {
                   return;
               }
+              if (operation === "CUT") {
+                  this.dispatch("REMOVE_MERGE", { sheetId, target: [merge] });
+              }
               ({ sheetId, col, row } = target);
               this.dispatch("ADD_MERGE", {
                   sheetId,
@@ -43761,9 +43759,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.64';
-  __info__.date = '2025-03-07T10:29:50.957Z';
-  __info__.hash = '20def15';
+  __info__.version = '16.0.65';
+  __info__.date = '2025-03-19T08:14:11.320Z';
+  __info__.hash = '4e495e9';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);