@odoo/o-spreadsheet 15.2.4 → 15.2.6

package/dist/o-spreadsheet.cjs.js

@@ -6613,7 +6613,7 @@ const POW = {
       base (number) ${_lt("The number to raise to the exponent power.")}
       exponent (number) ${_lt("The exponent to raise base to.")}
     `),
-    returns: ["BOOLEAN"],
+    returns: ["NUMBER"],
     compute: function (base, exponent) {
         return POWER.compute(base, exponent);
     },
@@ -24694,12 +24694,9 @@ function addFormula(cell) {
     else {
         // Shouldn't we always output the value then ?
         const value = cell.value;
-        // what if value = 0? Is this condition correct?
-        if (value) {
-            const type = getCellType(value);
-            attrs.push(["t", type]);
-            node = escapeXml /*xml*/ `<v>${value}</v>`;
-        }
+        const type = getCellType(value);
+        attrs.push(["t", type]);
+        node = escapeXml /*xml*/ `<v>${value}</v>`;
         return { attrs, node };
     }
 }
@@ -27022,14 +27019,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();
@@ -27041,6 +27055,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() {
@@ -31302,6 +31329,6 @@ exports.registries = registries;
 exports.setTranslationMethod = setTranslationMethod;
 
 
-__info__.version = '15.2.4';
-__info__.date = '2023-04-13T08:15:24.992Z';
-__info__.hash = '23f0126';
+__info__.version = '15.2.6';
+__info__.date = '2023-04-28T12:21:51.546Z';
+__info__.hash = 'cb8f763';

package/dist/o-spreadsheet.d.ts

@@ -4288,7 +4288,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

@@ -6590,7 +6590,7 @@ const POW = {
       base (number) ${_lt("The number to raise to the exponent power.")}
       exponent (number) ${_lt("The exponent to raise base to.")}
     `),
-    returns: ["BOOLEAN"],
+    returns: ["NUMBER"],
     compute: function (base, exponent) {
         return POWER.compute(base, exponent);
     },
@@ -24671,12 +24671,9 @@ function addFormula(cell) {
     else {
         // Shouldn't we always output the value then ?
         const value = cell.value;
-        // what if value = 0? Is this condition correct?
-        if (value) {
-            const type = getCellType(value);
-            attrs.push(["t", type]);
-            node = escapeXml /*xml*/ `<v>${value}</v>`;
-        }
+        const type = getCellType(value);
+        attrs.push(["t", type]);
+        node = escapeXml /*xml*/ `<v>${value}</v>`;
         return { attrs, node };
     }
 }
@@ -26999,14 +26996,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();
@@ -27018,6 +27032,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() {
@@ -31256,6 +31283,6 @@ const helpers = {
 export { CommandResult, CorePlugin, DATETIME_FORMAT, DataSource, DispatchResult, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, DEBUG as __DEBUG__, __info__, astToFormula, cellTypes, compile, convertAstNodes, coreTypes, functionCache, helpers, invalidateEvaluationCommands, parse, readonlyAllowedCommands, registries, setTranslationMethod };
 
 
-__info__.version = '15.2.4';
-__info__.date = '2023-04-13T08:15:24.992Z';
-__info__.hash = '23f0126';
+__info__.version = '15.2.6';
+__info__.date = '2023-04-28T12:21:51.546Z';
+__info__.hash = 'cb8f763';

package/dist/o-spreadsheet.iife.js

@@ -6610,7 +6610,7 @@
       base (number) ${_lt("The number to raise to the exponent power.")}
       exponent (number) ${_lt("The exponent to raise base to.")}
     `),
-      returns: ["BOOLEAN"],
+      returns: ["NUMBER"],
       compute: function (base, exponent) {
           return POWER.compute(base, exponent);
       },
@@ -24691,12 +24691,9 @@
       else {
           // Shouldn't we always output the value then ?
           const value = cell.value;
-          // what if value = 0? Is this condition correct?
-          if (value) {
-              const type = getCellType(value);
-              attrs.push(["t", type]);
-              node = escapeXml /*xml*/ `<v>${value}</v>`;
-          }
+          const type = getCellType(value);
+          attrs.push(["t", type]);
+          node = escapeXml /*xml*/ `<v>${value}</v>`;
           return { attrs, node };
       }
   }
@@ -27019,14 +27016,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();
@@ -27038,6 +27052,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() {
@@ -31301,9 +31328,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.2.4';
-  __info__.date = '2023-04-13T08:15:24.992Z';
-  __info__.hash = '23f0126';
+  __info__.version = '15.2.6';
+  __info__.date = '2023-04-28T12:21:51.546Z';
+  __info__.hash = 'cb8f763';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);