@odoo/o-spreadsheet 15.2.0 → 15.2.1

package/dist/o_spreadsheet.esm.js

@@ -1369,6 +1369,7 @@ var CommandResult;
     CommandResult[CommandResult["FigureDoesNotExist"] = 55] = "FigureDoesNotExist";
     CommandResult[CommandResult["DuplicatedFigureId"] = 56] = "DuplicatedFigureId";
     CommandResult[CommandResult["DuplicatedChartId"] = 57] = "DuplicatedChartId";
+    CommandResult[CommandResult["ChartDoesNotExist"] = 58] = "ChartDoesNotExist";
 })(CommandResult || (CommandResult = {}));
 
 var ReturnFormatType;
@@ -8416,13 +8417,7 @@ function load(data) {
             data = migrate(data);
         }
     }
-    // sanity check: try to fix missing fields/corrupted state by providing
-    // sensible default values
-    data = Object.assign(createEmptyWorkbookData(), data, { version: CURRENT_VERSION });
-    data.sheets = data.sheets.map((s, i) => Object.assign(createEmptySheet(`Sheet${i + 1}`, `Sheet${i + 1}`), s));
-    if (data.sheets.length === 0) {
-        data.sheets.push(createEmptySheet(INITIAL_SHEET_ID, "Sheet1"));
-    }
+    data = repairData(data);
     return data;
 }
 function migrate(data) {
@@ -8649,6 +8644,48 @@ const MIGRATIONS = [
         },
     },
 ];
