@odoo/o-spreadsheet 17.2.5 → 17.2.6

package/dist/o-spreadsheet.cjs.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.5
- * @date 2024-04-26T07:41:13.193Z
- * @hash a730f5c
+ * @version 17.2.6
+ * @date 2024-05-07T10:41:20.332Z
+ * @hash a4f800c
  */
 
 'use strict';
@@ -554,7 +554,7 @@ function getAddHeaderStartIndex(position, base) {
 /**
  * Compares two objects.
  */
-function deepEquals(o1, o2) {
+function deepEquals(o1, o2, ignoreFunctions) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
@@ -570,13 +570,16 @@ function deepEquals(o1, o2) {
         }
     }
     for (const key in o1) {
-        if (typeof o1[key] !== typeof o2[key])
+        const typeOfO1Key = typeof o1[key];
+        if (typeOfO1Key !== typeof o2[key])
             return false;
-        if (typeof o1[key] === "object") {
-            if (!deepEquals(o1[key], o2[key]))
+        if (typeOfO1Key === "object") {
+            if (!deepEquals(o1[key], o2[key], ignoreFunctions))
                 return false;
         }
         else {
+            if (ignoreFunctions && typeOfO1Key === "function")
+                return true;
             if (o1[key] !== o2[key])
                 return false;
         }
@@ -3684,21 +3687,22 @@ function toZoneWithoutBoundaryChanges(xc) {
         xc = xc.split("!").at(-1);
     }
     if (xc.includes("$")) {
-        xc = xc.replace(/\$/g, "");
+        xc = xc.replaceAll("$", "");
     }
-    let ranges;
+    let firstRangePart = "";
+    let secondRangePart;
     if (xc.includes(":")) {
-        ranges = xc.split(":").map((x) => x.trim());
+        [firstRangePart, secondRangePart] = xc.split(":");
+        firstRangePart = firstRangePart.trim();
+        secondRangePart = secondRangePart.trim();
     }
     else {
-        ranges = [xc.trim()];
+        firstRangePart = xc.trim();
     }
     let top, bottom, left, right;
     let fullCol = false;
     let fullRow = false;
     let hasHeader = false;
-    const firstRangePart = ranges[0];
-    const secondRangePart = ranges[1] && ranges[1];
     if (isColReference(firstRangePart)) {
         left = right = lettersToNumber(firstRangePart);
         top = bottom = 0;
@@ -3715,7 +3719,7 @@ function toZoneWithoutBoundaryChanges(xc) {
         top = bottom = c.row;
         hasHeader = true;
     }
-    if (ranges.length === 2) {
+    if (secondRangePart) {
         if (isColReference(secondRangePart)) {
             right = lettersToNumber(secondRangePart);
             fullCol = true;
@@ -8906,8 +8910,7 @@ class ComposerStore extends SpreadsheetStore {
             const exactMatch = proposals?.find((p) => p.text === tokenAtCursor.value);
             // remove tokens that are likely to be other parts of the formula that slipped in the token if it's a string
             const searchTerm = tokenAtCursor.value.replace(/[ ,\(\)]/g, "");
-            const initialContent = this.initialContent;
-            if (exactMatch && exactMatch.text !== initialContent) {
+            if (exactMatch && this._currentContent !== this.initialContent) {
                 // this means the user has chosen a proposal
                 return;
             }
@@ -8915,7 +8918,7 @@ class ComposerStore extends SpreadsheetStore {
                 proposals &&
                 !["ARG_SEPARATOR", "LEFT_PAREN"].includes(tokenAtCursor.type)) {
                 const filteredProposals = fuzzyLookup(searchTerm, proposals, (p) => p.fuzzySearchKey || p.text);
-                if (!exactMatch) {
+                if (!exactMatch || filteredProposals.length > 1) {
                     proposals = filteredProposals;
                 }
             }
@@ -9050,6 +9053,7 @@ class ChartJsComponent extends owl.Component {
     };
     canvas = owl.useRef("graphContainer");
     chart;
+    currentRuntime;
     get background() {
         return this.chartRuntime.background;
     }
@@ -9066,9 +9070,18 @@ class ChartJsComponent extends owl.Component {
     setup() {
         owl.onMounted(() => {
             const runtime = this.chartRuntime;
-            this.createChart(runtime.chartJsConfig);
+            this.currentRuntime = runtime;
+            // Note: chartJS modify the runtime in place, so it's important to give it a copy
+            this.createChart(deepCopy(runtime.chartJsConfig));
+        });
+        owl.onWillUnmount(() => this.chart?.destroy());
+        owl.useEffect(() => {
+            const runtime = this.chartRuntime;
+            if (!deepEquals(runtime, this.currentRuntime, "ignoreFunctions")) {
+                this.currentRuntime = runtime;
+                this.updateChartJs(deepCopy(runtime));
+            }
         });
-        owl.useEffect(() => this.updateChartJs(this.chartRuntime), () => [this.chartRuntime]);
     }
     createChart(chartData) {
         const canvas = this.canvas.el;
@@ -9090,8 +9103,7 @@ class ChartJsComponent extends owl.Component {
         this.chart.config.options.plugins.tooltip = chartData.options.plugins.tooltip;
         this.chart.config.options.plugins.legend = chartData.options.plugins.legend;
         this.chart.config.options.scales = chartData.options?.scales;
-        // ?
-        this.chart.update("active");
+        this.chart.update();
     }
 }
 
@@ -19454,7 +19466,7 @@ function truncateLabel(label) {
 /**
  * Get a default chart js configuration
  */
-function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale }) {
+function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, truncateLabels }) {
     const options = {
         // https://www.chartjs.org/docs/latest/general/responsive.html
         responsive: true,
@@ -19501,7 +19513,7 @@ function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale })
         type: chart.type,
         options,
         data: {
-            labels: labels.map(truncateLabel),
+            labels: truncateLabels ? labels.map(truncateLabel) : labels,
             datasets: [],
         },
         platform: undefined,
@@ -20267,9 +20279,9 @@ function isLuxonTimeAdapterInstalled() {
     }
     return isInstalled;
 }
-function getLineOrScatterConfiguration(chart, labels, localeFormat) {
+function getLineOrScatterConfiguration(chart, labels, options) {
     const fontColor = chartFontColor(chart.background);
-    const config = getDefaultChartJsRuntime(chart, labels, fontColor, localeFormat);
+    const config = getDefaultChartJsRuntime(chart, labels, fontColor, options);
     const legend = {
         labels: {
             color: fontColor,
@@ -20312,7 +20324,7 @@ function getLineOrScatterConfiguration(chart, labels, localeFormat) {
                     value = Number(value);
                     if (isNaN(value))
                         return value;
-                    const { locale, format } = localeFormat;
+                    const { locale, format } = options;
                     return formatValue(value, {
                         locale,
                         format: !format && Math.abs(value) >= 1000 ? "#,##" : format,
@@ -20345,9 +20357,10 @@ function createLineOrScatterChartRuntime(chart, getters) {
         ({ labels, dataSetsValues } = aggregateDataForLabels(labels, dataSetsValues));
     }
     const locale = getters.getLocale();
+    const truncateLabels = axisType === "category";
     const dataSetFormat = getChartDatasetFormat(getters, chart.dataSets);
-    const localeFormat = { format: dataSetFormat, locale };
-    const config = getLineOrScatterConfiguration(chart, labels, localeFormat);
+    const options = { format: dataSetFormat, locale, truncateLabels };
+    const config = getLineOrScatterConfiguration(chart, labels, options);
     const labelFormat = getChartLabelFormat(getters, chart.labelRange);
     if (axisType === "time") {
         const axis = {
@@ -32901,7 +32914,8 @@ class DataValidationOverlay extends owl.Component {
     get checkBoxCellPositions() {
         return this.env.model.getters
             .getVisibleCellPositions()
-            .filter(this.env.model.getters.isCellValidCheckbox);
+            .filter((position) => this.env.model.getters.isCellValidCheckbox(position) &&
+            !this.env.model.getters.isFilterHeader(position));
     }
     get listIconsCellPositions() {
         if (this.env.model.getters.isReadonly()) {
@@ -32909,7 +32923,8 @@ class DataValidationOverlay extends owl.Component {
         }
         return this.env.model.getters
             .getVisibleCellPositions()
-            .filter(this.env.model.getters.cellHasListDataValidationIcon);
+            .filter((position) => this.env.model.getters.cellHasListDataValidationIcon(position) &&
+            !this.env.model.getters.isFilterHeader(position));
     }
 }
 
@@ -47929,7 +47944,7 @@ class EvaluationPlugin extends UIPlugin {
                 ? getItemId(newFormat, data.formats)
                 : exportedCellData.format;
             let content;
-            if (isFormula && formulaCell instanceof FormulaCellWithDependencies) {
+            if (isExported && isFormula && formulaCell instanceof FormulaCellWithDependencies) {
                 content = formulaCell.contentWithFixedReferences;
             }
             else {
@@ -60600,6 +60615,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.5";
-__info__.date = "2024-04-26T07:41:13.193Z";
-__info__.hash = "a730f5c";
+__info__.version = "17.2.6";
+__info__.date = "2024-05-07T10:41:20.332Z";
+__info__.hash = "a4f800c";

package/dist/o-spreadsheet.d.ts

@@ -4937,7 +4937,7 @@ declare function lazy<T>(fn: (() => T) | T): Lazy<T>;
 /**
  * Compares two objects.
  */
-declare function deepEquals(o1: any, o2: any): boolean;
+declare function deepEquals(o1: any, o2: any, ignoreFunctions?: "ignoreFunctions"): boolean;
 
 interface ConstructorArgs {
     readonly zone: Readonly<Zone | UnboundedZone>;
@@ -6858,6 +6858,7 @@ declare class ChartJsComponent extends Component<Props$y, SpreadsheetChildEnv> {
     };
     private canvas;
     private chart?;
+    private currentRuntime;
     get background(): string;
     get canvasStyle(): string;
     get chartRuntime(): ChartJSRuntime;
@@ -8028,7 +8029,9 @@ declare function chartFontColor(backgroundColor: Color | undefined): Color;
 /**
  * Get a default chart js configuration
  */
-declare function getDefaultChartJsRuntime(chart: AbstractChart, labels: string[], fontColor: Color, { format, locale }: LocaleFormat): Required<ChartConfiguration>;
+declare function getDefaultChartJsRuntime(chart: AbstractChart, labels: string[], fontColor: Color, { format, locale, truncateLabels }: LocaleFormat & {
+    truncateLabels?: boolean;
+}): Required<ChartConfiguration>;
 /** See https://www.chartjs.org/docs/latest/charts/area.html#filling-modes */
 declare function getFillingMode(index: number): "origin" | number;
 

package/dist/o-spreadsheet.esm.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.5
- * @date 2024-04-26T07:41:13.193Z
- * @hash a730f5c
+ * @version 17.2.6
+ * @date 2024-05-07T10:41:20.332Z
+ * @hash a4f800c
  */
 
 import { reactive, useEnv, useSubEnv, useState, onWillUnmount, markRaw, toRaw, Component, useRef, onMounted, useEffect, onPatched, useComponent, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv } from '@odoo/owl';
@@ -552,7 +552,7 @@ function getAddHeaderStartIndex(position, base) {
 /**
  * Compares two objects.
  */
-function deepEquals(o1, o2) {
+function deepEquals(o1, o2, ignoreFunctions) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
@@ -568,13 +568,16 @@ function deepEquals(o1, o2) {
         }
     }
     for (const key in o1) {
-        if (typeof o1[key] !== typeof o2[key])
+        const typeOfO1Key = typeof o1[key];
+        if (typeOfO1Key !== typeof o2[key])
             return false;
-        if (typeof o1[key] === "object") {
-            if (!deepEquals(o1[key], o2[key]))
+        if (typeOfO1Key === "object") {
+            if (!deepEquals(o1[key], o2[key], ignoreFunctions))
                 return false;
         }
         else {
+            if (ignoreFunctions && typeOfO1Key === "function")
+                return true;
             if (o1[key] !== o2[key])
                 return false;
         }
@@ -3682,21 +3685,22 @@ function toZoneWithoutBoundaryChanges(xc) {
         xc = xc.split("!").at(-1);
     }
     if (xc.includes("$")) {
-        xc = xc.replace(/\$/g, "");
+        xc = xc.replaceAll("$", "");
     }
-    let ranges;
+    let firstRangePart = "";
+    let secondRangePart;
     if (xc.includes(":")) {
-        ranges = xc.split(":").map((x) => x.trim());
+        [firstRangePart, secondRangePart] = xc.split(":");
+        firstRangePart = firstRangePart.trim();
+        secondRangePart = secondRangePart.trim();
     }
     else {
-        ranges = [xc.trim()];
+        firstRangePart = xc.trim();
     }
     let top, bottom, left, right;
     let fullCol = false;
     let fullRow = false;
     let hasHeader = false;
-    const firstRangePart = ranges[0];
-    const secondRangePart = ranges[1] && ranges[1];
     if (isColReference(firstRangePart)) {
         left = right = lettersToNumber(firstRangePart);
         top = bottom = 0;
@@ -3713,7 +3717,7 @@ function toZoneWithoutBoundaryChanges(xc) {
         top = bottom = c.row;
         hasHeader = true;
     }
-    if (ranges.length === 2) {
+    if (secondRangePart) {
         if (isColReference(secondRangePart)) {
             right = lettersToNumber(secondRangePart);
             fullCol = true;
@@ -8904,8 +8908,7 @@ class ComposerStore extends SpreadsheetStore {
             const exactMatch = proposals?.find((p) => p.text === tokenAtCursor.value);
             // remove tokens that are likely to be other parts of the formula that slipped in the token if it's a string
             const searchTerm = tokenAtCursor.value.replace(/[ ,\(\)]/g, "");
-            const initialContent = this.initialContent;
-            if (exactMatch && exactMatch.text !== initialContent) {
+            if (exactMatch && this._currentContent !== this.initialContent) {
                 // this means the user has chosen a proposal
                 return;
             }
@@ -8913,7 +8916,7 @@ class ComposerStore extends SpreadsheetStore {
                 proposals &&
                 !["ARG_SEPARATOR", "LEFT_PAREN"].includes(tokenAtCursor.type)) {
                 const filteredProposals = fuzzyLookup(searchTerm, proposals, (p) => p.fuzzySearchKey || p.text);
-                if (!exactMatch) {
+                if (!exactMatch || filteredProposals.length > 1) {
                     proposals = filteredProposals;
                 }
             }
@@ -9048,6 +9051,7 @@ class ChartJsComponent extends Component {
     };
     canvas = useRef("graphContainer");
     chart;
+    currentRuntime;
     get background() {
         return this.chartRuntime.background;
     }
@@ -9064,9 +9068,18 @@ class ChartJsComponent extends Component {
     setup() {
         onMounted(() => {
             const runtime = this.chartRuntime;
-            this.createChart(runtime.chartJsConfig);
+            this.currentRuntime = runtime;
+            // Note: chartJS modify the runtime in place, so it's important to give it a copy
+            this.createChart(deepCopy(runtime.chartJsConfig));
+        });
+        onWillUnmount(() => this.chart?.destroy());
+        useEffect(() => {
+            const runtime = this.chartRuntime;
+            if (!deepEquals(runtime, this.currentRuntime, "ignoreFunctions")) {
+                this.currentRuntime = runtime;
+                this.updateChartJs(deepCopy(runtime));
+            }
         });
-        useEffect(() => this.updateChartJs(this.chartRuntime), () => [this.chartRuntime]);
     }
     createChart(chartData) {
         const canvas = this.canvas.el;
@@ -9088,8 +9101,7 @@ class ChartJsComponent extends Component {
         this.chart.config.options.plugins.tooltip = chartData.options.plugins.tooltip;
         this.chart.config.options.plugins.legend = chartData.options.plugins.legend;
         this.chart.config.options.scales = chartData.options?.scales;
-        // ?
-        this.chart.update("active");
+        this.chart.update();
     }
 }
 
@@ -19452,7 +19464,7 @@ function truncateLabel(label) {
 /**
  * Get a default chart js configuration
  */
-function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale }) {
+function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale, truncateLabels }) {
     const options = {
         // https://www.chartjs.org/docs/latest/general/responsive.html
         responsive: true,
@@ -19499,7 +19511,7 @@ function getDefaultChartJsRuntime(chart, labels, fontColor, { format, locale })
         type: chart.type,
         options,
         data: {
-            labels: labels.map(truncateLabel),
+            labels: truncateLabels ? labels.map(truncateLabel) : labels,
             datasets: [],
         },
         platform: undefined,
@@ -20265,9 +20277,9 @@ function isLuxonTimeAdapterInstalled() {
     }
     return isInstalled;
 }
-function getLineOrScatterConfiguration(chart, labels, localeFormat) {
+function getLineOrScatterConfiguration(chart, labels, options) {
     const fontColor = chartFontColor(chart.background);
-    const config = getDefaultChartJsRuntime(chart, labels, fontColor, localeFormat);
+    const config = getDefaultChartJsRuntime(chart, labels, fontColor, options);
     const legend = {
         labels: {
             color: fontColor,
@@ -20310,7 +20322,7 @@ function getLineOrScatterConfiguration(chart, labels, localeFormat) {
                     value = Number(value);
                     if (isNaN(value))
                         return value;
-                    const { locale, format } = localeFormat;
+                    const { locale, format } = options;
                     return formatValue(value, {
                         locale,
                         format: !format && Math.abs(value) >= 1000 ? "#,##" : format,
@@ -20343,9 +20355,10 @@ function createLineOrScatterChartRuntime(chart, getters) {
         ({ labels, dataSetsValues } = aggregateDataForLabels(labels, dataSetsValues));
     }
     const locale = getters.getLocale();
+    const truncateLabels = axisType === "category";
     const dataSetFormat = getChartDatasetFormat(getters, chart.dataSets);
-    const localeFormat = { format: dataSetFormat, locale };
-    const config = getLineOrScatterConfiguration(chart, labels, localeFormat);
+    const options = { format: dataSetFormat, locale, truncateLabels };
+    const config = getLineOrScatterConfiguration(chart, labels, options);
     const labelFormat = getChartLabelFormat(getters, chart.labelRange);
     if (axisType === "time") {
         const axis = {
@@ -32899,7 +32912,8 @@ class DataValidationOverlay extends Component {
     get checkBoxCellPositions() {
         return this.env.model.getters
             .getVisibleCellPositions()
-            .filter(this.env.model.getters.isCellValidCheckbox);
+            .filter((position) => this.env.model.getters.isCellValidCheckbox(position) &&
+            !this.env.model.getters.isFilterHeader(position));
     }
     get listIconsCellPositions() {
         if (this.env.model.getters.isReadonly()) {
@@ -32907,7 +32921,8 @@ class DataValidationOverlay extends Component {
         }
         return this.env.model.getters
             .getVisibleCellPositions()
-            .filter(this.env.model.getters.cellHasListDataValidationIcon);
+            .filter((position) => this.env.model.getters.cellHasListDataValidationIcon(position) &&
+            !this.env.model.getters.isFilterHeader(position));
     }
 }
 
@@ -47927,7 +47942,7 @@ class EvaluationPlugin extends UIPlugin {
                 ? getItemId(newFormat, data.formats)
                 : exportedCellData.format;
             let content;
-            if (isFormula && formulaCell instanceof FormulaCellWithDependencies) {
+            if (isExported && isFormula && formulaCell instanceof FormulaCellWithDependencies) {
                 content = formulaCell.contentWithFixedReferences;
             }
             else {
@@ -60557,6 +60572,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "17.2.5";
-__info__.date = "2024-04-26T07:41:13.193Z";
-__info__.hash = "a730f5c";
+__info__.version = "17.2.6";
+__info__.date = "2024-05-07T10:41:20.332Z";
+__info__.hash = "a4f800c";