@odoo/o-spreadsheet 16.4.15 → 16.4.16

package/dist/o-spreadsheet.cjs.js

@@ -301,13 +301,6 @@ const NEWLINE = "\n";
 const FONT_SIZES = [6, 7, 8, 9, 10, 11, 12, 14, 18, 24, 36];
 
 //------------------------------------------------------------------------------
-/**
- * Stringify an object, like JSON.stringify, except that the first level of keys
- * is ordered.
- */
-function stringify(obj) {
-    return JSON.stringify(obj, Object.keys(obj).sort());
-}
 /**
  * Remove quotes from a quoted string
  * ```js
@@ -527,7 +520,7 @@ function isObjectEmptyRecursive(argument) {
  */
 function getItemId(item, itemsDic) {
     for (let [key, value] of Object.entries(itemsDic)) {
-        if (stringify(value) === stringify(item)) {
+        if (deepEquals(value, item)) {
             return parseInt(key, 10);
         }
     }
@@ -2345,8 +2338,10 @@ function convertInternalFormatToFormat(internalFormat) {
 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) */
@@ -2376,6 +2371,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)
@@ -3048,18 +3046,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;
     }
@@ -5648,6 +5638,9 @@ function* iterateChildren(el) {
 }
 function getOpenedMenus() {
     return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
+}
+function isMacOS() {
+    return navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;
 }
 
 /**
@@ -14704,7 +14697,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),
@@ -14715,6 +14708,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]: {},
 };
@@ -16872,7 +16866,7 @@ function createGaugeChartRuntime(chart, getters) {
     });
     return {
         chartJsConfig: config,
-        background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+        background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
     };
 }
 
@@ -17596,7 +17590,7 @@ function createScorecardChartRuntime(chart, getters) {
         };
         baselineCell = getters.getEvaluatedCell(baselinePosition);
     }
-    const background = getters.getBackgroundOfSingleCellChart(chart.background, chart.keyValue);
+    const { background, fontColor } = getters.getStyleOfSingleCellChart(chart.background, chart.keyValue);
     const locale = getters.getLocale();
     return {
         title: _t(chart.title),
@@ -17605,7 +17599,7 @@ function createScorecardChartRuntime(chart, getters) {
         baselineArrow: getBaselineArrowDirection(baselineCell, keyValueCell, chart.baselineMode),
         baselineColor: getBaselineColor(baselineCell, chart.baselineMode, keyValueCell, chart.baselineColorUp, chart.baselineColorDown),
         baselineDescr: chart.baselineDescr ? _t(chart.baselineDescr) : "",
-        fontColor: chartFontColor(background),
+        fontColor,
         background,
         baselineStyle: chart.baselineMode !== "percentage" && baseline
             ? getters.getCellStyle({
@@ -25621,6 +25615,7 @@ class AbstractResizer extends owl.Component {
         draggerShadowThickness: 0,
         delta: 0,
         base: 0,
+        position: "before",
     });
     _computeHandleDisplay(ev) {
         const position = this._getEvOffset(ev);
@@ -25745,11 +25740,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;
@@ -25932,6 +25929,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);
@@ -26105,6 +26103,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);
@@ -26212,8 +26211,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;
@@ -31642,7 +31641,7 @@ class BordersPlugin extends CorePlugin {
          */
         function getBorderId(border) {
             for (let [key, value] of Object.entries(borders)) {
-                if (stringify(value) === stringify(border)) {
+                if (deepEquals(value, border)) {
                     return parseInt(key, 10);
                 }
             }
@@ -34551,7 +34550,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 88 /* CommandResult.InvalidHeaderIndex */;
                 }
                 else if (cmd.quantity <= 0) {
@@ -35492,10 +35491,13 @@ class CompilationParametersBuilder {
         if (evaluatedCell === undefined) {
             return { value: null, format: this.getters.getCell(position)?.format };
         }
+        if (evaluatedCell.type === CellValueType.error) {
+            throw evaluatedCell.error;
+        }
         return evaluatedCell;
     }
     getEvaluatedCellIfNotEmpty(position) {
-        const evaluatedCell = this.getEvaluatedCell(position);
+        const evaluatedCell = this.computeCell(position);
         if (evaluatedCell.type === CellValueType.empty) {
             const cell = this.getters.getCell(position);
             if (!cell || (!cell.isFormula && cell.content === "")) {
@@ -35504,13 +35506,6 @@ class CompilationParametersBuilder {
         }
         return evaluatedCell;
     }
-    getEvaluatedCell(position) {
-        const evaluatedCell = this.computeCell(position);
-        if (evaluatedCell.type === CellValueType.error) {
-            throw evaluatedCell.error;
-        }
-        return evaluatedCell;
-    }
     /**
      * Return the values of the cell(s) used in reference, but always in the format of a range even
      * if a single cell is referenced. It is a list of col values. This is useful for the formulas that describe parameters as
@@ -35533,7 +35528,11 @@ class CompilationParametersBuilder {
         const { top, left, bottom, right } = zone;
         const cacheKey = `${sheetId}-${top}-${left}-${bottom}-${right}`;
         if (cacheKey in this.rangeCache) {
-            return this.rangeCache[cacheKey];
+            const result = this.rangeCache[cacheKey];
+            if (result instanceof EvaluationError) {
+                throw result;
+            }
+            return result;
         }
         const height = _zone.bottom - _zone.top + 1;
         const width = _zone.right - _zone.left + 1;
@@ -35546,6 +35545,10 @@ class CompilationParametersBuilder {
             format[colIndex] = new Array(height);
             for (let row = _zone.top; row <= _zone.bottom; row++) {
                 const evaluatedCell = this.getEvaluatedCellIfNotEmpty({ sheetId, col, row });
+                if (evaluatedCell?.type === CellValueType.error) {
+                    this.rangeCache[cacheKey] = evaluatedCell.error;
+                    throw evaluatedCell.error;
+                }
                 const rowIndex = row - _zone.top;
                 value[colIndex][rowIndex] = evaluatedCell?.value;
                 if (evaluatedCell?.format !== undefined) {
@@ -36535,7 +36538,7 @@ class CustomColorsPlugin extends UIPlugin {
 }
 
 class EvaluationChartPlugin extends UIPlugin {
-    static getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+    static getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
     charts = {};
     createRuntimeChart = chartRuntimeFactory(this.getters);
     handle(cmd) {
@@ -36573,25 +36576,26 @@ class EvaluationChartPlugin extends UIPlugin {
         return this.charts[figureId];
     }
     /**
-     * Get the background color of a chart based on the color of the first cell of the main range
-     * of the chart. In order of priority, it will return :
-     *
-     *  - the chart background color if one is defined
-     *  - the fill color of the cell if one is defined
-     *  - the fill color of the cell from conditional formats if one is defined
-     *  - the default chart color if no other color is defined
+     * Get the background and textColor of a chart based on the color of the first cell of the main range of the chart.
      */
-    getBackgroundOfSingleCellChart(chartBackground, mainRange) {
+    getStyleOfSingleCellChart(chartBackground, mainRange) {
         if (chartBackground)
-            return chartBackground;
+            return { background: chartBackground, fontColor: chartFontColor(chartBackground) };
         if (!mainRange) {
-            return BACKGROUND_CHART_COLOR;
+            return {
+                background: BACKGROUND_CHART_COLOR,
+                fontColor: chartFontColor(BACKGROUND_CHART_COLOR),
+            };
         }
         const col = mainRange.zone.left;
         const row = mainRange.zone.top;
         const sheetId = mainRange.sheetId;
         const style = this.getters.getCellComputedStyle({ sheetId, col, row });
-        return style.fillColor || BACKGROUND_CHART_COLOR;
+        const background = style.fillColor || BACKGROUND_CHART_COLOR;
+        return {
+            background,
+            fontColor: style.textColor || chartFontColor(background),
+        };
     }
 }
 
@@ -37290,19 +37294,21 @@ class AutofillPlugin extends UIPlugin {
         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 ||
+                this.getters.getCell(leftPosition)?.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 ||
+                    this.getters.getCell(rightPosition)?.content) {
                     row += 1;
-                    right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                    rightPosition = { sheetId, col: col + 1, row };
                 }
             }
         }
@@ -40220,6 +40226,9 @@ class SelectionInputsManagerPlugin extends UIPlugin {
     // Other
     // ---------------------------------------------------------------------------
     initInput(id, initialRanges, inputHasSingleRange = false) {
+        if (this.inputs[id]) {
+            this.unfocus();
+        }
         this.inputs[id] = new SelectionInputPlugin(this.config, initialRanges, inputHasSingleRange);
         if (initialRanges.length === 0) {
             const input = this.inputs[id];
@@ -42335,6 +42344,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":
@@ -43750,7 +43763,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];
@@ -43767,12 +43780,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 });
@@ -43809,6 +43823,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 88 /* CommandResult.InvalidHeaderIndex */;
+        }
         return 0 /* CommandResult.Success */;
     }
     //-------------------------------------------
