Key入力の動き改善

- Searchに内容がある時にEscを押すと内容をSearchの内容を削除する
- Cmd + Fを押すとSearch inputがfocusされる

Author: Rokt33r

browser/main/HomePage.js

@@ -34,7 +34,7 @@ class HomePage extends React.Component {
     let { nav, top, list, detail } = this.refs
 
     if (top.isInputFocused() && !e.metaKey) {
-      if (e.keyCode === 13 || e.keyCode === 27) top.blurInput()
+      if (e.keyCode === 13 || e.keyCode === 27) top.escape()
       return
     }
 
@@ -68,7 +68,7 @@ class HomePage extends React.Component {
         }
 
         // `detail`の`openDeleteConfirmMenu`が`true`なら呼ばれない。
-        if (e.keyCode === 27) {
+        if (e.keyCode === 27 || (e.keyCode === 70 && e.metaKey)) {
           top.focusInput()
         }
 

browser/main/HomePage/ArticleList.js

@@ -15,14 +15,17 @@ export default class ArticleList extends React.Component {
     clearInterval(this.refreshTimer)
   }
 
+  // 移動ができなかったらfalseを返す:
   selectPriorArticle () {
     let { articles, activeArticle, dispatch } = this.props
     let targetIndex = articles.indexOf(activeArticle) - 1
     let targetArticle = articles[targetIndex]
 
     if (targetArticle != null) {
       dispatch(switchArticle(targetArticle.key))
+      return true
     }
+    return false
   }
 
   selectNextArticle () {
@@ -32,7 +35,9 @@ export default class ArticleList extends React.Component {
 
     if (targetArticle != null) {
       dispatch(switchArticle(targetArticle.key))
+      return true
     }
+    return false
   }
 
   handleArticleClick (article) {

browser/main/HomePage/ArticleTopBar.js

@@ -1,13 +1,22 @@
 import React, { PropTypes } from 'react'
 import ReactDOM from 'react-dom'
 import ExternalLink from 'boost/components/ExternalLink'
-import { setSearchFilter } from 'boost/actions'
+import { setSearchFilter, clearSearch } from 'boost/actions'
 
 export default class ArticleTopBar extends React.Component {
   isInputFocused () {
     return document.activeElement === ReactDOM.findDOMNode(this.refs.searchInput)
   }
 
+  escape () {
+    let { status, dispatch } = this.props
+    if (status.search.length > 0) {
+      dispatch(clearSearch())
+      return
+    }
+    this.blurInput()
+  }
+
   focusInput () {
     ReactDOM.findDOMNode(this.refs.searchInput).focus()
   }