@fw-components/formula-editor 2.0.7-formula-editor.7 → 2.0.7-formula-editor.9

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

@@ -30,7 +30,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         this.currentCursorRect = undefined;
         this.lastInputType = "undef";
         this.content = "";
-        this.placeholder = "";
+        this.placeholder = "Type your formula...";
         this.variables = new Map();
         this.minSuggestionLen = 2;
         this.errorString = null;
@@ -170,6 +170,13 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         this._recommendations = null;
         this.requestUpdate();
     }
+    async updated(_changedProperties) {
+        if (_changedProperties.has("content")) {
+            if (!this.content.trim()) {
+                this._recommendations = Array.from(this.variables.keys());
+            }
+        }
+    }
     render() {
         return html `
       <style>

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

@@ -28,6 +28,7 @@ export class Parser {
         let currentPosition = 0;
         // Previous 'token' (not a space or a new line) that we just encountered.
         let previousToken = "";
+        let currentTokens = "";
         // The object that we return as the output of the parsing result.
         let parseOutput = {
             recommendations: null,
@@ -36,6 +37,18 @@ export class Parser {
             newCursorPosition: prevCurPos ?? -1,
             errorString: null,
         };
+        if (!formula.trim()) {
+            if (recommendation) {
+                formattedString = `<span class="wysiwygInternals">${recommendation}</span>`;
+                currentPosition += recommendation.length;
+                const parser = new DOMParser();
+                const doc = parser.parseFromString(formattedString, "text/html");
+                parseOutput.formattedContent = doc.querySelector("body");
+                parseOutput.formattedString = formattedString;
+                parseOutput.newCursorPosition = recommendation.length;
+                return parseOutput;
+            }
+        }
         tokens.forEach((token) => {
             // It is a number is either it's in the defined variables, or
             // it's a valid number literal.
@@ -95,7 +108,7 @@ export class Parser {
                     !isNumber &&
                     token != "(" &&
                     !((token == "-" || token == "+") &&
-                        (this.mathematicalOperators.has(previousToken) || previousToken === ""))) {
+                        (!currentTokens.trim() || this.mathematicalOperators.has(previousToken)))) {
                     parseOutput.errorString = `Expected variable/number at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
@@ -162,6 +175,7 @@ export class Parser {
             formattedString = `${formattedString}<span class="wysiwygInternals ${tokenClassName}">${token}</span>`;
             currentPosition += token.length;
             previousToken = token;
+            currentTokens += token;
         });
         // If the formula ends with a mathematical operator, or has unclosed `(`
         if (this.mathematicalOperators.has(previousToken)) {
@@ -188,11 +202,10 @@ export class Parser {
         let previousToken = "";
         let carriedToken = null;
         const parsedTokens = [];
+        let currentTokens = "";
         for (const token of tokens) {
             if ((token == "+" || token == "-") &&
-                (this.mathematicalOperators.has(previousToken) ||
-                    previousToken === "" ||
-                    previousToken === "(")) {
+                (!currentTokens.trim() || this.mathematicalOperators.has(previousToken))) {
                 carriedToken = token;
             }
             else if (carriedToken) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.7",
+  "version": "2.0.7-formula-editor.9",
   "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": "c4519eefc65b67e7e8ce4d6c3e942d55c5f3c5d4"
+  "gitHead": "8ec9bb1e89c289c5334db8f99d1a359c731a4375"
 }