@odoo/o-spreadsheet 16.0.51 → 16.0.53

package/dist/o-spreadsheet.cjs.js

@@ -33954,11 +33954,7 @@ class FindAndReplacePlugin extends UIPlugin {
                 }
                 if (cell &&
                     this.currentSearchRegex &&
-                    this.currentSearchRegex.test(this.searchOptions.searchFormulas
-                        ? cell.isFormula()
-                            ? cell.content
-                            : String(cell.evaluated.value)
-                        : String(cell.evaluated.value))) {
+                    this.currentSearchRegex.test(this.searchOptions.searchFormulas ? cell.content : String(cell.evaluated.value))) {
                     const position = this.getters.getCellPosition(cell.id);
                     const match = { col: position.col, row: position.row, selected: false };
                     matches.push(match);
@@ -35112,6 +35108,8 @@ class GridSelectionPlugin extends UIPlugin {
                 this.selectedFigureId = null;
                 break;
         }
+    }
+    finalize() {
         /** Any change to the selection has to be  reflected in the selection processor. */
         this.selection.resetDefaultAnchor(this, deepCopy(this.gridSelection.anchor));
     }
@@ -36594,6 +36592,7 @@ class Session extends EventBus {
             case "REMOTE_REVISION":
             case "REVISION_REDONE":
             case "REVISION_UNDONE":
+            case "SNAPSHOT_CREATED":
                 return this.processedRevisions.has(message.nextRevisionId);
             default:
                 return false;
@@ -37111,7 +37110,6 @@ class SheetViewPlugin extends UIPlugin {
     }
     handle(cmd) {
         var _a;
-        this.cleanViewports();
         switch (cmd.type) {
             case "START":
                 this.selection.observe(this, {
@@ -37156,6 +37154,9 @@ class SheetViewPlugin extends UIPlugin {
                     this.sheetsWithDirtyViewports.add(cmd.sheetId);
                 }
                 break;
+            case "DELETE_SHEET":
+                this.cleanViewports();
+                break;
             case "ACTIVATE_SHEET":
                 this.setViewports();
                 this.refreshViewport(cmd.sheetIdTo);
@@ -37472,6 +37473,7 @@ class SheetViewPlugin extends UIPlugin {
         }
     }
     resetSheetViews() {
+        this.cleanViewports();
         for (let sheetId of Object.keys(this.viewports)) {
             const position = this.getters.getSheetPosition(sheetId);
             this.resetViewports(sheetId);
@@ -41857,30 +41859,27 @@ function addFormula(cell) {
     const isExported = tokens
         .filter((tk) => tk.type === "FUNCTION")
         .every((tk) => functions[tk.value.toUpperCase()].isExported);
+    const type = getCellType(cell.value);
     if (isExported) {
-        let cycle = escapeXml ``;
         const XlsxFormula = adaptFormulaToExcel(formula);
-        // hack for cycles : if we don't set a value (be it 0 or #VALUE!), it will appear as invisible on excel,
-        // Making it very hard for the client to find where the recursion is.
-        if (cell.value === CellErrorType.CircularDependency) {
-            attrs.push(["t", "str"]);
-            cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
-        }
-        node = escapeXml /*xml*/ `<f> ${XlsxFormula} </f> ${cycle}`;
+        node = escapeXml /*xml*/ `
+      <f>
+        ${XlsxFormula}
+      </f>
+      ${escapeXml /*xml*/ `<v>${cell.value}</v>`}
+    `;
+        attrs.push(["t", type]);
         return { attrs, node };
     }
     else {
-        // Shouldn't we always output the value then ?
-        const value = cell.value;
         // If the cell contains a non-exported formula and that is evaluates to
         // nothing* ,we don't export it.
         // * non-falsy value are relevant and so are 0 and FALSE, which only leaves
         // the empty string.
-        if (value === "")
+        if (cell.value === "")
             return undefined;
-        const type = getCellType(value);
         attrs.push(["t", type]);
-        node = escapeXml /*xml*/ `<v>${value}</v>`;
+        node = escapeXml /*xml*/ `<v>${cell.value}</v>`;
         return { attrs, node };
     }
 }
@@ -43104,6 +43103,9 @@ class Model extends EventBus {
         this.selection.observe(this, {
             handleEvent: () => this.trigger("update"),
         });
+        // move in "Loading" mode where we ignore redundant calls to finalize triggered by the
+        // replay of stateUpdateMessages in the session
+        this.isLoading = true;
         // This should be done after construction of LocalHistory due to order of
         // events
         this.setupSessionEvents();
@@ -43116,6 +43118,9 @@ class Model extends EventBus {
         // mark all models as "raw", so they will not be turned into reactive objects
         // by owl, since we do not rely on reactivity
         owl.markRaw(this);
+        this.isLoading = false;
+        // ensure propre recomputation of plugin states after the message replays
+        this.finalize();
     }
     joinSession() {
         this.session.join(this.config.client);
@@ -43225,6 +43230,9 @@ class Model extends EventBus {
         return DispatchResult.Success;
     }
     finalize() {
+        if (this.isLoading) {
+            return;
+        }
         this.status = 3 /* Status.Finalizing */;
         for (const h of this.handlers) {
             h.finalize();
@@ -43441,6 +43449,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.51';
-__info__.date = '2024-08-19T08:08:50.605Z';
-__info__.hash = '2b60022';
+__info__.version = '16.0.53';
+__info__.date = '2024-10-14T07:50:02.583Z';
+__info__.hash = 'a9ad6d8';

package/dist/o-spreadsheet.d.ts

@@ -1078,6 +1078,7 @@ declare class Model extends EventBus<any> implements CommandDispatcher {
      * can just iterate on it
      */
     private renderers;
+    private isLoading;
     /**
      * Internal status of the model. Important for command handling coordination
      */
@@ -4105,6 +4106,7 @@ declare class GridSelectionPlugin extends UIPlugin {
     allowDispatch(cmd: Command): CommandResult;
     private handleEvent;
     handle(cmd: Command): void;
+    finalize(): void;
     isGridSelectionActive(): boolean;
     getActiveSheet(): Readonly<Sheet>;
     getActiveSheetId(): UID;

package/dist/o-spreadsheet.esm.js

@@ -33950,11 +33950,7 @@ class FindAndReplacePlugin extends UIPlugin {
                 }
                 if (cell &&
                     this.currentSearchRegex &&
-                    this.currentSearchRegex.test(this.searchOptions.searchFormulas
-                        ? cell.isFormula()
-                            ? cell.content
-                            : String(cell.evaluated.value)
-                        : String(cell.evaluated.value))) {
+                    this.currentSearchRegex.test(this.searchOptions.searchFormulas ? cell.content : String(cell.evaluated.value))) {
                     const position = this.getters.getCellPosition(cell.id);
                     const match = { col: position.col, row: position.row, selected: false };
                     matches.push(match);
@@ -35108,6 +35104,8 @@ class GridSelectionPlugin extends UIPlugin {
                 this.selectedFigureId = null;
                 break;
         }
+    }
+    finalize() {
         /** Any change to the selection has to be  reflected in the selection processor. */
         this.selection.resetDefaultAnchor(this, deepCopy(this.gridSelection.anchor));
     }
@@ -36590,6 +36588,7 @@ class Session extends EventBus {
             case "REMOTE_REVISION":
             case "REVISION_REDONE":
             case "REVISION_UNDONE":
+            case "SNAPSHOT_CREATED":
                 return this.processedRevisions.has(message.nextRevisionId);
             default:
                 return false;
@@ -37107,7 +37106,6 @@ class SheetViewPlugin extends UIPlugin {
     }
     handle(cmd) {
         var _a;
-        this.cleanViewports();
         switch (cmd.type) {
             case "START":
                 this.selection.observe(this, {
@@ -37152,6 +37150,9 @@ class SheetViewPlugin extends UIPlugin {
                     this.sheetsWithDirtyViewports.add(cmd.sheetId);
                 }
                 break;
+            case "DELETE_SHEET":
+                this.cleanViewports();
+                break;
             case "ACTIVATE_SHEET":
                 this.setViewports();
                 this.refreshViewport(cmd.sheetIdTo);
@@ -37468,6 +37469,7 @@ class SheetViewPlugin extends UIPlugin {
         }
     }
     resetSheetViews() {
+        this.cleanViewports();
         for (let sheetId of Object.keys(this.viewports)) {
             const position = this.getters.getSheetPosition(sheetId);
             this.resetViewports(sheetId);
@@ -41853,30 +41855,27 @@ function addFormula(cell) {
     const isExported = tokens
         .filter((tk) => tk.type === "FUNCTION")
         .every((tk) => functions[tk.value.toUpperCase()].isExported);
+    const type = getCellType(cell.value);
     if (isExported) {
-        let cycle = escapeXml ``;
         const XlsxFormula = adaptFormulaToExcel(formula);
-        // hack for cycles : if we don't set a value (be it 0 or #VALUE!), it will appear as invisible on excel,
-        // Making it very hard for the client to find where the recursion is.
-        if (cell.value === CellErrorType.CircularDependency) {
-            attrs.push(["t", "str"]);
-            cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
-        }
-        node = escapeXml /*xml*/ `<f> ${XlsxFormula} </f> ${cycle}`;
+        node = escapeXml /*xml*/ `
+      <f>
+        ${XlsxFormula}
+      </f>
+      ${escapeXml /*xml*/ `<v>${cell.value}</v>`}
+    `;
+        attrs.push(["t", type]);
         return { attrs, node };
     }
     else {
-        // Shouldn't we always output the value then ?
-        const value = cell.value;
         // If the cell contains a non-exported formula and that is evaluates to
         // nothing* ,we don't export it.
         // * non-falsy value are relevant and so are 0 and FALSE, which only leaves
         // the empty string.
-        if (value === "")
+        if (cell.value === "")
             return undefined;
-        const type = getCellType(value);
         attrs.push(["t", type]);
-        node = escapeXml /*xml*/ `<v>${value}</v>`;
+        node = escapeXml /*xml*/ `<v>${cell.value}</v>`;
         return { attrs, node };
     }
 }
@@ -43100,6 +43099,9 @@ class Model extends EventBus {
         this.selection.observe(this, {
             handleEvent: () => this.trigger("update"),
         });
+        // move in "Loading" mode where we ignore redundant calls to finalize triggered by the
+        // replay of stateUpdateMessages in the session
+        this.isLoading = true;
         // This should be done after construction of LocalHistory due to order of
         // events
         this.setupSessionEvents();
@@ -43112,6 +43114,9 @@ class Model extends EventBus {
         // mark all models as "raw", so they will not be turned into reactive objects
         // by owl, since we do not rely on reactivity
         markRaw(this);
+        this.isLoading = false;
+        // ensure propre recomputation of plugin states after the message replays
+        this.finalize();
     }
     joinSession() {
         this.session.join(this.config.client);
@@ -43221,6 +43226,9 @@ class Model extends EventBus {
         return DispatchResult.Success;
     }
     finalize() {
+        if (this.isLoading) {
+            return;
+        }
         this.status = 3 /* Status.Finalizing */;
         for (const h of this.handlers) {
             h.finalize();
@@ -43409,6 +43417,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, cellTypes, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.0.51';
-__info__.date = '2024-08-19T08:08:50.605Z';
-__info__.hash = '2b60022';
+__info__.version = '16.0.53';
+__info__.date = '2024-10-14T07:50:02.583Z';
+__info__.hash = 'a9ad6d8';

package/dist/o-spreadsheet.iife.js

@@ -33951,11 +33951,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   }
                   if (cell &&
                       this.currentSearchRegex &&
-                      this.currentSearchRegex.test(this.searchOptions.searchFormulas
-                          ? cell.isFormula()
-                              ? cell.content
-                              : String(cell.evaluated.value)
-                          : String(cell.evaluated.value))) {
+                      this.currentSearchRegex.test(this.searchOptions.searchFormulas ? cell.content : String(cell.evaluated.value))) {
                       const position = this.getters.getCellPosition(cell.id);
                       const match = { col: position.col, row: position.row, selected: false };
                       matches.push(match);
@@ -35109,6 +35105,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   this.selectedFigureId = null;
                   break;
           }
+      }
+      finalize() {
           /** Any change to the selection has to be  reflected in the selection processor. */
           this.selection.resetDefaultAnchor(this, deepCopy(this.gridSelection.anchor));
       }
@@ -36591,6 +36589,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
               case "REMOTE_REVISION":
               case "REVISION_REDONE":
               case "REVISION_UNDONE":
+              case "SNAPSHOT_CREATED":
                   return this.processedRevisions.has(message.nextRevisionId);
               default:
                   return false;
@@ -37108,7 +37107,6 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       handle(cmd) {
           var _a;
-          this.cleanViewports();
           switch (cmd.type) {
               case "START":
                   this.selection.observe(this, {
@@ -37153,6 +37151,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                       this.sheetsWithDirtyViewports.add(cmd.sheetId);
                   }
                   break;
+              case "DELETE_SHEET":
+                  this.cleanViewports();
+                  break;
               case "ACTIVATE_SHEET":
                   this.setViewports();
                   this.refreshViewport(cmd.sheetIdTo);
@@ -37469,6 +37470,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           }
       }
       resetSheetViews() {
+          this.cleanViewports();
           for (let sheetId of Object.keys(this.viewports)) {
               const position = this.getters.getSheetPosition(sheetId);
               this.resetViewports(sheetId);
@@ -41854,30 +41856,27 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       const isExported = tokens
           .filter((tk) => tk.type === "FUNCTION")
           .every((tk) => functions[tk.value.toUpperCase()].isExported);
+      const type = getCellType(cell.value);
       if (isExported) {
-          let cycle = escapeXml ``;
           const XlsxFormula = adaptFormulaToExcel(formula);
-          // hack for cycles : if we don't set a value (be it 0 or #VALUE!), it will appear as invisible on excel,
-          // Making it very hard for the client to find where the recursion is.
-          if (cell.value === CellErrorType.CircularDependency) {
-              attrs.push(["t", "str"]);
-              cycle = escapeXml /*xml*/ `<v>${cell.value}</v>`;
-          }
-          node = escapeXml /*xml*/ `<f> ${XlsxFormula} </f> ${cycle}`;
+          node = escapeXml /*xml*/ `
+      <f>
+        ${XlsxFormula}
+      </f>
+      ${escapeXml /*xml*/ `<v>${cell.value}</v>`}
+    `;
+          attrs.push(["t", type]);
           return { attrs, node };
       }
       else {
-          // Shouldn't we always output the value then ?
-          const value = cell.value;
           // If the cell contains a non-exported formula and that is evaluates to
           // nothing* ,we don't export it.
           // * non-falsy value are relevant and so are 0 and FALSE, which only leaves
           // the empty string.
-          if (value === "")
+          if (cell.value === "")
               return undefined;
-          const type = getCellType(value);
           attrs.push(["t", type]);
-          node = escapeXml /*xml*/ `<v>${value}</v>`;
+          node = escapeXml /*xml*/ `<v>${cell.value}</v>`;
           return { attrs, node };
       }
   }
@@ -43101,6 +43100,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           this.selection.observe(this, {
               handleEvent: () => this.trigger("update"),
           });
+          // move in "Loading" mode where we ignore redundant calls to finalize triggered by the
+          // replay of stateUpdateMessages in the session
+          this.isLoading = true;
           // This should be done after construction of LocalHistory due to order of
           // events
           this.setupSessionEvents();
@@ -43113,6 +43115,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           // mark all models as "raw", so they will not be turned into reactive objects
           // by owl, since we do not rely on reactivity
           owl.markRaw(this);
+          this.isLoading = false;
+          // ensure propre recomputation of plugin states after the message replays
+          this.finalize();
       }
       joinSession() {
           this.session.join(this.config.client);
@@ -43222,6 +43227,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           return DispatchResult.Success;
       }
       finalize() {
+          if (this.isLoading) {
+              return;
+          }
           this.status = 3 /* Status.Finalizing */;
           for (const h of this.handlers) {
               h.finalize();
@@ -43440,9 +43448,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.51';
-  __info__.date = '2024-08-19T08:08:50.605Z';
-  __info__.hash = '2b60022';
+  __info__.version = '16.0.53';
+  __info__.date = '2024-10-14T07:50:02.583Z';
+  __info__.hash = 'a9ad6d8';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);