mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-30 04:14:36 +00:00
7cc7843109
Media modals push an history state so that pressing back on mobile closes them. We made sure to not scroll when opening them, but not when *closing* them, which caused some issues in rare cases.
99 lines
3.2 KiB
JavaScript
99 lines
3.2 KiB
JavaScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import PropTypes from 'prop-types';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
|
|
import {
|
|
fetchAccount,
|
|
fetchFollowing,
|
|
expandFollowing,
|
|
} from 'flavours/glitch/actions/accounts';
|
|
import { ScrollContainer } from 'react-router-scroll-4';
|
|
import AccountContainer from 'flavours/glitch/containers/account_container';
|
|
import Column from 'flavours/glitch/features/ui/components/column';
|
|
import HeaderContainer from 'flavours/glitch/features/account_timeline/containers/header_container';
|
|
import LoadMore from 'flavours/glitch/components/load_more';
|
|
import ColumnBackButton from 'flavours/glitch/components/column_back_button';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
|
|
const mapStateToProps = (state, props) => ({
|
|
accountIds: state.getIn(['user_lists', 'following', props.params.accountId, 'items']),
|
|
hasMore: !!state.getIn(['user_lists', 'following', props.params.accountId, 'next']),
|
|
});
|
|
|
|
@connect(mapStateToProps)
|
|
export default class Following extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
params: PropTypes.object.isRequired,
|
|
dispatch: PropTypes.func.isRequired,
|
|
accountIds: ImmutablePropTypes.list,
|
|
hasMore: PropTypes.bool,
|
|
};
|
|
|
|
componentWillMount () {
|
|
this.props.dispatch(fetchAccount(this.props.params.accountId));
|
|
this.props.dispatch(fetchFollowing(this.props.params.accountId));
|
|
}
|
|
|
|
componentWillReceiveProps (nextProps) {
|
|
if (nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) {
|
|
this.props.dispatch(fetchAccount(nextProps.params.accountId));
|
|
this.props.dispatch(fetchFollowing(nextProps.params.accountId));
|
|
}
|
|
}
|
|
|
|
handleScroll = (e) => {
|
|
const { scrollTop, scrollHeight, clientHeight } = e.target;
|
|
|
|
if (scrollTop === scrollHeight - clientHeight && this.props.hasMore) {
|
|
this.props.dispatch(expandFollowing(this.props.params.accountId));
|
|
}
|
|
}
|
|
|
|
handleLoadMore = (e) => {
|
|
e.preventDefault();
|
|
this.props.dispatch(expandFollowing(this.props.params.accountId));
|
|
}
|
|
|
|
shouldUpdateScroll = (prevRouterProps, { location }) => {
|
|
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
|
|
return !(location.state && location.state.mastodonModalOpen);
|
|
}
|
|
|
|
render () {
|
|
const { accountIds, hasMore } = this.props;
|
|
|
|
let loadMore = null;
|
|
|
|
if (!accountIds) {
|
|
return (
|
|
<Column>
|
|
<LoadingIndicator />
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
if (hasMore) {
|
|
loadMore = <LoadMore onClick={this.handleLoadMore} />;
|
|
}
|
|
|
|
return (
|
|
<Column>
|
|
<ColumnBackButton />
|
|
|
|
<ScrollContainer scrollKey='following' shouldUpdateScroll={this.shouldUpdateScroll}>
|
|
<div className='scrollable' onScroll={this.handleScroll}>
|
|
<div className='following'>
|
|
<HeaderContainer accountId={this.props.params.accountId} hideTabs />
|
|
{accountIds.map(id => <AccountContainer key={id} id={id} withNote={false} />)}
|
|
{loadMore}
|
|
</div>
|
|
</div>
|
|
</ScrollContainer>
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
}
|