@fw-components/formula-editor 2.0.7-formula-editor.18 → 2.0.7-formula-editor.20

package/dist/formula-editor/src/cursor.js

@@ -80,10 +80,31 @@ export class Cursor {
         }
         return false;
     }
-    static getCaretPosition(shadowRoot, element) {
+    static _getComposedRange(shadowRoot) {
         // `getSelection` is not defined for the type ShadowRoot in TS,
         // but it does exist.
-        const range = shadowRoot.getSelection().getRangeAt(0);
+        const sr = shadowRoot;
+        if (sr.getSelection && typeof sr.getSelection === 'function') {
+            const selection = sr.getSelection();
+            if (selection && selection.rangeCount > 0) {
+                return selection.getRangeAt(0);
+            }
+        }
+        // Fallback for browsers like Firefox/Safari.
+        const selection = window.getSelection();
+        if (selection && selection.rangeCount > 0) {
+            const range = selection.getRangeAt(0);
+            if (shadowRoot.contains(range.startContainer)) {
+                return range;
+            }
+        }
+        return null;
+    }
+    static getCaretPosition(shadowRoot, element) {
+        const range = Cursor._getComposedRange(shadowRoot);
+        if (!range) {
+            return 0;
+        }
         const prefix = range.cloneRange();
         prefix.selectNodeContents(element);
         prefix.setEnd(range.endContainer, range.endOffset);
@@ -115,9 +136,7 @@ export class Cursor {
         return pos;
     }; }
     static getCursorRect(shadowRoot) {
-        return shadowRoot
-            .getSelection()
-            ?.getRangeAt(0)
-            ?.getClientRects()[0];
+        const range = Cursor._getComposedRange(shadowRoot);
+        return range ? range.getClientRects()[0] : undefined;
     }
 }

package/dist/formula-editor/src/parser.js

@@ -15,7 +15,7 @@ export class Parser {
         this._recommender = new Recommender(this.variables, minSuggestionLen);
     }
     parseInput(formula, prevCurPos = null, recommendation = null) {
-        let tokens = formula.match(/'[^']*'|\d+|[A-Za-z_][A-Za-z0-9_]*|[+\-(),*^\/:\?\s]/g);
+        let tokens = formula.match(/'[^']*'|\d+|[A-Za-z_][A-Za-z0-9_]*|[-+(),*^/:?\s]/g);
         // Stores the positions of opening parentheses. This allows us to
         // show "Unclosed parenthesis error" for positions which are far behind
         // our current token
@@ -201,7 +201,7 @@ export class Parser {
             return null;
         }
         const tokens = formula
-            .match(/'[^']*'|\d+|[A-Za-z_][A-Za-z0-9_]*|[+\-(),*^\/:\?\s]/g)
+            .match(/'[^']*'|\d+|[A-Za-z_][A-Za-z0-9_]*|[-+(),*^/:?\s]/g)
             ?.filter((el) => !/\s+/.test(el) && el !== "");
         // Handling the special case of unary `-` and `+`.
         let previousToken = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.18",
+  "version": "2.0.7-formula-editor.20",
   "description": "A WYSIWYG type formula editor",
   "main": "dist/formula-editor/src/formula-builder.js",
   "publishConfig": {
@@ -25,5 +25,5 @@
     "@types/big.js": "^6.1.6",
     "es-dev-server": "^2.1.0"
   },
-  "gitHead": "1ad6ff3dc89bf4bea2547f4170744d95f0044ff9"
+  "gitHead": "7784664827845580650e4c671969aab0071aa0f6"
 }