@odoo/o-spreadsheet 17.0.13 → 17.0.14

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 17.0.13
- * @date 2024-02-28T12:28:44.914Z
- * @hash ed67be7
+ * @version 17.0.14
+ * @date 2024-03-12T07:56:15.364Z
+ * @hash 6f6e1b9
  */
 
 'use strict';
@@ -6059,8 +6059,10 @@ function getGroup(cell, cells, filter) {
         if (x === cell) {
             found = true;
         }
-        const cellValue = evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
-        if (filter(cellValue)) {
+        const cellValue = x?.isFormula
+            ? undefined
+            : evaluateLiteral(x?.content, { locale: DEFAULT_LOCALE });
+        if (cellValue && filter(cellValue)) {
             group.push(cellValue);
         }
         else {
@@ -19443,10 +19445,8 @@ function createComputeFunctionFromDescription(descr) {
 }
 function buildComputeFunctionFromDescription(descr) {
     return function (...args) {
-        const computeValue = descr.compute.bind(this);
-        const computeFormat = descr.computeFormat?.bind(this) || (() => undefined);
-        const value = computeValue(...extractArgValuesFromArgs(args));
-        const format = computeFormat(...args);
+        const value = descr.compute.apply(this, extractArgValuesFromArgs(args));
+        const format = descr.computeFormat?.apply(this, args);
         if (isMatrix(value)) {
             if (format === undefined || isMatrix(format)) {
                 return value.map((col, i) => col.map((row, j) => ({ value: row, format: format?.[i]?.[j] })));
@@ -27271,7 +27271,11 @@ class GridComposer extends owl.Component {
         }
     }
     updateCellReferenceVisibility() {
-        if (this.isCellReferenceVisible || this.env.model.getters.getEditionMode() === "inactive") {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            this.isCellReferenceVisible = false;
+            return;
+        }
+        if (this.isCellReferenceVisible) {
             return;
         }
         const sheetId = this.env.model.getters.getActiveSheetId();
@@ -27300,19 +27304,21 @@ class GridCellIcon extends owl.Component {
     static style = CSS$1;
     static template = "o-spreadsheet-GridCellIcon";
     get iconStyle() {
-        const x = this.getIconHorizontalPosition();
-        const y = this.getIconVerticalPosition();
+        const cellPosition = this.props.cellPosition;
+        const merge = this.env.model.getters.getMerge(cellPosition);
+        const zone = merge || positionToZone(cellPosition);
+        const rect = this.env.model.getters.getVisibleRectWithoutHeaders(zone);
+        const x = this.getIconHorizontalPosition(rect, cellPosition);
+        const y = this.getIconVerticalPosition(rect, cellPosition);
         return cssPropertiesToCss({
             top: `${y + (this.props.offset?.y || 0)}px`,
             left: `${x + (this.props.offset?.x || 0)}px`,
         });
     }
-    getIconVerticalPosition() {
-        const { sheetId, row } = this.props.cellPosition;
-        const merge = this.env.model.getters.getMerge(this.props.cellPosition);
-        const start = this.env.model.getters.getRowDimensionsInViewport(sheetId, row).start;
-        const end = this.env.model.getters.getRowDimensionsInViewport(sheetId, merge ? merge.bottom : row).end;
-        const cell = this.env.model.getters.getCell(this.props.cellPosition);
+    getIconVerticalPosition(rect, cellPosition) {
+        const start = rect.y;
+        const end = rect.y + rect.height;
+        const cell = this.env.model.getters.getCell(cellPosition);
         const align = this.props.verticalAlign || cell?.style?.verticalAlign || DEFAULT_VERTICAL_ALIGN;
         switch (align) {
             case "bottom":
@@ -27324,13 +27330,11 @@ class GridCellIcon extends owl.Component {
                 return end - GRID_ICON_EDGE_LENGTH - centeringOffset;
         }
     }
-    getIconHorizontalPosition() {
-        const { sheetId, col } = this.props.cellPosition;
-        const merge = this.env.model.getters.getMerge(this.props.cellPosition);
-        const start = this.env.model.getters.getColDimensionsInViewport(sheetId, col).start;
-        const end = this.env.model.getters.getColDimensionsInViewport(sheetId, merge ? merge.right : col).end;
-        const cell = this.env.model.getters.getCell(this.props.cellPosition);
-        const evaluatedCell = this.env.model.getters.getEvaluatedCell(this.props.cellPosition);
+    getIconHorizontalPosition(rect, cellPosition) {
+        const start = rect.x;
+        const end = rect.x + rect.width;
+        const cell = this.env.model.getters.getCell(cellPosition);
+        const evaluatedCell = this.env.model.getters.getEvaluatedCell(cellPosition);
         const align = this.props.horizontalAlign || cell?.style?.align || evaluatedCell.defaultAlign;
         switch (align) {
             case "right":
@@ -27422,6 +27426,8 @@ css /* scss */ `
     height: ${CHECKBOX_WIDTH}px;
     accent-color: #808080;
     margin: ${MARGIN}px;
+    /** required to prevent the checkbox position to be sensible to the font-size (affects Firefox) */
+    position: absolute;
   }
 `;
 class DataValidationCheckbox extends owl.Component {
@@ -27437,7 +27443,7 @@ class DataValidationCheckbox extends owl.Component {
     }
     get isDisabled() {
         const cell = this.env.model.getters.getCell(this.props.cellPosition);
-        return !!cell?.isFormula;
+        return this.env.model.getters.isReadonly() || !!cell?.isFormula;
     }
 }
 DataValidationCheckbox.props = {
@@ -27479,12 +27485,17 @@ class DataValidationOverlay extends owl.Component {
     static template = "o-spreadsheet-DataValidationOverlay";
     static components = { GridCellIcon, DataValidationCheckbox, DataValidationListIcon };
     get checkBoxCellPositions() {
-        return this.env.model.getters.getDataValidationCheckBoxCellPositions();
+        return this.env.model.getters
+            .getVisibleCellPositions()
+            .filter(this.env.model.getters.isCellValidCheckbox);
     }
     get listIconsCellPositions() {
-        return this.env.model.getters.isReadonly()
-            ? []
-            : this.env.model.getters.getDataValidationListCellsPositions();
+        if (this.env.model.getters.isReadonly()) {
+            return [];
+        }
+        return this.env.model.getters
+            .getVisibleCellPositions()
+            .filter(this.env.model.getters.cellHasListDataValidationIcon);
     }
 }
 DataValidationOverlay.props = {};
@@ -38600,7 +38611,6 @@ class SheetPlugin extends CorePlugin {
         "getNumberHeaders",
         "getGridLinesVisibility",
         "getNextSheetName",
-        "isEmpty",
         "getSheetSize",
         "getSheetZone",
         "getPaneDivisions",
@@ -38975,14 +38985,6 @@ class SheetPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Row/Col manipulation
     // ---------------------------------------------------------------------------
-    /**
-     * Check if a zone only contains empty cells
-     */
-    isEmpty(sheetId, zone) {
-        return positions(zone)
-            .map(({ col, row }) => this.getCell({ sheetId, col, row }))
-            .every((cell) => !cell || cell.content === "");
-    }
     getCommandZones(cmd) {
         const zones = [];
         if ("zone" in cmd) {
@@ -41436,6 +41438,7 @@ class EvaluationPlugin extends UIPlugin {
         "getEvaluatedCellsInZone",
         "getSpreadPositionsOf",
         "getArrayFormulaSpreadingOn",
+        "isEmpty",
     ];
     shouldRebuildDependenciesGraph = true;
     evaluator;
@@ -41540,6 +41543,14 @@ class EvaluationPlugin extends UIPlugin {
     getArrayFormulaSpreadingOn(position) {
         return this.evaluator.getArrayFormulaSpreadingOn(position);
     }
+    /**
+     * Check if a zone only contains empty cells
+     */
+    isEmpty(sheetId, zone) {
+        return positions(zone)
+            .map(({ col, row }) => this.getEvaluatedCell({ sheetId, col, row }))
+            .every((cell) => cell.type === CellValueType.empty);
+    }
     // ---------------------------------------------------------------------------
     // Export
     // ---------------------------------------------------------------------------
@@ -42186,8 +42197,6 @@ const VALID_RESULT = { isValid: true };
 class EvaluationDataValidationPlugin extends UIPlugin {
     static getters = [
         "getDataValidationInvalidCriterionValueMessage",
-        "getDataValidationCheckBoxCellPositions",
-        "getDataValidationListCellsPositions",
         "getInvalidDataValidationMessage",
         "getValidationResultForCellValue",
         "isCellValidCheckbox",
@@ -42251,19 +42260,6 @@ class EvaluationDataValidationPlugin extends UIPlugin {
         const error = this.getRuleErrorForCellValue(cellValue, cellPosition, rule);
         return error ? { error, rule, isValid: false } : VALID_RESULT;
     }
-    getDataValidationCheckBoxCellPositions() {
-        const rules = this.getters
-            .getDataValidationRules(this.getters.getActiveSheetId())
-            .filter((rule) => rule.criterion.type === "isBoolean");
-        return getCellPositionsInRanges(rules.map((rule) => rule.ranges).flat()).filter((position) => this.isCellValidCheckbox(position));
-    }
-    getDataValidationListCellsPositions() {
-        const rules = this.getters
-            .getDataValidationRules(this.getters.getActiveSheetId())
-            .filter((rule) => (rule.criterion.type === "isValueInList" || rule.criterion.type === "isValueInRange") &&
-            rule.criterion.displayStyle === "arrow");
-        return getCellPositionsInRanges(rules.map((rule) => rule.ranges).flat());
-    }
     getValidationResultForCell(cellPosition) {
         const { col, row, sheetId } = cellPosition;
         if (!this.validationResults[sheetId]) {
@@ -50086,6 +50082,8 @@ class SheetViewPlugin extends UIPlugin {
         "getEdgeScrollRow",
         "getVisibleFigures",
         "getVisibleRect",
+        "getVisibleRectWithoutHeaders",
+        "getVisibleCellPositions",
         "getColRowOffsetInViewport",
         "getMainViewportCoordinates",
         "getActiveSheetScrollInfo",
@@ -50329,6 +50327,26 @@ class SheetViewPlugin extends UIPlugin {
         const viewports = this.getSubViewports(sheetId);
         return [...new Set(viewports.map((v) => range(v.top, v.bottom + 1)).flat())].filter((row) => !this.getters.isHeaderHidden(sheetId, "ROW", row));
     }
+    /**
+     * Get the positions of all the cells that are visible in the viewport, taking merges into account.
+     */
+    getVisibleCellPositions() {
+        const visibleCols = this.getSheetViewVisibleCols();
+        const visibleRows = this.getSheetViewVisibleRows();
+        const sheetId = this.getters.getActiveSheetId();
+        const positions = [];
+        for (const col of visibleCols) {
+            for (const row of visibleRows) {
+                const position = { sheetId, col, row };
+                const mainPosition = this.getters.getMainCellPosition(position);
+                if (mainPosition.row !== row || mainPosition.col !== col) {
+                    continue;
+                }
+                positions.push(position);
+            }
+        }
+        return positions;
+    }
     /**
      * Return the main viewport maximum size relative to the client size.
      */
@@ -50448,6 +50466,13 @@ class SheetViewPlugin extends UIPlugin {
      * Computes the coordinates and size to draw the zone on the canvas
      */
     getVisibleRect(zone) {
+        const rect = this.getVisibleRectWithoutHeaders(zone);
+        return { ...rect, x: rect.x + this.gridOffsetX, y: rect.y + this.gridOffsetY };
+    }
+    /**
+     * Computes the coordinates and size to draw the zone without taking the grid offset into account
+     */
+    getVisibleRectWithoutHeaders(zone) {
         const sheetId = this.getters.getActiveSheetId();
         const viewportRects = this.getSubViewports(sheetId)
             .map((viewport) => viewport.getRect(zone))
@@ -50459,12 +50484,7 @@ class SheetViewPlugin extends UIPlugin {
         const y = Math.min(...viewportRects.map((rect) => rect.y));
         const width = Math.max(...viewportRects.map((rect) => rect.x + rect.width)) - x;
         const height = Math.max(...viewportRects.map((rect) => rect.y + rect.height)) - y;
-        return {
-            x: x + this.gridOffsetX,
-            y: y + this.gridOffsetY,
-            width,
-            height,
-        };
+        return { x, y, width, height };
     }
     /**
      * Returns the position of the MainViewport relatively to the start of the grid (without headers)
@@ -50688,13 +50708,8 @@ class HeaderPositionsUIPlugin extends UIPlugin {
                 }
                 break;
             case "UPDATE_CELL":
-                if ("content" in cmd || "format" in cmd) {
-                    this.headerPositions = {};
-                    this.isDirty = true;
-                }
-                else {
-                    this.headerPositions[cmd.sheetId] = this.computeHeaderPositionsOfSheet(cmd.sheetId);
-                }
+                this.headerPositions = {};
+                this.isDirty = true;
                 break;
             case "UPDATE_FILTER":
             case "REMOVE_FILTER_TABLE":
@@ -56941,6 +56956,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.13";
-__info__.date = "2024-02-28T12:28:44.914Z";
-__info__.hash = "ed67be7";
+__info__.version = "17.0.14";
+__info__.date = "2024-03-12T07:56:15.364Z";
+__info__.hash = "6f6e1b9";

package/dist/o-spreadsheet.d.ts

@@ -3981,7 +3981,7 @@ interface SheetState {
     readonly cellPosition: Record<UID, CellPosition | undefined>;
 }
 declare class SheetPlugin extends CorePlugin<SheetState> implements SheetState {
-    static getters: readonly ["getSheetName", "tryGetSheetName", "getSheet", "tryGetSheet", "getSheetIdByName", "getSheetIds", "getVisibleSheetIds", "isSheetVisible", "getEvaluationSheets", "doesHeaderExist", "doesHeadersExist", "getCell", "getCellPosition", "getColsZone", "getRowCells", "getRowsZone", "getNumberCols", "getNumberRows", "getNumberHeaders", "getGridLinesVisibility", "getNextSheetName", "isEmpty", "getSheetSize", "getSheetZone", "getPaneDivisions", "checkZonesExistInSheet", "getCommandZones", "getUnboundedZone", "checkElementsIncludeAllNonFrozenHeaders"];
+    static getters: readonly ["getSheetName", "tryGetSheetName", "getSheet", "tryGetSheet", "getSheetIdByName", "getSheetIds", "getVisibleSheetIds", "isSheetVisible", "getEvaluationSheets", "doesHeaderExist", "doesHeadersExist", "getCell", "getCellPosition", "getColsZone", "getRowCells", "getRowsZone", "getNumberCols", "getNumberRows", "getNumberHeaders", "getGridLinesVisibility", "getNextSheetName", "getSheetSize", "getSheetZone", "getPaneDivisions", "checkZonesExistInSheet", "getCommandZones", "getUnboundedZone", "checkElementsIncludeAllNonFrozenHeaders"];
     readonly sheetIdsMapName: Record<string, UID | undefined>;
     readonly orderedSheetIds: UID[];
     readonly sheets: Record<UID, Sheet | undefined>;
@@ -4030,10 +4030,6 @@ declare class SheetPlugin extends CorePlugin<SheetState> implements SheetState {
      * This validation ensures that all rows or columns cannot be deleted when frozen panes exist.
      */
     checkElementsIncludeAllNonFrozenHeaders(sheetId: UID, dimension: Dimension, elements: HeaderIndex[]): boolean;
-    /**
-     * Check if a zone only contains empty cells
-     */
-    isEmpty(sheetId: UID, zone: Zone): boolean;
     getCommandZones(cmd: Command): Zone[];
     /**
      * Check if zones in the command are well formed and
@@ -4128,7 +4124,7 @@ declare class SheetPlugin extends CorePlugin<SheetState> implements SheetState {
 }
 
 declare class EvaluationPlugin extends UIPlugin {
-    static getters: readonly ["evaluateFormula", "getCorrespondingFormulaCell", "getRangeFormattedValues", "getRangeValues", "getRangeFormats", "getEvaluatedCell", "getEvaluatedCells", "getEvaluatedCellsInZone", "getSpreadPositionsOf", "getArrayFormulaSpreadingOn"];
+    static getters: readonly ["evaluateFormula", "getCorrespondingFormulaCell", "getRangeFormattedValues", "getRangeValues", "getRangeFormats", "getEvaluatedCell", "getEvaluatedCells", "getEvaluatedCellsInZone", "getSpreadPositionsOf", "getArrayFormulaSpreadingOn", "isEmpty"];
     private shouldRebuildDependenciesGraph;
     private evaluator;
     private positionsToUpdate;
@@ -4154,6 +4150,10 @@ declare class EvaluationPlugin extends UIPlugin {
     getEvaluatedCellsInZone(sheetId: UID, zone: Zone): EvaluatedCell[];
     getSpreadPositionsOf(position: CellPosition): CellPosition[];
     getArrayFormulaSpreadingOn(position: CellPosition): CellPosition | undefined;
+    /**
+     * Check if a zone only contains empty cells
+     */
+    isEmpty(sheetId: UID, zone: Zone): boolean;
     exportForExcel(data: ExcelWorkbookData): void;
     /**
      * Returns the corresponding formula cell of a given cell
@@ -4253,7 +4253,7 @@ type SheetValidationResult = {
     [col: HeaderIndex]: Array<Lazy<ValidationResult>>;
 };
 declare class EvaluationDataValidationPlugin extends UIPlugin {
-    static getters: readonly ["getDataValidationInvalidCriterionValueMessage", "getDataValidationCheckBoxCellPositions", "getDataValidationListCellsPositions", "getInvalidDataValidationMessage", "getValidationResultForCellValue", "isCellValidCheckbox", "isDataValidationInvalid"];
+    static getters: readonly ["getDataValidationInvalidCriterionValueMessage", "getInvalidDataValidationMessage", "getValidationResultForCellValue", "isCellValidCheckbox", "isDataValidationInvalid"];
     validationResults: Record<UID, SheetValidationResult>;
     handle(cmd: CoreViewCommand): void;
     isDataValidationInvalid(cellPosition: CellPosition): boolean;
@@ -4267,8 +4267,6 @@ declare class EvaluationDataValidationPlugin extends UIPlugin {
     isCellValidCheckbox(cellPosition: CellPosition): boolean;
     /** Get the validation result if the cell on the given position had the given value */
     getValidationResultForCellValue(cellValue: CellValue, cellPosition: CellPosition): ValidationResult;
-    getDataValidationCheckBoxCellPositions(): CellPosition[];
-    getDataValidationListCellsPositions(): CellPosition[];
     private getValidationResultForCell;
     private computeSheetValidationResults;
     private getRuleErrorForCellValue;
@@ -5123,7 +5121,7 @@ type SheetViewports = {
  *
  */
 declare class SheetViewPlugin extends UIPlugin {
-    static getters: readonly ["getColIndex", "getRowIndex", "getActiveMainViewport", "getSheetViewDimension", "getSheetViewDimensionWithHeaders", "getMainViewportRect", "isVisibleInViewport", "getEdgeScrollCol", "getEdgeScrollRow", "getVisibleFigures", "getVisibleRect", "getColRowOffsetInViewport", "getMainViewportCoordinates", "getActiveSheetScrollInfo", "getActiveSheetDOMScrollInfo", "getSheetViewVisibleCols", "getSheetViewVisibleRows", "getFrozenSheetViewRatio", "isPositionVisible"];
+    static getters: readonly ["getColIndex", "getRowIndex", "getActiveMainViewport", "getSheetViewDimension", "getSheetViewDimensionWithHeaders", "getMainViewportRect", "isVisibleInViewport", "getEdgeScrollCol", "getEdgeScrollRow", "getVisibleFigures", "getVisibleRect", "getVisibleRectWithoutHeaders", "getVisibleCellPositions", "getColRowOffsetInViewport", "getMainViewportCoordinates", "getActiveSheetScrollInfo", "getActiveSheetDOMScrollInfo", "getSheetViewVisibleCols", "getSheetViewVisibleRows", "getFrozenSheetViewRatio", "isPositionVisible"];
     readonly viewports: Record<UID, SheetViewports | undefined>;
     /**
      * The viewport dimensions are usually set by one of the components
@@ -5170,6 +5168,10 @@ declare class SheetViewPlugin extends UIPlugin {
     getActiveSheetDOMScrollInfo(): SheetDOMScrollInfo;
     getSheetViewVisibleCols(): HeaderIndex[];
     getSheetViewVisibleRows(): HeaderIndex[];
+    /**
+     * Get the positions of all the cells that are visible in the viewport, taking merges into account.
+     */
+    getVisibleCellPositions(): CellPosition[];
     /**
      * Return the main viewport maximum size relative to the client size.
      */
@@ -5186,6 +5188,10 @@ declare class SheetViewPlugin extends UIPlugin {
      * Computes the coordinates and size to draw the zone on the canvas
      */
     getVisibleRect(zone: Zone): Rect;
+    /**
+     * Computes the coordinates and size to draw the zone without taking the grid offset into account
+     */
+    getVisibleRectWithoutHeaders(zone: Zone): Rect;
     /**
      * Returns the position of the MainViewport relatively to the start of the grid (without headers)
      * It corresponds to the summed dimensions of the visible cols/rows (in x/y respectively)