mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![Thibaut Girka](/assets/img/avatar_default.png)
* Make sure loading indicator has enough vertical space
* Respect reduce_motion setting for loading indicator
Port 4ede51743e
to glitch-soc
150 lines
4.7 KiB
JavaScript
150 lines
4.7 KiB
JavaScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import PropTypes from 'prop-types';
|
|
import { fetchAccount } from 'flavours/glitch/actions/accounts';
|
|
import { expandAccountMediaTimeline } from 'flavours/glitch/actions/timelines';
|
|
import LoadingIndicator from 'flavours/glitch/components/loading_indicator';
|
|
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';
|
|
import { getAccountGallery } from 'flavours/glitch/selectors';
|
|
import MediaItem from './components/media_item';
|
|
import HeaderContainer from 'flavours/glitch/features/account_timeline/containers/header_container';
|
|
import { ScrollContainer } from 'react-router-scroll-4';
|
|
import LoadMore from 'flavours/glitch/components/load_more';
|
|
|
|
const mapStateToProps = (state, props) => ({
|
|
medias: getAccountGallery(state, props.params.accountId),
|
|
isLoading: state.getIn(['timelines', `account:${props.params.accountId}:media`, 'isLoading']),
|
|
hasMore: state.getIn(['timelines', `account:${props.params.accountId}:media`, 'hasMore']),
|
|
});
|
|
|
|
class LoadMoreMedia extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
maxId: PropTypes.string,
|
|
onLoadMore: PropTypes.func.isRequired,
|
|
};
|
|
|
|
handleLoadMore = () => {
|
|
this.props.onLoadMore(this.props.maxId);
|
|
}
|
|
|
|
render () {
|
|
return (
|
|
<LoadMore
|
|
disabled={this.props.disabled}
|
|
onClick={this.handleLoadMore}
|
|
/>
|
|
);
|
|
}
|
|
|
|
}
|
|
|
|
@connect(mapStateToProps)
|
|
export default class AccountGallery extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
params: PropTypes.object.isRequired,
|
|
dispatch: PropTypes.func.isRequired,
|
|
medias: ImmutablePropTypes.list.isRequired,
|
|
isLoading: PropTypes.bool,
|
|
hasMore: PropTypes.bool,
|
|
};
|
|
|
|
componentDidMount () {
|
|
this.props.dispatch(fetchAccount(this.props.params.accountId));
|
|
this.props.dispatch(expandAccountMediaTimeline(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(expandAccountMediaTimeline(this.props.params.accountId));
|
|
}
|
|
}
|
|
|
|
handleScrollToBottom = () => {
|
|
if (this.props.hasMore) {
|
|
this.handleLoadMore(this.props.medias.size > 0 ? this.props.medias.last().getIn(['status', 'id']) : undefined);
|
|
}
|
|
}
|
|
|
|
handleScroll = (e) => {
|
|
const { scrollTop, scrollHeight, clientHeight } = e.target;
|
|
const offset = scrollHeight - scrollTop - clientHeight;
|
|
|
|
if (150 > offset && !this.props.isLoading) {
|
|
this.handleScrollToBottom();
|
|
}
|
|
}
|
|
|
|
handleLoadMore = maxId => {
|
|
this.props.dispatch(expandAccountMediaTimeline(this.props.params.accountId, { maxId }));
|
|
};
|
|
|
|
handleLoadOlder = (e) => {
|
|
e.preventDefault();
|
|
this.handleScrollToBottom();
|
|
}
|
|
|
|
shouldUpdateScroll = (prevRouterProps, { location }) => {
|
|
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
|
|
return !(location.state && location.state.mastodonModalOpen);
|
|
}
|
|
|
|
render () {
|
|
const { medias, isLoading, hasMore } = this.props;
|
|
|
|
let loadOlder = null;
|
|
|
|
if (!medias && isLoading) {
|
|
return (
|
|
<Column>
|
|
<LoadingIndicator />
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
if (hasMore && !(isLoading && medias.size === 0)) {
|
|
loadOlder = <LoadMore visible={!isLoading} onClick={this.handleLoadOlder} />;
|
|
}
|
|
|
|
return (
|
|
<Column>
|
|
<ColumnBackButton />
|
|
|
|
<ScrollContainer scrollKey='account_gallery' shouldUpdateScroll={this.shouldUpdateScroll}>
|
|
<div className='scrollable scrollable--flex' onScroll={this.handleScroll}>
|
|
<HeaderContainer accountId={this.props.params.accountId} />
|
|
|
|
<div role='feed' className='account-gallery__container'>
|
|
{medias.map((media, index) => media === null ? (
|
|
<LoadMoreMedia
|
|
key={'more:' + medias.getIn(index + 1, 'id')}
|
|
maxId={index > 0 ? medias.getIn(index - 1, 'id') : null}
|
|
onLoadMore={this.handleLoadMore}
|
|
/>
|
|
) : (
|
|
<MediaItem
|
|
key={media.get('id')}
|
|
media={media}
|
|
/>
|
|
))}
|
|
{loadOlder}
|
|
</div>
|
|
|
|
{isLoading && medias.size === 0 && (
|
|
<div className='scrollable__append'>
|
|
<LoadingIndicator />
|
|
</div>
|
|
)}
|
|
</div>
|
|
</ScrollContainer>
|
|
</Column>
|
|
);
|
|
}
|
|
|
|
}
|