npm - @odoo/o-spreadsheet - Versions diffs - 17.4.1 → 17.4.3 - Mend

@odoo/o-spreadsheet 17.4.1 → 17.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/o-spreadsheet.cjs.js +133 -108
package/dist/o-spreadsheet.d.ts +1 -0
package/dist/o-spreadsheet.esm.js +133 -108
package/dist/o-spreadsheet.iife.js +133 -108
package/dist/o-spreadsheet.iife.min.js +344 -334
package/dist/o_spreadsheet.xml +10 -7
package/package.json +5 -8

package/dist/o-spreadsheet.cjs.js CHANGED Viewed

@@ -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.4.1
- * @date 2024-07-18T14:25:54.421Z
- * @hash fd7deaa
+ * @version 17.4.3
+ * @date 2024-08-02T08:23:56.573Z
+ * @hash 40ecd1e
  */
 'use strict';
@@ -2767,13 +2767,16 @@ const wildcardToRegExp = memoize(function wildcardToRegExp(operand) {
     }
     return new RegExp("^" + exp + "$", "i");
 });
-function evaluatePredicate(value = "", criterion) {
+function evaluatePredicate(value = "", criterion, locale) {
     const { operator, operand } = criterion;
     if (operand === undefined || value === null || operand === null) {
         return false;
     }
     if (typeof operand === "number" && operator === "=") {
-        return value.toString() === operand.toString();
+        if (typeof value === "string" && (isNumber(value, locale) || isDateTime(value, locale))) {
+            return toNumber(value, locale) === operand;
+        }
+        return value === operand;
     }
     if (operator === "<>" || operator === "=") {
         let result;
@@ -2855,7 +2858,7 @@ function visitMatchingRanges(args, cb, locale, isQuery = false) {
             for (let k = 0; k < countArg - 1; k += 2) {
                 const criteriaValue = toMatrix(args[k])[i][j].value;
                 const criterion = predicates[k / 2];
-                validatedPredicates = evaluatePredicate(criteriaValue ?? undefined, criterion);
+                validatedPredicates = evaluatePredicate(criteriaValue ?? undefined, criterion, locale);
                 if (!validatedPredicates) {
                     break;
                 }
@@ -6546,6 +6549,9 @@ function toNormalizedPivotValue(dimension, groupValue) {
     const groupValueString = typeof groupValue === "boolean"
         ? toString(groupValue).toLocaleLowerCase()
         : toString(groupValue);
+    if (groupValueString === "null") {
+        return null;
+    }
     if (!pivotNormalizationValueRegistry.contains(dimension.type)) {
         throw new EvaluationError(_t("Field %(field)s is not supported because of its type (%(type)s)", {
             field: dimension.displayName,
@@ -6566,6 +6572,9 @@ function normalizeDateTime(value, granularity) {
     return pivotTimeAdapter(granularity).normalizeFunctionValue(value);
 }
 function toFunctionPivotValue(value, dimension) {
+    if (value === null) {
+        return `"null"`;
+    }
     if (!pivotToFunctionValueRegistry.contains(dimension.type)) {
         return `"${value}"`;
     }
@@ -20781,6 +20790,78 @@ function isCtrlKey(ev) {
     return isMacOS() ? ev.metaKey : ev.ctrlKey;
 }
+/**
+ * Return the o-spreadsheet element position relative
+ * to the browser viewport.
+ */
+function useSpreadsheetRect() {
+    const position = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
+    let spreadsheetElement = null;
+    function updatePosition() {
+        if (!spreadsheetElement) {
+            spreadsheetElement = document.querySelector(".o-spreadsheet");
+        }
+        if (spreadsheetElement) {
+            const { top, left, width, height } = spreadsheetElement.getBoundingClientRect();
+            position.x = left;
+            position.y = top;
+            position.width = width;
+            position.height = height;
+        }
+    }
+    owl.onMounted(updatePosition);
+    owl.onPatched(updatePosition);
+    return position;
+}
+/**
+ * Return the component (or ref's component) BoundingRect, relative
+ * to the upper left corner of the screen (<body> element).
+ *
+ * Note: when used with a <Portal/> component, it will
+ * return the portal position, not the teleported position.
+ */
+function useAbsoluteBoundingRect(ref) {
+    const rect = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
+    function updateElRect() {
+        const el = ref.el;
+        if (el === null) {
+            return;
+        }
+        const { top, left, width, height } = el.getBoundingClientRect();
+        rect.x = left;
+        rect.y = top;
+        rect.width = width;
+        rect.height = height;
+    }
+    owl.onMounted(updateElRect);
+    owl.onPatched(updateElRect);
+    return rect;
+}
+/**
+ * Get the rectangle inside which a popover should stay when being displayed.
+ * It's the value defined in `env.getPopoverContainerRect`, or the Rect of the "o-spreadsheet"
+ * element by default.
+ *
+ * Coordinates are expressed expressed as absolute DOM position.
+ */
+function usePopoverContainer() {
+    const container = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
+    const component = owl.useComponent();
+    const spreadsheetRect = useSpreadsheetRect();
+    function updateRect() {
+        const env = component.env;
+        const newRect = "getPopoverContainerRect" in env ? env.getPopoverContainerRect() : spreadsheetRect;
+        container.x = newRect.x;
+        container.y = newRect.y;
+        container.width = newRect.width;
+        container.height = newRect.height;
+    }
+    updateRect();
+    owl.onMounted(updateRect);
+    owl.onPatched(updateRect);
+    return container;
+}
 const arrowMap = {
     ArrowDown: "down",
     ArrowLeft: "left",
@@ -21370,7 +21451,9 @@ class Composer extends owl.Component {
         argToFocus: 0,
     });
     compositionActive = false;
+    spreadsheetRect = useSpreadsheetRect();
     get assistantStyle() {
+        const composerRect = this.composerRef.el.getBoundingClientRect();
         const assistantStyle = {};
         assistantStyle["min-width"] = `${this.props.rect?.width || ASSISTANT_WIDTH}px`;
         const proposals = this.autoCompleteState.provider?.proposals;
@@ -21397,6 +21480,9 @@ class Composer extends owl.Component {
         }
         else if (this.props.delimitation) {
             assistantStyle["max-height"] = `${this.props.delimitation.height}px`;
+            if (composerRect.left + ASSISTANT_WIDTH > this.spreadsheetRect.width) {
+                assistantStyle.right = `0px`;
+            }
         }
         return cssPropertiesToCss(assistantStyle);
     }
@@ -26239,78 +26325,6 @@ function zoneToRect(zone) {
     };
 }
-/**
- * Return the o-spreadsheet element position relative
- * to the browser viewport.
- */
-function useSpreadsheetRect() {
-    const position = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
-    let spreadsheetElement = null;
-    function updatePosition() {
-        if (!spreadsheetElement) {
-            spreadsheetElement = document.querySelector(".o-spreadsheet");
-        }
-        if (spreadsheetElement) {
-            const { top, left, width, height } = spreadsheetElement.getBoundingClientRect();
-            position.x = left;
-            position.y = top;
-            position.width = width;
-            position.height = height;
-        }
-    }
-    owl.onMounted(updatePosition);
-    owl.onPatched(updatePosition);
-    return position;
-}
-/**
- * Return the component (or ref's component) BoundingRect, relative
- * to the upper left corner of the screen (<body> element).
- *
- * Note: when used with a <Portal/> component, it will
- * return the portal position, not the teleported position.
- */
-function useAbsoluteBoundingRect(ref) {
-    const rect = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
-    function updateElRect() {
-        const el = ref.el;
-        if (el === null) {
-            return;
-        }
-        const { top, left, width, height } = el.getBoundingClientRect();
-        rect.x = left;
-        rect.y = top;
-        rect.width = width;
-        rect.height = height;
-    }
-    owl.onMounted(updateElRect);
-    owl.onPatched(updateElRect);
-    return rect;
-}
-/**
- * Get the rectangle inside which a popover should stay when being displayed.
- * It's the value defined in `env.getPopoverContainerRect`, or the Rect of the "o-spreadsheet"
- * element by default.
- *
- * Coordinates are expressed expressed as absolute DOM position.
- */
-function usePopoverContainer() {
-    const container = owl.useState({ x: 0, y: 0, width: 0, height: 0 });
-    const component = owl.useComponent();
-    const spreadsheetRect = useSpreadsheetRect();
-    function updateRect() {
-        const env = component.env;
-        const newRect = "getPopoverContainerRect" in env ? env.getPopoverContainerRect() : spreadsheetRect;
-        container.x = newRect.x;
-        container.y = newRect.y;
-        container.width = newRect.width;
-        container.height = newRect.height;
-    }
-    updateRect();
-    owl.onMounted(updateRect);
-    owl.onPatched(updateRect);
-    return container;
-}
 css /* scss */ `
   .o-popover {
     position: absolute;
@@ -35809,6 +35823,14 @@ css /* scss */ `
     .pivot-dim-operator-label {
       min-width: 120px;
     }
+    &.pivot-dimension-invalid {
+      background-color: #ffdddd;
+      border-color: red !important;
+      select {
+        background-color: #ffdddd;
+      }
+    }
   }
 `;
 class PivotDimension extends owl.Component {
@@ -35871,6 +35893,7 @@ class PivotLayoutConfigurator extends owl.Component {
             "__rows_title__",
             ...rows.map((row) => row.nameWithGranularity),
         ];
+        const allDimensions = columns.concat(rows);
         const offset = 1; // column title
         const draggableItems = draggableIds.map((id, index) => ({
             id,
@@ -35893,8 +35916,12 @@ class PivotLayoutConfigurator extends owl.Component {
                 const columns = draggedItems.slice(0, draggedItems.indexOf("__rows_title__"));
                 const rows = draggedItems.slice(draggedItems.indexOf("__rows_title__") + 1);
                 this.props.onDimensionsUpdated({
-                    columns: columns.map(parseDimension),
-                    rows: rows.map(parseDimension),
+                    columns: columns
+                        .map((nameWithGranularity) => allDimensions.find((dimension) => dimension.nameWithGranularity === nameWithGranularity))
+                        .filter(isDefined),
+                    rows: rows
+                        .map((nameWithGranularity) => allDimensions.find((dimension) => dimension.nameWithGranularity === nameWithGranularity))
+                        .filter(isDefined),
                 });
             },
         });
@@ -40207,10 +40234,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 };
@@ -47208,12 +47238,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;
@@ -51274,12 +51305,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);
                     }
                 }
             }
@@ -51289,7 +51315,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) {
@@ -51298,20 +51324,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);
         }
     }
     /**
@@ -51344,12 +51370,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);
                     }
                 }
             }
@@ -54115,6 +54136,9 @@ class Evaluator {
         if (!this.blockedArrayFormulas.has(position)) {
             this.invalidateSpreading(position);
         }
+        if (this.spreadingRelations.isArrayFormula(position)) {
+            this.spreadingRelations.removeNode(position);
+        }
         const cell = this.getters.getCell(position);
         if (cell === undefined) {
             return EMPTY_CELL;
@@ -54157,7 +54181,6 @@ class Evaluator {
         this.assertSheetHasEnoughSpaceToSpreadFormulaResult(formulaPosition, formulaReturn);
         const nbColumns = formulaReturn.length;
         const nbRows = formulaReturn[0].length;
-        this.spreadingRelations.removeNode(formulaPosition);
         forEachSpreadPositionInMatrix(nbColumns, nbRows, this.updateSpreadRelation(formulaPosition));
         this.assertNoMergedCellsInSpreadZone(formulaPosition, formulaReturn);
         forEachSpreadPositionInMatrix(nbColumns, nbRows, this.checkCollision(formulaPosition));
@@ -63082,6 +63105,8 @@ css /* scss */ `
     .o-sidePanel-handle-container {
       width: 8px;
+      position: fixed;
+      top: 50%;
     }
     .o-sidePanel-handle {
       cursor: col-resize;
@@ -65701,7 +65726,7 @@ function createEmptyStructure(node) {
 }
 class StateObserver {
-    changes = [];
+    changes;
     commands = [];
     /**
      * Record the changes which could happen in the given callback, save them in a
@@ -65733,7 +65758,7 @@ class StateObserver {
         if (value[key] === val) {
             return;
         }
-        this.changes.push({
+        this.changes?.push({
             key,
             target: value,
             before: value[key],
@@ -68399,6 +68424,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
-__info__.version = "17.4.1";
-__info__.date = "2024-07-18T14:25:54.421Z";
-__info__.hash = "fd7deaa";
+__info__.version = "17.4.3";
+__info__.date = "2024-08-02T08:23:56.573Z";
+__info__.hash = "40ecd1e";

package/dist/o-spreadsheet.d.ts CHANGED Viewed

@@ -7790,6 +7790,7 @@ declare class Composer extends Component<ComposerProps, SpreadsheetChildEnv> {
     autoCompleteState: Store<AutoCompleteStore>;
     functionDescriptionState: FunctionDescriptionState;
     private compositionActive;
+    private spreadsheetRect;
     get assistantStyle(): string;
     shouldProcessInputEvents: boolean;
     tokens: EnrichedToken[];