@@ -50793,6 +50812,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.15';
-__info__.date = '2023-11-24T13:12:26.608Z';
-__info__.hash = '141943d';
+__info__.version = '16.4.16';
+__info__.date = '2023-12-05T09:37:14.210Z';
+__info__.hash = '1abbb92';

package/dist/o-spreadsheet.d.ts

@@ -1715,6 +1715,7 @@ interface MoveColumnsRowsCommand extends GridDependentCommand {
     type: "MOVE_COLUMNS_ROWS";
     base: HeaderIndex;
     elements: HeaderIndex[];
+    position: "before" | "after";
 }
 interface ResizeColumnsRowsCommand extends GridDependentCommand {
     type: "RESIZE_COLUMNS_ROWS";
@@ -3810,25 +3811,23 @@ declare class CustomColorsPlugin extends UIPlugin<CustomColorState> {
     private tryToAddColor;
 }
 
+interface EvaluationChartStyle {
+    background: Color;
+    fontColor: Color;
+}
 interface EvaluationChartState {
     charts: Record<UID, ChartRuntime | undefined>;
 }
 declare class EvaluationChartPlugin extends UIPlugin<EvaluationChartState> {
-    static getters: readonly ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+    static getters: readonly ["getChartRuntime", "getStyleOfSingleCellChart"];
     charts: Record<UID, ChartRuntime | undefined>;
     private createRuntimeChart;
     handle(cmd: CoreViewCommand): void;
     getChartRuntime(figureId: UID): ChartRuntime;
     /**
-     * Get the background color of a chart based on the color of the first cell of the main range
-     * of the chart. In order of priority, it will return :
-     *
-     *  - the chart background color if one is defined
-     *  - the fill color of the cell if one is defined
-     *  - the fill color of the cell from conditional formats if one is defined
-     *  - the default chart color if no other color is defined
+     * Get the background and textColor of a chart based on the color of the first cell of the main range of the chart.
      */
-    getBackgroundOfSingleCellChart(chartBackground: Color | undefined, mainRange: Range | undefined): Color;
+    getStyleOfSingleCellChart(chartBackground: Color | undefined, mainRange: Range | undefined): EvaluationChartStyle;
 }
 
 declare class EvaluationConditionalFormatPlugin extends UIPlugin {
@@ -6932,6 +6931,7 @@ interface ResizerState {
     draggerShadowThickness: number;
     delta: number;
     base: number;
+    position: "before" | "after";
 }
 interface ResizerProps {
     onOpenContextMenu: (type: ContextMenuType, x: Pixel, y: Pixel) => void;