Clear error in between terms and toggling (#649)

fbi-cde · Apr 3, 2017 · cdb2340 · cdb2340
1 parent 14a7a73
commit cdb2340
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/components/Glossary.js b/src/components/Glossary.js
@@ -27,11 +27,6 @@ class Glossary extends React.Component {
     this.applyProps(nextProps)
   }
 
-  shouldComponentUpdate(nextProps, nextState) {
-    if (nextState.error) return true
-    return false
-  }
-
   setOpen(isOpen) {
     if (isOpen) this.glossaryEl.show()
     else this.glossaryEl.hide()
@@ -40,9 +35,10 @@ class Glossary extends React.Component {
   showTerm(term) {
     if (!term) return
 
+    this.setState({ error: null })
+
     try {
       this.glossaryEl.findTerm(term.toLowerCase())
-      this.setState({ error: null })
     } catch (e) {
       if (e.message === 'Cannot read property \'elm\' of undefined') {
         this.setState({ error: `Cannot find "${term}".` })
@@ -53,7 +49,10 @@ class Glossary extends React.Component {
   applyProps(props) {
     const { isOpen, term } = props
     this.setOpen(isOpen)
-    if (term) this.showTerm(term)
+    if (term) {
+      this.setState({ error: null })
+      this.showTerm(term)
+    }
   }
 
   toggleGlossary() {