mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 05:08:03 +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.
76 lines
2.3 KiB
JavaScript
76 lines
2.3 KiB
JavaScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import PropTypes from 'prop-types';
|
|
import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
|
|
import { ScrollContainer } from 'react-router-scroll-4';
|
|
import Column from 'flavours/glitch/features/ui/components/column';
|
|
import ColumnBackButtonSlim from 'flavours/glitch/components/column_back_button_slim';
|
|
import AccountContainer from 'flavours/glitch/containers/account_container';
|
|
import { fetchBlocks, expandBlocks } from 'flavours/glitch/actions/blocks';
|
|
import { defineMessages, injectIntl } from 'react-intl';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
|
|
const messages = defineMessages({
|
|
heading: { id: 'column.blocks', defaultMessage: 'Blocked users' },
|
|
});
|
|
|
|
const mapStateToProps = state => ({
|
|
accountIds: state.getIn(['user_lists', 'blocks', 'items']),
|
|
});
|
|
|
|
@connect(mapStateToProps)
|
|
@injectIntl
|
|
export default class Blocks extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
params: PropTypes.object.isRequired,
|
|
dispatch: PropTypes.func.isRequired,
|
|
accountIds: ImmutablePropTypes.list,
|
|
intl: PropTypes.object.isRequired,
|
|
};
|
|
|
|
componentWillMount () {
|
|
this.props.dispatch(fetchBlocks());
|
|
}
|
|
|
|
handleScroll = (e) => {
|
|
const { scrollTop, scrollHeight, clientHeight } = e.target;
|
|
|
|
if (scrollTop === scrollHeight - clientHeight) {
|
|
this.props.dispatch(expandBlocks());
|
|
}
|
|
}
|
|
|
|
shouldUpdateScroll = (prevRouterProps, { location }) => {
|
|
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
|
|
return !(location.state && location.state.mastodonModalOpen);
|
|
}
|
|
|
|
render () {
|
|
const { intl, accountIds } = this.props;
|
|
|
|
if (!accountIds) {
|
|
return (
|
|
<Column>
|
|
<LoadingIndicator />
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<Column name='blocks' icon='ban' heading={intl.formatMessage(messages.heading)}>
|
|
<ColumnBackButtonSlim />
|
|
<ScrollContainer scrollKey='blocks' shouldUpdateScroll={this.shouldUpdateScroll}>
|
|
<div className='scrollable' onScroll={this.handleScroll}>
|
|
{accountIds.map(id =>
|
|
<AccountContainer key={id} id={id} />
|
|
)}
|
|
</div>
|
|
</ScrollContainer>
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
}
|