@odoo/o-spreadsheet 18.5.0-alpha.3 → 18.5.0-alpha.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.5.0-alpha.3
- * @date 2025-07-28T13:43:05.981Z
- * @hash 53dfee8
+ * @version 18.5.0-alpha.4
+ * @date 2025-07-30T11:23:18.805Z
+ * @hash 34a4ab3
  */
 
 'use strict';
@@ -8640,12 +8640,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) {
@@ -30517,28 +30517,17 @@ class MenuPopover extends owl.Component {
     }
 }
 
-class ChartDashboardMenu extends owl.Component {
-    static template = "spreadsheet.ChartDashboardMenu";
-    static components = { MenuPopover };
-    static props = { figureUI: Object };
+class ChartDashboardMenuStore extends SpreadsheetStore {
+    chartId;
+    mutators = ["reset"];
     originalChartDefinition;
-    fullScreenFigureStore;
-    menuState = owl.useState({ isOpen: false, anchorRect: null, menuItems: [] });
-    setup() {
-        super.setup();
-        this.fullScreenFigureStore = useStore(FullScreenChartStore);
-        this.originalChartDefinition = this.env.model.getters.getChartDefinition(this.props.figureUI.id);
-        owl.onWillUpdateProps(({ figureUI }) => {
-            if (figureUI.id !== this.props.figureUI.id) {
-                this.originalChartDefinition = this.env.model.getters.getChartDefinition(figureUI.id);
-            }
-        });
-    }
-    getMenuItems() {
-        return [this.fullScreenMenuItem, ...this.changeChartTypeMenuItems].filter(isDefined);
+    constructor(get, chartId) {
+        super(get);
+        this.chartId = chartId;
+        this.originalChartDefinition = this.getters.getChartDefinition(this.chartId);
     }
     get changeChartTypeMenuItems() {
-        const definition = this.env.model.getters.getChartDefinition(this.props.figureUI.id);
+        const definition = this.getters.getChartDefinition(this.chartId);
         if (!["line", "bar", "pie"].includes(definition.type)) {
             return [];
         }
@@ -30547,27 +30536,19 @@ class ChartDashboardMenu extends owl.Component {
             return {
                 id: item.chartType,
                 label: item.displayName,
-                onClick: () => this.onTypeChange(item.chartType),
-                isSelected: item.chartType === this.selectedChartType,
+                onClick: () => this.updateType(item.chartType),
+                isSelected: item.chartType === this.getters.getChartDefinition(this.chartId).type,
                 iconClass: this.getIconClasses(item.chartType),
             };
         });
     }
-    getIconClasses(type) {
-        if (type.includes("bar")) {
-            return "fa fa-bar-chart";
-        }
-        if (type.includes("line")) {
-            return "fa fa-line-chart";
-        }
-        if (type.includes("pie")) {
-            return "fa fa-pie-chart";
-        }
-        return "";
+    reset(chartId) {
+        this.chartId = chartId;
+        this.originalChartDefinition = this.getters.getChartDefinition(chartId);
     }
-    onTypeChange(type) {
-        const figureId = this.props.figureUI.id;
-        const currentDefinition = this.env.model.getters.getChartDefinition(figureId);
+    updateType(type) {
+        const figureId = this.chartId;
+        const currentDefinition = this.getters.getChartDefinition(figureId);
         if (currentDefinition.type === type) {
             return;
         }
@@ -30578,7 +30559,7 @@ class ChartDashboardMenu extends owl.Component {
         else {
             const newChartInfo = chartSubtypeRegistry.get(type);
             const ChartClass = chartRegistry.get(newChartInfo.chartType);
-            const chartCreationContext = this.env.model.getters.getContextCreationChart(figureId);
+            const chartCreationContext = this.getters.getContextCreationChart(figureId);
             if (!chartCreationContext)
                 return;
             definition = {
@@ -30586,14 +30567,45 @@ class ChartDashboardMenu extends owl.Component {
                 ...newChartInfo.subtypeDefinition,
             };
         }
-        this.env.model.dispatch("UPDATE_CHART", {
+        this.model.dispatch("UPDATE_CHART", {
             definition,
             figureId,
-            sheetId: this.env.model.getters.getActiveSheetId(),
+            sheetId: this.getters.getActiveSheetId(),
+        });
+    }
+    getIconClasses(type) {
+        if (type.includes("bar")) {
+            return "fa fa-bar-chart";
+        }
+        if (type.includes("line")) {
+            return "fa fa-line-chart";
+        }
+        if (type.includes("pie")) {
+            return "fa fa-pie-chart";
+        }
+        return "";
+    }
+}
+
+class ChartDashboardMenu extends owl.Component {
+    static template = "o-spreadsheet-ChartDashboardMenu";
+    static components = { MenuPopover };
+    static props = { figureUI: Object };
+    fullScreenFigureStore;
+    store;
+    menuState = owl.useState({ isOpen: false, anchorRect: null, menuItems: [] });
+    setup() {
+        super.setup();
+        this.store = useLocalStore(ChartDashboardMenuStore, this.props.figureUI.id);
+        this.fullScreenFigureStore = useStore(FullScreenChartStore);
+        owl.onWillUpdateProps(({ figureUI }) => {
+            if (figureUI.id !== this.props.figureUI.id) {
+                this.store.reset(figureUI.id);
+            }
         });
     }
-    get selectedChartType() {
-        return this.env.model.getters.getChartDefinition(this.props.figureUI.id).type;
+    getMenuItems() {
+        return [this.fullScreenMenuItem, ...this.store.changeChartTypeMenuItems].filter(isDefined);
     }
     get backgroundColor() {
         const color = this.env.model.getters.getChartDefinition(this.props.figureUI.id).background;
@@ -31735,7 +31747,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])),
@@ -52112,7 +52124,8 @@ class ConditionalFormattingEditor extends owl.Component {
     static props = {
         editedCf: Object,
         onCancel: Function,
-        onSave: Function,
+        onExit: Function,
+        isNewCf: Boolean,
     };
     static components = {
         SelectionInput,
@@ -52137,6 +52150,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":
@@ -52188,6 +52202,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;
@@ -52209,7 +52226,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() {
@@ -67105,8 +67130,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)) {
@@ -75728,25 +75761,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,
             };
         });
     },
@@ -84720,6 +84758,8 @@ const components = {
     WaterfallChartDesignPanel,
     ComboChartDesignPanel,
     FunnelChartDesignPanel,
+    SunburstChartDesignPanel,
+    TreeMapChartDesignPanel,
     ChartTypePicker,
     FigureComponent,
     MenuPopover,
@@ -84749,6 +84789,7 @@ const hooks = {
 };
 const stores = {
     useStoreProvider,
+    ChartDashboardMenuStore,
     DependencyContainer,
     CellPopoverStore,
     ComposerFocusStore,
@@ -84835,6 +84876,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.5.0-alpha.3";
-__info__.date = "2025-07-28T13:43:05.981Z";
-__info__.hash = "53dfee8";
+__info__.version = "18.5.0-alpha.4";
+__info__.date = "2025-07-30T11:23:18.805Z";
+__info__.hash = "34a4ab3";