@odoo/o-spreadsheet 18.0.31 → 18.0.33

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.0.31
- * @date 2025-05-30T08:43:10.315Z
- * @hash d201086
+ * @version 18.0.33
+ * @date 2025-06-12T09:17:53.747Z
+ * @hash c1d64fb
  */
 
 (function (exports, owl) {
@@ -5677,7 +5677,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);
   }
@@ -5726,6 +5728,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.
@@ -5733,9 +5738,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);
@@ -10121,7 +10123,8 @@ stores.inject(MyMetaStore, storeInstance);
               textsPositions[xPosition].push(yPosition);
               ctx.fillStyle = point.options.backgroundColor;
               ctx.strokeStyle = options.background || "#ffffff";
-              drawTextWithBackground(options.callback(value - 0), xPosition, yPosition, ctx);
+              const valueToDisplay = options.callback(Number(value), dataset, i);
+              drawTextWithBackground(valueToDisplay, xPosition, yPosition, ctx);
           }
       }
   }
@@ -10135,7 +10138,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           for (let i = 0; i < dataset._parsed.length; i++) {
               const value = dataset._parsed[i].x;
-              const displayValue = options.callback(value - 0);
+              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;
@@ -10170,10 +10173,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);
               drawTextWithBackground(displayValue, x, y, ctx);
           }
       }
@@ -13390,7 +13405,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 {
@@ -30890,7 +30905,7 @@ stores.inject(MyMetaStore, storeInstance);
           return tooltipLabelCallback(tooltipItem);
       };
       const callback = config.options.plugins.chartShowValuesPlugin.callback;
-      config.options.plugins.chartShowValuesPlugin.callback = (x) => callback(Math.abs(x));
+      config.options.plugins.chartShowValuesPlugin.callback = (value, dataset, index) => callback(Math.abs(value), dataset, index);
       return { chartJsConfig: config, background: chart.background || BACKGROUND_CHART_COLOR };
   }
 
@@ -31165,7 +31180,7 @@ stores.inject(MyMetaStore, storeInstance);
           return new WaterfallChart(definition, this.sheetId, this.getters);
       }
   }
-  function getWaterfallConfiguration(chart, labels, dataSeriesLabels, localeFormat) {
+  function getWaterfallConfiguration(chart, labels, dataSeriesLabels, localeFormat, dataSetsValues) {
       const { locale, format } = localeFormat;
       const fontColor = chartFontColor(chart.background);
       const config = getDefaultChartJsRuntime(chart, labels, fontColor, localeFormat);
@@ -31258,10 +31273,22 @@ stores.inject(MyMetaStore, storeInstance);
           },
       };
       config.options.plugins.waterfallLinesPlugin = { showConnectorLines: chart.showConnectorLines };
+      const subtotalIndexes = dataSetsValues.reduce((subtotalIndexes, ds) => {
+          subtotalIndexes.push((subtotalIndexes.at(-1) || -1) + ds.data.length + 1);
+          return subtotalIndexes;
+      }, []);
       config.options.plugins.chartShowValuesPlugin = {
           showValues: chart.showValues,
           background: chart.background,
-          callback: formatTickValue(localeFormat),
+          callback: (value, dataset, index) => {
+              const raw = dataset._dataset.data[index];
+              const delta = raw[1] - raw[0];
+              let sign = delta >= 0 ? "+" : "";
+              if (chart.showSubTotals && subtotalIndexes.includes(index) && sign === "+") {
+                  sign = "";
+              }
+              return `${sign}${formatTickValue(localeFormat)(delta)}`;
+          },
       };
       return config;
   }
@@ -31282,10 +31309,7 @@ stores.inject(MyMetaStore, storeInstance);
       const dataSetFormat = getChartDatasetFormat(getters, chart.dataSets);
       const locale = getters.getLocale();
       const dataSeriesLabels = dataSetsValues.map((dataSet) => dataSet.label);
-      const config = getWaterfallConfiguration(chart, labels, dataSeriesLabels, {
-          format: dataSetFormat,
-          locale,
-      });
+      const config = getWaterfallConfiguration(chart, labels, dataSeriesLabels, { format: dataSetFormat, locale }, dataSetsValues);
       config.type = "bar";
       const negativeColor = chart.negativeValuesColor || CHART_WATERFALL_NEGATIVE_COLOR;
       const positiveColor = chart.positiveValuesColor || CHART_WATERFALL_POSITIVE_COLOR;
@@ -32507,19 +32531,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;
@@ -42346,13 +42377,14 @@ stores.inject(MyMetaStore, storeInstance);
           if (this.selectedMatchIndex === null) {
               return;
           }
+          this.preserveSelectedMatchIndex = true;
           this.model.dispatch("REPLACE_SEARCH", {
               searchString: this.toSearch,
               replaceWith: this.toReplace,
               matches: [this.searchMatches[this.selectedMatchIndex]],
               searchOptions: this.searchOptions,
           });
-          this.selectNextCell(Direction.next);
+          this.preserveSelectedMatchIndex = false;
       }
       /**
        * Apply the replace function to all the matches one time.
@@ -49697,6 +49729,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;
@@ -49717,6 +49752,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() {
@@ -56009,7 +56049,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.uuidGenerator.smallUuid();
                   const config = cmd.config || DEFAULT_TABLE_CONFIG;
                   const newTable = cmd.tableType === "dynamic"
@@ -56120,14 +56162,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;
@@ -65452,9 +65496,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);
                   }
               }
@@ -65969,11 +66014,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 = [
               {
@@ -65983,7 +66023,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;
@@ -74399,9 +74446,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.0.31";
-  __info__.date = "2025-05-30T08:43:10.315Z";
-  __info__.hash = "d201086";
+  __info__.version = "18.0.33";
+  __info__.date = "2025-06-12T09:17:53.747Z";
+  __info__.hash = "c1d64fb";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);