Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
fusshi- 2017-05-10 09:51:43 +09:00 • committed by Eugen Rochko
parent 682507bc3c
commit 29d8313b28
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/javascript/mastodon/features/compose/components/compose_form.js
View file

@ -118,7 +118,7 @@ class ComposeForm extends ImmutablePureComponent {
}
render () {
const { intl, onPaste } = this.props;
const { intl, onPaste, showSearch } = this.props;
const disabled = this.props.is_submitting;
const text = [this.props.spoiler_text, this.props.text].join('');
@ -156,6 +156,7 @@ class ComposeForm extends ImmutablePureComponent {
onSuggestionsClearRequested={this.onSuggestionsClearRequested}
onSuggestionSelected={this.onSuggestionSelected}
onPaste={onPaste}
autoFocus={!showSearch}
/>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
@ -204,7 +205,12 @@ ComposeForm.propTypes = {
onSuggestionSelected: PropTypes.func.isRequired,
onChangeSpoilerText: PropTypes.func.isRequired,
onPaste: PropTypes.func.isRequired,
onPickEmoji: PropTypes.func.isRequired
onPickEmoji: PropTypes.func.isRequired,
showSearch: PropTypes.bool,
};
ComposeForm.defaultProps = {
showSearch: false
};
export default injectIntl(ComposeForm);

3
app/javascript/mastodon/features/compose/containers/compose_form_container.js
View file

@ -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) => ({