@odoo/o-spreadsheet 18.3.6 → 18.3.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.3.6
- * @date 2025-05-30T08:46:25.817Z
- * @hash afa4379
+ * @version 18.3.8
+ * @date 2025-06-12T09:51:55.929Z
+ * @hash 32dedd1
  */
 
 (function (exports, owl) {
@@ -5881,7 +5881,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);
   }
@@ -5930,6 +5932,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.
@@ -5937,9 +5942,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);
@@ -20956,8 +20958,6 @@ stores.inject(MyMetaStore, storeInstance);
               if (isNaN(value)) {
                   continue;
               }
-              const axisId = chart.config.type === "radar" ? dataset.rAxisID : dataset.yAxisID;
-              const displayValue = options.callback(Number(value), axisId);
               const point = dataset.data[i];
               const xPosition = point.x;
               let yPosition = 0;
@@ -20981,7 +20981,8 @@ stores.inject(MyMetaStore, storeInstance);
               textsPositions[xPosition].push(yPosition);
               ctx.fillStyle = point.options.backgroundColor;
               ctx.strokeStyle = options.background || "#ffffff";
-              drawTextWithBackground(displayValue, xPosition, yPosition, ctx);
+              const valueToDisplay = options.callback(Number(value), dataset, i);
+              drawTextWithBackground(valueToDisplay, xPosition, yPosition, ctx);
           }
       }
   }
@@ -20998,7 +20999,7 @@ stores.inject(MyMetaStore, storeInstance);
               if (isNaN(value)) {
                   continue;
               }
-              const displayValue = options.callback(value, dataset.xAxisID);
+              const displayValue = options.callback(value, dataset, i);
               const point = dataset.data[i];
               const yPosition = point.y;
               let xPosition = value < 0 ? point.x + point.width / 2 : point.x - point.width / 2;
@@ -21033,10 +21034,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, "y");
               drawTextWithBackground(displayValue, x, y, ctx);
           }
       }
@@ -26357,7 +26370,10 @@ stores.inject(MyMetaStore, storeInstance);
           horizontal: "horizontal" in definition && definition.horizontal,
           showValues: "showValues" in definition ? !!definition.showValues : false,
           background: definition.background,
-          callback: formatChartDatasetValue(axisFormats, locale),
+          callback: (value, dataset) => {
+              const axisId = getDatasetAxisId(definition, dataset);
+              return formatChartDatasetValue(axisFormats, locale)(value, axisId);
+          },
       };
   }
   function getSunburstShowValues(definition, args) {
@@ -26375,6 +26391,45 @@ stores.inject(MyMetaStore, storeInstance);
           },
       };
   }
+  function getPyramidChartShowValues(definition, args) {
+      const { axisFormats, locale } = args;
+      return {
+          horizontal: true,
+          showValues: "showValues" in definition ? !!definition.showValues : false,
+          background: definition.background,
+          callback: (value, dataset) => {
+              value = Math.abs(Number(value));
+              return formatChartDatasetValue(axisFormats, locale)(value, dataset.xAxisID || "x");
+          },
+      };
+  }
+  function getWaterfallChartShowValues(definition, args) {
+      const { axisFormats, locale, dataSetsValues } = args;
+      const subtotalIndexes = dataSetsValues.reduce((subtotalIndexes, ds) => {
+          subtotalIndexes.push((subtotalIndexes.at(-1) || -1) + ds.data.length + 1);
+          return subtotalIndexes;
+      }, []);
+      return {
+          showValues: "showValues" in definition ? !!definition.showValues : false,
+          background: definition.background,
+          callback: (value, dataset, index) => {
+              const raw = dataset._dataset.data[index];
+              const delta = raw[1] - raw[0];
+              let sign = delta >= 0 ? "+" : "";
+              if (definition.showSubTotals && subtotalIndexes.includes(index) && sign === "+") {
+                  sign = "";
+              }
+              return `${sign}${formatChartDatasetValue(axisFormats, locale)(delta, dataset.yAxisID)}`;
+          },
+      };
+  }
+  function getDatasetAxisId(definition, dataset) {
+      if (dataset.rAxisID) {
+          return dataset.rAxisID;
+      }
+      const axisId = "horizontal" in definition && definition.horizontal ? dataset.xAxisID : dataset.yAxisID;
+      return axisId || "y";
+  }
 
   function getChartTitle(definition) {
       const chartTitle = definition.title;
@@ -26777,6 +26832,7 @@ stores.inject(MyMetaStore, storeInstance);
     getPieChartTooltip: getPieChartTooltip,
     getPyramidChartData: getPyramidChartData,
     getPyramidChartScales: getPyramidChartScales,
+    getPyramidChartShowValues: getPyramidChartShowValues,
     getPyramidChartTooltip: getPyramidChartTooltip,
     getRadarChartData: getRadarChartData,
     getRadarChartDatasets: getRadarChartDatasets,
@@ -26796,6 +26852,7 @@ stores.inject(MyMetaStore, storeInstance);
     getTrendDatasetForLineChart: getTrendDatasetForLineChart,
     getWaterfallChartLegend: getWaterfallChartLegend,
     getWaterfallChartScales: getWaterfallChartScales,
+    getWaterfallChartShowValues: getWaterfallChartShowValues,
     getWaterfallChartTooltip: getWaterfallChartTooltip,
     getWaterfallDatasetAndLabels: getWaterfallDatasetAndLabels,
     makeDatasetsCumulative: makeDatasetsCumulative
@@ -28075,7 +28132,7 @@ stores.inject(MyMetaStore, storeInstance);
                   title: getChartTitle(definition),
                   legend: getBarChartLegend(definition),
                   tooltip: getPyramidChartTooltip(definition, chartData),
-                  chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                  chartShowValuesPlugin: getPyramidChartShowValues(definition, chartData),
               },
           },
       };
