@odoo/o-spreadsheet 18.4.0-alpha.7 → 18.4.0-alpha.8

package/dist/o-spreadsheet.iife.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.4.0-alpha.7
- * @date 2025-06-06T09:32:44.285Z
- * @hash 2bfbe64
+ * @version 18.4.0-alpha.8
+ * @date 2025-06-12T09:53:48.133Z
+ * @hash 9b7a8d0
  */
 
 (function (exports, owl) {
@@ -131,7 +131,7 @@
 
   const CANVAS_SHIFT = 0.5;
   // Colors
-  const HIGHLIGHT_COLOR = "#37A850";
+  const HIGHLIGHT_COLOR = "#017E84";
   const BACKGROUND_GRAY_COLOR = "#f5f5f5";
   const BACKGROUND_HEADER_COLOR = "#F8F9FA";
   const BACKGROUND_HEADER_SELECTED_COLOR = "#E8EAED";
@@ -144,7 +144,7 @@
   const BACKGROUND_CHART_COLOR = "#FFFFFF";
   const DISABLED_TEXT_COLOR = "#CACACA";
   const DEFAULT_COLOR_SCALE_MIDPOINT_COLOR = 0xb6d7a8;
-  const LINK_COLOR = "#017E84";
+  const LINK_COLOR = HIGHLIGHT_COLOR;
   const FILTERS_COLOR = "#188038";
   const SEPARATOR_COLOR = "#E0E2E4";
   const ICONS_COLOR = "#4A4F59";
@@ -173,7 +173,7 @@
   const BUTTON_HOVER_TEXT_COLOR = "#111827";
   const BUTTON_ACTIVE_BG = "#e6f2f3";
   const BUTTON_ACTIVE_TEXT_COLOR = "#111827";
-  const ACTION_COLOR = "#017E84";
+  const ACTION_COLOR = HIGHLIGHT_COLOR;
   const ACTION_COLOR_HOVER = "#01585c";
   const ALERT_WARNING_BG = "#FBEBCC";
   const ALERT_WARNING_BORDER = "#F8E2B3";
@@ -1567,6 +1567,19 @@
           this.palette = getAlternatingColorsPalette(paletteSize).filter((c) => !preferredColors.includes(c));
       }
   }
