@odoo/o-spreadsheet 18.2.0-alpha.3 → 18.2.0-alpha.4

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.0-alpha.3
- * @date 2025-01-27T10:07:28.716Z
- * @hash 63a13e5
+ * @version 18.2.0-alpha.4
+ * @date 2025-01-29T06:30:12.773Z
+ * @hash 6838c26
  */
 
 'use strict';
@@ -40096,14 +40096,21 @@ class ChartTypePicker extends owl.Component {
 class MainChartPanelStore extends SpreadsheetStore {
     mutators = ["activatePanel", "changeChartType"];
     panel = "configuration";
-    creationContext = {};
+    creationContexts = {};
     activatePanel(panel) {
         this.panel = panel;
     }
     changeChartType(figureId, newDisplayType) {
-        this.creationContext = {
-            ...this.creationContext,
-            ...this.getters.getContextCreationChart(figureId),
+        const currentCreationContext = this.getters.getContextCreationChart(figureId);
+        const savedCreationContext = this.creationContexts[figureId] || {};
+        let newRanges = currentCreationContext?.range;
+        if (newRanges?.every((range, i) => deepEquals(range, savedCreationContext.range?.[i]))) {
+            newRanges = Object.assign([], savedCreationContext.range, currentCreationContext?.range);
+        }
+        this.creationContexts[figureId] = {
+            ...savedCreationContext,
+            ...currentCreationContext,
+            range: newRanges,
         };
         const sheetId = this.getters.getFigureSheetId(figureId);
         if (!sheetId) {
@@ -40119,12 +40126,8 @@ class MainChartPanelStore extends SpreadsheetStore {
     getChartDefinitionFromContextCreation(figureId, newDisplayType) {
         const newChartInfo = chartSubtypeRegistry.get(newDisplayType);
         const ChartClass = chartRegistry.get(newChartInfo.chartType);
-        const contextCreation = {
-            ...this.creationContext,
-            ...this.getters.getContextCreationChart(figureId),
-        };
         return {
-            ...ChartClass.getChartDefinitionFromContextCreation(contextCreation),
+            ...ChartClass.getChartDefinitionFromContextCreation(this.creationContexts[figureId]),
             ...newChartInfo.subtypeDefinition,
         };
     }
@@ -54685,10 +54688,20 @@ class DataValidationPlugin extends CorePlugin {
         for (const sheet of data.sheets) {
             sheet.dataValidationRules = [];
             for (const rule of this.rules[sheet.id]) {
-                sheet.dataValidationRules.push({
-                    ...rule,
+                const excelRule = {
+                    ...deepCopy(rule),
                     ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useBoundedReference: true })),
-                });
+                };
+                if (rule.criterion.type === "isValueInRange") {
+                    excelRule.criterion.values = rule.criterion.values.map((value) => {
+                        const range = this.getters.getRangeFromSheetXC(sheet.id, value);
+                        return this.getters.getRangeString(range, sheet.id, {
+                            useBoundedReference: true,
+                            useFixedReference: true,
+                        });
+                    });
+                }
+                sheet.dataValidationRules.push(excelRule);
             }
         }
     }
@@ -56109,9 +56122,10 @@ class RangeAdapter {
      * @param range the range (received from getRangeFromXC or getRangeFromZone)
      * @param forSheetId the id of the sheet where the range string is supposed to be used.
      * @param options
-     * @param options.useBoundedReference if true, the range will be returned with fixed row and column
+     * @param options.useBoundedReference if true, the range will be returned with bounded row and column
+     * @param options.useFixedReference if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId, options = { useBoundedReference: false }) {
+    getRangeString(range, forSheetId, options = { useBoundedReference: false, useFixedReference: false }) {
         if (!range) {
             return CellErrorType.InvalidReference;
         }
@@ -56214,10 +56228,10 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part, options = { useBoundedReference: false }) {
-        const colFixed = range.parts && range.parts[part]?.colFixed ? "$" : "";
+    getRangePartString(range, part, options = { useBoundedReference: false, useFixedReference: false }) {
+        const colFixed = range.parts[part]?.colFixed || options.useFixedReference ? "$" : "";
         const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
-        const rowFixed = range.parts && range.parts[part]?.rowFixed ? "$" : "";
+        const rowFixed = range.parts[part]?.rowFixed || options.useFixedReference ? "$" : "";
         const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
         let str = "";
         if (range.isFullCol && !options.useBoundedReference) {
@@ -63403,6 +63417,7 @@ class Session extends EventBus {
     waitingUndoRedoAck = false;
     isReplayingInitialRevisions = false;
     processedRevisions = new Set();
+    lastRevisionMessage = undefined;
     uuidGenerator = new UuidGenerator();
     lastLocalOperation;
     /**
@@ -63503,7 +63518,10 @@ class Session extends EventBus {
      * Notify the server that the user client left the collaborative session
      */
     async leave(data) {
-        if (data && Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
+        if (data &&
+            Object.keys(this.clients).length === 1 &&
+            this.lastRevisionMessage &&
+            this.lastRevisionMessage?.type !== "SNAPSHOT_CREATED") {
             await this.snapshot(data());
         }
         delete this.clients[this.clientId];
@@ -63724,6 +63742,7 @@ class Session extends EventBus {
                 this.pendingMessages = this.pendingMessages.filter((msg) => msg.nextRevisionId !== message.nextRevisionId);
                 this.serverRevisionId = message.nextRevisionId;
                 this.processedRevisions.add(message.nextRevisionId);
+                this.lastRevisionMessage = message;
                 this.sendPendingMessage();
                 break;
         }
@@ -75255,6 +75274,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.2.0-alpha.3";
-__info__.date = "2025-01-27T10:07:28.716Z";
-__info__.hash = "63a13e5";
+__info__.version = "18.2.0-alpha.4";
+__info__.date = "2025-01-29T06:30:12.773Z";
+__info__.hash = "6838c26";

package/dist/o-spreadsheet.d.ts

@@ -1186,6 +1186,7 @@ declare class Session extends EventBus<CollaborativeEvent> {
     private waitingUndoRedoAck;
     private isReplayingInitialRevisions;
     private processedRevisions;
+    private lastRevisionMessage;
     private uuidGenerator;
     private lastLocalOperation;
     /**
@@ -3985,6 +3986,10 @@ interface SpreadsheetChildEnv extends NotificationStoreMethods {
     getStore: Get;
 }
 
+interface RangeStringOptions {
+    useBoundedReference?: boolean;
+    useFixedReference?: boolean;
+}
 declare class RangeAdapter implements CommandHandler<CoreCommand> {
     private getters;
     private providers;
@@ -4032,11 +4037,10 @@ declare class RangeAdapter implements CommandHandler<CoreCommand> {
      * @param range the range (received from getRangeFromXC or getRangeFromZone)
      * @param forSheetId the id of the sheet where the range string is supposed to be used.
      * @param options
-     * @param options.useBoundedReference if true, the range will be returned with fixed row and column
+     * @param options.useBoundedReference if true, the range will be returned with bounded row and column
+     * @param options.useFixedReference if true, the range will be returned with fixed row and column
      */
-    getRangeString(range: Range, forSheetId: UID, options?: {
-        useBoundedReference: boolean;
-    }): string;
+    getRangeString(range: Range, forSheetId: UID, options?: RangeStringOptions): string;
     getRangeDataFromXc(sheetId: UID, xc: string): RangeData;
     getRangeDataFromZone(sheetId: UID, zone: Zone | UnboundedZone): RangeData;
     getRangeFromZone(sheetId: UID, zone: Zone | UnboundedZone): Range;
@@ -9635,7 +9639,7 @@ declare function useHighlights(highlightProvider: HighlightProvider): void;
 declare class MainChartPanelStore extends SpreadsheetStore {
     mutators: readonly ["activatePanel", "changeChartType"];
     panel: "configuration" | "design";
-    private creationContext;
+    private creationContexts;
     activatePanel(panel: "configuration" | "design"): void;
     changeChartType(figureId: UID, newDisplayType: string): void;
     private getChartDefinitionFromContextCreation;

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.0-alpha.3
- * @date 2025-01-27T10:07:28.716Z
- * @hash 63a13e5
+ * @version 18.2.0-alpha.4
+ * @date 2025-01-29T06:30:12.773Z
+ * @hash 6838c26
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, App, blockDom, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -40094,14 +40094,21 @@ class ChartTypePicker extends Component {
 class MainChartPanelStore extends SpreadsheetStore {
     mutators = ["activatePanel", "changeChartType"];
     panel = "configuration";
-    creationContext = {};
+    creationContexts = {};
     activatePanel(panel) {
         this.panel = panel;
     }
     changeChartType(figureId, newDisplayType) {
-        this.creationContext = {
-            ...this.creationContext,
-            ...this.getters.getContextCreationChart(figureId),
+        const currentCreationContext = this.getters.getContextCreationChart(figureId);
+        const savedCreationContext = this.creationContexts[figureId] || {};
+        let newRanges = currentCreationContext?.range;
+        if (newRanges?.every((range, i) => deepEquals(range, savedCreationContext.range?.[i]))) {
+            newRanges = Object.assign([], savedCreationContext.range, currentCreationContext?.range);
+        }
+        this.creationContexts[figureId] = {
+            ...savedCreationContext,
+            ...currentCreationContext,
+            range: newRanges,
         };
         const sheetId = this.getters.getFigureSheetId(figureId);
         if (!sheetId) {
@@ -40117,12 +40124,8 @@ class MainChartPanelStore extends SpreadsheetStore {
     getChartDefinitionFromContextCreation(figureId, newDisplayType) {
         const newChartInfo = chartSubtypeRegistry.get(newDisplayType);
         const ChartClass = chartRegistry.get(newChartInfo.chartType);
-        const contextCreation = {
-            ...this.creationContext,
-            ...this.getters.getContextCreationChart(figureId),
-        };
         return {
-            ...ChartClass.getChartDefinitionFromContextCreation(contextCreation),
+            ...ChartClass.getChartDefinitionFromContextCreation(this.creationContexts[figureId]),
             ...newChartInfo.subtypeDefinition,
         };
     }
@@ -54683,10 +54686,20 @@ class DataValidationPlugin extends CorePlugin {
         for (const sheet of data.sheets) {
             sheet.dataValidationRules = [];
             for (const rule of this.rules[sheet.id]) {
-                sheet.dataValidationRules.push({
-                    ...rule,
+                const excelRule = {
+                    ...deepCopy(rule),
                     ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useBoundedReference: true })),
-                });
+                };
+                if (rule.criterion.type === "isValueInRange") {
+                    excelRule.criterion.values = rule.criterion.values.map((value) => {
+                        const range = this.getters.getRangeFromSheetXC(sheet.id, value);
+                        return this.getters.getRangeString(range, sheet.id, {
+                            useBoundedReference: true,
+                            useFixedReference: true,
+                        });
+                    });
+                }
+                sheet.dataValidationRules.push(excelRule);
             }
         }
     }
@@ -56107,9 +56120,10 @@ class RangeAdapter {
      * @param range the range (received from getRangeFromXC or getRangeFromZone)
      * @param forSheetId the id of the sheet where the range string is supposed to be used.
      * @param options
-     * @param options.useBoundedReference if true, the range will be returned with fixed row and column
+     * @param options.useBoundedReference if true, the range will be returned with bounded row and column
+     * @param options.useFixedReference if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId, options = { useBoundedReference: false }) {
+    getRangeString(range, forSheetId, options = { useBoundedReference: false, useFixedReference: false }) {
         if (!range) {
             return CellErrorType.InvalidReference;
         }
@@ -56212,10 +56226,10 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part, options = { useBoundedReference: false }) {
-        const colFixed = range.parts && range.parts[part]?.colFixed ? "$" : "";
+    getRangePartString(range, part, options = { useBoundedReference: false, useFixedReference: false }) {
+        const colFixed = range.parts[part]?.colFixed || options.useFixedReference ? "$" : "";
         const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
-        const rowFixed = range.parts && range.parts[part]?.rowFixed ? "$" : "";
+        const rowFixed = range.parts[part]?.rowFixed || options.useFixedReference ? "$" : "";
         const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
         let str = "";
         if (range.isFullCol && !options.useBoundedReference) {
@@ -63401,6 +63415,7 @@ class Session extends EventBus {
     waitingUndoRedoAck = false;
     isReplayingInitialRevisions = false;
     processedRevisions = new Set();
+    lastRevisionMessage = undefined;
     uuidGenerator = new UuidGenerator();
     lastLocalOperation;
     /**
@@ -63501,7 +63516,10 @@ class Session extends EventBus {
      * Notify the server that the user client left the collaborative session
      */
     async leave(data) {
-        if (data && Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
+        if (data &&
+            Object.keys(this.clients).length === 1 &&
+            this.lastRevisionMessage &&
+            this.lastRevisionMessage?.type !== "SNAPSHOT_CREATED") {
             await this.snapshot(data());
         }
         delete this.clients[this.clientId];
@@ -63722,6 +63740,7 @@ class Session extends EventBus {
                 this.pendingMessages = this.pendingMessages.filter((msg) => msg.nextRevisionId !== message.nextRevisionId);
                 this.serverRevisionId = message.nextRevisionId;
                 this.processedRevisions.add(message.nextRevisionId);
+                this.lastRevisionMessage = message;
                 this.sendPendingMessage();
                 break;
         }
@@ -75208,6 +75227,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, CoreViewPlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, chartHelpers, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "18.2.0-alpha.3";
-__info__.date = "2025-01-27T10:07:28.716Z";
-__info__.hash = "63a13e5";
+__info__.version = "18.2.0-alpha.4";
+__info__.date = "2025-01-29T06:30:12.773Z";
+__info__.hash = "6838c26";

package/dist/o-spreadsheet.iife.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 18.2.0-alpha.3
- * @date 2025-01-27T10:07:28.716Z
- * @hash 63a13e5
+ * @version 18.2.0-alpha.4
+ * @date 2025-01-29T06:30:12.773Z
+ * @hash 6838c26
  */
 
 (function (exports, owl) {
@@ -40095,14 +40095,21 @@ stores.inject(MyMetaStore, storeInstance);
   class MainChartPanelStore extends SpreadsheetStore {
       mutators = ["activatePanel", "changeChartType"];
       panel = "configuration";
-      creationContext = {};
+      creationContexts = {};
       activatePanel(panel) {
           this.panel = panel;
       }
       changeChartType(figureId, newDisplayType) {
-          this.creationContext = {
-              ...this.creationContext,
-              ...this.getters.getContextCreationChart(figureId),
+          const currentCreationContext = this.getters.getContextCreationChart(figureId);
+          const savedCreationContext = this.creationContexts[figureId] || {};
+          let newRanges = currentCreationContext?.range;
+          if (newRanges?.every((range, i) => deepEquals(range, savedCreationContext.range?.[i]))) {
+              newRanges = Object.assign([], savedCreationContext.range, currentCreationContext?.range);
+          }
+          this.creationContexts[figureId] = {
+              ...savedCreationContext,
+              ...currentCreationContext,
+              range: newRanges,
           };
           const sheetId = this.getters.getFigureSheetId(figureId);
           if (!sheetId) {
@@ -40118,12 +40125,8 @@ stores.inject(MyMetaStore, storeInstance);
       getChartDefinitionFromContextCreation(figureId, newDisplayType) {
           const newChartInfo = chartSubtypeRegistry.get(newDisplayType);
           const ChartClass = chartRegistry.get(newChartInfo.chartType);
-          const contextCreation = {
-              ...this.creationContext,
-              ...this.getters.getContextCreationChart(figureId),
-          };
           return {
-              ...ChartClass.getChartDefinitionFromContextCreation(contextCreation),
+              ...ChartClass.getChartDefinitionFromContextCreation(this.creationContexts[figureId]),
               ...newChartInfo.subtypeDefinition,
           };
       }
@@ -54684,10 +54687,20 @@ stores.inject(MyMetaStore, storeInstance);
           for (const sheet of data.sheets) {
               sheet.dataValidationRules = [];
               for (const rule of this.rules[sheet.id]) {
-                  sheet.dataValidationRules.push({
-                      ...rule,
+                  const excelRule = {
+                      ...deepCopy(rule),
                       ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useBoundedReference: true })),
-                  });
+                  };
+                  if (rule.criterion.type === "isValueInRange") {
+                      excelRule.criterion.values = rule.criterion.values.map((value) => {
+                          const range = this.getters.getRangeFromSheetXC(sheet.id, value);
+                          return this.getters.getRangeString(range, sheet.id, {
+                              useBoundedReference: true,
+                              useFixedReference: true,
+                          });
+                      });
+                  }
+                  sheet.dataValidationRules.push(excelRule);
               }
           }
       }
@@ -56108,9 +56121,10 @@ stores.inject(MyMetaStore, storeInstance);
        * @param range the range (received from getRangeFromXC or getRangeFromZone)
        * @param forSheetId the id of the sheet where the range string is supposed to be used.
        * @param options
-       * @param options.useBoundedReference if true, the range will be returned with fixed row and column
+       * @param options.useBoundedReference if true, the range will be returned with bounded row and column
+       * @param options.useFixedReference if true, the range will be returned with fixed row and column
        */
-      getRangeString(range, forSheetId, options = { useBoundedReference: false }) {
+      getRangeString(range, forSheetId, options = { useBoundedReference: false, useFixedReference: false }) {
           if (!range) {
               return CellErrorType.InvalidReference;
           }
@@ -56213,10 +56227,10 @@ stores.inject(MyMetaStore, storeInstance);
       /**
        * Get a Xc string that represent a part of a range
        */
-      getRangePartString(range, part, options = { useBoundedReference: false }) {
-          const colFixed = range.parts && range.parts[part]?.colFixed ? "$" : "";
+      getRangePartString(range, part, options = { useBoundedReference: false, useFixedReference: false }) {
+          const colFixed = range.parts[part]?.colFixed || options.useFixedReference ? "$" : "";
           const col = part === 0 ? numberToLetters(range.zone.left) : numberToLetters(range.zone.right);
-          const rowFixed = range.parts && range.parts[part]?.rowFixed ? "$" : "";
+          const rowFixed = range.parts[part]?.rowFixed || options.useFixedReference ? "$" : "";
           const row = part === 0 ? String(range.zone.top + 1) : String(range.zone.bottom + 1);
           let str = "";
           if (range.isFullCol && !options.useBoundedReference) {
@@ -63402,6 +63416,7 @@ stores.inject(MyMetaStore, storeInstance);
       waitingUndoRedoAck = false;
       isReplayingInitialRevisions = false;
       processedRevisions = new Set();
+      lastRevisionMessage = undefined;
       uuidGenerator = new UuidGenerator();
       lastLocalOperation;
       /**
@@ -63502,7 +63517,10 @@ stores.inject(MyMetaStore, storeInstance);
        * Notify the server that the user client left the collaborative session
        */
       async leave(data) {
-          if (data && Object.keys(this.clients).length === 1 && this.processedRevisions.size) {
+          if (data &&
+              Object.keys(this.clients).length === 1 &&
+              this.lastRevisionMessage &&
+              this.lastRevisionMessage?.type !== "SNAPSHOT_CREATED") {
               await this.snapshot(data());
           }
           delete this.clients[this.clientId];
@@ -63723,6 +63741,7 @@ stores.inject(MyMetaStore, storeInstance);
                   this.pendingMessages = this.pendingMessages.filter((msg) => msg.nextRevisionId !== message.nextRevisionId);
                   this.serverRevisionId = message.nextRevisionId;
                   this.processedRevisions.add(message.nextRevisionId);
+                  this.lastRevisionMessage = message;
                   this.sendPendingMessage();
                   break;
           }
@@ -75254,9 +75273,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.2.0-alpha.3";
-  __info__.date = "2025-01-27T10:07:28.716Z";
-  __info__.hash = "63a13e5";
+  __info__.version = "18.2.0-alpha.4";
+  __info__.date = "2025-01-29T06:30:12.773Z";
+  __info__.hash = "6838c26";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);