@odoo/o-spreadsheet 16.0.9 → 16.0.11

package/dist/o-spreadsheet.cjs.js

@@ -6417,6 +6417,12 @@ css /* scss */ `
         height: 25px;
       }
     }
+    /** Make the character a bit bigger
+    compared to its neighbor INPUT box  */
+    .o-remove-selection {
+      font-weight: bold;
+      font-size: calc(100% + 4px);
+    }
   }
 `;
 /**
@@ -6493,6 +6499,9 @@ class SelectionInput extends owl.Component {
         (_b = (_a = this.props).onSelectionChanged) === null || _b === void 0 ? void 0 : _b.call(_a, ranges);
         this.previousRanges = ranges;
     }
+    extractRanges(value) {
+        return this.props.hasSingleRange ? value.split(",")[0] : value;
+    }
     focus(rangeId) {
         this.state.isMissing = false;
         this.env.model.dispatch("FOCUS_RANGE", {
@@ -6511,15 +6520,16 @@ class SelectionInput extends owl.Component {
     }
     onInputChanged(rangeId, ev) {
         const target = ev.target;
+        const value = this.extractRanges(target.value);
         this.env.model.dispatch("CHANGE_RANGE", {
             id: this.id,
             rangeId,
-            value: target.value,
+            value,
         });
         target.blur();
         this.triggerChange();
     }
-    disable() {
+    confirm() {
         var _a, _b;
         this.env.model.dispatch("UNFOCUS_SELECTION_INPUT");
         const ranges = this.env.model.getters.getSelectionInputValue(this.id);
@@ -6568,7 +6578,7 @@ class LineBarPieConfigPanel extends owl.Component {
         return !!((_a = this.state.labelsDispatchResult) === null || _a === void 0 ? void 0 : _a.isCancelledBecause(32 /* CommandResult.InvalidLabelRange */));
     }
     onUpdateDataSetsHaveTitle(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             dataSetsHaveTitle: ev.target.checked,
         });
     }
@@ -6580,7 +6590,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,
         });
     }
@@ -6592,7 +6602,7 @@ 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,
         });
     }
@@ -6602,7 +6612,7 @@ LineBarPieConfigPanel.components = { SelectionInput };
 
 class BarConfigPanel extends LineBarPieConfigPanel {
     onUpdateStacked(ev) {
-        this.props.updateChart({
+        this.props.updateChart(this.props.figureId, {
             stacked: ev.target.checked,
         });
     }
@@ -8350,6 +8360,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;
@@ -8566,17 +8588,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,
         });
     }
@@ -8609,7 +8631,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,
         });
     }
@@ -8679,12 +8701,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,
         });
     }
@@ -8753,7 +8775,7 @@ class GaugeChartDesignPanel extends owl.Component {
         }
     }
     updateSectionRule(sectionRule) {
-        this.state.sectionRuleDispatchResult = this.props.updateChart({
+        this.state.sectionRuleDispatchResult = this.props.updateChart(this.props.figureId, {
             sectionRule,
         });
     }
@@ -8773,12 +8795,12 @@ 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,
         });
     }
@@ -8819,7 +8841,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,
         });
     }
@@ -8827,12 +8849,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";
@@ -8852,12 +8874,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;
@@ -8865,13 +8887,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;
@@ -8935,16 +8957,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) {
@@ -8953,17 +8968,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();
@@ -8971,8 +8980,8 @@ class ChartPanel extends owl.Component {
             }
         });
     }