@@ -28816,7 +28873,7 @@ stores.inject(MyMetaStore, storeInstance);
                   title: getChartTitle(definition),
                   legend: getWaterfallChartLegend(definition),
                   tooltip: getWaterfallChartTooltip(definition, chartData),
-                  chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                  chartShowValuesPlugin: getWaterfallChartShowValues(definition, chartData),
                   waterfallLinesPlugin: { showConnectorLines: definition.showConnectorLines },
               },
           },
@@ -33128,7 +33185,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 {
@@ -36081,19 +36138,26 @@ stores.inject(MyMetaStore, storeInstance);
               .filter(({ row }) => !this.env.model.getters.isRowHidden(sheetId, row))
               .map(({ col, row }) => this.env.model.getters.getEvaluatedCell({ sheetId, col, row }).formattedValue);
           const filterValues = this.env.model.getters.getFilterHiddenValues({ sheetId, ...position });
-          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) => {
-              const checked = normalizedFilteredValues.findIndex((filteredValue) => filteredValue === normalizedValue) ===
-                  -1;
-              return {
-                  checked,
-                  string: strValues.find((val) => toLowerCase(val) === normalizedValue) || "",
-              };
-          });
+          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: !normalizedFilteredValues.has(normalizedValue),
+                      normalizedValue,
+                  });
+                  set.add(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;
@@ -47368,13 +47432,15 @@ stores.inject(MyMetaStore, storeInstance);
           if (this.selectedMatchIndex === null) {
               return;
           }
+          this.preserveSelectedMatchIndex = true;
+          this.shouldFinalizeUpdateSelection = true;
           this.model.dispatch("REPLACE_SEARCH", {
               searchString: this.toSearch,
               replaceWith: this.toReplace,
               matches: [this.searchMatches[this.selectedMatchIndex]],
               searchOptions: this.searchOptions,
           });
-          this.selectNextCell(Direction.next, { jumpToMatchSheet: true, updateSelection: true });
+          this.preserveSelectedMatchIndex = false;
       }
       /**
        * Apply the replace function to all the matches one time.
@@ -53530,7 +53596,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       hover(position) {
-          if (position.col === this.col && position.row === this.row) {
+          if (!this.getters.isDashboard() || (position.col === this.col && position.row === this.row)) {
               return "noStateChange";
           }
           this.col = position.col;
@@ -55206,6 +55272,9 @@ stores.inject(MyMetaStore, storeInstance);
           let deltaX = lastX - clientX;
           let deltaY = lastY - clientY;
           const elapsedTime = currentTime - lastTime;
+          if (!elapsedTime) {
+              return;
+          }
           velocityX = deltaX / elapsedTime;
           velocityY = deltaY / elapsedTime;
           lastX = clientX;
@@ -55226,6 +55295,11 @@ stores.inject(MyMetaStore, storeInstance);
       function onTouchEnd(ev) {
           isMouseDown = false;
           lastX = lastY = 0;
+          if (resetTimeout) {
+              clearTimeout(resetTimeout);
+          }
+          velocityX *= 1.2;
+          velocityY *= 1.2;
           requestAnimationFrame(scroll);
       }
       function scroll() {
@@ -61424,7 +61498,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"
@@ -61523,14 +61599,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;
@@ -62316,7 +62394,7 @@ stores.inject(MyMetaStore, storeInstance);
                   break;
               }
               case "UPDATE_PIVOT": {
-                  this.history.update("pivots", cmd.pivotId, "definition", deepCopy(cmd.pivot));
+                  this.history.update("pivots", cmd.pivotId, "definition", this.repairSortedColumn(deepCopy(cmd.pivot)));
                   this.compileCalculatedMeasures(cmd.pivot.measures);
                   break;
               }
@@ -62387,7 +62465,10 @@ stores.inject(MyMetaStore, storeInstance);
       // Private
       // -------------------------------------------------------------------------
       addPivot(pivotId, pivot, formulaId = this.nextFormulaId.toString()) {
-          this.history.update("pivots", pivotId, { definition: deepCopy(pivot), formulaId });
+          this.history.update("pivots", pivotId, {
+              definition: this.repairSortedColumn(deepCopy(pivot)),
+              formulaId,
+          });
           this.compileCalculatedMeasures(pivot.measures);
           this.history.update("formulaIds", formulaId, pivotId);
           this.history.update("nextFormulaId", this.nextFormulaId + 1);
@@ -62476,6 +62557,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
       }
       checkSortedColumnInMeasures(definition) {
+          definition = this.repairSortedColumn(definition);
           const measures = definition.measures.map((measure) => measure.id);
           if (definition.sortedColumn && !measures.includes(definition.sortedColumn.measure)) {
               return "InvalidDefinition" /* CommandResult.InvalidDefinition */;
