fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 06:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

DrawerResults → SearchResults + SearchResultsContainer

Browse source
This commit is contained in:
Thibaut Girka 2019-04-20 19:18:26 +02:00 committed by ThibG
parent 67771e6d65
commit 149aa07409
3 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/javascript/flavours/glitch/features/compose/results/index.js → app/javascript/flavours/glitch/features/compose/components/search_results.js
View file

@ -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,

8
app/javascript/flavours/glitch/features/compose/containers/search_results_container.js Normal file
View file

@ -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);

13
app/javascript/flavours/glitch/features/compose/index.js
View file

@ -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>