@odoo/o-spreadsheet 16.2.0-alpha.1 → 16.2.0-alpha.3

package/dist/o_spreadsheet.iife.js

@@ -274,7 +274,6 @@
       ComponentsImportance[ComponentsImportance["Dropdown"] = 16] = "Dropdown";
       ComponentsImportance[ComponentsImportance["GridComposer"] = 20] = "GridComposer";
       ComponentsImportance[ComponentsImportance["TopBarComposer"] = 21] = "TopBarComposer";
-      ComponentsImportance[ComponentsImportance["ColorPicker"] = 25] = "ColorPicker";
       ComponentsImportance[ComponentsImportance["IconPicker"] = 25] = "IconPicker";
       ComponentsImportance[ComponentsImportance["Popover"] = 30] = "Popover";
       ComponentsImportance[ComponentsImportance["ChartAnchor"] = 1000] = "ChartAnchor";
@@ -2844,7 +2843,7 @@
           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");
           }
@@ -3109,7 +3108,7 @@
           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;
@@ -3498,7 +3497,7 @@
       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";
@@ -3555,6 +3554,7 @@
       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;
@@ -6165,7 +6165,7 @@
           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 = {
@@ -17184,7 +17184,7 @@
                   id: "reset_size",
                   name: _lt("Reset size"),
                   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(),
@@ -17233,8 +17233,7 @@
           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";
@@ -18039,9 +18038,9 @@
           const ranges = existingSelectionRange.length
               ? existingSelectionRange
               : this.props.ranges
-                  ? this.props.ranges.map((xc, i) => ({
+                  ? this.props.ranges.map((xc, id) => ({
                       xc,
-                      id: i.toString(),
+                      id,
                       isFocused: false,
                   }))
                   : [];
@@ -18107,6 +18106,7 @@
           else if (ev.key === "Enter") {
               const target = ev.target;
               target.blur();
+              this.confirm();
           }
       }
       focus(rangeId) {
@@ -18135,7 +18135,7 @@
           });
           this.triggerChange();
       }
-      disable() {
+      confirm() {
           var _a, _b;
           this.env.model.dispatch("UNFOCUS_SELECTION_INPUT");
           const ranges = this.env.model.getters.getSelectionInputValue(this.id);
@@ -18230,7 +18230,6 @@
   LineBarPieConfigPanel.template = "o-spreadsheet-LineBarPieConfigPanel";
   LineBarPieConfigPanel.components = { SelectionInput };
   LineBarPieConfigPanel.props = {
-      sheetId: String,
       figureId: String,
       definition: Object,
       updateChart: Function,
@@ -18263,9 +18262,6 @@
   const GRADIENT_HEIGHT = PICKER_WIDTH - 50;
   css /* scss */ `
   .o-color-picker {
-    position: absolute;
-    top: calc(100% + 5px);
-    z-index: ${ComponentsImportance.ColorPicker};
     padding: ${PICKER_PADDING}px 0px;
     box-shadow: 1px 2px 5px 2px rgba(51, 51, 51, 0.15);
     background-color: white;
@@ -18380,15 +18376,6 @@
         width: 100%;
       }
     }
-    &.right {
-      left: 0;
-    }
-    &.left {
-      right: 0;
-    }
-    &.center {
-      left: calc(50% - ${PICKER_WIDTH / 2}px);
-    }
   }
   .o-magnifier-glass {
     position: absolute;
@@ -18423,14 +18410,18 @@
           });
       }
       get colorPickerStyle() {
-          if (this.props.maxHeight === undefined)
-              return "";
-          if (this.props.maxHeight <= 0) {
+          if (this.props.maxHeight !== undefined && this.props.maxHeight <= 0) {
               return cssPropertiesToCss({ display: "none" });
           }
-          return cssPropertiesToCss({
-              "max-height": `${this.props.maxHeight}px`,
-          });
+          return "";
+      }
+      get popoverProps() {
+          return {
+              anchorRect: this.props.anchorRect,
+              maxHeight: this.props.maxHeight,
+              positioning: "BottomLeft",
+              verticalOffset: 0,
+          };
       }
       onColorClick(color) {
           if (color) {
@@ -18485,11 +18476,12 @@
   ColorPicker.defaultProps = {
       currentColor: "", //TODO Change it to false instead of empty string
   };
+  ColorPicker.components = { Popover };
   ColorPicker.props = {
-      dropdownDirection: { type: String, optional: true },
       onColorPicked: Function,
       currentColor: { type: String, optional: true },
       maxHeight: { type: Number, optional: true },
+      anchorRect: Object,
   };
 
   css /* scss */ `
@@ -18525,11 +18517,25 @@
   }
 `;
   class ColorPickerWidget extends owl.Component {
+      constructor() {
+          super(...arguments);
+          this.colorPickerButtonRef = owl.useRef("colorPickerButton");
+      }
       get iconStyle() {
           return this.props.currentColor
               ? `border-color: ${this.props.currentColor}`
               : "border-bottom-style: hidden";
       }
+      get colorPickerAnchorRect() {
+          const button = this.colorPickerButtonRef.el;
+          const buttonRect = button.getBoundingClientRect();
+          return {
+              x: buttonRect.x,
+              y: buttonRect.y,
+              width: buttonRect.width,
+              height: buttonRect.height,
+          };
+      }
   }
   ColorPickerWidget.template = "o-spreadsheet-ColorPickerWidget";
   ColorPickerWidget.components = { ColorPicker };
@@ -18539,7 +18545,6 @@
       showColorPicker: Boolean,
       onColorPicked: Function,
       icon: String,
-      dropdownDirection: { type: String, optional: true },
       title: { type: String, optional: true },
       disabled: { type: Boolean, optional: true },
       dropdownMaxHeight: { type: Number, optional: true },
@@ -18619,7 +18624,6 @@
   GaugeChartConfigPanel.template = "o-spreadsheet-GaugeChartConfigPanel";
   GaugeChartConfigPanel.components = { SelectionInput };
   GaugeChartConfigPanel.props = {
-      sheetId: String,
       figureId: String,
       definition: Object,
       updateChart: Function,
@@ -18766,7 +18770,7 @@
 
   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);
           }
@@ -18843,7 +18847,6 @@
   ScorecardChartConfigPanel.template = "o-spreadsheet-ScorecardChartConfigPanel";
   ScorecardChartConfigPanel.components = { SelectionInput };
   ScorecardChartConfigPanel.props = {
-      sheetId: String,
       figureId: String,
       definition: Object,
       updateChart: Function,
@@ -18979,7 +18982,7 @@
               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;
               }
@@ -18993,7 +18996,6 @@
               ...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,
@@ -19001,12 +19003,11 @@
           });
       }
       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,
@@ -19014,7 +19015,7 @@
           });
       }
       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.");
           }
@@ -19024,8 +19025,8 @@
           }
           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();
@@ -25897,13 +25898,7 @@
               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) {
@@ -26141,6 +26136,48 @@
           },
       },
   ];
+  /**
+   * 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.
@@ -26279,6 +26316,7 @@
           formats: {},
           borders: {},
           revisionId: DEFAULT_REVISION_ID,
+          uniqueFigureIds: true,
       };
       return data;
   }
@@ -28058,10 +28096,8 @@
           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));
           }
       }
       // ---------------------------------------------------------------------------
@@ -28072,20 +28108,20 @@
               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": {
@@ -28094,7 +28130,7 @@
                       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,
@@ -28109,44 +28145,44 @@
                   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}`);
           }
@@ -28158,28 +28194,35 @@
       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;
@@ -28187,13 +28230,13 @@
           }
       }
       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,
