tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Improve load gap styling in web UI

Browse Source 
Port 45c9f16f71 to glitch-soc
This commit is contained in:
Thibaut Girka
2018-05-27 20:23:56 +02:00
committed by ThibG
parent cc589d6ec0
commit 08dbe29e29
4 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/flavours/glitch/features/notifications/index.js
View File

@ -17,7 +17,7 @@ import { createSelector } from 'reselect';
import { List as ImmutableList } from 'immutable';
import { debounce } from 'lodash';
import ScrollableList from 'flavours/glitch/components/scrollable_list';
import LoadMore from 'flavours/glitch/components/load_more';
import LoadGap from 'flavours/glitch/components/load_gap';
const messages = defineMessages({
title: { id: 'column.notifications', defaultMessage: 'Notifications' },
@ -28,24 +28,6 @@ const getNotifications = createSelector([
state => state.getIn(['notifications', 'items']),
], (excludedTypes, notifications) => notifications.filterNot(item => item !== null && excludedTypes.includes(item.get('type'))));
class LoadGap extends React.PureComponent {
static propTypes = {
disabled: PropTypes.bool,
maxId: PropTypes.string,
onClick: PropTypes.func.isRequired,
};
handleClick = () => {
this.props.onClick(this.props.maxId);
}
render () {
return <LoadMore onClick={this.handleClick} disabled={this.props.disabled} />;
}
}
const mapStateToProps = state => ({
notifications: getNotifications(state),
localSettings: state.get('local_settings'),