@fw-components/formula-editor 2.0.7-formula-editor.0 → 2.0.7-formula-editor.1

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

@@ -146,6 +146,9 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         this.requestUpdate();
     }
     requestFormat() {
+        if (!Boolean(this.content)) {
+            return;
+        }
         this.content = this._parser.addParentheses(this.content) ?? this.content;
         this.parseInput();
         this._recommendations = null;
@@ -156,14 +159,14 @@ let FormulaEditor = class FormulaEditor extends LitElement {
       <style>
         ${FormulaEditorStyles}
       </style>
-      <div
-        contenteditable
-        id="wysiwyg-editor"
-        spellcheck="false"
-        autocomplete="off"
-        @input=${this.handleChange}
-        @keydown=${this.handleKeyboardEvents}
-      ></div>
+        <div
+          contenteditable
+          id="wysiwyg-editor"
+          spellcheck="false"
+          autocomplete="off"
+          @input=${this.handleChange}
+          @keydown=${this.handleKeyboardEvents}
+        ></div>
       ${this._recommendations
             ? html ` <suggestion-menu
             style="
@@ -176,10 +179,10 @@ let FormulaEditor = class FormulaEditor extends LitElement {
                 window.scrollY +
                 "px"};
             "
-            .recommendations=${this._recommendations}
-            .currentSelection=${this._selectedRecommendation}
-            .onClickRecommendation=${(e) => this.onClickRecommendation(e)}
-          ></suggestion-menu>`
+              .recommendations=${this._recommendations}
+              .currentSelection=${this._selectedRecommendation}
+              .onClickRecommendation=${(e) => this.onClickRecommendation(e)}
+            ></suggestion-menu>`
             : html ``}
       <p>${this._calculatedResult}</p>
     `;

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

@@ -75,7 +75,6 @@ export class Parser {
                 // Fetch recommendations nonetheless.
                 parseOutput.recommendations =
                     this._recommender.getRecommendation(token);
-                console.log(parseOutput.recommendations);
             }
             let tokenClassName = "";
             // Don't check for errors if an error has already been encountered.

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

@@ -1,67 +1,20 @@
+import { Fzf } from 'fzf';
 export class Recommender {
     constructor(variables, minSuggestionLen) {
-        this._mininumSuggestionLength = minSuggestionLen > 0 ? minSuggestionLen : 1;
-        this._trie = new TrieNode();
-        for (let variable of variables) {
-            this.insert(variable[0]);
-        }
-    }
-    insert(word, position = -1, node = undefined) {
-        if (position == -1) {
-            this.insert(word, 0, this._trie);
-            return;
-        }
-        if (position == word.length) {
-            node?.addChild("\0");
-            return;
-        }
-        if (!node.getChild(word[position])) {
-            node?.addChild(word[position]);
-        }
-        this.insert(word, position + 1, node.getChild(word[position]));
+        this._minimumSuggestionLength = minSuggestionLen > 0 ? minSuggestionLen : 1;
+        const variableList = Array.from(variables.keys());
+        this._fzf = new Fzf(variableList);
     }
     getRecommendation(word) {
-        if (word.length < this._mininumSuggestionLength) {
-            return null;
-        }
-        let recommendations = [];
-        let currentPosition = 0;
-        let currentNode = this._trie;
-        while (currentNode && currentPosition < word.length) {
-            currentNode = currentNode.getChild(word[currentPosition]);
-            currentPosition++;
-        }
-        if (!currentNode) {
+        if (word.length < this._minimumSuggestionLength) {
             return null;
         }
-        this._traverseAndGet(recommendations, currentNode, word);
-        if (recommendations.length == 0 ||
-            (recommendations.length == 1 && recommendations[0] == word)) {
+        const entries = this._fzf.find(word);
+        const recommendations = entries.map(entry => entry.item);
+        if (recommendations.length === 0 ||
+            (recommendations.length === 1 && recommendations[0] === word)) {
             return null;
         }
         return recommendations;
     }
-    _traverseAndGet(recommendations, node, word, currentString = "") {
-        for (let child of node.children) {
-            if (child[0] == "\0") {
-                recommendations.push(word + currentString);
-                // return;
-            }
-            this._traverseAndGet(recommendations, child[1], word, currentString + child[0]);
-        }
-    }
-}
-class TrieNode {
-    constructor() {
-        this._children = new Map();
-    }
-    get children() {
-        return this._children;
-    }
-    getChild(char) {
-        return this._children.get(char);
-    }
-    addChild(char) {
-        this._children.set(char, new TrieNode());
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.0",
+  "version": "2.0.7-formula-editor.1",
   "description": "A WYSIWYG type formula editor",
   "main": "dist/formula-editor/src/formula-builder.js",
   "publishConfig": {
@@ -15,6 +15,7 @@
   "dependencies": {
     "@fw-components/styles": "^2.0.7-formula-editor.0",
     "big.js": "^6.2.1",
+    "fzf": "^0.5.2",
     "lit": "^2.1.2",
     "typescript": "^5.0.4"
   },
@@ -24,5 +25,5 @@
     "@types/big.js": "^6.1.6",
     "es-dev-server": "^2.1.0"
   },
-  "gitHead": "05f8378db753ed6edfd56b945162795de33ae0fe"
+  "gitHead": "ac3d8a9eb757e3b2b5001bd46e9e7003a323f46e"
 }