@odoo/o-spreadsheet 16.2.19 → 16.2.21

package/dist/o-spreadsheet.cjs.js

@@ -7126,7 +7126,7 @@ function createGaugeChartRuntime(chart, getters) {
     });
     return {
         chartJsConfig: config,
-        background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+        background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
     };
 }
 
@@ -7810,7 +7810,7 @@ function createScorecardChartRuntime(chart, getters) {
         };
         baselineCell = getters.getEvaluatedCell(baselinePosition);
     }
-    const background = getters.getBackgroundOfSingleCellChart(chart.background, chart.keyValue);
+    const { background, fontColor } = getters.getStyleOfSingleCellChart(chart.background, chart.keyValue);
     return {
         title: _t(chart.title),
         keyValue: formattedKeyValue || keyValue,
@@ -7818,7 +7818,7 @@ function createScorecardChartRuntime(chart, getters) {
         baselineArrow: getBaselineArrowDirection(baselineCell, keyValueCell, chart.baselineMode),
         baselineColor: getBaselineColor(baselineCell, chart.baselineMode, keyValueCell, chart.baselineColorUp, chart.baselineColorDown),
         baselineDescr: chart.baselineDescr ? _t(chart.baselineDescr) : "",
-        fontColor: chartFontColor(background),
+        fontColor,
         background,
         baselineStyle: chart.baselineMode !== "percentage" && baseline
             ? getters.getCellStyle({
@@ -19398,7 +19398,7 @@ class ClientTag extends owl.Component {
             left: `${x - 1}px`,
             border: `1px solid ${color}`,
             "background-color": color,
-            opacity: this.props.active ? "opacity:1 !important" : undefined,
+            opacity: this.props.active ? "1 !important" : undefined,
         });
     }
 }
@@ -32270,28 +32270,29 @@ class EvaluationChartPlugin extends UIPlugin {
         return this.charts[figureId];
     }
     /**
-     * Get the background color of a chart based on the color of the first cell of the main range
-     * of the chart. In order of priority, it will return :
-     *
-     *  - the chart background color if one is defined
-     *  - the fill color of the cell if one is defined
-     *  - the fill color of the cell from conditional formats if one is defined
-     *  - the default chart color if no other color is defined
+     * Get the background and textColor of a chart based on the color of the first cell of the main range of the chart.
      */
-    getBackgroundOfSingleCellChart(chartBackground, mainRange) {
+    getStyleOfSingleCellChart(chartBackground, mainRange) {
         if (chartBackground)
-            return chartBackground;
+            return { background: chartBackground, fontColor: chartFontColor(chartBackground) };
         if (!mainRange) {
-            return BACKGROUND_CHART_COLOR;
+            return {
+                background: BACKGROUND_CHART_COLOR,
+                fontColor: chartFontColor(BACKGROUND_CHART_COLOR),
+            };
         }
         const col = mainRange.zone.left;
         const row = mainRange.zone.top;
         const sheetId = mainRange.sheetId;
         const style = this.getters.getCellComputedStyle({ sheetId, col, row });
-        return style.fillColor || BACKGROUND_CHART_COLOR;
+        const background = style.fillColor || BACKGROUND_CHART_COLOR;
+        return {
+            background,
+            fontColor: style.textColor || chartFontColor(background),
+        };
     }
 }
-EvaluationChartPlugin.getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+EvaluationChartPlugin.getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
 
 // -----------------------------------------------------------------------------
 // Constants
@@ -39380,11 +39381,19 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
-        // get deduplicated cells in zones
-        const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-            .flat()
-            .filter((cell) => cell.type !== CellValueType.empty));
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = new Set();
+        for (const zone of this.gridSelection.zones) {
+            for (const { col, row } of positions(zone)) {
+                if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                    continue; // Skip hidden cells
+                }
+                const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                if (evaluatedCell.type !== CellValueType.empty) {
+                    cells.add(evaluatedCell);
+                }
+            }
+        }
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -45526,6 +45535,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.2.19';
-__info__.date = '2023-10-19T14:22:48.890Z';
-__info__.hash = '79980d5';
+__info__.version = '16.2.21';
+__info__.date = '2023-11-02T09:31:50.545Z';
+__info__.hash = 'cc30e85';

package/dist/o-spreadsheet.d.ts

@@ -3725,22 +3725,20 @@ declare class EvaluationPlugin extends UIPlugin {
     private isBadExpression;
 }
 
