@fw-components/formula-editor 2.0.7-formula-editor.13 → 2.0.7-formula-editor.15

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

@@ -118,7 +118,6 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         this._recommendations = parseOutput.recommendations;
         this._formattedContent = parseOutput.formattedContent;
         this.errorString = parseOutput.errorString;
-        // console.log("this._recommendation",parseOutput)
         /**
          * Don't modify the text stream manually if the text is being composed,
          * unless the user manually chooses to do so by selecting a suggestion.
@@ -185,6 +184,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 +210,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.";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.13",
+  "version": "2.0.7-formula-editor.15",
   "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": "64b2664ee2da986636148d45c0d05bcf4c223886"
+  "gitHead": "c544f7013f65838c0ce25819898c444386fa5602"
 }