@odoo/o-spreadsheet 17.0.4 → 17.0.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.0.4
- * @date 2023-11-24T13:13:42.575Z
- * @hash 7346d0a
+ * @version 17.0.5
+ * @date 2023-12-05T09:51:44.657Z
+ * @hash 2480a5d
  */
 
 'use strict';
@@ -3389,8 +3389,10 @@ function convertInternalFormatToFormat(internalFormat) {
 const cellReference = new RegExp(/\$?([A-Z]{1,3})\$?([0-9]{1,7})/, "i");
 // Same as above, but matches the exact string (nothing before or after)
 const singleCellReference = new RegExp(/^\$?([A-Z]{1,3})\$?([0-9]{1,7})$/, "i");
-/** Reference of a column header (eg. A, AB) */
-const colHeader = new RegExp(/^([A-Z]{1,3})+$/, "i");
+/** Reference of a column header (eg. A, AB, $A) */
+const colHeader = new RegExp(/^\$?([A-Z]{1,3})+$/, "i");
+/** Reference of a row header (eg. 1, $1) */
+const rowHeader = new RegExp(/^\$?([0-9]{1,7})+$/, "i");
 /** Reference of a column (eg. A, $CA, Sheet1!B) */
 const colReference = new RegExp(/^\s*('.+'!|[^']+!)?\$?([A-Z]{1,3})$/, "i");
 /** Reference of a row (eg. 1, 59, Sheet1!9) */
@@ -3420,6 +3422,9 @@ function isRowReference(xc) {
 function isColHeader(str) {
     return colHeader.test(str);
 }
+function isRowHeader(str) {
+    return rowHeader.test(str);
+}
 /**
  * Return true if the given xc is the reference of a single cell,
  * without any specified sheet (e.g. A1)
@@ -4103,18 +4108,10 @@ class RangeImpl {
         if (isFullCol) {
             parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
             parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-            if (zone.left === zone.right) {
-                parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
-                parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-            }
         }
         if (isFullRow) {
             parts[0].colFixed = parts[0].colFixed || parts[1].colFixed;
             parts[1].colFixed = parts[0].colFixed || parts[1].colFixed;
-            if (zone.top === zone.bottom) {
-                parts[0].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-                parts[1].rowFixed = parts[0].rowFixed || parts[1].rowFixed;
-            }
         }
         return parts;
     }
@@ -4356,7 +4353,7 @@ function computeTextLinesHeight(textLineHeight, numberOfLines = 1) {
 function getDefaultCellHeight(ctx, cell, colSize) {
     if (!cell || !cell.content)
         return DEFAULT_CELL_HEIGHT;
-    const maxWidth = cell.style?.wrapping ? colSize - 2 * MIN_CELL_TEXT_MARGIN : undefined;
+    const maxWidth = cell.style?.wrapping === "wrap" ? colSize - 2 * MIN_CELL_TEXT_MARGIN : undefined;
     const numberOfLines = cell.isFormula
         ? 1
         : splitTextToWidth(ctx, cell.content, cell.style, maxWidth).length;
@@ -6251,10 +6248,6 @@ css /* scss */ `
 
     .o-error-tooltip-message {
       overflow: hidden;
-      display: -webkit-box; /* Limit to 3 lines */
-      -webkit-line-clamp: 3;
-      line-clamp: 3;
-      -webkit-box-orient: vertical;
     }
   }
 `;
@@ -6637,6 +6630,9 @@ function* iterateChildren(el) {
 function getOpenedMenus() {
     return Array.from(document.querySelectorAll(".o-spreadsheet .o-menu"));
 }
+function isMacOS() {
+    return navigator.userAgent.toUpperCase().indexOf("MAC") >= 0;
+}
 
 /**
  * Return the o-spreadsheet element position relative
@@ -28281,6 +28277,7 @@ class AbstractResizer extends owl.Component {
         draggerShadowThickness: 0,
         delta: 0,
         base: 0,
+        position: "before",
     });
     _computeHandleDisplay(ev) {
         const position = this._getEvOffset(ev);
@@ -28405,11 +28402,13 @@ class AbstractResizer extends owl.Component {
                     this.state.draggerLinePosition = dimensions.start;
                     this.state.draggerShadowPosition = dimensions.start;
                     this.state.base = elementIndex;
+                    this.state.position = "before";
                 }
                 else if (this._getSelectedZoneEnd() < elementIndex) {
                     this.state.draggerLinePosition = dimensions.end;
                     this.state.draggerShadowPosition = dimensions.end - this.state.draggerShadowThickness;
-                    this.state.base = elementIndex + 1;
+                    this.state.base = elementIndex;
+                    this.state.position = "after";
                 }
                 else {
                     this.state.draggerLinePosition = startDimensions.start;
@@ -28591,6 +28590,7 @@ class ColResizer extends AbstractResizer {
             dimension: "COL",
             base: this.state.base,
             elements,
+            position: this.state.position,
         });
         if (!result.isSuccessful && result.reasons.includes("WillRemoveExistingMerge" /* CommandResult.WillRemoveExistingMerge */)) {
             this.env.raiseError(MergeErrorMessage);
@@ -28764,6 +28764,7 @@ class RowResizer extends AbstractResizer {
             dimension: "ROW",
             base: this.state.base,
             elements,
+            position: this.state.position,
         });
         if (!result.isSuccessful && result.reasons.includes("WillRemoveExistingMerge" /* CommandResult.WillRemoveExistingMerge */)) {
             this.env.raiseError(MergeErrorMessage);
@@ -28871,8 +28872,8 @@ function useWheelHandler(handler) {
         return val * (deltaMode === 0 ? 1 : DEFAULT_CELL_HEIGHT);
     }
     const onMouseWheel = (ev) => {
-        const deltaX = normalize(ev.shiftKey ? ev.deltaY : ev.deltaX, ev.deltaMode);
-        const deltaY = normalize(ev.shiftKey ? ev.deltaX : ev.deltaY, ev.deltaMode);
+        const deltaX = normalize(ev.shiftKey && !isMacOS() ? ev.deltaY : ev.deltaX, ev.deltaMode);
+        const deltaY = normalize(ev.shiftKey && !isMacOS() ? ev.deltaX : ev.deltaY, ev.deltaMode);
         handler(deltaX, deltaY);
     };
     return onMouseWheel;
@@ -33326,7 +33327,7 @@ const machine = {
         SPACE: goTo(State.RightRef),
         NUMBER: goTo(State.Found),
         REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
-        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isColHeader(token.value) || isRowHeader(token.value)),
     },
     [State.RightColumnRef]: {
         SPACE: goTo(State.RightColumnRef),
@@ -33337,6 +33338,7 @@ const machine = {
         SPACE: goTo(State.RightRowRef),
         NUMBER: goTo(State.Found),
         REFERENCE: goTo(State.Found, (token) => isSingleCellReference(token.value)),
+        SYMBOL: goTo(State.Found, (token) => isRowHeader(token.value)),
     },
     [State.Found]: {},
 };
@@ -37318,7 +37320,16 @@ class HeaderVisibilityPlugin extends CorePlugin {
         return consecutiveIndexes;
     }
     getAllVisibleHeaders(sheetId, dimension) {
-        return range(0, this.hiddenHeaders[sheetId][dimension].length).filter((i) => !this.hiddenHeaders[sheetId][dimension][i]);
+        const headers = range(0, this.getters.getNumberHeaders(sheetId, dimension));
+        const foldedHeaders = [];
+        this.getters.getHeaderGroups(sheetId, dimension).forEach((group) => {
+            if (group.isFolded) {
+                foldedHeaders.push(...range(group.start, group.end + 1));
+            }
+        });
+        return headers.filter((i) => {
+            return !this.hiddenHeaders[sheetId][dimension][i] && !foldedHeaders.includes(i);
+        });
     }
     import(data) {
         for (let sheet of data.sheets) {
@@ -39778,10 +39789,13 @@ class CompilationParametersBuilder {
         if (evaluatedCell === undefined) {
             return { value: null, format: this.getters.getCell(position)?.format };
         }
+        if (evaluatedCell.type === CellValueType.error) {
+            throw evaluatedCell.error;
+        }
         return evaluatedCell;
     }
     getEvaluatedCellIfNotEmpty(position) {
-        const evaluatedCell = this.getEvaluatedCell(position);
+        const evaluatedCell = this.computeCell(position);
         if (evaluatedCell.type === CellValueType.empty) {
             const cell = this.getters.getCell(position);
             if (!cell || (!cell.isFormula && cell.content === "")) {
@@ -39790,13 +39804,6 @@ class CompilationParametersBuilder {
         }
         return evaluatedCell;
     }
-    getEvaluatedCell(position) {
-        const evaluatedCell = this.computeCell(position);
-        if (evaluatedCell.type === CellValueType.error) {
-            throw evaluatedCell.error;
-        }
-        return evaluatedCell;
-    }
     /**
      * Return the values of the cell(s) used in reference, but always in the format of a range even
      * if a single cell is referenced. It is a list of col values. This is useful for the formulas that describe parameters as
@@ -39819,7 +39826,11 @@ class CompilationParametersBuilder {
         const { top, left, bottom, right } = zone;
         const cacheKey = `${sheetId}-${top}-${left}-${bottom}-${right}`;
         if (cacheKey in this.rangeCache) {
-            return this.rangeCache[cacheKey];
+            const result = this.rangeCache[cacheKey];
+            if (result instanceof EvaluationError) {
+                throw result;
+            }
+            return result;
         }
         const height = _zone.bottom - _zone.top + 1;
         const width = _zone.right - _zone.left + 1;
@@ -39829,6 +39840,11 @@ class CompilationParametersBuilder {
             const colIndex = col - _zone.left;
             matrix[colIndex] = new Array(height);
             for (let row = _zone.top; row <= _zone.bottom; row++) {
+                const evaluatedCell = this.getEvaluatedCellIfNotEmpty({ sheetId, col, row });
+                if (evaluatedCell?.type === CellValueType.error) {
+                    this.rangeCache[cacheKey] = evaluatedCell.error;
+                    throw evaluatedCell.error;
+                }
                 const rowIndex = row - _zone.top;
                 matrix[colIndex][rowIndex] = this.readCell({ sheetId, col, row });
             }
@@ -41786,19 +41802,21 @@ class AutofillPlugin extends UIPlugin {
         let col = zone.left;
         let row = zone.bottom;
         if (col > 0) {
-            let left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
-            while (left.type !== CellValueType.empty) {
+            let leftPosition = { sheetId, col: col - 1, row };
+            while (this.getters.getEvaluatedCell(leftPosition).type !== CellValueType.empty ||
+                this.getters.getCell(leftPosition)?.content) {
                 row += 1;
-                left = this.getters.getEvaluatedCell({ sheetId, col: col - 1, row });
+                leftPosition = { sheetId, col: col - 1, row };
             }
         }
         if (row === zone.bottom) {
             col = zone.right;
             if (col <= this.getters.getNumberCols(sheetId)) {
-                let right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
-                while (right.type !== CellValueType.empty) {
+                let rightPosition = { sheetId, col: col + 1, row };
+                while (this.getters.getEvaluatedCell(rightPosition).type !== CellValueType.empty ||
+                    this.getters.getCell(rightPosition)?.content) {
                     row += 1;
-                    right = this.getters.getEvaluatedCell({ sheetId, col: col + 1, row });
+                    rightPosition = { sheetId, col: col + 1, row };
                 }
             }
         }
@@ -42790,6 +42808,7 @@ class Session extends EventBus {
     isReplayingInitialRevisions = false;
     processedRevisions = new Set();
     uuidGenerator = new UuidGenerator();
+    lastLocalOperation;
     /**
      * Manages the collaboration between multiple users on the same spreadsheet.
      * It can forward local state changes to other users to ensure they all eventually
@@ -42822,6 +42841,11 @@ class Session extends EventBus {
             return;
         const revision = new Revision(this.uuidGenerator.uuidv4(), this.clientId, commands, rootCommand, changes, Date.now());
         this.revisions.append(revision.id, revision);
+        // REQUEST_REDO just repeats the last operation, the
+        // last operation is still the same and should not change.
+        if (rootCommand.type !== "REQUEST_REDO") {
+            this.lastLocalOperation = revision;
+        }
         this.trigger("new-local-state-update", { id: revision.id });
         this.sendUpdateMessage({
             type: "REMOTE_REVISION",
@@ -42918,19 +42942,10 @@ class Session extends EventBus {
         return this.pendingMessages.length === 0;
     }
     /**
-     * Get the last local revision whose root command isn't in the given list of ignored commands
+     * Get the last local revision
      * */
-    getLastLocalNonEmptyRevision(ignoredRootCommands) {
-        const revisions = this.revisions.getRevertedExecution();
-        for (const rev of revisions) {
-            if (rev.rootCommand === "SNAPSHOT")
-                return undefined;
-            if (!rev.rootCommand || rev.rootCommand === "REMOTE")
-                continue;
-            if (!ignoredRootCommands.includes(rev.rootCommand?.type) && rev.commands.length)
-                return rev;
-        }
-        return undefined;
+    getLastLocalNonEmptyRevision() {
+        return this.lastLocalOperation;
     }
     _move(position) {
         // this method is debounced and might be called after the client
@@ -42990,7 +43005,7 @@ class Session extends EventBus {
                 break;
             case "REMOTE_REVISION":
                 const { clientId, commands, timestamp } = message;
-                const revision = new Revision(message.nextRevisionId, clientId, commands, "REMOTE", undefined, timestamp);
+                const revision = new Revision(message.nextRevisionId, clientId, commands, undefined, undefined, timestamp);
                 if (revision.clientId !== this.clientId) {
                     this.revisions.insert(revision.id, revision, message.serverRevisionId);
                     const pendingCommands = this.pendingMessages
@@ -43003,10 +43018,11 @@ class Session extends EventBus {
                 }
                 break;
             case "SNAPSHOT_CREATED": {
-                const revision = new Revision(message.nextRevisionId, "server", [], "SNAPSHOT", undefined, Date.now());
+                const revision = new Revision(message.nextRevisionId, "server", [], undefined, undefined, Date.now());
                 this.revisions.insert(revision.id, revision, message.serverRevisionId);
                 this.dropPendingHistoryMessages();
                 this.trigger("snapshot");
+                this.lastLocalOperation = undefined;
                 break;
             }
         }
@@ -45561,6 +45577,9 @@ class SelectionInputsManagerPlugin extends UIPlugin {
     // Other
     // ---------------------------------------------------------------------------
     initInput(id, initialRanges, inputHasSingleRange = false) {
+        if (this.inputs[id]) {
+            this.unfocus();
+        }
         this.inputs[id] = new SelectionInputPlugin(this.config, initialRanges, inputHasSingleRange);
         if (initialRanges.length === 0) {
             const input = this.inputs[id];
@@ -46359,7 +46378,7 @@ class HistoryPlugin extends UIPlugin {
      * Ignore standard undo/redo revisions (that are empty)
      */
     getPossibleRevisionToRepeat() {
-        return this.session.getLastLocalNonEmptyRevision(["REQUEST_REDO"]);
+        return this.session.getLastLocalNonEmptyRevision();
     }
 }
 
@@ -47144,6 +47163,10 @@ function setXcToReferenceType(xc, referenceType) {
             return xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
         case "colrow":
             indexOfNumber = xc.search(/[0-9]/);
+            if (indexOfNumber === -1 || indexOfNumber === 0) {
+                // no row number (eg. A) or no column (eg. 1)
+                return "$" + xc;
+            }
             xc = xc.slice(0, indexOfNumber) + "$" + xc.slice(indexOfNumber);
             return "$" + xc;
         case "none":
@@ -47914,6 +47937,12 @@ class FilterEvaluationPlugin extends UIPlugin {
                 break;
             case "HIDE_COLUMNS_ROWS":
             case "UNHIDE_COLUMNS_ROWS":
+            case "GROUP_HEADERS":
+            case "UNGROUP_HEADERS":
+            case "FOLD_HEADER_GROUP":
+            case "UNFOLD_HEADER_GROUP":
+            case "FOLD_ALL_HEADER_GROUPS":
+            case "UNFOLD_ALL_HEADER_GROUPS":
                 this.updateHiddenRows();
                 break;
             case "UPDATE_FILTER":
@@ -48615,7 +48644,7 @@ class GridSelectionPlugin extends UIPlugin {
             sheetId: cmd.sheetId,
             base: cmd.base,
             quantity: thickness,
-            position: "before",
+            position: cmd.position,
         });
         const isCol = cmd.dimension === "COL";
         const start = cmd.elements[0];
@@ -48632,12 +48661,13 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const base = isBasedBefore ? cmd.base : cmd.base + 1;
         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,
+                left: isCol ? base : 0,
+                right: isCol ? base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? base : 0,
+                bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
             },
         ];
         state.paste(pasteTarget, { selectTarget: true });
@@ -48672,6 +48702,11 @@ class GridSelectionPlugin extends UIPlugin {
             doesElementsHaveCommonMerges(id, cmd.base - 1, cmd.base)) {
             return "WillRemoveExistingMerge" /* CommandResult.WillRemoveExistingMerge */;
         }
+        const headers = [cmd.base, ...cmd.elements];
+        const maxHeaderValue = isCol ? this.getters.getNumberCols(id) : this.getters.getNumberRows(id);
+        if (headers.some((h) => h < 0 || h >= maxHeaderValue)) {
+            return "InvalidHeaderIndex" /* CommandResult.InvalidHeaderIndex */;
+        }
         return "Success" /* CommandResult.Success */;
     }
     //-------------------------------------------
@@ -49717,10 +49752,13 @@ class HeaderPositionsUIPlugin extends UIPlugin {
                 }
                 break;
             case "UPDATE_CELL":
-                if ("content" in cmd || "format" in cmd || cmd.style?.fontSize !== undefined) {
+                if ("content" in cmd || "format" in cmd) {
                     this.headerPositions = {};
                     this.isDirty = true;
                 }
+                else {
+                    this.headerPositions[cmd.sheetId] = this.computeHeaderPositionsOfSheet(cmd.sheetId);
+                }
                 break;
             case "UPDATE_FILTER":
             case "REMOVE_FILTER_TABLE":
@@ -51877,6 +51915,8 @@ css /* scss */ `
     *:before,
     *:after {
       box-sizing: content-box;
+      /** rtl not supported ATM */
+      direction: ltr;
     }
     .o-separator {
       border-bottom: ${MENU_SEPARATOR_BORDER_WIDTH}px solid ${SEPARATOR_COLOR};
@@ -55949,6 +55989,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.4";
-__info__.date = "2023-11-24T13:13:42.575Z";
-__info__.hash = "7346d0a";
+__info__.version = "17.0.5";
+__info__.date = "2023-12-05T09:51:44.657Z";
+__info__.hash = "2480a5d";

package/dist/o-spreadsheet.d.ts

@@ -776,7 +776,7 @@ interface TransportService<T = any> {
 }
 
 declare class Revision implements RevisionData {
-    readonly rootCommand?: Command | "SNAPSHOT" | "REMOTE" | undefined;
+    readonly rootCommand?: Command | undefined;
     readonly timestamp?: number | undefined;
     readonly id: UID;
     readonly clientId: ClientId;
@@ -791,7 +791,7 @@ declare class Revision implements RevisionData {
      *  - clientId: Client who initiated the action
      *  - changes: List of changes applied on the state.
      */
-    constructor(id: UID, clientId: ClientId, commands: readonly CoreCommand[], rootCommand?: Command | "SNAPSHOT" | "REMOTE" | undefined, changes?: readonly HistoryChange[], timestamp?: number | undefined);
+    constructor(id: UID, clientId: ClientId, commands: readonly CoreCommand[], rootCommand?: Command | undefined, changes?: readonly HistoryChange[], timestamp?: number | undefined);
     setChanges(changes: readonly HistoryChange[]): void;
     get commands(): readonly CoreCommand[];
     get changes(): readonly HistoryChange[];
@@ -820,6 +820,7 @@ declare class Session extends EventBus<CollaborativeEvent> {
     private isReplayingInitialRevisions;
     private processedRevisions;
     private uuidGenerator;
+    private lastLocalOperation;
     /**
      * Manages the collaboration between multiple users on the same spreadsheet.
      * It can forward local state changes to other users to ensure they all eventually
@@ -861,9 +862,9 @@ declare class Session extends EventBus<CollaborativeEvent> {
     getRevisionId(): UID;
     isFullySynchronized(): boolean;
     /**
-     * Get the last local revision whose root command isn't in the given list of ignored commands
+     * Get the last local revision
      * */
-    getLastLocalNonEmptyRevision(ignoredRootCommands: CommandTypes[]): Revision | undefined;
+    getLastLocalNonEmptyRevision(): Revision | undefined;
     private _move;
     /**
      * Handles messages received from other clients in the collaborative
@@ -1769,6 +1770,7 @@ interface MoveColumnsRowsCommand extends HeadersDependentCommand {
     type: "MOVE_COLUMNS_ROWS";
     base: HeaderIndex;
     elements: HeaderIndex[];
+    position: "before" | "after";
 }
 interface ResizeColumnsRowsCommand extends HeadersDependentCommand {
     type: "RESIZE_COLUMNS_ROWS";
@@ -7440,6 +7442,7 @@ interface ResizerState {
     draggerShadowThickness: number;
     delta: number;
     base: number;
+    position: "before" | "after";
 }
 interface ResizerProps {
     onOpenContextMenu: (type: ContextMenuType, x: Pixel, y: Pixel) => void;