@odoo/o-spreadsheet 18.1.27 → 18.1.29

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.1.27
- * @date 2025-06-23T15:04:51.792Z
- * @hash b25bcc7
+ * @version 18.1.29
+ * @date 2025-07-11T11:11:55.442Z
+ * @hash 3456a93
  */
 
 'use strict';
@@ -822,6 +822,7 @@ const specialWhiteSpaceSpecialCharacters = [
 ];
 const specialWhiteSpaceRegexp = new RegExp(specialWhiteSpaceSpecialCharacters.join("|"), "g");
 const newLineRegexp = /(\r\n|\r)/g;
+const whiteSpaceCharacters = specialWhiteSpaceSpecialCharacters.concat([" "]);
 /**
  * Replace all different newlines characters by \n
  */
@@ -2828,8 +2829,9 @@ const INITIAL_JS_DAY = DateTime.fromTimestamp(0);
 const DATE_JS_1900_OFFSET = INITIAL_JS_DAY.getTime() - INITIAL_1900_DAY.getTime();
 const mdyDateRegexp = /^\d{1,2}(\/|-|\s)\d{1,2}((\/|-|\s)\d{1,4})?$/;
 const ymdDateRegexp = /^\d{3,4}(\/|-|\s)\d{1,2}(\/|-|\s)\d{1,2}$/;