@@ -62489,6 +62571,26 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return "Success" /* CommandResult.Success */;
       }
+      repairSortedColumn(definition) {
+          if (definition.sortedColumn) {
+              // Fix for an upgrade issue: the sortedColumn measure was not updated
+              // from using fieldName to using id. If the sortedColumn measure matches
+              // a measure fieldName in the definition, update it to use the measure's id instead
+              // of its fieldName.
+              // TODO: add an upgrade step to fix this in master and remove this code
+              const sortedMeasure = definition.measures.find((measure) => measure.fieldName === definition.sortedColumn?.measure);
+              if (sortedMeasure) {
+                  return {
+                      ...definition,
+                      sortedColumn: {
+                          ...definition.sortedColumn,
+                          measure: sortedMeasure.id,
+                      },
+                  };
+              }
+          }
+          return definition;
+      }
       // ---------------------------------------------------------------------
       // Import/Export
       // ---------------------------------------------------------------------
@@ -71132,9 +71234,10 @@ stores.inject(MyMetaStore, storeInstance);
               const filteredZone = filter.filteredRange?.zone;
               if (!filteredValues || !filteredZone)
                   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);
                   }
               }
@@ -71648,11 +71751,6 @@ stores.inject(MyMetaStore, storeInstance);
               },
           ];
           const sheetId = this.getActiveSheetId();
-          const handler = new CellClipboardHandler(this.getters, this.dispatch);
-          const data = handler.copy(getClipboardDataPositions(sheetId, target));
-          if (!data) {
-              return;
-          }
           const base = isBasedBefore ? cmd.base : cmd.base + 1;
           const pasteTarget = [
               {
@@ -71662,7 +71760,14 @@ stores.inject(MyMetaStore, storeInstance);
                   bottom: !isCol ? base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
               },
           ];
-          handler.paste({ zones: pasteTarget, sheetId }, data, { isCutOperation: true });
+          for (const Handler of clipboardHandlersRegistries.cellHandlers.getAll()) {
+              const handler = new Handler(this.getters, this.dispatch);
+              const data = handler.copy(getClipboardDataPositions(sheetId, target));
+              if (!data) {
+                  continue;
+              }
+              handler.paste({ zones: pasteTarget, sheetId }, data, { isCutOperation: true });
+          }
           const selection = pasteTarget[0];
           const col = selection.left;
           const row = selection.top;
@@ -80562,9 +80667,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.3.6";
-  __info__.date = "2025-05-30T08:46:25.817Z";
-  __info__.hash = "afa4379";
+  __info__.version = "18.3.8";
+  __info__.date = "2025-06-12T09:51:55.929Z";
+  __info__.hash = "32dedd1";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);