@odoo/o-spreadsheet 17.0.67 → 17.0.69

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 17.0.67
- * @date 2025-06-23T15:02:54.391Z
- * @hash cb0b6a9
+ * @version 17.0.69
+ * @date 2025-07-11T11:06:35.446Z
+ * @hash 8c0d3da
  */
 
 'use strict';
@@ -4587,6 +4587,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
@@ -32341,38 +32343,111 @@ function applyStyleToZone(appliedStyle, zone, cells, styles) {
  * 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];
-                    if (cell && cell.content && cell.content.startsWith("=")) {
-                        let refIndex;
-                        while ((refIndex = cell.content.indexOf(tabRef)) !== -1) {
-                            let endIndex = refIndex + tabRef.length;
-                            let openBrackets = 1;
-                            while (openBrackets > 0 && endIndex < cell.content.length) {
-                                if (cell.content[endIndex] === "[") {
-                                    openBrackets++;
-                                }
-                                else if (cell.content[endIndex] === "]") {
-                                    openBrackets--;
-                                }
-                                endIndex++;
-                            }
-                            let reference = cell.content.slice(refIndex + tabRef.length, endIndex - 1);
-                            const sheetPrefix = tableSheet.id === sheet.id ? "" : tableSheet.name + "!";
-                            const convertedRef = convertTableReference(sheetPrefix, reference, table, xc);
-                            cell.content =
-                                cell.content.slice(0, refIndex) + convertedRef + cell.content.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);
+                    }
+                }
+            }
+        }
+    }
+    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].content = 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].content = 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]?.content;
+            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,
@@ -52503,14 +52578,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() {
@@ -55629,26 +55702,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 ? organizeZone(result) : result;
             if (result && !isEqual(result, anchor.zone)) {
@@ -55877,18 +55952,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) {
@@ -58353,6 +58436,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.67";
-__info__.date = "2025-06-23T15:02:54.391Z";
-__info__.hash = "cb0b6a9";
+__info__.version = "17.0.69";
+__info__.date = "2025-07-11T11:06:35.446Z";
+__info__.hash = "8c0d3da";

package/dist/o-spreadsheet.esm.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 17.0.67
- * @date 2025-06-23T15:02:54.391Z
- * @hash cb0b6a9
+ * @version 17.0.69
+ * @date 2025-07-11T11:06:35.446Z
+ * @hash 8c0d3da
  */
 
 import { Component, useRef, onMounted, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillUnmount, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -4585,6 +4585,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
@@ -32339,38 +32341,111 @@ function applyStyleToZone(appliedStyle, zone, cells, styles) {
  * 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];
-                    if (cell && cell.content && cell.content.startsWith("=")) {
-                        let refIndex;
-                        while ((refIndex = cell.content.indexOf(tabRef)) !== -1) {
-                            let endIndex = refIndex + tabRef.length;
-                            let openBrackets = 1;
-                            while (openBrackets > 0 && endIndex < cell.content.length) {
-                                if (cell.content[endIndex] === "[") {
-                                    openBrackets++;
-                                }
-                                else if (cell.content[endIndex] === "]") {
-                                    openBrackets--;
-                                }
-                                endIndex++;
-                            }
-                            let reference = cell.content.slice(refIndex + tabRef.length, endIndex - 1);
-                            const sheetPrefix = tableSheet.id === sheet.id ? "" : tableSheet.name + "!";
-                            const convertedRef = convertTableReference(sheetPrefix, reference, table, xc);
-                            cell.content =
-                                cell.content.slice(0, refIndex) + convertedRef + cell.content.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);
+                    }
+                }
+            }
+        }
+    }
+    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].content = 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].content = 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]?.content;
+            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,
@@ -52501,14 +52576,12 @@ class BottomBarSheet extends 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() {
@@ -55627,26 +55700,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 ? organizeZone(result) : result;
             if (result && !isEqual(result, anchor.zone)) {
@@ -55875,18 +55950,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) {
@@ -58316,6 +58399,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = "17.0.67";
-__info__.date = "2025-06-23T15:02:54.391Z";
-__info__.hash = "cb0b6a9";
+__info__.version = "17.0.69";
+__info__.date = "2025-07-11T11:06:35.446Z";
+__info__.hash = "8c0d3da";