Merge pull request #305 from FluxNotes/context-search-fix

Fixed bug where search bar would disappear if returned no results
FluxNotes · Mar 29, 2018 · 99f7c51 · 99f7c51
2 parents e6cc2f2 + efa7551
commit 99f7c51
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/context/ContextOptions.jsx b/src/context/ContextOptions.jsx
@@ -12,7 +12,7 @@ export default class ContextOptions extends Component {
         super(props);
 
         this.state = {
-            searchString: "",
+            searchString: '',
             tooltipVisibility: 'visible'
         }
     }
@@ -51,13 +51,15 @@ export default class ContextOptions extends Component {
                 count++;
             });
         });
+        const countBeforeSearch = count;
 
         // enable filter?
         const showFilter = (count > 10);
 
         // build our list of filtered triggers (only filter if we will be showing search bar)
         let triggers = [];
         count = 0;
+
         validShortcuts.forEach((shortcut, i) => {
             let groupName = this.props.shortcutManager.getShortcutGroupName(shortcut);
             this.props.shortcutManager.getTriggersForShortcut(shortcut, context).forEach((trigger, j) => {
@@ -90,7 +92,7 @@ export default class ContextOptions extends Component {
             }
         });
 
-        if (totalShown === 0) {
+        if (!showFilter && totalShown === 0) {
             return null;
         }
 
@@ -102,7 +104,7 @@ export default class ContextOptions extends Component {
                     <div className="shortcut-search-container">
                         <div className="shortcut-search-title">
                             <div>Filter:</div>
-                            <div className="count">(showing {totalShown} of {count})</div>
+                            <div className="count">(showing {totalShown} of {countBeforeSearch})</div>
                         </div>
 
                         <TextField