@odoo/o-spreadsheet 18.2.21 → 18.2.23

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.21
- * @date 2025-07-11T11:11:48.661Z
- * @hash 1c32303
+ * @version 18.2.23
+ * @date 2025-07-30T11:19:55.262Z
+ * @hash 4419b30
  */
 
 'use strict';
@@ -8367,12 +8367,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) {
@@ -11309,6 +11309,7 @@ const autoCompleteProviders = new Registry();
 
 autoCompleteProviders.add("dataValidation", {
     displayAllOnInitialContent: true,
+    canBeToggled: false,
     getProposals(tokenAtCursor, content) {
         if (content.startsWith("=")) {
             return [];
@@ -11316,31 +11317,40 @@ autoCompleteProviders.add("dataValidation", {
         if (!this.composer.currentEditedCell) {
             return [];
         }
-        const position = this.composer.currentEditedCell;
-        const rule = this.getters.getValidationRuleForCell(position);
-        if (!rule ||
-            (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
-            return [];
-        }
-        let values;
-        if (rule.criterion.type === "isValueInList") {
-            values = rule.criterion.values;
-        }
-        else {
-            const range = this.getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
-            values = Array.from(new Set(this.getters
-                .getRangeValues(range)
-                .filter(isNotNull)
-                .map((value) => value.toString())
-                .filter((val) => val !== "")));
-        }
-        return values.map((value) => ({ text: value }));
+        return getProposedValues(this.getters, this.composer.currentEditedCell).map((value) => ({
+            text: value.value?.toString() || "",
+            htmlContent: [{ value: value.label }],
+            fuzzySearchKey: value.label,
+        }));
     },
     selectProposal(tokenAtCursor, value) {
         this.composer.setCurrentContent(value);
         this.composer.stopEdition();
     },
 });
+function getProposedValues(getters, position) {
+    const rule = getters.getValidationRuleForCell(position);
+    if (!rule ||
+        (rule.criterion.type !== "isValueInList" && rule.criterion.type !== "isValueInRange")) {
+        return [];
+    }
+    let values = [];
+    if (rule.criterion.type === "isValueInList") {
+        values = rule.criterion.values.map((value) => ({ label: value, value }));
+    }
+    else {
+        const labelsSet = new Set();
+        const range = getters.getRangeFromSheetXC(position.sheetId, rule.criterion.values[0]);
+        for (const p of positions(range.zone)) {
+            const cell = 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 });
+            }
+        }
+    }
+    return values;
+}
 
 function getHtmlContentFromPattern(pattern, value, highlightColor, className) {
     const pendingHtmlContent = [];
@@ -19111,11 +19121,17 @@ const COLUMN = {
         if (isEvaluationError(cellReference?.value)) {
             return cellReference;
         }
-        const column = cellReference === undefined
-            ? this.__originCellPosition?.col
-            : toZone(cellReference.value).left;
-        assert(() => column !== undefined, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
-        return column + 1;
+        if (cellReference === undefined) {
+            assert(() => this.__originCellPosition?.col !== undefined, "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 generateMatrix(zone.right - zone.left + 1, 1, (col, row) => ({
+            value: zone.left + col + 1,
+        }));
     },
     isExported: true,
 };
@@ -19334,11 +19350,17 @@ const ROW = {
         if (isEvaluationError(cellReference?.value)) {
             return cellReference;
         }
-        const row = cellReference === undefined
-            ? this.__originCellPosition?.row
-            : toZone(cellReference.value).top;
-        assert(() => row !== undefined, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
-        return row + 1;
+        if (cellReference === undefined) {
+            assert(() => this.__originCellPosition?.row !== undefined, "In this context, the function [[FUNCTION_NAME]] needs to have a cell or range in parameter.");
+            return this.__originCellPosition.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,
 };
@@ -21614,6 +21636,7 @@ class AbstractComposerStore extends SpreadsheetStore {
                     proposals,
                     selectProposal: provider.selectProposal,
                     autoSelectFirstProposal: provider.autoSelectFirstProposal ?? false,
+                    canBeToggled: provider.canBeToggled,
                 };
             }
             if (exactMatch && this._currentContent !== this.initialContent) {
@@ -21636,6 +21659,7 @@ class AbstractComposerStore extends SpreadsheetStore {
                     proposals,
                     selectProposal: provider.selectProposal,
                     autoSelectFirstProposal: provider.autoSelectFirstProposal ?? false,
+                    canBeToggled: provider.canBeToggled,
                 };
             }
         }
@@ -41307,9 +41331,13 @@ class Composer extends owl.Component {
         }
     }
     closeAssistant() {
+        if (!this.canBeToggled)
+            return;
         this.assistant.forcedClosed = true;
     }
     openAssistant() {
+        if (!this.canBeToggled)
+            return;
         this.assistant.forcedClosed = false;
     }
     onWheel(event) {
@@ -41319,6 +41347,9 @@ class Composer extends owl.Component {
             event.stopPropagation();
         }
     }
+    get canBeToggled() {
+        return this.autoCompleteState.provider?.canBeToggled ?? true;
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -41454,7 +41485,7 @@ class Composer extends owl.Component {
         }
     }
     autoComplete(value) {
-        if (!value || this.assistant.forcedClosed) {
+        if (!value || (this.assistant.forcedClosed && this.canBeToggled)) {
             return;
         }
         this.autoCompleteState.provider?.selectProposal(value);
@@ -42790,7 +42821,8 @@ class ConditionalFormattingEditor extends owl.Component {
     static props = {
         editedCf: Object,
         onCancel: Function,
-        onSave: Function,
+        onExit: Function,
+        isNewCf: Boolean,
     };
     static components = {
         SelectionInput,
@@ -42809,6 +42841,7 @@ class ConditionalFormattingEditor extends owl.Component {
     getTextDecoration = getTextDecoration;
     colorNumberString = colorNumberString;
     state;
+    hasEditedCf = this.props.isNewCf;
     setup() {
         this.state = owl.useState({
             errors: [],
@@ -42866,6 +42899,9 @@ class ConditionalFormattingEditor extends owl.Component {
             ranges: ranges.map((xc) => this.env.model.getters.getRangeDataFromXc(sheetId, xc)),
             sheetId,
         });
+        if (result.isSuccessful) {
+            this.hasEditedCf = true;
+        }
         const reasons = result.reasons.filter((r) => r !== "NoChanges" /* CommandResult.NoChanges */);
         if (!newCf.suppressErrors) {
             this.state.errors = reasons;
@@ -42887,7 +42923,15 @@ class ConditionalFormattingEditor extends owl.Component {
     onSave() {
         const result = this.updateConditionalFormat({});
         if (result.length === 0) {
-            this.props.onSave();
+            this.props.onExit();
+        }
+    }
+    onCancel() {
+        if (this.hasEditedCf) {
+            this.props.onCancel();
+        }
+        else {
+            this.props.onExit();
         }
     }
     getDefaultRules() {
@@ -47238,9 +47282,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);
@@ -49736,6 +49786,11 @@ class GridComposer extends owl.Component {
     rect = this.defaultRect;
     isEditing = false;
     isCellReferenceVisible = false;
+    currentEditedCell = {
+        col: 0,
+        row: 0,
+        sheetId: this.env.model.getters.getActiveSheetId(),
+    };
     composerStore;
     composerFocusStore;
     composerInterface;
@@ -49765,7 +49820,7 @@ class GridComposer extends owl.Component {
         return this.isCellReferenceVisible;
     }
     get cellReference() {
-        const { col, row, sheetId } = this.composerStore.currentEditedCell;
+        const { col, row, sheetId } = this.currentEditedCell;
         const prefixSheet = sheetId !== this.env.model.getters.getActiveSheetId();
         return getFullReference(prefixSheet ? this.env.model.getters.getSheetName(sheetId) : undefined, toXC(col, row));
     }
@@ -49857,12 +49912,17 @@ class GridComposer extends owl.Component {
         if (!isEditing && this.composerFocusStore.activeComposer !== this.composerInterface) {
             this.composerFocusStore.focusComposer(this.composerInterface, { focusMode: "inactive" });
         }
+        let shouldRecomputeRect = isEditing && !deepEquals(this.currentEditedCell, this.composerStore.currentEditedCell);
         if (this.isEditing !== isEditing) {
             this.isEditing = isEditing;
             if (!isEditing) {
                 this.rect = this.defaultRect;
                 return;
             }
+            this.currentEditedCell = this.composerStore.currentEditedCell;
+            shouldRecomputeRect = true;
+        }
+        if (shouldRecomputeRect) {
             const position = this.env.model.getters.getActivePosition();
             const zone = this.env.model.getters.expandZone(position.sheetId, positionToZone(position));
             this.rect = this.env.model.getters.getVisibleRect(zone);
@@ -62971,6 +63031,23 @@ class HeaderSizeUIPlugin extends CoreViewPlugin {
     static getters = ["getRowSize", "getHeaderSize"];
     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":
@@ -63000,16 +63077,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;
@@ -68762,6 +68829,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,
@@ -68792,13 +68867,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;
@@ -70483,14 +70557,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() {
@@ -77187,6 +77259,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.2.21";
-__info__.date = "2025-07-11T11:11:48.661Z";
-__info__.hash = "1c32303";
+__info__.version = "18.2.23";
+__info__.date = "2025-07-30T11:19:55.262Z";
+__info__.hash = "4419b30";

package/dist/o-spreadsheet.d.ts

@@ -5316,6 +5316,7 @@ declare class HeaderSizeUIPlugin extends CoreViewPlugin<HeaderSizeState> impleme
     static getters: readonly ["getRowSize", "getHeaderSize"];
     readonly tallestCellInRow: Immutable<Record<UID, Array<CellWithSize | undefined>>>;
     private ctx;
+    beforeHandle(cmd: Command): void;
     handle(cmd: Command): void;
     getRowSize(sheetId: UID, row: HeaderIndex): Pixel;
     getHeaderSize(sheetId: UID, dimension: Dimension, index: HeaderIndex): Pixel;
@@ -8313,6 +8314,7 @@ declare class Composer extends Component<CellComposerProps, SpreadsheetChildEnv>
     closeAssistant(): void;
     openAssistant(): void;
     onWheel(event: WheelEvent): void;
+    get canBeToggled(): boolean;
     private processContent;
     /**
      * Get the HTML content corresponding to the current composer token, divided by lines.
@@ -8354,6 +8356,7 @@ interface AutoCompleteProvider {
     proposals: AutoCompleteProposal[];
     selectProposal(text: string): void;
     autoSelectFirstProposal: boolean;
+    canBeToggled?: boolean;
 }
 interface ComposerStoreInterface {
     currentEditedCell?: CellPosition;
@@ -8373,6 +8376,7 @@ interface ComposerStoreInterface {
 interface AutoCompleteProviderDefinition {
     sequence?: number;
     autoSelectFirstProposal?: boolean;
+    canBeToggled?: boolean;
     displayAllOnInitialContent?: boolean;
     maxDisplayedProposals?: number;
     getProposals(this: {
@@ -8972,6 +8976,7 @@ declare class GridComposer extends Component<Props$J, SpreadsheetChildEnv> {
     private rect;
     private isEditing;
     private isCellReferenceVisible;
+    private currentEditedCell;
     private composerStore;
     composerFocusStore: Store<ComposerFocusStore>;
     private composerInterface;