@odoo/o-spreadsheet 18.1.3 → 18.1.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.1.3
- * @date 2025-01-27T10:50:23.000Z
- * @hash 7ffac1e
+ * @version 18.1.4
+ * @date 2025-01-29T06:27:32.901Z
+ * @hash a11ef27
  */
 
 'use strict';
@@ -9658,13 +9658,13 @@ function toExcelDataset(getters, ds) {
     else if (ds.labelCell) {
         label = {
             reference: getters.getRangeString(ds.labelCell, "forceSheetReference", {
-                useFixedReference: true,
+                useBoundedReference: true,
             }),
         };
     }
     return {
         label,
-        range: getters.getRangeString(dataRange, "forceSheetReference", { useFixedReference: true }),
+        range: getters.getRangeString(dataRange, "forceSheetReference", { useBoundedReference: true }),
         backgroundColor: ds.backgroundColor,
         rightYAxis: ds.rightYAxis,
     };
@@ -9679,7 +9679,7 @@ function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
         zone.top = zone.top + 1;
     }
     const range = labelRange.clone({ zone });
-    return getters.getRangeString(range, "forceSheetReference", { useFixedReference: true });
+    return getters.getRangeString(range, "forceSheetReference", { useBoundedReference: true });
 }
 /**
  * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -53313,7 +53313,7 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on new dependencies
      */
-    getFormulaString(sheetId, tokens, dependencies, useFixedReference = false) {
+    getFormulaString(sheetId, tokens, dependencies, useBoundedReference = false) {
         if (!dependencies.length) {
             return concat(tokens.map((token) => token.value));
         }
@@ -53321,7 +53321,7 @@ class CellPlugin extends CorePlugin {
         return concat(tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const range = dependencies[rangeIndex++];
-                return this.getters.getRangeString(range, sheetId, { useFixedReference });
+                return this.getters.getRangeString(range, sheetId, { useBoundedReference });
             }
             return token.value;
         }));
@@ -53601,7 +53601,7 @@ class FormulaCellWithDependencies {
             if (token.type === "REFERENCE") {
                 const index = rangeIndex++;
                 return this.getRangeString(this.compiledFormula.dependencies[index], this.sheetId, {
-                    useFixedReference: true,
+                    useBoundedReference: true,
                 });
             }
             return token.value;
@@ -53938,7 +53938,7 @@ class ConditionalFormatPlugin extends CorePlugin {
         if (data.sheets) {
             for (let sheet of data.sheets) {
                 if (this.cfRules[sheet.id]) {
-                    sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                    sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useBoundedReference: true }));
                 }
             }
         }
@@ -54007,9 +54007,9 @@ class ConditionalFormatPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
-    mapToConditionalFormat(sheetId, cf, { useFixedReference } = { useFixedReference: false }) {
+    mapToConditionalFormat(sheetId, cf, { useBoundedReference } = { useBoundedReference: false }) {
         const ranges = cf.ranges.map((range) => {
-            return this.getters.getRangeString(range, sheetId, { useFixedReference });
+            return this.getters.getRangeString(range, sheetId, { useBoundedReference });
         });
         if (cf.rule.type !== "DataBarRule") {
             return {
@@ -54024,7 +54024,7 @@ class ConditionalFormatPlugin extends CorePlugin {
                 ...cf.rule,
                 rangeValues: cf.rule.rangeValues &&
                     this.getters.getRangeString(cf.rule.rangeValues, sheetId, {
-                        useFixedReference,
+                        useBoundedReference,
                     }),
             },
             ranges,
@@ -54465,10 +54465,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,
-                    ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useFixedReference: true })),
-                });
+                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);
             }
         }
     }