+  class AlternatingColorMap {
+      availableColors;
+      colors = {};
+      constructor(paletteSize = 12) {
+          this.availableColors = new AlternatingColorGenerator(paletteSize);
+      }
+      get(id) {
+          if (!this.colors[id]) {
+              this.colors[id] = this.availableColors.next();
+          }
+          return this.colors[id];
+      }
+  }
   /**
    * Returns a function that maps a value to a color using a color scale defined by the given
    * color/threshold values pairs.
@@ -5006,7 +5019,9 @@
   }
 
   function evaluateLiteral(literalCell, localeFormat) {
-      const value = isTextFormat(localeFormat.format) ? literalCell.content : literalCell.parsedValue;
+      const value = isTextFormat(localeFormat.format) && literalCell.parsedValue !== null
+          ? literalCell.content
+          : literalCell.parsedValue;
       const functionResult = { value, format: localeFormat.format };
       return createEvaluatedCell(functionResult, localeFormat.locale);
   }
@@ -5055,6 +5070,9 @@
       if (isEvaluationError(value)) {
           return errorCell(value, message);
       }
+      if (value === null) {
+          return emptyCell(format);
+      }
       if (isTextFormat(format)) {
           // TO DO:
           // with the next line, the value of the cell is transformed depending on the format.
@@ -5062,9 +5080,6 @@
           // to interpret the value as a number.
           return textCell(toString(value), format, formattedValue);
       }
-      if (value === null) {
-          return emptyCell(format);
-      }
       if (typeof value === "number") {
           if (isDateTimeFormat(format || "")) {
               return dateTimeCell(value, format, formattedValue);
@@ -19352,8 +19367,9 @@ stores.inject(MyMetaStore, storeInstance);
           arg("include_total (boolean, default=TRUE)", _t("Whether to include total/sub-totals or not.")),
           arg("include_column_titles (boolean, default=TRUE)", _t("Whether to include the column titles or not.")),
           arg("column_count (number, optional)", _t("number of columns")),
+          arg("include_measure_titles (boolean, default=TRUE)", _t("Whether to include the measure titles row or not.")),
       ],
-      compute: function (pivotFormulaId, rowCount = { value: 10000 }, includeTotal = { value: true }, includeColumnHeaders = { value: true }, columnCount = { value: Number.MAX_VALUE }) {
+      compute: function (pivotFormulaId, rowCount = { value: 10000 }, includeTotal = { value: true }, includeColumnHeaders = { value: true }, columnCount = { value: Number.MAX_VALUE }, includeMeasureTitles = { value: true }) {
           const _pivotFormulaId = toString(pivotFormulaId);
           const _rowCount = toNumber(rowCount, this.locale);
           if (_rowCount < 0) {
@@ -19363,8 +19379,11 @@ stores.inject(MyMetaStore, storeInstance);
           if (_columnCount < 0) {
               return new EvaluationError(_t("The number of columns must be positive."));
           }
-          const _includeColumnHeaders = toBoolean(includeColumnHeaders);
-          const _includedTotal = toBoolean(includeTotal);
+          const visibilityOptions = {
+              displayColumnHeaders: toBoolean(includeColumnHeaders),
+              displayTotals: toBoolean(includeTotal),
+              displayMeasuresRow: toBoolean(includeMeasureTitles),
+          };
           const pivotId = getPivotId(_pivotFormulaId, this.getters);
           const pivot = this.getters.getPivot(pivotId);
           const coreDefinition = this.getters.getPivotCoreDefinition(pivotId);
@@ -19375,9 +19394,15 @@ stores.inject(MyMetaStore, storeInstance);
               return error;
           }
           const table = pivot.getCollapsedTableStructure();
-          const cells = table.getPivotCells(_includedTotal, _includeColumnHeaders);
-          const headerRows = _includeColumnHeaders ? table.columns.length : 0;
-          const pivotTitle = this.getters.getPivotDisplayName(pivotId);
+          const cells = table.getPivotCells(visibilityOptions);
+          let headerRows = 0;
+          if (visibilityOptions.displayColumnHeaders) {
+              headerRows = table.columns.length - 1;
+          }
+          if (visibilityOptions.displayMeasuresRow) {
+              headerRows++;
+          }
+          const pivotTitle = this.getters.getPivotName(pivotId);
           const tableHeight = Math.min(headerRows + _rowCount, cells[0].length);
           if (tableHeight === 0) {
               return [[{ value: pivotTitle }]];
@@ -19405,7 +19430,7 @@ stores.inject(MyMetaStore, storeInstance);
                   }
               }
           }
-          if (_includeColumnHeaders) {
+          if (visibilityOptions.displayColumnHeaders || visibilityOptions.displayMeasuresRow) {
               result[0][0] = { value: pivotTitle };
           }
           return result;
@@ -21744,10 +21769,22 @@ stores.inject(MyMetaStore, storeInstance);
               const midAngle = (startAngle + endAngle) / 2;
               const midRadius = (innerRadius + outerRadius) / 2;
               const x = bar.x + midRadius * Math.cos(midAngle);
-              const y = bar.y + midRadius * Math.sin(midAngle) + 7;
+              const y = bar.y + midRadius * Math.sin(midAngle);
+              const displayValue = options.callback(value, dataset, i);
+              const textHeight = 12; // ChartJS default
+              const textWidth = computeTextWidth(ctx, displayValue, { fontSize: textHeight }, "px");
+              const radius = outerRadius - innerRadius;
+              // Check if the text fits in the slice. Not perfect, but good enough heuristic.
+              if (textWidth >= radius || radius < textHeight) {
+                  continue;
+              }
+              const sliceAngle = endAngle - startAngle;
+              const midWidth = 2 * midRadius * Math.tan(sliceAngle / 2);
+              if (sliceAngle < Math.PI / 2 && (textWidth >= midWidth || midWidth < textHeight)) {
+                  continue;
+              }
               ctx.fillStyle = chartFontColor(options.background);
               ctx.strokeStyle = options.background || "#ffffff";
-              const displayValue = options.callback(value, dataset, i);
               drawTextWithBackground(displayValue, x, y, ctx);
           }
       }
@@ -34940,17 +34977,22 @@ stores.inject(MyMetaStore, storeInstance);
       static components = { FilterMenuValueItem };
       state = owl.useState({
           values: [],
+          displayedValues: [],
           textFilter: "",
           selectedValue: undefined,
+          numberOfDisplayedValues: 50,
+          hasMoreValues: false,
       });
       searchBar = owl.useRef("filterMenuSearchBar");
       setup() {
           owl.onWillUpdateProps((nextProps) => {
               if (!deepEquals(nextProps.filterPosition, this.props.filterPosition)) {
                   this.state.values = this.getFilterHiddenValues(nextProps.filterPosition);
+                  this.computeDisplayedValues();
               }
           });
           this.state.values = this.getFilterHiddenValues(this.props.filterPosition);
+          this.computeDisplayedValues();
       }
       getFilterHiddenValues(position) {
           const sheetId = this.env.model.getters.getActiveSheetId();
@@ -34968,21 +35010,28 @@ stores.inject(MyMetaStore, storeInstance);
           }
           const cellValues = cells.map((val) => val.cellValue);
           const filterValues = filterValue?.filterType === "values" ? filterValue.hiddenValues : [];
-          const strValues = [...cellValues, ...filterValues];
-          const normalizedFilteredValues = filterValues.map(toLowerCase);
-          // Set with lowercase values to avoid duplicates
-          const normalizedValues = [...new Set(strValues.map(toLowerCase))];
-          const sortedValues = normalizedValues.sort((val1, val2) => val1.localeCompare(val2, undefined, { numeric: true, sensitivity: "base" }));
-          return sortedValues.map((normalizedValue) => {
-              let checked = false;
-              if (filterValue?.filterType !== "criterion") {
-                  checked = normalizedFilteredValues.findIndex((val) => val === normalizedValue) === -1;
+          const normalizedFilteredValues = new Set(filterValues.map(toLowerCase));
+          const set = new Set();
+          const values = [];
+          const addValue = (value) => {
+              const normalizedValue = toLowerCase(value);
+              if (!set.has(normalizedValue)) {
+                  values.push({
+                      string: value || "",
+                      checked: filterValue?.filterType !== "criterion"
+                          ? !normalizedFilteredValues.has(normalizedValue)
+                          : false,
+                      normalizedValue,
+                  });
+                  set.add(normalizedValue);
               }
-              return {
-                  checked,
-                  string: strValues.find((val) => toLowerCase(val) === normalizedValue) || "",
-              };
-          });
+          };
+          cellValues.forEach(addValue);
+          filterValues.forEach(addValue);
+          return values.sort((val1, val2) => val1.normalizedValue.localeCompare(val2.normalizedValue, undefined, {
+              numeric: true,
+              sensitivity: "base",
+          }));
       }
       checkValue(value) {
           this.state.selectedValue = value.string;
@@ -34994,25 +35043,37 @@ stores.inject(MyMetaStore, storeInstance);
           this.state.selectedValue = value.string;
       }
       selectAll() {
-          this.displayedValues.forEach((value) => (value.checked = true));
-          this.updateHiddenValues();
+          this.state.displayedValues.forEach((value) => (value.checked = true));
+          this.props.onUpdateHiddenValues([]);
       }
       clearAll() {
-          this.displayedValues.forEach((value) => (value.checked = false));
-          this.updateHiddenValues();
+          this.state.displayedValues.forEach((value) => (value.checked = false));
+          const hiddenValues = this.state.values.map((val) => val.string);
+          this.props.onUpdateHiddenValues(hiddenValues);
       }
       updateHiddenValues() {
           const hiddenValues = this.state.values.filter((val) => !val.checked).map((val) => val.string);
           this.props.onUpdateHiddenValues(hiddenValues);
       }
-      get displayedValues() {
-          if (!this.state.textFilter) {
-              return this.state.values;
-          }
-          return fuzzyLookup(this.state.textFilter, this.state.values, (val) => val.string);
+      updateSearch(ev) {
+          const target = ev.target;
+          this.state.textFilter = target.value;
+          this.state.selectedValue = undefined;
+          this.computeDisplayedValues();
+      }
+      computeDisplayedValues() {
+          const values = !this.state.textFilter
+              ? this.state.values
+              : fuzzyLookup(this.state.textFilter, this.state.values, (val) => val.string);
+          this.state.displayedValues = values.slice(0, this.state.numberOfDisplayedValues);
+          this.state.hasMoreValues = values.length > this.state.numberOfDisplayedValues;
+      }
+      loadMoreValues() {
+          this.state.numberOfDisplayedValues += 100;
+          this.computeDisplayedValues();
       }
       onKeyDown(ev) {
-          const displayedValues = this.displayedValues;
+          const displayedValues = this.state.displayedValues;
           if (displayedValues.length === 0)
               return;
           let selectedIndex = undefined;
@@ -38485,7 +38546,7 @@ stores.inject(MyMetaStore, storeInstance);
        */
       handleMissingValue(parentElement, missingElementName, optionalArgs) {
           if (optionalArgs?.required) {
-              if (optionalArgs?.default) {
+              if (optionalArgs?.default !== undefined) {
                   this.warningManager.addParsingWarning(`Missing required ${missingElementName} in element <${parentElement.tagName}> of ${this.currentFile}, replacing it by the default value ${optionalArgs.default}`);
               }
               else {
@@ -48708,7 +48769,8 @@ stores.inject(MyMetaStore, storeInstance);
     input.o-font-size {
       outline: none;
       height: 20px;
-      width: 23px;
+      width: 31px;
+      text-align: center;
     }
   }
   .o-text-options > div {
@@ -53786,28 +53848,45 @@ stores.inject(MyMetaStore, storeInstance);
       getNumberOfDataColumns() {
           return this.columns.at(-1)?.length || 0;
       }
-      getPivotCells(includeTotal = true, includeColumnHeaders = true) {
-          const key = JSON.stringify({ includeTotal, includeColumnHeaders });
+      getSkippedRows(visibilityOptions) {
+          const skippedRows = new Set();
+          if (!visibilityOptions.displayColumnHeaders) {
+              for (let i = 0; i < this.columns.length - 1; i++) {
+                  skippedRows.add(i);
+              }
+          }
+          if (!visibilityOptions.displayMeasuresRow) {
+              skippedRows.add(this.columns.length - 1);
+          }
+          return skippedRows;
+      }
+      getPivotCells(visibilityOptions = {
+          displayColumnHeaders: true,
+          displayTotals: true,
+          displayMeasuresRow: true,
+      }) {
+          const key = JSON.stringify(visibilityOptions);
           if (!this.pivotCells[key]) {
+              const { displayTotals } = visibilityOptions;
               const numberOfDataRows = this.rows.length;
               const numberOfDataColumns = this.getNumberOfDataColumns();
               let pivotHeight = this.columns.length + numberOfDataRows;
               let pivotWidth = 1 /*(row headers)*/ + numberOfDataColumns;
-              if (!includeTotal && numberOfDataRows !== 1) {
+              if (!displayTotals && numberOfDataRows !== 1) {
                   pivotHeight -= 1;
               }
-              if (!includeTotal && numberOfDataColumns !== this.measures.length) {
+              if (!displayTotals && numberOfDataColumns !== this.measures.length) {
                   pivotWidth -= this.measures.length;
               }
               const domainArray = [];
-              const startRow = includeColumnHeaders ? 0 : this.columns.length;
+              const skippedRows = this.getSkippedRows(visibilityOptions);
               for (let col = 0; col < pivotWidth; col++) {
                   domainArray.push([]);
-                  for (let row = startRow; row < pivotHeight; row++) {
-                      if (!includeTotal && row === pivotHeight) {
+                  for (let row = 0; row < pivotHeight; row++) {
+                      if (skippedRows.has(row)) {
                           continue;
                       }
-                      domainArray[col].push(this.getPivotCell(col, row, includeTotal));
+                      domainArray[col].push(this.getPivotCell(col, row, displayTotals));
                   }
               }
               this.pivotCells[key] = domainArray;
@@ -61998,7 +62077,9 @@ stores.inject(MyMetaStore, storeInstance);
                   const ranges = cmd.ranges.map((rangeData) => this.getters.getRangeFromRangeData(rangeData));
                   const union = this.getters.getRangesUnion(ranges);
                   const mergesInTarget = this.getters.getMergesInZone(cmd.sheetId, union.zone);
-                  this.dispatch("REMOVE_MERGE", { sheetId: cmd.sheetId, target: mergesInTarget });
+                  if (mergesInTarget.length) {
+                      this.dispatch("REMOVE_MERGE", { sheetId: cmd.sheetId, target: mergesInTarget });
+                  }
                   const id = this.consumeNextId();
                   const config = cmd.config || DEFAULT_TABLE_CONFIG;
                   const newTable = cmd.tableType === "dynamic"
@@ -62097,14 +62178,16 @@ stores.inject(MyMetaStore, storeInstance);
           const zoneToCheckIfEmpty = direction === "down"
               ? { ...zone, bottom: zone.bottom + 1, top: zone.bottom + 1 }
               : { ...zone, right: zone.right + 1, left: zone.right + 1 };
-          for (const position of positions(zoneToCheckIfEmpty)) {
-              const cellPosition = { sheetId, ...position };
-              // Since this plugin is loaded before CellPlugin, the getters still give us the old cell content
-              const cellContent = this.getters.getCell(cellPosition)?.content;
-              if (cellContent ||
-                  this.getters.isInMerge(cellPosition) ||
-                  this.getTablesOverlappingZones(sheetId, [positionToZone(position)]).length) {
-                  return "none";
+          for (let row = zoneToCheckIfEmpty.top; row <= zoneToCheckIfEmpty.bottom; row++) {
+              for (let col = zoneToCheckIfEmpty.left; col <= zoneToCheckIfEmpty.right; col++) {
+                  const cellPosition = { sheetId, col, row };
+                  // Since this plugin is loaded before CellPlugin, the getters still give us the old cell content
+                  const cellContent = this.getters.getCell(cellPosition)?.content;
+                  if (cellContent ||
+                      this.getters.isInMerge(cellPosition) ||
+                      this.getTablesOverlappingZones(sheetId, [positionToZone(cellPosition)]).length) {
+                      return "none";
+                  }
               }
           }
           return direction;
@@ -67257,10 +67340,15 @@ stores.inject(MyMetaStore, storeInstance);
               const includeTotal = toScalar(args[2]);
               const shouldIncludeTotal = includeTotal === undefined ? true : toBoolean(includeTotal);
               const includeColumnHeaders = toScalar(args[3]);
+              const includeMeasures = toScalar(args[5]);
+              const shouldIncludeMeasures = includeMeasures === undefined ? true : toBoolean(includeMeasures);
               const shouldIncludeColumnHeaders = includeColumnHeaders === undefined ? true : toBoolean(includeColumnHeaders);
-              const pivotCells = pivot
-                  .getCollapsedTableStructure()
-                  .getPivotCells(shouldIncludeTotal, shouldIncludeColumnHeaders);
+              const visibilityOptions = {
+                  displayColumnHeaders: shouldIncludeColumnHeaders,
+                  displayTotals: shouldIncludeTotal,
+                  displayMeasuresRow: shouldIncludeMeasures,
+              };
+              const pivotCells = pivot.getCollapsedTableStructure().getPivotCells(visibilityOptions);
               const pivotCol = position.col - mainPosition.col;
               const pivotRow = position.row - mainPosition.row;
               return pivotCells[pivotCol][pivotRow];
@@ -69482,8 +69570,7 @@ stores.inject(MyMetaStore, storeInstance);
           "isFullySynchronized",
       ];
       static layers = ["Selection"];
-      availableColors = new AlternatingColorGenerator(12);
-      colors = {};
+      colors = new AlternatingColorMap(12);
       session;
       constructor(config) {
           super(config);
@@ -69501,7 +69588,7 @@ stores.inject(MyMetaStore, storeInstance);
       }
       getConnectedClients() {
           return [...this.session.getConnectedClients()].map((client) => {
-              return { ...client, color: this.colors[client.id] };
+              return { ...client, color: this.colors.get(client.id) };
           });
       }
       isFullySynchronized() {
@@ -69530,10 +69617,7 @@ stores.inject(MyMetaStore, storeInstance);
                   client.position &&
                   client.position.sheetId === sheetId &&
                   this.isPositionValid(client.position)) {
-                  if (!this.colors[client.id]) {
-                      this.colors[client.id] = this.availableColors.next();
-                  }
-                  clients.push({ ...client, color: this.colors[client.id], position: client.position });
+                  clients.push({ ...client, position: client.position });
               }
           }
           return clients;
@@ -72407,9 +72491,10 @@ stores.inject(MyMetaStore, storeInstance);
                   const filteredValues = filterValue.hiddenValues?.map(toLowerCase);
                   if (!filteredValues)
                       continue;
+                  const filteredValuesSet = new Set(filteredValues);
                   for (let row = filteredZone.top; row <= filteredZone.bottom; row++) {
                       const value = this.getCellValueAsString(sheetId, filter.col, row);
-                      if (filteredValues.includes(value)) {
+                      if (filteredValuesSet.has(value)) {
                           hiddenRows.add(row);
                       }
                   }
@@ -75091,7 +75176,7 @@ stores.inject(MyMetaStore, storeInstance);
   })
       .addChild("settings", ["file"], {
       name: _t("Settings"),
-      sequence: 100,
+      sequence: 200,
       execute: (env) => env.openSidePanel("Settings"),
       isEnabled: (env) => !env.isSmall,
       icon: "o-spreadsheet-Icon.COG",
@@ -78000,7 +78085,7 @@ stores.inject(MyMetaStore, storeInstance);
 
   .o-spreadsheet-topbar {
     line-height: 1.2;
-    font-size: 13px;
+    font-size: 14px;
     font-weight: 500;
     background-color: #fff;
 
@@ -83259,6 +83344,7 @@ stores.inject(MyMetaStore, storeInstance);
   exports.AbstractChart = AbstractChart;
   exports.AbstractFigureClipboardHandler = AbstractFigureClipboardHandler;
   exports.CellErrorType = CellErrorType;
+  exports.ClientDisconnectedError = ClientDisconnectedError;
   exports.CorePlugin = CorePlugin;
   exports.CoreViewPlugin = CoreViewPlugin;
   exports.DispatchResult = DispatchResult;
@@ -83305,9 +83391,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.4.0-alpha.7";
-  __info__.date = "2025-06-06T09:32:44.285Z";
-  __info__.hash = "2bfbe64";
+  __info__.version = "18.4.0-alpha.8";
+  __info__.date = "2025-06-12T09:53:48.133Z";
+  __info__.hash = "9b7a8d0";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);