@odoo/o-spreadsheet 17.2.11 → 17.2.13

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.2.11
- * @date 2024-06-14T10:03:05.033Z
- * @hash 7704cc4
+ * @version 17.2.13
+ * @date 2024-07-02T09:03:00.731Z
+ * @hash fac2351
  */
 
 'use strict';
@@ -1818,9 +1818,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];
@@ -1832,7 +1833,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
  */
@@ -1840,6 +1842,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);
@@ -8881,10 +8895,8 @@ class ComposerStore extends SpreadsheetStore {
             const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
             return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), oldZone);
         });
-        // this function assumes that the previous range is always found because
-        // it's called when changing a highlight, which exists by definition
         if (!previousRefToken) {
-            throw new Error("Previous range not found");
+            return;
         }
         const previousRange = this.getters.getRangeFromSheetXC(activeSheetId, previousRefToken.value);
         this.selectionStart = previousRefToken.start;
@@ -29855,6 +29867,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;
@@ -29964,7 +29977,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);
     }
@@ -30063,10 +30078,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;
         }
@@ -54982,7 +55003,7 @@ class BottomBarSheet extends owl.Component {
             this.DOMFocusableElementStore.focus();
         }
     }
-    onClickSheetName(ev) {
+    onMouseEventSheetName(ev) {
         if (this.state.isEditing)
             ev.stopPropagation();
     }
@@ -60154,6 +60175,7 @@ class Model extends EventBus {
     coreHandlers = [];
     constructor(data = {}, config = {}, stateUpdateMessages = [], uuidGenerator = new UuidGenerator(), verboseImport = true) {
         super();
+        setDefaultTranslationMethod();
         stateUpdateMessages = repairInitialMessages(data, stateUpdateMessages);
         const workbookData = load(data, verboseImport);
         this.state = new StateObserver();
@@ -60786,6 +60808,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.11";
-__info__.date = "2024-06-14T10:03:05.033Z";
-__info__.hash = "7704cc4";
+__info__.version = "17.2.13";
+__info__.date = "2024-07-02T09:03:00.731Z";
+__info__.hash = "fac2351";

package/dist/o-spreadsheet.d.ts

@@ -7951,6 +7951,7 @@ declare class FindAndReplaceStore extends SpreadsheetStore implements HighlightP
     private currentSearchRegex;
     private isSearchDirty;
     private initialShowFormulaState;
+    private preserveSelectedMatchIndex;
     selectedMatchIndex: number | null;
     toSearch: string;
     toReplace: string;
@@ -8235,7 +8236,7 @@ declare class BottomBarSheet extends Component<Props$b, SpreadsheetChildEnv> {
     private activateSheet;
     onDblClick(): void;
     onKeyDown(ev: KeyboardEvent): void;
-    onClickSheetName(ev: MouseEvent): void;
+    onMouseEventSheetName(ev: MouseEvent): void;
     private startEdition;
     private stopEdition;
     private cancelEdition;
@@ -9072,7 +9073,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.2.11
- * @date 2024-06-14T10:03:05.033Z
- * @hash 7704cc4
+ * @version 17.2.13
+ * @date 2024-07-02T09:03:00.731Z
+ * @hash fac2351
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw } from '@odoo/owl';
@@ -1816,9 +1816,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];
@@ -1830,7 +1831,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
  */
@@ -1838,6 +1840,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);
@@ -8879,10 +8893,8 @@ class ComposerStore extends SpreadsheetStore {
             const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
             return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), oldZone);
         });
-        // this function assumes that the previous range is always found because
-        // it's called when changing a highlight, which exists by definition
         if (!previousRefToken) {
-            throw new Error("Previous range not found");
+            return;
         }
         const previousRange = this.getters.getRangeFromSheetXC(activeSheetId, previousRefToken.value);
         this.selectionStart = previousRefToken.start;
@@ -29853,6 +29865,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;
@@ -29962,7 +29975,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);
     }
@@ -30061,10 +30076,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;
         }
@@ -54980,7 +55001,7 @@ class BottomBarSheet extends Component {
             this.DOMFocusableElementStore.focus();
         }
     }
-    onClickSheetName(ev) {
+    onMouseEventSheetName(ev) {
         if (this.state.isEditing)
             ev.stopPropagation();
     }
@@ -60152,6 +60173,7 @@ class Model extends EventBus {
     coreHandlers = [];
     constructor(data = {}, config = {}, stateUpdateMessages = [], uuidGenerator = new UuidGenerator(), verboseImport = true) {
         super();
+        setDefaultTranslationMethod();
         stateUpdateMessages = repairInitialMessages(data, stateUpdateMessages);
         const workbookData = load(data, verboseImport);
         this.state = new StateObserver();
@@ -60743,6 +60765,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, 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.2.11";
-__info__.date = "2024-06-14T10:03:05.033Z";
-__info__.hash = "7704cc4";
+__info__.version = "17.2.13";
+__info__.date = "2024-07-02T09:03:00.731Z";
+__info__.hash = "fac2351";

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.2.11
- * @date 2024-06-14T10:03:05.033Z
- * @hash 7704cc4
+ * @version 17.2.13
+ * @date 2024-07-02T09:03:00.731Z
+ * @hash fac2351
  */
 
 (function (exports, owl) {
@@ -1817,9 +1817,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];
@@ -1831,7 +1832,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
    */
@@ -1839,6 +1841,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);
@@ -8880,10 +8894,8 @@ stores.inject(MyMetaStore, storeInstance);
               const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
               return isEqual(this.getters.expandZone(activeSheetId, refRange.zone), oldZone);
           });
-          // this function assumes that the previous range is always found because
-          // it's called when changing a highlight, which exists by definition
           if (!previousRefToken) {
-              throw new Error("Previous range not found");
+              return;
           }
           const previousRange = this.getters.getRangeFromSheetXC(activeSheetId, previousRefToken.value);
           this.selectionStart = previousRefToken.start;
@@ -29854,6 +29866,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;
@@ -29963,7 +29976,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);
       }
@@ -30062,10 +30077,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;
           }
@@ -54981,7 +55002,7 @@ stores.inject(MyMetaStore, storeInstance);
               this.DOMFocusableElementStore.focus();
           }
       }
-      onClickSheetName(ev) {
+      onMouseEventSheetName(ev) {
           if (this.state.isEditing)
               ev.stopPropagation();
       }
@@ -60153,6 +60174,7 @@ stores.inject(MyMetaStore, storeInstance);
       coreHandlers = [];
       constructor(data = {}, config = {}, stateUpdateMessages = [], uuidGenerator = new UuidGenerator(), verboseImport = true) {
           super();
+          setDefaultTranslationMethod();
           stateUpdateMessages = repairInitialMessages(data, stateUpdateMessages);
           const workbookData = load(data, verboseImport);
           this.state = new StateObserver();
@@ -60785,9 +60807,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.2.11";
-  __info__.date = "2024-06-14T10:03:05.033Z";
-  __info__.hash = "7704cc4";
+  __info__.version = "17.2.13";
+  __info__.date = "2024-07-02T09:03:00.731Z";
+  __info__.hash = "fac2351";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);