@@ -28232,15 +28275,21 @@
        * 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 = [
@@ -28621,7 +28670,7 @@
       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);
@@ -28687,9 +28736,8 @@
           }
           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 */;
@@ -28704,6 +28752,9 @@
           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
       // ---------------------------------------------------------------------------
@@ -28728,7 +28779,7 @@
           this.export(data);
       }
   }
-  FigurePlugin.getters = ["getFigures", "getFigure"];
+  FigurePlugin.getters = ["getFigures", "getFigure", "getFigureSheetId"];
 
   class FilterTable {
       constructor(zone) {
@@ -29455,7 +29506,7 @@
           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:
@@ -29475,7 +29526,7 @@
                       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", {
@@ -29513,13 +29564,19 @@
       // ---------------------------------------------------------------------------
       // 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
@@ -29561,7 +29618,7 @@
           return images;
       }
   }
-  ImagePlugin.getters = ["getImage"];
+  ImagePlugin.getters = ["getImage", "getImagePath", "getImageSize"];
 
   class MergePlugin extends CorePlugin {
       constructor() {
@@ -31367,9 +31424,7 @@
           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) {
@@ -31735,37 +31790,34 @@
               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
@@ -35250,8 +35302,8 @@
           const currentMaxId = Math.max(0, ...this.ranges.map((range) => Number(range.id)));
           this.ranges.splice(index, 0, ...values.map((xc, i) => ({
               xc,
-              id: (currentMaxId + i + 1).toString(),
-              color: colors$1[(currentMaxId + 1 + i) % colors$1.length],
+              id: currentMaxId + i + 1,
+              color: colors$1[(currentMaxId + i) % colors$1.length],
           })));
       }
       /**
@@ -37417,7 +37469,7 @@
       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}`);
           }
@@ -37438,7 +37490,7 @@
       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) {
@@ -44850,9 +44902,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.2.0-alpha.1';
-  __info__.date = '2023-03-01T07:42:43.501Z';
-  __info__.hash = '162451a';
+  __info__.version = '16.2.0-alpha.3';
+  __info__.date = '2023-03-06T07:18:09.258Z';
+  __info__.hash = 'ec749cf';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);