@@ -55889,9 +55899,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 bounded row and column
      * @param options.useFixedReference if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId, options = { useFixedReference: false }) {
+    getRangeString(range, forSheetId, options = { useBoundedReference: false, useFixedReference: false }) {
         if (!range) {
             return CellErrorType.InvalidReference;
         }
@@ -55994,13 +56005,13 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part, options = { useFixedReference: 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.useFixedReference) {
+        if (range.isFullCol && !options.useBoundedReference) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -56008,7 +56019,7 @@ class RangeAdapter {
                 str = colFixed + col;
             }
         }
-        else if (range.isFullRow && !options.useFixedReference) {
+        else if (range.isFullRow && !options.useBoundedReference) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -63187,6 +63198,7 @@ class Session extends EventBus {
     waitingUndoRedoAck = false;
     isReplayingInitialRevisions = false;
     processedRevisions = new Set();
+    lastRevisionMessage = undefined;
     uuidGenerator = new UuidGenerator();
     lastLocalOperation;
     /**
@@ -63287,7 +63299,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];
@@ -63508,6 +63523,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;
         }
@@ -75017,6 +75033,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "18.1.3";
-__info__.date = "2025-01-27T10:50:23.000Z";
-__info__.hash = "7ffac1e";
+__info__.version = "18.1.4";
+__info__.date = "2025-01-29T06:27:32.901Z";
+__info__.hash = "a11ef27";

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;
     /**
@@ -3977,6 +3978,10 @@ interface SpreadsheetChildEnv extends NotificationStoreMethods {
     getStore: Get;
 }
 
+interface RangeStringOptions {
+    useBoundedReference?: boolean;
+    useFixedReference?: boolean;
+}
 declare class RangeAdapter implements CommandHandler<CoreCommand> {
     private getters;
     private providers;
@@ -4024,11 +4029,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 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?: {
-        useFixedReference: 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;
@@ -4262,7 +4266,7 @@ declare class CellPlugin extends CorePlugin<CoreState$1> implements CoreState$1
      * starting an async evaluation even if it has been moved or re-allocated
      */
     getCellById(cellId: UID): Cell | undefined;
-    getFormulaString(sheetId: UID, tokens: Token[], dependencies: Range[], useFixedReference?: boolean): string;
+    getFormulaString(sheetId: UID, tokens: Token[], dependencies: Range[], useBoundedReference?: boolean): string;
     getTranslatedCellFormula(sheetId: UID, offsetX: number, offsetY: number, tokens: Token[]): string;
     getFormulaMovedInSheet(originSheetId: UID, targetSheetId: UID, tokens: Token[]): string;
     getCellStyle(position: CellPosition): Style;

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.1.3
- * @date 2025-01-27T10:50:23.000Z
- * @hash 7ffac1e
+ * @version 18.1.4
+ * @date 2025-01-29T06:27:32.901Z
+ * @hash a11ef27
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -9656,13 +9656,13 @@ function toExcelDataset(getters, ds) {
     else if (ds.labelCell) {
         label = {
             reference: getters.getRangeString(ds.labelCell, "forceSheetReference", {
-                useFixedReference: true,
+                useBoundedReference: true,
             }),
         };
     }
     return {
         label,
-        range: getters.getRangeString(dataRange, "forceSheetReference", { useFixedReference: true }),
+        range: getters.getRangeString(dataRange, "forceSheetReference", { useBoundedReference: true }),
         backgroundColor: ds.backgroundColor,
         rightYAxis: ds.rightYAxis,
     };
@@ -9677,7 +9677,7 @@ function toExcelLabelRange(getters, labelRange, shouldRemoveFirstLabel) {
         zone.top = zone.top + 1;
     }
     const range = labelRange.clone({ zone });
-    return getters.getRangeString(range, "forceSheetReference", { useFixedReference: true });
+    return getters.getRangeString(range, "forceSheetReference", { useBoundedReference: true });
 }
 /**
  * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -53311,7 +53311,7 @@ class CellPlugin extends CorePlugin {
     /*
      * Reconstructs the original formula string based on new dependencies
      */
-    getFormulaString(sheetId, tokens, dependencies, useFixedReference = false) {
+    getFormulaString(sheetId, tokens, dependencies, useBoundedReference = false) {
         if (!dependencies.length) {
             return concat(tokens.map((token) => token.value));
         }
@@ -53319,7 +53319,7 @@ class CellPlugin extends CorePlugin {
         return concat(tokens.map((token) => {
             if (token.type === "REFERENCE") {
                 const range = dependencies[rangeIndex++];
-                return this.getters.getRangeString(range, sheetId, { useFixedReference });
+                return this.getters.getRangeString(range, sheetId, { useBoundedReference });
             }
             return token.value;
         }));
@@ -53599,7 +53599,7 @@ class FormulaCellWithDependencies {
             if (token.type === "REFERENCE") {
                 const index = rangeIndex++;
                 return this.getRangeString(this.compiledFormula.dependencies[index], this.sheetId, {
-                    useFixedReference: true,
+                    useBoundedReference: true,
                 });
             }
             return token.value;
@@ -53936,7 +53936,7 @@ class ConditionalFormatPlugin extends CorePlugin {
         if (data.sheets) {
             for (let sheet of data.sheets) {
                 if (this.cfRules[sheet.id]) {
-                    sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                    sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useBoundedReference: true }));
                 }
             }
         }
@@ -54005,9 +54005,9 @@ class ConditionalFormatPlugin extends CorePlugin {
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
-    mapToConditionalFormat(sheetId, cf, { useFixedReference } = { useFixedReference: false }) {
+    mapToConditionalFormat(sheetId, cf, { useBoundedReference } = { useBoundedReference: false }) {
         const ranges = cf.ranges.map((range) => {
-            return this.getters.getRangeString(range, sheetId, { useFixedReference });
+            return this.getters.getRangeString(range, sheetId, { useBoundedReference });
         });
         if (cf.rule.type !== "DataBarRule") {
             return {
@@ -54022,7 +54022,7 @@ class ConditionalFormatPlugin extends CorePlugin {
                 ...cf.rule,
                 rangeValues: cf.rule.rangeValues &&
                     this.getters.getRangeString(cf.rule.rangeValues, sheetId, {
-                        useFixedReference,
+                        useBoundedReference,
                     }),
             },
             ranges,
@@ -54463,10 +54463,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,
-                    ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useFixedReference: true })),
-                });
+                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);
             }
         }
     }
@@ -55887,9 +55897,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 bounded row and column
      * @param options.useFixedReference if true, the range will be returned with fixed row and column
      */
-    getRangeString(range, forSheetId, options = { useFixedReference: false }) {
+    getRangeString(range, forSheetId, options = { useBoundedReference: false, useFixedReference: false }) {
         if (!range) {
             return CellErrorType.InvalidReference;
         }
@@ -55992,13 +56003,13 @@ class RangeAdapter {
     /**
      * Get a Xc string that represent a part of a range
      */
-    getRangePartString(range, part, options = { useFixedReference: 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.useFixedReference) {
+        if (range.isFullCol && !options.useBoundedReference) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -56006,7 +56017,7 @@ class RangeAdapter {
                 str = colFixed + col;
             }
         }
-        else if (range.isFullRow && !options.useFixedReference) {
+        else if (range.isFullRow && !options.useBoundedReference) {
             if (part === 0 && range.unboundedZone.hasHeader) {
                 str = colFixed + col + rowFixed + row;
             }
@@ -63185,6 +63196,7 @@ class Session extends EventBus {
     waitingUndoRedoAck = false;
     isReplayingInitialRevisions = false;
     processedRevisions = new Set();
+    lastRevisionMessage = undefined;
     uuidGenerator = new UuidGenerator();
     lastLocalOperation;
     /**
@@ -63285,7 +63297,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];
@@ -63506,6 +63521,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;
         }
@@ -74971,6 +74987,6 @@ const chartHelpers = { ...CHART_HELPERS, ...CHART_RUNTIME_HELPERS };
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, 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.1.3";
-__info__.date = "2025-01-27T10:50:23.000Z";
-__info__.hash = "7ffac1e";
+__info__.version = "18.1.4";
+__info__.date = "2025-01-29T06:27:32.901Z";
+__info__.hash = "a11ef27";

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.1.3
- * @date 2025-01-27T10:50:23.000Z
- * @hash 7ffac1e
+ * @version 18.1.4
+ * @date 2025-01-29T06:27:32.901Z
+ * @hash a11ef27
  */
 
 (function (exports, owl) {
@@ -9657,13 +9657,13 @@ stores.inject(MyMetaStore, storeInstance);
       else if (ds.labelCell) {
           label = {
               reference: getters.getRangeString(ds.labelCell, "forceSheetReference", {
-                  useFixedReference: true,
+                  useBoundedReference: true,
               }),
           };
       }
       return {
           label,
-          range: getters.getRangeString(dataRange, "forceSheetReference", { useFixedReference: true }),
+          range: getters.getRangeString(dataRange, "forceSheetReference", { useBoundedReference: true }),
           backgroundColor: ds.backgroundColor,
           rightYAxis: ds.rightYAxis,
       };
@@ -9678,7 +9678,7 @@ stores.inject(MyMetaStore, storeInstance);
           zone.top = zone.top + 1;
       }
       const range = labelRange.clone({ zone });
-      return getters.getRangeString(range, "forceSheetReference", { useFixedReference: true });
+      return getters.getRangeString(range, "forceSheetReference", { useBoundedReference: true });
   }
   /**
    * Transform a chart definition which supports dataSets (dataSets and LabelRange)
@@ -53312,7 +53312,7 @@ stores.inject(MyMetaStore, storeInstance);
       /*
        * Reconstructs the original formula string based on new dependencies
        */
-      getFormulaString(sheetId, tokens, dependencies, useFixedReference = false) {
+      getFormulaString(sheetId, tokens, dependencies, useBoundedReference = false) {
           if (!dependencies.length) {
               return concat(tokens.map((token) => token.value));
           }
@@ -53320,7 +53320,7 @@ stores.inject(MyMetaStore, storeInstance);
           return concat(tokens.map((token) => {
               if (token.type === "REFERENCE") {
                   const range = dependencies[rangeIndex++];
-                  return this.getters.getRangeString(range, sheetId, { useFixedReference });
+                  return this.getters.getRangeString(range, sheetId, { useBoundedReference });
               }
               return token.value;
           }));
@@ -53600,7 +53600,7 @@ stores.inject(MyMetaStore, storeInstance);
               if (token.type === "REFERENCE") {
                   const index = rangeIndex++;
                   return this.getRangeString(this.compiledFormula.dependencies[index], this.sheetId, {
-                      useFixedReference: true,
+                      useBoundedReference: true,
                   });
               }
               return token.value;
@@ -53937,7 +53937,7 @@ stores.inject(MyMetaStore, storeInstance);
           if (data.sheets) {
               for (let sheet of data.sheets) {
                   if (this.cfRules[sheet.id]) {
-                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useFixedReference: true }));
+                      sheet.conditionalFormats = this.cfRules[sheet.id].map((rule) => this.mapToConditionalFormat(sheet.id, rule, { useBoundedReference: true }));
                   }
               }
           }
@@ -54006,9 +54006,9 @@ stores.inject(MyMetaStore, storeInstance);
       // ---------------------------------------------------------------------------
       // Private
       // ---------------------------------------------------------------------------
-      mapToConditionalFormat(sheetId, cf, { useFixedReference } = { useFixedReference: false }) {
+      mapToConditionalFormat(sheetId, cf, { useBoundedReference } = { useBoundedReference: false }) {
           const ranges = cf.ranges.map((range) => {
-              return this.getters.getRangeString(range, sheetId, { useFixedReference });
+              return this.getters.getRangeString(range, sheetId, { useBoundedReference });
           });
           if (cf.rule.type !== "DataBarRule") {
               return {
@@ -54023,7 +54023,7 @@ stores.inject(MyMetaStore, storeInstance);
                   ...cf.rule,
                   rangeValues: cf.rule.rangeValues &&
                       this.getters.getRangeString(cf.rule.rangeValues, sheetId, {
-                          useFixedReference,
+                          useBoundedReference,
                       }),
               },
               ranges,
@@ -54464,10 +54464,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,
-                      ranges: rule.ranges.map((range) => this.getters.getRangeString(range, sheet.id, { useFixedReference: true })),
-                  });
+                  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);
               }
           }
       }
@@ -55888,9 +55898,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 bounded row and column
        * @param options.useFixedReference if true, the range will be returned with fixed row and column
        */
-      getRangeString(range, forSheetId, options = { useFixedReference: false }) {
+      getRangeString(range, forSheetId, options = { useBoundedReference: false, useFixedReference: false }) {
           if (!range) {
               return CellErrorType.InvalidReference;
           }
@@ -55993,13 +56004,13 @@ stores.inject(MyMetaStore, storeInstance);
       /**
        * Get a Xc string that represent a part of a range
        */
-      getRangePartString(range, part, options = { useFixedReference: 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.useFixedReference) {
+          if (range.isFullCol && !options.useBoundedReference) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -56007,7 +56018,7 @@ stores.inject(MyMetaStore, storeInstance);
                   str = colFixed + col;
               }
           }
-          else if (range.isFullRow && !options.useFixedReference) {
+          else if (range.isFullRow && !options.useBoundedReference) {
               if (part === 0 && range.unboundedZone.hasHeader) {
                   str = colFixed + col + rowFixed + row;
               }
@@ -63186,6 +63197,7 @@ stores.inject(MyMetaStore, storeInstance);
       waitingUndoRedoAck = false;
       isReplayingInitialRevisions = false;
       processedRevisions = new Set();
+      lastRevisionMessage = undefined;
       uuidGenerator = new UuidGenerator();
       lastLocalOperation;
       /**
@@ -63286,7 +63298,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];
@@ -63507,6 +63522,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;
           }
@@ -75016,9 +75032,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "18.1.3";
-  __info__.date = "2025-01-27T10:50:23.000Z";
-  __info__.hash = "7ffac1e";
+  __info__.version = "18.1.4";
+  __info__.date = "2025-01-29T06:27:32.901Z";
+  __info__.hash = "a11ef27";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);