@odoo/o-spreadsheet 16.2.6 → 16.2.8

package/dist/o-spreadsheet.cjs.js

@@ -16863,7 +16863,7 @@ class LineBarPieConfigPanel extends owl.Component {
         return !!((_a = this.state.labelsDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(33 /* CommandResult.InvalidLabelRange */));
     }
     onUpdateDataSetsHaveTitle(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             dataSetsHaveTitle: ev.target.checked,
         });
     }
@@ -16875,7 +16875,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,
         });
     }
@@ -16887,12 +16887,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,
         });
     }
@@ -16907,12 +16907,12 @@ LineBarPieConfigPanel.props = {
 
 class BarConfigPanel extends LineBarPieConfigPanel {
     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,
         });
     }
@@ -16950,6 +16950,18 @@ css /* scss */ `
       grid-template-columns: repeat(${ITEMS_PER_LINE}, 1fr);
       grid-gap: ${ITEM_HORIZONTAL_MARGIN * 2}px;
     }
+    .o-color-picker-toggler {
+      display: flex;
+      .o-color-picker-toggler-sign {
+        margin: auto auto;
+        width: 55%;
+        height: 55%;
+        .o-icon {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
     .o-color-picker-line-item {
       width: ${ITEM_EDGE_LENGTH}px;
       height: ${ITEM_EDGE_LENGTH}px;
@@ -17243,17 +17255,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,
         });
     }
@@ -17291,7 +17303,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,
         });
     }
@@ -17353,12 +17365,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,
         });
     }
@@ -17427,7 +17439,7 @@ class GaugeChartDesignPanel extends owl.Component {
         }
     }
     updateSectionRule(sectionRule) {
-        this.state.sectionRuleDispatchResult = this.props.updateChart({
+        this.state.sectionRuleDispatchResult = this.props.updateChart(this.props.figureId, {
             sectionRule,
         });
     }
@@ -17452,17 +17464,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,
         });
     }
@@ -17503,7 +17515,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,
         });
     }
@@ -17511,12 +17523,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.template = "o-spreadsheet-ScorecardChartConfigPanel";
@@ -17538,12 +17550,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) {
@@ -17556,13 +17568,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();
@@ -17627,16 +17639,9 @@ css /* scss */ `
   }
 `;
 class ChartPanel extends owl.Component {
-    constructor() {
-        super(...arguments);
-        this.shouldUpdateChart = true;
-    }
     get figureId() {
         return this.state.figureId;
     }
-    get sheetId() {
-        return this.state.sheetId;
-    }
     setup() {
         const selectedFigureId = this.env.model.getters.getSelectedFigureId();
         if (!selectedFigureId) {
@@ -17645,17 +17650,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();
@@ -17663,8 +17662,8 @@ class ChartPanel extends owl.Component {
             }
         });
     }
-    updateChart(updateDefinition) {
-        if (!this.shouldUpdateChart) {
+    updateChart(figureId, updateDefinition) {
+        if (figureId !== this.figureId) {
             return;
         }
         const definition = {
@@ -17673,8 +17672,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) {
@@ -17686,7 +17685,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() {
@@ -19542,7 +19541,14 @@ class ContentEditableHelper {
             current = it.next();
         }
         if (current.value !== nodeToFind) {
-            throw new Error("Cannot find the node in the children of the element");
+            /** This situation can happen if the code is called while the selection is not currently on the ContentEditableHelper.
+             * In this case, we return 0 because we don't know the size of the text before the selection.
+             *
+             * A known occurence is triggered since the introduction of commit d4663158 (PR #2038).
+             *
+             * FIXME: find a way to test eventhough the selection API is not available in jsDOM.
+             */
+            return 0;
         }
         else {
             if (!current.value.hasChildNodes()) {
@@ -23049,6 +23055,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",
 };
 
 /**
@@ -25485,6 +25501,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"));
 }
@@ -37078,7 +37099,8 @@ class SheetUIPlugin extends UIPlugin {
     getCellWidth(position) {
         const text = this.getCellText(position);
         const style = this.getters.getCellComputedStyle(position);
-        let contentWidth = this.getTextWidth(text, style);
+        const multiLineText = text.split(NEWLINE);
+        let contentWidth = Math.max(...multiLineText.map((line) => this.getTextWidth(line, style)));
         const icon = this.getters.getConditionalIcon(position);
         if (icon) {
             contentWidth += computeIconWidth(this.getters.getCellStyle(position));
@@ -39545,7 +39567,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) => {
@@ -44611,8 +44633,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`,
@@ -44621,20 +44642,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`,
@@ -44753,6 +44781,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]));
@@ -44760,6 +44790,7 @@ function createContentTypes(files) {
     }
     const xml = escapeXml /*xml*/ `
     <Types xmlns="${NAMESPACE["Types"]}">
