ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Prepend account header even when status list is empty 

Partially port 90b64c0069
rebase/4.0.0rc2
Thibaut Girka 2018-11-13 15:32:29 +01:00 committed by ThibG
parent c78c80f807
commit 2fe0cb1623
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/flavours/glitch/components/scrollable_list.js
View File

@ -27,6 +27,7 @@ export default class ScrollableList extends PureComponent {
showLoading: PropTypes.bool, showLoading: PropTypes.bool,
hasMore: PropTypes.bool, hasMore: PropTypes.bool,
prepend: PropTypes.node, prepend: PropTypes.node,
alwaysPrepend: PropTypes.bool,
emptyMessage: PropTypes.node, emptyMessage: PropTypes.node,
children: PropTypes.node, children: PropTypes.node,
}; };
@ -159,7 +160,7 @@ export default class ScrollableList extends PureComponent {
} }
render () { render () {
const { children, scrollKey, trackScroll, shouldUpdateScroll, showLoading, isLoading, hasMore, prepend, emptyMessage, onLoadMore } = this.props; const { children, scrollKey, trackScroll, shouldUpdateScroll, showLoading, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props;
const { fullscreen } = this.state; const { fullscreen } = this.state;
const childrenCount = React.Children.count(children); const childrenCount = React.Children.count(children);
@ -203,8 +204,12 @@ export default class ScrollableList extends PureComponent {
); );
} else { } else {
scrollableArea = ( scrollableArea = (
<div className='empty-column-indicator' ref={this.setRef}> <div className={classNames('scrollable', { fullscreen })} ref={this.setRef} style={{ flex: '1 1 auto', display: 'flex', flexDirection: 'column' }}>
{emptyMessage} {alwaysPrepend && prepend}
<div className='empty-column-indicator'>
{emptyMessage}
</div>
</div> </div>
); );
} }

1
app/javascript/flavours/glitch/components/status_list.js
View File

@ -23,6 +23,7 @@ export default class StatusList extends ImmutablePureComponent {
isPartial: PropTypes.bool, isPartial: PropTypes.bool,
hasMore: PropTypes.bool, hasMore: PropTypes.bool,
prepend: PropTypes.node, prepend: PropTypes.node,
alwaysPrepend: PropTypes.bool,
emptyMessage: PropTypes.node, emptyMessage: PropTypes.node,
timelineId: PropTypes.string, timelineId: PropTypes.string,
}; };