DrawerResults → SearchResults + SearchResultsContainer

diff --git a/app/javascript/flavours/glitch/features/compose/results/index.js b/app/javascript/flavours/glitch/features/compose/components/search_results.js
similarity index 93%
rename from app/javascript/flavours/glitch/features/compose/results/index.js
rename to app/javascript/flavours/glitch/features/compose/components/search_results.js
index 162d1491342159e46c202ded16b80c649e9f02e8..3d29675b43c9088df69463a134698cf184daf39a 100644 (file)
--- a/app/javascript/flavours/glitch/features/compose/results/index.js
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.js
@@ -1,21 +1,15 @@
-//  Package imports.
-import PropTypes from 'prop-types';
 import React from 'react';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { Link } from 'react-router-dom';
-
-//  Components.
-import Icon from 'flavours/glitch/components/icon';
 import AccountContainer from 'flavours/glitch/containers/account_container';
 import StatusContainer from 'flavours/glitch/containers/status_container';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import Hashtag from 'flavours/glitch/components/hashtag';
+import Icon from 'flavours/glitch/components/icon';
 
-//  Messages.
-//  The component.
 export default @injectIntl
-class DrawerResults extends ImmutablePureComponent {
+class SearchResults extends ImmutablePureComponent {
 
   static propTypes = {
     results: ImmutablePropTypes.map.isRequired,

diff --git a/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js b/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js
new file mode 100644 (file)
index 0000000..16d95d4
--- /dev/null
+++ b/app/javascript/flavours/glitch/features/compose/containers/search_results_container.js
@@ -0,0 +1,8 @@
+import { connect } from 'react-redux';
+import SearchResults from '../components/search_results';
+
+const mapStateToProps = state => ({
+  results: state.getIn(['search', 'results']),
+});
+
+export default connect(mapStateToProps)(SearchResults);

diff --git a/app/javascript/flavours/glitch/features/compose/index.js b/app/javascript/flavours/glitch/features/compose/index.js
index 6dc786c8bc54428d98b4a6175f294bfaa64d0247..0865a7ff91d97d6d2fb4a21589e4a4ad9bda0d28 100644 (file)
--- a/app/javascript/flavours/glitch/features/compose/index.js
+++ b/app/javascript/flavours/glitch/features/compose/index.js
@@ -14,8 +14,8 @@ import { cycleElefriendCompose } from 'flavours/glitch/actions/compose';
 import Composer from 'flavours/glitch/features/composer';
 import DrawerAccount from './account';
 import DrawerHeader from './header';
-import DrawerResults from './results';
 import SearchContainer from './containers/search_container';
+import SearchResultsContainer from './containers/search_results_container';
 import spring from 'react-motion/lib/spring';
 
 //  Utils.
@@ -32,9 +32,6 @@ const mapStateToProps = (state, ownProps) => ({
   account: state.getIn(['accounts', me]),
   columns: state.getIn(['settings', 'columns']),
   elefriend: state.getIn(['compose', 'elefriend']),
-  results: state.getIn(['search', 'results']),
-  searchHidden: state.getIn(['search', 'hidden']),
-  submitted: state.getIn(['search', 'submitted']),
   showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : ownProps.isSearchPage,
   unreadNotifications: state.getIn(['notifications', 'unread']),
   showNotificationsBadge: state.getIn(['local_settings', 'notifications', 'tab_badge']),
@@ -65,10 +62,7 @@ class Compose extends React.PureComponent {
     //  State props.
     account: ImmutablePropTypes.map,
     columns: ImmutablePropTypes.list,
-    results: ImmutablePropTypes.map,
     elefriend: PropTypes.number,
-    searchHidden: PropTypes.bool,
-    submitted: PropTypes.bool,
     unreadNotifications: PropTypes.number,
     showNotificationsBadge: PropTypes.bool,
 
@@ -87,9 +81,6 @@ class Compose extends React.PureComponent {
       multiColumn,
       onClickElefriend,
       onOpenSettings,
-      results,
-      searchHidden,
-      submitted,
       isSearchPage,
       unreadNotifications,
       showNotificationsBadge,
@@ -124,7 +115,7 @@ class Compose extends React.PureComponent {
           <Motion defaultStyle={{ x: isSearchPage ? 0 : -100 }} style={{ x: spring(showSearch || isSearchPage ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
             {({ x }) => (
               <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
-                <DrawerResults results={results} visible={submitted && !searchHidden} />
+                <SearchResultsContainer />
               </div>
             )}
           </Motion>