@odoo/o-spreadsheet 15.0.3 → 15.0.5

package/dist/o-spreadsheet.cjs.js

@@ -370,7 +370,7 @@ function formatJSTime(jsDate, format) {
  * - it does not accept "," as thousand separator, because when we tokenize a
  *   formula, commas are used to separate arguments
  */
-const formulaNumberRegexp = /^-?\d+(\.?\d*(e\d+)?)?(\s*%)?|^-?\.\d+(\s*%)?/;
+const formulaNumberRegexp = /(^-?\d+(\.?\d*(e\d+)?)?(\s*%)?|^-?\.\d+(\s*%)?)(?!\w|!)/;
 const numberRegexp = /^-?\d+(,\d+)*(\.?\d*(e\d+)?)?(\s*%)?$|^-?\.\d+(\s*%)?$/;
 /**
  * Return true if the argument is a "number string".
@@ -27080,14 +27080,31 @@ class ContentEditableHelper {
      * */
     getCurrentSelection() {
         let { startElement, endElement, startSelectionOffset, endSelectionOffset } = this.getStartAndEndSelection();
-        let startSizeBefore = this.findSizeBeforeElement(startElement);
-        let endSizeBefore = this.findSizeBeforeElement(endElement);
+        let startSizeBefore = this.findSelectionIndex(startElement, startSelectionOffset);
+        let endSizeBefore = this.findSelectionIndex(endElement, endSelectionOffset);
         return {
-            start: startSizeBefore + startSelectionOffset,
-            end: endSizeBefore + endSelectionOffset,
+            start: startSizeBefore,
+            end: endSizeBefore,
         };
     }
-    findSizeBeforeElement(nodeToFind) {
+    /**
+     * Computes the text 'index' inside this.el based on the currently selected node and its offset.
+     * The selected node is either a Text node or an Element node.
+     *
+     * case 1 -Text node:
+     * the offset is the number of characters from the start of the node. We have to add this offset to the
+     * content length of all previous nodes.
+     *
+     * case 2 - Element node:
+     * the offset is the number of child nodes before the selected node. We have to add the content length of
+     * all the bnodes prior to the selected node as well as the content of the child node before the offset.
+     *
+     * See the MDN documentation for more details.
+     * https://developer.mozilla.org/en-US/docs/Web/API/Range/startOffset
+     * https://developer.mozilla.org/en-US/docs/Web/API/Range/endOffset
+     *
+     */
+    findSelectionIndex(nodeToFind, nodeOffset) {
         let it = this.iterateChildren(this.el);
         let usedCharacters = 0;
         let current = it.next();
@@ -27099,6 +27116,19 @@ class ContentEditableHelper {
             }
             current = it.next();
         }
+        if (current.value === nodeToFind) {
+            if (!current.value.hasChildNodes()) {
+                usedCharacters += nodeOffset;
+            }
+            else {
+                const children = [...current.value.childNodes].slice(0, nodeOffset);
+                for (const child of children) {
+                    if (!child.textContent)
+                        continue;
+                    usedCharacters += child.textContent.length;
+                }
+            }
+        }
         return usedCharacters;
     }
     getStartAndEndSelection() {
@@ -31369,6 +31399,6 @@ exports.registries = registries;
 exports.setTranslationMethod = setTranslationMethod;
 
 
-__info__.version = '15.0.3';
-__info__.date = '2023-03-23T11:34:07.983Z';
-__info__.hash = 'f51b30b';
+__info__.version = '15.0.5';
+__info__.date = '2023-04-21T07:27:19.753Z';
+__info__.hash = 'ef69cc7';

package/dist/o-spreadsheet.d.ts

@@ -4279,7 +4279,24 @@ declare class ContentEditableHelper {
         start: number;
         end: number;
     };
-    private findSizeBeforeElement;
+    /**
+     * Computes the text 'index' inside this.el based on the currently selected node and its offset.
+     * The selected node is either a Text node or an Element node.
+     *
+     * case 1 -Text node:
+     * the offset is the number of characters from the start of the node. We have to add this offset to the
+     * content length of all previous nodes.
+     *
+     * case 2 - Element node:
+     * the offset is the number of child nodes before the selected node. We have to add the content length of
+     * all the bnodes prior to the selected node as well as the content of the child node before the offset.
+     *
+     * See the MDN documentation for more details.
+     * https://developer.mozilla.org/en-US/docs/Web/API/Range/startOffset
+     * https://developer.mozilla.org/en-US/docs/Web/API/Range/endOffset
+     *
+     */
+    private findSelectionIndex;
     private getStartAndEndSelection;
 }
 

package/dist/o-spreadsheet.esm.js

@@ -347,7 +347,7 @@ function formatJSTime(jsDate, format) {
  * - it does not accept "," as thousand separator, because when we tokenize a
  *   formula, commas are used to separate arguments
  */
-const formulaNumberRegexp = /^-?\d+(\.?\d*(e\d+)?)?(\s*%)?|^-?\.\d+(\s*%)?/;
+const formulaNumberRegexp = /(^-?\d+(\.?\d*(e\d+)?)?(\s*%)?|^-?\.\d+(\s*%)?)(?!\w|!)/;
 const numberRegexp = /^-?\d+(,\d+)*(\.?\d*(e\d+)?)?(\s*%)?$|^-?\.\d+(\s*%)?$/;
 /**
  * Return true if the argument is a "number string".
@@ -27057,14 +27057,31 @@ class ContentEditableHelper {
      * */
     getCurrentSelection() {
         let { startElement, endElement, startSelectionOffset, endSelectionOffset } = this.getStartAndEndSelection();
-        let startSizeBefore = this.findSizeBeforeElement(startElement);
-        let endSizeBefore = this.findSizeBeforeElement(endElement);
+        let startSizeBefore = this.findSelectionIndex(startElement, startSelectionOffset);
+        let endSizeBefore = this.findSelectionIndex(endElement, endSelectionOffset);
         return {
-            start: startSizeBefore + startSelectionOffset,
-            end: endSizeBefore + endSelectionOffset,
+            start: startSizeBefore,
+            end: endSizeBefore,
         };
     }
-    findSizeBeforeElement(nodeToFind) {
+    /**
+     * Computes the text 'index' inside this.el based on the currently selected node and its offset.
+     * The selected node is either a Text node or an Element node.
+     *
+     * case 1 -Text node:
+     * the offset is the number of characters from the start of the node. We have to add this offset to the
+     * content length of all previous nodes.
+     *
+     * case 2 - Element node:
+     * the offset is the number of child nodes before the selected node. We have to add the content length of
+     * all the bnodes prior to the selected node as well as the content of the child node before the offset.
+     *
+     * See the MDN documentation for more details.
+     * https://developer.mozilla.org/en-US/docs/Web/API/Range/startOffset
+     * https://developer.mozilla.org/en-US/docs/Web/API/Range/endOffset
+     *
+     */
+    findSelectionIndex(nodeToFind, nodeOffset) {
         let it = this.iterateChildren(this.el);
         let usedCharacters = 0;
         let current = it.next();
@@ -27076,6 +27093,19 @@ class ContentEditableHelper {
             }
             current = it.next();
         }
+        if (current.value === nodeToFind) {
+            if (!current.value.hasChildNodes()) {
+                usedCharacters += nodeOffset;
+            }
+            else {
+                const children = [...current.value.childNodes].slice(0, nodeOffset);
+                for (const child of children) {
+                    if (!child.textContent)
+                        continue;
+                    usedCharacters += child.textContent.length;
+                }
+            }
+        }
         return usedCharacters;
     }
     getStartAndEndSelection() {
@@ -31324,6 +31354,6 @@ const helpers = {
 export { CommandResult, CorePlugin, DATETIME_FORMAT, DataSource, DispatchResult, Model, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, DEBUG as __DEBUG__, __info__, astToFormula, cellTypes, convertAstNodes, coreTypes, functionCache, helpers, invalidateEvaluationCommands, normalize, parse, readonlyAllowedCommands, registries, setTranslationMethod };
 
 
-__info__.version = '15.0.3';
-__info__.date = '2023-03-23T11:34:07.983Z';
-__info__.hash = 'f51b30b';
+__info__.version = '15.0.5';
+__info__.date = '2023-04-21T07:27:19.753Z';
+__info__.hash = 'ef69cc7';

package/dist/o-spreadsheet.iife.js

@@ -367,7 +367,7 @@
    * - it does not accept "," as thousand separator, because when we tokenize a
    *   formula, commas are used to separate arguments
    */
-  const formulaNumberRegexp = /^-?\d+(\.?\d*(e\d+)?)?(\s*%)?|^-?\.\d+(\s*%)?/;
+  const formulaNumberRegexp = /(^-?\d+(\.?\d*(e\d+)?)?(\s*%)?|^-?\.\d+(\s*%)?)(?!\w|!)/;
   const numberRegexp = /^-?\d+(,\d+)*(\.?\d*(e\d+)?)?(\s*%)?$|^-?\.\d+(\s*%)?$/;
   /**
    * Return true if the argument is a "number string".
@@ -27077,14 +27077,31 @@
        * */
       getCurrentSelection() {
           let { startElement, endElement, startSelectionOffset, endSelectionOffset } = this.getStartAndEndSelection();
-          let startSizeBefore = this.findSizeBeforeElement(startElement);
-          let endSizeBefore = this.findSizeBeforeElement(endElement);
+          let startSizeBefore = this.findSelectionIndex(startElement, startSelectionOffset);
+          let endSizeBefore = this.findSelectionIndex(endElement, endSelectionOffset);
           return {
-              start: startSizeBefore + startSelectionOffset,
-              end: endSizeBefore + endSelectionOffset,
+              start: startSizeBefore,
+              end: endSizeBefore,
           };
       }
-      findSizeBeforeElement(nodeToFind) {
+      /**
+       * Computes the text 'index' inside this.el based on the currently selected node and its offset.
+       * The selected node is either a Text node or an Element node.
+       *
+       * case 1 -Text node:
+       * the offset is the number of characters from the start of the node. We have to add this offset to the
+       * content length of all previous nodes.
+       *
+       * case 2 - Element node:
+       * the offset is the number of child nodes before the selected node. We have to add the content length of
+       * all the bnodes prior to the selected node as well as the content of the child node before the offset.
+       *
+       * See the MDN documentation for more details.
+       * https://developer.mozilla.org/en-US/docs/Web/API/Range/startOffset
+       * https://developer.mozilla.org/en-US/docs/Web/API/Range/endOffset
+       *
+       */
+      findSelectionIndex(nodeToFind, nodeOffset) {
           let it = this.iterateChildren(this.el);
           let usedCharacters = 0;
           let current = it.next();
@@ -27096,6 +27113,19 @@
               }
               current = it.next();
           }
+          if (current.value === nodeToFind) {
+              if (!current.value.hasChildNodes()) {
+                  usedCharacters += nodeOffset;
+              }
+              else {
+                  const children = [...current.value.childNodes].slice(0, nodeOffset);
+                  for (const child of children) {
+                      if (!child.textContent)
+                          continue;
+                      usedCharacters += child.textContent.length;
+                  }
+              }
+          }
           return usedCharacters;
       }
       getStartAndEndSelection() {
@@ -31368,9 +31398,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.0.3';
-  __info__.date = '2023-03-23T11:34:07.983Z';
-  __info__.hash = 'f51b30b';
+  __info__.version = '15.0.5';
+  __info__.date = '2023-04-21T07:27:19.753Z';
+  __info__.hash = 'ef69cc7';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);