@odoo/o-spreadsheet 18.1.22 → 18.1.24

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.1.22
- * @date 2025-05-26T12:35:56.145Z
- * @hash ff4b0ba
+ * @version 18.1.24
+ * @date 2025-06-06T09:31:57.011Z
+ * @hash 0e386b2
  */
 
 (function (exports, owl) {
@@ -8294,9 +8294,10 @@
       avg: _t("Average"),
       sum: _t("Sum"),
   };
+  const NUMBER_CHAR_AGGREGATORS = ["max", "min", "avg", "sum", "count_distinct", "count"];
   const AGGREGATORS_BY_FIELD_TYPE = {
-      integer: ["max", "min", "avg", "sum", "count_distinct", "count"],
-      char: ["count_distinct", "count"],
+      integer: NUMBER_CHAR_AGGREGATORS,
+      char: NUMBER_CHAR_AGGREGATORS,
       boolean: ["count_distinct", "count", "bool_and", "bool_or"],
   };
   const AGGREGATORS = {};
@@ -10206,8 +10207,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;
@@ -10231,7 +10230,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);
           }
       }
   }
@@ -10248,7 +10248,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;
@@ -10286,7 +10286,7 @@ stores.inject(MyMetaStore, storeInstance);
               const y = bar.y + midRadius * Math.sin(midAngle) + 7;
               ctx.fillStyle = chartFontColor(options.background);
               ctx.strokeStyle = options.background || "#ffffff";
-              const displayValue = options.callback(value, "y");
+              const displayValue = options.callback(value, dataset, i);
               drawTextWithBackground(displayValue, x, y, ctx);
           }
       }
@@ -30051,9 +30051,51 @@ 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 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;
@@ -30262,6 +30304,7 @@ stores.inject(MyMetaStore, storeInstance);
     getPieChartTooltip: getPieChartTooltip,
     getPyramidChartData: getPyramidChartData,
     getPyramidChartScales: getPyramidChartScales,
+    getPyramidChartShowValues: getPyramidChartShowValues,
     getPyramidChartTooltip: getPyramidChartTooltip,
     getRadarChartData: getRadarChartData,
     getRadarChartDatasets: getRadarChartDatasets,
@@ -30275,6 +30318,7 @@ stores.inject(MyMetaStore, storeInstance);
     getTrendDatasetForLineChart: getTrendDatasetForLineChart,
     getWaterfallChartLegend: getWaterfallChartLegend,
     getWaterfallChartScales: getWaterfallChartScales,
+    getWaterfallChartShowValues: getWaterfallChartShowValues,
     getWaterfallChartTooltip: getWaterfallChartTooltip,
     getWaterfallDatasetAndLabels: getWaterfallDatasetAndLabels
   });
@@ -31373,7 +31417,7 @@ stores.inject(MyMetaStore, storeInstance);
                   title: getChartTitle(definition),
                   legend: getBarChartLegend(definition),
                   tooltip: getPyramidChartTooltip(definition, chartData),
-                  chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                  chartShowValuesPlugin: getPyramidChartShowValues(definition, chartData),
               },
           },
       };
@@ -31836,7 +31880,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 },
               },
           },
@@ -44319,13 +44363,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.
@@ -46755,12 +46801,7 @@ stores.inject(MyMetaStore, storeInstance);
                       entry[field.name] = { value: null, type: CellValueType.empty, formattedValue: "" };
                   }
                   else {
-                      if (field.type === "char") {
-                          entry[field.name] = { ...cell, value: cell.formattedValue || null };
-                      }
-                      else {
-                          entry[field.name] = cell;
-                      }
+                      entry[field.name] = cell;
                   }
               }
               entry["__count"] = { value: 1, type: CellValueType.number, formattedValue: "1" };
@@ -51826,6 +51867,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;
@@ -51846,6 +51890,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() {
@@ -58947,7 +58996,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;
               }
@@ -59018,7 +59067,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);
@@ -59111,6 +59163,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
       // ---------------------------------------------------------------------
@@ -68019,11 +68091,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 = [
               {
@@ -68033,7 +68100,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;
@@ -76436,9 +76510,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.1.22";
-  __info__.date = "2025-05-26T12:35:56.145Z";
-  __info__.hash = "ff4b0ba";
+  __info__.version = "18.1.24";
+  __info__.date = "2025-06-06T09:31:57.011Z";
+  __info__.hash = "0e386b2";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);