+interface EvaluationChartStyle {
+    background: Color;
+    fontColor: Color;
+}
 declare class EvaluationChartPlugin extends UIPlugin {
-    static getters: readonly ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+    static getters: readonly ["getChartRuntime", "getStyleOfSingleCellChart"];
     readonly charts: Record<UID, ChartRuntime | undefined>;
     private createRuntimeChart;
     handle(cmd: Command): void;
     getChartRuntime(figureId: UID): ChartRuntime;
     /**
-     * Get the background color of a chart based on the color of the first cell of the main range
-     * of the chart. In order of priority, it will return :
-     *
-     *  - the chart background color if one is defined
-     *  - the fill color of the cell if one is defined
-     *  - the fill color of the cell from conditional formats if one is defined
-     *  - the default chart color if no other color is defined
+     * Get the background and textColor of a chart based on the color of the first cell of the main range of the chart.
      */
-    getBackgroundOfSingleCellChart(chartBackground: Color | undefined, mainRange: Range | undefined): Color;
+    getStyleOfSingleCellChart(chartBackground: Color | undefined, mainRange: Range | undefined): EvaluationChartStyle;
 }
 
 declare class EvaluationConditionalFormatPlugin extends UIPlugin {

package/dist/o-spreadsheet.esm.js

@@ -7122,7 +7122,7 @@ function createGaugeChartRuntime(chart, getters) {
     });
     return {
         chartJsConfig: config,
-        background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+        background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
     };
 }
 
@@ -7806,7 +7806,7 @@ function createScorecardChartRuntime(chart, getters) {
         };
         baselineCell = getters.getEvaluatedCell(baselinePosition);
     }
-    const background = getters.getBackgroundOfSingleCellChart(chart.background, chart.keyValue);
+    const { background, fontColor } = getters.getStyleOfSingleCellChart(chart.background, chart.keyValue);
     return {
         title: _t(chart.title),
         keyValue: formattedKeyValue || keyValue,
@@ -7814,7 +7814,7 @@ function createScorecardChartRuntime(chart, getters) {
         baselineArrow: getBaselineArrowDirection(baselineCell, keyValueCell, chart.baselineMode),
         baselineColor: getBaselineColor(baselineCell, chart.baselineMode, keyValueCell, chart.baselineColorUp, chart.baselineColorDown),
         baselineDescr: chart.baselineDescr ? _t(chart.baselineDescr) : "",
-        fontColor: chartFontColor(background),
+        fontColor,
         background,
         baselineStyle: chart.baselineMode !== "percentage" && baseline
             ? getters.getCellStyle({
@@ -19394,7 +19394,7 @@ class ClientTag extends Component {
             left: `${x - 1}px`,
             border: `1px solid ${color}`,
             "background-color": color,
-            opacity: this.props.active ? "opacity:1 !important" : undefined,
+            opacity: this.props.active ? "1 !important" : undefined,
         });
     }
 }
@@ -32266,28 +32266,29 @@ class EvaluationChartPlugin extends UIPlugin {
         return this.charts[figureId];
     }
     /**
-     * Get the background color of a chart based on the color of the first cell of the main range
-     * of the chart. In order of priority, it will return :
-     *
-     *  - the chart background color if one is defined
-     *  - the fill color of the cell if one is defined
-     *  - the fill color of the cell from conditional formats if one is defined
-     *  - the default chart color if no other color is defined
+     * Get the background and textColor of a chart based on the color of the first cell of the main range of the chart.
      */
-    getBackgroundOfSingleCellChart(chartBackground, mainRange) {
+    getStyleOfSingleCellChart(chartBackground, mainRange) {
         if (chartBackground)
-            return chartBackground;
+            return { background: chartBackground, fontColor: chartFontColor(chartBackground) };
         if (!mainRange) {
-            return BACKGROUND_CHART_COLOR;
+            return {
+                background: BACKGROUND_CHART_COLOR,
+                fontColor: chartFontColor(BACKGROUND_CHART_COLOR),
+            };
         }
         const col = mainRange.zone.left;
         const row = mainRange.zone.top;
         const sheetId = mainRange.sheetId;
         const style = this.getters.getCellComputedStyle({ sheetId, col, row });
-        return style.fillColor || BACKGROUND_CHART_COLOR;
+        const background = style.fillColor || BACKGROUND_CHART_COLOR;
+        return {
+            background,
+            fontColor: style.textColor || chartFontColor(background),
+        };
     }
 }
-EvaluationChartPlugin.getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+EvaluationChartPlugin.getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
 
 // -----------------------------------------------------------------------------
 // Constants
@@ -39376,11 +39377,19 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
-        // get deduplicated cells in zones
-        const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-            .flat()
-            .filter((cell) => cell.type !== CellValueType.empty));
+        const sheetId = this.getters.getActiveSheetId();
+        const cells = new Set();
+        for (const zone of this.gridSelection.zones) {
+            for (const { col, row } of positions(zone)) {
+                if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                    continue; // Skip hidden cells
+                }
+                const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                if (evaluatedCell.type !== CellValueType.empty) {
+                    cells.add(evaluatedCell);
+                }
+            }
+        }
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -45494,6 +45503,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, links, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.2.19';
-__info__.date = '2023-10-19T14:22:48.890Z';
-__info__.hash = '79980d5';
+__info__.version = '16.2.21';
+__info__.date = '2023-11-02T09:31:50.545Z';
+__info__.hash = 'cc30e85';

