@odoo/o-spreadsheet 16.1.12 → 16.1.14

package/dist/o-spreadsheet.cjs.js

@@ -1707,27 +1707,36 @@ 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.
  */
 function limitDecimalDigits(decimalDigits, maxDecimals) {
+    var _a;
     let integerDigits = "0";
     let resultDecimalDigits = decimalDigits;
     // Note : we'd want to simply use number.toFixed() to handle the max digits & rounding,
     // 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 = ((_a = slicedDecimalDigits.match(leadingZeroesRegexp)) === null || _a === void 0 ? void 0 : _a[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 };
 }
@@ -17345,6 +17354,7 @@ class Composer extends owl.Component {
                     (this.autoCompleteState.selectedIndex + 1) % this.autoCompleteState.values.length;
             }
         }
+        this.updateCursorIfNeeded();
     }
     processTabKey(ev) {
         var _a;
@@ -17403,9 +17413,12 @@ class Composer extends owl.Component {
         }
         else {
             ev.stopPropagation();
+            this.updateCursorIfNeeded();
         }
-        const { start, end } = this.contentHelper.getCurrentSelection();
+    }
+    updateCursorIfNeeded() {
         if (!this.env.model.getters.isSelectingForComposer()) {
+            const { start, end } = this.contentHelper.getCurrentSelection();
             this.env.model.dispatch("CHANGE_COMPOSER_CURSOR_SELECTION", { start, end });
             this.isKeyStillDown = true;
         }
@@ -19943,7 +19956,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,
         });
     }
@@ -19955,7 +19968,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,
         });
     }
@@ -19967,12 +19980,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,
         });
     }
@@ -19987,12 +20000,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,
         });
     }
@@ -20036,6 +20049,7 @@ css /* scss */ `
     .o-color-picker-toggler {
       display: flex;
       .o-color-picker-toggler-sign {
+        display: flex;
         margin: auto auto;
         width: 55%;
         height: 55%;
@@ -20270,17 +20284,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,
         });
     }
@@ -20318,7 +20332,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,
         });
     }
@@ -20393,12 +20407,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,
         });
     }
@@ -20467,7 +20481,7 @@ class GaugeChartDesignPanel extends owl.Component {
         }
     }
     updateSectionRule(sectionRule) {
-        this.state.sectionRuleDispatchResult = this.props.updateChart({
+        this.state.sectionRuleDispatchResult = this.props.updateChart(this.props.figureId, {
             sectionRule,
         });
     }
@@ -20492,17 +20506,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,
         });
     }
@@ -20543,7 +20557,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,
         });
     }
@@ -20551,12 +20565,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";
@@ -20581,12 +20595,12 @@ class ScorecardChartDesignPanel extends owl.Component {
         owl.useExternalListener(window, "click", this.onClick);
     }
     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 });
     }
     openColorPicker(colorPickerId) {
         this.state.openedColorPicker = colorPickerId;
@@ -20594,13 +20608,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.state.openedColorPicker = undefined;
@@ -20669,16 +20683,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) {
@@ -20687,17 +20694,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();
@@ -20705,8 +20706,8 @@ class ChartPanel extends owl.Component {
             }
         });
     }
-    updateChart(updateDefinition) {
-        if (!this.shouldUpdateChart) {
+    updateChart(figureId, updateDefinition) {
+        if (figureId !== this.figureId) {
             return;
         }
         const definition = {
@@ -20715,8 +20716,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) {
@@ -20728,7 +20729,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() {
@@ -44271,6 +44272,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.1.12';
-__info__.date = '2023-05-25T12:56:29.735Z';
-__info__.hash = 'b80dc51';
+__info__.version = '16.1.14';
+__info__.date = '2023-06-12T13:50:13.693Z';
+__info__.hash = 'a51d9fa';

package/dist/o-spreadsheet.d.ts

@@ -5025,7 +5025,7 @@ declare class SelectionInput extends Component<Props$x, SpreadsheetChildEnv> {
 interface Props$w {
     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$w, SpreadsheetChildEnv> {
     static template: string;
@@ -5091,7 +5091,7 @@ declare class ColorPicker extends Component<ColorPickerProps, SpreadsheetChildEn
 interface Props$v {
     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$v, SpreadsheetChildEnv> {
     static template: string;
@@ -5110,7 +5110,7 @@ declare class LineBarPieDesignPanel extends Component<Props$v, SpreadsheetChildE
 interface Props$u {
     figureId: UID;
     definition: GaugeChartDefinition;
-    updateChart: (definition: Partial<GaugeChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<GaugeChartDefinition>) => DispatchResult;
 }
 declare class GaugeChartConfigPanel extends Component<Props$u, SpreadsheetChildEnv> {
     static template: string;
@@ -5129,7 +5129,7 @@ declare type GaugeMenu = "backgroundColor" | "sectionColor-lowerColor" | "sectio
 interface Props$t {
     figureId: UID;
     definition: GaugeChartDefinition;
-    updateChart: (definition: Partial<GaugeChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<GaugeChartDefinition>) => DispatchResult;
 }
 declare class GaugeChartDesignPanel extends Component<Props$t, SpreadsheetChildEnv> {
     static template: string;
@@ -5167,7 +5167,7 @@ declare class LineConfigPanel extends LineBarPieConfigPanel {
 interface Props$s {
     figureId: UID;
     definition: ScorecardChartDefinition;
-    updateChart: (definition: Partial<ScorecardChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<ScorecardChartDefinition>) => DispatchResult;
 }
 declare class ScorecardChartConfigPanel extends Component<Props$s, SpreadsheetChildEnv> {
     static template: string;
@@ -5191,7 +5191,7 @@ declare type ColorPickerId = undefined | "backgroundColor" | "baselineColorUp" |
 interface Props$r {
     figureId: UID;
     definition: ScorecardChartDefinition;
-    updateChart: (definition: Partial<ScorecardChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<ScorecardChartDefinition>) => DispatchResult;
 }
 declare class ScorecardChartDesignPanel extends Component<Props$r, SpreadsheetChildEnv> {
     static template: string;
@@ -5668,6 +5668,7 @@ declare class Composer extends Component<Props$j, SpreadsheetChildEnv> {
     onCompositionStart(): void;
     onCompositionEnd(): void;
     onKeydown(ev: KeyboardEvent): void;
+    private updateCursorIfNeeded;
     onInput(): void;
     onKeyup(ev: KeyboardEvent): void;
     showAutocomplete(searchTerm: string): void;
@@ -6462,11 +6463,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;