@odoo/o-spreadsheet 16.1.1 → 16.1.3

package/dist/o_spreadsheet.cjs.js

@@ -2827,7 +2827,7 @@ class ChartJsComponent extends owl.Component {
         return `background-color: ${this.background}`;
     }
     get chartRuntime() {
-        const runtime = this.env.model.getters.getChartRuntime(this.env.model.getters.getActiveSheetId(), this.props.figure.id);
+        const runtime = this.env.model.getters.getChartRuntime(this.props.figure.id);
         if (!("chartJsConfig" in runtime)) {
             throw new Error("Unsupported chart runtime");
         }
@@ -3081,7 +3081,7 @@ class ScorecardChart$1 extends owl.Component {
         this.ctx = document.createElement("canvas").getContext("2d");
     }
     get runtime() {
-        return this.env.model.getters.getChartRuntime(this.env.model.getters.getActiveSheetId(), this.props.figure.id);
+        return this.env.model.getters.getChartRuntime(this.props.figure.id);
     }
     get title() {
         return this.runtime.title;
@@ -3472,7 +3472,7 @@ exports.CommandResult = void 0;
     CommandResult[CommandResult["InvalidRange"] = 25] = "InvalidRange";
     CommandResult[CommandResult["InvalidZones"] = 26] = "InvalidZones";
     CommandResult[CommandResult["InvalidSheetId"] = 27] = "InvalidSheetId";
-    CommandResult[CommandResult["DuplicatedImageId"] = 28] = "DuplicatedImageId";
+    CommandResult[CommandResult["InvalidFigureId"] = 28] = "InvalidFigureId";
     CommandResult[CommandResult["InputAlreadyFocused"] = 29] = "InputAlreadyFocused";
     CommandResult[CommandResult["MaximumRangesReached"] = 30] = "MaximumRangesReached";
     CommandResult[CommandResult["InvalidChartDefinition"] = 31] = "InvalidChartDefinition";
@@ -3529,6 +3529,7 @@ exports.CommandResult = void 0;
     CommandResult[CommandResult["DuplicatedFigureId"] = 82] = "DuplicatedFigureId";
     CommandResult[CommandResult["InvalidSelectionStep"] = 83] = "InvalidSelectionStep";
     CommandResult[CommandResult["DuplicatedChartId"] = 84] = "DuplicatedChartId";
+    CommandResult[CommandResult["ChartDoesNotExist"] = 85] = "ChartDoesNotExist";
 })(exports.CommandResult || (exports.CommandResult = {}));
 
 var DIRECTION;
