Rework DrawerResults to make them closer to upstream

This commit is contained in:
Thibaut Girka 2019-04-20 18:21:11 +02:00 committed by ThibG
parent ab3e8fc542
commit 67771e6d65
3 changed files with 70 additions and 109 deletions

View file

@ -16,10 +16,11 @@ import DrawerAccount from './account';
import DrawerHeader from './header'; import DrawerHeader from './header';
import DrawerResults from './results'; import DrawerResults from './results';
import SearchContainer from './containers/search_container'; import SearchContainer from './containers/search_container';
import spring from 'react-motion/lib/spring';
// Utils. // Utils.
import { me, mascot } from 'flavours/glitch/util/initial_state'; import { me, mascot } from 'flavours/glitch/util/initial_state';
import { wrap } from 'flavours/glitch/util/redux_helpers'; import Motion from 'flavours/glitch/util/optional_motion';
// Messages. // Messages.
const messages = defineMessages({ const messages = defineMessages({
@ -27,13 +28,14 @@ const messages = defineMessages({
}); });
// State mapping. // State mapping.
const mapStateToProps = state => ({ const mapStateToProps = (state, ownProps) => ({
account: state.getIn(['accounts', me]), account: state.getIn(['accounts', me]),
columns: state.getIn(['settings', 'columns']), columns: state.getIn(['settings', 'columns']),
elefriend: state.getIn(['compose', 'elefriend']), elefriend: state.getIn(['compose', 'elefriend']),
results: state.getIn(['search', 'results']), results: state.getIn(['search', 'results']),
searchHidden: state.getIn(['search', 'hidden']), searchHidden: state.getIn(['search', 'hidden']),
submitted: state.getIn(['search', 'submitted']), submitted: state.getIn(['search', 'submitted']),
showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : ownProps.isSearchPage,
unreadNotifications: state.getIn(['notifications', 'unread']), unreadNotifications: state.getIn(['notifications', 'unread']),
showNotificationsBadge: state.getIn(['local_settings', 'notifications', 'tab_badge']), showNotificationsBadge: state.getIn(['local_settings', 'notifications', 'tab_badge']),
}); });
@ -58,6 +60,7 @@ class Compose extends React.PureComponent {
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
isSearchPage: PropTypes.bool, isSearchPage: PropTypes.bool,
multiColumn: PropTypes.bool, multiColumn: PropTypes.bool,
showSearch: PropTypes.bool,
// State props. // State props.
account: ImmutablePropTypes.map, account: ImmutablePropTypes.map,
@ -90,6 +93,7 @@ class Compose extends React.PureComponent {
isSearchPage, isSearchPage,
unreadNotifications, unreadNotifications,
showNotificationsBadge, showNotificationsBadge,
showSearch,
} = this.props; } = this.props;
const computedClass = classNames('drawer', `mbstobon-${elefriend}`); const computedClass = classNames('drawer', `mbstobon-${elefriend}`);
@ -117,11 +121,13 @@ class Compose extends React.PureComponent {
)} )}
</div>} </div>}
{(multiColumn || isSearchPage) && <Motion defaultStyle={{ x: isSearchPage ? 0 : -100 }} style={{ x: spring(showSearch || isSearchPage ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
<DrawerResults {({ x }) => (
results={results} <div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}>
visible={submitted && !searchHidden} <DrawerResults results={results} visible={submitted && !searchHidden} />
/>} </div>
)}
</Motion>
</div> </div>
</div> </div>
); );

View file

