ScrollableList: break up render function into smaller pieces

profile-avatar-switcher
Alex Gleason 2021-10-11 11:59:37 -05:00
rodzic b1e10f3db2
commit d41e3f96ee
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
1 zmienionych plików z 68 dodań i 53 usunięć

Wyświetl plik

@ -221,16 +221,10 @@ export default class ScrollableList extends PureComponent {
this.node = c; this.node = c;
} }
render() { renderLoading = () => {
const { children, scrollKey, showLoading, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props; const { prepend } = this.props;
const childrenCount = React.Children.count(children);
const trackScroll = true; //placeholder
const loadMore = (hasMore && onLoadMore) ? <LoadMore visible={!isLoading} onClick={this.handleLoadMore} /> : null; return (
let scrollableArea = null;
if (showLoading) {
scrollableArea = (
<div className='slist slist--flex'> <div className='slist slist--flex'>
<div role='feed' className='item-list'> <div role='feed' className='item-list'>
{prepend} {prepend}
@ -241,13 +235,34 @@ export default class ScrollableList extends PureComponent {
</div> </div>
</div> </div>
); );
} else if (isLoading || childrenCount > 0 || hasMore || !emptyMessage) { }
scrollableArea = (
renderEmptyMessage = () => {
const { prepend, alwaysPrepend, emptyMessage } = this.props;
return (
<div className='slist slist--flex' ref={this.setRef}>
{alwaysPrepend && prepend}
<div className='empty-column-indicator'>
<div>{emptyMessage}</div>
</div>
</div>
);
}
renderFeed = () => {
const { children, scrollKey, isLoading, hasMore, prepend, onLoadMore } = this.props;
const childrenCount = React.Children.count(children);
const trackScroll = true; //placeholder
const loadMore = (hasMore && onLoadMore) ? <LoadMore visible={!isLoading} onClick={this.handleLoadMore} /> : null;
return (
<div className='slist' ref={this.setRef} onMouseMove={this.handleMouseMove}> <div className='slist' ref={this.setRef} onMouseMove={this.handleMouseMove}>
<div role='feed' className='item-list'> <div role='feed' className='item-list'>
{prepend} {prepend}
{React.Children.map(this.props.children, (child, index) => ( {React.Children.map(children, (child, index) => (
<IntersectionObserverArticleContainer <IntersectionObserverArticleContainer
key={child.key} key={child.key}
id={child.key} id={child.key}
@ -269,19 +284,19 @@ export default class ScrollableList extends PureComponent {
</div> </div>
</div> </div>
); );
} else {
scrollableArea = (
<div className='slist slist--flex' ref={this.setRef}>
{alwaysPrepend && prepend}
<div className='empty-column-indicator'>
<div>{emptyMessage}</div>
</div>
</div>
);
} }
return scrollableArea; render() {
const { children, showLoading, isLoading, hasMore, emptyMessage } = this.props;
const childrenCount = React.Children.count(children);
if (showLoading) {
return this.renderLoading();
} else if (isLoading || childrenCount > 0 || hasMore || !emptyMessage) {
return this.renderFeed();
} else {
return this.renderEmptyMessage();
}
} }
} }