@odoo/o-spreadsheet 17.2.19 → 17.2.20

package/dist/o-spreadsheet.cjs.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.19
- * @date 2024-08-02T08:22:56.367Z
- * @hash c5ae261
+ * @version 17.2.20
+ * @date 2024-08-09T12:24:12.002Z
+ * @hash d667a15
  */
 
 'use strict';
@@ -44140,7 +44140,7 @@ class RangeAdapter {
      * @param sheetXC the string description of a range, in the form SheetName!XC:XC
      */
     getRangeFromSheetXC(defaultSheetId, sheetXC) {
-        if (!rangeReference.test(sheetXC)) {
+        if (!rangeReference.test(sheetXC) || !this.getters.tryGetSheet(defaultSheetId)) {
             return new RangeImpl({
                 sheetId: "",
                 zone: { left: -1, top: -1, right: -1, bottom: -1 },
@@ -47729,18 +47729,23 @@ class Evaluator {
         this.evaluatedCells = new PositionMap();
         this.evaluate(this.getAllCells());
     }
-    evaluateFormula(sheetId, formulaString) {
-        const compiledFormula = compile(formulaString);
-        const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-        this.updateCompilationParameters();
-        const result = updateEvalContextAndExecute({ ...compiledFormula, dependencies: ranges }, this.compilationParams, sheetId);
-        if (isMatrix(result)) {
-            return matrixMap(result, (cell) => cell.value);
+    evaluateFormulaResult(sheetId, formulaString) {
+        try {
+            const compiledFormula = compile(formulaString);
+            const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
+            this.updateCompilationParameters();
+            const result = updateEvalContextAndExecute({ ...compiledFormula, dependencies: ranges }, this.compilationParams, sheetId);
+            if (isMatrix(result)) {
+                return result;
+            }
+            if (result.value === null) {
+                return { value: 0, format: result.format };
+            }
+            return result;
         }
-        if (result.value === null) {
-            return 0;
+        catch (error) {
+            return handleError(error, "");
         }
-        return result.value;
     }
     getAllCells() {
         const positions = this.createEmptyPositionSet();
@@ -48084,6 +48089,7 @@ function updateEvalContextAndExecute(compiledFormula, compilationParams, sheetId
 class EvaluationPlugin extends UIPlugin {
     static getters = [
         "evaluateFormula",
+        "evaluateFormulaResult",
         "getCorrespondingFormulaCell",
         "getRangeFormattedValues",
         "getRangeValues",
@@ -48146,12 +48152,14 @@ class EvaluationPlugin extends UIPlugin {
     // Getters
     // ---------------------------------------------------------------------------
     evaluateFormula(sheetId, formulaString) {
-        try {
-            return this.evaluator.evaluateFormula(sheetId, formulaString);
-        }
-        catch (error) {
-            return error.value || CellErrorType.GenericError;
+        const result = this.evaluateFormulaResult(sheetId, formulaString);
+        if (isMatrix(result)) {
+            return matrixMap(result, (cell) => cell.value);
         }
+        return result.value;
+    }
+    evaluateFormulaResult(sheetId, formulaString) {
+        return this.evaluator.evaluateFormulaResult(sheetId, formulaString);
     }
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
@@ -51010,6 +51018,7 @@ class FormatPlugin extends UIPlugin {
      * evaluated and updated with the number type.
      */
     setDecimal(sheetId, zones, step) {
+        const positionsByFormat = {};
         // Find the each cell with a number value and get the format
         for (const zone of zones) {
             for (const position of positions(zone)) {
@@ -51019,15 +51028,20 @@ class FormatPlugin extends UIPlugin {
                     // of the format
                     this.getters.getLocale();
                     const newFormat = changeDecimalPlaces(numberFormat, step);
-                    // Apply the new format on the whole zone
-                    this.dispatch("SET_FORMATTING", {
-                        sheetId,
-                        target: [positionToZone(position)],
-                        format: newFormat,
-                    });
+                    positionsByFormat[newFormat] = positionsByFormat[newFormat] || [];
+                    positionsByFormat[newFormat].push(position);
                 }
             }
         }
+        // consolidate all positions with the same format in bigger zones
+        for (const newFormat in positionsByFormat) {
+            const zones = futureRecomputeZones(positionsByFormat[newFormat].map((position) => positionToZone(position)));
+            this.dispatch("SET_FORMATTING", {
+                sheetId,
+                format: newFormat,
+                target: zones,
+            });
+        }
     }
     /**
      * Take a range of cells and return the format of the first cell containing a
@@ -60885,6 +60899,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.19";
-__info__.date = "2024-08-02T08:22:56.367Z";
-__info__.hash = "c5ae261";
+__info__.version = "17.2.20";
+__info__.date = "2024-08-09T12:24:12.002Z";
+__info__.hash = "d667a15";

package/dist/o-spreadsheet.d.ts

@@ -3559,7 +3559,7 @@ declare class UIPlugin<State = any> extends BasePlugin<State, Command> {
 }
 
 declare class EvaluationPlugin extends UIPlugin {
-    static getters: readonly ["evaluateFormula", "getCorrespondingFormulaCell", "getRangeFormattedValues", "getRangeValues", "getRangeFormats", "getEvaluatedCell", "getEvaluatedCells", "getEvaluatedCellsInZone", "getSpreadPositionsOf", "getArrayFormulaSpreadingOn", "isEmpty"];
+    static getters: readonly ["evaluateFormula", "evaluateFormulaResult", "getCorrespondingFormulaCell", "getRangeFormattedValues", "getRangeValues", "getRangeFormats", "getEvaluatedCell", "getEvaluatedCells", "getEvaluatedCellsInZone", "getSpreadPositionsOf", "getArrayFormulaSpreadingOn", "isEmpty"];
     private shouldRebuildDependenciesGraph;
     private evaluator;
     private positionsToUpdate;
@@ -3568,6 +3568,7 @@ declare class EvaluationPlugin extends UIPlugin {
     handle(cmd: CoreViewCommand): void;
     finalize(): void;
     evaluateFormula(sheetId: UID, formulaString: string): CellValue | Matrix<CellValue>;
+    evaluateFormulaResult(sheetId: UID, formulaString: string): Matrix<FPayload> | FPayload;
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
      */

package/dist/o-spreadsheet.esm.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.19
- * @date 2024-08-02T08:22:56.367Z
- * @hash c5ae261
+ * @version 17.2.20
+ * @date 2024-08-09T12:24:12.002Z
+ * @hash d667a15
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw } from '@odoo/owl';
@@ -44138,7 +44138,7 @@ class RangeAdapter {
      * @param sheetXC the string description of a range, in the form SheetName!XC:XC
      */
     getRangeFromSheetXC(defaultSheetId, sheetXC) {
-        if (!rangeReference.test(sheetXC)) {
+        if (!rangeReference.test(sheetXC) || !this.getters.tryGetSheet(defaultSheetId)) {
             return new RangeImpl({
                 sheetId: "",
                 zone: { left: -1, top: -1, right: -1, bottom: -1 },
@@ -47727,18 +47727,23 @@ class Evaluator {
         this.evaluatedCells = new PositionMap();
         this.evaluate(this.getAllCells());
     }
-    evaluateFormula(sheetId, formulaString) {
-        const compiledFormula = compile(formulaString);
-        const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-        this.updateCompilationParameters();
-        const result = updateEvalContextAndExecute({ ...compiledFormula, dependencies: ranges }, this.compilationParams, sheetId);
-        if (isMatrix(result)) {
-            return matrixMap(result, (cell) => cell.value);
+    evaluateFormulaResult(sheetId, formulaString) {
+        try {
+            const compiledFormula = compile(formulaString);
+            const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
+            this.updateCompilationParameters();
+            const result = updateEvalContextAndExecute({ ...compiledFormula, dependencies: ranges }, this.compilationParams, sheetId);
+            if (isMatrix(result)) {
+                return result;
+            }
+            if (result.value === null) {
+                return { value: 0, format: result.format };
+            }
+            return result;
         }
-        if (result.value === null) {
-            return 0;
+        catch (error) {
+            return handleError(error, "");
         }
-        return result.value;
     }
     getAllCells() {
         const positions = this.createEmptyPositionSet();
@@ -48082,6 +48087,7 @@ function updateEvalContextAndExecute(compiledFormula, compilationParams, sheetId
 class EvaluationPlugin extends UIPlugin {
     static getters = [
         "evaluateFormula",
+        "evaluateFormulaResult",
         "getCorrespondingFormulaCell",
         "getRangeFormattedValues",
         "getRangeValues",
@@ -48144,12 +48150,14 @@ class EvaluationPlugin extends UIPlugin {
     // Getters
     // ---------------------------------------------------------------------------
     evaluateFormula(sheetId, formulaString) {
-        try {
-            return this.evaluator.evaluateFormula(sheetId, formulaString);
-        }
-        catch (error) {
-            return error.value || CellErrorType.GenericError;
+        const result = this.evaluateFormulaResult(sheetId, formulaString);
+        if (isMatrix(result)) {
+            return matrixMap(result, (cell) => cell.value);
         }
+        return result.value;
+    }
+    evaluateFormulaResult(sheetId, formulaString) {
+        return this.evaluator.evaluateFormulaResult(sheetId, formulaString);
     }
     /**
      * Return the value of each cell in the range as they are displayed in the grid.
@@ -51008,6 +51016,7 @@ class FormatPlugin extends UIPlugin {
      * evaluated and updated with the number type.
      */
     setDecimal(sheetId, zones, step) {
+        const positionsByFormat = {};
         // Find the each cell with a number value and get the format
         for (const zone of zones) {
             for (const position of positions(zone)) {
@@ -51017,15 +51026,20 @@ class FormatPlugin extends UIPlugin {
                     // of the format
                     this.getters.getLocale();
                     const newFormat = changeDecimalPlaces(numberFormat, step);
-                    // Apply the new format on the whole zone
-                    this.dispatch("SET_FORMATTING", {
-                        sheetId,
-                        target: [positionToZone(position)],
-                        format: newFormat,
-                    });
+                    positionsByFormat[newFormat] = positionsByFormat[newFormat] || [];
+                    positionsByFormat[newFormat].push(position);
                 }
             }
         }
+        // consolidate all positions with the same format in bigger zones
+        for (const newFormat in positionsByFormat) {
+            const zones = futureRecomputeZones(positionsByFormat[newFormat].map((position) => positionToZone(position)));
+            this.dispatch("SET_FORMATTING", {
+                sheetId,
+                format: newFormat,
+                target: zones,
+            });
+        }
     }
     /**
      * Take a range of cells and return the format of the first cell containing a
@@ -60842,6 +60856,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, 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.2.19";
-__info__.date = "2024-08-02T08:22:56.367Z";
-__info__.hash = "c5ae261";
+__info__.version = "17.2.20";
+__info__.date = "2024-08-09T12:24:12.002Z";
+__info__.hash = "d667a15";

package/dist/o-spreadsheet.iife.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.19
- * @date 2024-08-02T08:22:56.367Z
- * @hash c5ae261
+ * @version 17.2.20
+ * @date 2024-08-09T12:24:12.002Z
+ * @hash d667a15
  */
 
 (function (exports, owl) {
@@ -44139,7 +44139,7 @@ stores.inject(MyMetaStore, storeInstance);
        * @param sheetXC the string description of a range, in the form SheetName!XC:XC
        */
       getRangeFromSheetXC(defaultSheetId, sheetXC) {
-          if (!rangeReference.test(sheetXC)) {
+          if (!rangeReference.test(sheetXC) || !this.getters.tryGetSheet(defaultSheetId)) {
               return new RangeImpl({
                   sheetId: "",
                   zone: { left: -1, top: -1, right: -1, bottom: -1 },
@@ -47728,18 +47728,23 @@ stores.inject(MyMetaStore, storeInstance);
           this.evaluatedCells = new PositionMap();
           this.evaluate(this.getAllCells());
       }
-      evaluateFormula(sheetId, formulaString) {
-          const compiledFormula = compile(formulaString);
-          const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
-          this.updateCompilationParameters();
-          const result = updateEvalContextAndExecute({ ...compiledFormula, dependencies: ranges }, this.compilationParams, sheetId);
-          if (isMatrix(result)) {
-              return matrixMap(result, (cell) => cell.value);
+      evaluateFormulaResult(sheetId, formulaString) {
+          try {
+              const compiledFormula = compile(formulaString);
+              const ranges = compiledFormula.dependencies.map((xc) => this.getters.getRangeFromSheetXC(sheetId, xc));
+              this.updateCompilationParameters();
+              const result = updateEvalContextAndExecute({ ...compiledFormula, dependencies: ranges }, this.compilationParams, sheetId);
+              if (isMatrix(result)) {
+                  return result;
+              }
+              if (result.value === null) {
+                  return { value: 0, format: result.format };
+              }
+              return result;
           }
-          if (result.value === null) {
-              return 0;
+          catch (error) {
+              return handleError(error, "");
           }
-          return result.value;
       }
       getAllCells() {
           const positions = this.createEmptyPositionSet();
@@ -48083,6 +48088,7 @@ stores.inject(MyMetaStore, storeInstance);
   class EvaluationPlugin extends UIPlugin {
       static getters = [
           "evaluateFormula",
+          "evaluateFormulaResult",
           "getCorrespondingFormulaCell",
           "getRangeFormattedValues",
           "getRangeValues",
@@ -48145,12 +48151,14 @@ stores.inject(MyMetaStore, storeInstance);
       // Getters
       // ---------------------------------------------------------------------------
       evaluateFormula(sheetId, formulaString) {
-          try {
-              return this.evaluator.evaluateFormula(sheetId, formulaString);
-          }
-          catch (error) {
-              return error.value || CellErrorType.GenericError;
+          const result = this.evaluateFormulaResult(sheetId, formulaString);
+          if (isMatrix(result)) {
+              return matrixMap(result, (cell) => cell.value);
           }
+          return result.value;
+      }
+      evaluateFormulaResult(sheetId, formulaString) {
+          return this.evaluator.evaluateFormulaResult(sheetId, formulaString);
       }
       /**
        * Return the value of each cell in the range as they are displayed in the grid.
@@ -51009,6 +51017,7 @@ stores.inject(MyMetaStore, storeInstance);
        * evaluated and updated with the number type.
        */
       setDecimal(sheetId, zones, step) {
+          const positionsByFormat = {};
           // Find the each cell with a number value and get the format
           for (const zone of zones) {
               for (const position of positions(zone)) {
@@ -51018,15 +51027,20 @@ stores.inject(MyMetaStore, storeInstance);
                       // of the format
                       this.getters.getLocale();
                       const newFormat = changeDecimalPlaces(numberFormat, step);
-                      // Apply the new format on the whole zone
-                      this.dispatch("SET_FORMATTING", {
-                          sheetId,
-                          target: [positionToZone(position)],
-                          format: newFormat,
-                      });
+                      positionsByFormat[newFormat] = positionsByFormat[newFormat] || [];
+                      positionsByFormat[newFormat].push(position);
                   }
               }
           }
+          // consolidate all positions with the same format in bigger zones
+          for (const newFormat in positionsByFormat) {
+              const zones = futureRecomputeZones(positionsByFormat[newFormat].map((position) => positionToZone(position)));
+              this.dispatch("SET_FORMATTING", {
+                  sheetId,
+                  format: newFormat,
+                  target: zones,
+              });
+          }
       }
       /**
        * Take a range of cells and return the format of the first cell containing a
@@ -60884,9 +60898,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.2.19";
-  __info__.date = "2024-08-02T08:22:56.367Z";
-  __info__.hash = "c5ae261";
+  __info__.version = "17.2.20";
+  __info__.date = "2024-08-09T12:24:12.002Z";
+  __info__.hash = "d667a15";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);