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

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

@@ -29,6 +29,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         this.currentCursorPosition = null;
         this.currentCursorRect = undefined;
         this.lastInputType = "undef";
+        this.isFocus = false;
         this.content = "";
         this.placeholder = "Type your formula...";
         this.variables = new Map();
@@ -181,10 +182,12 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         }
     }
     handleFocusOut(e) {
+        this.isFocus = false;
         this._recommendations = null;
         this.requestUpdate();
     }
     handleFocus(e) {
+        this.isFocus = true;
         if (!this.content.trim()) {
             this._recommendations = Array.from(this.variables.keys());
         }
@@ -212,7 +215,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
           @blur=${this.handleFocusOut}
           @focus=${this.handleFocus}
         ></div>
-      ${this._recommendations && this.currentCursorPosition
+      ${this._recommendations && this.isFocus
             ? html ` <suggestion-menu
               .recommendations=${this._recommendations}
               .currentSelection=${this._selectedRecommendation}
@@ -245,6 +248,9 @@ __decorate([
 __decorate([
     state()
 ], FormulaEditor.prototype, "_selectedRecommendation", void 0);
+__decorate([
+    state()
+], FormulaEditor.prototype, "isFocus", void 0);
 __decorate([
     property()
 ], FormulaEditor.prototype, "content", void 0);

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.split(/([-+(),*^/:?\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
@@ -49,7 +49,7 @@ export class Parser {
                 return parseOutput;
             }
         }
-        tokens.forEach((token) => {
+        tokens?.forEach((token) => {
             // It is a number is either it's in the defined variables, or
             // it's a valid number literal.
             let isNumber = this.variables.has(token) || !Number.isNaN(Number(token)), isOperator = this.mathematicalOperators.has(token), isSpace = token.trim() == "", isBracket = token == "(" || token == ")";
@@ -201,8 +201,8 @@ export class Parser {
             return null;
         }
         const tokens = formula
-            .split(/([-+(),*^/:?\s])/g)
-            .filter((el) => !/\s+/.test(el) && el !== "");
+            .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 = "";
         let carriedToken = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.16",
+  "version": "2.0.7-formula-editor.18",
   "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": "be12aca1478fe579ff329b62b0e504d33b16d72c"
+  "gitHead": "1ad6ff3dc89bf4bea2547f4170744d95f0044ff9"
 }