-const dateSeparatorsRegex = /\/|-|\s/;
-const dateRegexp = /^(\d{1,4})[\/-\s](\d{1,4})([\/-\s](\d{1,4}))?$/;
+const whiteSpaceChars = whiteSpaceCharacters.join("");
+const dateSeparatorsRegex = new RegExp(`\/|-|${whiteSpaceCharacters.join("|")}`);
+const dateRegexp = new RegExp(`^(\\d{1,4})[\/${whiteSpaceChars}\-](\\d{1,4})([\/${whiteSpaceChars}\-](\\d{1,4}))?$`);
 const timeRegexp = /((\d+(:\d+)?(:\d+)?\s*(AM|PM))|(\d+:\d+(:\d+)?))$/;
 /** Convert a value number representing a date, or return undefined if it isn't possible */
 function valueToDateNumber(value, locale) {
@@ -6534,6 +6536,8 @@ function splitWordToSpecificWidth(ctx, word, width, style) {
 function splitTextToWidth(ctx, text, style, width) {
     if (!style)
         style = {};
+    if (isMarkdownLink(text))
+        text = parseMarkdownLink(text).label;
     const brokenText = [];
     // Checking if text contains NEWLINE before split makes it very slightly slower if text contains it,
     // but 5-10x faster if it doesn't
@@ -8497,6 +8501,10 @@ function toNormalizedPivotValue(dimension, groupValue) {
     if (groupValue === null || groupValue === "null") {
         return null;
     }
+    const extractedGroupValue = typeof groupValue === "object" ? groupValue.value : groupValue;
+    if (isEvaluationError(extractedGroupValue)) {
+        return extractedGroupValue;
+    }
     const groupValueString = typeof groupValue === "boolean"
         ? toString(groupValue).toLocaleLowerCase()
         : toString(groupValue);
@@ -21027,7 +21035,7 @@ class AbstractComposerStore extends SpreadsheetStore {
     }
     captureSelection(zone, col, row) {
         this.model.selection.capture(this, {
-            cell: { col: col || zone.left, row: row || zone.right },
+            cell: { col: col ?? zone.left, row: row ?? zone.right },
             zone,
         }, {
             handleEvent: this.handleEvent.bind(this),
@@ -25787,40 +25795,112 @@ function convertPivotTableConfig(pivotTable) {
  * In all the sheets, replace the table-only references in the formula cells with standard references.
  */
 function convertTableFormulaReferences(convertedSheets, xlsxSheets) {
+    let deconstructedSheets = null;
     for (let tableSheet of convertedSheets) {
         const tables = xlsxSheets.find((s) => isSheetNameEqual(s.sheetName, tableSheet.name)).tables;
+        if (!tables || tables.length === 0) {
+            continue;
+        }
+        // Only deconstruct sheets if we are sure there are tables to process
+        if (!deconstructedSheets) {
+            deconstructedSheets = deconstructSheets(convertedSheets);
+        }
         for (let table of tables) {
-            const tabRef = table.name + "[";
-            for (let sheet of convertedSheets) {
-                for (let xc in sheet.cells) {
-                    const cell = sheet.cells[xc];
-                    let cellContent = sheet.cells[xc];
-                    if (cell && cellContent && cellContent.startsWith("=")) {
-                        let refIndex;
-                        while ((refIndex = cellContent.indexOf(tabRef)) !== -1) {
-                            let endIndex = refIndex + tabRef.length;
-                            let openBrackets = 1;
-                            while (openBrackets > 0 && endIndex < cellContent.length) {
-                                if (cellContent[endIndex] === "[") {
-                                    openBrackets++;
-                                }
-                                else if (cellContent[endIndex] === "]") {
-                                    openBrackets--;
-                                }
-                                endIndex++;
-                            }
-                            let reference = cellContent.slice(refIndex + tabRef.length, endIndex - 1);
-                            const sheetPrefix = tableSheet.id === sheet.id ? "" : tableSheet.name + "!";
-                            const convertedRef = convertTableReference(sheetPrefix, reference, table, xc);
-                            cellContent =
-                                cellContent.slice(0, refIndex) + convertedRef + cellContent.slice(endIndex);
+            for (let sheetId in deconstructedSheets) {
+                const sheet = convertedSheets.find((s) => s.id === sheetId);
+                for (let xc in deconstructedSheets[sheetId]) {
+                    const deconstructedCell = deconstructedSheets[sheetId][xc];
+                    for (let i = deconstructedCell.length - 3; i >= 0; i -= 2) {
+                        const possibleTable = deconstructedSheets[sheetId][xc][i];
+                        if (!possibleTable.endsWith(table.name)) {
+                            continue;
                         }
+                        const possibleRef = deconstructedSheets[sheetId][xc][i + 1];
+                        const sheetPrefix = tableSheet.id === sheet.id ? "" : tableSheet.name + "!";
+                        const convertedRef = convertTableReference(sheetPrefix, possibleRef, table, xc);
+                        deconstructedSheets[sheetId][xc][i + 2] =
+                            possibleTable.slice(0, possibleTable.indexOf(table.name)) +
+                                convertedRef +
+                                deconstructedSheets[sheetId][xc][i + 2];
+                        deconstructedSheets[sheetId][xc].splice(i, 2);
                     }
-                    sheet.cells[xc] = cellContent;
+                    // sheet.cells[xc] = cellContent;
                 }
             }
         }
     }
+    if (!deconstructedSheets) {
+        return;
+    }
+    for (let sheetId in deconstructedSheets) {
+        const sheet = convertedSheets.find((s) => s.id === sheetId);
+        for (let xc in deconstructedSheets[sheetId]) {
+            const deconstructedCell = deconstructedSheets[sheetId][xc];
+            if (deconstructedCell.length === 1) {
+                sheet.cells[xc] = deconstructedCell[0];
+                continue;
+            }
+            let newContent = "";
+            for (let i = 0; i < deconstructedCell.length; i += 2) {
+                newContent += deconstructedCell[i] + "[" + deconstructedCell[i + 1] + "]";
+            }
+            newContent += deconstructedCell[deconstructedCell.length - 1];
+            sheet.cells[xc] = newContent;
+        }
+    }
+}
+/**
+ * Deconstruct the content of the cells in the sheets to extract possible table references.
+ * Example from "=AVERAGE(Table1[colName1])-AVERAGE(Table2[colName2])":
+ * return --> ["=AVERAGE(Table1", "colName1", ")-AVERAGE(Table2", "colName2", ")"]
+ */
+function deconstructSheets(convertedSheets) {
+    const deconstructedSheets = {};
+    for (let sheet of convertedSheets) {
+        for (let xc in sheet.cells) {
+            const cellContent = sheet.cells[xc];
+            if (!cellContent || !cellContent.startsWith("=")) {
+                continue;
+            }
+            const startIndex = cellContent.indexOf("[");
+            if (startIndex === -1) {
+                continue;
+            }
+            const deconstructedCell = [];
+            let possibleTable = cellContent.slice(0, startIndex);
+            let possibleRef = "";
+            let openBrackets = 1;
+            let mainPossibleTableIndex = 0;
+            let mainOpenBracketIndex = startIndex;
+            for (let index = startIndex + 1; index < cellContent.length; index++) {
+                if (cellContent[index] === "[") {
+                    if (openBrackets === 0) {
+                        possibleTable = cellContent.slice(mainPossibleTableIndex, index);
+                        mainOpenBracketIndex = index;
+                    }
+                    openBrackets++;
+                    continue;
+                }
+                if (cellContent[index] === "]") {
+                    openBrackets--;
+                    if (openBrackets === 0) {
+                        possibleRef = cellContent.slice(mainOpenBracketIndex + 1, index);
+                        deconstructedCell.push(possibleTable);
+                        deconstructedCell.push(possibleRef);
+                        mainPossibleTableIndex = index + 1;
+                    }
+                }
+            }
+            if (deconstructedCell.length) {
+                if (!deconstructedSheets[sheet.id]) {
+                    deconstructedSheets[sheet.id] = {};
+                }
+                deconstructedCell.push(cellContent.slice(mainPossibleTableIndex));
+                deconstructedSheets[sheet.id][xc] = [...deconstructedCell];
+            }
+        }
+    }
+    return deconstructedSheets;
 }
 /**
  * Convert table-specific references in formulas into standard references. A table reference is composed of columns names,
@@ -42799,6 +42879,9 @@ class ConditionalFormattingPanel extends owl.Component {
                     this.switchToList();
                 }
             }
+            else if (!this.editedCF) {
+                this.switchToList();
+            }
         });
     }
     get conditionalFormats() {
@@ -46717,10 +46800,7 @@ class SpreadsheetPivot {
         if (finalCell.value === null) {
             return { value: _t("(Undefined)") };
         }
-        return {
-            value: finalCell.value,
-            format: finalCell.format,
-        };
+        return finalCell;
     }
     getPivotCellValueAndFormat(measureId, domain) {
         const dataEntries = this.filterDataEntriesFromDomain(this.dataEntries, domain);
@@ -46951,7 +47031,6 @@ pivotRegistry.add("SPREADSHEET", {
     ui: SpreadsheetPivot,
     definition: SpreadsheetPivotRuntimeDefinition,
     externalData: false,
-    onIterationEndEvaluation: (pivot) => pivot.markAsDirtyForEvaluation(),
     dateGranularities: [...dateGranularities],
     datetimeGranularities: [...dateGranularities, "hour_number", "minute_number", "second_number"],
     isMeasureCandidate: (field) => !["datetime", "boolean"].includes(field.type),
@@ -59585,7 +59664,7 @@ const onIterationEndEvaluationRegistry = new Registry();
 onIterationEndEvaluationRegistry.add("pivots", (getters) => {
     for (const pivotId of getters.getPivotIds()) {
         const pivot = getters.getPivot(pivotId);
-        pivotRegistry.get(pivot.type).onIterationEndEvaluation(pivot);
+        pivot.markAsDirtyForEvaluation?.();
     }
 });
 
@@ -62584,13 +62663,13 @@ function withPivotPresentationLayer (PivotClass) {
             super(custom, params);
             this.getters = params.getters;
         }
-        init(params) {
+        markAsDirtyForEvaluation() {
             this.cache = {};
             this.rankAsc = {};
             this.rankDesc = {};
             this.runningTotal = {};
             this.runningTotalInPercent = {};
-            super.init(params);
+            super.markAsDirtyForEvaluation?.();
         }
         getPivotCellValueAndFormat(measureName, domain) {
             return this.getMeasureDisplayValue(measureName, domain);
@@ -62715,7 +62794,7 @@ function withPivotPresentationLayer (PivotClass) {
                     return this.getSubTreeMatchingDomain(node.children, domain, domainLevel + 1);
                 }
             }
-            return tree;
+            return [];
         }
         treeToLeafDomains(tree, parentDomain = []) {
             const domains = [];
@@ -73247,26 +73326,28 @@ class SelectionStreamProcessorImpl {
                 bottom: Math.min(this.getters.getNumberRows(sheetId) - 1, bottom),
             };
         };
-        const { col: refCol, row: refRow } = this.getReferencePosition();
+        const { cell: refCell, zone: refZone } = this.getReferenceAnchor();
+        const { col: refCol, row: refRow } = refCell;
         // check if we can shrink selection
         let n = 0;
         while (result !== null) {
             n++;
             if (deltaCol < 0) {
                 const newRight = this.getNextAvailableCol(deltaCol, right - (n - 1), refRow);
-                result = refCol <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
+                result = refZone.right <= right - n ? expand({ top, left, bottom, right: newRight }) : null;
             }
             if (deltaCol > 0) {
                 const newLeft = this.getNextAvailableCol(deltaCol, left + (n - 1), refRow);
-                result = left + n <= refCol ? expand({ top, left: newLeft, bottom, right }) : null;
+                result = left + n <= refZone.left ? expand({ top, left: newLeft, bottom, right }) : null;
             }
             if (deltaRow < 0) {
                 const newBottom = this.getNextAvailableRow(deltaRow, refCol, bottom - (n - 1));
-                result = refRow <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
+                result =
+                    refZone.bottom <= bottom - n ? expand({ top, left, bottom: newBottom, right }) : null;
             }
             if (deltaRow > 0) {
                 const newTop = this.getNextAvailableRow(deltaRow, refCol, top + (n - 1));
-                result = top + n <= refRow ? expand({ top: newTop, left, bottom, right }) : null;
+                result = top + n <= refZone.top ? expand({ top: newTop, left, bottom, right }) : null;
             }
             result = result ? reorderZone(result) : result;
             if (result && !isEqual(result, anchor.zone)) {
@@ -73496,18 +73577,26 @@ class SelectionStreamProcessorImpl {
      * If the anchor is hidden, browses from left to right and top to bottom to
      * find a visible cell.
      */
-    getReferencePosition() {
+    getReferenceAnchor() {
         const sheetId = this.getters.getActiveSheetId();
         const anchor = this.anchor;
         const { left, right, top, bottom } = anchor.zone;
         const { col: anchorCol, row: anchorRow } = anchor.cell;
+        const col = this.getters.isColHidden(sheetId, anchorCol)
+            ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
+            : anchorCol;
+        const row = this.getters.isRowHidden(sheetId, anchorRow)
+            ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
+            : anchorRow;
+        const zone = this.getters.expandZone(sheetId, {
+            left: col,
+            right: col,
+            top: row,
+            bottom: row,
+        });
         return {
-            col: this.getters.isColHidden(sheetId, anchorCol)
-                ? this.getters.findVisibleHeader(sheetId, "COL", left, right) || anchorCol
-                : anchorCol,
-            row: this.getters.isRowHidden(sheetId, anchorRow)
-                ? this.getters.findVisibleHeader(sheetId, "ROW", top, bottom) || anchorRow
-                : anchorRow,
+            cell: { col, row },
+            zone,
         };
     }
     deltaToTarget(position, direction, step) {
@@ -76617,6 +76706,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.1.27";
-__info__.date = "2025-06-23T15:04:51.792Z";
-__info__.hash = "b25bcc7";
+__info__.version = "18.1.29";
+__info__.date = "2025-07-11T11:11:55.442Z";
+__info__.hash = "3456a93";

package/dist/o-spreadsheet.d.ts

@@ -5415,6 +5415,7 @@ interface Pivot<T = PivotRuntimeDefinition> {
         label: string;
     }[];
     needsReevaluation: boolean;
+    markAsDirtyForEvaluation?(): void;
 }
 
 declare class PivotUIPlugin extends UIPlugin {
@@ -6335,7 +6336,6 @@ interface PivotRegistryItem {
     ui: PivotUIConstructor;
     definition: PivotDefinitionConstructor;
     externalData: boolean;
-    onIterationEndEvaluation: (pivot: Pivot) => void;
     dateGranularities: string[];
     datetimeGranularities: string[];
     isMeasureCandidate: (field: PivotField) => boolean;
@@ -10005,7 +10005,7 @@ declare function createPivotFormula(formulaId: string, cell: PivotTableCell): st
  * e.g. given the following formula PIVOT.VALUE("1", "stage_id", "42", "status", "won"),
  * the two group values are "42" and "won".
  */
-declare function toNormalizedPivotValue(dimension: Pick<PivotDimension$1, "type" | "displayName" | "granularity">, groupValue: any): CellValue;
+declare function toNormalizedPivotValue(dimension: Pick<PivotDimension$1, "type" | "displayName" | "granularity">, groupValue: Maybe<CellValue | FunctionResultObject>): CellValue;
 
 interface Props$j {
     onConfirm: (content: string) => void;