@odoo/o-spreadsheet 18.2.19 → 18.2.20

package/dist/o-spreadsheet.cjs.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.2.19
- * @date 2025-06-23T15:07:13.023Z
- * @hash 430d931
+ * @version 18.2.20
+ * @date 2025-06-27T09:11:55.800Z
+ * @hash 16dfc38
  */
 
 'use strict';
@@ -21200,7 +21200,7 @@ class AbstractComposerStore extends SpreadsheetStore {
     }
     captureSelection(zone, col, row) {
         this.model.selection.capture(this, {
-            cell: { col: col || zone.left, row: row || zone.right },
+            cell: { col: col ?? zone.left, row: row ?? zone.right },
             zone,
         }, {
             handleEvent: this.handleEvent.bind(this),
@@ -43144,6 +43144,9 @@ class ConditionalFormattingPanel extends owl.Component {
                     this.switchToList();
                 }
             }
+            else if (!this.editedCF) {
+                this.switchToList();
+            }
         });
     }
     get conditionalFormats() {
@@ -73692,26 +73695,28 @@ class SelectionStreamProcessorImpl {
                 bottom: Math.min(this.getters.getNumberRows(sheetId) - 1, bottom),
             };
         };
-        const { col: refCol, row: refRow } = this.getReferencePosition();
+        const { cell: refCell, zone: refZone } = this.getReferenceAnchor();
+        const { col: refCol, row: refRow } = refCell;
         // check if we can shrink selection
         let n = 0;
         while (result !== null) {
             n++;
             if (deltaCol < 0) {
                 const newRight = this.getNextAvailableCol(deltaCol, right - (n - 1), refRow);
-                result = refCol <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
+                result = refZone.right <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
             }
             if (deltaCol > 0) {
                 const newLeft = this.getNextAvailableCol(deltaCol, left + (n - 1), refRow);
-                result = left + n <= refCol ? expand({ top, left: newLeft, bottom, right }) : null;
+                result = left + n <= refZone.left ? expand({ top, left: newLeft, bottom, right }) : null;
             }
             if (deltaRow < 0) {
                 const newBottom = this.getNextAvailableRow(deltaRow, refCol, bottom - (n - 1));
-                result = refRow <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
+                result =
+                    refZone.bottom <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
             }
             if (deltaRow > 0) {
                 const newTop = this.getNextAvailableRow(deltaRow, refCol, top + (n - 1));
-                result = top + n <= refRow ? expand({ top: newTop, left, bottom, right }) : null;
+                result = top + n <= refZone.top ? expand({ top: newTop, left, bottom, right }) : null;
             }
             result = result ? reorderZone(result) : result;
             if (result && !isEqual(result, anchor.zone)) {
@@ -73941,18 +73946,26 @@ class SelectionStreamProcessorImpl {
      * If the anchor is hidden, browses from left to right and top to bottom to
      * find a visible cell.
      */
-    getReferencePosition() {
+    getReferenceAnchor() {
         const sheetId = this.getters.getActiveSheetId();
         const anchor = this.anchor;
         const { left, right, top, bottom } = anchor.zone;
         const { col: anchorCol, row: anchorRow } = anchor.cell;
+        const col = this.getters.isColHidden(sheetId, anchorCol)
+            ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
+            : anchorCol;
+        const row = this.getters.isRowHidden(sheetId, anchorRow)
+            ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
+            : anchorRow;
+        const zone = this.getters.expandZone(sheetId, {
+            left: col,
+            right: col,
+            top: row,
+            bottom: row,
+        });
         return {
-            col: this.getters.isColHidden(sheetId, anchorCol)
-                ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
-                : anchorCol,
-            row: this.getters.isRowHidden(sheetId, anchorRow)
-                ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
-                : anchorRow,
+            cell: { col, row },
+            zone,
         };
     }
     deltaToTarget(position, direction, step) {
@@ -77095,6 +77108,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.2.19";
-__info__.date = "2025-06-23T15:07:13.023Z";
-__info__.hash = "430d931";
+__info__.version = "18.2.20";
+__info__.date = "2025-06-27T09:11:55.800Z";
+__info__.hash = "16dfc38";

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.2.19
- * @date 2025-06-23T15:07:13.023Z
- * @hash 430d931
+ * @version 18.2.20
+ * @date 2025-06-27T09:11:55.800Z
+ * @hash 16dfc38
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -21198,7 +21198,7 @@ class AbstractComposerStore extends SpreadsheetStore {
     }
     captureSelection(zone, col, row) {
         this.model.selection.capture(this, {
-            cell: { col: col || zone.left, row: row || zone.right },
+            cell: { col: col ?? zone.left, row: row ?? zone.right },
             zone,
         }, {
             handleEvent: this.handleEvent.bind(this),
@@ -43142,6 +43142,9 @@ class ConditionalFormattingPanel extends Component {
                     this.switchToList();
                 }
             }
+            else if (!this.editedCF) {
+                this.switchToList();
+            }
         });
     }
     get conditionalFormats() {
@@ -73690,26 +73693,28 @@ class SelectionStreamProcessorImpl {
                 bottom: Math.min(this.getters.getNumberRows(sheetId) - 1, bottom),
             };
         };
-        const { col: refCol, row: refRow } = this.getReferencePosition();
+        const { cell: refCell, zone: refZone } = this.getReferenceAnchor();
+        const { col: refCol, row: refRow } = refCell;
         // check if we can shrink selection
         let n = 0;
         while (result !== null) {
             n++;
             if (deltaCol < 0) {
                 const newRight = this.getNextAvailableCol(deltaCol, right - (n - 1), refRow);
-                result = refCol <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
+                result = refZone.right <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
             }
             if (deltaCol > 0) {
                 const newLeft = this.getNextAvailableCol(deltaCol, left + (n - 1), refRow);
-                result = left + n <= refCol ? expand({ top, left: newLeft, bottom, right }) : null;
+                result = left + n <= refZone.left ? expand({ top, left: newLeft, bottom, right }) : null;
             }
             if (deltaRow < 0) {
                 const newBottom = this.getNextAvailableRow(deltaRow, refCol, bottom - (n - 1));
-                result = refRow <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
+                result =
+                    refZone.bottom <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
             }
             if (deltaRow > 0) {
                 const newTop = this.getNextAvailableRow(deltaRow, refCol, top + (n - 1));
-                result = top + n <= refRow ? expand({ top: newTop, left, bottom, right }) : null;
+                result = top + n <= refZone.top ? expand({ top: newTop, left, bottom, right }) : null;
             }
             result = result ? reorderZone(result) : result;
             if (result && !isEqual(result, anchor.zone)) {
@@ -73939,18 +73944,26 @@ class SelectionStreamProcessorImpl {
      * If the anchor is hidden, browses from left to right and top to bottom to
      * find a visible cell.
      */
-    getReferencePosition() {
+    getReferenceAnchor() {
         const sheetId = this.getters.getActiveSheetId();
         const anchor = this.anchor;
         const { left, right, top, bottom } = anchor.zone;
         const { col: anchorCol, row: anchorRow } = anchor.cell;
+        const col = this.getters.isColHidden(sheetId, anchorCol)
+            ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
+            : anchorCol;
+        const row = this.getters.isRowHidden(sheetId, anchorRow)
+            ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
+            : anchorRow;
+        const zone = this.getters.expandZone(sheetId, {
+            left: col,
+            right: col,
+            top: row,
+            bottom: row,
+        });
         return {
-            col: this.getters.isColHidden(sheetId, anchorCol)
-                ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
-                : anchorCol,
-            row: this.getters.isRowHidden(sheetId, anchorRow)
-                ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
-                : anchorRow,
+            cell: { col, row },
+            zone,
         };
     }
     deltaToTarget(position, direction, step) {
@@ -77048,6 +77061,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, chartHelpers, 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.2.19";
-__info__.date = "2025-06-23T15:07:13.023Z";
-__info__.hash = "430d931";
+__info__.version = "18.2.20";
+__info__.date = "2025-06-27T09:11:55.800Z";
+__info__.hash = "16dfc38";

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.2.19
- * @date 2025-06-23T15:07:13.023Z
- * @hash 430d931
+ * @version 18.2.20
+ * @date 2025-06-27T09:11:55.800Z
+ * @hash 16dfc38
  */
 
 (function (exports, owl) {
@@ -21199,7 +21199,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       captureSelection(zone, col, row) {
           this.model.selection.capture(this, {
-              cell: { col: col || zone.left, row: row || zone.right },
+              cell: { col: col ?? zone.left, row: row ?? zone.right },
               zone,
           }, {
               handleEvent: this.handleEvent.bind(this),
@@ -43143,6 +43143,9 @@ stores.inject(MyMetaStore, storeInstance);
                       this.switchToList();
                   }
               }
+              else if (!this.editedCF) {
+                  this.switchToList();
+              }
           });
       }
       get conditionalFormats() {
@@ -73691,26 +73694,28 @@ stores.inject(MyMetaStore, storeInstance);
                   bottom: Math.min(this.getters.getNumberRows(sheetId) - 1, bottom),
               };
           };
-          const { col: refCol, row: refRow } = this.getReferencePosition();
+          const { cell: refCell, zone: refZone } = this.getReferenceAnchor();
+          const { col: refCol, row: refRow } = refCell;
           // check if we can shrink selection
           let n = 0;
           while (result !== null) {
               n++;
               if (deltaCol < 0) {
                   const newRight = this.getNextAvailableCol(deltaCol, right - (n - 1), refRow);
-                  result = refCol <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
+                  result = refZone.right <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
               }
               if (deltaCol > 0) {
                   const newLeft = this.getNextAvailableCol(deltaCol, left + (n - 1), refRow);
-                  result = left + n <= refCol ? expand({ top, left: newLeft, bottom, right }) : null;
+                  result = left + n <= refZone.left ? expand({ top, left: newLeft, bottom, right }) : null;
               }
               if (deltaRow < 0) {
                   const newBottom = this.getNextAvailableRow(deltaRow, refCol, bottom - (n - 1));
-                  result = refRow <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
+                  result =
+                      refZone.bottom <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
               }
               if (deltaRow > 0) {
                   const newTop = this.getNextAvailableRow(deltaRow, refCol, top + (n - 1));
-                  result = top + n <= refRow ? expand({ top: newTop, left, bottom, right }) : null;
+                  result = top + n <= refZone.top ? expand({ top: newTop, left, bottom, right }) : null;
               }
               result = result ? reorderZone(result) : result;
               if (result && !isEqual(result, anchor.zone)) {
@@ -73940,18 +73945,26 @@ stores.inject(MyMetaStore, storeInstance);
        * If the anchor is hidden, browses from left to right and top to bottom to
        * find a visible cell.
        */
-      getReferencePosition() {
+      getReferenceAnchor() {
           const sheetId = this.getters.getActiveSheetId();
           const anchor = this.anchor;
           const { left, right, top, bottom } = anchor.zone;
           const { col: anchorCol, row: anchorRow } = anchor.cell;
+          const col = this.getters.isColHidden(sheetId, anchorCol)
+              ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
+              : anchorCol;
+          const row = this.getters.isRowHidden(sheetId, anchorRow)
+              ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
+              : anchorRow;
+          const zone = this.getters.expandZone(sheetId, {
+              left: col,
+              right: col,
+              top: row,
+              bottom: row,
+          });
           return {
-              col: this.getters.isColHidden(sheetId, anchorCol)
-                  ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
-                  : anchorCol,
-              row: this.getters.isRowHidden(sheetId, anchorRow)
-                  ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
-                  : anchorRow,
+              cell: { col, row },
+              zone,
           };
       }
       deltaToTarget(position, direction, step) {
@@ -77094,9 +77107,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.2.19";
-  __info__.date = "2025-06-23T15:07:13.023Z";
-  __info__.hash = "430d931";
+  __info__.version = "18.2.20";
+  __info__.date = "2025-06-27T09:11:55.800Z";
+  __info__.hash = "16dfc38";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);