Skip to content

Commit f0bbe5a

Browse files
committed
(fix) loading more rooms duplicates
1 parent bd5dfc6 commit f0bbe5a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/ChatWindow/RoomsList.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
</div>
129129
<transition name="vac-fade-message">
130130
<infinite-loading
131-
v-if="rooms.length"
131+
v-if="!loadingRooms && rooms.length"
132132
spinner="spiral"
133133
@infinite="loadMoreRooms"
134134
>
@@ -179,23 +179,22 @@ export default {
179179
},
180180
181181
watch: {
182-
rooms(val) {
183-
this.filteredRooms = val
182+
rooms(newVal, oldVal) {
183+
this.filteredRooms = newVal
184184
185-
if (this.infiniteState) {
185+
if (
186+
this.infiniteState &&
187+
(newVal.length !== oldVal.length || this.roomsLoaded)
188+
) {
186189
this.infiniteState.loaded()
187-
setTimeout(() => (this.loadingMoreRooms = false), 0)
190+
this.loadingMoreRooms = false
188191
}
189192
},
190193
191194
loadingRooms(val) {
192195
if (val) this.infiniteState = null
193196
},
194197
195-
roomsLoaded() {
196-
if (this.infiniteState) this.infiniteState.complete()
197-
},
198-
199198
loadingMoreRooms(val) {
200199
this.$emit('loading-more-rooms', val)
201200
},
@@ -225,6 +224,7 @@ export default {
225224
if (this.loadingMoreRooms) return
226225
227226
if (this.roomsLoaded) {
227+
this.loadingMoreRooms = false
228228
return infiniteState.complete()
229229
}
230230

0 commit comments

Comments
 (0)