From 994a0c2c6a704678c867b07ae23dc3b274df7589 Mon Sep 17 00:00:00 2001
From: Eryn Lynn <eryn@eryn.io>
Date: Tue, 10 Sep 2019 03:46:03 -0400
Subject: [PATCH 1/6] Add support for search hotkeys

---
 packages/@vuepress/plugin-search/SearchBox.vue | 10 ++++++++++
 packages/@vuepress/plugin-search/index.js      |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/@vuepress/plugin-search/SearchBox.vue b/packages/@vuepress/plugin-search/SearchBox.vue
index 6fbbd70b3e..f329a3f814 100644
--- a/packages/@vuepress/plugin-search/SearchBox.vue
+++ b/packages/@vuepress/plugin-search/SearchBox.vue
@@ -12,6 +12,7 @@
       @keyup.enter="go(focusIndex)"
       @keyup.up="onUp"
       @keyup.down="onDown"
+      ref="input"
     >
     <ul
       class="suggestions"
@@ -46,6 +47,15 @@ export default {
     }
   },
 
+  created () {
+    document.addEventListener('keydown', event => {
+      if (event.srcElement === document.body && SEARCH_HOTKEYS.includes(event.key)) {
+        this.$refs.input.focus()
+        event.preventDefault()
+      }
+    })
+  },
+
   computed: {
     showSuggestions () {
       return (
diff --git a/packages/@vuepress/plugin-search/index.js b/packages/@vuepress/plugin-search/index.js
index 54ea02398b..ee280ac72c 100644
--- a/packages/@vuepress/plugin-search/index.js
+++ b/packages/@vuepress/plugin-search/index.js
@@ -8,6 +8,7 @@ module.exports = (options) => ({
 
   define: {
     SEARCH_MAX_SUGGESTIONS: options.searchMaxSuggestions || 5,
-    SEARCH_PATHS: options.test || null
+    SEARCH_PATHS: options.test || null,
+    SEARCH_HOTKEYS: options.searchHotkeys || ['s', '/']
   }
 })

From ba2c74e38d8f5ed64e0976cd5965f5ca3db6f6c9 Mon Sep 17 00:00:00 2001
From: Eryn Lynn <eryn@eryn.io>
Date: Tue, 10 Sep 2019 03:57:59 -0400
Subject: [PATCH 2/6] Add documentation

---
 packages/docs/docs/plugin/official/plugin-search.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/docs/docs/plugin/official/plugin-search.md b/packages/docs/docs/plugin/official/plugin-search.md
index b9e14566aa..f490ed98e3 100644
--- a/packages/docs/docs/plugin/official/plugin-search.md
+++ b/packages/docs/docs/plugin/official/plugin-search.md
@@ -95,6 +95,13 @@ You can set up searchable paths with `test` as:
 
 Otherwise,  the default search will return duplicates, once you can have similar content between folders `/master/`, `/1.0/` and `/2.0/`.
 
+### searchHotkeys
+
+- Type: `Array<string>`
+- Default: `['s', '/']`
+
+Configure the hotkeys which when pressed will focus the search box. Set to an empty array to disable this feature.
+
 ## Tips
 
 ### Tweak the default colors.

From 1c45f7c2ca3c5d7c0a084afa24eb0dc0d07ed7f1 Mon Sep 17 00:00:00 2001
From: Eryn Lynn <eryn@eryn.io>
Date: Tue, 10 Sep 2019 04:01:35 -0400
Subject: [PATCH 3/6] Fix lint error

---
 packages/@vuepress/plugin-search/SearchBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/plugin-search/SearchBox.vue b/packages/@vuepress/plugin-search/SearchBox.vue
index f329a3f814..eee19b63b9 100644
--- a/packages/@vuepress/plugin-search/SearchBox.vue
+++ b/packages/@vuepress/plugin-search/SearchBox.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-/* global SEARCH_MAX_SUGGESTIONS, SEARCH_PATHS */
+/* global SEARCH_MAX_SUGGESTIONS, SEARCH_PATHS, SEARCH_HOTKEYS */
 export default {
   data () {
     return {

From 1faf451475c8a7aca9ca509df8a41a33efa1b5a7 Mon Sep 17 00:00:00 2001
From: Eryn Lynn <eryn@eryn.io>
Date: Tue, 10 Sep 2019 04:12:59 -0400
Subject: [PATCH 4/6] Use mounted instead of created for ssr

---
 packages/@vuepress/plugin-search/SearchBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/plugin-search/SearchBox.vue b/packages/@vuepress/plugin-search/SearchBox.vue
index eee19b63b9..0766fb8e47 100644
--- a/packages/@vuepress/plugin-search/SearchBox.vue
+++ b/packages/@vuepress/plugin-search/SearchBox.vue
@@ -47,7 +47,7 @@ export default {
     }
   },
 
-  created () {
+  mounted () {
     document.addEventListener('keydown', event => {
       if (event.srcElement === document.body && SEARCH_HOTKEYS.includes(event.key)) {
         this.$refs.input.focus()

From 480241646ef2431ff8a86bbed0f492345527a12c Mon Sep 17 00:00:00 2001
From: Eryn Lynn <eryn@eryn.io>
Date: Wed, 11 Sep 2019 11:30:01 -0400
Subject: [PATCH 5/6] Remove event listener on Destroy

---
 .../@vuepress/plugin-search/SearchBox.vue     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/@vuepress/plugin-search/SearchBox.vue b/packages/@vuepress/plugin-search/SearchBox.vue
index 8d18e04c9f..b867ec034d 100644
--- a/packages/@vuepress/plugin-search/SearchBox.vue
+++ b/packages/@vuepress/plugin-search/SearchBox.vue
@@ -51,12 +51,11 @@ export default {
 
   mounted () {
     this.placeholder = this.$site.themeConfig.searchPlaceholder || ''
-    document.addEventListener('keydown', event => {
-      if (event.srcElement === document.body && SEARCH_HOTKEYS.includes(event.key)) {
-        this.$refs.input.focus()
-        event.preventDefault()
-      }
-    })
+    document.addEventListener('keydown', this.onHotkey)
+  },
+
+  beforeDestroy () {
+    document.removeEventListener('keydown', this.onHotkey)
   },
 
   computed: {
@@ -78,7 +77,8 @@ export default {
       const max = SEARCH_MAX_SUGGESTIONS
       const localePath = this.$localePath
       const matches = item => (
-        item.title
+        item
+        && item.title
         && item.title.toLowerCase().indexOf(query) > -1
       )
       const res = []
@@ -142,6 +142,13 @@ export default {
       return searchPaths.filter(path => {
         return page.path.match(path)
       }).length > 0
+    }, 
+
+    onHotkey (event) {
+      if (event.srcElement === document.body && SEARCH_HOTKEYS.includes(event.key)) {
+        this.$refs.input.focus()
+        event.preventDefault()
+      }
     },
 
     onUp () {

From d88b6446a85ee5cad398451ea2503ec3225dbf60 Mon Sep 17 00:00:00 2001
From: Eryn Lynn <eryn@eryn.io>
Date: Wed, 11 Sep 2019 11:33:17 -0400
Subject: [PATCH 6/6] Fix style

---
 packages/@vuepress/plugin-search/SearchBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vuepress/plugin-search/SearchBox.vue b/packages/@vuepress/plugin-search/SearchBox.vue
index b867ec034d..0faa59cfc3 100644
--- a/packages/@vuepress/plugin-search/SearchBox.vue
+++ b/packages/@vuepress/plugin-search/SearchBox.vue
@@ -142,7 +142,7 @@ export default {
       return searchPaths.filter(path => {
         return page.path.match(path)
       }).length > 0
-    }, 
+    },
 
     onHotkey (event) {
       if (event.srcElement === document.body && SEARCH_HOTKEYS.includes(event.key)) {