@odoo/o-spreadsheet 16.0.2 → 16.0.4

package/dist/{o_spreadsheet.cjs.js → o-spreadsheet.cjs.js}

@@ -896,6 +896,9 @@ function parseSheetLink(sheetLink) {
 function isDefined$1(argument) {
     return argument !== undefined;
 }
+function isNonEmptyString(str) {
+    return str !== undefined && str !== "";
+}
 /**
  * Check if all the values of an object, and all the values of the objects inside of it, are undefined.
  */
@@ -8386,7 +8389,7 @@ class ColorPicker extends owl.Component {
     }
     onColorClick(color) {
         if (color) {
-            this.props.onColorPicked(color);
+            this.props.onColorPicked(toHex(color));
         }
     }
     getCheckMarkColor() {
@@ -8401,8 +8404,10 @@ class ColorPicker extends owl.Component {
             this.state.isCurrentColorInvalid = true;
             return;
         }
+        const color = toHex(this.state.currentColor);
         this.state.isCurrentColorInvalid = false;
-        this.props.onColorPicked(this.state.currentColor);
+        this.props.onColorPicked(color);
+        this.state.currentColor = color;
     }
     toggleColorPicker() {
         this.state.showGradient = !this.state.showGradient;
@@ -10039,7 +10044,7 @@ class ScorecardChart extends owl.Component {
         return this.runtime.fontColor;
     }
     get secondaryFontColor() {
-        return relativeLuminance(this.primaryFontColor) <= 0.3 ? "#757575" : "#bbbbbb";
+        return relativeLuminance(this.backgroundColor) > 0.3 ? "#525252" : "#C8C8C8";
     }
     get figure() {
         return this.props.figure;
@@ -32770,6 +32775,9 @@ class FilterEvaluationPlugin extends UIPlugin {
             case "CREATE_SHEET":
                 this.filterValues[cmd.sheetId] = {};
                 break;
+            case "HIDE_COLUMNS_ROWS":
+                this.updateHiddenRows();
+                break;
             case "UPDATE_FILTER":
                 this.updateFilter(cmd);
                 this.updateHiddenRows();
@@ -32871,9 +32879,16 @@ class FilterEvaluationPlugin extends UIPlugin {
     updateHiddenRows() {
         var _a, _b;
         const sheetId = this.getters.getActiveSheetId();
-        const filters = this.getters.getFilters(sheetId);
+        const filters = this.getters
+            .getFilters(sheetId)
+            .sort((filter1, filter2) => filter1.zoneWithHeaders.top - filter2.zoneWithHeaders.top);
         const hiddenRows = new Set();
         for (let filter of filters) {
+            // Disable filters whose header are hidden
+            if (this.getters.isRowHiddenByUser(sheetId, filter.zoneWithHeaders.top))
+                continue;
+            if (hiddenRows.has(filter.zoneWithHeaders.top))
+                continue;
             const filteredValues = (_b = (_a = this.filterValues[sheetId]) === null || _a === void 0 ? void 0 : _a[filter.id]) === null || _b === void 0 ? void 0 : _b.map(toLowerCase);
             if (!filteredValues || !filter.filteredZone)
                 continue;
@@ -32906,7 +32921,7 @@ class FilterEvaluationPlugin extends UIPlugin {
                     const valuesInFilterZone = filter.filteredZone
                         ? positions(filter.filteredZone)
                             .map((pos) => { var _a; return (_a = this.getters.getCell(sheetData.id, pos.col, pos.row)) === null || _a === void 0 ? void 0 : _a.formattedValue; })
-                            .filter(isDefined$1)
+                            .filter(isNonEmptyString)
                         : [];
                     // In xlsx, filtered values = values that are displayed, not values that are hidden
                     const xlsxFilteredValues = valuesInFilterZone.filter((val) => !filteredValues.includes(val));
@@ -38178,6 +38193,7 @@ class TopBar extends owl.Component {
         this.state.menuState.parentMenu = menu;
         this.isSelectingMenu = true;
         this.openedEl = ev.target;
+        this.env.model.dispatch("STOP_EDITION");
     }
     closeMenus() {
         this.state.activeTool = "";
@@ -42455,6 +42471,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.2';
-__info__.date = '2023-03-06T07:17:51.313Z';
-__info__.hash = '6b4d816';
+__info__.version = '16.0.4';
+__info__.date = '2023-03-16T12:11:01.007Z';
+__info__.hash = 'ebbb1f0';

package/dist/{o_spreadsheet.d.ts → o-spreadsheet.d.ts}

@@ -5148,7 +5148,7 @@ declare class ScorecardChart extends Component<Props$q, SpreadsheetChildEnv> {
     get baselineArrowDirection(): BaselineArrowDirection;
     get backgroundColor(): string;
     get primaryFontColor(): string;
-    get secondaryFontColor(): "#757575" | "#bbbbbb";
+    get secondaryFontColor(): "#525252" | "#C8C8C8";
     get figure(): Figure;
     get chartStyle(): string;
     get chartContentStyle(): string;

package/dist/{o_spreadsheet.esm.js → o-spreadsheet.esm.js}

@@ -892,6 +892,9 @@ function parseSheetLink(sheetLink) {
 function isDefined$1(argument) {
     return argument !== undefined;
 }
+function isNonEmptyString(str) {
+    return str !== undefined && str !== "";
+}
 /**
  * Check if all the values of an object, and all the values of the objects inside of it, are undefined.
  */
@@ -8382,7 +8385,7 @@ class ColorPicker extends Component {
     }
     onColorClick(color) {
         if (color) {
-            this.props.onColorPicked(color);
+            this.props.onColorPicked(toHex(color));
         }
     }
     getCheckMarkColor() {
@@ -8397,8 +8400,10 @@ class ColorPicker extends Component {
             this.state.isCurrentColorInvalid = true;
             return;
         }
+        const color = toHex(this.state.currentColor);
         this.state.isCurrentColorInvalid = false;
-        this.props.onColorPicked(this.state.currentColor);
+        this.props.onColorPicked(color);
+        this.state.currentColor = color;
     }
     toggleColorPicker() {
         this.state.showGradient = !this.state.showGradient;
@@ -10035,7 +10040,7 @@ class ScorecardChart extends Component {
         return this.runtime.fontColor;
     }
     get secondaryFontColor() {
-        return relativeLuminance(this.primaryFontColor) <= 0.3 ? "#757575" : "#bbbbbb";
+        return relativeLuminance(this.backgroundColor) > 0.3 ? "#525252" : "#C8C8C8";
     }
     get figure() {
         return this.props.figure;
@@ -32766,6 +32771,9 @@ class FilterEvaluationPlugin extends UIPlugin {
             case "CREATE_SHEET":
                 this.filterValues[cmd.sheetId] = {};
                 break;
+            case "HIDE_COLUMNS_ROWS":
+                this.updateHiddenRows();
+                break;
             case "UPDATE_FILTER":
                 this.updateFilter(cmd);
                 this.updateHiddenRows();
@@ -32867,9 +32875,16 @@ class FilterEvaluationPlugin extends UIPlugin {
     updateHiddenRows() {
         var _a, _b;
         const sheetId = this.getters.getActiveSheetId();
-        const filters = this.getters.getFilters(sheetId);
+        const filters = this.getters
+            .getFilters(sheetId)
+            .sort((filter1, filter2) => filter1.zoneWithHeaders.top - filter2.zoneWithHeaders.top);
         const hiddenRows = new Set();
         for (let filter of filters) {
+            // Disable filters whose header are hidden
+            if (this.getters.isRowHiddenByUser(sheetId, filter.zoneWithHeaders.top))
+                continue;
+            if (hiddenRows.has(filter.zoneWithHeaders.top))
+                continue;
             const filteredValues = (_b = (_a = this.filterValues[sheetId]) === null || _a === void 0 ? void 0 : _a[filter.id]) === null || _b === void 0 ? void 0 : _b.map(toLowerCase);
             if (!filteredValues || !filter.filteredZone)
                 continue;
@@ -32902,7 +32917,7 @@ class FilterEvaluationPlugin extends UIPlugin {
                     const valuesInFilterZone = filter.filteredZone
                         ? positions(filter.filteredZone)
                             .map((pos) => { var _a; return (_a = this.getters.getCell(sheetData.id, pos.col, pos.row)) === null || _a === void 0 ? void 0 : _a.formattedValue; })
-                            .filter(isDefined$1)
+                            .filter(isNonEmptyString)
                         : [];
                     // In xlsx, filtered values = values that are displayed, not values that are hidden
                     const xlsxFilteredValues = valuesInFilterZone.filter((val) => !filteredValues.includes(val));
@@ -38174,6 +38189,7 @@ class TopBar extends Component {
         this.state.menuState.parentMenu = menu;
         this.isSelectingMenu = true;
         this.openedEl = ev.target;
+        this.env.model.dispatch("STOP_EDITION");
     }
     closeMenus() {
         this.state.activeTool = "";
@@ -42423,6 +42439,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.2';
-__info__.date = '2023-03-06T07:17:51.313Z';
-__info__.hash = '6b4d816';
+__info__.version = '16.0.4';
+__info__.date = '2023-03-16T12:11:01.007Z';
+__info__.hash = 'ebbb1f0';

package/dist/{o_spreadsheet.iife.js → o-spreadsheet.iife.js}

@@ -893,6 +893,9 @@
   function isDefined$1(argument) {
       return argument !== undefined;
   }
+  function isNonEmptyString(str) {
+      return str !== undefined && str !== "";
+  }
   /**
    * Check if all the values of an object, and all the values of the objects inside of it, are undefined.
    */
@@ -8383,7 +8386,7 @@
       }
       onColorClick(color) {
           if (color) {
-              this.props.onColorPicked(color);
+              this.props.onColorPicked(toHex(color));
           }
       }
       getCheckMarkColor() {
@@ -8398,8 +8401,10 @@
               this.state.isCurrentColorInvalid = true;
               return;
           }
+          const color = toHex(this.state.currentColor);
           this.state.isCurrentColorInvalid = false;
-          this.props.onColorPicked(this.state.currentColor);
+          this.props.onColorPicked(color);
+          this.state.currentColor = color;
       }
       toggleColorPicker() {
           this.state.showGradient = !this.state.showGradient;
@@ -10036,7 +10041,7 @@
           return this.runtime.fontColor;
       }
       get secondaryFontColor() {
-          return relativeLuminance(this.primaryFontColor) <= 0.3 ? "#757575" : "#bbbbbb";
+          return relativeLuminance(this.backgroundColor) > 0.3 ? "#525252" : "#C8C8C8";
       }
       get figure() {
           return this.props.figure;
@@ -32767,6 +32772,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               case "CREATE_SHEET":
                   this.filterValues[cmd.sheetId] = {};
                   break;
+              case "HIDE_COLUMNS_ROWS":
+                  this.updateHiddenRows();
+                  break;
               case "UPDATE_FILTER":
                   this.updateFilter(cmd);
                   this.updateHiddenRows();
@@ -32868,9 +32876,16 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       updateHiddenRows() {
           var _a, _b;
           const sheetId = this.getters.getActiveSheetId();
-          const filters = this.getters.getFilters(sheetId);
+          const filters = this.getters
+              .getFilters(sheetId)
+              .sort((filter1, filter2) => filter1.zoneWithHeaders.top - filter2.zoneWithHeaders.top);
           const hiddenRows = new Set();
           for (let filter of filters) {
+              // Disable filters whose header are hidden
+              if (this.getters.isRowHiddenByUser(sheetId, filter.zoneWithHeaders.top))
+                  continue;
+              if (hiddenRows.has(filter.zoneWithHeaders.top))
+                  continue;
               const filteredValues = (_b = (_a = this.filterValues[sheetId]) === null || _a === void 0 ? void 0 : _a[filter.id]) === null || _b === void 0 ? void 0 : _b.map(toLowerCase);
               if (!filteredValues || !filter.filteredZone)
                   continue;
@@ -32903,7 +32918,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                       const valuesInFilterZone = filter.filteredZone
                           ? positions(filter.filteredZone)
                               .map((pos) => { var _a; return (_a = this.getters.getCell(sheetData.id, pos.col, pos.row)) === null || _a === void 0 ? void 0 : _a.formattedValue; })
-                              .filter(isDefined$1)
+                              .filter(isNonEmptyString)
                           : [];
                       // In xlsx, filtered values = values that are displayed, not values that are hidden
                       const xlsxFilteredValues = valuesInFilterZone.filter((val) => !filteredValues.includes(val));
@@ -38175,6 +38190,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           this.state.menuState.parentMenu = menu;
           this.isSelectingMenu = true;
           this.openedEl = ev.target;
+          this.env.model.dispatch("STOP_EDITION");
       }
       closeMenus() {
           this.state.activeTool = "";
@@ -42454,9 +42470,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.2';
-  __info__.date = '2023-03-06T07:17:51.313Z';
-  __info__.hash = '6b4d816';
+  __info__.version = '16.0.4';
+  __info__.date = '2023-03-16T12:11:01.007Z';
+  __info__.hash = 'ebbb1f0';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);