fixed issue raised when className was added #49

devuxd · Nov 6, 2023 · e0111ff · e0111ff
1 parent 2dcaa87
commit e0111ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/ui/RulePad/rulePad.js b/src/ui/RulePad/rulePad.js
@@ -348,6 +348,8 @@ class RulePad extends Component {
             autoCompleteArray: []
         };
 
+        this.shouldUpdate = true;
+
         // existing rule
         if (this.ruleIndex >= 0) {
             let indices = props.rules.map(d => d.index);
@@ -658,8 +660,8 @@ class RulePad extends Component {
                                            });
                                    }}
                                onUpdate={(newAutoCompleteText) => {
-                                       if (this.state.autoCompleteArray.map(d => d.text).join(" ") !== newAutoCompleteText
-                                           || this.state.constraintXPath === "" || this.state.quantifierXPath === "") {
+                                       if (this.shouldUpdate) {
+                                           this.shouldUpdate = false;
                                            verifyTextBasedOnGrammar(newAutoCompleteText)
                                                .then((data) => {
                                                    if (this.state.quantifierXPath !== data.quantifierXPath || this.state.constraintXPath !== data.constraintXPath) {
@@ -1121,6 +1123,13 @@ class RulePad extends Component {
         this._mounted = false
     }
 
+    componentDidUpdate(prevProps, prevState) {
+        if (prevState.autoCompleteArray.map(d => d.text).join(" ") !==
+            this.state.autoCompleteArray.map(d => d.text).join(" ")) {
+            this.shouldUpdate = true;
+        }
+    }
+
 
     /**
      * Match nextProps.sentMessages and nextProps.receivedMessages using messageIDs, update XPaths

diff --git a/src/ui/RulePad/rulePadTextualEditor/generateGuiTree.js b/src/ui/RulePad/rulePadTextualEditor/generateGuiTree.js
@@ -174,7 +174,7 @@ const traverseNormalNode = (treeNode, isConstraint = false) => {
     // context nodes
     let keywords = grammar_keywords.slice().map(w => pluralize(w).split(" ").map(a => a.charAt(0).toUpperCase() + a.slice(1)).join(""));
     // ClassNames is not included Grammar keywords
-    keywords.push("ClassNames");
+
     if (keywords.indexOf(treeNode.nodeType.replace("Context", "")) !== -1) {
         let nodeKey = treeNode.nodeType.replace("Context", "")
             .replace("ClassNames", "Names");
@@ -267,6 +267,7 @@ const traverseExpressionNode = (ExpressionNode, isConstraint) => {
     let setIsConstraint = ExpressionNode.isConstraint || isConstraint;
     // context nodes
     let keywords = grammar_keywords.slice().map(w => pluralize(w).split(" ").map(a => a.charAt(0).toUpperCase() + a.slice(1)).join(""));
+    keywords.push("ClassNames");
 
     if (ExpressionNode.children) {
         ExpressionNode.children.forEach(child => {