+/**
+ * This function is used to repair faulty data independently of the migration.
+ */
+function repairData(data) {
+    data = forceUnicityOfFigure(data);
+    data = setDefaults(data);
+    return data;
+}
+/**
+ * Force the unicity of figure ids accross sheets
+ */
+function forceUnicityOfFigure(data) {
+    if (data.uniqueFigureIds) {
+        return data;
+    }
+    const figureIds = new Set();
+    const uuidGenerator = new UuidGenerator();
+    for (const sheet of data.sheets || []) {
+        for (const figure of sheet.figures || []) {
+            if (figureIds.has(figure.id)) {
+                figure.id += uuidGenerator.uuidv4();
+            }
+            figureIds.add(figure.id);
+        }
+    }
+    data.uniqueFigureIds = true;
+    return data;
+}
+/**
+ * sanity check: try to fix missing fields/corrupted state by providing
+ * sensible default values
+ */
+function setDefaults(data) {
+    data = Object.assign(createEmptyWorkbookData(), data, { version: CURRENT_VERSION });
+    data.sheets = data.sheets
+        ? data.sheets.map((s, i) => Object.assign(createEmptySheet(`Sheet${i + 1}`, `Sheet${i + 1}`), s))
+        : [];
+    if (data.sheets.length === 0) {
+        data.sheets.push(createEmptySheet(INITIAL_SHEET_ID, "Sheet1"));
+    }
+    return data;
+}
 /**
  * The goal of this function is to repair corrupted/wrong initial messages caused by
  * a bug.
@@ -8736,6 +8773,7 @@ function createEmptyWorkbookData(sheetName = "Sheet1") {
         formats: {},
         borders: {},
         revisionId: DEFAULT_REVISION_ID,
+        uniqueFigureIds: true,
     };
     return data;
 }
@@ -9776,34 +9814,32 @@ class ChartPlugin extends CorePlugin {
         this.chartFigures = {};
     }
     adaptRanges(applyChange) {
-        for (const sheetId of Object.keys(this.chartFigures)) {
-            for (const [chartId, chart] of Object.entries(this.chartFigures[sheetId] || {})) {
-                if (chart) {
-                    this.adaptDataSetRanges(sheetId, chart, chartId, applyChange);
-                    this.adaptLabelRanges(sheetId, chart, chartId, applyChange);
-                }
+        for (let [chartId, chart] of Object.entries(this.chartFigures)) {
+            if (chart) {
+                this.adaptDataSetRanges(chart, chartId, applyChange);
+                this.adaptLabelRanges(chart, chartId, applyChange);
             }
         }
     }
-    adaptDataSetRanges(sheetId, chart, chartId, applyChange) {
+    adaptDataSetRanges(chart, chartId, applyChange) {
         for (let ds of chart.dataSets) {
             if (ds.labelCell) {
                 const labelCellChange = applyChange(ds.labelCell);
                 switch (labelCellChange.changeType) {
                     case "REMOVE":
-                        this.history.update("chartFigures", sheetId, chartId, "dataSets", chart.dataSets.indexOf(ds), "labelCell", undefined);
+                        this.history.update("chartFigures", chartId, "dataSets", chart.dataSets.indexOf(ds), "labelCell", undefined);
                         break;
                     case "RESIZE":
                     case "MOVE":
                     case "CHANGE":
-                        this.history.update("chartFigures", sheetId, chartId, "dataSets", chart.dataSets.indexOf(ds), "labelCell", labelCellChange.range);
+                        this.history.update("chartFigures", chartId, "dataSets", chart.dataSets.indexOf(ds), "labelCell", labelCellChange.range);
                 }
             }
             const dataRangeChange = applyChange(ds.dataRange);
             switch (dataRangeChange.changeType) {
                 case "REMOVE":
                     const newDataSets = chart.dataSets.filter((dataset) => dataset !== ds);
-                    this.history.update("chartFigures", sheetId, chartId, "dataSets", newDataSets);
+                    this.history.update("chartFigures", chartId, "dataSets", newDataSets);
                     break;
                 case "RESIZE":
                 case "MOVE":
@@ -9811,27 +9847,27 @@ class ChartPlugin extends CorePlugin {
                     // We have to remove the ranges that are #REF
                     if (this.getters.getRangeString(dataRangeChange.range, dataRangeChange.range.sheetId) !==
                         INCORRECT_RANGE_STRING) {
-                        this.history.update("chartFigures", sheetId, chartId, "dataSets", chart.dataSets.indexOf(ds), "dataRange", dataRangeChange.range);
+                        this.history.update("chartFigures", chartId, "dataSets", chart.dataSets.indexOf(ds), "dataRange", dataRangeChange.range);
                     }
                     else {
                         const newDataSets = chart.dataSets.filter((dataset) => dataset !== ds);
-                        this.history.update("chartFigures", sheetId, chartId, "dataSets", newDataSets);
+                        this.history.update("chartFigures", chartId, "dataSets", newDataSets);
                     }
                     break;
             }
         }
     }
-    adaptLabelRanges(sheetId, chart, chartId, applyChange) {
+    adaptLabelRanges(chart, chartId, applyChange) {
         if (chart.labelRange) {
             const labelRangeChange = applyChange(chart.labelRange);
             switch (labelRangeChange.changeType) {
                 case "REMOVE":
-                    this.history.update("chartFigures", sheetId, chartId, "labelRange", undefined);
+                    this.history.update("chartFigures", chartId, "labelRange", undefined);
                     break;
                 case "RESIZE":
                 case "MOVE":
                 case "CHANGE":
-                    this.history.update("chartFigures", sheetId, chartId, "labelRange", labelRangeChange.range);
+                    this.history.update("chartFigures", chartId, "labelRange", labelRangeChange.range);
                     break;
             }
         }
@@ -9842,16 +9878,16 @@ class ChartPlugin extends CorePlugin {
     allowDispatch(cmd) {
         const success = 0 /* Success */;
         switch (cmd.type) {
-            case "CREATE_CHART":
-                return this.checkValidations(cmd, this.chainValidations(this.checkChartDuplicate, this.checkEmptyDataset, this.checkDataset), this.checkLabelRange);
             case "UPDATE_CHART":
-                return this.checkValidations(cmd, this.chainValidations(this.checkEmptyDataset, this.checkDataset), this.checkLabelRange);
+                return this.checkValidations(cmd, this.chainValidations(this.checkEmptyDataset, this.checkDataset, this.checkChartExists), this.checkLabelRange);
+            case "CREATE_CHART":
+                return this.checkValidations(cmd, this.chainValidations(this.checkEmptyDataset, this.checkDataset, this.checkChartDuplicate), this.checkLabelRange);
             default:
                 return success;
         }
     }
     handle(cmd) {
-        var _a;
+        var _a, _b;
         switch (cmd.type) {
             case "CREATE_CHART":
                 const x = cmd.position ? cmd.position.x : 0;
@@ -9866,7 +9902,7 @@ class ChartPlugin extends CorePlugin {
                 });
                 break;
             case "UPDATE_CHART": {
-                this.updateChartDefinition(cmd.sheetId, cmd.id, cmd.definition);
+                this.updateChartDefinition(cmd.id, cmd.definition);
                 break;
             }
             case "DUPLICATE_SHEET": {
@@ -9876,7 +9912,7 @@ class ChartPlugin extends CorePlugin {
                         const figureIdBase = fig.id.split(FIGURE_ID_SPLITTER).pop();
                         const duplicatedFigureId = `${cmd.sheetIdTo}${FIGURE_ID_SPLITTER}${figureIdBase}`;
                         const chartDefinition = {
-                            ...deepCopy(this.chartFigures[cmd.sheetId][fig.id]),
+                            ...deepCopy(this.chartFigures[fig.id]),
                             id: duplicatedFigureId,
                         };
                         chartDefinition.sheetId = cmd.sheetIdTo;
@@ -9906,28 +9942,37 @@ class ChartPlugin extends CorePlugin {
                 break;
             }
             case "DELETE_FIGURE":
-                this.history.update("chartFigures", cmd.sheetId, cmd.id, undefined);
+                this.history.update("chartFigures", cmd.id, undefined);
                 break;
             case "DELETE_SHEET":
-                this.history.update("chartFigures", cmd.sheetId, undefined);
+                for (let id of Object.keys(this.chartFigures)) {
+                    if (((_b = this.chartFigures[id]) === null || _b === void 0 ? void 0 : _b.sheetId) === cmd.sheetId) {
+                        this.history.update("chartFigures", id, undefined);
+                    }
+                }
                 break;
         }
     }
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
-    getChartDefinition(sheetId, figureId) {
-        var _a;
-        return (_a = this.chartFigures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId];
+    getChartDefinition(figureId) {
+        return this.chartFigures[figureId];
     }
-    getChartDefinitionsBySheet(sheetId) {
-        return Object.values(this.chartFigures[sheetId] || {}).filter(isDefined);
+    getChartsIdBySheet(sheetId) {
+        return Object.entries(this.chartFigures)
+            .filter((chart) => {
+            return chart[1].sheetId === sheetId;
+        })
+            .map((chart) => chart[0]);
     }
-    getChartDefinitionUI(sheetId, figureId, forceSheetName = false) {
-        const data = this.chartFigures[sheetId][figureId];
-        const rangeSheetId = forceSheetName ? "forceSheetReference" : sheetId;
+    getChartDefinitionUI(sheetId, figureId) {
+        const data = this.chartFigures[figureId];
+        if (!data) {
+            return undefined;
+        }
         const dataSets = data.dataSets
-            .map((ds) => (ds ? this.getters.getRangeString(ds.dataRange, rangeSheetId) : ""))
+            .map((ds) => (ds ? this.getters.getRangeString(ds.dataRange, sheetId) : ""))
             .filter((ds) => {
             return ds !== ""; // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
         });
@@ -9935,7 +9980,7 @@ class ChartPlugin extends CorePlugin {
             title: data && data.title ? data.title : "",
             dataSets,
             labelRange: data.labelRange
-                ? this.getters.getRangeString(data.labelRange, rangeSheetId)
+                ? this.getters.getRangeString(data.labelRange, sheetId)
                 : undefined,
             type: data ? data.type : "bar",
             dataSetsHaveTitle: data && dataSets.length !== 0 ? Boolean(data.dataSets[0].labelCell) : false,
@@ -9946,12 +9991,16 @@ class ChartPlugin extends CorePlugin {
         };
     }
     getChartDefinitionExcel(sheetId, figureId) {
-        const data = this.chartFigures[sheetId][figureId];
+        const data = this.chartFigures[figureId];
+        const dataUI = this.getChartDefinitionUI("forceSheetReference", figureId);
+        if (!data || !dataUI) {
+            return undefined;
+        }
         const dataSets = data.dataSets
             .map((ds) => this.toExcelDataset(ds))
             .filter((ds) => ds.range !== ""); // && range !== INCORRECT_RANGE_STRING ? show incorrect #ref ?
         return {
-            ...this.getChartDefinitionUI(sheetId, figureId, true),
+            ...dataUI,
             backgroundColor: data.background,
             dataSets,
         };
@@ -9986,17 +10035,15 @@ class ChartPlugin extends CorePlugin {
     import(data) {
         for (let sheet of data.sheets) {
             if (sheet.figures) {
-                const charts = {};
                 for (let figure of sheet.figures) {
                     if (figure.tag === "chart") {
                         const figureData = {
                             ...figure.data,
                         };
-                        charts[figure.id] = this.createChartDefinition(figureData, sheet.id);
+                        this.chartFigures[figure.id] = this.createChartDefinition(figureData, sheet.id);
                         delete figure.data;
                     }
                 }
-                this.chartFigures[sheet.id] = charts;
             }
         }
     }
@@ -10004,10 +10051,18 @@ class ChartPlugin extends CorePlugin {
         if (data.sheets) {
             for (let sheet of data.sheets) {
                 const sheetFigures = this.getters.getFigures(sheet.id);
-                const figures = sheetFigures;
-                for (let figure of figures) {
+                const figures = [];
+                for (let sheetFigure of sheetFigures) {
+                    const figure = sheetFigure;
                     if (figure && figure.tag === "chart") {
-                        figure.data = this.getChartDefinitionUI(sheet.id, figure.id);
+                        const data = this.getChartDefinitionUI(sheet.id, figure.id);
+                        if (data) {
+                            figure.data = data;
+                            figures.push(figure);
+                        }
+                    }
+                    else {
+                        figures.push(figure);
                     }
                 }
                 sheet.figures = figures;
@@ -10017,10 +10072,18 @@ class ChartPlugin extends CorePlugin {
     exportForExcel(data) {
         for (let sheet of data.sheets) {
             const sheetFigures = this.getters.getFigures(sheet.id);
-            const figures = sheetFigures;
-            for (let figure of figures) {
+            const figures = [];
+            for (let sheetFigure of sheetFigures) {
+                const figure = sheetFigure;
                 if (figure && figure.tag === "chart") {
-                    figure.data = this.getChartDefinitionExcel(sheet.id, figure.id);
+                    const data = this.getChartDefinitionExcel(sheet.id, figure.id);
+                    if (data) {
+                        figure.data = data;
+                        figures.push(figure);
+                    }
+                }
+                else {
+                    figures.push(figure);
                 }
             }
             sheet.charts = figures;
@@ -10046,39 +10109,39 @@ class ChartPlugin extends CorePlugin {
      * Update the chart definition linked to the given id with the attributes
      * given in the partial UI definition
      */
-    updateChartDefinition(sheetId, id, definition) {
-        const chart = this.chartFigures[sheetId][id];
+    updateChartDefinition(id, definition) {
+        const chart = this.chartFigures[id];
         if (!chart) {
             throw new Error(`There is no chart with the given id: ${id}`);
         }
         if (definition.title !== undefined) {
-            this.history.update("chartFigures", sheetId, id, "title", definition.title);
+            this.history.update("chartFigures", id, "title", definition.title);
         }
         if (definition.type) {
-            this.history.update("chartFigures", sheetId, id, "type", definition.type);
+            this.history.update("chartFigures", id, "type", definition.type);
         }
         if (definition.dataSets) {
             const dataSetsHaveTitle = !!definition.dataSetsHaveTitle;
             const dataSets = this.createDataSets(definition.dataSets, chart.sheetId, dataSetsHaveTitle);
-            this.history.update("chartFigures", sheetId, id, "dataSets", dataSets);
+            this.history.update("chartFigures", id, "dataSets", dataSets);
         }
         if (definition.labelRange !== undefined) {
             const labelRange = definition.labelRange
                 ? this.getters.getRangeFromSheetXC(chart.sheetId, definition.labelRange)
                 : undefined;
-            this.history.update("chartFigures", sheetId, id, "labelRange", labelRange);
+            this.history.update("chartFigures", id, "labelRange", labelRange);
         }
         if (definition.background) {
-            this.history.update("chartFigures", sheetId, id, "background", definition.background);
+            this.history.update("chartFigures", id, "background", definition.background);
         }
         if (definition.verticalAxisPosition) {
-            this.history.update("chartFigures", sheetId, id, "verticalAxisPosition", definition.verticalAxisPosition);
+            this.history.update("chartFigures", id, "verticalAxisPosition", definition.verticalAxisPosition);
         }
         if (definition.legendPosition) {
-            this.history.update("chartFigures", sheetId, id, "legendPosition", definition.legendPosition);
+            this.history.update("chartFigures", id, "legendPosition", definition.legendPosition);
         }
         if (definition.stackedBar !== undefined) {
-            this.history.update("chartFigures", sheetId, id, "stackedBar", definition.stackedBar);
+            this.history.update("chartFigures", id, "stackedBar", definition.stackedBar);
         }
     }
     createDataSets(dataSetsString, sheetId, dataSetsHaveTitle) {
@@ -10133,7 +10196,7 @@ class ChartPlugin extends CorePlugin {
             sheetId,
             figure,
         });
-        this.history.update("chartFigures", sheetId, figure.id, data);
+        this.history.update("chartFigures", figure.id, data);
     }
     createDataSet(sheetId, fullZone, titleZone) {
         if (fullZone.left !== fullZone.right && fullZone.top !== fullZone.bottom) {
@@ -10174,18 +10237,20 @@ class ChartPlugin extends CorePlugin {
         return invalidLabels ? 29 /* InvalidLabelRange */ : 0 /* Success */;
     }
     checkChartDuplicate(cmd) {
-        var _a;
-        if ((_a = this.chartFigures[cmd.sheetId]) === null || _a === void 0 ? void 0 : _a[cmd.id]) {
-            return 57 /* DuplicatedChartId */;
+        for (const sheet of this.getters.getSheets()) {
+            if (this.getters.getFigure(sheet.id, cmd.id)) {
+                return 57 /* DuplicatedChartId */;
+            }
         }
         return 0 /* Success */;
     }
+    checkChartExists(cmd) {
+        return this.getters.getFigure(cmd.sheetId, cmd.id)
+            ? 0 /* Success */
+            : 58 /* ChartDoesNotExist */;
+    }
 }
-ChartPlugin.getters = [
-    "getChartDefinition",
-    "getChartDefinitionUI",
-    "getChartDefinitionsBySheet",
-];
+ChartPlugin.getters = ["getChartDefinition", "getChartDefinitionUI", "getChartsIdBySheet"];
 
 // -----------------------------------------------------------------------------
 // Constants
@@ -10524,7 +10589,7 @@ class FigurePlugin extends CorePlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "CREATE_FIGURE":
-                return this.checkFigureDuplicate(cmd.sheetId, cmd.figure.id);
+                return this.checkFigureDuplicate(cmd.figure.id);
             case "UPDATE_FIGURE":
             case "DELETE_FIGURE":
                 return this.checkFigureExists(cmd.sheetId, cmd.id);
@@ -10590,9 +10655,8 @@ class FigurePlugin extends CorePlugin {
         }
         return 0 /* Success */;
     }
-    checkFigureDuplicate(sheetId, figureId) {
-        var _a;
-        if ((_a = this.figures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) {
+    checkFigureDuplicate(figureId) {
+        if (Object.values(this.figures).find((sheet) => sheet === null || sheet === void 0 ? void 0 : sheet[figureId])) {
             return 56 /* DuplicatedFigureId */;
         }
         return 0 /* Success */;
@@ -10607,6 +10671,9 @@ class FigurePlugin extends CorePlugin {
         var _a;
         return (_a = this.figures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId];
     }
+    getFigureSheetId(figureId) {
+        return Object.keys(this.figures).find((sheetId) => { var _a; return ((_a = this.figures[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) !== undefined; });
+    }
     // ---------------------------------------------------------------------------
     // Import/Export
     // ---------------------------------------------------------------------------
@@ -10631,7 +10698,7 @@ class FigurePlugin extends CorePlugin {
         this.export(data);
     }
 }
-FigurePlugin.getters = ["getFigures", "getFigure"];
+FigurePlugin.getters = ["getFigures", "getFigure", "getFigureSheetId"];
 
 class MergePlugin extends CorePlugin {
     constructor() {
@@ -12934,7 +13001,7 @@ const CREATE_CHART = (env) => {
         },
     });
     const figure = env.getters.getFigure(sheetId, id);
-    env.openSidePanel("ChartPanel", { sheetId, figure });
+    env.openSidePanel("ChartPanel", { figure });
 };
 //------------------------------------------------------------------------------
 // Style/Format
@@ -14447,15 +14514,17 @@ class ChartPanel extends Component {
     constructor() {
         super(...arguments);
         this.getters = this.env.getters;
+        this.chartSheetId = this.findSheetId(this.props.figure.id);
         this.state = useState$b(this.initialState(this.props.figure));
     }
     setup() {
         onWillUpdateProps$6((nextProps) => {
-            if (!this.getters.getChartDefinition(nextProps.sheetId, nextProps.figure.id)) {
+            if (!this.getters.getChartDefinition(nextProps.figure.id)) {
                 this.props.onCloseSidePanel();
                 return;
             }
             if (nextProps.figure.id !== this.props.figure.id) {
+                this.chartSheetId = this.findSheetId(nextProps.figure.id);
                 this.state.panel = "configuration";
                 this.state.fillColorTool = false;
                 this.state.datasetDispatchResult = undefined;
@@ -14508,7 +14577,7 @@ class ChartPanel extends Component {
     updateChart(definition) {
         return this.env.dispatch("UPDATE_CHART", {
             id: this.props.figure.id,
-            sheetId: this.props.sheetId,
+            sheetId: this.chartSheetId,
             definition,
         });
     }
@@ -14530,12 +14599,16 @@ class ChartPanel extends Component {
         this.state.panel = panel;
     }
     initialState(figure) {
+        const sheetId = this.findSheetId(figure.id);
         return {
-            chart: this.env.getters.getChartDefinitionUI(this.env.getters.getActiveSheetId(), figure.id),
+            chart: this.env.getters.getChartDefinitionUI(sheetId, figure.id),
             panel: "configuration",
             fillColorTool: false,
         };
     }
+    findSheetId(figureId) {
+        return this.env.getters.getFigureSheetId(figureId) || "";
+    }
 }
 ChartPanel.template = TEMPLATE$m;
 ChartPanel.style = STYLE;
@@ -18851,60 +18924,51 @@ class EvaluationChartPlugin extends UIPlugin {
         this.outOfDate = new Set();
     }
     handle(cmd) {
-        var _a;
         if (invalidateEvaluationCommands.has(cmd.type) ||
             cmd.type === "EVALUATE_CELLS" ||
             (cmd.type === "UPDATE_CELL" && "content" in cmd)) {
-            for (const sheetId of Object.keys(this.chartRuntime)) {
-                for (const chartId of Object.keys(this.chartRuntime[sheetId] || {})) {
-                    this.outOfDate.add(chartId);
-                }
+            for (let chartId of Object.keys(this.chartRuntime)) {
+                this.outOfDate.add(chartId);
             }
         }
         switch (cmd.type) {
             case "UPDATE_CHART":
-            case "CREATE_CHART": {
-                const chartDefinition = this.getters.getChartDefinition(cmd.sheetId, cmd.id);
-                if (!this.chartRuntime[cmd.sheetId])
-                    this.chartRuntime[cmd.sheetId] = {};
-                this.chartRuntime[cmd.sheetId][cmd.id] = this.mapDefinitionToRuntime(chartDefinition);
+            case "CREATE_CHART":
+                const chartDefinition = this.getters.getChartDefinition(cmd.id);
+                this.chartRuntime[cmd.id] = this.mapDefinitionToRuntime(chartDefinition);
                 break;
-            }
             case "DELETE_FIGURE":
-                (_a = this.chartRuntime[cmd.sheetId]) === null || _a === void 0 ? true : delete _a[cmd.id];
+                delete this.chartRuntime[cmd.id];
                 break;
-            case "REFRESH_CHART": {
-                const chartDefinition = this.getters.getChartDefinition(cmd.sheetId, cmd.id);
-                this.evaluateUsedSheets([chartDefinition]);
+            case "REFRESH_CHART":
+                this.evaluateUsedSheets([cmd.id]);
                 this.outOfDate.add(cmd.id);
                 break;
-            }
-            case "ACTIVATE_SHEET": {
-                const chartsDefinitions = this.getters.getChartDefinitionsBySheet(cmd.sheetIdTo);
-                this.evaluateUsedSheets(chartsDefinitions);
+            case "ACTIVATE_SHEET":
+                const chartsIds = this.getters.getChartsIdBySheet(cmd.sheetIdTo);
+                this.evaluateUsedSheets(chartsIds);
                 break;
-            }
             case "DELETE_SHEET":
-                delete this.chartRuntime[cmd.sheetId];
+                for (let chartId of Object.keys(this.chartRuntime)) {
+                    if (!this.getters.getChartDefinition(chartId)) {
+                        delete this.chartRuntime[chartId];
+                    }
+                }
                 break;
         }
     }
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
-    getChartRuntime(sheetId, figureId) {
-        if (this.outOfDate.has(figureId) ||
-            !(sheetId in this.chartRuntime) ||
-            !(figureId in this.chartRuntime[sheetId])) {
-            const chartDefinition = this.getters.getChartDefinition(sheetId, figureId);
+    getChartRuntime(figureId) {
+        if (this.outOfDate.has(figureId) || !(figureId in this.chartRuntime)) {
+            const chartDefinition = this.getters.getChartDefinition(figureId);
             if (chartDefinition === undefined)
                 return;
-            if (!this.chartRuntime[sheetId])
-                this.chartRuntime[sheetId] = {};
-            this.chartRuntime[sheetId][figureId] = this.mapDefinitionToRuntime(chartDefinition);
+            this.chartRuntime[figureId] = this.mapDefinitionToRuntime(chartDefinition);
             this.outOfDate.delete(figureId);
         }
-        return this.chartRuntime[sheetId][figureId];
+        return this.chartRuntime[figureId];
     }
     truncateLabel(label) {
         if (!label) {
@@ -19009,9 +19073,10 @@ class EvaluationChartPlugin extends UIPlugin {
         }
         return sheetIds;
     }
-    evaluateUsedSheets(chartsDefinitions) {
+    evaluateUsedSheets(chartsIds) {
         const usedSheetsId = new Set();
-        for (const chartDefinition of chartsDefinitions) {
+        for (let chartId of chartsIds) {
+            const chartDefinition = this.getters.getChartDefinition(chartId);
             const sheetsIds = chartDefinition !== undefined ? this.getSheetIdsUsedInChart(chartDefinition) : [];
             sheetsIds.forEach((sheetId) => {
                 if (sheetId !== this.getters.getActiveSheetId()) {
@@ -27798,7 +27863,7 @@ class ChartFigure extends Component {
     setup() {
         onMounted$4(() => {
             const figure = this.props.figure;
-            const chartData = this.env.getters.getChartRuntime(this.env.getters.getActiveSheetId(), figure.id);
+            const chartData = this.env.getters.getChartRuntime(figure.id);
             if (chartData) {
                 this.createChart(chartData);
             }
@@ -27806,8 +27871,7 @@ class ChartFigure extends Component {
         onPatched$1(() => {
             var _a, _b, _c;
             const figure = this.props.figure;
-            const sheetId = this.env.getters.getActiveSheetId();
-            const chartData = this.env.getters.getChartRuntime(sheetId, figure.id);
+            const chartData = this.env.getters.getChartRuntime(figure.id);
             if (chartData) {
                 if (chartData.type !== this.chart.config.type) {
                     // Updating a chart type requires to update its options accordingly, if feasible at all.
@@ -27833,7 +27897,7 @@ class ChartFigure extends Component {
             else {
                 this.chart && this.chart.destroy();
             }
-            const def = this.env.getters.getChartDefinition(sheetId, figure.id);
+            const def = this.env.getters.getChartDefinition(figure.id);
             if (def) {
                 this.state.background = def.background;
             }
@@ -27843,7 +27907,7 @@ class ChartFigure extends Component {
         const canvas = this.canvas.el;
         const ctx = canvas.getContext("2d");
         this.chart = new window.Chart(ctx, chartData);
-        const def = this.env.getters.getChartDefinition(this.env.getters.getActiveSheetId(), this.props.figure.id);
+        const def = this.env.getters.getChartDefinition(this.props.figure.id);
         if (def) {
             this.state.background = def.background;
         }
@@ -27853,10 +27917,8 @@ class ChartFigure extends Component {
         registry.add("edit", {
             name: _lt("Edit"),
             sequence: 1,
-            action: () => this.env.openSidePanel("ChartPanel", {
-                sheetId: this.env.getters.getActiveSheetId(),
-                figure: this.props.figure,
-            }),
+            action: () => this.env.openSidePanel("ChartPanel", { figure: this.props.figure }),
+            isVisible: () => !!this.env.getters.getChartDefinition(this.props.figure.id),
         });
         registry.add("delete", {
             name: _lt("Delete"),
@@ -27867,10 +27929,7 @@ class ChartFigure extends Component {
                     id: this.props.figure.id,
                 });
                 if (this.props.sidePanelIsOpen) {
-                    this.env.toggleSidePanel("ChartPanel", {
-                        sheetId: this.env.getters.getActiveSheetId(),
-                        figure: this.props.figure,
-                    });
+                    this.env.toggleSidePanel("ChartPanel", { figure: this.props.figure });
                 }
                 this.props.onFigureDeleted();
             },
@@ -27880,7 +27939,6 @@ class ChartFigure extends Component {
             sequence: 11,
             action: () => {
                 this.env.dispatch("REFRESH_CHART", {
-                    sheetId: this.env.getters.getActiveSheetId(),
                     id: this.props.figure.id,
                 });
             },
@@ -28128,10 +28186,7 @@ class FiguresContainer extends Component {
             return;
         }
         if (this.props.sidePanelIsOpen) {
-            this.env.openSidePanel("ChartPanel", {
-                sheetId: this.env.getters.getActiveSheetId(),
-                figure,
-            });
+            this.env.openSidePanel("ChartPanel", { figure });
         }
         const initialX = ev.clientX;
         const initialY = ev.clientY;
@@ -31188,6 +31243,6 @@ const helpers = {
 export { CommandResult, CorePlugin, DATETIME_FORMAT, DataSource, DispatchResult, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, DEBUG as __DEBUG__, __info__, astToFormula, cellTypes, compile, convertAstNodes, coreTypes, functionCache, helpers, invalidateEvaluationCommands, parse, readonlyAllowedCommands, registries, setTranslationMethod };
 
 
-__info__.version = '15.2.0';
-__info__.date = '2023-02-27T14:23:03.128Z';
-__info__.hash = 'd07958f';
+__info__.version = '15.2.1';
+__info__.date = '2023-03-06T07:16:45.196Z';
+__info__.hash = 'baeea23';