@odoo/o-spreadsheet 16.3.1 → 16.3.3

package/dist/o-spreadsheet.cjs.js

@@ -1777,6 +1777,7 @@ function removeTrailingZeroes(numberString) {
     }
     return numberString.slice(0, i + 1) || undefined;
 }
+const leadingZeroesRegexp = /^0+/;
 /**
  * Limit the size of the decimal part of a number to the given number of digits.
  */
@@ -1787,17 +1788,24 @@ function limitDecimalDigits(decimalDigits, maxDecimals) {
     // but it has very strange behaviour. Ex: 12.345.toFixed(2) => "12.35", but 1.345.toFixed(2) => "1.34"
     let slicedDecimalDigits = decimalDigits.slice(0, maxDecimals);
     const i = maxDecimals;
-    if (Number(Number(decimalDigits[i]) < 5)) {
+    if (Number(decimalDigits[i]) < 5) {
         return { integerDigits, decimalDigits: slicedDecimalDigits };
     }
     // round up
+    const leadingZeroes = slicedDecimalDigits.match(leadingZeroesRegexp)?.[0] || "";
     const slicedRoundedUp = (Number(slicedDecimalDigits) + 1).toString();
-    if (slicedRoundedUp.length > slicedDecimalDigits.length) {
-        integerDigits = (Number(integerDigits) + 1).toString();
+    const withoutLeadingZeroes = slicedDecimalDigits.slice(leadingZeroes.length);
+    // e.g. carry over from 99 to 100
+    const carryOver = slicedRoundedUp.length > withoutLeadingZeroes.length;
+    if (carryOver && !leadingZeroes) {
+        integerDigits = "1";
         resultDecimalDigits = undefined;
     }
+    else if (carryOver) {
+        resultDecimalDigits = leadingZeroes.slice(0, -1) + slicedRoundedUp;
+    }
     else {
-        resultDecimalDigits = slicedRoundedUp;
+        resultDecimalDigits = leadingZeroes + slicedRoundedUp;
     }
     return { integerDigits, decimalDigits: resultDecimalDigits };
 }
@@ -17844,7 +17852,7 @@ class LineBarPieConfigPanel extends owl.Component {
         return !!this.state.labelsDispatchResult?.isCancelledBecause(33 /* CommandResult.InvalidLabelRange */);
     }
     onUpdateDataSetsHaveTitle(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             dataSetsHaveTitle: ev.target.checked,
         });
     }
@@ -17856,7 +17864,7 @@ class LineBarPieConfigPanel extends owl.Component {
         this.dataSeriesRanges = ranges;
     }
     onDataSeriesConfirmed() {
-        this.state.datasetDispatchResult = this.props.updateChart({
+        this.state.datasetDispatchResult = this.props.updateChart(this.props.figureId, {
             dataSets: this.dataSeriesRanges,
         });
     }
@@ -17868,12 +17876,12 @@ class LineBarPieConfigPanel extends owl.Component {
         this.labelRange = ranges[0];
     }
     onLabelRangeConfirmed() {
-        this.state.labelsDispatchResult = this.props.updateChart({
+        this.state.labelsDispatchResult = this.props.updateChart(this.props.figureId, {
             labelRange: this.labelRange,
         });
     }
     onUpdateAggregated(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             aggregated: ev.target.checked,
         });
     }
@@ -17903,12 +17911,12 @@ LineBarPieConfigPanel.props = {
 class BarConfigPanel extends LineBarPieConfigPanel {
     static template = "o-spreadsheet-BarConfigPanel";
     onUpdateStacked(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             stacked: ev.target.checked,
         });
     }
     onUpdateAggregated(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             aggregated: ev.target.checked,
         });
     }
