Disabled auto focus on toot form when search results are shown. (#2942)

2017-05-10 09:51:43 +09:00
parent 682507bc3c
commit 29d8313b28
3 changed files with 17 additions and 5 deletions
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@ -22,7 +22,8 @@ const mapStateToProps = state => ({
  preselectDate: state.getIn(['compose', 'preselectDate']),
  is_submitting: state.getIn(['compose', 'is_submitting']),
  is_uploading: state.getIn(['compose', 'is_uploading']),
-  me: state.getIn(['compose', 'me'])
+  me: state.getIn(['compose', 'me']),
+  showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden'])
 });

 const mapDispatchToProps = (dispatch) => ({