Skip to content

Commit 4bff57f

Browse files
committed
fixup! show joined room during loading
Signed-off-by: Grigorii K. Shartsev <[email protected]>
1 parent a1ef542 commit 4bff57f

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/components/LeftSidebar/ConversationsListVirtual.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,16 @@
2828
<template #default="{ item }">
2929
<Conversation :item="item" />
3030
</template>
31+
<template #after>
32+
<LoadingPlaceholder v-if="loading" type="conversations" />
33+
</template>
3134
</RecycleScroller>
3235
</template>
3336

3437
<script>
3538
import { RecycleScroller } from 'vue-virtual-scroller'
3639
40+
import LoadingPlaceholder from '../LoadingPlaceholder.vue'
3741
import Conversation from './ConversationsList/Conversation.vue'
3842
3943
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
@@ -44,6 +48,7 @@ export default {
4448
name: 'ConversationsListVirtual',
4549
4650
components: {
51+
LoadingPlaceholder,
4752
Conversation,
4853
RecycleScroller,
4954
},
@@ -53,6 +58,11 @@ export default {
5358
type: Array,
5459
required: true,
5560
},
61+
62+
loading: {
63+
type: Boolean,
64+
default: false,
65+
},
5666
},
5767
5868
setup() {

src/components/LeftSidebar/LeftSidebar.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,15 @@
114114
<li ref="container" class="left-sidebar__list">
115115
<ul class="scroller h-100">
116116
<!-- Conversations List -->
117-
<template v-else-if="!isSearching">
118-
<li v-if="filteredConversationsList.length" class="h-100">
117+
<template v-if="!isSearching">
118+
<li class="h-100">
119119
<ConversationsListVirtual ref="scroller"
120120
:conversations="filteredConversationsList"
121+
:loading="!initialisedConversations"
121122
class="h-100"
122123
@scroll.native="debounceHandleScroll" />
123124
</li>
124-
<Hint v-else :hint="t('spreed', 'No matches found')" />
125+
<Hint v-if="initialisedConversations && filteredConversationsList.length === 0" :hint="t('spreed', 'No matches found')" />
125126
</template>
126127

127128
<!-- Search results -->

0 commit comments

Comments
 (0)