From 7abf53009ad4e3bb3d76dc8c3328dd7422a01742 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Fri, 26 May 2017 18:01:44 +0900
Subject: [PATCH 1/8] change search ux

---
 browser/main/NoteList/index.js |  69 ++++++++++++++++++++++
 browser/main/TopBar/index.js   | 105 +++------------------------------
 browser/main/index.js          |   1 +
 3 files changed, 77 insertions(+), 98 deletions(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index b296bc5a9..c8fafd1a2 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -212,6 +212,10 @@ class NoteList extends React.Component {
         .map((uniqueKey) => data.noteMap.get(uniqueKey))
     }
 
+    if (location.pathname.match(/\/searched/)) {
+      return this.getSearchNotes()
+    }
+
     let storageKey = params.storageKey
     let folderKey = params.folderKey
     let storage = data.storageMap.get(storageKey)
@@ -349,6 +353,71 @@ class NoteList extends React.Component {
     })
   }
 
+  getSearchNotes () {
+    let { data } = this.props
+    let search = document.getElementsByClassName('TopBar__control-search-input___browser-main-TopBar-')[0].childNodes[0].value
+    let notes = data.noteMap.map((note) => note)
+    if (search.trim().length === 0) return []
+    let searchBlocks = search.split(' ')
+    searchBlocks.forEach((block) => {
+      if (block.match(/^!#.+/)) {
+        let tag = block.match(/^!#(.+)/)[1]
+        let regExp = new RegExp(_.escapeRegExp(tag), 'i')
+        notes = notes
+          .filter((note) => {
+            if (!_.isArray(note.tags)) return false
+            return note.tags.some((_tag) => {
+              return _tag.match(regExp)
+            })
+          })
+      } else if (block.match(/^!.+/)) {
+        let block = block.match(/^!(.+)/)[1]
+        let regExp = new RegExp(_.escapeRegExp(block), 'i')
+        notes = notes.filter((note) => {
+          if (!_.isArray(note.tags) || !note.tags.some((_tag) => {
+            return _tag.match(regExp)
+          })) {
+            return true
+          }
+          if (note.type === 'SNIPPET_NOTE') {
+            return !note.description.match(regExp)
+          } else if (note.type === 'MARKDOWN_NOTE') {
+            return !note.content.match(regExp)
+          }
+          return false
+        })
+      } else if (block.match(/^#.+/)) {
+        let tag = block.match(/#(.+)/)[1]
+        let regExp = new RegExp(_.escapeRegExp(tag), 'i')
+        notes = notes
+          .filter((note) => {
+            if (!_.isArray(note.tags)) return false
+            return note.tags.some((_tag) => {
+              return _tag.match(regExp)
+            })
+          })
+      } else {
+        let regExp = new RegExp(_.escapeRegExp(block), 'i')
+        notes = notes.filter((note) => {
+          if (_.isArray(note.tags) && note.tags.some((_tag) => {
+            return _tag.match(regExp)
+          })) {
+            return true
+          }
+          if (note.type === 'SNIPPET_NOTE') {
+            return note.description.match(regExp)
+          } else if (note.type === 'MARKDOWN_NOTE') {
+            return note.content.match(regExp)
+          }
+          return false
+        })
+      }
+  })
+
+    return notes
+
+  }
+
   render () {
     let { location, notes, config } = this.props
     let sortFunc = config.sortBy === 'CREATED_AT'
diff --git a/browser/main/TopBar/index.js b/browser/main/TopBar/index.js
index 946c72427..0aca7a5d7 100644
--- a/browser/main/TopBar/index.js
+++ b/browser/main/TopBar/index.js
@@ -18,7 +18,7 @@ class TopBar extends React.Component {
     this.state = {
       search: '',
       searchOptions: [],
-      searchPopupOpen: false
+      isSearching: false
     }
 
     this.newNoteHandler = () => {
@@ -87,79 +87,17 @@ class TopBar extends React.Component {
   }
 
   handleSearchChange (e) {
+    let { router } = this.context
+    router.push('/searched')
     this.setState({
       search: this.refs.searchInput.value
     })
   }
 
-  getOptions () {
-    let { data } = this.props
-    let { search } = this.state
-    let notes = data.noteMap.map((note) => note)
-    if (search.trim().length === 0) return []
-    let searchBlocks = search.split(' ')
-    searchBlocks.forEach((block) => {
-      if (block.match(/^!#.+/)) {
-        let tag = block.match(/^!#(.+)/)[1]
-        let regExp = new RegExp(_.escapeRegExp(tag), 'i')
-        notes = notes
-          .filter((note) => {
-            if (!_.isArray(note.tags)) return false
-            return note.tags.some((_tag) => {
-              return _tag.match(regExp)
-            })
-          })
-      } else if (block.match(/^!.+/)) {
-        let block = block.match(/^!(.+)/)[1]
-        let regExp = new RegExp(_.escapeRegExp(block), 'i')
-        notes = notes.filter((note) => {
-          if (!_.isArray(note.tags) || !note.tags.some((_tag) => {
-            return _tag.match(regExp)
-          })) {
-            return true
-          }
-          if (note.type === 'SNIPPET_NOTE') {
-            return !note.description.match(regExp)
-          } else if (note.type === 'MARKDOWN_NOTE') {
-            return !note.content.match(regExp)
-          }
-          return false
-        })
-      } else if (block.match(/^#.+/)) {
-        let tag = block.match(/#(.+)/)[1]
-        let regExp = new RegExp(_.escapeRegExp(tag), 'i')
-        notes = notes
-          .filter((note) => {
-            if (!_.isArray(note.tags)) return false
-            return note.tags.some((_tag) => {
-              return _tag.match(regExp)
-            })
-          })
-      } else {
-        let regExp = new RegExp(_.escapeRegExp(block), 'i')
-        notes = notes.filter((note) => {
-          if (_.isArray(note.tags) && note.tags.some((_tag) => {
-            return _tag.match(regExp)
-          })) {
-            return true
-          }
-          if (note.type === 'SNIPPET_NOTE') {
-            return note.description.match(regExp)
-          } else if (note.type === 'MARKDOWN_NOTE') {
-            return note.content.match(regExp)
-          }
-          return false
-        })
-      }
-    })
-
-    return notes
-  }
-
   handleOptionClick (uniqueKey) {
     return (e) => {
       this.setState({
-        searchPopupOpen: false
+        isSearching: false
       }, () => {
         let { location } = this.props
         hashHistory.push({
@@ -174,7 +112,7 @@ class TopBar extends React.Component {
 
   handleSearchFocus (e) {
     this.setState({
-      searchPopupOpen: true
+      isSearching: true
     })
   }
   handleSearchBlur (e) {
@@ -191,7 +129,7 @@ class TopBar extends React.Component {
     }
     if (!isStillFocused) {
       this.setState({
-        searchPopupOpen: false
+        isSearching: false
       })
     }
   }
@@ -251,7 +189,7 @@ class TopBar extends React.Component {
   }
 
   handleOnSearchFocus () {
-    if (this.state.searchPopupOpen) {
+    if (this.state.isSearching) {
       this.refs.search.childNodes[0].blur()
     } else {
       this.refs.search.childNodes[0].focus()
@@ -260,27 +198,6 @@ class TopBar extends React.Component {
 
   render () {
     let { config, style, data } = this.props
-    let searchOptionList = this.getOptions()
-      .map((note) => {
-        let storage = data.storageMap.get(note.storage)
-        let folder = _.find(storage.folders, {key: note.folder})
-        return <div styleName='control-search-optionList-item'
-          key={note.storage + '-' + note.key}
-          onClick={(e) => this.handleOptionClick(note.storage + '-' + note.key)(e)}
-        >
-          <div styleName='control-search-optionList-item-folder'
-            style={{borderColor: folder.color}}>
-            {folder.name}
-            <span styleName='control-search-optionList-item-folder-surfix'>in {storage.name}</span>
-          </div>
-          {note.type === 'SNIPPET_NOTE'
-            ? <i styleName='control-search-optionList-item-type' className='fa fa-code' />
-            : <i styleName='control-search-optionList-item-type' className='fa fa-file-text-o' />
-          }&nbsp;
-          {note.title}
-        </div>
-      })
-
     return (
       <div className='TopBar'
         styleName={config.isSideNavFolded ? 'root--expanded' : 'root'}
@@ -302,14 +219,6 @@ class TopBar extends React.Component {
                 placeholder='Search'
                 type='text'
               />
-              {this.state.searchPopupOpen &&
-                <div styleName='control-search-optionList'>
-                  {searchOptionList.length > 0
-                    ? searchOptionList
-                    : <div styleName='control-search-optionList-empty'>Empty List</div>
-                  }
-                </div>
-              }
             </div>
             {this.state.search > 0 &&
               <button styleName='left-search-clearButton'
diff --git a/browser/main/index.js b/browser/main/index.js
index 68315a8d4..455913281 100644
--- a/browser/main/index.js
+++ b/browser/main/index.js
@@ -50,6 +50,7 @@ ReactDOM.render((
         <IndexRedirect to='/home' />
         <Route path='home' />
         <Route path='starred' />
+        <Route path='searched' />
         <Route path='storages'>
           <IndexRedirect to='/home' />
           <Route path=':storageKey'>

From e643443660068760c606827ad1565210e208278b Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Tue, 30 May 2017 18:27:57 +0900
Subject: [PATCH 2/8] split search function to module.

---
 browser/lib/search.js          | 62 +++++++++++++++++++++++++++++++
 browser/main/NoteList/index.js | 68 +---------------------------------
 2 files changed, 64 insertions(+), 66 deletions(-)
 create mode 100644 browser/lib/search.js

diff --git a/browser/lib/search.js b/browser/lib/search.js
new file mode 100644
index 000000000..38a1ef0ba
--- /dev/null
+++ b/browser/lib/search.js
@@ -0,0 +1,62 @@
+export default function searchFromNotes(data, search) {
+  let notes = data.noteMap.map((note) => note)
+  if (search.trim().length === 0) return []
+  let searchBlocks = search.split(' ')
+  searchBlocks.forEach((block) => {
+  if (block.match(/^!#.+/)) {
+    let tag = block.match(/^!#(.+)/)[1]
+    let regExp = new RegExp(_.escapeRegExp(tag), 'i')
+    notes = notes
+      .filter((note) => {
+        if (!_.isArray(note.tags)) return false
+          return note.tags.some((_tag) => {
+          return _tag.match(regExp)
+        })
+      })
+  } else if (block.match(/^!.+/)) {
+    let block = block.match(/^!(.+)/)[1]
+    let regExp = new RegExp(_.escapeRegExp(block), 'i')
+    notes = notes.filter((note) => {
+      if (!_.isArray(note.tags) || !note.tags.some((_tag) => {
+        return _tag.match(regExp)
+      })) {
+        return true
+      }
+      if (note.type === 'SNIPPET_NOTE') {
+        return !note.description.match(regExp)
+      } else if (note.type === 'MARKDOWN_NOTE') {
+        return !note.content.match(regExp)
+      }
+      return false
+    })
+  } else if (block.match(/^#.+/)) {
+    let tag = block.match(/#(.+)/)[1]
+    let regExp = new RegExp(_.escapeRegExp(tag), 'i')
+    notes = notes
+      .filter((note) => {
+        if (!_.isArray(note.tags)) return false
+        return note.tags.some((_tag) => {
+          return _tag.match(regExp)
+        })
+      })
+  } else {
+    let regExp = new RegExp(_.escapeRegExp(block), 'i')
+    notes = notes.filter((note) => {
+      if (_.isArray(note.tags) && note.tags.some((_tag) => {
+        return _tag.match(regExp)
+      })) {
+        return true
+      }
+      if (note.type === 'SNIPPET_NOTE') {
+        return note.description.match(regExp)
+      } else if (note.type === 'MARKDOWN_NOTE') {
+        return note.content.match(regExp)
+      }
+      return false
+    })
+  }
+})
+
+  return notes
+
+}
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index c8fafd1a2..59e50b996 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -8,6 +8,7 @@ import dataApi from 'browser/main/lib/dataApi'
 import ConfigManager from 'browser/main/lib/ConfigManager'
 import NoteItem from 'browser/components/NoteItem'
 import NoteItemSimple from 'browser/components/NoteItemSimple'
+import searchFromNotes from 'browser/lib/search'
 
 const { remote } = require('electron')
 const { Menu, MenuItem, dialog } = remote
@@ -213,7 +214,7 @@ class NoteList extends React.Component {
     }
 
     if (location.pathname.match(/\/searched/)) {
-      return this.getSearchNotes()
+      return searchFromNotes(this.props.data, document.getElementsByClassName('TopBar__control-search-input___browser-main-TopBar-')[0].childNodes[0].value)
     }
 
     let storageKey = params.storageKey
@@ -353,71 +354,6 @@ class NoteList extends React.Component {
     })
   }
 
-  getSearchNotes () {
-    let { data } = this.props
-    let search = document.getElementsByClassName('TopBar__control-search-input___browser-main-TopBar-')[0].childNodes[0].value
-    let notes = data.noteMap.map((note) => note)
-    if (search.trim().length === 0) return []
-    let searchBlocks = search.split(' ')
-    searchBlocks.forEach((block) => {
-      if (block.match(/^!#.+/)) {
-        let tag = block.match(/^!#(.+)/)[1]
-        let regExp = new RegExp(_.escapeRegExp(tag), 'i')
-        notes = notes
-          .filter((note) => {
-            if (!_.isArray(note.tags)) return false
-            return note.tags.some((_tag) => {
-              return _tag.match(regExp)
-            })
-          })
-      } else if (block.match(/^!.+/)) {
-        let block = block.match(/^!(.+)/)[1]
-        let regExp = new RegExp(_.escapeRegExp(block), 'i')
-        notes = notes.filter((note) => {
-          if (!_.isArray(note.tags) || !note.tags.some((_tag) => {
-            return _tag.match(regExp)
-          })) {
-            return true
-          }
-          if (note.type === 'SNIPPET_NOTE') {
-            return !note.description.match(regExp)
-          } else if (note.type === 'MARKDOWN_NOTE') {
-            return !note.content.match(regExp)
-          }
-          return false
-        })
-      } else if (block.match(/^#.+/)) {
-        let tag = block.match(/#(.+)/)[1]
-        let regExp = new RegExp(_.escapeRegExp(tag), 'i')
-        notes = notes
-          .filter((note) => {
-            if (!_.isArray(note.tags)) return false
-            return note.tags.some((_tag) => {
-              return _tag.match(regExp)
-            })
-          })
-      } else {
-        let regExp = new RegExp(_.escapeRegExp(block), 'i')
-        notes = notes.filter((note) => {
-          if (_.isArray(note.tags) && note.tags.some((_tag) => {
-            return _tag.match(regExp)
-          })) {
-            return true
-          }
-          if (note.type === 'SNIPPET_NOTE') {
-            return note.description.match(regExp)
-          } else if (note.type === 'MARKDOWN_NOTE') {
-            return note.content.match(regExp)
-          }
-          return false
-        })
-      }
-  })
-
-    return notes
-
-  }
-
   render () {
     let { location, notes, config } = this.props
     let sortFunc = config.sortBy === 'CREATED_AT'

From 2364348df47919a6fef7b7367e96a5c6a4b04341 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Tue, 30 May 2017 18:49:39 +0900
Subject: [PATCH 3/8] fix indent

---
 browser/lib/search.js | 98 +++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/browser/lib/search.js b/browser/lib/search.js
index 38a1ef0ba..ca1b5f48b 100644
--- a/browser/lib/search.js
+++ b/browser/lib/search.js
@@ -3,59 +3,59 @@ export default function searchFromNotes(data, search) {
   if (search.trim().length === 0) return []
   let searchBlocks = search.split(' ')
   searchBlocks.forEach((block) => {
-  if (block.match(/^!#.+/)) {
-    let tag = block.match(/^!#(.+)/)[1]
-    let regExp = new RegExp(_.escapeRegExp(tag), 'i')
-    notes = notes
-      .filter((note) => {
-        if (!_.isArray(note.tags)) return false
-          return note.tags.some((_tag) => {
-          return _tag.match(regExp)
+    if (block.match(/^!#.+/)) {
+      let tag = block.match(/^!#(.+)/)[1]
+      let regExp = new RegExp(_.escapeRegExp(tag), 'i')
+      notes = notes
+        .filter((note) => {
+          if (!_.isArray(note.tags)) return false
+            return note.tags.some((_tag) => {
+            return _tag.match(regExp)
+          })
         })
-      })
-  } else if (block.match(/^!.+/)) {
-    let block = block.match(/^!(.+)/)[1]
-    let regExp = new RegExp(_.escapeRegExp(block), 'i')
-    notes = notes.filter((note) => {
-      if (!_.isArray(note.tags) || !note.tags.some((_tag) => {
-        return _tag.match(regExp)
-      })) {
-        return true
-      }
-      if (note.type === 'SNIPPET_NOTE') {
-        return !note.description.match(regExp)
-      } else if (note.type === 'MARKDOWN_NOTE') {
-        return !note.content.match(regExp)
-      }
-      return false
-    })
-  } else if (block.match(/^#.+/)) {
-    let tag = block.match(/#(.+)/)[1]
-    let regExp = new RegExp(_.escapeRegExp(tag), 'i')
-    notes = notes
-      .filter((note) => {
-        if (!_.isArray(note.tags)) return false
-        return note.tags.some((_tag) => {
+    } else if (block.match(/^!.+/)) {
+      let block = block.match(/^!(.+)/)[1]
+      let regExp = new RegExp(_.escapeRegExp(block), 'i')
+      notes = notes.filter((note) => {
+        if (!_.isArray(note.tags) || !note.tags.some((_tag) => {
           return _tag.match(regExp)
+        })) {
+          return true
+        }
+        if (note.type === 'SNIPPET_NOTE') {
+          return !note.description.match(regExp)
+        } else if (note.type === 'MARKDOWN_NOTE') {
+          return !note.content.match(regExp)
+        }
+        return false
+      })
+    } else if (block.match(/^#.+/)) {
+      let tag = block.match(/#(.+)/)[1]
+      let regExp = new RegExp(_.escapeRegExp(tag), 'i')
+      notes = notes
+        .filter((note) => {
+          if (!_.isArray(note.tags)) return false
+          return note.tags.some((_tag) => {
+            return _tag.match(regExp)
+          })
         })
+    } else {
+      let regExp = new RegExp(_.escapeRegExp(block), 'i')
+      notes = notes.filter((note) => {
+        if (_.isArray(note.tags) && note.tags.some((_tag) => {
+          return _tag.match(regExp)
+        })) {
+          return true
+        }
+        if (note.type === 'SNIPPET_NOTE') {
+          return note.description.match(regExp)
+        } else if (note.type === 'MARKDOWN_NOTE') {
+          return note.content.match(regExp)
+        }
+        return false
       })
-  } else {
-    let regExp = new RegExp(_.escapeRegExp(block), 'i')
-    notes = notes.filter((note) => {
-      if (_.isArray(note.tags) && note.tags.some((_tag) => {
-        return _tag.match(regExp)
-      })) {
-        return true
-      }
-      if (note.type === 'SNIPPET_NOTE') {
-        return note.description.match(regExp)
-      } else if (note.type === 'MARKDOWN_NOTE') {
-        return note.content.match(regExp)
-      }
-      return false
-    })
-  }
-})
+    }
+  })
 
   return notes
 

From 10e75041e8c77cd1093b03b7d31fb70750b29b31 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Tue, 30 May 2017 18:54:13 +0900
Subject: [PATCH 4/8] add className 'searchInput'

---
 browser/main/NoteList/index.js | 2 +-
 browser/main/TopBar/index.js   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 59e50b996..dfe12a1a8 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -214,7 +214,7 @@ class NoteList extends React.Component {
     }
 
     if (location.pathname.match(/\/searched/)) {
-      return searchFromNotes(this.props.data, document.getElementsByClassName('TopBar__control-search-input___browser-main-TopBar-')[0].childNodes[0].value)
+      return searchFromNotes(this.props.data, document.getElementsByClassName('searchInput')[0].value)
     }
 
     let storageKey = params.storageKey
diff --git a/browser/main/TopBar/index.js b/browser/main/TopBar/index.js
index 0aca7a5d7..fd3edbbfc 100644
--- a/browser/main/TopBar/index.js
+++ b/browser/main/TopBar/index.js
@@ -218,6 +218,7 @@ class TopBar extends React.Component {
                 onChange={(e) => this.handleSearchChange(e)}
                 placeholder='Search'
                 type='text'
+                className='searchInput'
               />
             </div>
             {this.state.search > 0 &&

From 805c39e60c5e76b20fe667baaf0036f43ba1ed24 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Tue, 30 May 2017 22:16:27 +0900
Subject: [PATCH 5/8] refactor search function

---
 browser/lib/search.js | 83 +++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 51 deletions(-)

diff --git a/browser/lib/search.js b/browser/lib/search.js
index ca1b5f48b..3e4d0b21b 100644
--- a/browser/lib/search.js
+++ b/browser/lib/search.js
@@ -1,62 +1,43 @@
+import _ from 'lodash'
+
 export default function searchFromNotes(data, search) {
   let notes = data.noteMap.map((note) => note)
   if (search.trim().length === 0) return []
   let searchBlocks = search.split(' ')
   searchBlocks.forEach((block) => {
-    if (block.match(/^!#.+/)) {
-      let tag = block.match(/^!#(.+)/)[1]
-      let regExp = new RegExp(_.escapeRegExp(tag), 'i')
-      notes = notes
-        .filter((note) => {
-          if (!_.isArray(note.tags)) return false
-            return note.tags.some((_tag) => {
-            return _tag.match(regExp)
-          })
-        })
-    } else if (block.match(/^!.+/)) {
-      let block = block.match(/^!(.+)/)[1]
-      let regExp = new RegExp(_.escapeRegExp(block), 'i')
-      notes = notes.filter((note) => {
-        if (!_.isArray(note.tags) || !note.tags.some((_tag) => {
-          return _tag.match(regExp)
-        })) {
-          return true
-        }
-        if (note.type === 'SNIPPET_NOTE') {
-          return !note.description.match(regExp)
-        } else if (note.type === 'MARKDOWN_NOTE') {
-          return !note.content.match(regExp)
-        }
-        return false
-      })
-    } else if (block.match(/^#.+/)) {
-      let tag = block.match(/#(.+)/)[1]
-      let regExp = new RegExp(_.escapeRegExp(tag), 'i')
-      notes = notes
-        .filter((note) => {
-          if (!_.isArray(note.tags)) return false
-          return note.tags.some((_tag) => {
-            return _tag.match(regExp)
-          })
-        })
+    if (block.match(/^#.+/)) {
+      const tag = block.match(/#(.+)/)[1]
+      notes = findByTag(notes, tag)
     } else {
-      let regExp = new RegExp(_.escapeRegExp(block), 'i')
-      notes = notes.filter((note) => {
-        if (_.isArray(note.tags) && note.tags.some((_tag) => {
-          return _tag.match(regExp)
-        })) {
-          return true
-        }
-        if (note.type === 'SNIPPET_NOTE') {
-          return note.description.match(regExp)
-        } else if (note.type === 'MARKDOWN_NOTE') {
-          return note.content.match(regExp)
-        }
-        return false
-      })
+      notes = findByWord(notes, block)
     }
   })
-
   return notes
+}
 
+function findByTag(notes, tag) {
+  let regExp = new RegExp(_.escapeRegExp(tag), 'i')
+  return notes.filter((note) => {
+    if(!_.isArray(note.tags)) return false
+    return note.tags.some((_tag) => {
+      return _tag.match(regExp)
+    })
+  })
+}
+
+function findByWord(notes, block) {
+  let regExp = new RegExp(_.escapeRegExp(block), 'i')
+  return notes.filter((note) => {
+    if (_.isArray(note.tags) && note.tags.some((_tag) => {
+      return _tag.match(regExp)
+    })) {
+      return true
+    }
+    if (note.type === 'SNIPPET_NOTE') {
+      return note.description.match(regExp)
+    } else if (note.type === 'MARKDOWN_NOTE') {
+      return note.content.match(regExp)
+    }
+    return false
+  })
 }

From fc4c471a875977fd90ff17c96cd0eb0569243ace Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 31 May 2017 00:30:55 +0900
Subject: [PATCH 6/8] fix spacing for eslint

---
 browser/lib/search.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/lib/search.js b/browser/lib/search.js
index 3e4d0b21b..813eb667a 100644
--- a/browser/lib/search.js
+++ b/browser/lib/search.js
@@ -1,6 +1,6 @@
 import _ from 'lodash'
 
-export default function searchFromNotes(data, search) {
+export default function searchFromNotes(data, search){
   let notes = data.noteMap.map((note) => note)
   if (search.trim().length === 0) return []
   let searchBlocks = search.split(' ')
@@ -15,17 +15,17 @@ export default function searchFromNotes(data, search) {
   return notes
 }
 
-function findByTag(notes, tag) {
+function findByTag(notes, tag){
   let regExp = new RegExp(_.escapeRegExp(tag), 'i')
   return notes.filter((note) => {
-    if(!_.isArray(note.tags)) return false
+    if (!_.isArray(note.tags)) return false
     return note.tags.some((_tag) => {
       return _tag.match(regExp)
     })
   })
 }
 
-function findByWord(notes, block) {
+function findByWord(notes, block){
   let regExp = new RegExp(_.escapeRegExp(block), 'i')
   return notes.filter((note) => {
     if (_.isArray(note.tags) && note.tags.some((_tag) => {

From 290e6ab1709cc0e65bcece5858061134fcdd6cca Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 31 May 2017 20:49:34 +0900
Subject: [PATCH 7/8] change arg findByTag

---
 browser/lib/search.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/lib/search.js b/browser/lib/search.js
index 813eb667a..0a9505f30 100644
--- a/browser/lib/search.js
+++ b/browser/lib/search.js
@@ -6,8 +6,7 @@ export default function searchFromNotes(data, search){
   let searchBlocks = search.split(' ')
   searchBlocks.forEach((block) => {
     if (block.match(/^#.+/)) {
-      const tag = block.match(/#(.+)/)[1]
-      notes = findByTag(notes, tag)
+      notes = findByTag(notes, block)
     } else {
       notes = findByWord(notes, block)
     }
@@ -15,7 +14,8 @@ export default function searchFromNotes(data, search){
   return notes
 }
 
-function findByTag(notes, tag){
+function findByTag(notes, block){
+  const tag = block.match(/#(.+)/)[1]
   let regExp = new RegExp(_.escapeRegExp(tag), 'i')
   return notes.filter((note) => {
     if (!_.isArray(note.tags)) return false

From 9496ab88f7fac0a15ac387932feb8fcdd33b4746 Mon Sep 17 00:00:00 2001
From: Sosuke Suzuki <aosukeke@gmail.com>
Date: Wed, 31 May 2017 20:52:36 +0900
Subject: [PATCH 8/8] fix spacings

---
 browser/lib/search.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/lib/search.js b/browser/lib/search.js
index 0a9505f30..f119421be 100644
--- a/browser/lib/search.js
+++ b/browser/lib/search.js
@@ -1,6 +1,6 @@
 import _ from 'lodash'
 
-export default function searchFromNotes(data, search){
+export default function searchFromNotes (data, search) {
   let notes = data.noteMap.map((note) => note)
   if (search.trim().length === 0) return []
   let searchBlocks = search.split(' ')
@@ -14,7 +14,7 @@ export default function searchFromNotes(data, search){
   return notes
 }
 
-function findByTag(notes, block){
+function findByTag (notes, block) {
   const tag = block.match(/#(.+)/)[1]
   let regExp = new RegExp(_.escapeRegExp(tag), 'i')
   return notes.filter((note) => {
@@ -25,7 +25,7 @@ function findByTag(notes, block){
   })
 }
 
-function findByWord(notes, block){
+function findByWord (notes, block) {
   let regExp = new RegExp(_.escapeRegExp(block), 'i')
   return notes.filter((note) => {
     if (_.isArray(note.tags) && note.tags.some((_tag) => {