Progress

app/javascript/gabsocial/features/compose/components/compose_search/compose_search.js

@@ -1,69 +0,0 @@
-import { defineMessages, injectIntl } from 'react-intl';
-import Search from '../../../../components/search';
-
-const messages = defineMessages({
-  placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
-});
-
-export default @injectIntl
-class ComposeSearch extends PureComponent {
-
-  static contextTypes = {
-    router: PropTypes.object.isRequired,
-  };
-
-  static propTypes = {
-    value: PropTypes.string.isRequired,
-    submitted: PropTypes.bool,
-    onChange: PropTypes.func.isRequired,
-    onSubmit: PropTypes.func.isRequired,
-    onClear: PropTypes.func.isRequired,
-    onShow: PropTypes.func.isRequired,
-    openInRoute: PropTypes.bool,
-    intl: PropTypes.object.isRequired,
-  };
-
-  handleChange = (e) => {
-    this.props.onChange(e.target.value);
-  }
-
-  handleClear = (e) => {
-    e.preventDefault();
-
-    if (this.props.value.length > 0 || this.props.submitted) {
-      this.props.onClear();
-    }
-  }
-
-  handleKeyUp = (e) => {
-    if (e.key === 'Enter') {
-      e.preventDefault();
-
-      this.props.onSubmit();
-
-      if (this.props.openInRoute) {
-        this.context.router.history.push('/search');
-      }
-    } else if (e.key === 'Escape') {
-      document.querySelector('.ui').parentElement.focus();
-    }
-  }
-
-  render () {
-    const { intl, value, onShow, openInRoute } = this.props;
-
-    return (
-      <Search
-        value={value}
-        placeholder={intl.formatMessage(messages.placeholder)}
-        onChange={this.handleChange}
-        onKeyUp={this.handleKeyUp}
-        handleClear={this.handleClear}
-        onShow={onShow}
-        withOverlay
-        openInRoute
-      />
-    )
-  }
-
-}

app/javascript/gabsocial/features/compose/components/compose_search/index.js

@@ -1 +0,0 @@
-export { default } from './compose_search';

app/javascript/gabsocial/features/compose/components/search_results/search_results.js

@@ -1,7 +1,7 @@
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage } from 'react-intl';
-import TrendingItem from '../../../../components/trending_item';
+import TrendingItem from '../../../../components/trends_panel_item';
 import Icon from '../../../../components/icon';
 import { WhoToFollowPanel } from '../../../../components/panel';
 // import TrendsPanel from '../../ui/components/trends_panel';

app/javascript/gabsocial/features/compose/compose.js

@@ -10,7 +10,7 @@ import {
 import { mascot } from '../../initial_state';
 import Motion from '../ui/util/optional_motion';
 import ComposeFormContainer from './containers/compose_form_container';
-import SearchContainer from './containers/search_container';
+// import SearchContainer from './containers/search_container';
 import SearchResultsContainer from './containers/search_results_container';
 import NavigationBar from './components/navigation_bar';
 import elephantUIPlane from '../../../images/logo_ui_column_footer.png';
@@ -76,7 +76,7 @@ class Compose extends ImmutablePureComponent {
       <div className='drawer' role='region' aria-label={intl.formatMessage(messages.compose)}>
         {header}
 
-        {isSearchPage && <SearchContainer /> }
+        { /* isSearchPage && <SearchContainer /> */ }
 
         <div className='drawer__pager'>
           {!isSearchPage && <div className='drawer__inner' onFocus={this.onFocus}>

app/javascript/gabsocial/features/compose/containers/search_container.js

@@ -1,34 +0,0 @@
-import {
-  changeSearch,
-  clearSearch,
-  submitSearch,
-  showSearch,
-} from '../../../actions/search';
-import ComposeSearch from '../components/compose_search';
-
-const mapStateToProps = state => ({
-  value: state.getIn(['search', 'value']),
-  submitted: state.getIn(['search', 'submitted']),
-});
-
-const mapDispatchToProps = dispatch => ({
-
-  onChange (value) {
-    dispatch(changeSearch(value));
-  },
-
-  onClear () {
-    dispatch(clearSearch());
-  },
-
-  onSubmit () {
-    dispatch(submitSearch());
-  },
-
-  onShow () {
-    dispatch(showSearch());
-  },
-
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(ComposeSearch);