mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 23:54:52 +01: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.
66 lines
2.1 KiB
JavaScript
66 lines
2.1 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 { fetchFavourites } from 'flavours/glitch/actions/interactions';
|
|
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 ColumnBackButton from 'flavours/glitch/components/column_back_button';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
|
|
const mapStateToProps = (state, props) => ({
|
|
accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
|
|
});
|
|
|
|
@connect(mapStateToProps)
|
|
export default class Favourites extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
params: PropTypes.object.isRequired,
|
|
dispatch: PropTypes.func.isRequired,
|
|
accountIds: ImmutablePropTypes.list,
|
|
};
|
|
|
|
componentWillMount () {
|
|
this.props.dispatch(fetchFavourites(this.props.params.statusId));
|
|
}
|
|
|
|
componentWillReceiveProps (nextProps) {
|
|
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
|
|
this.props.dispatch(fetchFavourites(nextProps.params.statusId));
|
|
}
|
|
}
|
|
|
|
shouldUpdateScroll = (prevRouterProps, { location }) => {
|
|
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
|
|
return !(location.state && location.state.mastodonModalOpen);
|
|
}
|
|
|
|
render () {
|
|
const { accountIds } = this.props;
|
|
|
|
if (!accountIds) {
|
|
return (
|
|
<Column>
|
|
<LoadingIndicator />
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<Column>
|
|
<ColumnBackButton />
|
|
|
|
<ScrollContainer scrollKey='favourites' shouldUpdateScroll={this.shouldUpdateScroll}>
|
|
<div className='scrollable'>
|
|
{accountIds.map(id => <AccountContainer key={id} id={id} withNote={false} />)}
|
|
</div>
|
|
</ScrollContainer>
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
}
|