@@ -17948,6 +17956,7 @@ css /* scss */ `
     .o-color-picker-toggler-button {
       display: flex;
       .o-color-picker-toggler-sign {
+        display: flex;
         margin: auto auto;
         width: 55%;
         height: 55%;
@@ -18245,17 +18254,17 @@ class LineBarPieDesignPanel extends owl.Component {
         this.state.fillColorTool = !this.state.fillColorTool;
     }
     updateBackgroundColor(color) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             background: color,
         });
     }
     updateTitle(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             title: ev.target.value,
         });
     }
     updateSelect(attr, ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             [attr]: ev.target.value,
         });
     }
@@ -18288,7 +18297,7 @@ class GaugeChartConfigPanel extends owl.Component {
         this.dataRange = ranges[0];
     }
     updateDataRange() {
-        this.state.dataRangeDispatchResult = this.props.updateChart({
+        this.state.dataRangeDispatchResult = this.props.updateChart(this.props.figureId, {
             dataRange: this.dataRange,
         });
     }
@@ -18346,12 +18355,12 @@ class GaugeChartDesignPanel extends owl.Component {
     }
     updateBackgroundColor(color) {
         this.state.openedMenu = undefined;
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             background: color,
         });
     }
     updateTitle(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             title: ev.target.value,
         });
     }
@@ -18416,7 +18425,7 @@ class GaugeChartDesignPanel extends owl.Component {
         }
     }
     updateSectionRule(sectionRule) {
-        this.state.sectionRuleDispatchResult = this.props.updateChart({
+        this.state.sectionRuleDispatchResult = this.props.updateChart(this.props.figureId, {
             sectionRule,
         });
     }
@@ -18440,17 +18449,17 @@ class LineConfigPanel extends LineBarPieConfigPanel {
         return false;
     }
     onUpdateLabelsAsText(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             labelsAsText: ev.target.checked,
         });
     }
     onUpdateStacked(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             stacked: ev.target.checked,
         });
     }
     onUpdateAggregated(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             aggregated: ev.target.checked,
         });
     }
@@ -18486,7 +18495,7 @@ class ScorecardChartConfigPanel extends owl.Component {
         this.keyValue = ranges[0];
     }
     updateKeyValueRange() {
-        this.state.keyValueDispatchResult = this.props.updateChart({
+        this.state.keyValueDispatchResult = this.props.updateChart(this.props.figureId, {
             keyValue: this.keyValue,
         });
     }
@@ -18494,12 +18503,12 @@ class ScorecardChartConfigPanel extends owl.Component {
         this.baseline = ranges[0];
     }
     updateBaselineRange() {
-        this.state.baselineDispatchResult = this.props.updateChart({
+        this.state.baselineDispatchResult = this.props.updateChart(this.props.figureId, {
             baseline: this.baseline,
         });
     }
     updateBaselineMode(ev) {
-        this.props.updateChart({ baselineMode: ev.target.value });
+        this.props.updateChart(this.props.figureId, { baselineMode: ev.target.value });
     }
 }
 ScorecardChartConfigPanel.props = {
@@ -18518,12 +18527,12 @@ class ScorecardChartDesignPanel extends owl.Component {
         owl.useExternalListener(window, "click", this.closeMenus);
     }
     updateTitle(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             title: ev.target.value,
         });
     }
     updateBaselineDescr(ev) {
-        this.props.updateChart({ baselineDescr: ev.target.value });
+        this.props.updateChart(this.props.figureId, { baselineDescr: ev.target.value });
     }
     toggleColorPicker(colorPickerId) {
         if (this.state.openedColorPicker === colorPickerId) {
@@ -18536,13 +18545,13 @@ class ScorecardChartDesignPanel extends owl.Component {
     setColor(color, colorPickerId) {
         switch (colorPickerId) {
             case "backgroundColor":
-                this.props.updateChart({ background: color });
+                this.props.updateChart(this.props.figureId, { background: color });
                 break;
             case "baselineColorDown":
-                this.props.updateChart({ baselineColorDown: color });
+                this.props.updateChart(this.props.figureId, { baselineColorDown: color });
                 break;
             case "baselineColorUp":
-                this.props.updateChart({ baselineColorUp: color });
+                this.props.updateChart(this.props.figureId, { baselineColorUp: color });
                 break;
         }
         this.closeMenus();
@@ -18607,13 +18616,9 @@ css /* scss */ `
 class ChartPanel extends owl.Component {
     static template = "o-spreadsheet-ChartPanel";
     state;
-    shouldUpdateChart = true;
     get figureId() {
         return this.state.figureId;
     }
-    get sheetId() {
-        return this.state.sheetId;
-    }
     setup() {
         const selectedFigureId = this.env.model.getters.getSelectedFigureId();
         if (!selectedFigureId) {
@@ -18623,17 +18628,11 @@ class ChartPanel extends owl.Component {
         this.state = owl.useState({
             panel: "configuration",
             figureId: selectedFigureId,
-            sheetId: this.env.model.getters.getActiveSheetId(),
         });
         owl.onWillUpdateProps(() => {
             const selectedFigureId = this.env.model.getters.getSelectedFigureId();
             if (selectedFigureId && selectedFigureId !== this.state.figureId) {
                 this.state.figureId = selectedFigureId;
-                this.state.sheetId = this.env.model.getters.getActiveSheetId();
-                this.shouldUpdateChart = false;
-            }
-            else {
-                this.shouldUpdateChart = true;
             }
             if (!this.env.model.getters.isChartDefined(this.figureId)) {
                 this.props.onCloseSidePanel();
@@ -18641,8 +18640,8 @@ class ChartPanel extends owl.Component {
             }
         });
     }
-    updateChart(updateDefinition) {
-        if (!this.shouldUpdateChart) {
+    updateChart(figureId, updateDefinition) {
+        if (figureId !== this.figureId) {
             return;
         }
         const definition = {
@@ -18651,8 +18650,8 @@ class ChartPanel extends owl.Component {
         };
         return this.env.model.dispatch("UPDATE_CHART", {
             definition,
-            id: this.figureId,
-            sheetId: this.sheetId,
+            id: figureId,
+            sheetId: this.env.model.getters.getFigureSheetId(figureId),
         });
     }
     onTypeChange(type) {
@@ -18664,7 +18663,7 @@ class ChartPanel extends owl.Component {
         this.env.model.dispatch("UPDATE_CHART", {
             definition,
             id: this.figureId,
-            sheetId: this.sheetId,
+            sheetId: this.env.model.getters.getFigureSheetId(this.figureId),
         });
     }
     get chartPanel() {
@@ -24485,6 +24484,16 @@ const XLSX_INDEXED_COLORS = {
     63: "333333",
     64: "000000",
     65: "FFFFFF", // system background
+};
+const IMAGE_MIMETYPE_EXTENSION_MAPPING = {
+    "image/avif": "avif",
+    "image/bmp": "bmp",
+    "image/gif": "gif",
+    "image/vnd.microsoft.icon": "ico",
+    "image/jpeg": "jpeg",
+    "image/png": "png",
+    "image/tiff": "tiff",
+    "image/webp": "webp",
 };
 
 /**
@@ -26966,6 +26975,11 @@ function createOverride(partName, contentType) {
     <Override ContentType="${contentType}" PartName="${partName}" />
   `;
 }
+function createDefaultXMLElement(extension, contentType) {
+    return escapeXml /*xml*/ `
+    <Default Extension="${extension}" ContentType="${contentType}" />
+  `;
+}
 function joinXmlNodes(xmlNodes) {
     return new XMLString(xmlNodes.join("\n"));
 }
@@ -41733,7 +41747,7 @@ class ImageProvider {
         const file = await this.getImageFromUser();
         const path = await this.fileStore.upload(file);
         const size = await this.getImageSize(path);
-        return { path, size };
+        return { path, size, mimetype: file.type };
     }
     getImageFromUser() {
         return new Promise((resolve, reject) => {
@@ -46814,8 +46828,7 @@ function createWorksheets(data, construct) {
         // Figures and Charts
         let drawingNode = escapeXml ``;
         const drawingRelIds = [];
-        const charts = sheet.charts;
-        for (const chart of charts) {
+        for (const chart of sheet.charts) {
             const xlsxChartId = convertChartId(chart.id);
             const chartRelId = addRelsToFile(construct.relsFiles, `xl/drawings/_rels/drawing${sheetIndex}.xml.rels`, {
                 target: `../charts/chart${xlsxChartId}.xml`,
@@ -46824,20 +46837,27 @@ function createWorksheets(data, construct) {
             drawingRelIds.push(chartRelId);
             files.push(createXMLFile(createChart(chart, sheetIndex, data), `xl/charts/chart${xlsxChartId}.xml`, "chart"));
         }
-        const images = sheet.images;
-        for (const image of images) {
+        for (const image of sheet.images) {
+            const mimeType = image.data.mimetype;
+            if (mimeType === undefined)
+                continue;
+            const extension = IMAGE_MIMETYPE_EXTENSION_MAPPING[mimeType];
+            // only support exporting images with mimetypes specified in the mapping
+            if (extension === undefined)
+                continue;
             const xlsxImageId = convertImageId(image.id);
+            let imageFileName = `image${xlsxImageId}.${extension}`;
             const imageRelId = addRelsToFile(construct.relsFiles, `xl/drawings/_rels/drawing${sheetIndex}.xml.rels`, {
-                target: `../media/image${xlsxImageId}`,
+                target: `../media/${imageFileName}`,
                 type: XLSX_RELATION_TYPE.image,
             });
             drawingRelIds.push(imageRelId);
             files.push({
-                path: `xl/media/image${xlsxImageId}`,
-                imagePath: image.data.path,
+                path: `xl/media/${imageFileName}`,
+                imageSrc: image.data.path,
             });
         }
-        const drawings = [...charts, ...images];
+        const drawings = [...sheet.charts, ...sheet.images];
         if (drawings.length) {
             const drawingRelId = addRelsToFile(construct.relsFiles, `xl/worksheets/_rels/sheet${sheetIndex}.xml.rels`, {
                 target: `../drawings/drawing${sheetIndex}.xml`,
@@ -46956,6 +46976,8 @@ function createRelsFiles(relsFiles) {
 }
 function createContentTypes(files) {
     const overrideNodes = [];
+    // hard-code supported image mimetypes
+    const imageDefaultNodes = Object.entries(IMAGE_MIMETYPE_EXTENSION_MAPPING).map(([mimetype, extension]) => createDefaultXMLElement(extension, mimetype));
     for (const file of files) {
         if ("contentType" in file && file.contentType) {
             overrideNodes.push(createOverride("/" + file.path, CONTENT_TYPES[file.contentType]));
@@ -46971,6 +46993,7 @@ function createContentTypes(files) {
     ];
     const xml = escapeXml /*xml*/ `
     <Types xmlns="${NAMESPACE["Types"]}">
+      ${joinXmlNodes(Object.values(imageDefaultNodes))}
       <Default ${formatAttributes(relsAttributes)} />
       <Default ${formatAttributes(xmlAttributes)} />
       ${joinXmlNodes(overrideNodes)}
@@ -47583,6 +47606,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.3.1';
-__info__.date = '2023-05-25T13:00:27.320Z';
-__info__.hash = 'b3cfd2c';
+__info__.version = '16.3.3';
+__info__.date = '2023-06-12T13:50:01.114Z';
+__info__.hash = 'd3ab96f';

package/dist/o-spreadsheet.d.ts

@@ -297,7 +297,7 @@ interface XLSXExportXMLFile {
 }
 interface XLSXExportImageFile {
     path: string;
-    imagePath: string;
+    imageSrc: string;
 }
 interface XLSXExport {
     name: string;
@@ -574,6 +574,7 @@ declare type ResizeDirection = -1 | 0 | 1;
 interface Image {
     path: string;
     size: FigureSize;
+    mimetype?: string;
 }
 
 interface CellData {
@@ -5026,7 +5027,7 @@ declare class SelectionInput extends Component<Props$D, SpreadsheetChildEnv> {
 interface Props$C {
     figureId: UID;
     definition: LineChartDefinition | BarChartDefinition | PieChartDefinition;
-    updateChart: (definition: Partial<LineChartDefinition | BarChartDefinition | PieChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<LineChartDefinition | BarChartDefinition | PieChartDefinition>) => DispatchResult;
 }
 declare class LineBarPieConfigPanel extends Component<Props$C, SpreadsheetChildEnv> {
     static template: string;
@@ -5173,7 +5174,7 @@ declare class ColorPickerWidget extends Component<Props$B, SpreadsheetChildEnv>
 interface Props$A {
     figureId: UID;
     definition: LineChartDefinition | BarChartDefinition | PieChartDefinition;
-    updateChart: (definition: Partial<LineChartDefinition | BarChartDefinition | PieChartDefinition>) => CommandResult | CommandResult[];
+    updateChart: (figureId: UID, definition: Partial<LineChartDefinition | BarChartDefinition | PieChartDefinition>) => CommandResult | CommandResult[];
 }
 declare class LineBarPieDesignPanel extends Component<Props$A, SpreadsheetChildEnv> {
     static template: string;
@@ -5192,7 +5193,7 @@ declare class LineBarPieDesignPanel extends Component<Props$A, SpreadsheetChildE
 interface Props$z {
     figureId: UID;
     definition: GaugeChartDefinition;
-    updateChart: (definition: Partial<GaugeChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<GaugeChartDefinition>) => DispatchResult;
 }
 declare class GaugeChartConfigPanel extends Component<Props$z, SpreadsheetChildEnv> {
     static template: string;
@@ -5211,7 +5212,7 @@ declare type GaugeMenu = "backgroundColor" | "sectionColor-lowerColor" | "sectio
 interface Props$y {
     figureId: UID;
     definition: GaugeChartDefinition;
-    updateChart: (definition: Partial<GaugeChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<GaugeChartDefinition>) => DispatchResult;
 }
 declare class GaugeChartDesignPanel extends Component<Props$y, SpreadsheetChildEnv> {
     static template: string;
@@ -5248,7 +5249,7 @@ declare class LineConfigPanel extends LineBarPieConfigPanel {
 interface Props$x {
     figureId: UID;
     definition: ScorecardChartDefinition;
-    updateChart: (definition: Partial<ScorecardChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<ScorecardChartDefinition>) => DispatchResult;
 }
 declare class ScorecardChartConfigPanel extends Component<Props$x, SpreadsheetChildEnv> {
     static template: string;
@@ -5272,7 +5273,7 @@ declare type ColorPickerId = undefined | "backgroundColor" | "baselineColorUp" |
 interface Props$w {
     figureId: UID;
     definition: ScorecardChartDefinition;
-    updateChart: (definition: Partial<ScorecardChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<ScorecardChartDefinition>) => DispatchResult;
 }
 declare class ScorecardChartDesignPanel extends Component<Props$w, SpreadsheetChildEnv> {
     static template: string;
@@ -7018,11 +7019,9 @@ interface Props {
 declare class ChartPanel extends Component<Props, SpreadsheetChildEnv> {
     static template: string;
     private state;
-    private shouldUpdateChart;
     get figureId(): UID;
-    get sheetId(): UID;
     setup(): void;
-    updateChart<T extends ChartDefinition>(updateDefinition: Partial<T>): DispatchResult | undefined;
+    updateChart<T extends ChartDefinition>(figureId: UID, updateDefinition: Partial<T>): DispatchResult | undefined;
     onTypeChange(type: ChartType): void;
     get chartPanel(): ChartSidePanel;
     private getChartDefinition;