package/dist/o-spreadsheet.iife.js

@@ -7123,7 +7123,7 @@
       });
       return {
           chartJsConfig: config,
-          background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+          background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
       };
   }
 
@@ -7807,7 +7807,7 @@
           };
           baselineCell = getters.getEvaluatedCell(baselinePosition);
       }
-      const background = getters.getBackgroundOfSingleCellChart(chart.background, chart.keyValue);
+      const { background, fontColor } = getters.getStyleOfSingleCellChart(chart.background, chart.keyValue);
       return {
           title: _t(chart.title),
           keyValue: formattedKeyValue || keyValue,
@@ -7815,7 +7815,7 @@
           baselineArrow: getBaselineArrowDirection(baselineCell, keyValueCell, chart.baselineMode),
           baselineColor: getBaselineColor(baselineCell, chart.baselineMode, keyValueCell, chart.baselineColorUp, chart.baselineColorDown),
           baselineDescr: chart.baselineDescr ? _t(chart.baselineDescr) : "",
-          fontColor: chartFontColor(background),
+          fontColor,
           background,
           baselineStyle: chart.baselineMode !== "percentage" && baseline
               ? getters.getCellStyle({
@@ -19395,7 +19395,7 @@
               left: `${x - 1}px`,
               border: `1px solid ${color}`,
               "background-color": color,
-              opacity: this.props.active ? "opacity:1 !important" : undefined,
+              opacity: this.props.active ? "1 !important" : undefined,
           });
       }
   }
@@ -32267,28 +32267,29 @@
           return this.charts[figureId];
       }
       /**
-       * Get the background color of a chart based on the color of the first cell of the main range
-       * of the chart. In order of priority, it will return :
-       *
-       *  - the chart background color if one is defined
-       *  - the fill color of the cell if one is defined
-       *  - the fill color of the cell from conditional formats if one is defined
-       *  - the default chart color if no other color is defined
+       * Get the background and textColor of a chart based on the color of the first cell of the main range of the chart.
        */
-      getBackgroundOfSingleCellChart(chartBackground, mainRange) {
+      getStyleOfSingleCellChart(chartBackground, mainRange) {
           if (chartBackground)
-              return chartBackground;
+              return { background: chartBackground, fontColor: chartFontColor(chartBackground) };
           if (!mainRange) {
-              return BACKGROUND_CHART_COLOR;
+              return {
+                  background: BACKGROUND_CHART_COLOR,
+                  fontColor: chartFontColor(BACKGROUND_CHART_COLOR),
+              };
           }
           const col = mainRange.zone.left;
           const row = mainRange.zone.top;
           const sheetId = mainRange.sheetId;
           const style = this.getters.getCellComputedStyle({ sheetId, col, row });
-          return style.fillColor || BACKGROUND_CHART_COLOR;
+          const background = style.fillColor || BACKGROUND_CHART_COLOR;
+          return {
+              background,
+              fontColor: style.textColor || chartFontColor(background),
+          };
       }
   }
-  EvaluationChartPlugin.getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+  EvaluationChartPlugin.getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
 
   // -----------------------------------------------------------------------------
   // Constants
@@ -39377,11 +39378,19 @@
           }
       }
       getStatisticFnResults() {
-          // get deduplicated cells in zones
-          const cells = new Set(this.gridSelection.zones
-              .map((zone) => this.getters.getEvaluatedCellsInZone(this.getters.getActiveSheetId(), zone))
-              .flat()
-              .filter((cell) => cell.type !== CellValueType.empty));
+          const sheetId = this.getters.getActiveSheetId();
+          const cells = new Set();
+          for (const zone of this.gridSelection.zones) {
+              for (const { col, row } of positions(zone)) {
+                  if (this.getters.isRowHidden(sheetId, row) || this.getters.isColHidden(sheetId, col)) {
+                      continue; // Skip hidden cells
+                  }
+                  const evaluatedCell = this.getters.getEvaluatedCell({ sheetId, col, row });
+                  if (evaluatedCell.type !== CellValueType.empty) {
+                      cells.add(evaluatedCell);
+                  }
+              }
+          }
           let cellsTypes = new Set();
           let cellsValues = [];
           for (let cell of cells) {
@@ -45525,9 +45534,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.2.19';
-  __info__.date = '2023-10-19T14:22:48.890Z';
-  __info__.hash = '79980d5';
+  __info__.version = '16.2.21';
+  __info__.date = '2023-11-02T09:31:50.545Z';
+  __info__.hash = 'cc30e85';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);