@odoo/o-spreadsheet 16.4.6 → 16.4.8

package/dist/o-spreadsheet.cjs.js

@@ -614,13 +614,17 @@ function getAddHeaderStartIndex(position, base) {
     return position === "after" ? base + 1 : base;
 }
 /**
- * Compare two objects.
+ * Compares two objects.
  */
 function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
         return false;
+    if (typeof o1 !== typeof o2)
+        return false;
+    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));
@@ -5265,6 +5269,7 @@ css /* scss */ `
     padding: 10px;
     width: ${ERROR_TOOLTIP_WIDTH}px;
     box-sizing: border-box !important;
+    overflow-wrap: break-word;
   }
 `;
 class ErrorToolTip extends owl.Component {
@@ -5444,6 +5449,9 @@ class FilterMenu extends owl.Component {
         });
         this.state.values = this.getFilterValues(this.props.filterPosition);
     }
+    get isReadonly() {
+        return this.env.model.getters.isReadonly();
+    }
     getFilterValues(position) {
         const sheetId = this.env.model.getters.getActiveSheetId();
         const filter = this.env.model.getters.getFilter({ sheetId, ...position });
@@ -15120,13 +15128,42 @@ function isValidLocale(locale) {
     }
     return true;
 }
-/** Change a content string to its canonical form (en_US locale) */
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Don't convert date string.
+ *
+ * @example
+ * canonicalizeNumberContent("=SUM(1,5; 02/12/2012)", FR_LOCALE) // "=SUM(1.5, 02/12/2012)"
+ * canonicalizeNumberContent("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeNumberContent("02/12/2012", FR_LOCALE) // "02/12/2012"
+ */
+function canonicalizeNumberContent(content, locale) {
+    return content.startsWith("=")
+        ? canonicalizeFormula$1(content, locale)
+        : canonicalizeNumberLiteral(content, locale);
+}
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * canonicalizeContent("=SUM(1,5; 5)", FR_LOCALE) // "=SUM(1.5, 5)"
+ * canonicalizeContent("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeContent("02/12/2012", FR_LOCALE) // "12/02/2012"
+ * canonicalizeContent("02-12-2012", FR_LOCALE) // "12/02/2012"
+ */
 function canonicalizeContent(content, locale) {
     return content.startsWith("=")
         ? canonicalizeFormula$1(content, locale)
-        : toCanonicalNumberString(content, locale);
+        : canonicalizeLiteral(content, locale);
 }
-/** Change the content of a cell to its canonical form (en_US locale) */
+/**
+ * Change a content string from its canonical form (en_US locale) to the given locale. Also convert date string.
+ *
+ * @example
+ * localizeContent("=SUM(1.5, 5)", FR_LOCALE) // "=SUM(1,5; 5)"
+ * localizeContent("125.9", FR_LOCALE) // "125,9"
+ * localizeContent("12/02/2012", FR_LOCALE) // "02/12/2012"
+ */
 function localizeContent(content, locale) {
     return content.startsWith("=")
         ? localizeFormula(content, locale)
@@ -15161,24 +15198,75 @@ function _localizeFormula$1(formula, fromLocale, toLocale) {
     return localizedFormula;
 }
 /**
- *  Replace localized number with localized decimal separator by a number with "." as decimal separator
+ * Change a literal string from the given locale to its canonical form (en_US locale). Don't convert date string.
+ *
+ * @example
+ * canonicalizeNumberLiteral("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeNumberLiteral("02/12/2012", FR_LOCALE) // "02/12/2012"
  */
-function toCanonicalNumberString(content, locale) {
+function canonicalizeNumberLiteral(content, locale) {
     if (locale.decimalSeparator === "." || !isNumber(content, locale)) {
         return content;
     }
     return content.replace(locale.decimalSeparator, ".");
 }
-function localizeLiteral(content, locale) {
-    if (locale.decimalSeparator === "." || !isNumber(content, DEFAULT_LOCALE)) {
-        return content;
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * canonicalizeLiteral("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeLiteral("02/12/2012", FR_LOCALE) // "12/02/2012"
+ * canonicalizeLiteral("02-12-2012", FR_LOCALE) // "12/02/2012"
+ */
+function canonicalizeLiteral(content, locale) {
+    if (isDateTime(content, locale)) {
+        const dateNumber = toNumber(content, locale);
+        let format = DEFAULT_LOCALE.dateFormat;
+        if (!Number.isInteger(dateNumber)) {
+            format += " " + DEFAULT_LOCALE.timeFormat;
+        }
+        return formatValue(dateNumber, { locale: DEFAULT_LOCALE, format });
+    }
+    return canonicalizeNumberLiteral(content, locale);
+}
+/**
+ * Change a literal string from its canonical form (en_US locale) to the given locale. Don't convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * localizeNumberLiteral("125.9", FR_LOCALE) // "125,9"
+ * localizeNumberLiteral("12/02/2012", FR_LOCALE) // "12/02/2012"
+ * localizeNumberLiteral("12-02-2012", FR_LOCALE) // "12/02/2012"
+ */
+function localizeNumberLiteral(literal, locale) {
+    if (locale.decimalSeparator === "." || !isNumber(literal, DEFAULT_LOCALE)) {
+        return literal;
     }
     const decimalNumberRegex = getDecimalNumberRegex(DEFAULT_LOCALE);
-    const localized = content.replace(decimalNumberRegex, (match) => {
+    const localized = literal.replace(decimalNumberRegex, (match) => {
         return match.replace(".", locale.decimalSeparator);
     });
     return localized;
 }
+/**
+ * Change a literal string from its canonical form (en_US locale) to the given locale. Also convert date string.
+ *
+ * @example
+ * localizeLiteral("125.9", FR_LOCALE) // "125,9"
+ * localizeLiteral("12/02/2012", FR_LOCALE) // "02/12/2012"
+ */
+function localizeLiteral(literal, locale) {
+    if (isDateTime(literal, DEFAULT_LOCALE)) {
+        const dateNumber = toNumber(literal, DEFAULT_LOCALE);
+        let format = locale.dateFormat;
+        if (!Number.isInteger(dateNumber)) {
+            format += " " + locale.timeFormat;
+        }
+        return formatValue(dateNumber, { locale, format });
+    }
+    return localizeNumberLiteral(literal, locale);
+}
 function canonicalizeCFRule(cf, locale) {
     return changeCFRuleLocale(cf, (content) => canonicalizeContent(content, locale));
 }
@@ -15535,7 +15623,9 @@ class LinkEditor extends owl.Component {
     save() {
         const { col, row } = this.props.cellPosition;
         const locale = this.env.model.getters.getLocale();
-        const label = this.link.label ? canonicalizeContent(this.link.label, locale) : this.link.url;
+        const label = this.link.label
+            ? canonicalizeNumberContent(this.link.label, locale)
+            : this.link.url;
         this.env.model.dispatch("UPDATE_CELL", {
             col: col,
             row: row,
@@ -22711,7 +22801,6 @@ class FindAndReplacePanel extends owl.Component {
     state = owl.useState(this.initialState());
     debounceTimeoutId;
     showFormulaState = false;
-    debouncedUpdateSearch;
     findAndReplaceRef = owl.useRef("findAndReplace");
     get hasSearchResult() {
         return this.env.model.getters.getCurrentSelectedMatchIndex() !== null;
@@ -22721,9 +22810,9 @@ class FindAndReplacePanel extends owl.Component {
     }
     setup() {
         this.showFormulaState = this.env.model.getters.shouldShowFormulas();
-        this.debouncedUpdateSearch = debounce(this.updateSearch.bind(this), 200);
         owl.onMounted(() => this.focusInput());
         owl.onWillUnmount(() => {
+            clearTimeout(this.debounceTimeoutId);
             this.env.model.dispatch("CLEAR_SEARCH");
             this.env.model.dispatch("SET_FORMULA_VISIBILITY", { show: this.showFormulaState });
         });
@@ -22768,6 +22857,13 @@ class FindAndReplacePanel extends owl.Component {
             searchOptions: this.state.searchOptions,
         });
     }
+    debouncedUpdateSearch() {
+        clearTimeout(this.debounceTimeoutId);
+        this.debounceTimeoutId = setTimeout(() => {
+            this.updateSearch();
+            this.debounceTimeoutId = undefined;
+        }, 200);
+    }
     replace() {
         this.env.model.dispatch("REPLACE_SEARCH", {
             replaceWith: this.state.replaceWith,
@@ -25305,9 +25401,11 @@ function useCellHovered(env, gridRef, callback) {
         }
     }
     function updateMousePosition(e) {
-        x = e.offsetX;
-        y = e.offsetY;
-        lastMoved = Date.now();
+        if (gridRef.el === e.target) {
+            x = e.offsetX;
+            y = e.offsetY;
+            lastMoved = Date.now();
+        }
     }
     function recompute() {
         const { col, row } = getPosition();
@@ -36680,8 +36778,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
             if (cell.type === CellValueType.error) {
                 return false;
             }
-            const locale = this.getters.getLocale();
-            const values = rule.values.map((val) => parseLiteral(val, locale));
+            const values = rule.values.map((val) => parseLiteral(val, DEFAULT_LOCALE));
             switch (rule.operator) {
                 case "IsEmpty":
                     return cell.value.toString().trim() === "";
@@ -38606,14 +38703,10 @@ class FindAndReplacePlugin extends UIPlugin {
             case "REPLACE_ALL_SEARCH":
                 this.replaceAll(cmd.replaceWith);
                 break;
-            case "EVALUATE_CELLS":
-            case "UPDATE_CELL":
-            case "REMOVE_FILTER_TABLE":
-            case "UPDATE_FILTER":
-                this.isSearchDirty = true;
-                break;
             case "UNDO":
             case "REDO":
+            case "REMOVE_FILTER_TABLE":
+            case "UPDATE_FILTER":
             case "REMOVE_COLUMNS_ROWS":
             case "HIDE_COLUMNS_ROWS":
             case "UNHIDE_COLUMNS_ROWS":
@@ -38765,7 +38858,7 @@ class FindAndReplacePlugin extends UIPlugin {
         const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
         const toReplace = this.getSearchableString({ sheetId, col, row });
         const content = toReplace.replace(replaceRegex, replaceWith);
-        const canonicalContent = canonicalizeContent(content, this.getters.getLocale());
+        const canonicalContent = canonicalizeNumberContent(content, this.getters.getLocale());
         this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
     }
     /**
@@ -40939,7 +41032,7 @@ class SplitToColumnsPlugin extends UIPlugin {
                     sheetId,
                     col: col + index,
                     row,
-                    content: canonicalizeContent(content, this.getters.getLocale()),
+                    content: canonicalizeNumberContent(content, this.getters.getLocale()),
                     format: "",
                     style: mainCell?.style || null,
                 });
@@ -41125,6 +41218,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
     cells;
     copiedTables;
     zones;
+    uuidGenerator = new UuidGenerator();
     constructor(zones, operation, getters, dispatch, selection) {
         super(operation, getters, dispatch, selection);
         if (!zones.length) {
@@ -41273,7 +41367,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
         });
         for (const filterTable of this.copiedTables) {
             this.dispatch("REMOVE_FILTER_TABLE", {
-                sheetId: this.getters.getActiveSheetId(),
+                sheetId: this.sheetId,
                 target: [filterTable.zone],
             });
         }
@@ -41586,8 +41680,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
                         this.adaptCFRules(origin.sheetId, cf, [xc], toRemoveRange);
                     }
                     else {
-                        this.adaptCFRules(target.sheetId, cf, [xc], []);
                         this.adaptCFRules(origin.sheetId, cf, [], toRemoveRange);
+                        const cfToCopyTo = this.getCFToCopyTo(target.sheetId, cf);
+                        this.adaptCFRules(target.sheetId, cfToCopyTo, [xc], []);
                     }
                 }
             }
@@ -41611,6 +41706,12 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             sheetId,
         });
     }
+    getCFToCopyTo(targetSheetId, originCF) {
+        const cfInTarget = this.getters
+            .getConditionalFormats(targetSheetId)
+            .find((cf) => cf.stopIfTrue === originCF.stopIfTrue && deepEquals(cf.rule, originCF.rule));
+        return cfInTarget ? cfInTarget : { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+    }
 }
 
 /** State of the clipboard when copying/cutting figures */
@@ -41742,7 +41843,7 @@ class ClipboardFigureImage {
 function canonicalizeNumberValue(content, locale) {
     return content.startsWith("=")
         ? canonicalizeFormula(content, locale)
-        : toCanonicalNumberString(content, locale);
+        : canonicalizeNumberLiteral(content, locale);
 }
 /** Change a formula to its canonical form (en_US locale) */
 function canonicalizeFormula(formula, locale) {
@@ -41859,7 +41960,7 @@ class ClipboardPlugin extends UIPlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "CUT":
-                const zones = cmd.cutTarget || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 const state = this.getClipboardState(zones, cmd.type);
                 return state.isCutAllowed(zones);
             case "PASTE":
@@ -41894,7 +41995,7 @@ class ClipboardPlugin extends UIPlugin {
         switch (cmd.type) {
             case "COPY":
             case "CUT":
-                const zones = ("cutTarget" in cmd && cmd.cutTarget) || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 this.state = this.getClipboardState(zones, cmd.type);
                 this.status = "visible";
                 this.originSheetId = this.getters.getActiveSheetId();
@@ -42544,7 +42645,7 @@ class EditionPlugin extends UIPlugin {
             if (content) {
                 const sheetId = this.getters.getActiveSheetId();
                 const cell = this.getters.getEvaluatedCell({ sheetId, col: this.col, row: this.row });
-                content = canonicalizeContent(content, this.getters.getLocale());
+                content = canonicalizeNumberContent(content, this.getters.getLocale());
                 if (content.startsWith("=")) {
                     const left = this.currentTokens.filter((t) => t.type === "LEFT_PAREN").length;
                     const right = this.currentTokens.filter((t) => t.type === "RIGHT_PAREN").length;
@@ -43565,26 +43666,24 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
-        this.dispatch("CUT", {
-            cutTarget: [
-                {
-                    left: isCol ? start + deltaCol : 0,
-                    right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? start + deltaRow : 0,
-                    bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
-        this.dispatch("PASTE", {
-            target: [
-                {
-                    left: isCol ? cmd.base : 0,
-                    right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? cmd.base : 0,
-                    bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
+        const target = [
+            {
+                left: isCol ? start + deltaCol : 0,
+                right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? start + deltaRow : 0,
+                bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const pasteTarget = [
+            {
+                left: isCol ? cmd.base : 0,
+                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? cmd.base : 0,
+                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        state.paste(pasteTarget, { selectTarget: true });
         const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = cmd.base;
         for (const element of toRemove) {
@@ -43809,30 +43908,26 @@ class InternalViewport {
         const { end } = this.getters.getColDimensions(sheetId, targetCol);
         const maxCol = this.getters.getNumberCols(sheetId);
         if (this.offsetX + this.offsetCorrectionX + this.viewportWidth < end) {
-            for (let col = this.left; this.offsetX + this.offsetCorrectionX + this.viewportWidth < end; col++) {
-                if (col > maxCol) {
-                    break;
-                }
-                if (this.getters.isColHidden(sheetId, col)) {
-                    continue;
-                }
-                this.offsetX = this.getters.getColDimensions(sheetId, col).end - this.offsetCorrectionX;
-                this.offsetScrollbarX = this.offsetX;
-                this.adjustViewportZoneX();
+            let finalTarget = targetCol;
+            while (this.getters.isColHidden(sheetId, finalTarget) && targetCol < maxCol) {
+                finalTarget++;
             }
+            const finalTargetEnd = this.getters.getColDimensions(sheetId, finalTarget).end;
+            const startIndex = this.searchHeaderIndex("COL", finalTargetEnd - this.viewportWidth - this.offsetCorrectionX, this.boundaries.left, true);
+            this.offsetX =
+                this.getters.getColDimensions(sheetId, startIndex).end - this.offsetCorrectionX;
+            this.offsetScrollbarX = this.offsetX;
+            this.adjustViewportZoneX();
         }
         else if (this.left > targetCol) {
-            for (let col = this.left; col >= targetCol; col--) {
-                if (col < 0) {
-                    break;
-                }
-                if (this.getters.isColHidden(sheetId, col)) {
-                    continue;
-                }
-                this.offsetX = this.getters.getColDimensions(sheetId, col).start - this.offsetCorrectionX;
-                this.offsetScrollbarX = this.offsetX;
-                this.adjustViewportZoneX();
+            let finalTarget = targetCol;
+            while (this.getters.isColHidden(sheetId, finalTarget) && targetCol > 0) {
+                finalTarget--;
             }
+            this.offsetX =
+                this.getters.getColDimensions(sheetId, finalTarget).start - this.offsetCorrectionX;
+            this.offsetScrollbarX = this.offsetX;
+            this.adjustViewportZoneX();
         }
     }
     adjustPositionY(targetRow) {
@@ -43840,30 +43935,26 @@ class InternalViewport {
         const { end } = this.getters.getRowDimensions(sheetId, targetRow);
         const maxRow = this.getters.getNumberRows(sheetId);
         if (this.offsetY + this.viewportHeight + this.offsetCorrectionY < end) {
-            for (let row = this.top; this.offsetY + this.viewportHeight + this.offsetCorrectionY < end; row++) {
-                if (row > maxRow) {
-                    break;
-                }
-                if (this.getters.isRowHidden(sheetId, row)) {
-                    continue;
-                }
-                this.offsetY = this.getters.getRowDimensions(sheetId, row).end - this.offsetCorrectionY;
-                this.offsetScrollbarY = this.offsetY;
-                this.adjustViewportZoneY();
+            let finalTarget = targetRow;
+            while (this.getters.isRowHidden(sheetId, finalTarget) && targetRow < maxRow) {
+                finalTarget++;
             }
+            const finalTargetEnd = this.getters.getRowDimensions(sheetId, finalTarget).end;
+            const startIndex = this.searchHeaderIndex("ROW", finalTargetEnd - this.viewportHeight - this.offsetCorrectionY, this.boundaries.top, true);
+            this.offsetY =
+                this.getters.getRowDimensions(sheetId, startIndex).end - this.offsetCorrectionY;
+            this.offsetScrollbarY = this.offsetY;
+            this.adjustViewportZoneY();
         }
         else if (this.top > targetRow) {
-            for (let row = this.top; row >= targetRow; row--) {
-                if (row < 0) {
-                    break;
-                }
-                if (this.getters.isRowHidden(sheetId, row)) {
-                    continue;
-                }
-                this.offsetY = this.getters.getRowDimensions(sheetId, row).start - this.offsetCorrectionY;
-                this.offsetScrollbarY = this.offsetY;
-                this.adjustViewportZoneY();
+            let finalTarget = targetRow;
+            while (this.getters.isRowHidden(sheetId, finalTarget) && targetRow > 0) {
+                finalTarget--;
             }
+            this.offsetY =
+                this.getters.getRowDimensions(sheetId, finalTarget).start - this.offsetCorrectionY;
+            this.offsetScrollbarY = this.offsetY;
+            this.adjustViewportZoneY();
         }
     }
     setViewportOffset(offsetX, offsetY) {
@@ -50602,6 +50693,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.6';
-__info__.date = '2023-09-12T11:43:54.243Z';
-__info__.hash = '5746355';
+__info__.version = '16.4.8';
+__info__.date = '2023-10-03T12:45:33.807Z';
+__info__.hash = 'c614d64';

package/dist/o-spreadsheet.d.ts

@@ -1897,8 +1897,6 @@ interface CopyCommand {
 }
 interface CutCommand {
     type: "CUT";
-    /** Zones to cut. If none were given, will copy the zones in the selection*/
-    cutTarget?: Zone[];
 }
 interface PasteCommand {
     type: "PASTE";