@odoo/o-spreadsheet 17.2.5 → 17.2.7

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.7
+ * @date 2024-05-15T09:20:44.429Z
+ * @hash 57e89fa
  */
 
 '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;
@@ -5199,7 +5203,7 @@ function tokenizeString(chars) {
     }
     return null;
 }
-const separatorRegexp = /^[\w\.!\$]+/;
+const SYMBOL_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.!$");
 /**
  * A "Symbol" is just basically any word-like element that can appear in a
  * formula, which is not a string. So:
@@ -5239,11 +5243,8 @@ function tokenizeSymbol(chars) {
             };
         }
     }
-    const match = chars.remaining().match(separatorRegexp);
-    if (match) {
-        const value = match[0];
-        result += value;
-        chars.advanceBy(value.length);
+    while (chars.current && SYMBOL_CHARS.has(chars.current)) {
+        result += chars.shift();
     }
     if (result.length) {
         const value = result;
@@ -6795,7 +6796,7 @@ const machine = {
 function matchReference(tokens) {
     let head = 0;
     let transitions = machine[State.LeftRef];
-    const matchedTokens = [];
+    let matchedTokens = "";
     while (transitions !== undefined) {
         const token = tokens[head++];
         if (!token) {
@@ -6807,15 +6808,15 @@ function matchReference(tokens) {
             case undefined:
                 return null;
             case State.Found:
-                matchedTokens.push(token);
+                matchedTokens += token.value;
                 tokens.splice(0, head);
                 return {
                     type: "REFERENCE",
-                    value: concat(matchedTokens.map((token) => token.value)),
+                    value: matchedTokens,
                 };
             default:
                 transitions = machine[nextState];
-                matchedTokens.push(token);
+                matchedTokens += token.value;
                 break;
         }
     }
@@ -8906,8 +8907,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 +8915,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 +9050,7 @@ class ChartJsComponent extends owl.Component {
     };
     canvas = owl.useRef("graphContainer");
     chart;
+    currentRuntime;
     get background() {
         return this.chartRuntime.background;
     }
@@ -9066,9 +9067,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 +9100,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 +19463,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 +19510,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 +20276,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 +20321,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 +20354,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 +32911,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 +32920,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));
     }
 }
 
@@ -47422,9 +47434,10 @@ class Evaluator {
             }
             if (!content) {
                 // The previous content could have blocked some array formulas
-                impactedPositions.addMany(this.getArrayFormulasBlockedBy(position));
+                impactedPositions.add(position);
             }
         }
+        impactedPositions.addMany(this.getArrayFormulasBlockedBy(impactedPositions));
         return impactedPositions;
     }
     buildDependencyGraph() {
@@ -47466,23 +47479,25 @@ class Evaluator {
         return positions;
     }
     /**
-     * Return the position of formulas blocked by the given position
+     * Return the position of formulas blocked by the given positions
      * as well as all their dependencies.
      */
-    getArrayFormulasBlockedBy(position) {
-        if (!this.spreadingRelations.hasArrayFormulaResult(position)) {
-            return [];
-        }
-        const arrayFormulas = this.spreadingRelations.getFormulaPositionsSpreadingOn(position);
-        const positions = this.createEmptyPositionSet();
-        positions.addMany(arrayFormulas);
-        const arrayFormulaPosition = this.getArrayFormulaSpreadingOn(position);
-        if (arrayFormulaPosition) {
-            // ignore the formula spreading on the position. Keep only the blocked ones
-            positions.delete(arrayFormulaPosition);
+    getArrayFormulasBlockedBy(positions) {
+        const arrayFormulaPositions = this.createEmptyPositionSet();
+        for (const position of positions) {
+            if (!this.spreadingRelations.hasArrayFormulaResult(position)) {
+                continue;
+            }
+            const arrayFormulas = this.spreadingRelations.getFormulaPositionsSpreadingOn(position);
+            arrayFormulaPositions.addMany(arrayFormulas);
+            const arrayFormulaPosition = this.getArrayFormulaSpreadingOn(position);
+            if (arrayFormulaPosition) {
+                // ignore the formula spreading on the position. Keep only the blocked ones
+                arrayFormulaPositions.delete(arrayFormulaPosition);
+            }
         }
-        positions.addMany(this.getCellsDependingOn(positions));
-        return positions;
+        arrayFormulaPositions.addMany(this.getCellsDependingOn(arrayFormulaPositions));
+        return arrayFormulaPositions;
     }
     nextPositionsToUpdate = new PositionSet({});
     cellsBeingComputed = new Set();
@@ -47612,6 +47627,7 @@ class Evaluator {
         if (!this.spreadingRelations.isArrayFormula(position)) {
             return;
         }
+        const invalidated = this.createEmptyPositionSet();
         for (const child of this.spreadingRelations.getArrayResultPositions(position)) {
             const content = this.getters.getCell(child)?.content;
             if (content) {
@@ -47619,10 +47635,11 @@ class Evaluator {
                 // there's still a collision
                 continue;
             }
+            invalidated.add(child);
             this.evaluatedCells.delete(child);
-            this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([child]));
-            this.nextPositionsToUpdate.addMany(this.getArrayFormulasBlockedBy(child));
         }
+        this.nextPositionsToUpdate.addMany(this.getCellsDependingOn(invalidated));
+        this.nextPositionsToUpdate.addMany(this.getArrayFormulasBlockedBy(invalidated));
         this.spreadingRelations.removeNode(position);
     }
     // ----------------------------------------------------------
@@ -47929,7 +47946,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 +60617,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.7";
+__info__.date = "2024-05-15T09:20:44.429Z";
+__info__.hash = "57e89fa";

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;