|
|
@ -35,7 +35,6 @@ export default class ScrollableList extends PureComponent {
|
|
|
|
|
|
|
|
|
|
|
|
state = {
|
|
|
|
state = {
|
|
|
|
fullscreen: null,
|
|
|
|
fullscreen: null,
|
|
|
|
mouseOver: false,
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
intersectionObserverWrapper = new IntersectionObserverWrapper();
|
|
|
|
intersectionObserverWrapper = new IntersectionObserverWrapper();
|
|
|
@ -86,7 +85,7 @@ export default class ScrollableList extends PureComponent {
|
|
|
|
const someItemInserted = React.Children.count(prevProps.children) > 0 &&
|
|
|
|
const someItemInserted = React.Children.count(prevProps.children) > 0 &&
|
|
|
|
React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
|
|
|
|
React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
|
|
|
|
this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
|
|
|
|
this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
|
|
|
|
if (someItemInserted && this.node.scrollTop > 0 || this.state.mouseOver) {
|
|
|
|
if (someItemInserted && this.node.scrollTop > 0) {
|
|
|
|
return this.node.scrollHeight - this.node.scrollTop;
|
|
|
|
return this.node.scrollHeight - this.node.scrollTop;
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
@ -148,14 +147,6 @@ export default class ScrollableList extends PureComponent {
|
|
|
|
this.props.onScrollToBottom();
|
|
|
|
this.props.onScrollToBottom();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
handleMouseEnter = () => {
|
|
|
|
|
|
|
|
this.setState({ mouseOver: true });
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handleMouseLeave = () => {
|
|
|
|
|
|
|
|
this.setState({ mouseOver: false });
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
render () {
|
|
|
|
render () {
|
|
|
|
const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;
|
|
|
|
const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;
|
|
|
|
const { fullscreen } = this.state;
|
|
|
|
const { fullscreen } = this.state;
|
|
|
@ -166,7 +157,7 @@ export default class ScrollableList extends PureComponent {
|
|
|
|
|
|
|
|
|
|
|
|
if (isLoading || childrenCount > 0 || !emptyMessage) {
|
|
|
|
if (isLoading || childrenCount > 0 || !emptyMessage) {
|
|
|
|
scrollableArea = (
|
|
|
|
scrollableArea = (
|
|
|
|
<div className={classNames('scrollable', { fullscreen })} ref={this.setRef} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
|
|
|
|
<div className={classNames('scrollable', { fullscreen })} ref={this.setRef}>
|
|
|
|
<div role='feed' className='item-list'>
|
|
|
|
<div role='feed' className='item-list'>
|
|
|
|
{prepend}
|
|
|
|
{prepend}
|
|
|
|
|
|
|
|
|
|
|
|