@fw-components/formula-editor 2.0.7-formula-editor.4 → 2.0.7-formula-editor.6

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

@@ -30,6 +30,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         this.currentCursorRect = undefined;
         this.lastInputType = "undef";
         this.content = "";
+        this.placeholder = "";
         this.variables = new Map();
         this.minSuggestionLen = 2;
         this.errorString = null;
@@ -176,6 +177,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
       </style>
         <div
           contenteditable
+          placeholder=${this.placeholder}
           id="wysiwyg-editor"
           spellcheck="false"
           autocomplete="off"
@@ -217,6 +219,9 @@ __decorate([
 __decorate([
     property()
 ], FormulaEditor.prototype, "content", void 0);
+__decorate([
+    property()
+], FormulaEditor.prototype, "placeholder", void 0);
 __decorate([
     property({
         type: (Map),

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

@@ -61,6 +61,9 @@ 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 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
@@ -80,7 +83,7 @@ export class Parser {
             if (expectation != Expectation.UNDEFINED) {
                 // Unnecessary closing parenthesis
                 if (parentheses.isEmpty() && token == ")") {
-                    parseOutput.errorString = `Unexpected ')' at pos: ${currentPosition}`;
+                    parseOutput.errorString = `Unexpected ')' at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
                 }
@@ -93,7 +96,7 @@ export class Parser {
                     token != "(" &&
                     !((token == "-" || token == "+") &&
                         this.mathematicalOperators.has(previousToken))) {
-                    parseOutput.errorString = `Expected variable/number at pos: ${currentPosition}`;
+                    parseOutput.errorString = `Expected variable/number at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
                 }
@@ -102,13 +105,13 @@ export class Parser {
                 else if (expectation == Expectation.OPERATOR &&
                     !isOperator &&
                     token != ")") {
-                    parseOutput.errorString = `Expected mathematical operator at pos: ${currentPosition}`;
+                    parseOutput.errorString = `Expected mathematical operator at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
                 }
                 // Unknown symbol/variable/word
                 else if (!(isNumber || isOperator || isBracket)) {
-                    parseOutput.errorString = `Unknown word at pos: ${currentPosition}`;
+                    parseOutput.errorString = `Unknown word at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
                 }
@@ -117,7 +120,7 @@ export class Parser {
                 else if (isNumber &&
                     previousToken == "/" &&
                     (this.variables.get(token) == 0 || Number(token) == 0)) {
-                    parseOutput.errorString = `Division by zero at pos: ${currentPosition}`;
+                    parseOutput.errorString = `Division by zero at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
                 }
@@ -162,7 +165,8 @@ export class Parser {
         });
         // If the formula ends with a mathematical operator, or has unclosed `(`
         if (this.mathematicalOperators.has(previousToken)) {
-            parseOutput.errorString = "Unexpected ending of formula.";
+            // parseOutput.errorString = "Unexpected ending of formula.";
+            parseOutput.recommendations = Array.from(this.variables.keys());
         }
         else if (!parentheses.isEmpty()) {
             parseOutput.errorString = `Unclosed '(' at position: ${parentheses.top()}`;

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

@@ -2,7 +2,7 @@ import { css } from "lit";
 export const FormulaEditorStyles = css `
   #wysiwyg-editor {
     display: inline-block;
-    padding: 4px;
+    padding: var(--fe-padding, 4px);
     caret-color: var(--fe-caret-color, #fff);
     color: var(--fe-text-color, #f7f1ff);
     line-height: 1.1;
@@ -15,9 +15,16 @@ export const FormulaEditorStyles = css `
     white-space: pre-wrap;
     background-color: var(--fe-background-color, #222222);
     margin: 0px;
+    box-sizing: border-box;
     /* position: relative; */
   }
 
+  #wysiwyg-editor:empty:before {
+  content: attr(placeholder);
+  color: var(--fe-placeholder-color,grey);
+  pointer-events: none;
+  }
+
   .wysiwygInternals.error {
     text-decoration: underline;
     -webkit-text-decoration-color: var(--fe-err-underline-color, #fc514f);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.4",
+  "version": "2.0.7-formula-editor.6",
   "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": "a4617735ec4ff4910bbfbce1b7e0c26fc6b55b02"
+  "gitHead": "dfd5a0d70498d8b9fc4d57253720e9b20e44c2b1"
 }