@@ -6069,7 +6070,7 @@ class ChartFigure extends owl.Component {
         return registry;
     }
     get chartType() {
-        return this.env.model.getters.getChartType(this.env.model.getters.getActiveSheetId(), this.props.figure.id);
+        return this.env.model.getters.getChartType(this.props.figure.id);
     }
     onContextMenu(ev) {
         const position = {
@@ -18804,7 +18805,7 @@ class ImageFigure extends owl.Component {
             name: _lt("Reset size"),
             sequence: 3,
             action: () => {
-                const size = this.env.model.getters.getImage(this.env.model.getters.getActiveSheetId(), this.figureId).size;
+                const size = this.env.model.getters.getImageSize(this.figureId);
                 const { height, width } = getMaxFigureSize(this.env.model.getters, size);
                 this.env.model.dispatch("UPDATE_FIGURE", {
                     sheetId: this.env.model.getters.getActiveSheetId(),
@@ -18855,8 +18856,7 @@ class ImageFigure extends owl.Component {
         return this.props.figure.id;
     }
     get getImagePath() {
-        return this.env.model.getters.getImage(this.env.model.getters.getActiveSheetId(), this.figureId)
-            .path;
+        return this.env.model.getters.getImagePath(this.figureId);
     }
 }
 ImageFigure.template = "o-spreadsheet-ImageFigure";
@@ -19811,7 +19811,6 @@ class LineBarPieConfigPanel extends owl.Component {
 LineBarPieConfigPanel.template = "o-spreadsheet-LineBarPieConfigPanel";
 LineBarPieConfigPanel.components = { SelectionInput };
 LineBarPieConfigPanel.props = {
-    sheetId: String,
     figureId: String,
     definition: Object,
     updateChart: Function,
@@ -20141,7 +20140,6 @@ class GaugeChartConfigPanel extends owl.Component {
 GaugeChartConfigPanel.template = "o-spreadsheet-GaugeChartConfigPanel";
 GaugeChartConfigPanel.components = { SelectionInput };
 GaugeChartConfigPanel.props = {
-    sheetId: String,
     figureId: String,
     definition: Object,
     updateChart: Function,
@@ -20295,7 +20293,7 @@ GaugeChartDesignPanel.props = {
 
 class LineConfigPanel extends LineBarPieConfigPanel {
     get canTreatLabelsAsText() {
-        const chart = this.env.model.getters.getChart(this.props.sheetId, this.props.figureId);
+        const chart = this.env.model.getters.getChart(this.props.figureId);
         if (chart && chart instanceof LineChart) {
             return canChartParseLabels(chart.labelRange, this.env.model.getters);
         }
@@ -20372,7 +20370,6 @@ class ScorecardChartConfigPanel extends owl.Component {
 ScorecardChartConfigPanel.template = "o-spreadsheet-ScorecardChartConfigPanel";
 ScorecardChartConfigPanel.components = { SelectionInput };
 ScorecardChartConfigPanel.props = {
-    sheetId: String,
     figureId: String,
     definition: Object,
     updateChart: Function,
@@ -20504,7 +20501,7 @@ class ChartPanel extends owl.Component {
             else {
                 this.shouldUpdateChart = true;
             }
-            if (!this.env.model.getters.isChartDefined(this.sheetId, this.figureId)) {
+            if (!this.env.model.getters.isChartDefined(this.figureId)) {
                 this.props.onCloseSidePanel();
                 return;
             }
@@ -20518,7 +20515,6 @@ class ChartPanel extends owl.Component {
             ...this.getChartDefinition(),
             ...updateDefinition,
         };
-        // TODORAR add a putain de test - c'est faux de nouveau ...
         return this.env.model.dispatch("UPDATE_CHART", {
             definition,
             id: this.figureId,
@@ -20526,12 +20522,11 @@ class ChartPanel extends owl.Component {
         });
     }
     onTypeChange(type) {
-        const context = this.env.model.getters.getContextCreationChart(this.sheetId, this.figureId);
+        const context = this.env.model.getters.getContextCreationChart(this.figureId);
         if (!context) {
             throw new Error("Chart not defined.");
         }
         const definition = getChartDefinitionFromContextCreation(context, type);
-        // TODORAR add a putain de test - c'est faux de nouveau ...
         this.env.model.dispatch("UPDATE_CHART", {
             definition,
             id: this.figureId,
@@ -20539,7 +20534,7 @@ class ChartPanel extends owl.Component {
         });
     }
     get chartPanel() {
-        const type = this.env.model.getters.getChartType(this.sheetId, this.figureId);
+        const type = this.env.model.getters.getChartType(this.figureId);
         if (!type) {
             throw new Error("Chart not defined.");
         }
@@ -20549,8 +20544,8 @@ class ChartPanel extends owl.Component {
         }
         return chartPanel;
     }
-    getChartDefinition() {
-        return this.env.model.getters.getChartDefinition(this.sheetId, this.figureId);
+    getChartDefinition(figureId = this.figureId) {
+        return this.env.model.getters.getChartDefinition(figureId);
     }
     get chartTypes() {
         return getChartTypes();
@@ -27109,13 +27104,7 @@ function load(data, verboseImport) {
             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) {
@@ -27353,6 +27342,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.
@@ -27491,6 +27522,7 @@ function createEmptyWorkbookData(sheetName = "Sheet1") {
         formats: {},
         borders: {},
         revisionId: DEFAULT_REVISION_ID,
+        uniqueFigureIds: true,
     };
     return data;
 }
@@ -28488,10 +28520,8 @@ class ChartPlugin extends CorePlugin {
         this.validateChartDefinition = (cmd) => validateChartDefinition(this, cmd.definition);
     }
     adaptRanges(applyChange) {
-        for (const sheetId of Object.keys(this.charts)) {
-            for (const [chartId, chart] of Object.entries(this.charts[sheetId] || {})) {
-                this.history.update("charts", sheetId, chartId, chart === null || chart === void 0 ? void 0 : chart.updateRanges(applyChange));
-            }
+        for (const [chartId, chart] of Object.entries(this.charts)) {
+            this.history.update("charts", chartId, chart === null || chart === void 0 ? void 0 : chart.updateRanges(applyChange));
         }
     }
     // ---------------------------------------------------------------------------
@@ -28502,20 +28532,20 @@ class ChartPlugin extends CorePlugin {
             case "CREATE_CHART":
                 return this.checkValidations(cmd, this.chainValidations(this.validateChartDefinition, this.checkChartDuplicate));
             case "UPDATE_CHART":
-                return this.validateChartDefinition(cmd);
+                return this.checkValidations(cmd, this.chainValidations(this.validateChartDefinition, this.checkChartExists));
             default:
                 return 0 /* CommandResult.Success */;
         }
     }
     handle(cmd) {
-        var _a, _b;
+        var _a;
         switch (cmd.type) {
             case "CREATE_CHART":
                 this.addFigure(cmd.id, cmd.sheetId, cmd.position, cmd.size);
-                this.addChart(cmd.id, cmd.sheetId, cmd.definition);
+                this.addChart(cmd.id, cmd.definition);
                 break;
             case "UPDATE_CHART": {
-                this.addChart(cmd.id, cmd.sheetId, cmd.definition);
+                this.addChart(cmd.id, cmd.definition);
                 break;
             }
             case "DUPLICATE_SHEET": {
@@ -28524,7 +28554,7 @@ class ChartPlugin extends CorePlugin {
                     if (fig.tag === "chart") {
                         const figureIdBase = fig.id.split(FIGURE_ID_SPLITTER).pop();
                         const duplicatedFigureId = `${cmd.sheetIdTo}${FIGURE_ID_SPLITTER}${figureIdBase}`;
-                        const chart = (_b = (_a = this.charts[cmd.sheetId]) === null || _a === void 0 ? void 0 : _a[fig.id]) === null || _b === void 0 ? void 0 : _b.copyForSheetId(cmd.sheetIdTo);
+                        const chart = (_a = this.charts[fig.id]) === null || _a === void 0 ? void 0 : _a.copyForSheetId(cmd.sheetIdTo);
                         if (chart) {
                             this.dispatch("CREATE_CHART", {
                                 id: duplicatedFigureId,
@@ -28539,44 +28569,44 @@ class ChartPlugin extends CorePlugin {
                 break;
             }
             case "DELETE_FIGURE":
-                this.history.update("charts", cmd.sheetId, cmd.id, undefined);
+                this.history.update("charts", cmd.id, undefined);
                 break;
             case "DELETE_SHEET":
-                this.history.update("charts", cmd.sheetId, undefined);
+                for (let id of this.getChartIds(cmd.sheetId)) {
+                    this.history.update("charts", id, undefined);
+                }
                 break;
         }
     }
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
-    getContextCreationChart(sheetId, figureId) {
-        var _a, _b;
-        return (_b = (_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) === null || _b === void 0 ? void 0 : _b.getContextCreation();
-    }
-    getChart(sheetId, figureId) {
+    getContextCreationChart(figureId) {
         var _a;
-        return (_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId];
+        return (_a = this.charts[figureId]) === null || _a === void 0 ? void 0 : _a.getContextCreation();
     }
-    getChartType(sheetId, figureId) {
-        var _a, _b;
-        const type = (_b = (_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) === null || _b === void 0 ? void 0 : _b.type;
+    getChart(figureId) {
+        return this.charts[figureId];
+    }
+    getChartType(figureId) {
+        var _a;
+        const type = (_a = this.charts[figureId]) === null || _a === void 0 ? void 0 : _a.type;
         if (!type) {
             throw new Error("Chart not defined.");
         }
         return type;
     }
-    isChartDefined(sheetId, figureId) {
-        return figureId in (this.charts[sheetId] || {});
+    isChartDefined(figureId) {
+        return figureId in this.charts && this.charts !== undefined;
     }
     getChartIds(sheetId) {
-        // TODORAR refaire ce shit truc
-        // on veut un  truc du genre Object.keys(this.charts[sheetId] || {} a mon avis
-        // return (Object.values(this.charts[sheetId] || {}).filter(isDefined) as AbstractChart[]).map((chart) => chart.id);
-        return Object.keys(this.charts[sheetId] || {});
+        return Object.entries(this.charts)
+            .filter(([, chart]) => (chart === null || chart === void 0 ? void 0 : chart.sheetId) === sheetId)
+            .map(([id]) => id);
     }
-    getChartDefinition(sheetId, figureId) {
-        var _a, _b;
-        const definition = (_b = (_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId]) === null || _b === void 0 ? void 0 : _b.getDefinition();
+    getChartDefinition(figureId) {
+        var _a;
+        const definition = (_a = this.charts[figureId]) === null || _a === void 0 ? void 0 : _a.getDefinition();
         if (!definition) {
             throw new Error(`There is no chart with the given figureId: ${figureId}`);
         }
@@ -28588,28 +28618,35 @@ class ChartPlugin extends CorePlugin {
     import(data) {
         for (let sheet of data.sheets) {
             if (sheet.figures) {
-                const charts = {};
                 for (let figure of sheet.figures) {
                     // TODO:
                     // figure data should be external IMO => chart should be in sheet.chart
                     // instead of in figure.data
                     if (figure.tag === "chart") {
-                        charts[figure.id] = this.createChart(figure.id, figure.data, sheet.id);
+                        this.charts[figure.id] = this.createChart(figure.id, figure.data, sheet.id);
                     }
                 }
-                this.charts[sheet.id] = charts;
             }
         }
     }
     export(data) {
+        var _a;
         if (data.sheets) {
             for (let sheet of data.sheets) {
                 // TODO This code is false, if two plugins want ot insert figures on the sheet, it will crash !
                 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.getChartDefinition(sheet.id, figure.id);
+                        const data = (_a = this.charts[figure.id]) === null || _a === void 0 ? void 0 : _a.getDefinition();
+                        if (data) {
+                            figure.data = data;
+                            figures.push(figure);
+                        }
+                    }
+                    else {
+                        figures.push(figure);
                     }
                 }
                 sheet.figures = figures;
@@ -28617,13 +28654,13 @@ class ChartPlugin extends CorePlugin {
         }
     }
     exportForExcel(data) {
-        var _a, _b;
+        var _a;
         for (let sheet of data.sheets) {
             const sheetFigures = this.getters.getFigures(sheet.id);
             const figures = [];
             for (let figure of sheetFigures) {
                 if (figure && figure.tag === "chart") {
-                    const figureData = (_b = (_a = this.charts[sheet.id]) === null || _a === void 0 ? void 0 : _a[figure.id]) === null || _b === void 0 ? void 0 : _b.getDefinitionForExcel();
+                    const figureData = (_a = this.charts[figure.id]) === null || _a === void 0 ? void 0 : _a.getDefinitionForExcel();
                     if (figureData) {
                         figures.push({
                             ...figure,
@@ -28662,15 +28699,21 @@ class ChartPlugin extends CorePlugin {
      * Add a chart in the local state. If a chart already exists, this chart is
      * replaced
      */
-    addChart(id, sheetId, definition) {
-        this.history.update("charts", sheetId, id, this.createChart(id, definition, sheetId));
+    addChart(id, definition) {
+        const sheetId = this.getters.getFigureSheetId(id);
+        if (sheetId) {
+            this.history.update("charts", id, this.createChart(id, definition, sheetId));
+        }
     }
     checkChartDuplicate(cmd) {
-        var _a;
-        if ((_a = this.charts[cmd.sheetId]) === null || _a === void 0 ? void 0 : _a[cmd.id]) {
-            return 84 /* CommandResult.DuplicatedChartId */;
-        }
-        return 0 /* CommandResult.Success */;
+        return this.getters.getFigureSheetId(cmd.id)
+            ? 84 /* CommandResult.DuplicatedChartId */
+            : 0 /* CommandResult.Success */;
+    }
+    checkChartExists(cmd) {
+        return this.getters.getFigureSheetId(cmd.id)
+            ? 0 /* CommandResult.Success */
+            : 85 /* CommandResult.ChartDoesNotExist */;
     }
 }
 ChartPlugin.getters = [
@@ -29051,7 +29094,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);
@@ -29117,9 +29160,8 @@ class FigurePlugin extends CorePlugin {
         }
         return 0 /* CommandResult.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 82 /* CommandResult.DuplicatedFigureId */;
         }
         return 0 /* CommandResult.Success */;
@@ -29134,6 +29176,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
     // ---------------------------------------------------------------------------
@@ -29158,7 +29203,7 @@ class FigurePlugin extends CorePlugin {
         this.export(data);
     }
 }
-FigurePlugin.getters = ["getFigures", "getFigure"];
+FigurePlugin.getters = ["getFigures", "getFigure", "getFigureSheetId"];
 
 class FilterTable {
     constructor(zone) {
@@ -29885,7 +29930,7 @@ class ImagePlugin extends CorePlugin {
         switch (cmd.type) {
             case "CREATE_IMAGE":
                 if (this.getters.getFigure(cmd.sheetId, cmd.figureId)) {
-                    return 28 /* CommandResult.DuplicatedImageId */;
+                    return 28 /* CommandResult.InvalidFigureId */;
                 }
                 return 0 /* CommandResult.Success */;
             default:
@@ -29905,7 +29950,7 @@ class ImagePlugin extends CorePlugin {
                     if (fig.tag === "image") {
                         const figureIdBase = fig.id.split(FIGURE_ID_SPLITTER).pop();
                         const duplicatedFigureId = `${cmd.sheetIdTo}${FIGURE_ID_SPLITTER}${figureIdBase}`;
-                        const image = this.getImage(cmd.sheetId, fig.id);
+                        const image = this.getImage(fig.id);
                         if (image) {
                             const size = { width: fig.width, height: fig.height };
                             this.dispatch("CREATE_IMAGE", {
@@ -29943,13 +29988,19 @@ class ImagePlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Getters
     // ---------------------------------------------------------------------------
-    getImage(sheetId, figureId) {
-        var _a;
-        const image = (_a = this.images[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId];
-        if (!image) {
-            throw new Error(`There is no image with the given figureId: ${figureId}`);
+    getImage(figureId) {
+        for (const sheet of Object.values(this.images)) {
+            if (sheet && sheet[figureId]) {
+                return sheet[figureId];
+            }
         }
-        return image;
+        throw new Error(`There is no image with the given figureId: ${figureId}`);
+    }
+    getImagePath(figureId) {
+        return this.getImage(figureId).path;
+    }
+    getImageSize(figureId) {
+        return this.getImage(figureId).size;
     }
     // ---------------------------------------------------------------------------
     // Private
@@ -29991,7 +30042,7 @@ class ImagePlugin extends CorePlugin {
         return images;
     }
 }
-ImagePlugin.getters = ["getImage"];
+ImagePlugin.getters = ["getImage", "getImagePath", "getImageSize"];
 
 class MergePlugin extends CorePlugin {
     constructor() {
@@ -31792,9 +31843,7 @@ class CustomColorsPlugin extends UIPlugin {
         return formatColors.filter(isDefined$1);
     }
     getChartColors(sheetId) {
-        const charts = this.getters
-            .getChartIds(sheetId)
-            .map((cid) => this.getters.getChart(sheetId, cid));
+        const charts = this.getters.getChartIds(sheetId).map((cid) => this.getters.getChart(cid));
         let chartsColors = new Set();
         for (let chart of charts) {
             if (chart === undefined) {
@@ -32150,37 +32199,34 @@ class EvaluationChartPlugin extends UIPlugin {
             invalidateCFEvaluationCommands.has(cmd.type) ||
             cmd.type === "EVALUATE_CELLS" ||
             cmd.type === "UPDATE_CELL") {
-            for (const sheetId in this.charts) {
-                for (const chartId in this.charts[sheetId]) {
-                    this.charts[sheetId][chartId] = undefined;
-                }
+            for (const chartId in this.charts) {
+                this.charts[chartId] = undefined;
             }
         }
         switch (cmd.type) {
             case "UPDATE_CHART":
             case "CREATE_CHART":
             case "DELETE_FIGURE":
-                if (this.charts[cmd.sheetId]) {
-                    this.charts[cmd.sheetId][cmd.id] = undefined;
-                }
+                this.charts[cmd.id] = undefined;
                 break;
             case "DELETE_SHEET":
-                delete this.charts[cmd.sheetId];
+                for (let chartId in this.charts) {
+                    if (!this.getters.isChartDefined(chartId)) {
+                        this.charts[chartId] = undefined;
+                    }
+                }
                 break;
         }
     }
-    getChartRuntime(sheetId, figureId) {
-        var _a;
-        if (!((_a = this.charts[sheetId]) === null || _a === void 0 ? void 0 : _a[figureId])) {
-            const chart = this.getters.getChart(sheetId, figureId);
+    getChartRuntime(figureId) {
+        if (!this.charts[figureId]) {
+            const chart = this.getters.getChart(figureId);
             if (!chart) {
                 throw new Error(`No chart for the given id: ${figureId}`);
             }
-            if (!this.charts[sheetId])
-                this.charts[sheetId] = {};
-            this.charts[sheetId][figureId] = this.createRuntimeChart(chart);
+            this.charts[figureId] = this.createRuntimeChart(chart);
         }
-        return this.charts[sheetId][figureId];
+        return this.charts[figureId];
     }
     /**
      * Get the background color of a chart based on the color of the first cell of the main range
@@ -37824,7 +37870,7 @@ class ClipboardFigureChart {
     constructor(dispatch, getters, sheetId, copiedFigureId) {
         this.dispatch = dispatch;
         this.sheetId = sheetId;
-        const chart = getters.getChart(sheetId, copiedFigureId);
+        const chart = getters.getChart(copiedFigureId);
         if (!chart) {
             throw new Error(`No chart for the given id: ${copiedFigureId}`);
         }
@@ -37845,7 +37891,7 @@ class ClipboardFigureImage {
     constructor(dispatch, getters, sheetId, copiedFigureId) {
         this.dispatch = dispatch;
         this.sheetId = sheetId;
-        const image = getters.getImage(sheetId, copiedFigureId);
+        const image = getters.getImage(copiedFigureId);
         this.copiedImage = deepCopy(image);
     }
     paste(sheetId, figureId, position, size) {
@@ -43853,6 +43899,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.1.1';
-__info__.date = '2023-02-28T09:39:22.910Z';
-__info__.hash = '943d80d';
+__info__.version = '16.1.3';
+__info__.date = '2023-03-06T07:18:06.669Z';
+__info__.hash = '7e26a7c';