-    updateChart(updateDefinition) {
-        if (!this.shouldUpdateChart) {
+    updateChart(figureId, updateDefinition) {
+        if (figureId !== this.figureId) {
             return;
         }
         const definition = {
@@ -8981,8 +8990,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) {
@@ -8994,7 +9003,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() {
@@ -32481,7 +32490,7 @@ class EvaluationPlugin extends UIPlugin {
                 // magic "empty" value
                 // Returning {value: null} instead of undefined will ensure that we don't
                 // fall back on the default value of the argument provided to the formula's compute function
-                return { value: null };
+                return { value: null, format: cell === null || cell === void 0 ? void 0 : cell.format };
             }
             return getEvaluatedCell(cell);
         }
@@ -34896,6 +34905,9 @@ const uuidGenerator = new UuidGenerator();
  */
 class SelectionInputPlugin extends UIPlugin {
     constructor(getters, state, dispatch, config, selection, initialRanges, inputHasSingleRange) {
+        if (inputHasSingleRange && initialRanges.length > 1) {
+            throw new Error("Input with a single range cannot be instantiated with several range references.");
+        }
         super(getters, state, dispatch, config, selection);
         this.inputHasSingleRange = inputHasSingleRange;
         this.ranges = [];
@@ -34918,6 +34930,11 @@ class SelectionInputPlugin extends UIPlugin {
                     return 29 /* CommandResult.MaximumRangesReached */;
                 }
                 break;
+            case "CHANGE_RANGE":
+                if (this.inputHasSingleRange && cmd.value.split(",").length > 1) {
+                    return 29 /* CommandResult.MaximumRangesReached */;
+                }
+                break;
         }
         return 0 /* CommandResult.Success */;
     }
@@ -35731,13 +35748,9 @@ class Session extends EventBus {
     }
     loadInitialMessages(messages) {
         this.isReplayingInitialRevisions = true;
-        this.on("unexpected-revision-id", this, ({ revisionId }) => {
-            throw new Error(`The spreadsheet could not be loaded. Revision ${revisionId} is corrupted.`);
-        });
         for (const message of messages) {
             this.onMessageReceived(message);
         }
-        this.off("unexpected-revision-id", this);
         this.isReplayingInitialRevisions = false;
     }
     /**
@@ -35809,6 +35822,10 @@ class Session extends EventBus {
     onMessageReceived(message) {
         if (this.isAlreadyProcessed(message))
             return;
+        if (this.isWrongServerRevisionId(message)) {
+            this.trigger("unexpected-revision-id");
+            return;
+        }
         switch (message.type) {
             case "CLIENT_MOVED":
                 this.onClientMoved(message);
@@ -35835,10 +35852,6 @@ class Session extends EventBus {
                 });
                 break;
             case "REMOTE_REVISION":
-                if (message.serverRevisionId !== this.serverRevisionId) {
-                    this.trigger("unexpected-revision-id", { revisionId: message.serverRevisionId });
-                    return;
-                }
                 const { clientId, commands } = message;
                 const revision = new Revision(message.nextRevisionId, clientId, commands);
                 if (revision.clientId !== this.clientId) {
@@ -35970,6 +35983,17 @@ class Session extends EventBus {
                 return false;
         }
     }
+    isWrongServerRevisionId(message) {
+        switch (message.type) {
+            case "REMOTE_REVISION":
+            case "REVISION_REDONE":
+            case "REVISION_UNDONE":
+            case "SNAPSHOT_CREATED":
+                return message.serverRevisionId !== this.serverRevisionId;
+            default:
+                return false;
+        }
+    }
     dropPendingHistoryMessages() {
         this.waitingUndoRedoAck = false;
         this.pendingMessages = this.pendingMessages.filter(({ type }) => type !== "REVISION_REDONE" && type !== "REVISION_UNDONE");
@@ -37933,7 +37957,6 @@ css /* scss */ `
         color: dimgrey;
       }
       .o-sidePanelClose {
-        font-size: 1.5rem;
         padding: 5px 10px;
         cursor: pointer;
         &:hover {
@@ -42779,6 +42802,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.9';
-__info__.date = '2023-04-28T12:25:41.572Z';
-__info__.hash = 'e06ca83';
+__info__.version = '16.0.11';
+__info__.date = '2023-05-25T12:57:28.152Z';
+__info__.hash = 'd27e998';

package/dist/o-spreadsheet.d.ts

@@ -873,7 +873,6 @@ interface CollaborativeEventReceived {
 }
 interface UnexpectedRevisionIdEvent {
     type: "unexpected-revision-id";
-    revisionId: UID;
 }
 interface NewLocalStateUpdateEvent {
     type: "new-local-state-update";
@@ -2809,6 +2808,7 @@ declare class Session extends EventBus<CollaborativeEvent> {
     private sendPendingMessage;
     private acknowledge;
     private isAlreadyProcessed;
+    isWrongServerRevisionId(message: CollaborationMessage): boolean;
     private dropPendingHistoryMessages;
 }
 
@@ -4862,17 +4862,18 @@ declare class SelectionInput extends Component<Props$y, SpreadsheetChildEnv> {
     checkChange(): void;
     getColor(range: SelectionRange): string;
     private triggerChange;
+    private extractRanges;
     focus(rangeId: string): void;
     addEmptyInput(): void;
     removeInput(rangeId: string): void;
     onInputChanged(rangeId: string, ev: InputEvent): void;
-    disable(): void;
+    confirm(): void;
 }
 
 interface Props$x {
     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$x, SpreadsheetChildEnv> {
     static template: string;
@@ -4933,7 +4934,7 @@ declare class ColorPicker extends Component<ColorPickerProps, SpreadsheetChildEn
 interface Props$w {
     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$w, SpreadsheetChildEnv> {
     static template: string;
@@ -4952,7 +4953,7 @@ declare class LineBarPieDesignPanel extends Component<Props$w, SpreadsheetChildE
 interface Props$v {
     figureId: UID;
     definition: GaugeChartDefinition;
-    updateChart: (definition: Partial<GaugeChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<GaugeChartDefinition>) => DispatchResult;
 }
 declare class GaugeChartConfigPanel extends Component<Props$v, SpreadsheetChildEnv> {
     static template: string;
@@ -4971,7 +4972,7 @@ declare type GaugeMenu = "backgroundColor" | "sectionColor-lowerColor" | "sectio
 interface Props$u {
     figureId: UID;
     definition: GaugeChartDefinition;
-    updateChart: (definition: Partial<GaugeChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<GaugeChartDefinition>) => DispatchResult;
 }
 declare class GaugeChartDesignPanel extends Component<Props$u, SpreadsheetChildEnv> {
     static template: string;
@@ -5008,7 +5009,7 @@ declare class LineConfigPanel extends LineBarPieConfigPanel {
 interface Props$t {
     figureId: UID;
     definition: ScorecardChartDefinition;
-    updateChart: (definition: Partial<ScorecardChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<ScorecardChartDefinition>) => DispatchResult;
 }
 declare class ScorecardChartConfigPanel extends Component<Props$t, SpreadsheetChildEnv> {
     static template: string;
@@ -5032,7 +5033,7 @@ declare type ColorPickerId = undefined | "backgroundColor" | "baselineColorUp" |
 interface Props$s {
     figureId: UID;
     definition: ScorecardChartDefinition;
-    updateChart: (definition: Partial<ScorecardChartDefinition>) => DispatchResult;
+    updateChart: (figureId: UID, definition: Partial<ScorecardChartDefinition>) => DispatchResult;
 }
 declare class ScorecardChartDesignPanel extends Component<Props$s, SpreadsheetChildEnv> {
     static template: string;
@@ -6117,11 +6118,9 @@ interface Props$4 {
 declare class ChartPanel extends Component<Props$4, 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;