@ -1,12 +1,9 @@
// Package imports. // Package imports.
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
import ImmutablePureComponent from 'react-immutable-pure-component';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
FormattedMessage,
defineMessages,
} from 'react-intl';
import spring from 'react-motion/lib/spring';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
// Components. // Components.
@ -15,103 +12,67 @@ import AccountContainer from 'flavours/glitch/containers/account_container';
import StatusContainer from 'flavours/glitch/containers/status_container'; import StatusContainer from 'flavours/glitch/containers/status_container';
import Hashtag from 'flavours/glitch/components/hashtag'; import Hashtag from 'flavours/glitch/components/hashtag';
// Utils.
import Motion from 'flavours/glitch/util/optional_motion';
// Messages. // Messages.
const messages = defineMessages({
total: {
defaultMessage: '{count, number} {count, plural, one {result} other {results}}',
id: 'search_results.total',
},
});
// The component. // The component.
export default function DrawerResults ({ export default @injectIntl
results, class DrawerResults extends ImmutablePureComponent {
visible,
}) {
const accounts = results ? results.get('accounts') : null;
const statuses = results ? results.get('statuses') : null;
const hashtags = results ? results.get('hashtags') : null;
// This gets the total number of items. static propTypes = {
const count = [accounts, statuses, hashtags].reduce(function (size, item) { results: ImmutablePropTypes.map.isRequired,
if (item && item.size) { intl: PropTypes.object.isRequired,
return size + item.size; };
}
return size;
}, 0);
// The result. render() {
return ( const { intl, results } = this.props;
<Motion
defaultStyle={{ x: -100 }} let accounts, statuses, hashtags;
style={{ let count = 0;
x: spring(visible ? 0 : -100, {
stiffness: 210, if (results.get('accounts') && results.get('accounts').size > 0) {
damping: 20, count += results.get('accounts').size;
}), accounts = (
}}
>
{({ x }) => (
<div
className='drawer--results'
style={{
transform: `translateX(${x}%)`,
visibility: x === -100 ? 'hidden' : 'visible',
}}
>
<header>
<Icon icon='search' fixedWidth />
<FormattedMessage
{...messages.total}
values={{ count }}
/>
</header>
{accounts && accounts.size ? (
<section> <section>
<h5><Icon icon='users' fixedWidth /><FormattedMessage id='search_results.accounts' defaultMessage='People' /></h5> <h5><Icon icon='users' fixedWidth /><FormattedMessage id='search_results.accounts' defaultMessage='People' /></h5>
{accounts.map( {results.get('accounts').map(accountId => <AccountContainer id={accountId} key={accountId} />)}
accountId => (
<AccountContainer
id={accountId}
key={accountId}
/>
)
)}
</section> </section>
) : null}
{statuses && statuses.size ? (
<section>
<h5><Icon icon='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
{statuses.map(
statusId => (
<StatusContainer
id={statusId}
key={statusId}
/>
)
)}
</section>
) : null}
{hashtags && hashtags.size ? (
<section>
<h5><Icon icon='hashtag' fixedWidth /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></h5>
{hashtags.map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
</section>
) : null}
</div>
)}
</Motion>
); );
} }
// Props. if (results.get('statuses') && results.get('statuses').size > 0) {
DrawerResults.propTypes = { count += results.get('statuses').size;
results: ImmutablePropTypes.map, statuses = (
visible: PropTypes.bool, <section>
<h5><Icon icon='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
{results.get('statuses').map(statusId => <StatusContainer id={statusId} key={statusId}/>)}
</section>
);
}
if (results.get('hashtags') && results.get('hashtags').size > 0) {
count += results.get('hashtags').size;
hashtags = (
<section>
<h5><Icon icon='hashtag' fixedWidth /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></h5>
{results.get('hashtags').map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
</section>
);
}
// The result.
return (
<div className='drawer--results'>
<header className='search-results__header'>
<Icon icon='search' fixedWidth />
<FormattedMessage id='search_results.total' defaultMessage='{count, number} {count, plural, one {result} other {results}}' values={{ count }} />
</header>
{accounts}
{statuses}
{hashtags}
</div>
);
}; };
}

View file

@ -185,12 +185,6 @@
} }
.drawer--results { .drawer--results {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
padding: 0;
background: $ui-base-color; background: $ui-base-color;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;