diff options
-rw-r--r-- | src/client/react/components/container/Search.js | 30 | ||||
-rw-r--r-- | src/client/react/components/container/Search.jsx (renamed from src/client/react/components/presentational/Search.jsx) | 30 |
2 files changed, 27 insertions, 33 deletions
diff --git a/src/client/react/components/container/Search.js b/src/client/react/components/container/Search.js deleted file mode 100644 index 4517191..0000000 --- a/src/client/react/components/container/Search.js +++ /dev/null @@ -1,30 +0,0 @@ -import { connect } from 'react-redux'; -import { inputChange, focusChange } from '../../actions/search'; -import PresentationalSearch from '../presentational/Search'; - -const mapStateToProps = state => ({ - results: state.search.results, - value: state.search.input, - hasFocus: state.search.hasFocus, - exactMatch: state.search.exactMatch, -}); - -const mapDispatchToProps = dispatch => ({ - onInputChange: (event) => { - dispatch(inputChange(event.target.value)); - }, - onFocus: () => { - dispatch(focusChange(true)); - document.querySelector('#search__input').select(); - }, - onBlur: () => { - dispatch(focusChange(false)); - }, -}); - -const Search = connect( - mapStateToProps, - mapDispatchToProps, -)(PresentationalSearch); - -export default Search; diff --git a/src/client/react/components/presentational/Search.jsx b/src/client/react/components/container/Search.jsx index 096cdf3..7a2822f 100644 --- a/src/client/react/components/presentational/Search.jsx +++ b/src/client/react/components/container/Search.jsx @@ -1,10 +1,14 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { connect } from 'react-redux'; import classnames from 'classnames'; + import SearchIcon from 'react-icons/lib/md/search'; -import IconFromUserType from './IconFromUserType'; -import Result from './Result'; +import { inputChange, focusChange } from '../../actions/search'; + +import IconFromUserType from '../presentational/IconFromUserType'; +import Result from '../presentational/Result'; const userShape = { value: PropTypes.string.isRequired, @@ -58,4 +62,24 @@ Search.defaultProps = { exactMatch: null, }; -export default Search; +const mapStateToProps = state => ({ + results: state.search.results, + value: state.search.input, + hasFocus: state.search.hasFocus, + exactMatch: state.search.exactMatch, +}); + +const mapDispatchToProps = dispatch => ({ + onInputChange: (event) => { + dispatch(inputChange(event.target.value)); + }, + onFocus: () => { + dispatch(focusChange(true)); + document.querySelector('#search__input').select(); + }, + onBlur: () => { + dispatch(focusChange(false)); + }, +}); + +export default connect(mapStateToProps, mapDispatchToProps)(Search); |