@odoo/o-spreadsheet 16.2.23 → 16.2.24

package/dist/o-spreadsheet.cjs.js

@@ -1366,8 +1366,10 @@ function isSameColor(color1, color2) {
 const cellReference = new RegExp(/\$?([A-Z]{1,3})\$?([0-9]{1,7})/, "i");
 // Same as above, but matches the exact string (nothing before or after)
 const singleCellReference = new RegExp(/^\$?([A-Z]{1,3})\$?([0-9]{1,7})$/, "i");
-/** Reference of a column header (eg. A, AB) */
-const colHeader = new RegExp(/^([A-Z]{1,3})+$/, "i");
+/** Reference of a column header (eg. A, AB, $A) */
+const colHeader = new RegExp(/^\$?([A-Z]{1,3})+$/, "i");
+/** Reference of a row header (eg. 1, $1) */
+const rowHeader = new RegExp(/^\$?([0-9]{1,7})+$/, "i");
 /** Reference of a column (eg. A, $CA, Sheet1!B) */
 const colReference = new RegExp(/^\s*('.+'!|[^']+!)?\$?([A-Z]{1,3})$/, "i");
 /** Reference of a row (eg. 1, 59, Sheet1!9) */
@@ -1397,6 +1399,9 @@ function isRowReference(xc) {
 function isColHeader(str) {
     return colHeader.test(str);
 }
+function isRowHeader(str) {
+    return rowHeader.test(str);
+}
 /**
  * Return true if the given xc is the reference of a single cell,
  * without any specified sheet (e.g. A1)
@@ -2186,18 +2191,10 @@ class RangeImpl {
         if (isFullCol) {
             parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
             parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-            if (zone.left === zone.right) {
-                parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
-                parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-            }
         }
         if (isFullRow) {
             parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
             parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-            if (zone.top === zone.bottom) {
-                parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-                parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-            }
         }
         return parts;
     }
@@ -5096,6 +5093,9 @@ function setElementScrollTop(el, scroll) {
 }
 function getOpenedMenus() {
     return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
+}
+function isMacOS() {
+    return navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;
 }
 
 /**
@@ -21139,6 +21139,7 @@ class AbstractResizer extends owl.Component {
             draggerShadowThickness: 0,
             delta: 0,
             base: 0,
+            position: "before",
         });
     }
     _computeHandleDisplay(ev) {
@@ -21264,11 +21265,13 @@ class AbstractResizer extends owl.Component {
                     this.state.draggerLinePosition = dimensions.start;
                     this.state.draggerShadowPosition = dimensions.start;
                     this.state.base = elementIndex;
+                    this.state.position = "before";
                 }
                 else if (this._getSelectedZoneEnd() < elementIndex) {
                     this.state.draggerLinePosition = dimensions.end;
                     this.state.draggerShadowPosition = dimensions.end - this.state.draggerShadowThickness;
-                    this.state.base = elementIndex + 1;
+                    this.state.base = elementIndex;
+                    this.state.position = "after";
                 }
                 else {
                     this.state.draggerLinePosition = startDimensions.start;
@@ -21449,6 +21452,7 @@ class ColResizer extends AbstractResizer {
             dimension: "COL",
             base: this.state.base,
             elements,
+            position: this.state.position,
         });
         if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
             this.env.raiseError(MergeErrorMessage);
@@ -21621,6 +21625,7 @@ class RowResizer extends AbstractResizer {
             dimension: "ROW",
             base: this.state.base,
             elements,
+            position: this.state.position,
         });
         if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
             this.env.raiseError(MergeErrorMessage);
@@ -21729,8 +21734,8 @@ function useWheelHandler(handler) {
         return val * (deltaMode === 0 ? 1 : DEFAULT_CELL_HEIGHT);
     }
     const onMouseWheel = (ev) => {
-        const deltaX = normalize(ev.shiftKey ? ev.deltaY : ev.deltaX, ev.deltaMode);
-        const deltaY = normalize(ev.shiftKey ? ev.deltaX : ev.deltaY, ev.deltaMode);
+        const deltaX = normalize(ev.shiftKey && !isMacOS() ? ev.deltaY : ev.deltaX, ev.deltaMode);
+        const deltaY = normalize(ev.shiftKey && !isMacOS() ? ev.deltaX : ev.deltaY, ev.deltaMode);
         handler(deltaX, deltaY);
     };
     return onMouseWheel;
@@ -24318,7 +24323,7 @@ const machine = {
         SPACE: goTo(State.RightRef),
         NUMBER: goTo(State.Found),
         REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value) || isRowHeader(token.value)),
     },
     [State.RightColumnRef]: {
         SPACE: goTo(State.RightColumnRef),
@@ -24329,6 +24334,7 @@ const machine = {
         SPACE: goTo(State.RightRowRef),
         NUMBER: goTo(State.Found),
         REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isRowHeader(token.value)),
     },
     [State.Found]: {},
 };
@@ -30931,7 +30937,7 @@ class SheetPlugin extends CorePlugin {
                 const elements = cmd.dimension === "COL"
                     ? this.getNumberCols(cmd.sheetId)
                     : this.getNumberRows(cmd.sheetId);
-                if (cmd.base < 0 || cmd.base > elements) {
+                if (cmd.base < 0 || cmd.base >= elements) {
                     return 86 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else if (cmd.quantity <= 0) {
@@ -34096,24 +34102,27 @@ class AutofillPlugin extends UIPlugin {
      * autofiller
      */
     autofillAuto() {
+        var _a, _b;
         const zone = this.getters.getSelectedZone();
         const sheetId = this.getters.getActiveSheetId();
         let col = zone.left;
         let row = zone.bottom;
         if (col > 0) {
-            let left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
-            while (left.type !== CellValueType.empty) {
+            let leftPosition = { sheetId, col: col - 1, row };
+            while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+                ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.content)) {
                 row += 1;
-                left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
+                leftPosition = { sheetId, col: col - 1, row };
             }
         }
         if (row === zone.bottom) {
             col = zone.right;
             if (col <= this.getters.getNumberCols(sheetId)) {
-                let right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
-                while (right.type !== CellValueType.empty) {
+                let rightPosition = { sheetId, col: col + 1, row };
+                while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                    ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content)) {
                     row += 1;
-                    right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                    rightPosition = { sheetId, col: col + 1, row };
                 }
             }
         }
@@ -38431,6 +38440,10 @@ function setXcToReferenceType(xc, referenceType) {
             return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
         case "colrow":
             indexOfNumber = xc.search(/[0-9]/);
+            if (indexOfNumber === -1 || indexOfNumber === 0) {
+                // no row number (eg. A) or no column (eg. 1)
+                return "$" + xc;
+            }
             xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
             return "$" + xc;
         case "none":
@@ -39572,7 +39585,7 @@ class GridSelectionPlugin extends UIPlugin {
             sheetId: cmd.sheetId,
             base: cmd.base,
             quantity: thickness,
-            position: "before",
+            position: cmd.position,
         });
         const isCol = cmd.dimension === "COL";
         const start = cmd.elements[0];
@@ -39589,12 +39602,13 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const base = isBasedBefore ? cmd.base : cmd.base + 1;
         const pasteTarget = [
             {
-                left: isCol ? cmd.base : 0,
-                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                top: !isCol ? cmd.base : 0,
-                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+                left: isCol ? base : 0,
+                right: isCol ? base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? base : 0,
+                bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
             },
         ];
         state.paste(pasteTarget, { selectTarget: true });
@@ -39631,6 +39645,11 @@ class GridSelectionPlugin extends UIPlugin {
             doesElementsHaveCommonMerges(id, cmd.base - 1, cmd.base)) {
             return 2 /* CommandResult.WillRemoveExistingMerge */;
         }
+        const headers = [cmd.base, ...cmd.elements];
+        const maxHeaderValue = isCol ? this.getters.getNumberCols(id) : this.getters.getNumberRows(id);
+        if (headers.some((h) => h < 0 || h >= maxHeaderValue)) {
+            return 86 /* CommandResult.InvalidHeaderIndex */;
+        }
         return 0 /* CommandResult.Success */;
     }
     //-------------------------------------------
@@ -45572,6 +45591,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.2.23';
-__info__.date = '2023-11-24T13:11:02.651Z';
-__info__.hash = '3c723d3';
+__info__.version = '16.2.24';
+__info__.date = '2023-12-05T09:37:14.992Z';
+__info__.hash = '7b1a35c';

package/dist/o-spreadsheet.d.ts

@@ -1507,6 +1507,7 @@ interface MoveColumnsRowsCommand extends GridDependentCommand {
     type: "MOVE_COLUMNS_ROWS";
     base: HeaderIndex;
     elements: HeaderIndex[];
+    position: "before" | "after";
 }
 interface ResizeColumnsRowsCommand extends GridDependentCommand {
     type: "RESIZE_COLUMNS_ROWS";
@@ -6345,6 +6346,7 @@ interface ResizerState {
     draggerShadowThickness: number;
     delta: number;
     base: number;
+    position: "before" | "after";
 }
 interface ResizerProps {
     onOpenContextMenu: (type: ContextMenuType, x: Pixel, y: Pixel) => void;

package/dist/o-spreadsheet.esm.js

@@ -1362,8 +1362,10 @@ function isSameColor(color1, color2) {
 const cellReference = new RegExp(/\$?([A-Z]{1,3})\$?([0-9]{1,7})/, "i");
 // Same as above, but matches the exact string (nothing before or after)
 const singleCellReference = new RegExp(/^\$?([A-Z]{1,3})\$?([0-9]{1,7})$/, "i");
-/** Reference of a column header (eg. A, AB) */
-const colHeader = new RegExp(/^([A-Z]{1,3})+$/, "i");
+/** Reference of a column header (eg. A, AB, $A) */
+const colHeader = new RegExp(/^\$?([A-Z]{1,3})+$/, "i");
+/** Reference of a row header (eg. 1, $1) */
+const rowHeader = new RegExp(/^\$?([0-9]{1,7})+$/, "i");
 /** Reference of a column (eg. A, $CA, Sheet1!B) */
 const colReference = new RegExp(/^\s*('.+'!|[^']+!)?\$?([A-Z]{1,3})$/, "i");
 /** Reference of a row (eg. 1, 59, Sheet1!9) */
@@ -1393,6 +1395,9 @@ function isRowReference(xc) {
 function isColHeader(str) {
     return colHeader.test(str);
 }
+function isRowHeader(str) {
+    return rowHeader.test(str);
+}
 /**
  * Return true if the given xc is the reference of a single cell,
  * without any specified sheet (e.g. A1)
@@ -2182,18 +2187,10 @@ class RangeImpl {
         if (isFullCol) {
             parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
             parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-            if (zone.left === zone.right) {
-                parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
-                parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-            }
         }
         if (isFullRow) {
             parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
             parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-            if (zone.top === zone.bottom) {
-                parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-                parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-            }
         }
         return parts;
     }
@@ -5092,6 +5089,9 @@ function setElementScrollTop(el, scroll) {
 }
 function getOpenedMenus() {
     return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
+}
+function isMacOS() {
+    return navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;
 }
 
 /**
@@ -21135,6 +21135,7 @@ class AbstractResizer extends Component {
             draggerShadowThickness: 0,
             delta: 0,
             base: 0,
+            position: "before",
         });
     }
     _computeHandleDisplay(ev) {
@@ -21260,11 +21261,13 @@ class AbstractResizer extends Component {
                     this.state.draggerLinePosition = dimensions.start;
                     this.state.draggerShadowPosition = dimensions.start;
                     this.state.base = elementIndex;
+                    this.state.position = "before";
                 }
                 else if (this._getSelectedZoneEnd() < elementIndex) {
                     this.state.draggerLinePosition = dimensions.end;
                     this.state.draggerShadowPosition = dimensions.end - this.state.draggerShadowThickness;
-                    this.state.base = elementIndex + 1;
+                    this.state.base = elementIndex;
+                    this.state.position = "after";
                 }
                 else {
                     this.state.draggerLinePosition = startDimensions.start;
@@ -21445,6 +21448,7 @@ class ColResizer extends AbstractResizer {
             dimension: "COL",
             base: this.state.base,
             elements,
+            position: this.state.position,
         });
         if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
             this.env.raiseError(MergeErrorMessage);
@@ -21617,6 +21621,7 @@ class RowResizer extends AbstractResizer {
             dimension: "ROW",
             base: this.state.base,
             elements,
+            position: this.state.position,
         });
         if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
             this.env.raiseError(MergeErrorMessage);
@@ -21725,8 +21730,8 @@ function useWheelHandler(handler) {
         return val * (deltaMode === 0 ? 1 : DEFAULT_CELL_HEIGHT);
     }
     const onMouseWheel = (ev) => {
-        const deltaX = normalize(ev.shiftKey ? ev.deltaY : ev.deltaX, ev.deltaMode);
-        const deltaY = normalize(ev.shiftKey ? ev.deltaX : ev.deltaY, ev.deltaMode);
+        const deltaX = normalize(ev.shiftKey && !isMacOS() ? ev.deltaY : ev.deltaX, ev.deltaMode);
+        const deltaY = normalize(ev.shiftKey && !isMacOS() ? ev.deltaX : ev.deltaY, ev.deltaMode);
         handler(deltaX, deltaY);
     };
     return onMouseWheel;
@@ -24314,7 +24319,7 @@ const machine = {
         SPACE: goTo(State.RightRef),
         NUMBER: goTo(State.Found),
         REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value) || isRowHeader(token.value)),
     },
     [State.RightColumnRef]: {
         SPACE: goTo(State.RightColumnRef),
@@ -24325,6 +24330,7 @@ const machine = {
         SPACE: goTo(State.RightRowRef),
         NUMBER: goTo(State.Found),
         REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isRowHeader(token.value)),
     },
     [State.Found]: {},
 };
@@ -30927,7 +30933,7 @@ class SheetPlugin extends CorePlugin {
                 const elements = cmd.dimension === "COL"
                     ? this.getNumberCols(cmd.sheetId)
                     : this.getNumberRows(cmd.sheetId);
-                if (cmd.base < 0 || cmd.base > elements) {
+                if (cmd.base < 0 || cmd.base >= elements) {
                     return 86 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else if (cmd.quantity <= 0) {
@@ -34092,24 +34098,27 @@ class AutofillPlugin extends UIPlugin {
      * autofiller
      */
     autofillAuto() {
+        var _a, _b;
         const zone = this.getters.getSelectedZone();
         const sheetId = this.getters.getActiveSheetId();
         let col = zone.left;
         let row = zone.bottom;
         if (col > 0) {
-            let left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
-            while (left.type !== CellValueType.empty) {
+            let leftPosition = { sheetId, col: col - 1, row };
+            while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+                ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.content)) {
                 row += 1;
-                left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
+                leftPosition = { sheetId, col: col - 1, row };
             }
         }
         if (row === zone.bottom) {
             col = zone.right;
             if (col <= this.getters.getNumberCols(sheetId)) {
-                let right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
-                while (right.type !== CellValueType.empty) {
+                let rightPosition = { sheetId, col: col + 1, row };
+                while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                    ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content)) {
                     row += 1;
-                    right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                    rightPosition = { sheetId, col: col + 1, row };
                 }
             }
         }
@@ -38427,6 +38436,10 @@ function setXcToReferenceType(xc, referenceType) {
             return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
         case "colrow":
             indexOfNumber = xc.search(/[0-9]/);
+            if (indexOfNumber === -1 || indexOfNumber === 0) {
+                // no row number (eg. A) or no column (eg. 1)
+                return "$" + xc;
+            }
             xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
             return "$" + xc;
         case "none":
@@ -39568,7 +39581,7 @@ class GridSelectionPlugin extends UIPlugin {
             sheetId: cmd.sheetId,
             base: cmd.base,
             quantity: thickness,
-            position: "before",
+            position: cmd.position,
         });
         const isCol = cmd.dimension === "COL";
         const start = cmd.elements[0];
@@ -39585,12 +39598,13 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const base = isBasedBefore ? cmd.base : cmd.base + 1;
         const pasteTarget = [
             {
-                left: isCol ? cmd.base : 0,
-                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                top: !isCol ? cmd.base : 0,
-                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+                left: isCol ? base : 0,
+                right: isCol ? base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? base : 0,
+                bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
             },
         ];
         state.paste(pasteTarget, { selectTarget: true });
@@ -39627,6 +39641,11 @@ class GridSelectionPlugin extends UIPlugin {
             doesElementsHaveCommonMerges(id, cmd.base - 1, cmd.base)) {
             return 2 /* CommandResult.WillRemoveExistingMerge */;
         }
+        const headers = [cmd.base, ...cmd.elements];
+        const maxHeaderValue = isCol ? this.getters.getNumberCols(id) : this.getters.getNumberRows(id);
+        if (headers.some((h) => h < 0 || h >= maxHeaderValue)) {
+            return 86 /* CommandResult.InvalidHeaderIndex */;
+        }
         return 0 /* CommandResult.Success */;
     }
     //-------------------------------------------
@@ -45540,6 +45559,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, links, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.2.23';
-__info__.date = '2023-11-24T13:11:02.651Z';
-__info__.hash = '3c723d3';
+__info__.version = '16.2.24';
+__info__.date = '2023-12-05T09:37:14.992Z';
+__info__.hash = '7b1a35c';

package/dist/o-spreadsheet.iife.js

@@ -1363,8 +1363,10 @@
   const cellReference = new RegExp(/\$?([A-Z]{1,3})\$?([0-9]{1,7})/, "i");
   // Same as above, but matches the exact string (nothing before or after)
   const singleCellReference = new RegExp(/^\$?([A-Z]{1,3})\$?([0-9]{1,7})$/, "i");
-  /** Reference of a column header (eg. A, AB) */
-  const colHeader = new RegExp(/^([A-Z]{1,3})+$/, "i");
+  /** Reference of a column header (eg. A, AB, $A) */
+  const colHeader = new RegExp(/^\$?([A-Z]{1,3})+$/, "i");
+  /** Reference of a row header (eg. 1, $1) */
+  const rowHeader = new RegExp(/^\$?([0-9]{1,7})+$/, "i");
   /** Reference of a column (eg. A, $CA, Sheet1!B) */
   const colReference = new RegExp(/^\s*('.+'!|[^']+!)?\$?([A-Z]{1,3})$/, "i");
   /** Reference of a row (eg. 1, 59, Sheet1!9) */
@@ -1394,6 +1396,9 @@
   function isColHeader(str) {
       return colHeader.test(str);
   }
+  function isRowHeader(str) {
+      return rowHeader.test(str);
+  }
   /**
    * Return true if the given xc is the reference of a single cell,
    * without any specified sheet (e.g. A1)
@@ -2183,18 +2188,10 @@
           if (isFullCol) {
               parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
               parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-              if (zone.left === zone.right) {
-                  parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
-                  parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-              }
           }
           if (isFullRow) {
               parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
               parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-              if (zone.top === zone.bottom) {
-                  parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-                  parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-              }
           }
           return parts;
       }
@@ -5093,6 +5090,9 @@
   }
   function getOpenedMenus() {
       return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
+  }
+  function isMacOS() {
+      return navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;
   }
 
   /**
@@ -21136,6 +21136,7 @@
               draggerShadowThickness: 0,
               delta: 0,
               base: 0,
+              position: "before",
           });
       }
       _computeHandleDisplay(ev) {
@@ -21261,11 +21262,13 @@
                       this.state.draggerLinePosition = dimensions.start;
                       this.state.draggerShadowPosition = dimensions.start;
                       this.state.base = elementIndex;
+                      this.state.position = "before";
                   }
                   else if (this._getSelectedZoneEnd() < elementIndex) {
                       this.state.draggerLinePosition = dimensions.end;
                       this.state.draggerShadowPosition = dimensions.end - this.state.draggerShadowThickness;
-                      this.state.base = elementIndex + 1;
+                      this.state.base = elementIndex;
+                      this.state.position = "after";
                   }
                   else {
                       this.state.draggerLinePosition = startDimensions.start;
@@ -21446,6 +21449,7 @@
               dimension: "COL",
               base: this.state.base,
               elements,
+              position: this.state.position,
           });
           if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
               this.env.raiseError(MergeErrorMessage);
@@ -21618,6 +21622,7 @@
               dimension: "ROW",
               base: this.state.base,
               elements,
+              position: this.state.position,
           });
           if (!result.isSuccessful && result.reasons.includes(2 /* CommandResult.WillRemoveExistingMerge */)) {
               this.env.raiseError(MergeErrorMessage);
@@ -21726,8 +21731,8 @@
           return val * (deltaMode === 0 ? 1 : DEFAULT_CELL_HEIGHT);
       }
       const onMouseWheel = (ev) => {
-          const deltaX = normalize(ev.shiftKey ? ev.deltaY : ev.deltaX, ev.deltaMode);
-          const deltaY = normalize(ev.shiftKey ? ev.deltaX : ev.deltaY, ev.deltaMode);
+          const deltaX = normalize(ev.shiftKey && !isMacOS() ? ev.deltaY : ev.deltaX, ev.deltaMode);
+          const deltaY = normalize(ev.shiftKey && !isMacOS() ? ev.deltaX : ev.deltaY, ev.deltaMode);
           handler(deltaX, deltaY);
       };
       return onMouseWheel;
@@ -24315,7 +24320,7 @@
           SPACE: goTo(State.RightRef),
           NUMBER: goTo(State.Found),
           REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-          SYMBOL: goTo(State.Found, (token) => isColHeader(token.value)),
+          SYMBOL: goTo(State.Found, (token) => isColHeader(token.value) || isRowHeader(token.value)),
       },
       [State.RightColumnRef]: {
           SPACE: goTo(State.RightColumnRef),
@@ -24326,6 +24331,7 @@
           SPACE: goTo(State.RightRowRef),
           NUMBER: goTo(State.Found),
           REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+          SYMBOL: goTo(State.Found, (token) => isRowHeader(token.value)),
       },
       [State.Found]: {},
   };
@@ -30928,7 +30934,7 @@
                   const elements = cmd.dimension === "COL"
                       ? this.getNumberCols(cmd.sheetId)
                       : this.getNumberRows(cmd.sheetId);
-                  if (cmd.base < 0 || cmd.base > elements) {
+                  if (cmd.base < 0 || cmd.base >= elements) {
                       return 86 /* CommandResult.InvalidHeaderIndex */;
                   }
                   else if (cmd.quantity <= 0) {
@@ -34093,24 +34099,27 @@
        * autofiller
        */
       autofillAuto() {
+          var _a, _b;
           const zone = this.getters.getSelectedZone();
           const sheetId = this.getters.getActiveSheetId();
           let col = zone.left;
           let row = zone.bottom;
           if (col > 0) {
-              let left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
-              while (left.type !== CellValueType.empty) {
+              let leftPosition = { sheetId, col: col - 1, row };
+              while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+                  ((_a = this.getters.getCell(leftPosition)) === null || _a === void 0 ? void 0 : _a.content)) {
                   row += 1;
-                  left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
+                  leftPosition = { sheetId, col: col - 1, row };
               }
           }
           if (row === zone.bottom) {
               col = zone.right;
               if (col <= this.getters.getNumberCols(sheetId)) {
-                  let right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
-                  while (right.type !== CellValueType.empty) {
+                  let rightPosition = { sheetId, col: col + 1, row };
+                  while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                      ((_b = this.getters.getCell(rightPosition)) === null || _b === void 0 ? void 0 : _b.content)) {
                       row += 1;
-                      right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                      rightPosition = { sheetId, col: col + 1, row };
                   }
               }
           }
@@ -38428,6 +38437,10 @@
               return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
           case "colrow":
               indexOfNumber = xc.search(/[0-9]/);
+              if (indexOfNumber === -1 || indexOfNumber === 0) {
+                  // no row number (eg. A) or no column (eg. 1)
+                  return "$" + xc;
+              }
               xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
               return "$" + xc;
           case "none":
@@ -39569,7 +39582,7 @@
               sheetId: cmd.sheetId,
               base: cmd.base,
               quantity: thickness,
-              position: "before",
+              position: cmd.position,
           });
           const isCol = cmd.dimension === "COL";
           const start = cmd.elements[0];
@@ -39586,12 +39599,13 @@
               },
           ];
           const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+          const base = isBasedBefore ? cmd.base : cmd.base + 1;
           const pasteTarget = [
               {
-                  left: isCol ? cmd.base : 0,
-                  right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                  top: !isCol ? cmd.base : 0,
-                  bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+                  left: isCol ? base : 0,
+                  right: isCol ? base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                  top: !isCol ? base : 0,
+                  bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
               },
           ];
           state.paste(pasteTarget, { selectTarget: true });
@@ -39628,6 +39642,11 @@
               doesElementsHaveCommonMerges(id, cmd.base - 1, cmd.base)) {
               return 2 /* CommandResult.WillRemoveExistingMerge */;
           }
+          const headers = [cmd.base, ...cmd.elements];
+          const maxHeaderValue = isCol ? this.getters.getNumberCols(id) : this.getters.getNumberRows(id);
+          if (headers.some((h) => h < 0 || h >= maxHeaderValue)) {
+              return 86 /* CommandResult.InvalidHeaderIndex */;
+          }
           return 0 /* CommandResult.Success */;
       }
       //-------------------------------------------
@@ -45571,9 +45590,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.2.23';
-  __info__.date = '2023-11-24T13:11:02.651Z';
-  __info__.hash = '3c723d3';
+  __info__.version = '16.2.24';
+  __info__.date = '2023-12-05T09:37:14.992Z';
+  __info__.hash = '7b1a35c';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);