@odoo/o-spreadsheet 17.4.0 → 17.4.2

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.4.0
- * @date 2024-07-12T04:41:51.675Z
- * @hash f8e8543
+ * @version 17.4.2
+ * @date 2024-07-24T10:26:00.237Z
+ * @hash f5ede5b
  */
 
 'use strict';
@@ -2724,7 +2724,7 @@ function getPredicate(descr, locale) {
             operand = descr;
         }
     }
-    if (isNumber(operand, locale)) {
+    if (isNumber(operand, locale) || isDateTime(operand, locale)) {
         operand = toNumber(operand, locale);
     }
     else if (operand === "TRUE" || operand === "FALSE") {
@@ -35871,6 +35871,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 +35894,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),
                 });
             },
         });
@@ -35974,9 +35979,15 @@ class PivotLayoutConfigurator extends owl.Component {
     addMeasureDimension(fieldName) {
         const { measures } = this.props.definition;
         this.props.onDimensionsUpdated({
-            measures: measures.concat([{ name: fieldName }]),
+            measures: measures.concat([
+                { name: fieldName, aggregator: this.getDefaultMeasureAggregator(fieldName) },
+            ]),
         });
     }
+    getDefaultMeasureAggregator(fieldName) {
+        const field = this.props.unusedMeasureFields.find((f) => f.name === fieldName);
+        return field?.aggregator ? field.aggregator : "count";
+    }
     updateAggregator(updatedMeasure, aggregator) {
         const { measures } = this.props.definition;
         this.props.onDimensionsUpdated({
@@ -36200,7 +36211,7 @@ function createMeasure(fields, measure) {
     const field = name === "__count"
         ? { name: "__count", string: _t("Count"), type: "integer", aggregator: "sum" }
         : fields[name];
-    const aggregator = measure.aggregator || field?.aggregator;
+    const aggregator = measure.aggregator;
     return {
         nameWithAggregator: name + (aggregator ? `:${aggregator}` : ""),
         /**
@@ -36936,7 +36947,7 @@ class SpreadsheetPivot {
             .map((value) => value[measure])
             .filter((cell) => cell && cell.type !== CellValueType.empty)
             .filter(isDefined);
-        const aggregator = this.getMeasure(measure).aggregator || "count";
+        const aggregator = this.getMeasure(measure).aggregator;
         const operator = AGGREGATORS_FN[aggregator];
         if (!operator) {
             throw new Error(`Aggregator ${aggregator} does not exist`);
@@ -40201,10 +40212,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 };
@@ -54204,9 +54218,9 @@ class Evaluator {
     assertNoMergedCellsInSpreadZone({ sheetId, col, row }, matrixResult) {
         const mergedCells = this.getters.getMergesInZone(sheetId, {
             top: row,
-            bottom: row + matrixResult.length,
+            bottom: row + matrixResult[0].length - 1,
             left: col,
-            right: col + matrixResult[0].length,
+            right: col + matrixResult.length - 1,
         });
         if (mergedCells.length === 0) {
             return;
@@ -68393,6 +68407,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.4.0";
-__info__.date = "2024-07-12T04:41:51.675Z";
-__info__.hash = "f8e8543";
+__info__.version = "17.4.2";
+__info__.date = "2024-07-24T10:26:00.237Z";
+__info__.hash = "f5ede5b";

package/dist/o-spreadsheet.d.ts

@@ -531,7 +531,7 @@ interface PivotCoreDimension {
 }
 interface PivotCoreMeasure {
     name: string;
-    aggregator?: Aggregator | string;
+    aggregator: Aggregator | string;
 }
 interface CommonPivotCoreDefinition {
     columns: PivotCoreDimension[];
@@ -9354,6 +9354,7 @@ declare class PivotLayoutConfigurator extends Component<Props$d, SpreadsheetChil
     addColumnDimension(fieldName: string): void;
     addRowDimension(fieldName: string): void;
     addMeasureDimension(fieldName: string): void;
+    private getDefaultMeasureAggregator;
     updateAggregator(updatedMeasure: PivotMeasure, aggregator: string): void;
     updateOrder(updateDimension: PivotDimension$1, order?: "asc" | "desc"): void;
     updateGranularity(dimension: PivotDimension$1, granularity: Granularity): void;

package/dist/o-spreadsheet.esm.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.4.0
- * @date 2024-07-12T04:41:51.675Z
- * @hash f8e8543
+ * @version 17.4.2
+ * @date 2024-07-24T10:26:00.237Z
+ * @hash f5ede5b
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -2722,7 +2722,7 @@ function getPredicate(descr, locale) {
             operand = descr;
         }
     }
-    if (isNumber(operand, locale)) {
+    if (isNumber(operand, locale) || isDateTime(operand, locale)) {
         operand = toNumber(operand, locale);
     }
     else if (operand === "TRUE" || operand === "FALSE") {
@@ -35869,6 +35869,7 @@ class PivotLayoutConfigurator extends 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,
@@ -35891,8 +35892,12 @@ class PivotLayoutConfigurator extends 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),
                 });
             },
         });
@@ -35972,9 +35977,15 @@ class PivotLayoutConfigurator extends Component {
     addMeasureDimension(fieldName) {
         const { measures } = this.props.definition;
         this.props.onDimensionsUpdated({
-            measures: measures.concat([{ name: fieldName }]),
+            measures: measures.concat([
+                { name: fieldName, aggregator: this.getDefaultMeasureAggregator(fieldName) },
+            ]),
         });
     }
+    getDefaultMeasureAggregator(fieldName) {
+        const field = this.props.unusedMeasureFields.find((f) => f.name === fieldName);
+        return field?.aggregator ? field.aggregator : "count";
+    }
     updateAggregator(updatedMeasure, aggregator) {
         const { measures } = this.props.definition;
         this.props.onDimensionsUpdated({
@@ -36198,7 +36209,7 @@ function createMeasure(fields, measure) {
     const field = name === "__count"
         ? { name: "__count", string: _t("Count"), type: "integer", aggregator: "sum" }
         : fields[name];
-    const aggregator = measure.aggregator || field?.aggregator;
+    const aggregator = measure.aggregator;
     return {
         nameWithAggregator: name + (aggregator ? `:${aggregator}` : ""),
         /**
@@ -36934,7 +36945,7 @@ class SpreadsheetPivot {
             .map((value) => value[measure])
             .filter((cell) => cell && cell.type !== CellValueType.empty)
             .filter(isDefined);
-        const aggregator = this.getMeasure(measure).aggregator || "count";
+        const aggregator = this.getMeasure(measure).aggregator;
         const operator = AGGREGATORS_FN[aggregator];
         if (!operator) {
             throw new Error(`Aggregator ${aggregator} does not exist`);
@@ -40199,10 +40210,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 };
@@ -54202,9 +54216,9 @@ class Evaluator {
     assertNoMergedCellsInSpreadZone({ sheetId, col, row }, matrixResult) {
         const mergedCells = this.getters.getMergesInZone(sheetId, {
             top: row,
-            bottom: row + matrixResult.length,
+            bottom: row + matrixResult[0].length - 1,
             left: col,
-            right: col + matrixResult[0].length,
+            right: col + matrixResult.length - 1,
         });
         if (mergedCells.length === 0) {
             return;
@@ -68348,6 +68362,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "17.4.0";
-__info__.date = "2024-07-12T04:41:51.675Z";
-__info__.hash = "f8e8543";
+__info__.version = "17.4.2";
+__info__.date = "2024-07-24T10:26:00.237Z";
+__info__.hash = "f5ede5b";

package/dist/o-spreadsheet.iife.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.4.0
- * @date 2024-07-12T04:41:51.675Z
- * @hash f8e8543
+ * @version 17.4.2
+ * @date 2024-07-24T10:26:00.237Z
+ * @hash f5ede5b
  */
 
 (function (exports, owl) {
@@ -2723,7 +2723,7 @@
               operand = descr;
           }
       }
-      if (isNumber(operand, locale)) {
+      if (isNumber(operand, locale) || isDateTime(operand, locale)) {
           operand = toNumber(operand, locale);
       }
       else if (operand === "TRUE" || operand === "FALSE") {
@@ -35870,6 +35870,7 @@ stores.inject(MyMetaStore, storeInstance);
               "__rows_title__",
               ...rows.map((row) => row.nameWithGranularity),
           ];
+          const allDimensions = columns.concat(rows);
           const offset = 1; // column title
           const draggableItems = draggableIds.map((id, index) => ({
               id,
@@ -35892,8 +35893,12 @@ stores.inject(MyMetaStore, storeInstance);
                   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),
                   });
               },
           });
@@ -35973,9 +35978,15 @@ stores.inject(MyMetaStore, storeInstance);
       addMeasureDimension(fieldName) {
           const { measures } = this.props.definition;
           this.props.onDimensionsUpdated({
-              measures: measures.concat([{ name: fieldName }]),
+              measures: measures.concat([
+                  { name: fieldName, aggregator: this.getDefaultMeasureAggregator(fieldName) },
+              ]),
           });
       }
+      getDefaultMeasureAggregator(fieldName) {
+          const field = this.props.unusedMeasureFields.find((f) => f.name === fieldName);
+          return field?.aggregator ? field.aggregator : "count";
+      }
       updateAggregator(updatedMeasure, aggregator) {
           const { measures } = this.props.definition;
           this.props.onDimensionsUpdated({
@@ -36199,7 +36210,7 @@ stores.inject(MyMetaStore, storeInstance);
       const field = name === "__count"
           ? { name: "__count", string: _t("Count"), type: "integer", aggregator: "sum" }
           : fields[name];
-      const aggregator = measure.aggregator || field?.aggregator;
+      const aggregator = measure.aggregator;
       return {
           nameWithAggregator: name + (aggregator ? `:${aggregator}` : ""),
           /**
@@ -36935,7 +36946,7 @@ stores.inject(MyMetaStore, storeInstance);
               .map((value) => value[measure])
               .filter((cell) => cell && cell.type !== CellValueType.empty)
               .filter(isDefined);
-          const aggregator = this.getMeasure(measure).aggregator || "count";
+          const aggregator = this.getMeasure(measure).aggregator;
           const operator = AGGREGATORS_FN[aggregator];
           if (!operator) {
               throw new Error(`Aggregator ${aggregator} does not exist`);
@@ -40200,10 +40211,13 @@ stores.inject(MyMetaStore, storeInstance);
           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 };
@@ -54203,9 +54217,9 @@ stores.inject(MyMetaStore, storeInstance);
       assertNoMergedCellsInSpreadZone({ sheetId, col, row }, matrixResult) {
           const mergedCells = this.getters.getMergesInZone(sheetId, {
               top: row,
-              bottom: row + matrixResult.length,
+              bottom: row + matrixResult[0].length - 1,
               left: col,
-              right: col + matrixResult[0].length,
+              right: col + matrixResult.length - 1,
           });
           if (mergedCells.length === 0) {
               return;
@@ -68392,9 +68406,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.4.0";
-  __info__.date = "2024-07-12T04:41:51.675Z";
-  __info__.hash = "f8e8543";
+  __info__.version = "17.4.2";
+  __info__.date = "2024-07-24T10:26:00.237Z";
+  __info__.hash = "f5ede5b";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);