@odoo/o-spreadsheet 16.0.21 → 16.0.23

package/dist/o-spreadsheet.cjs.js

@@ -3951,13 +3951,16 @@ class Popover extends owl.Component {
         super(...arguments);
         this.spreadsheetPosition = useSpreadsheetPosition();
     }
+    get maxHeight() {
+        return Math.max(0, this.viewportDimension.height - BOTTOMBAR_HEIGHT - SCROLLBAR_WIDTH$1);
+    }
     get style() {
         // 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 maxHeight = Math.max(0, this.viewportDimension.height - BOTTOMBAR_HEIGHT - SCROLLBAR_WIDTH$1);
+        const maxHeight = this.maxHeight;
         const height = `max-height:${maxHeight}`;
         const shadow = maxHeight !== 0 ? "box-shadow: 1px 2px 5px 2px rgb(51 51 51 / 15%);" : "";
         return `
@@ -3981,7 +3984,7 @@ class Popover extends owl.Component {
     }
     get shouldRenderBottom() {
         const { y } = this.props.position;
-        return (y + this.props.childHeight <
+        return (y + Math.min(this.props.childHeight, this.maxHeight) <
             this.viewportDimension.height + (this.env.isDashboard() ? 0 : TOPBAR_HEIGHT));
     }
     horizontalPosition() {
@@ -7688,7 +7691,7 @@ function createGaugeChartRuntime(chart, getters) {
     });
     return {
         chartJsConfig: config,
-        background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+        background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
     };
 }
 
@@ -8362,7 +8365,7 @@ function createScorecardChartRuntime(chart, getters) {
         const baselineZone = chart.baseline.zone;
         baselineCell = getters.getCell(chart.baseline.sheetId, baselineZone.left, baselineZone.top);
     }
-    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,
@@ -8370,7 +8373,7 @@ function createScorecardChartRuntime(chart, getters) {
         baselineArrow: getBaselineArrowDirection(baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.evaluated, keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.evaluated, chart.baselineMode),
         baselineColor: getBaselineColor(baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.evaluated, chart.baselineMode, keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.evaluated, chart.baselineColorUp, chart.baselineColorDown),
         baselineDescr: chart.baselineDescr ? _t(chart.baselineDescr) : "",
-        fontColor: chartFontColor(background),
+        fontColor,
         background,
         baselineStyle: chart.baselineMode !== "percentage" ? baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.style : undefined,
         keyValueStyle: keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.style,
@@ -25240,12 +25243,15 @@ function createXMLFile(doc, path, contentType) {
     };
 }
 function xmlEscape(str) {
-    return String(str)
+    return (String(str)
         .replace(/\&/g, "&amp;")
         .replace(/\</g, "&lt;")
         .replace(/\>/g, "&gt;")
         .replace(/\"/g, "&quot;")
-        .replace(/\'/g, "&apos;");
+        .replace(/\'/g, "&apos;")
+        // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+        // They are not valid at all in XML 1.0 (even escaped)
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
 }
 function formatAttributes(attrs) {
     return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -28846,6 +28852,13 @@ class FiltersPlugin extends CorePlugin {
     }
     onDeleteColumnsRows(cmd) {
         for (const table of this.getFilterTables(cmd.sheetId)) {
+            // Remove the filter tables whose data filter headers are in the removed rows.
+            if (cmd.dimension === "ROW" && cmd.elements.includes(table.zone.top)) {
+                const tables = { ...this.tables[cmd.sheetId] };
+                delete tables[table.id];
+                this.history.update("tables", cmd.sheetId, tables);
+                continue;
+            }
             const zone = reduceZoneOnDeletion(table.zone, cmd.dimension === "COL" ? "left" : "top", cmd.elements);
             if (!zone) {
                 const tables = { ...this.tables[cmd.sheetId] };
@@ -32751,27 +32764,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 style = this.getters.getCellComputedStyle(mainRange.sheetId, col, row);
-        return style.fillColor || BACKGROUND_CHART_COLOR;
+        const sheetId = mainRange.sheetId;
+        const style = this.getters.getCellComputedStyle(sheetId, col, row);
+        const background = style.fillColor || BACKGROUND_CHART_COLOR;
+        return {
+            background,
+            fontColor: style.textColor || chartFontColor(background),
+        };
     }
 }
-EvaluationChartPlugin.getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+EvaluationChartPlugin.getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
 
 // -----------------------------------------------------------------------------
 // Constants
@@ -33110,6 +33125,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         }
         currentRanges = currentRanges.concat(toAdd);
         const newRangesXC = recomputeZones(currentRanges, toRemove);
+        if (newRangesXC.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -33195,6 +33214,8 @@ class FilterEvaluationPlugin extends UIPlugin {
                 break;
             case "HIDE_COLUMNS_ROWS":
             case "UNHIDE_COLUMNS_ROWS":
+            case "ADD_COLUMNS_ROWS":
+            case "REMOVE_COLUMNS_ROWS":
                 this.updateHiddenRows();
                 break;
             case "UPDATE_FILTER":
@@ -34765,11 +34786,18 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
+        const sheetId = this.getters.getActiveSheetId();
         // get deduplicated cells in zones
         const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getCellsInZone(this.getters.getActiveSheetId(), zone))
+            .map((zone) => this.getters.getCellsInZone(sheetId, zone))
             .flat()
-            .filter((cell) => cell !== undefined));
+            .filter((cell) => {
+            if (!cell) {
+                return false;
+            }
+            const { col, row } = this.getters.getCellPosition(cell === null || cell === void 0 ? void 0 : cell.id);
+            return !this.getters.isRowHidden(sheetId, row) && !this.getters.isColHidden(sheetId, col);
+        }));
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -42983,6 +43011,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.21';
-__info__.date = '2023-10-10T07:26:26.680Z';
-__info__.hash = '5f66b12';
+__info__.version = '16.0.23';
+__info__.date = '2023-11-02T09:31:21.669Z';
+__info__.hash = '06ef793';

package/dist/o-spreadsheet.d.ts

@@ -3893,22 +3893,20 @@ declare class EvaluationPlugin extends UIPlugin {
     private getCompilationParameters;
 }
 
+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 {
@@ -5251,6 +5249,7 @@ declare class Popover extends Component<Props$p, SpreadsheetChildEnv> {
         zIndex: ComponentsImportance;
     };
     private spreadsheetPosition;
+    get maxHeight(): number;
     get style(): string;
     private get viewportDimension();
     private get shouldRenderRight();

package/dist/o-spreadsheet.esm.js

@@ -3947,13 +3947,16 @@ class Popover extends Component {
         super(...arguments);
         this.spreadsheetPosition = useSpreadsheetPosition();
     }
+    get maxHeight() {
+        return Math.max(0, this.viewportDimension.height - BOTTOMBAR_HEIGHT - SCROLLBAR_WIDTH$1);
+    }
     get style() {
         // 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 maxHeight = Math.max(0, this.viewportDimension.height - BOTTOMBAR_HEIGHT - SCROLLBAR_WIDTH$1);
+        const maxHeight = this.maxHeight;
         const height = `max-height:${maxHeight}`;
         const shadow = maxHeight !== 0 ? "box-shadow: 1px 2px 5px 2px rgb(51 51 51 / 15%);" : "";
         return `
@@ -3977,7 +3980,7 @@ class Popover extends Component {
     }
     get shouldRenderBottom() {
         const { y } = this.props.position;
-        return (y + this.props.childHeight <
+        return (y + Math.min(this.props.childHeight, this.maxHeight) <
             this.viewportDimension.height + (this.env.isDashboard() ? 0 : TOPBAR_HEIGHT));
     }
     horizontalPosition() {
@@ -7684,7 +7687,7 @@ function createGaugeChartRuntime(chart, getters) {
     });
     return {
         chartJsConfig: config,
-        background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+        background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
     };
 }
 
@@ -8358,7 +8361,7 @@ function createScorecardChartRuntime(chart, getters) {
         const baselineZone = chart.baseline.zone;
         baselineCell = getters.getCell(chart.baseline.sheetId, baselineZone.left, baselineZone.top);
     }
-    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,
@@ -8366,7 +8369,7 @@ function createScorecardChartRuntime(chart, getters) {
         baselineArrow: getBaselineArrowDirection(baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.evaluated, keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.evaluated, chart.baselineMode),
         baselineColor: getBaselineColor(baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.evaluated, chart.baselineMode, keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.evaluated, chart.baselineColorUp, chart.baselineColorDown),
         baselineDescr: chart.baselineDescr ? _t(chart.baselineDescr) : "",
-        fontColor: chartFontColor(background),
+        fontColor,
         background,
         baselineStyle: chart.baselineMode !== "percentage" ? baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.style : undefined,
         keyValueStyle: keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.style,
@@ -25236,12 +25239,15 @@ function createXMLFile(doc, path, contentType) {
     };
 }
 function xmlEscape(str) {
-    return String(str)
+    return (String(str)
         .replace(/\&/g, "&amp;")
         .replace(/\</g, "&lt;")
         .replace(/\>/g, "&gt;")
         .replace(/\"/g, "&quot;")
-        .replace(/\'/g, "&apos;");
+        .replace(/\'/g, "&apos;")
+        // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+        // They are not valid at all in XML 1.0 (even escaped)
+        .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
 }
 function formatAttributes(attrs) {
     return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -28842,6 +28848,13 @@ class FiltersPlugin extends CorePlugin {
     }
     onDeleteColumnsRows(cmd) {
         for (const table of this.getFilterTables(cmd.sheetId)) {
+            // Remove the filter tables whose data filter headers are in the removed rows.
+            if (cmd.dimension === "ROW" && cmd.elements.includes(table.zone.top)) {
+                const tables = { ...this.tables[cmd.sheetId] };
+                delete tables[table.id];
+                this.history.update("tables", cmd.sheetId, tables);
+                continue;
+            }
             const zone = reduceZoneOnDeletion(table.zone, cmd.dimension === "COL" ? "left" : "top", cmd.elements);
             if (!zone) {
                 const tables = { ...this.tables[cmd.sheetId] };
@@ -32747,27 +32760,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 style = this.getters.getCellComputedStyle(mainRange.sheetId, col, row);
-        return style.fillColor || BACKGROUND_CHART_COLOR;
+        const sheetId = mainRange.sheetId;
+        const style = this.getters.getCellComputedStyle(sheetId, col, row);
+        const background = style.fillColor || BACKGROUND_CHART_COLOR;
+        return {
+            background,
+            fontColor: style.textColor || chartFontColor(background),
+        };
     }
 }
-EvaluationChartPlugin.getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+EvaluationChartPlugin.getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
 
 // -----------------------------------------------------------------------------
 // Constants
@@ -33106,6 +33121,10 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
         }
         currentRanges = currentRanges.concat(toAdd);
         const newRangesXC = recomputeZones(currentRanges, toRemove);
+        if (newRangesXC.length === 0) {
+            this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+            return;
+        }
         this.dispatch("ADD_CONDITIONAL_FORMAT", {
             cf: {
                 id: cf.id,
@@ -33191,6 +33210,8 @@ class FilterEvaluationPlugin extends UIPlugin {
                 break;
             case "HIDE_COLUMNS_ROWS":
             case "UNHIDE_COLUMNS_ROWS":
+            case "ADD_COLUMNS_ROWS":
+            case "REMOVE_COLUMNS_ROWS":
                 this.updateHiddenRows();
                 break;
             case "UPDATE_FILTER":
@@ -34761,11 +34782,18 @@ class GridSelectionPlugin extends UIPlugin {
         }
     }
     getStatisticFnResults() {
+        const sheetId = this.getters.getActiveSheetId();
         // get deduplicated cells in zones
         const cells = new Set(this.gridSelection.zones
-            .map((zone) => this.getters.getCellsInZone(this.getters.getActiveSheetId(), zone))
+            .map((zone) => this.getters.getCellsInZone(sheetId, zone))
             .flat()
-            .filter((cell) => cell !== undefined));
+            .filter((cell) => {
+            if (!cell) {
+                return false;
+            }
+            const { col, row } = this.getters.getCellPosition(cell === null || cell === void 0 ? void 0 : cell.id);
+            return !this.getters.isRowHidden(sheetId, row) && !this.getters.isColHidden(sheetId, col);
+        }));
         let cellsTypes = new Set();
         let cellsValues = [];
         for (let cell of cells) {
@@ -42951,6 +42979,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.21';
-__info__.date = '2023-10-10T07:26:26.680Z';
-__info__.hash = '5f66b12';
+__info__.version = '16.0.23';
+__info__.date = '2023-11-02T09:31:21.669Z';
+__info__.hash = '06ef793';

package/dist/o-spreadsheet.iife.js

@@ -3948,13 +3948,16 @@
           super(...arguments);
           this.spreadsheetPosition = useSpreadsheetPosition();
       }
+      get maxHeight() {
+          return Math.max(0, this.viewportDimension.height - BOTTOMBAR_HEIGHT - SCROLLBAR_WIDTH$1);
+      }
       get style() {
           // 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 maxHeight = Math.max(0, this.viewportDimension.height - BOTTOMBAR_HEIGHT - SCROLLBAR_WIDTH$1);
+          const maxHeight = this.maxHeight;
           const height = `max-height:${maxHeight}`;
           const shadow = maxHeight !== 0 ? "box-shadow: 1px 2px 5px 2px rgb(51 51 51 / 15%);" : "";
           return `
@@ -3978,7 +3981,7 @@
       }
       get shouldRenderBottom() {
           const { y } = this.props.position;
-          return (y + this.props.childHeight <
+          return (y + Math.min(this.props.childHeight, this.maxHeight) <
               this.viewportDimension.height + (this.env.isDashboard() ? 0 : TOPBAR_HEIGHT));
       }
       horizontalPosition() {
@@ -7685,7 +7688,7 @@
       });
       return {
           chartJsConfig: config,
-          background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+          background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
       };
   }
 
@@ -8359,7 +8362,7 @@
           const baselineZone = chart.baseline.zone;
           baselineCell = getters.getCell(chart.baseline.sheetId, baselineZone.left, baselineZone.top);
       }
-      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,
@@ -8367,7 +8370,7 @@
           baselineArrow: getBaselineArrowDirection(baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.evaluated, keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.evaluated, chart.baselineMode),
           baselineColor: getBaselineColor(baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.evaluated, chart.baselineMode, keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.evaluated, chart.baselineColorUp, chart.baselineColorDown),
           baselineDescr: chart.baselineDescr ? _t(chart.baselineDescr) : "",
-          fontColor: chartFontColor(background),
+          fontColor,
           background,
           baselineStyle: chart.baselineMode !== "percentage" ? baselineCell === null || baselineCell === void 0 ? void 0 : baselineCell.style : undefined,
           keyValueStyle: keyValueCell === null || keyValueCell === void 0 ? void 0 : keyValueCell.style,
@@ -25237,12 +25240,15 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       };
   }
   function xmlEscape(str) {
-      return String(str)
+      return (String(str)
           .replace(/\&/g, "&amp;")
           .replace(/\</g, "&lt;")
           .replace(/\>/g, "&gt;")
           .replace(/\"/g, "&quot;")
-          .replace(/\'/g, "&apos;");
+          .replace(/\'/g, "&apos;")
+          // Delete all ASCII control characters except for TAB (\x09), LF (\x0A) and CR (\x0D)
+          // They are not valid at all in XML 1.0 (even escaped)
+          .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, ""));
   }
   function formatAttributes(attrs) {
       return new XMLString(attrs.map(([key, val]) => `${key}="${xmlEscape(val)}"`).join(" "));
@@ -28843,6 +28849,13 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       onDeleteColumnsRows(cmd) {
           for (const table of this.getFilterTables(cmd.sheetId)) {
+              // Remove the filter tables whose data filter headers are in the removed rows.
+              if (cmd.dimension === "ROW" && cmd.elements.includes(table.zone.top)) {
+                  const tables = { ...this.tables[cmd.sheetId] };
+                  delete tables[table.id];
+                  this.history.update("tables", cmd.sheetId, tables);
+                  continue;
+              }
               const zone = reduceZoneOnDeletion(table.zone, cmd.dimension === "COL" ? "left" : "top", cmd.elements);
               if (!zone) {
                   const tables = { ...this.tables[cmd.sheetId] };
@@ -32748,27 +32761,29 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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 style = this.getters.getCellComputedStyle(mainRange.sheetId, col, row);
-          return style.fillColor || BACKGROUND_CHART_COLOR;
+          const sheetId = mainRange.sheetId;
+          const style = this.getters.getCellComputedStyle(sheetId, col, row);
+          const background = style.fillColor || BACKGROUND_CHART_COLOR;
+          return {
+              background,
+              fontColor: style.textColor || chartFontColor(background),
+          };
       }
   }
-  EvaluationChartPlugin.getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+  EvaluationChartPlugin.getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
 
   // -----------------------------------------------------------------------------
   // Constants
@@ -33107,6 +33122,10 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           }
           currentRanges = currentRanges.concat(toAdd);
           const newRangesXC = recomputeZones(currentRanges, toRemove);
+          if (newRangesXC.length === 0) {
+              this.dispatch("REMOVE_CONDITIONAL_FORMAT", { id: cf.id, sheetId });
+              return;
+          }
           this.dispatch("ADD_CONDITIONAL_FORMAT", {
               cf: {
                   id: cf.id,
@@ -33192,6 +33211,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   break;
               case "HIDE_COLUMNS_ROWS":
               case "UNHIDE_COLUMNS_ROWS":
+              case "ADD_COLUMNS_ROWS":
+              case "REMOVE_COLUMNS_ROWS":
                   this.updateHiddenRows();
                   break;
               case "UPDATE_FILTER":
@@ -34762,11 +34783,18 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           }
       }
       getStatisticFnResults() {
+          const sheetId = this.getters.getActiveSheetId();
           // get deduplicated cells in zones
           const cells = new Set(this.gridSelection.zones
-              .map((zone) => this.getters.getCellsInZone(this.getters.getActiveSheetId(), zone))
+              .map((zone) => this.getters.getCellsInZone(sheetId, zone))
               .flat()
-              .filter((cell) => cell !== undefined));
+              .filter((cell) => {
+              if (!cell) {
+                  return false;
+              }
+              const { col, row } = this.getters.getCellPosition(cell === null || cell === void 0 ? void 0 : cell.id);
+              return !this.getters.isRowHidden(sheetId, row) && !this.getters.isColHidden(sheetId, col);
+          }));
           let cellsTypes = new Set();
           let cellsValues = [];
           for (let cell of cells) {
@@ -42982,9 +43010,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.21';
-  __info__.date = '2023-10-10T07:26:26.680Z';
-  __info__.hash = '5f66b12';
+  __info__.version = '16.0.23';
+  __info__.date = '2023-11-02T09:31:21.669Z';
+  __info__.hash = '06ef793';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);