+      ${joinXmlNodes(Object.values(imageDefaultNodes))}
       <Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml" />
       <Default Extension="xml" ContentType="application/xml" />
       ${joinXmlNodes(overrideNodes)}
@@ -45319,6 +45350,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.2.6';
-__info__.date = '2023-05-12T10:58:25.815Z';
-__info__.hash = '6848d25';
+__info__.version = '16.2.8';
+__info__.date = '2023-06-02T10:12:43.068Z';
+__info__.hash = 'b474e62';

package/dist/o-spreadsheet.d.ts

@@ -358,7 +358,7 @@ interface XLSXExportXMLFile {
 }
 interface XLSXExportImageFile {
     path: string;
-    imagePath: string;
+    imageSrc: string;
 }
 interface XLSXExport {
     name: string;
@@ -635,6 +635,7 @@ declare type ResizeDirection = -1 | 0 | 1;
 interface Image {
     path: string;
     size: FigureSize;
+    mimetype?: string;
 }
 
 interface CellData {
@@ -4920,7 +4921,7 @@ declare class SelectionInput extends Component<Props$B, SpreadsheetChildEnv> {
 interface Props$A {
     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$A, SpreadsheetChildEnv> {
     static template: string;
@@ -5065,7 +5066,7 @@ declare class ColorPickerWidget extends Component<Props$z, SpreadsheetChildEnv>
 interface Props$y {
     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$y, SpreadsheetChildEnv> {
     static template: string;
@@ -5084,7 +5085,7 @@ declare class LineBarPieDesignPanel extends Component<Props$y, SpreadsheetChildE
 interface Props$x {
     figureId: UID;
     definition: GaugeChartDefinition;
-    updateChart: (definition: Partial<GaugeChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<GaugeChartDefinition>) => DispatchResult;
 }
 declare class GaugeChartConfigPanel extends Component<Props$x, SpreadsheetChildEnv> {
     static template: string;
@@ -5103,7 +5104,7 @@ declare type GaugeMenu = "backgroundColor" | "sectionColor-lowerColor" | "sectio
 interface Props$w {
     figureId: UID;
     definition: GaugeChartDefinition;
-    updateChart: (definition: Partial<GaugeChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<GaugeChartDefinition>) => DispatchResult;
 }
 declare class GaugeChartDesignPanel extends Component<Props$w, SpreadsheetChildEnv> {
     static template: string;
@@ -5140,7 +5141,7 @@ declare class LineConfigPanel extends LineBarPieConfigPanel {
 interface Props$v {
     figureId: UID;
     definition: ScorecardChartDefinition;
-    updateChart: (definition: Partial<ScorecardChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<ScorecardChartDefinition>) => DispatchResult;
 }
 declare class ScorecardChartConfigPanel extends Component<Props$v, SpreadsheetChildEnv> {
     static template: string;
@@ -5164,7 +5165,7 @@ declare type ColorPickerId = undefined | "backgroundColor" | "baselineColorUp" |
 interface Props$u {
     figureId: UID;
     definition: ScorecardChartDefinition;
-    updateChart: (definition: Partial<ScorecardChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<ScorecardChartDefinition>) => DispatchResult;
 }
 declare class ScorecardChartDesignPanel extends Component<Props$u, SpreadsheetChildEnv> {
     static template: string;
@@ -6571,11 +6572,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;