|
|
@ -100,7 +100,9 @@ class Notifications extends React.PureComponent {
|
|
|
|
unread = <div className='notifications__unread-indicator' />;
|
|
|
|
unread = <div className='notifications__unread-indicator' />;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (isLoading || notifications.size > 0) {
|
|
|
|
if (isLoading && this.scrollableArea) {
|
|
|
|
|
|
|
|
scrollableArea = this.scrollableArea;
|
|
|
|
|
|
|
|
} else if (notifications.size > 0) {
|
|
|
|
scrollableArea = (
|
|
|
|
scrollableArea = (
|
|
|
|
<div className='scrollable' onScroll={this.handleScroll} ref={this.setRef}>
|
|
|
|
<div className='scrollable' onScroll={this.handleScroll} ref={this.setRef}>
|
|
|
|
{unread}
|
|
|
|
{unread}
|
|
|
@ -119,6 +121,8 @@ class Notifications extends React.PureComponent {
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.scrollableArea = scrollableArea;
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<Column icon='bell' active={isUnread} heading={intl.formatMessage(messages.title)}>
|
|
|
|
<Column icon='bell' active={isUnread} heading={intl.formatMessage(messages.title)}>
|
|
|
|
<ColumnSettingsContainer />
|
|
|
|
<ColumnSettingsContainer />
|
|
|
|