@odoo/o-spreadsheet 16.0.47 → 16.0.49

package/dist/o-spreadsheet.cjs.js

@@ -3346,7 +3346,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;
@@ -3359,6 +3359,7 @@ class DispatchResult {
         return this.reasons.includes(reason);
     }
 }
+const SUCCESS = new DispatchResult();
 exports.CommandResult = void 0;
 (function (CommandResult) {
     CommandResult[CommandResult["Success"] = 0] = "Success";
@@ -4086,8 +4087,8 @@ function isCtrlKey(ev) {
  * Return the o-spreadsheet element position relative
  * to the browser viewport.
  */
-function useSpreadsheetPosition() {
-    const position = owl.useState({ x: 0, y: 0 });
+function useSpreadsheetRect() {
+    const position = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
     let spreadsheetElement = document.querySelector(".o-spreadsheet");
     updatePosition();
     function updatePosition() {
@@ -4095,9 +4096,11 @@ function useSpreadsheetPosition() {
             spreadsheetElement = document.querySelector(".o-spreadsheet");
         }
         if (spreadsheetElement) {
-            const { top, left } = spreadsheetElement.getBoundingClientRect();
+            const { top, left, width, height } = spreadsheetElement.getBoundingClientRect();
             position.x = left;
             position.y = top;
+            position.width = width;
+            position.height = height;
         }
     }
     owl.onMounted(updatePosition);
@@ -4132,7 +4135,7 @@ function useAbsolutePosition(ref) {
 class Popover extends owl.Component {
     constructor() {
         super(...arguments);
-        this.spreadsheetPosition = useSpreadsheetPosition();
+        this.spreadsheetRect = useSpreadsheetRect();
     }
     get maxHeight() {
         return Math.max(0, this.viewportDimension.height - BOTTOMBAR_HEIGHT - SCROLLBAR_WIDTH);
@@ -4141,8 +4144,8 @@ class Popover extends owl.Component {
         // the props's position is expressed relative to the "body" element
         // but we teleport the element in ".o-spreadsheet" to keep everything
         // within our control and to avoid leaking into external DOM
-        const horizontalPosition = `left:${this.horizontalPosition() - this.spreadsheetPosition.x}`;
-        const verticalPosition = `top:${this.verticalPosition() - this.spreadsheetPosition.y}`;
+        const horizontalPosition = `left:${this.horizontalPosition() - this.spreadsheetRect.x}`;
+        const verticalPosition = `top:${this.verticalPosition() - this.spreadsheetRect.y}`;
         const maxHeight = this.maxHeight;
         const height = `max-height:${maxHeight}`;
         const shadow = maxHeight !== 0 ? "box-shadow: 1px 2px 5px 2px rgb(51 51 51 / 15%);" : "";
@@ -11375,7 +11378,7 @@ function getPredicate(descr, isQuery) {
             operand = descr;
         }
     }
-    if (isNumber(operand)) {
+    if (isNumber(operand) || isDateTime(operand)) {
         operand = toNumber(operand);
     }
     else if (operand === "TRUE" || operand === "FALSE") {
@@ -11423,7 +11426,10 @@ function evaluatePredicate(value = "", criterion) {
         return false;
     }
     if (typeof operand === "number" && operator === "=") {
-        return toString(value) === toString(operand);
+        if (typeof value === "string" && (isNumber(value) || isDateTime(value))) {
+            return toNumber(value) === operand;
+        }
+        return value === operand;
     }
     if (operator === "<>" || operator === "=") {
         let result;
@@ -20432,6 +20438,7 @@ class Composer extends owl.Component {
     constructor() {
         super(...arguments);
         this.composerRef = owl.useRef("o_composer");
+        this.spreadsheetRect = useSpreadsheetRect();
         this.contentHelper = new ContentEditableHelper(this.composerRef.el);
         this.composerState = owl.useState({
             positionStart: 0,
@@ -20467,24 +20474,28 @@ class Composer extends owl.Component {
         };
     }
     get assistantStyle() {
+        const composerRect = this.composerRef.el.getBoundingClientRect();
+        const assistantStyle = {
+            width: `${ASSISTANT_WIDTH}px`,
+        };
         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);
-            let assistantStyle = "";
             if (cellY > remainingHeight) {
                 // render top
-                assistantStyle += `
-          top: -8px;
-          transform: translate(0, -100%);
-        `;
+                assistantStyle.top = "-8px";
+                assistantStyle.transform = "translate(0, -100%)";
             }
             if (cellX + ASSISTANT_WIDTH > this.props.delimitation.width) {
                 // render left
-                assistantStyle += `right:0px;`;
+                assistantStyle.right = "0px";
             }
-            return (assistantStyle += `width:${ASSISTANT_WIDTH}px;`);
+            return cssPropertiesToCss(assistantStyle);
+        }
+        if (composerRect.left + ASSISTANT_WIDTH > this.spreadsheetRect.width) {
+            assistantStyle.right = "0px";
         }
-        return `width:${ASSISTANT_WIDTH}px;`;
+        return cssPropertiesToCss(assistantStyle);
     }
     setup() {
         owl.onMounted(() => {
@@ -21622,10 +21633,13 @@ function useCellHovered(env, gridRef, callback) {
         row: undefined,
     };
     const { Date } = window;
-    let x = 0;
-    let y = 0;
+    let x = undefined;
+    let y = undefined;
     let lastMoved = 0;
     function getPosition() {
+        if (x === undefined || y === undefined) {
+            return { col: -1, row: -1 };
+        }
         const col = env.model.getters.getColIndex(x);
         const row = env.model.getters.getRowIndex(y);
         return { col, row };
@@ -27465,12 +27479,13 @@ class BordersPlugin extends CorePlugin {
                 this.clearBorders(cmd.sheetId, cmd.target);
                 break;
             case "REMOVE_COLUMNS_ROWS":
-                for (let el of [...cmd.elements].sort((a, b) => b - a)) {
+                const elements = [...cmd.elements].sort((a, b) => b - a);
+                for (const group of groupConsecutive(elements)) {
                     if (cmd.dimension === "COL") {
-                        this.shiftBordersHorizontally(cmd.sheetId, el + 1, -1);
+                        this.shiftBordersHorizontally(cmd.sheetId, group[group.length - 1] + 1, -group.length);
                     }
                     else {
-                        this.shiftBordersVertically(cmd.sheetId, el + 1, -1);
+                        this.shiftBordersVertically(cmd.sheetId, group[group.length - 1] + 1, -group.length);
                     }
                 }
                 break;
@@ -30967,12 +30982,7 @@ class SheetPlugin extends CorePlugin {
                         });
                     }
                     if (colIndex > deletedColumn) {
-                        this.dispatch("UPDATE_CELL_POSITION", {
-                            sheetId: sheet.id,
-                            cellId: cellId,
-                            col: colIndex - 1,
-                            row: rowIndex,
-                        });
+                        this.setNewPosition(cellId, sheet.id, colIndex - 1, rowIndex);
                     }
                 }
             }
@@ -30982,7 +30992,7 @@ class SheetPlugin extends CorePlugin {
      * Move the cells after a column or rows insertion
      */
     moveCellsOnAddition(sheet, addedElement, quantity, dimension) {
-        const commands = [];
+        const updates = [];
         for (let rowIndex = 0; rowIndex < sheet.rows.length; rowIndex++) {
             const row = sheet.rows[rowIndex];
             if (dimension !== "rows" || rowIndex >= addedElement) {
@@ -30991,20 +31001,20 @@ class SheetPlugin extends CorePlugin {
                     const cellId = row.cells[i];
                     if (cellId) {
                         if (dimension === "rows" || colIndex >= addedElement) {
-                            commands.push({
-                                type: "UPDATE_CELL_POSITION",
+                            updates.push({
                                 sheetId: sheet.id,
                                 cellId: cellId,
                                 col: colIndex + (dimension === "columns" ? quantity : 0),
                                 row: rowIndex + (dimension === "rows" ? quantity : 0),
+                                type: "UPDATE_CELL_POSITION",
                             });
                         }
                     }
                 }
             }
         }
-        for (let cmd of commands.reverse()) {
-            this.dispatch(cmd.type, cmd);
+        for (let update of updates.reverse()) {
+            this.updateCellPosition(update);
         }
     }
     /**
@@ -31037,12 +31047,7 @@ class SheetPlugin extends CorePlugin {
                     const colIndex = Number(i);
                     const cellId = row.cells[i];
                     if (cellId) {
-                        this.dispatch("UPDATE_CELL_POSITION", {
-                            sheetId: sheet.id,
-                            cellId: cellId,
-                            col: colIndex,
-                            row: rowIndex - numberRows,
-                        });
+                        this.setNewPosition(cellId, sheet.id, colIndex, rowIndex - numberRows);
                     }
                 }
             }
@@ -43436,6 +43441,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.47';
-__info__.date = '2024-07-08T05:37:37.541Z';
-__info__.hash = 'f52ca6f';
+__info__.version = '16.0.49';
+__info__.date = '2024-08-02T08:18:43.387Z';
+__info__.hash = '97d415b';

package/dist/o-spreadsheet.d.ts

@@ -5287,7 +5287,7 @@ declare class Popover extends Component<Props$o, SpreadsheetChildEnv> {
         onMouseWheel: () => void;
         zIndex: ComponentsImportance;
     };
-    private spreadsheetPosition;
+    private spreadsheetRect;
     get maxHeight(): number;
     get style(): string;
     private get viewportDimension();
@@ -5574,6 +5574,7 @@ declare class Composer extends Component<ComposerProps, SpreadsheetChildEnv> {
         el: HTMLElement | null;
     };
     private autocompleteAPI?;
+    private spreadsheetRect;
     contentHelper: ContentEditableHelper;
     composerState: ComposerState$1;
     autoCompleteState: AutoCompleteState;

package/dist/o-spreadsheet.esm.js

@@ -3342,7 +3342,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;
@@ -3355,6 +3355,7 @@ class DispatchResult {
         return this.reasons.includes(reason);
     }
 }
+const SUCCESS = new DispatchResult();
 var CommandResult;
 (function (CommandResult) {
     CommandResult[CommandResult["Success"] = 0] = "Success";
@@ -4082,8 +4083,8 @@ function isCtrlKey(ev) {
  * Return the o-spreadsheet element position relative
  * to the browser viewport.
  */
-function useSpreadsheetPosition() {
-    const position = useState({ x: 0, y: 0 });
+function useSpreadsheetRect() {
+    const position = useState({ x: 0, y: 0, width: 0, height: 0 });
     let spreadsheetElement = document.querySelector(".o-spreadsheet");
     updatePosition();
     function updatePosition() {
@@ -4091,9 +4092,11 @@ function useSpreadsheetPosition() {
             spreadsheetElement = document.querySelector(".o-spreadsheet");
         }
         if (spreadsheetElement) {
-            const { top, left } = spreadsheetElement.getBoundingClientRect();
+            const { top, left, width, height } = spreadsheetElement.getBoundingClientRect();
             position.x = left;
             position.y = top;
+            position.width = width;
+            position.height = height;
         }
     }
     onMounted(updatePosition);
@@ -4128,7 +4131,7 @@ function useAbsolutePosition(ref) {
 class Popover extends Component {
     constructor() {
         super(...arguments);
-        this.spreadsheetPosition = useSpreadsheetPosition();
+        this.spreadsheetRect = useSpreadsheetRect();
     }
     get maxHeight() {
         return Math.max(0, this.viewportDimension.height - BOTTOMBAR_HEIGHT - SCROLLBAR_WIDTH);
@@ -4137,8 +4140,8 @@ class Popover extends Component {
         // the props's position is expressed relative to the "body" element
         // but we teleport the element in ".o-spreadsheet" to keep everything
         // within our control and to avoid leaking into external DOM
-        const horizontalPosition = `left:${this.horizontalPosition() - this.spreadsheetPosition.x}`;
-        const verticalPosition = `top:${this.verticalPosition() - this.spreadsheetPosition.y}`;
+        const horizontalPosition = `left:${this.horizontalPosition() - this.spreadsheetRect.x}`;
+        const verticalPosition = `top:${this.verticalPosition() - this.spreadsheetRect.y}`;
         const maxHeight = this.maxHeight;
         const height = `max-height:${maxHeight}`;
         const shadow = maxHeight !== 0 ? "box-shadow: 1px 2px 5px 2px rgb(51 51 51 / 15%);" : "";
@@ -11371,7 +11374,7 @@ function getPredicate(descr, isQuery) {
             operand = descr;
         }
     }
-    if (isNumber(operand)) {
+    if (isNumber(operand) || isDateTime(operand)) {
         operand = toNumber(operand);
     }
     else if (operand === "TRUE" || operand === "FALSE") {
@@ -11419,7 +11422,10 @@ function evaluatePredicate(value = "", criterion) {
         return false;
     }
     if (typeof operand === "number" && operator === "=") {
-        return toString(value) === toString(operand);
+        if (typeof value === "string" && (isNumber(value) || isDateTime(value))) {
+            return toNumber(value) === operand;
+        }
+        return value === operand;
     }
     if (operator === "<>" || operator === "=") {
         let result;
@@ -20428,6 +20434,7 @@ class Composer extends Component {
     constructor() {
         super(...arguments);
         this.composerRef = useRef("o_composer");
+        this.spreadsheetRect = useSpreadsheetRect();
         this.contentHelper = new ContentEditableHelper(this.composerRef.el);
         this.composerState = useState({
             positionStart: 0,
@@ -20463,24 +20470,28 @@ class Composer extends Component {
         };
     }
     get assistantStyle() {
+        const composerRect = this.composerRef.el.getBoundingClientRect();
+        const assistantStyle = {
+            width: `${ASSISTANT_WIDTH}px`,
+        };
         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);
-            let assistantStyle = "";
             if (cellY > remainingHeight) {
                 // render top
-                assistantStyle += `
-          top: -8px;
-          transform: translate(0, -100%);
-        `;
+                assistantStyle.top = "-8px";
+                assistantStyle.transform = "translate(0, -100%)";
             }
             if (cellX + ASSISTANT_WIDTH > this.props.delimitation.width) {
                 // render left
-                assistantStyle += `right:0px;`;
+                assistantStyle.right = "0px";
             }
-            return (assistantStyle += `width:${ASSISTANT_WIDTH}px;`);
+            return cssPropertiesToCss(assistantStyle);
+        }
+        if (composerRect.left + ASSISTANT_WIDTH > this.spreadsheetRect.width) {
+            assistantStyle.right = "0px";
         }
-        return `width:${ASSISTANT_WIDTH}px;`;
+        return cssPropertiesToCss(assistantStyle);
     }
     setup() {
         onMounted(() => {
@@ -21618,10 +21629,13 @@ function useCellHovered(env, gridRef, callback) {
         row: undefined,
     };
     const { Date } = window;
-    let x = 0;
-    let y = 0;
+    let x = undefined;
+    let y = undefined;
     let lastMoved = 0;
     function getPosition() {
+        if (x === undefined || y === undefined) {
+            return { col: -1, row: -1 };
+        }
         const col = env.model.getters.getColIndex(x);
         const row = env.model.getters.getRowIndex(y);
         return { col, row };
@@ -27461,12 +27475,13 @@ class BordersPlugin extends CorePlugin {
                 this.clearBorders(cmd.sheetId, cmd.target);
                 break;
             case "REMOVE_COLUMNS_ROWS":
-                for (let el of [...cmd.elements].sort((a, b) => b - a)) {
+                const elements = [...cmd.elements].sort((a, b) => b - a);
+                for (const group of groupConsecutive(elements)) {
                     if (cmd.dimension === "COL") {
-                        this.shiftBordersHorizontally(cmd.sheetId, el + 1, -1);
+                        this.shiftBordersHorizontally(cmd.sheetId, group[group.length - 1] + 1, -group.length);
                     }
                     else {
-                        this.shiftBordersVertically(cmd.sheetId, el + 1, -1);
+                        this.shiftBordersVertically(cmd.sheetId, group[group.length - 1] + 1, -group.length);
                     }
                 }
                 break;
@@ -30963,12 +30978,7 @@ class SheetPlugin extends CorePlugin {
                         });
                     }
                     if (colIndex > deletedColumn) {
-                        this.dispatch("UPDATE_CELL_POSITION", {
-                            sheetId: sheet.id,
-                            cellId: cellId,
-                            col: colIndex - 1,
-                            row: rowIndex,
-                        });
+                        this.setNewPosition(cellId, sheet.id, colIndex - 1, rowIndex);
                     }
                 }
             }
@@ -30978,7 +30988,7 @@ class SheetPlugin extends CorePlugin {
      * Move the cells after a column or rows insertion
      */
     moveCellsOnAddition(sheet, addedElement, quantity, dimension) {
-        const commands = [];
+        const updates = [];
         for (let rowIndex = 0; rowIndex < sheet.rows.length; rowIndex++) {
             const row = sheet.rows[rowIndex];
             if (dimension !== "rows" || rowIndex >= addedElement) {
@@ -30987,20 +30997,20 @@ class SheetPlugin extends CorePlugin {
                     const cellId = row.cells[i];
                     if (cellId) {
                         if (dimension === "rows" || colIndex >= addedElement) {
-                            commands.push({
-                                type: "UPDATE_CELL_POSITION",
+                            updates.push({
                                 sheetId: sheet.id,
                                 cellId: cellId,
                                 col: colIndex + (dimension === "columns" ? quantity : 0),
                                 row: rowIndex + (dimension === "rows" ? quantity : 0),
+                                type: "UPDATE_CELL_POSITION",
                             });
                         }
                     }
                 }
             }
         }
-        for (let cmd of commands.reverse()) {
-            this.dispatch(cmd.type, cmd);
+        for (let update of updates.reverse()) {
+            this.updateCellPosition(update);
         }
     }
     /**
@@ -31033,12 +31043,7 @@ class SheetPlugin extends CorePlugin {
                     const colIndex = Number(i);
                     const cellId = row.cells[i];
                     if (cellId) {
-                        this.dispatch("UPDATE_CELL_POSITION", {
-                            sheetId: sheet.id,
-                            cellId: cellId,
-                            col: colIndex,
-                            row: rowIndex - numberRows,
-                        });
+                        this.setNewPosition(cellId, sheet.id, colIndex, rowIndex - numberRows);
                     }
                 }
             }
@@ -43404,6 +43409,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, cellTypes, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.0.47';
-__info__.date = '2024-07-08T05:37:37.541Z';
-__info__.hash = 'f52ca6f';
+__info__.version = '16.0.49';
+__info__.date = '2024-08-02T08:18:43.387Z';
+__info__.hash = '97d415b';