@odoo/o-spreadsheet 17.1.4 → 17.1.5

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.1.4
- * @date 2024-02-09T13:09:13.430Z
- * @hash 16d3ece
+ * @version 17.1.5
+ * @date 2024-02-16T14:23:54.651Z
+ * @hash 29d8ad6
  */
 
 'use strict';
@@ -453,8 +453,8 @@ function isObjectEmptyRecursive(argument) {
  * If the given item does not exist in the dictionary, it creates one with a new id.
  */
 function getItemId(item, itemsDic) {
-    for (let [key, value] of Object.entries(itemsDic)) {
-        if (deepEquals(value, item)) {
+    for (const key in itemsDic) {
+        if (deepEquals(itemsDic[key], item)) {
             return parseInt(key, 10);
         }
     }
@@ -553,11 +553,13 @@ function deepEquals(o1, o2) {
     if (typeof o1 !== "object")
         return o1 === o2;
     // Objects can have different keys if the values are undefined
-    const keys = new Set();
-    Object.keys(o1).forEach((key) => keys.add(key));
-    Object.keys(o2).forEach((key) => keys.add(key));
-    for (let key of keys) {
-        if (typeof o1[key] !== typeof o1[key])
+    for (const key in o2) {
+        if (!(key in o1) && o2[key] !== undefined) {
+            return false;
+        }
+    }
+    for (const key in o1) {
+        if (typeof o1[key] !== typeof o2[key])
             return false;
         if (typeof o1[key] === "object") {
             if (!deepEquals(o1[key], o2[key]))
@@ -627,18 +629,18 @@ function isConsecutive(iterable) {
     return true;
 }
 class JetSet extends Set {
-    add(...iterable) {
+    addMany(iterable) {
         for (const element of iterable) {
             super.add(element);
         }
         return this;
     }
-    delete(...iterable) {
-        let deleted = false;
+    deleteMany(iterable) {
+        let wasDeleted = false;
         for (const element of iterable) {
-            deleted ||= super.delete(element);
+            wasDeleted ||= super.delete(element);
         }
-        return deleted;
+        return wasDeleted;
     }
 }
 /**
@@ -1936,7 +1938,7 @@ class DispatchResult {
      * Static helper which returns a successful DispatchResult
      */
     static get Success() {
-        return new DispatchResult();
+        return SUCCESS;
     }
     get isSuccessful() {
         return this.reasons.length === 0;
@@ -1949,6 +1951,7 @@ class DispatchResult {
         return this.reasons.includes(reason);
     }
 }
+const SUCCESS = new DispatchResult();
 exports.CommandResult = void 0;
 (function (CommandResult) {
     CommandResult["Success"] = "Success";
@@ -7655,6 +7658,9 @@ function isValidLocale(locale) {
     if (locale.formulaArgSeparator === locale.decimalSeparator) {
         return false;
     }
+    if (locale.thousandsSeparator === locale.decimalSeparator) {
+        return false;
+    }
     try {
         formatValue(1, { locale, format: "#,##0.00" });
         formatValue(1, { locale, format: locale.dateFormat });
@@ -7745,7 +7751,7 @@ function canonicalizeNumberLiteral(content, locale) {
     if (locale.decimalSeparator === "." || !isNumber(content, locale)) {
         return content;
     }
-    return content.replace(locale.decimalSeparator, ".");
+    return content.replace(locale.thousandsSeparator, "").replace(locale.decimalSeparator, ".");
 }
 /**
  * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
@@ -10840,6 +10846,12 @@ const INSERT_LINK = (env) => {
     let { col, row } = env.model.getters.getActivePosition();
     env.model.dispatch("OPEN_CELL_POPOVER", { col, row, popoverType: "LinkEditor" });
 };
+const INSERT_LINK_NAME = (env) => {
+    const sheetId = env.model.getters.getActiveSheetId();
+    const { col, row } = env.model.getters.getActivePosition();
+    const cell = env.model.getters.getEvaluatedCell({ sheetId, col, row });
+    return cell && cell.link ? _t("Edit link") : _t("Insert link");
+};
 //------------------------------------------------------------------------------
 // Filters action
 //------------------------------------------------------------------------------
@@ -20084,7 +20096,7 @@ cellMenuRegistry
 })
     .add("insert_link", {
     ...insertLink,
-    name: _t("Insert link"),
+    name: INSERT_LINK_NAME,
     sequence: 150,
     separator: true,
 });
@@ -26527,6 +26539,17 @@ class TextValueProvider extends owl.Component {
         onValueSelected: Function,
         onValueHovered: Function,
     };
+    autoCompleteListRef = owl.useRef("autoCompleteList");
+    setup() {
+        owl.useEffect(() => {
+            const selectedIndex = this.props.selectedIndex;
+            if (selectedIndex === undefined) {
+                return;
+            }
+            const selectedElement = this.autoCompleteListRef.el?.children[selectedIndex];
+            selectedElement?.scrollIntoView?.({ block: "nearest" });
+        }, () => [this.props.selectedIndex, this.autoCompleteListRef.el]);
+    }
 }
 
 class ContentEditableHelper {
@@ -26971,6 +26994,7 @@ css /* scss */ `
       position: absolute;
       margin: 1px 4px;
       pointer-events: none;
+      overflow: auto;
 
       .o-semi-bold {
         /** FIXME: to remove in favor of Bootstrap
@@ -27028,7 +27052,10 @@ class Composer extends owl.Component {
         if (this.props.delimitation && this.props.rect) {
             const { x: cellX, y: cellY, height: cellHeight } = this.props.rect;
             const remainingHeight = this.props.delimitation.height - (cellY + cellHeight);
+            assistantStyle["max-height"] = `${remainingHeight}px`;
             if (cellY > remainingHeight) {
+                const availableSpaceAbove = cellY;
+                assistantStyle["max-height"] = `${availableSpaceAbove}px`;
                 // render top
                 // We compensate 2 px of margin on the assistant style + 1px for design reasons
                 assistantStyle.top = `-3px`;
@@ -35147,22 +35174,7 @@ class BordersPlugin extends CorePlugin {
         }
     }
     export(data) {
-        // Borders
-        let borderId = 0;
         const borders = {};
-        /**
-         * Get the id of the given border. If the border does not exist, it creates
-         * one.
-         */
-        function getBorderId(border) {
-            for (let [key, value] of Object.entries(borders)) {
-                if (deepEquals(value, border)) {
-                    return parseInt(key, 10);
-                }
-            }
-            borders[++borderId] = border;
-            return borderId;
-        }
         for (let sheet of data.sheets) {
             for (let col = 0; col < sheet.colNumber; col++) {
                 for (let row = 0; row < sheet.rowNumber; row++) {
@@ -35170,7 +35182,7 @@ class BordersPlugin extends CorePlugin {
                     if (border) {
                         const xc = toXC(col, row);
                         const cell = sheet.cells[xc];
-                        const borderId = getBorderId(border);
+                        const borderId = getItemId(border, borders);
                         if (cell) {
                             cell.border = borderId;
                         }
@@ -35959,9 +35971,9 @@ class CellPlugin extends CorePlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "UPDATE_CELL":
-                return this.checkCellOutOfSheet(cmd);
+                return this.checkValidations(cmd, this.checkCellOutOfSheet, this.checkUselessUpdateCell);
             case "CLEAR_CELL":
-                return this.checkValidations(cmd, this.chainValidations(this.checkCellOutOfSheet, this.checkUselessClearCell));
+                return this.checkValidations(cmd, this.checkCellOutOfSheet, this.checkUselessClearCell);
             default:
                 return "Success" /* CommandResult.Success */;
         }
@@ -36111,8 +36123,8 @@ class CellPlugin extends CorePlugin {
     }
     removeDefaultStyleValues(style) {
         const cleanedStyle = { ...style };
-        for (const [property, defaultValue] of Object.entries(DEFAULT_STYLE)) {
-            if (cleanedStyle[property] === defaultValue) {
+        for (const property in DEFAULT_STYLE) {
+            if (cleanedStyle[property] === DEFAULT_STYLE[property]) {
                 delete cleanedStyle[property];
             }
         }
@@ -36268,10 +36280,7 @@ class CellPlugin extends CorePlugin {
         else {
             style = before ? before.style : undefined;
         }
-        const locale = this.getters.getLocale();
-        let format = ("format" in after ? after.format : before && before.format) ||
-            detectDateFormat(afterContent, locale) ||
-            detectNumberFormat(afterContent);
+        const format = "format" in after ? after.format : before && before.format;
         /* Read the following IF as:
          * we need to remove the cell if it is completely empty, but we can know if it completely empty if:
          * - the command says the new content is empty and has no border/format/style
@@ -36312,6 +36321,7 @@ class CellPlugin extends CorePlugin {
     }
     createLiteralCell(id, content, format, style) {
         const locale = this.getters.getLocale();
+        format = format || detectDateFormat(content, locale) || detectNumberFormat(content);
         if (format !== PLAIN_TEXT_FORMAT && !isEvaluationError(content)) {
             content = toString(parseLiteral(content, locale));
         }
@@ -36384,6 +36394,18 @@ class CellPlugin extends CorePlugin {
         }
         return "Success" /* CommandResult.Success */;
     }
+    checkUselessUpdateCell(cmd) {
+        const cell = this.getters.getCell(cmd);
+        const hasContent = "content" in cmd || "formula" in cmd;
+        const hasStyle = "style" in cmd;
+        const hasFormat = "format" in cmd;
+        if ((!hasContent || cell?.content === cmd.content) &&
+            (!hasStyle || deepEquals(cell?.style, cmd.style)) &&
+            (!hasFormat || cell?.format === cmd.format)) {
+            return "NoChanges" /* CommandResult.NoChanges */;
+        }
+        return "Success" /* CommandResult.Success */;
+    }
 }
 class FormulaCellWithDependencies {
     id;
@@ -41168,7 +41190,15 @@ class SpreadsheetRTree {
         if (!this.rTrees[sheetId]) {
             return;
         }
-        this.rTrees[sheetId].remove(item, deepEquals);
+        this.rTrees[sheetId].remove(item, this.rtreeItemComparer);
+    }
+    rtreeItemComparer(left, right) {
+        return (left.data == right.data &&
+            left.boundingBox.sheetId === right.boundingBox.sheetId &&
+            left.boundingBox?.zone.left === right.boundingBox.zone.left &&
+            left.boundingBox?.zone.top === right.boundingBox.zone.top &&
+            left.boundingBox?.zone.right === right.boundingBox.zone.right &&
+            left.boundingBox?.zone.bottom === right.boundingBox.zone.bottom);
     }
 }
 /**
@@ -41246,7 +41276,7 @@ class FormulaDependencyGraph {
         const queue = Array.from(ranges).reverse();
         while (queue.length > 0) {
             const range = queue.pop();
-            visited.add(...this.encoder.encodeBoundingBox(range));
+            visited.addMany(this.encoder.encodeBoundingBox(range));
             const impactedPositionIds = this.rTree.search(range).map((dep) => dep.data);
             for (const positionId of impactedPositionIds) {
                 if (!visited.has(positionId)) {
@@ -41254,7 +41284,7 @@ class FormulaDependencyGraph {
                 }
             }
         }
-        visited.delete(...ranges.flatMap((r) => this.encoder.encodeBoundingBox(r)));
+        visited.deleteMany(ranges.flatMap((r) => this.encoder.encodeBoundingBox(r)));
         return visited;
     }
 }
@@ -41394,9 +41424,9 @@ class Evaluator {
         const cells = positions.map((p) => this.encoder.encode(p));
         const cellsToCompute = new JetSet(cells);
         const arrayFormulasPositionIds = this.getArrayFormulasImpactedByChangesOf(cells);
-        cellsToCompute.add(...this.getCellsDependingOn(cells));
-        cellsToCompute.add(...arrayFormulasPositionIds);
-        cellsToCompute.add(...this.getCellsDependingOn(arrayFormulasPositionIds));
+        cellsToCompute.addMany(this.getCellsDependingOn(cells));
+        cellsToCompute.addMany(arrayFormulasPositionIds);
+        cellsToCompute.addMany(this.getCellsDependingOn(arrayFormulasPositionIds));
         this.evaluate(cellsToCompute);
     }
     getArrayFormulasImpactedByChangesOf(positionIds) {
@@ -41410,7 +41440,7 @@ class Evaluator {
             }
             if (!content) {
                 // The previous content could have blocked some array formulas
-                impactedPositionIds.add(...this.getArrayFormulasBlockedByOrSpreadingOn(positionId));
+                impactedPositionIds.addMany(this.getArrayFormulasBlockedByOrSpreadingOn(positionId));
             }
         }
         return impactedPositionIds;
@@ -41462,7 +41492,7 @@ class Evaluator {
         }
         const arrayFormulas = this.spreadingRelations.getFormulaPositionsSpreadingOn(positionId);
         const cells = new JetSet(arrayFormulas);
-        cells.add(...this.getCellsDependingOn(arrayFormulas));
+        cells.addMany(this.getCellsDependingOn(arrayFormulas));
         return cells;
     }
     nextPositionsToUpdate = new JetSet();
@@ -41600,7 +41630,7 @@ class Evaluator {
             this.setEvaluatedCell(positionId, evaluatedCell);
             // check if formula dependencies present in the spread zone
             // if so, they need to be recomputed
-            this.nextPositionsToUpdate.add(...this.getCellsDependingOn([positionId]));
+            this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([positionId]));
         };
     }
     invalidateSpreading(positionId) {
@@ -41615,8 +41645,8 @@ class Evaluator {
                 continue;
             }
             this.evaluatedCells.delete(child);
-            this.nextPositionsToUpdate.add(...this.getCellsDependingOn([child]));
-            this.nextPositionsToUpdate.add(...this.getArrayFormulasBlockedByOrSpreadingOn(child));
+            this.nextPositionsToUpdate.addMany(this.getCellsDependingOn([child]));
+            this.nextPositionsToUpdate.addMany(this.getArrayFormulasBlockedByOrSpreadingOn(child));
         }
         this.spreadingRelations.removeNode(positionId);
     }
@@ -45485,7 +45515,7 @@ class FindAndReplacePlugin extends UIPlugin {
     }
     finalize() {
         if (this.isSearchDirty) {
-            this.refreshSearch();
+            this.refreshSearch(false);
             this.isSearchDirty = false;
         }
     }
@@ -45529,10 +45559,10 @@ class FindAndReplacePlugin extends UIPlugin {
     /**
      * refresh the matches according to the current search options
      */
-    refreshSearch() {
+    refreshSearch(jumpToMatchSheet = true) {
         this.selectedMatchIndex = null;
         this.findMatches();
-        this.selectNextCell(Direction.current);
+        this.selectNextCell(Direction.current, jumpToMatchSheet);
     }
     /**
      * Updates the regex based on the current searchOptions and
@@ -45614,7 +45644,7 @@ class FindAndReplacePlugin extends UIPlugin {
      * It is also used to keep coherence between the selected searchMatch
      * and selectedMatchIndex.
      */
-    selectNextCell(indexChange) {
+    selectNextCell(indexChange, jumpToMatchSheet = true) {
         const matches = this.searchMatches;
         if (!matches.length) {
             this.selectedMatchIndex = null;
@@ -45640,7 +45670,7 @@ class FindAndReplacePlugin extends UIPlugin {
         this.selectedMatchIndex = nextIndex;
         const selectedMatch = matches[nextIndex];
         // Switch to the sheet where the match is located
-        if (this.getters.getActiveSheetId() !== selectedMatch.sheetId) {
+        if (jumpToMatchSheet && this.getters.getActiveSheetId() !== selectedMatch.sheetId) {
             this.dispatch("ACTIVATE_SHEET", {
                 sheetIdFrom: this.getters.getActiveSheetId(),
                 sheetIdTo: selectedMatch.sheetId,
@@ -47212,7 +47242,7 @@ class SheetUIPlugin extends UIPlugin {
         "getCellText",
         "getCellMultiLineText",
         "getContiguousZone",
-        "isCellEmpty",
+        "isEvaluatedCellEmpty",
     ];
     ctx = document.createElement("canvas").getContext("2d");
     // ---------------------------------------------------------------------------
@@ -47340,14 +47370,23 @@ class SheetUIPlugin extends UIPlugin {
         return zone;
     }
     /**
-     * Check if a cell is empty. If the cell is part of a merge,
-     * check if the merge containing the cell is empty.
+     * Checks if a cell evaluated value is empty. If the cell is part of a merge,
+     * the check applies to the main cell of the merge.
      */
-    isCellEmpty(position) {
+    isEvaluatedCellEmpty(position) {
         const mainPosition = this.getters.getMainCellPosition(position);
         const cell = this.getters.getEvaluatedCell(mainPosition);
         return cell.type === CellValueType.empty;
     }
+    /**
+     * Checks if a cell is empty (i.e. does not have a content or a formula does not spread over it).
+     * If the cell is part of a merge, the check applies to the main cell of the merge.
+     */
+    isCellEmpty(position) {
+        const mainPosition = this.getters.getMainCellPosition(position);
+        return !(this.getters.getCorrespondingFormulaCell(mainPosition) ||
+            this.getters.getCell(mainPosition)?.content);
+    }
     getColMaxWidth(sheetId, index) {
         const cellsPositions = positions(this.getters.getColsZone(sheetId, index, index));
         const sizes = cellsPositions.map((position) => this.getCellWidth({ sheetId, ...position }));
@@ -54889,8 +54928,8 @@ class SelectionStreamProcessorImpl {
         let currentPosition = startPosition;
         // If both the current cell and the next cell are not empty, we want to go to the end of the cluster
         const nextCellPosition = this.getNextCellPosition(startPosition, dim, dir);
-        let mode = !this.getters.isCellEmpty({ ...currentPosition, sheetId }) &&
-            !this.getters.isCellEmpty({ ...nextCellPosition, sheetId })
+        let mode = !this.getters.isEvaluatedCellEmpty({ ...currentPosition, sheetId }) &&
+            !this.getters.isEvaluatedCellEmpty({ ...nextCellPosition, sheetId })
             ? "endOfCluster"
             : "nextCluster";
         while (true) {
@@ -54900,7 +54939,7 @@ class SelectionStreamProcessorImpl {
                 currentPosition.row === nextCellPosition.row) {
                 break;
             }
-            const isNextCellEmpty = this.getters.isCellEmpty({ ...nextCellPosition, sheetId });
+            const isNextCellEmpty = this.getters.isEvaluatedCellEmpty({ ...nextCellPosition, sheetId });
             if (mode === "endOfCluster" && isNextCellEmpty) {
                 break;
             }
@@ -57185,6 +57224,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.1.4";
-__info__.date = "2024-02-09T13:09:13.430Z";
-__info__.hash = "16d3ece";
+__info__.version = "17.1.5";
+__info__.date = "2024-02-16T14:23:54.651Z";
+__info__.hash = "29d8ad6";

package/dist/o-spreadsheet.d.ts

@@ -3349,6 +3349,7 @@ declare class CellPlugin extends CorePlugin<CoreState> implements CoreState {
     private createErrorFormula;
     private checkCellOutOfSheet;
     private checkUselessClearCell;
+    private checkUselessUpdateCell;
 }
 
 /**
@@ -4699,7 +4700,7 @@ declare class UIOptionsPlugin extends UIPlugin {
 }
 
 declare class SheetUIPlugin extends UIPlugin {
-    static getters: readonly ["doesCellHaveGridIcon", "getCellWidth", "getTextWidth", "getCellText", "getCellMultiLineText", "getContiguousZone", "isCellEmpty"];
+    static getters: readonly ["doesCellHaveGridIcon", "getCellWidth", "getTextWidth", "getCellText", "getCellMultiLineText", "getContiguousZone", "isEvaluatedCellEmpty"];
     private ctx;
     allowDispatch(cmd: LocalCommand): CommandResult | CommandResult[];
     handle(cmd: Command): void;
@@ -4717,10 +4718,15 @@ declare class SheetUIPlugin extends UIPlugin {
      */
     getContiguousZone(sheetId: UID, zoneToExpand: Zone): Zone;
     /**
-     * Check if a cell is empty. If the cell is part of a merge,
-     * check if the merge containing the cell is empty.
+     * Checks if a cell evaluated value is empty. If the cell is part of a merge,
+     * the check applies to the main cell of the merge.
      */
-    isCellEmpty(position: CellPosition): boolean;
+    isEvaluatedCellEmpty(position: CellPosition): boolean;
+    /**
+     * Checks if a cell is empty (i.e. does not have a content or a formula does not spread over it).
+     * If the cell is part of a merge, the check applies to the main cell of the merge.
+     */
+    private isCellEmpty;
     private getColMaxWidth;
     /**
      * Check that any "sheetId" in the command matches an existing
@@ -7721,6 +7727,8 @@ declare class TextValueProvider extends Component<Props$b> {
         onValueSelected: FunctionConstructor;
         onValueHovered: FunctionConstructor;
     };
+    private autoCompleteListRef;
+    setup(): void;
 }
 
 declare class ContentEditableHelper {