From 53cdcce3d141f7c6e7328041ef2bb5e298931de3 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Fri, 7 Apr 2023 15:44:31 +0200 Subject: [PATCH] [Glitch] Fix loading spinner + infinite scroll for private mentions Port 9ef9974ff207fe91291c81c7a9b9bb83e0df8e16 to glitch-soc Signed-off-by: Claire --- .../direct_timeline/components/conversations_list.jsx | 4 ++-- .../flavours/glitch/features/direct_timeline/index.jsx | 4 ++++ app/javascript/flavours/glitch/styles/components/columns.scss | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversations_list.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversations_list.jsx index ae72179e21..2bfe6fbf12 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversations_list.jsx +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversations_list.jsx @@ -55,10 +55,10 @@ export default class ConversationsList extends ImmutablePureComponent { }, 300, { leading: true }); render () { - const { conversations, onLoadMore, ...other } = this.props; + const { conversations, isLoading, onLoadMore, ...other } = this.props; return ( - + {conversations.map(item => ( } + alwaysPrepend emptyMessage={} /> ); @@ -119,8 +121,10 @@ class DirectTimeline extends React.PureComponent { trackScroll={!pinned} scrollKey={`direct_timeline-${columnId}`} timelineId='direct' + bindToDocument={!multiColumn} onLoadMore={this.handleLoadMoreTimeline} prepend={
} + alwaysPrepend emptyMessage={} /> ); diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss index fd4bb95b5f..907f820d6c 100644 --- a/app/javascript/flavours/glitch/styles/components/columns.scss +++ b/app/javascript/flavours/glitch/styles/components/columns.scss @@ -650,6 +650,7 @@ $ui-header-height: 55px; .follow_requests-unlocked_explanation { background: darken($ui-base-color, 4%); contain: initial; + flex-grow: 0; } .error-column {