@fw-components/formula-editor 2.0.7-formula-editor.12 → 2.0.7-formula-editor.14

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

@@ -185,6 +185,11 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         this._recommendations = null;
         this.requestUpdate();
     }
+    handleFocus(e) {
+        if (!this.content.trim()) {
+            this._recommendations = Array.from(this.variables.keys());
+        }
+    }
     render() {
         return html `
       <style>
@@ -206,6 +211,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
           @input=${this.handleChange}
           @keydown=${this.handleKeyboardEvents}
           @blur=${this.handleFocusOut}
+          @focus=${this.handleFocus}
         ></div>
       ${this._recommendations
             ? html ` <suggestion-menu

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

@@ -177,6 +177,11 @@ export class Parser {
             previousToken = token;
             currentTokens += token;
         });
+        if (recommendation) {
+            parseOutput.newCursorPosition = Math.min(parseOutput.newCursorPosition +
+                recommendation.length, formula.length + recommendation.length);
+            formattedString = `${formattedString}<span class="wysiwygInternals">${recommendation}</span>`;
+        }
         // If the formula ends with a mathematical operator, or has unclosed `(`
         if (this.mathematicalOperators.has(previousToken)) {
             // parseOutput.errorString = "Unexpected ending of formula.";
@@ -216,6 +221,7 @@ export class Parser {
                 parsedTokens.push(token);
             }
             previousToken = token;
+            currentTokens += token;
         }
         /**
          * Shunting Yard Algorithm (EW Dijkstra)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.12",
+  "version": "2.0.7-formula-editor.14",
   "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": "e4017600c11247faaed1b4cd6bad02bb86cad278"
+  "gitHead": "2dc58c17d6ead375305a45c5e254be86da0d81b3"
 }