@odoo/o-spreadsheet 18.4.2 → 18.4.4

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.4.2
- * @date 2025-07-11T11:11:12.642Z
- * @hash 29b6458
+ * @version 18.4.4
+ * @date 2025-07-30T11:20:08.639Z
+ * @hash b14de14
  */
 
 'use strict';
@@ -8626,12 +8626,12 @@ const AGGREGATOR_NAMES = {
     avg: _t("Average"),
     sum: _t("Sum"),
 };
-const NUMBER_CHAR_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
+const DEFAULT_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
 const AGGREGATORS_BY_FIELD_TYPE = {
-    integer: NUMBER_CHAR_AGGREGATORS,
-    char: NUMBER_CHAR_AGGREGATORS,
+    integer: DEFAULT_AGGREGATORS,
+    char: DEFAULT_AGGREGATORS,
+    datetime: DEFAULT_AGGREGATORS,
     boolean: ["count_distinct", "count", "bool_and", "bool_or"],
-    datetime: ["max", "min", "count_distinct", "count"],
 };
 const AGGREGATORS = {};
 for (const type in AGGREGATORS_BY_FIELD_TYPE) {
@@ -19035,13 +19035,19 @@ const COLUMN = {
         if (isEvaluationError(cellReference?.value)) {
             return cellReference;
         }
-        const column = cellReference === undefined
-            ? this.__originCellPosition?.col
-            : toZone(cellReference.value).left;
-        if (column === undefined) {
-            return new EvaluationError(_t("In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter."));
+        if (cellReference === undefined) {
+            if (this.__originCellPosition?.col === undefined) {
+                return new EvaluationError(_t("In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter."));
+            }
+            return this.__originCellPosition.col + 1;
+        }
+        const zone = this.getters.getRangeFromSheetXC(this.getters.getActiveSheetId(), cellReference.value).zone;
+        if (zone.left === zone.right) {
+            return zone.left + 1;
         }
-        return column + 1;
+        return generateMatrix(zone.right - zone.left + 1, 1, (col, row) => ({
+            value: zone.left + col + 1,
+        }));
     },
     isExported: true,
 };
@@ -19272,13 +19278,19 @@ const ROW = {
         if (isEvaluationError(cellReference?.value)) {
             return cellReference;
         }
-        const row = cellReference === undefined
-            ? this.__originCellPosition?.row
-            : toZone(cellReference.value).top;
-        if (row === undefined) {
-            return new EvaluationError(_t("In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter."));
+        if (cellReference === undefined) {
+            if (this.__originCellPosition?.row === undefined) {
+                return new EvaluationError(_t("In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter."));
+            }
+            return this.__originCellPosition.row + 1;
         }
-        return row + 1;
+        const zone = this.getters.getRangeFromSheetXC(this.getters.getActiveSheetId(), cellReference.value).zone;
+        if (zone.top === zone.bottom) {
+            return zone.top + 1;
+        }
+        return generateMatrix(1, zone.bottom - zone.top + 1, (col, row) => ({
+            value: zone.top + row + 1,
+        }));
     },
     isExported: true,
 };
@@ -31697,7 +31709,7 @@ criterionEvaluatorRegistry.add("isValueInRange", {
         }
         const criterionValues = getters.getDataValidationRangeValues(sheetId, criterion);
         return criterionValues
-            .map((value) => value.toLowerCase())
+            .map((value) => value.value.toLowerCase())
             .includes(value.toString().toLowerCase());
     },
     getErrorString: (criterion) => _t("The value must be a value in the range %s", String(criterion.values[0])),
@@ -32608,6 +32620,9 @@ class AbstractComposerStore extends SpreadsheetStore {
     get isAutoCompleteDisplayed() {
         return !!this.autoComplete.provider;
     }
+    get canBeToggled() {
+        return this.autoComplete.provider?.canBeToggled ?? true;
+    }
     cycleReferences() {
         const locale = this.getters.getLocale();
         const updated = cycleFixedReference(this.composerSelection, this._currentContent, locale);
@@ -33137,6 +33152,7 @@ class AbstractComposerStore extends SpreadsheetStore {
                     proposals,
                     selectProposal: provider.selectProposal,
                     autoSelectFirstProposal: provider.autoSelectFirstProposal ?? false,
+                    canBeToggled: provider.canBeToggled,
                 };
             }
             if (exactMatch && this._currentContent !== this.initialContent) {
@@ -33159,6 +33175,7 @@ class AbstractComposerStore extends SpreadsheetStore {
                     proposals,
                     selectProposal: provider.selectProposal,
                     autoSelectFirstProposal: provider.autoSelectFirstProposal ?? false,
+                    canBeToggled: provider.canBeToggled,
                 };
             }
         }
@@ -33729,9 +33746,13 @@ class Composer extends owl.Component {
         }
     }
     closeAssistant() {
+        if (!this.props.composerStore.canBeToggled)
+            return;
         this.assistant.forcedClosed = true;
     }
     openAssistant() {
+        if (!this.props.composerStore.canBeToggled)
+            return;
         this.assistant.forcedClosed = false;
     }
     onWheel(event) {
@@ -33921,7 +33942,7 @@ class Composer extends owl.Component {
         return [...new Set(argsToFocus)];
     }
     autoComplete(value) {
-        if (!value || this.assistant.forcedClosed) {
+        if (!value || (this.assistant.forcedClosed && this.props.composerStore.canBeToggled)) {
             return;
         }
         this.props.composerStore.insertAutoCompleteValue(value);
@@ -52023,7 +52044,8 @@ class ConditionalFormattingEditor extends owl.Component {
     static props = {
         editedCf: Object,
         onCancel: Function,
-        onSave: Function,
+        onExit: Function,
+        isNewCf: Boolean,
     };
     static components = {
         SelectionInput,
@@ -52048,6 +52070,7 @@ class ConditionalFormattingEditor extends owl.Component {
             currentCFType: this.props.editedCf.rule.type,
             ranges: this.props.editedCf.ranges,
             rules: this.getDefaultRules(),
+            hasEditedCf: this.props.isNewCf,
         });
         switch (this.props.editedCf.rule.type) {
             case "CellIsRule":
@@ -52099,6 +52122,9 @@ class ConditionalFormattingEditor extends owl.Component {
             ranges: ranges.map((xc) => this.env.model.getters.getRangeDataFromXc(sheetId, xc)),
             sheetId,
         });
+        if (result.isSuccessful) {
+            this.state.hasEditedCf = true;
+        }
         const reasons = result.reasons.filter((r) => r !== "NoChanges" /* CommandResult.NoChanges */);
         if (!newCf.suppressErrors) {
             this.state.errors = reasons;
@@ -52120,7 +52146,15 @@ class ConditionalFormattingEditor extends owl.Component {
     onSave() {
         const result = this.updateConditionalFormat({});
         if (result.length === 0) {
-            this.props.onSave();
+            this.props.onExit();
+        }
+    }
+    onCancel() {
+        if (this.state.hasEditedCf) {
+            this.props.onCancel();
+        }
+        else {
+            this.props.onExit();
         }
     }
     getDefaultRules() {
@@ -55682,9 +55716,15 @@ class SpreadsheetPivot {
         return domain.reduce((current, acc) => this.filterDataEntriesFromDomainNode(current, acc), dataEntries);
     }
     filterDataEntriesFromDomainNode(dataEntries, domain) {
-        const { field, value } = domain;
+        const { field, value, type } = domain;
         const { nameWithGranularity } = this.getDimension(field);
-        return dataEntries.filter((entry) => entry[nameWithGranularity]?.value === value);
+        return dataEntries.filter((entry) => {
+            const cellValue = entry[nameWithGranularity]?.value;
+            if (type === "char") {
+                return String(cellValue) === String(value);
+            }
+            return cellValue === value;
+        });
     }
     getDimension(nameWithGranularity) {
         return this.definition.getDimension(nameWithGranularity);
@@ -67009,8 +67049,16 @@ class EvaluationDataValidationPlugin extends CoreViewPlugin {
     }
     getDataValidationRangeValues(sheetId, criterion) {
         const range = this.getters.getRangeFromSheetXC(sheetId, String(criterion.values[0]));
-        const criterionValues = this.getters.getRangeValues(range);
-        return criterionValues.map((value) => value?.toString()).filter(isDefined);
+        const values = [];
+        const labelsSet = new Set();
+        for (const p of positions(range.zone)) {
+            const cell = this.getters.getEvaluatedCell({ ...p, sheetId: range.sheetId });
+            if (cell.formattedValue && !labelsSet.has(cell.formattedValue)) {
+                labelsSet.add(cell.formattedValue);
+                values.push({ label: cell.formattedValue, value: cell.value?.toString() || "" });
+            }
+        }
+        return values;
     }
     isCellValidCheckbox(cellPosition) {
         if (!this.getters.isMainCellPosition(cellPosition)) {
@@ -67553,6 +67601,23 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
     static getters = ["getRowSize", "getHeaderSize", "getMaxAnchorOffset"];
     tallestCellInRow = {};
     ctx = document.createElement("canvas").getContext("2d");
+    beforeHandle(cmd) {
+        switch (cmd.type) {
+            // Ensure rows are updated before "UPDATE_CELL" is dispatched from cell plugin.
+            // "UPDATE_CELL" uses the Sheet core plugin to access row data.
+            // If "ADD_COLUMNS_ROWS" has not been processed yet by header_sizes_ui,
+            // size updates may apply to incorrect (pre-insert) rows.
+            case "ADD_COLUMNS_ROWS":
+                if (cmd.dimension === "COL") {
+                    return;
+                }
+                const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
+                const newCells = Array(cmd.quantity).fill(undefined);
+                const newTallestCells = insertItemsAtIndex(this.tallestCellInRow[cmd.sheetId], newCells, addIndex);
+                this.history.update("tallestCellInRow", cmd.sheetId, newTallestCells);
+                break;
+        }
+    }
     handle(cmd) {
         switch (cmd.type) {
             case "START":
@@ -67582,16 +67647,6 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
                 this.history.update("tallestCellInRow", cmd.sheetId, tallestCells);
                 break;
             }
-            case "ADD_COLUMNS_ROWS": {
-                if (cmd.dimension === "COL") {
-                    return;
-                }
-                const addIndex = getAddHeaderStartIndex(cmd.position, cmd.base);
-                const newCells = Array(cmd.quantity).fill(undefined);
-                const newTallestCells = insertItemsAtIndex(this.tallestCellInRow[cmd.sheetId], newCells, addIndex);
-                this.history.update("tallestCellInRow", cmd.sheetId, newTallestCells);
-                break;
-            }
             case "RESIZE_COLUMNS_ROWS":
                 {
                     const sheetId = cmd.sheetId;
@@ -74133,6 +74188,14 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
+        const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
+        const originalSize = Object.fromEntries(toRemove.map((element) => {
+            const size = isCol
+                ? this.getters.getColSize(cmd.sheetId, element)
+                : this.getters.getUserRowSize(cmd.sheetId, element);
+            const isDefaultCol = isCol && size === DEFAULT_CELL_WIDTH;
+            return [element, isDefaultCol ? undefined : size];
+        }));
         const target = [
             {
                 left: isCol ? start + deltaCol : 0,
@@ -74163,13 +74226,12 @@ class GridSelectionPlugin extends UIPlugin {
         const col = selection.left;
         const row = selection.top;
         this.setSelectionMixin({ zone: selection, cell: { col, row } }, [selection]);
-        const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = isBasedBefore ? cmd.base : cmd.base + 1;
         const resizingGroups = {};
         for (const element of toRemove) {
-            const size = this.getters.getHeaderSize(cmd.sheetId, cmd.dimension, element);
+            const size = originalSize[element];
             const currentSize = this.getters.getHeaderSize(cmd.sheetId, cmd.dimension, currentIndex);
-            if (size !== currentSize) {
+            if (size && size !== currentSize) {
                 resizingGroups[size] ??= [];
                 resizingGroups[size].push(currentIndex);
                 currentIndex += 1;
@@ -75595,6 +75657,7 @@ const coreViewsPluginRegistry = new Registry()
 
 autoCompleteProviders.add("dataValidation", {
     displayAllOnInitialContent: true,
+    canBeToggled: false,
     getProposals(tokenAtCursor, content) {
         if (isFormula(content)) {
             return [];
@@ -75610,25 +75673,30 @@ autoCompleteProviders.add("dataValidation", {
         }
         const sheetId = this.composer.currentEditedCell.sheetId;
         const values = rule.criterion.type === "isValueInRange"
-            ? Array.from(new Set(this.getters.getDataValidationRangeValues(sheetId, rule.criterion)))
-            : rule.criterion.values;
+            ? this.getters.getDataValidationRangeValues(sheetId, rule.criterion)
+            : rule.criterion.values.map((value) => ({ label: value, value }));
         const isChip = rule.criterion.displayStyle === "chip";
         if (!isChip) {
-            return values.map((value) => ({ text: value }));
+            return values.map((value) => ({
+                text: value.value,
+                fuzzySearchKey: value.label,
+                htmlContent: [{ value: value.label }],
+            }));
         }
         const colors = rule.criterion.colors;
         return values.map((value) => {
-            const color = colors?.[value];
+            const color = colors?.[value.value];
             return {
-                text: value,
+                text: value.value,
                 htmlContent: [
                     {
-                        value,
+                        value: value.label,
                         color: color ? chipTextColor(color) : undefined,
                         backgroundColor: color || GRAY_200,
                         classes: ["badge rounded-pill fs-6 fw-normal w-100 mt-1 text-start"],
                     },
                 ],
+                fuzzySearchKey: value.label,
             };
         });
     },
@@ -77160,14 +77228,12 @@ class BottomBarSheet extends owl.Component {
         this.editionState = "initializing";
     }
     stopEdition() {
-        const input = this.sheetNameRef.el;
-        if (!this.state.isEditing || !input)
+        if (!this.state.isEditing || !this.sheetNameRef.el)
             return;
         this.state.isEditing = false;
         this.editionState = "initializing";
-        input.blur();
+        this.sheetNameRef.el.blur();
         const inputValue = this.getInputContent() || "";
-        input.innerText = inputValue;
         interactiveRenameSheet(this.env, this.props.sheetId, inputValue, () => this.startEdition());
     }
     cancelEdition() {
@@ -84606,6 +84672,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.4.2";
-__info__.date = "2025-07-11T11:11:12.642Z";
-__info__.hash = "29b6458";
+__info__.version = "18.4.4";
+__info__.date = "2025-07-30T11:20:08.639Z";
+__info__.hash = "b14de14";

package/dist/o-spreadsheet.d.ts

@@ -5557,7 +5557,10 @@ declare class EvaluationDataValidationPlugin extends CoreViewPlugin {
      * The value must be canonicalized.
      */
     getDataValidationInvalidCriterionValueMessage(criterionType: DataValidationCriterionType, value: string): string | undefined;
-    getDataValidationRangeValues(sheetId: UID, criterion: EvaluatedCriterion): string[];
+    getDataValidationRangeValues(sheetId: UID, criterion: EvaluatedCriterion): {
+        value: string;
+        label: string;
+    }[];
     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;
@@ -5689,6 +5692,7 @@ declare class HeaderSizeUIPlugin extends CoreViewPlugin<HeaderSizeState> impleme
     static getters: readonly ["getRowSize", "getHeaderSize", "getMaxAnchorOffset"];
     readonly tallestCellInRow: Immutable<Record<UID, Array<CellWithSize | undefined>>>;
     private ctx;
+    beforeHandle(cmd: Command): void;
     handle(cmd: Command): void;
     getRowSize(sheetId: UID, row: HeaderIndex): Pixel;
     getMaxAnchorOffset(sheetId: UID, height: Pixel, width: Pixel): AnchorOffset;
@@ -8551,6 +8555,7 @@ declare abstract class AbstractComposerStore extends SpreadsheetStore {
     get autoCompleteProposals(): AutoCompleteProposal[];
     get autoCompleteSelectedIndex(): number | undefined;
     get isAutoCompleteDisplayed(): boolean;
+    get canBeToggled(): boolean;
     cycleReferences(): void;
     toggleEditionMode(): void;
     hoverToken(tokenIndex: number | undefined): void;
@@ -8857,6 +8862,7 @@ interface AutoCompleteProvider {
     proposals: AutoCompleteProposal[];
     selectProposal(text: string): void;
     autoSelectFirstProposal: boolean;
+    canBeToggled?: boolean;
 }
 interface ComposerStoreInterface {
     currentEditedCell?: CellPosition;
@@ -8876,6 +8882,7 @@ interface ComposerStoreInterface {
 interface AutoCompleteProviderDefinition {
     sequence?: number;
     autoSelectFirstProposal?: boolean;
+    canBeToggled?: boolean;
     displayAllOnInitialContent?: boolean;
     maxDisplayedProposals?: number;
     getProposals(this: {