@odoo/o-spreadsheet 16.3.15 → 16.3.17

package/dist/o-spreadsheet.cjs.js

@@ -7348,7 +7348,7 @@ function createGaugeChartRuntime(chart, getters) {
     });
     return {
         chartJsConfig: config,
-        background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+        background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
     };
 }
 
@@ -8069,7 +8069,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,
@@ -8077,7 +8077,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({
@@ -9388,6 +9388,17 @@ const SORT_CELLS_DESCENDING = (env) => {
 };
 const IS_ONLY_ONE_RANGE = (env) => {
     return env.model.getters.getSelectedZones().length === 1;
+};
+const CAN_INSERT_HEADER = (env, dimension) => {
+    if (!IS_ONLY_ONE_RANGE(env)) {
+        return false;
+    }
+    const activeHeaders = dimension === "COL" ? env.model.getters.getActiveCols() : env.model.getters.getActiveRows();
+    const ortogonalActiveHeaders = dimension === "COL" ? env.model.getters.getActiveRows() : env.model.getters.getActiveCols();
+    const sheetId = env.model.getters.getActiveSheetId();
+    const zone = env.model.getters.getSelectedZone();
+    const allSheetSelected = isEqual(zone, env.model.getters.getSheetZone(sheetId));
+    return isConsecutive(activeHeaders) && (ortogonalActiveHeaders.size === 0 || allSheetSelected);
 };
 
 const undo = {
@@ -16322,17 +16333,13 @@ for (let category of categories) {
 
 const insertRow = {
     name: MENU_INSERT_ROWS_NAME,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW",
 };
 const rowInsertRowBefore = {
     name: ROW_INSERT_ROWS_BEFORE_NAME,
     execute: INSERT_ROWS_BEFORE_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW_BEFORE",
 };
 const topBarInsertRowsBefore = {
@@ -16348,9 +16355,7 @@ const cellInsertRowsBefore = {
 const rowInsertRowsAfter = {
     execute: INSERT_ROWS_AFTER_ACTION,
     name: ROW_INSERT_ROWS_AFTER_NAME,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW_AFTER",
 };
 const topBarInsertRowsAfter = {
@@ -16359,17 +16364,13 @@ const topBarInsertRowsAfter = {
 };
 const insertCol = {
     name: MENU_INSERT_COLUMNS_NAME,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL",
 };
 const colInsertColsBefore = {
     name: COLUMN_INSERT_COLUMNS_BEFORE_NAME,
     execute: INSERT_COLUMNS_BEFORE_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL_BEFORE",
 };
 const topBarInsertColsBefore = {
@@ -16385,9 +16386,7 @@ const cellInsertColsBefore = {
 const colInsertColsAfter = {
     name: COLUMN_INSERT_COLUMNS_AFTER_NAME,
     execute: INSERT_COLUMNS_AFTER_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL_AFTER",
 };
 const topBarInsertColsAfter = {
@@ -19714,7 +19713,7 @@ css /* scss */ `
       }
       .o-input-count {
         width: fit-content;
-        padding: 4 0 4 4;
+        padding: 4px 0 4px 4px;
       }
     }
   }
@@ -30848,6 +30847,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] };
@@ -33728,7 +33734,7 @@ class EvaluationPlugin extends UIPlugin {
 }
 
 class EvaluationChartPlugin extends UIPlugin {
-    static getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+    static getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
     charts = {};
     createRuntimeChart = chartRuntimeFactory(this.getters);
     handle(cmd) {
@@ -33766,25 +33772,26 @@ 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),
+        };
     }
 }
 
@@ -34195,6 +34202,8 @@ class FilterEvaluationPlugin extends UIPlugin {
             case "EVALUATE_CELLS":
             case "ACTIVATE_SHEET":
             case "REMOVE_FILTER_TABLE":
+            case "ADD_COLUMNS_ROWS":
+            case "REMOVE_COLUMNS_ROWS":
                 this.isEvaluationDirty = true;
                 break;
             case "START":
@@ -43565,6 +43574,7 @@ css /* scss */ `
     line-height: 1.2;
     font-size: 13px;
     font-weight: 500;
+    background-color: #fff;
 
     .o-topbar-top {
       border-bottom: 1px solid ${SEPARATOR_COLOR};
@@ -46411,14 +46421,14 @@ function convertFigureData(figure, sheet) {
  */
 function figureCoordinates(headers, position) {
     let currentPosition = 0;
-    for (const [headerIndex, header] of Object.entries(headers)) {
+    for (const [headerIndex, header] of headers.entries()) {
         if (currentPosition <= position && position < currentPosition + header.size) {
             return {
-                index: parseInt(headerIndex),
+                index: headerIndex,
                 offset: convertDotValueToEMU(position - currentPosition + FIGURE_BORDER_WIDTH),
             };
         }
-        else {
+        else if (headerIndex < headers.length - 1) {
             currentPosition += header.size;
         }
     }
@@ -47795,6 +47805,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.3.15';
-__info__.date = '2023-10-25T10:03:43.272Z';
-__info__.hash = 'fb7c4dd';
+__info__.version = '16.3.17';
+__info__.date = '2023-11-16T11:59:29.130Z';
+__info__.hash = '4049460';

package/dist/o-spreadsheet.d.ts

@@ -3762,22 +3762,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

@@ -7344,7 +7344,7 @@ function createGaugeChartRuntime(chart, getters) {
     });
     return {
         chartJsConfig: config,
-        background: getters.getBackgroundOfSingleCellChart(chart.background, dataRange),
+        background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
     };
 }
 
@@ -8065,7 +8065,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,
@@ -8073,7 +8073,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({
@@ -9384,6 +9384,17 @@ const SORT_CELLS_DESCENDING = (env) => {
 };
 const IS_ONLY_ONE_RANGE = (env) => {
     return env.model.getters.getSelectedZones().length === 1;
+};
+const CAN_INSERT_HEADER = (env, dimension) => {
+    if (!IS_ONLY_ONE_RANGE(env)) {
+        return false;
+    }
+    const activeHeaders = dimension === "COL" ? env.model.getters.getActiveCols() : env.model.getters.getActiveRows();
+    const ortogonalActiveHeaders = dimension === "COL" ? env.model.getters.getActiveRows() : env.model.getters.getActiveCols();
+    const sheetId = env.model.getters.getActiveSheetId();
+    const zone = env.model.getters.getSelectedZone();
+    const allSheetSelected = isEqual(zone, env.model.getters.getSheetZone(sheetId));
+    return isConsecutive(activeHeaders) && (ortogonalActiveHeaders.size === 0 || allSheetSelected);
 };
 
 const undo = {
@@ -16318,17 +16329,13 @@ for (let category of categories) {
 
 const insertRow = {
     name: MENU_INSERT_ROWS_NAME,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW",
 };
 const rowInsertRowBefore = {
     name: ROW_INSERT_ROWS_BEFORE_NAME,
     execute: INSERT_ROWS_BEFORE_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW_BEFORE",
 };
 const topBarInsertRowsBefore = {
@@ -16344,9 +16351,7 @@ const cellInsertRowsBefore = {
 const rowInsertRowsAfter = {
     execute: INSERT_ROWS_AFTER_ACTION,
     name: ROW_INSERT_ROWS_AFTER_NAME,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveRows()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveCols().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "ROW"),
     icon: "o-spreadsheet-Icon.INSERT_ROW_AFTER",
 };
 const topBarInsertRowsAfter = {
@@ -16355,17 +16360,13 @@ const topBarInsertRowsAfter = {
 };
 const insertCol = {
     name: MENU_INSERT_COLUMNS_NAME,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL",
 };
 const colInsertColsBefore = {
     name: COLUMN_INSERT_COLUMNS_BEFORE_NAME,
     execute: INSERT_COLUMNS_BEFORE_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL_BEFORE",
 };
 const topBarInsertColsBefore = {
@@ -16381,9 +16382,7 @@ const cellInsertColsBefore = {
 const colInsertColsAfter = {
     name: COLUMN_INSERT_COLUMNS_AFTER_NAME,
     execute: INSERT_COLUMNS_AFTER_ACTION,
-    isVisible: (env) => isConsecutive(env.model.getters.getActiveCols()) &&
-        IS_ONLY_ONE_RANGE(env) &&
-        env.model.getters.getActiveRows().size === 0,
+    isVisible: (env) => CAN_INSERT_HEADER(env, "COL"),
     icon: "o-spreadsheet-Icon.INSERT_COL_AFTER",
 };
 const topBarInsertColsAfter = {
@@ -19710,7 +19709,7 @@ css /* scss */ `
       }
       .o-input-count {
         width: fit-content;
-        padding: 4 0 4 4;
+        padding: 4px 0 4px 4px;
       }
     }
   }
@@ -30844,6 +30843,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] };
@@ -33724,7 +33730,7 @@ class EvaluationPlugin extends UIPlugin {
 }
 
 class EvaluationChartPlugin extends UIPlugin {
-    static getters = ["getChartRuntime", "getBackgroundOfSingleCellChart"];
+    static getters = ["getChartRuntime", "getStyleOfSingleCellChart"];
     charts = {};
     createRuntimeChart = chartRuntimeFactory(this.getters);
     handle(cmd) {
@@ -33762,25 +33768,26 @@ 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),
+        };
     }
 }
 
@@ -34191,6 +34198,8 @@ class FilterEvaluationPlugin extends UIPlugin {
             case "EVALUATE_CELLS":
             case "ACTIVATE_SHEET":
             case "REMOVE_FILTER_TABLE":
+            case "ADD_COLUMNS_ROWS":
+            case "REMOVE_COLUMNS_ROWS":
                 this.isEvaluationDirty = true;
                 break;
             case "START":
@@ -43561,6 +43570,7 @@ css /* scss */ `
     line-height: 1.2;
     font-size: 13px;
     font-weight: 500;
+    background-color: #fff;
 
     .o-topbar-top {
       border-bottom: 1px solid ${SEPARATOR_COLOR};
@@ -46407,14 +46417,14 @@ function convertFigureData(figure, sheet) {
  */
 function figureCoordinates(headers, position) {
     let currentPosition = 0;
-    for (const [headerIndex, header] of Object.entries(headers)) {
+    for (const [headerIndex, header] of headers.entries()) {
         if (currentPosition <= position && position < currentPosition + header.size) {
             return {
-                index: parseInt(headerIndex),
+                index: headerIndex,
                 offset: convertDotValueToEMU(position - currentPosition + FIGURE_BORDER_WIDTH),
             };
         }
-        else {
+        else if (headerIndex < headers.length - 1) {
             currentPosition += header.size;
         }
     }
@@ -47763,6 +47773,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, 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, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.3.15';
-__info__.date = '2023-10-25T10:03:43.272Z';
-__info__.hash = 'fb7c4dd';
+__info__.version = '16.3.17';
+__info__.date = '2023-11-16T11:59:29.130Z';
+__info__.hash = '4049460';