@odoo/o-spreadsheet 18.3.6 → 18.3.7

package/dist/o-spreadsheet.cjs.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.7
+ * @date 2025-06-06T09:31:27.123Z
+ * @hash 05333f1
  */
 
 'use strict';
@@ -20957,8 +20957,6 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
             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;
@@ -20982,7 +20980,8 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
             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);
         }
     }
 }
@@ -20999,7 +20998,7 @@ function drawHorizontalBarChartValues(chart, options, ctx) {
             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;
@@ -21037,7 +21036,7 @@ function drawPieChartValues(chart, options, ctx) {
             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);
         }
     }
@@ -26358,7 +26357,10 @@ function getChartShowValues(definition, args) {
         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) {
@@ -26376,6 +26378,45 @@ function getSunburstShowValues(definition, args) {
         },
     };
 }
+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;
@@ -26778,6 +26819,7 @@ var CHART_RUNTIME_HELPERS = /*#__PURE__*/Object.freeze({
   getPieChartTooltip: getPieChartTooltip,
   getPyramidChartData: getPyramidChartData,
   getPyramidChartScales: getPyramidChartScales,
+  getPyramidChartShowValues: getPyramidChartShowValues,
   getPyramidChartTooltip: getPyramidChartTooltip,
   getRadarChartData: getRadarChartData,
   getRadarChartDatasets: getRadarChartDatasets,
@@ -26797,6 +26839,7 @@ var CHART_RUNTIME_HELPERS = /*#__PURE__*/Object.freeze({
   getTrendDatasetForLineChart: getTrendDatasetForLineChart,
   getWaterfallChartLegend: getWaterfallChartLegend,
   getWaterfallChartScales: getWaterfallChartScales,
+  getWaterfallChartShowValues: getWaterfallChartShowValues,
   getWaterfallChartTooltip: getWaterfallChartTooltip,
   getWaterfallDatasetAndLabels: getWaterfallDatasetAndLabels,
   makeDatasetsCumulative: makeDatasetsCumulative
@@ -28076,7 +28119,7 @@ function createPyramidChartRuntime(chart, getters) {
                 title: getChartTitle(definition),
                 legend: getBarChartLegend(definition),
                 tooltip: getPyramidChartTooltip(definition, chartData),
-                chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                chartShowValuesPlugin: getPyramidChartShowValues(definition, chartData),
             },
         },
     };
@@ -28817,7 +28860,7 @@ function createWaterfallChartRuntime(chart, getters) {
                 title: getChartTitle(definition),
                 legend: getWaterfallChartLegend(definition),
                 tooltip: getWaterfallChartTooltip(definition, chartData),
-                chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                chartShowValuesPlugin: getWaterfallChartShowValues(definition, chartData),
                 waterfallLinesPlugin: { showConnectorLines: definition.showConnectorLines },
             },
         },
@@ -47369,13 +47412,15 @@ class FindAndReplaceStore extends SpreadsheetStore {
         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.
@@ -53531,7 +53576,7 @@ class HoveredTableStore extends SpreadsheetStore {
         }
     }
     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;
@@ -55207,6 +55252,9 @@ function useTouchScroll(ref, updateScroll, canMoveUp) {
         let deltaX = lastX - clientX;
         let deltaY = lastY - clientY;
         const elapsedTime = currentTime - lastTime;
+        if (!elapsedTime) {
+            return;
+        }
         velocityX = deltaX / elapsedTime;
         velocityY = deltaY / elapsedTime;
         lastX = clientX;
@@ -55227,6 +55275,11 @@ function useTouchScroll(ref, updateScroll, canMoveUp) {
     function onTouchEnd(ev) {
         isMouseDown = false;
         lastX = lastY = 0;
+        if (resetTimeout) {
+            clearTimeout(resetTimeout);
+        }
+        velocityX *= 1.2;
+        velocityY *= 1.2;
         requestAnimationFrame(scroll);
     }
     function scroll() {
@@ -62317,7 +62370,7 @@ class PivotCorePlugin extends CorePlugin {
                 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;
             }
@@ -62388,7 +62441,10 @@ class PivotCorePlugin extends CorePlugin {
     // 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);
@@ -62477,6 +62533,7 @@ class PivotCorePlugin extends CorePlugin {
         }
     }
     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 */;
@@ -62490,6 +62547,26 @@ class PivotCorePlugin extends CorePlugin {
         }
         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
     // ---------------------------------------------------------------------
@@ -71649,11 +71726,6 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         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 = [
             {
@@ -71663,7 +71735,14 @@ class GridSelectionPlugin extends UIPlugin {
                 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;
@@ -80563,6 +80642,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.3.6";
-__info__.date = "2025-05-30T08:46:25.817Z";
-__info__.hash = "afa4379";
+__info__.version = "18.3.7";
+__info__.date = "2025-06-06T09:31:27.123Z";
+__info__.hash = "05333f1";

package/dist/o-spreadsheet.d.ts

@@ -1,5 +1,5 @@
 import * as chart_js from 'chart.js';
-import { ChartConfiguration, ChartDataset, CoreChartOptions, Scriptable, Color as Color$1, ScriptableContext, FontSpec, Point, ChartType as ChartType$1 } from 'chart.js';
+import { ChartConfiguration, ChartDataset, CoreChartOptions, Scriptable, Color as Color$1, ScriptableContext, FontSpec, Point, ChartType as ChartType$1, ChartMeta } from 'chart.js';
 import * as ChartGeo from 'chartjs-chart-geo';
 import * as GeoJSON$1 from 'geojson';
 import * as _odoo_owl from '@odoo/owl';
@@ -5064,6 +5064,7 @@ declare class PivotCorePlugin extends CorePlugin<CoreState> implements CoreState
     private replaceMeasureFormula;
     private checkSortedColumnInMeasures;
     private checkDuplicatedMeasureIds;
+    private repairSortedColumn;
     /**
      * Import the pivots
      */
@@ -6531,7 +6532,7 @@ interface ChartShowValuesPluginOptions {
     showValues: boolean;
     background?: Color;
     horizontal?: boolean;
-    callback: (value: number | string, axisId: string) => string;
+    callback: (value: number | string, dataset: ChartMeta, index: number) => string;
 }
 declare module "chart.js" {
     interface PluginOptionsByType<TType extends ChartType$1> {
@@ -12524,6 +12525,8 @@ declare const chartHelpers: {
     }>;
     getChartShowValues(definition: ChartWithDataSetDefinition, args: ChartRuntimeGenerationArgs): ChartShowValuesPluginOptions;
     getSunburstShowValues(definition: SunburstChartDefinition, args: ChartRuntimeGenerationArgs): ChartSunburstLabelsPluginOptions;
+    getPyramidChartShowValues(definition: ChartWithDataSetDefinition, args: ChartRuntimeGenerationArgs): ChartShowValuesPluginOptions;
+    getWaterfallChartShowValues(definition: WaterfallChartDefinition, args: ChartRuntimeGenerationArgs): ChartShowValuesPluginOptions;
     getChartTitle(definition: ChartWithDataSetDefinition): chart_js_dist_types_utils._DeepPartialObject<chart_js.TitleOptions>;
     getBarChartTooltip(definition: GenericDefinition<BarChartDefinition>, args: ChartRuntimeGenerationArgs): chart_js_dist_types_utils._DeepPartialObject<chart_js.TooltipOptions<any>>;
     getLineChartTooltip(definition: GenericDefinition<LineChartDefinition>, args: ChartRuntimeGenerationArgs): chart_js_dist_types_utils._DeepPartialObject<chart_js.TooltipOptions<any>>;

package/dist/o-spreadsheet.esm.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.7
+ * @date 2025-06-06T09:31:27.123Z
+ * @hash 05333f1
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -20955,8 +20955,6 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
             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;
@@ -20980,7 +20978,8 @@ function drawLineOrBarOrRadarChartValues(chart, options, ctx) {
             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);
         }
     }
 }
@@ -20997,7 +20996,7 @@ function drawHorizontalBarChartValues(chart, options, ctx) {
             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;
@@ -21035,7 +21034,7 @@ function drawPieChartValues(chart, options, ctx) {
             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);
         }
     }
@@ -26356,7 +26355,10 @@ function getChartShowValues(definition, args) {
         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) {
@@ -26374,6 +26376,45 @@ function getSunburstShowValues(definition, args) {
         },
     };
 }
+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;
@@ -26776,6 +26817,7 @@ var CHART_RUNTIME_HELPERS = /*#__PURE__*/Object.freeze({
   getPieChartTooltip: getPieChartTooltip,
   getPyramidChartData: getPyramidChartData,
   getPyramidChartScales: getPyramidChartScales,
+  getPyramidChartShowValues: getPyramidChartShowValues,
   getPyramidChartTooltip: getPyramidChartTooltip,
   getRadarChartData: getRadarChartData,
   getRadarChartDatasets: getRadarChartDatasets,
@@ -26795,6 +26837,7 @@ var CHART_RUNTIME_HELPERS = /*#__PURE__*/Object.freeze({
   getTrendDatasetForLineChart: getTrendDatasetForLineChart,
   getWaterfallChartLegend: getWaterfallChartLegend,
   getWaterfallChartScales: getWaterfallChartScales,
+  getWaterfallChartShowValues: getWaterfallChartShowValues,
   getWaterfallChartTooltip: getWaterfallChartTooltip,
   getWaterfallDatasetAndLabels: getWaterfallDatasetAndLabels,
   makeDatasetsCumulative: makeDatasetsCumulative
@@ -28074,7 +28117,7 @@ function createPyramidChartRuntime(chart, getters) {
                 title: getChartTitle(definition),
                 legend: getBarChartLegend(definition),
                 tooltip: getPyramidChartTooltip(definition, chartData),
-                chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                chartShowValuesPlugin: getPyramidChartShowValues(definition, chartData),
             },
         },
     };
@@ -28815,7 +28858,7 @@ function createWaterfallChartRuntime(chart, getters) {
                 title: getChartTitle(definition),
                 legend: getWaterfallChartLegend(definition),
                 tooltip: getWaterfallChartTooltip(definition, chartData),
-                chartShowValuesPlugin: getChartShowValues(definition, chartData),
+                chartShowValuesPlugin: getWaterfallChartShowValues(definition, chartData),
                 waterfallLinesPlugin: { showConnectorLines: definition.showConnectorLines },
             },
         },
@@ -47367,13 +47410,15 @@ class FindAndReplaceStore extends SpreadsheetStore {
         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.
@@ -53529,7 +53574,7 @@ class HoveredTableStore extends SpreadsheetStore {
         }
     }
     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;
@@ -55205,6 +55250,9 @@ function useTouchScroll(ref, updateScroll, canMoveUp) {
         let deltaX = lastX - clientX;
         let deltaY = lastY - clientY;
         const elapsedTime = currentTime - lastTime;
+        if (!elapsedTime) {
+            return;
+        }
         velocityX = deltaX / elapsedTime;
         velocityY = deltaY / elapsedTime;
         lastX = clientX;
@@ -55225,6 +55273,11 @@ function useTouchScroll(ref, updateScroll, canMoveUp) {
     function onTouchEnd(ev) {
         isMouseDown = false;
         lastX = lastY = 0;
+        if (resetTimeout) {
+            clearTimeout(resetTimeout);
+        }
+        velocityX *= 1.2;
+        velocityY *= 1.2;
         requestAnimationFrame(scroll);
     }
     function scroll() {
@@ -62315,7 +62368,7 @@ class PivotCorePlugin extends CorePlugin {
                 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;
             }
@@ -62386,7 +62439,10 @@ class PivotCorePlugin extends CorePlugin {
     // 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);
@@ -62475,6 +62531,7 @@ class PivotCorePlugin extends CorePlugin {
         }
     }
     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 */;
@@ -62488,6 +62545,26 @@ class PivotCorePlugin extends CorePlugin {
         }
         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
     // ---------------------------------------------------------------------
@@ -71647,11 +71724,6 @@ class GridSelectionPlugin extends UIPlugin {
             },
         ];
         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 = [
             {
@@ -71661,7 +71733,14 @@ class GridSelectionPlugin extends UIPlugin {
                 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;
@@ -80515,6 +80594,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateChartEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "18.3.6";
-__info__.date = "2025-05-30T08:46:25.817Z";
-__info__.hash = "afa4379";
+__info__.version = "18.3.7";
+__info__.date = "2025-06-06T09:31:27.123Z";
+__info__.hash = "05333f1";