@fw-components/formula-editor 2.0.7-formula-editor-enhancements.0 → 2.0.7-formula-editor-enhancements.2

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

@@ -74,7 +74,8 @@ let FormulaEditor = class FormulaEditor extends LitElement {
             this.parseInput(this._recommendations[0]);
         }
         else if (event.code === "ArrowDown" || event.code === "ArrowUp") {
-            event.preventDefault();
+            if (this._recommendations)
+                event.preventDefault();
             this.navigateRecommendations(event.code);
             this.requestUpdate();
         }

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

@@ -52,10 +52,15 @@ export class Parser {
         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));
+            let isNumber = token.trim() !== "" && (this.variables.has(token) || !Number.isNaN(Number(token)));
             let isOperator = this.mathematicalOperators.has(token);
             let isSpace = token.trim() == "";
             let isBracket = token == "(" || token == ")";
+            if (isSpace) {
+                formattedString = `${formattedString}${token}`;
+                currentPosition += token.length;
+                return;
+            }
             // If the cursor position is 'inside` the current token:
             //
             // 1. If we've got a recommendation to add, simply replace the
@@ -67,21 +72,26 @@ export class Parser {
                     // Since we are sure that the recommendation will always correspond
                     // to a variable.
                     isNumber = true;
-                    if (this.mathematicalOperators.has(token))
-                        recommendation = token + recommendation;
+                    if (this.mathematicalOperators.has(token)) {
+                        // append recommendation at the end if token is an operator
+                        const updatedTokenString = `${token} ${recommendation}`;
+                        formattedString += updatedTokenString;
+                        currentPosition += updatedTokenString.length;
+                        parseOutput.newCursorPosition = currentPosition;
+                        recommendation = null;
+                        return;
+                    }
+                    ;
                     // If the new cursor length somehow becomes larger than the
                     // length of the formula string, setting the caret to that
                     // length will move the caret to the start. Although this overflow
                     // won't happen, but still, this check prevents that.
-                    const updatedTokenLength = recommendation.length -
-                        (isSpace ? 0 : token.length);
+                    const updatedTokenLength = recommendation.length - token.length;
                     parseOutput.newCursorPosition = Math.min(parseOutput.newCursorPosition, formula.length) + updatedTokenLength;
-                    token = isSpace ? ` ${recommendation}` : recommendation;
+                    token = recommendation;
                     recommendation = null;
                 }
-                if (!isSpace)
-                    parseOutput.recommendations = this._recommender.getRecommendation(token);
-                previousToken = isSpace ? previousToken : token;
+                parseOutput.recommendations = this.mathematicalOperators.has(token) ? Array.from(this.variables.keys()) : this._recommender.getRecommendation(token);
             }
             let tokenClassName = "";
             // Don't check for errors if an error has already been encountered.
@@ -98,6 +108,7 @@ export class Parser {
                 // be an error if the formula ends with them.
                 else if (expectation == Expectation.VARIABLE &&
                     !isNumber &&
+                    !isSpace &&
                     token != "(" &&
                     !((token == "-" || token == "+") &&
                         (!currentTokens.trim() || this.mathematicalOperators.has(previousToken)))) {
@@ -109,13 +120,14 @@ export class Parser {
                 // Having a ) is fine. Eg: `23)` might be representing `(23 + 23)
                 else if (expectation == Expectation.OPERATOR &&
                     !isOperator &&
+                    !isSpace &&
                     token != ")") {
                     parseOutput.errorString = `Expected mathematical operator at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
                 }
                 // Unknown symbol/variable/word
-                else if (!(isNumber || isOperator || isBracket)) {
+                else if (!(isNumber || isOperator || isBracket || isSpace)) {
                     parseOutput.errorString = `Unknown word at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
@@ -148,7 +160,12 @@ export class Parser {
                     expectation = Expectation.OPERATOR;
                 }
             }
+            if (token == "(")
+                parentheses.push(currentPosition);
+            else if (token == ")")
+                parentheses.pop();
             formattedString = `${formattedString}${token}`;
+            previousToken = token;
             currentPosition += token.length;
             currentTokens += token;
         });

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

@@ -8,9 +8,8 @@ export const FormulaEditorStyles = css `
   }
 
   #wysiwyg-editor {
-    display: inline-block;
-    resize: vertical;
-    overflow-y: auto;
+    display: block;
+    resize: none;
     padding: var(--fe-padding, 4px);
     caret-color: var(--fe-caret-color, #fff);
     color: var(--fe-text-color, #f7f1ff);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor-enhancements.0",
+  "version": "2.0.7-formula-editor-enhancements.2",
   "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": "44b278fd46fea9fb963b5320e52e9c4d896a76da"
+  "gitHead": "d1d3c9cad9faf31d3ef0192c0c1d0f6604be41e2"
 }