@odoo/o-spreadsheet 17.3.4 → 17.3.5

package/dist/o-spreadsheet.cjs.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.3.4
- * @date 2024-06-21T20:00:08.515Z
- * @hash 6efbf3b
+ * @version 17.3.5
+ * @date 2024-06-26T11:05:50.339Z
+ * @hash 54eb151
  */
 
 'use strict';
@@ -1898,9 +1898,10 @@ function percentile(values, percent, isInclusive) {
         sortedValues[indexLow] * (indexSup - percentIndex));
 }
 
-// define a mock translation function, when o-spreadsheet runs in standalone it doesn't translate any string
-let _translate = (s) => s;
-let _loaded = () => false;
+const defaultTranslate = (s) => s;
+const defaultLoaded = () => false;
+let _translate = defaultTranslate;
+let _loaded = defaultLoaded;
 function sprintf(s, ...values) {
     if (values.length === 1 && typeof values[0] === "object" && !(values[0] instanceof String)) {
         const valuesDict = values[0];
@@ -1912,7 +1913,8 @@ function sprintf(s, ...values) {
     return s;
 }
 /***
- * Allow to inject a translation function from outside o-spreadsheet.
+ * Allow to inject a translation function from outside o-spreadsheet. This should be called before instantiating
+ * a model.
  * @param tfn the function that will do the translation
  * @param loaded a function that returns true when the translation is loaded
  */
@@ -1920,6 +1922,18 @@ function setTranslationMethod(tfn, loaded = () => true) {
     _translate = tfn;
     _loaded = loaded;
 }
+/**
+ * If no translation function has been set, this will mark the translation are loaded.
+ *
+ * By default, the translations should not be set as loaded, otherwise top-level translated constants will never be
+ * translated. But if by the time the model is instantiated no custom translation function has been set, we can set
+ * the default translation function as loaded so o-spreadsheet can be run in standalone with no translations.
+ */
+function setDefaultTranslationMethod() {
+    if (_translate === defaultTranslate && _loaded === defaultLoaded) {
+        _loaded = () => true;
+    }
+}
 const _t = function (s, ...values) {
     if (!_loaded()) {
         return new LazyTranslatedString(s, values);
@@ -34063,6 +34077,7 @@ class FindAndReplaceStore extends SpreadsheetStore {
     currentSearchRegex = null;
     isSearchDirty = false;
     initialShowFormulaState;
+    preserveSelectedMatchIndex = false;
     // fixme: why do we make selectedMatchIndex on top of a selected
     // property in the matches?
     selectedMatchIndex = null;
@@ -34172,7 +34187,9 @@ class FindAndReplaceStore extends SpreadsheetStore {
      * refresh the matches according to the current search options
      */
     refreshSearch(jumpToMatchSheet = true) {
-        this.selectedMatchIndex = null;
+        if (!this.preserveSelectedMatchIndex) {
+            this.selectedMatchIndex = null;
+        }
         this.findMatches();
         this.selectNextCell(Direction.current, jumpToMatchSheet);
     }
@@ -34271,10 +34288,16 @@ class FindAndReplaceStore extends SpreadsheetStore {
         const selectedMatch = matches[nextIndex];
         // Switch to the sheet where the match is located
         if (jumpToMatchSheet && this.getters.getActiveSheetId() !== selectedMatch.sheetId) {
+            // We set `preserveSelectedMatchIndex` to true to avoid resetting the selected search
+            // index in the `refreshSearch` function when a new sheet is activated. The reason being
+            // that, when we automatically go back to previous sheet while performing a search, the
+            // search index is reset to the first occurrence each time.
+            this.preserveSelectedMatchIndex = true;
             this.model.dispatch("ACTIVATE_SHEET", {
                 sheetIdFrom: this.getters.getActiveSheetId(),
                 sheetIdTo: selectedMatch.sheetId,
             });
+            this.preserveSelectedMatchIndex = false;
             // We do not want to reset the selection at finalize in this case
             this.isSearchDirty = false;
         }
@@ -54489,7 +54512,7 @@ class PivotUIPlugin extends UIPlugin {
     getPivotIdFromPosition(position) {
         const cell = this.getters.getCorrespondingFormulaCell(position);
         if (cell && cell.isFormula) {
-            const pivotFunction = this.getFirstPivotFunction(cell.compiledFormula.tokens);
+            const pivotFunction = this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
             if (pivotFunction) {
                 const pivotId = pivotFunction.args[0]?.toString();
                 return pivotId && this.getters.getPivotId(pivotId);
@@ -54497,7 +54520,7 @@ class PivotUIPlugin extends UIPlugin {
         }
         return undefined;
     }
-    getFirstPivotFunction(tokens) {
+    getFirstPivotFunction(sheetId, tokens) {
         const pivotFunction = getFirstPivotFunction(tokens);
         if (!pivotFunction) {
             return undefined;
@@ -54513,7 +54536,7 @@ class PivotUIPlugin extends UIPlugin {
                 return argAst.value;
             }
             const argsString = astToFormula(argAst);
-            return this.getters.evaluateFormula(this.getters.getActiveSheetId(), argsString);
+            return this.getters.evaluateFormula(sheetId, argsString);
         });
         return { functionName, args: evaluatedArgs };
     }
@@ -54536,7 +54559,7 @@ class PivotUIPlugin extends UIPlugin {
             return undefined;
         }
         const mainPosition = this.getters.getCellPosition(cell.id);
-        const result = this.getters.getFirstPivotFunction(cell.compiledFormula.tokens);
+        const result = this.getters.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
         if (!result) {
             return undefined;
         }
@@ -66314,6 +66337,7 @@ class Model extends EventBus {
         const start = performance.now();
         console.group("Model creation");
         super();
+        setDefaultTranslationMethod();
         stateUpdateMessages = repairInitialMessages(data, stateUpdateMessages);
         const workbookData = load(data, verboseImport);
         this.state = new StateObserver();
@@ -66990,6 +67014,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.3.4";
-__info__.date = "2024-06-21T20:00:08.515Z";
-__info__.hash = "6efbf3b";
+__info__.version = "17.3.5";
+__info__.date = "2024-06-26T11:05:50.339Z";
+__info__.hash = "54eb151";

package/dist/o-spreadsheet.d.ts

@@ -4255,7 +4255,7 @@ declare class PivotUIPlugin extends UIPlugin {
      * is no pivot at this position
      */
     getPivotIdFromPosition(position: CellPosition): "" | UID | undefined;
-    getFirstPivotFunction(tokens: Token[]): {
+    getFirstPivotFunction(sheetId: UID, tokens: Token[]): {
         functionName: string;
         args: (CellValue | Matrix<CellValue> | undefined)[];
     } | undefined;
@@ -8899,6 +8899,7 @@ declare class FindAndReplaceStore extends SpreadsheetStore implements HighlightP
     private currentSearchRegex;
     private isSearchDirty;
     private initialShowFormulaState;
+    private preserveSelectedMatchIndex;
     selectedMatchIndex: number | null;
     toSearch: string;
     toReplace: string;
@@ -10180,7 +10181,8 @@ type SprintfValues = (string | String | number)[] | [{
 }];
 type TranslationFunction = (string: string, ...values: SprintfValues) => string;
 /***
- * Allow to inject a translation function from outside o-spreadsheet.
+ * Allow to inject a translation function from outside o-spreadsheet. This should be called before instantiating
+ * a model.
  * @param tfn the function that will do the translation
  * @param loaded a function that returns true when the translation is loaded
  */

package/dist/o-spreadsheet.esm.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.3.4
- * @date 2024-06-21T20:00:08.515Z
- * @hash 6efbf3b
+ * @version 17.3.5
+ * @date 2024-06-26T11:05:50.339Z
+ * @hash 54eb151
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw, toRaw } from '@odoo/owl';
@@ -1896,9 +1896,10 @@ function percentile(values, percent, isInclusive) {
         sortedValues[indexLow] * (indexSup - percentIndex));
 }
 
-// define a mock translation function, when o-spreadsheet runs in standalone it doesn't translate any string
-let _translate = (s) => s;
-let _loaded = () => false;
+const defaultTranslate = (s) => s;
+const defaultLoaded = () => false;
+let _translate = defaultTranslate;
+let _loaded = defaultLoaded;
 function sprintf(s, ...values) {
     if (values.length === 1 && typeof values[0] === "object" && !(values[0] instanceof String)) {
         const valuesDict = values[0];
@@ -1910,7 +1911,8 @@ function sprintf(s, ...values) {
     return s;
 }
 /***
- * Allow to inject a translation function from outside o-spreadsheet.
+ * Allow to inject a translation function from outside o-spreadsheet. This should be called before instantiating
+ * a model.
  * @param tfn the function that will do the translation
  * @param loaded a function that returns true when the translation is loaded
  */
@@ -1918,6 +1920,18 @@ function setTranslationMethod(tfn, loaded = () => true) {
     _translate = tfn;
     _loaded = loaded;
 }
+/**
+ * If no translation function has been set, this will mark the translation are loaded.
+ *
+ * By default, the translations should not be set as loaded, otherwise top-level translated constants will never be
+ * translated. But if by the time the model is instantiated no custom translation function has been set, we can set
+ * the default translation function as loaded so o-spreadsheet can be run in standalone with no translations.
+ */
+function setDefaultTranslationMethod() {
+    if (_translate === defaultTranslate && _loaded === defaultLoaded) {
+        _loaded = () => true;
+    }
+}
 const _t = function (s, ...values) {
     if (!_loaded()) {
         return new LazyTranslatedString(s, values);
@@ -34061,6 +34075,7 @@ class FindAndReplaceStore extends SpreadsheetStore {
     currentSearchRegex = null;
     isSearchDirty = false;
     initialShowFormulaState;
+    preserveSelectedMatchIndex = false;
     // fixme: why do we make selectedMatchIndex on top of a selected
     // property in the matches?
     selectedMatchIndex = null;
@@ -34170,7 +34185,9 @@ class FindAndReplaceStore extends SpreadsheetStore {
      * refresh the matches according to the current search options
      */
     refreshSearch(jumpToMatchSheet = true) {
-        this.selectedMatchIndex = null;
+        if (!this.preserveSelectedMatchIndex) {
+            this.selectedMatchIndex = null;
+        }
         this.findMatches();
         this.selectNextCell(Direction.current, jumpToMatchSheet);
     }
@@ -34269,10 +34286,16 @@ class FindAndReplaceStore extends SpreadsheetStore {
         const selectedMatch = matches[nextIndex];
         // Switch to the sheet where the match is located
         if (jumpToMatchSheet && this.getters.getActiveSheetId() !== selectedMatch.sheetId) {
+            // We set `preserveSelectedMatchIndex` to true to avoid resetting the selected search
+            // index in the `refreshSearch` function when a new sheet is activated. The reason being
+            // that, when we automatically go back to previous sheet while performing a search, the
+            // search index is reset to the first occurrence each time.
+            this.preserveSelectedMatchIndex = true;
             this.model.dispatch("ACTIVATE_SHEET", {
                 sheetIdFrom: this.getters.getActiveSheetId(),
                 sheetIdTo: selectedMatch.sheetId,
             });
+            this.preserveSelectedMatchIndex = false;
             // We do not want to reset the selection at finalize in this case
             this.isSearchDirty = false;
         }
@@ -54487,7 +54510,7 @@ class PivotUIPlugin extends UIPlugin {
     getPivotIdFromPosition(position) {
         const cell = this.getters.getCorrespondingFormulaCell(position);
         if (cell && cell.isFormula) {
-            const pivotFunction = this.getFirstPivotFunction(cell.compiledFormula.tokens);
+            const pivotFunction = this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
             if (pivotFunction) {
                 const pivotId = pivotFunction.args[0]?.toString();
                 return pivotId && this.getters.getPivotId(pivotId);
@@ -54495,7 +54518,7 @@ class PivotUIPlugin extends UIPlugin {
         }
         return undefined;
     }
-    getFirstPivotFunction(tokens) {
+    getFirstPivotFunction(sheetId, tokens) {
         const pivotFunction = getFirstPivotFunction(tokens);
         if (!pivotFunction) {
             return undefined;
@@ -54511,7 +54534,7 @@ class PivotUIPlugin extends UIPlugin {
                 return argAst.value;
             }
             const argsString = astToFormula(argAst);
-            return this.getters.evaluateFormula(this.getters.getActiveSheetId(), argsString);
+            return this.getters.evaluateFormula(sheetId, argsString);
         });
         return { functionName, args: evaluatedArgs };
     }
@@ -54534,7 +54557,7 @@ class PivotUIPlugin extends UIPlugin {
             return undefined;
         }
         const mainPosition = this.getters.getCellPosition(cell.id);
-        const result = this.getters.getFirstPivotFunction(cell.compiledFormula.tokens);
+        const result = this.getters.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
         if (!result) {
             return undefined;
         }
@@ -66312,6 +66335,7 @@ class Model extends EventBus {
         const start = performance.now();
         console.group("Model creation");
         super();
+        setDefaultTranslationMethod();
         stateUpdateMessages = repairInitialMessages(data, stateUpdateMessages);
         const workbookData = load(data, verboseImport);
         this.state = new StateObserver();
@@ -66945,6 +66969,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, PivotRuntimeDefinition, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, SpreadsheetPivotTable, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, 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 = "17.3.4";
-__info__.date = "2024-06-21T20:00:08.515Z";
-__info__.hash = "6efbf3b";
+__info__.version = "17.3.5";
+__info__.date = "2024-06-26T11:05:50.339Z";
+__info__.hash = "54eb151";

package/dist/o-spreadsheet.iife.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.3.4
- * @date 2024-06-21T20:00:08.515Z
- * @hash 6efbf3b
+ * @version 17.3.5
+ * @date 2024-06-26T11:05:50.339Z
+ * @hash 54eb151
  */
 
 (function (exports, owl) {
@@ -1897,9 +1897,10 @@
           sortedValues[indexLow] * (indexSup - percentIndex));
   }
 
-  // define a mock translation function, when o-spreadsheet runs in standalone it doesn't translate any string
-  let _translate = (s) => s;
-  let _loaded = () => false;
+  const defaultTranslate = (s) => s;
+  const defaultLoaded = () => false;
+  let _translate = defaultTranslate;
+  let _loaded = defaultLoaded;
   function sprintf(s, ...values) {
       if (values.length === 1 && typeof values[0] === "object" && !(values[0] instanceof String)) {
           const valuesDict = values[0];
@@ -1911,7 +1912,8 @@
       return s;
   }
   /***
-   * Allow to inject a translation function from outside o-spreadsheet.
+   * Allow to inject a translation function from outside o-spreadsheet. This should be called before instantiating
+   * a model.
    * @param tfn the function that will do the translation
    * @param loaded a function that returns true when the translation is loaded
    */
@@ -1919,6 +1921,18 @@
       _translate = tfn;
       _loaded = loaded;
   }
+  /**
+   * If no translation function has been set, this will mark the translation are loaded.
+   *
+   * By default, the translations should not be set as loaded, otherwise top-level translated constants will never be
+   * translated. But if by the time the model is instantiated no custom translation function has been set, we can set
+   * the default translation function as loaded so o-spreadsheet can be run in standalone with no translations.
+   */
+  function setDefaultTranslationMethod() {
+      if (_translate === defaultTranslate && _loaded === defaultLoaded) {
+          _loaded = () => true;
+      }
+  }
   const _t = function (s, ...values) {
       if (!_loaded()) {
           return new LazyTranslatedString(s, values);
@@ -34062,6 +34076,7 @@ stores.inject(MyMetaStore, storeInstance);
       currentSearchRegex = null;
       isSearchDirty = false;
       initialShowFormulaState;
+      preserveSelectedMatchIndex = false;
       // fixme: why do we make selectedMatchIndex on top of a selected
       // property in the matches?
       selectedMatchIndex = null;
@@ -34171,7 +34186,9 @@ stores.inject(MyMetaStore, storeInstance);
        * refresh the matches according to the current search options
        */
       refreshSearch(jumpToMatchSheet = true) {
-          this.selectedMatchIndex = null;
+          if (!this.preserveSelectedMatchIndex) {
+              this.selectedMatchIndex = null;
+          }
           this.findMatches();
           this.selectNextCell(Direction.current, jumpToMatchSheet);
       }
@@ -34270,10 +34287,16 @@ stores.inject(MyMetaStore, storeInstance);
           const selectedMatch = matches[nextIndex];
           // Switch to the sheet where the match is located
           if (jumpToMatchSheet && this.getters.getActiveSheetId() !== selectedMatch.sheetId) {
+              // We set `preserveSelectedMatchIndex` to true to avoid resetting the selected search
+              // index in the `refreshSearch` function when a new sheet is activated. The reason being
+              // that, when we automatically go back to previous sheet while performing a search, the
+              // search index is reset to the first occurrence each time.
+              this.preserveSelectedMatchIndex = true;
               this.model.dispatch("ACTIVATE_SHEET", {
                   sheetIdFrom: this.getters.getActiveSheetId(),
                   sheetIdTo: selectedMatch.sheetId,
               });
+              this.preserveSelectedMatchIndex = false;
               // We do not want to reset the selection at finalize in this case
               this.isSearchDirty = false;
           }
@@ -54488,7 +54511,7 @@ stores.inject(MyMetaStore, storeInstance);
       getPivotIdFromPosition(position) {
           const cell = this.getters.getCorrespondingFormulaCell(position);
           if (cell && cell.isFormula) {
-              const pivotFunction = this.getFirstPivotFunction(cell.compiledFormula.tokens);
+              const pivotFunction = this.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
               if (pivotFunction) {
                   const pivotId = pivotFunction.args[0]?.toString();
                   return pivotId && this.getters.getPivotId(pivotId);
@@ -54496,7 +54519,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return undefined;
       }
-      getFirstPivotFunction(tokens) {
+      getFirstPivotFunction(sheetId, tokens) {
           const pivotFunction = getFirstPivotFunction(tokens);
           if (!pivotFunction) {
               return undefined;
@@ -54512,7 +54535,7 @@ stores.inject(MyMetaStore, storeInstance);
                   return argAst.value;
               }
               const argsString = astToFormula(argAst);
-              return this.getters.evaluateFormula(this.getters.getActiveSheetId(), argsString);
+              return this.getters.evaluateFormula(sheetId, argsString);
           });
           return { functionName, args: evaluatedArgs };
       }
@@ -54535,7 +54558,7 @@ stores.inject(MyMetaStore, storeInstance);
               return undefined;
           }
           const mainPosition = this.getters.getCellPosition(cell.id);
-          const result = this.getters.getFirstPivotFunction(cell.compiledFormula.tokens);
+          const result = this.getters.getFirstPivotFunction(position.sheetId, cell.compiledFormula.tokens);
           if (!result) {
               return undefined;
           }
@@ -66313,6 +66336,7 @@ stores.inject(MyMetaStore, storeInstance);
           const start = performance.now();
           console.group("Model creation");
           super();
+          setDefaultTranslationMethod();
           stateUpdateMessages = repairInitialMessages(data, stateUpdateMessages);
           const workbookData = load(data, verboseImport);
           this.state = new StateObserver();
@@ -66989,9 +67013,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.3.4";
-  __info__.date = "2024-06-21T20:00:08.515Z";
-  __info__.hash = "6efbf3b";
+  __info__.version = "17.3.5";
+  __info__.date = "2024-06-26T11:05:50.339Z";
+  __info__.hash = "54eb151";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);