Skip to content

Commit

Permalink
fix(MessagesList): position loading spinner to not interfere with scr…
Browse files Browse the repository at this point in the history
…olling

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
  • Loading branch information
Antreesy committed Jul 30, 2024
1 parent b9e6e42 commit c27d8a4
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions src/components/MessagesList/MessagesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@scroll="onScroll"
@scrollend="endScroll">
<TransitionWrapper name="fade">
<ul v-if="displayMessagesLoader" class="scroller__loading icon-loading" />
<NcLoadingIcon v-if="displayMessagesLoader" class="scroller__loading" :size="32" />
</TransitionWrapper>

<ul v-for="(list, dateTimestamp) in messagesGroupedByDateByAuthor"
Expand Down Expand Up @@ -67,6 +67,7 @@ import { t, n } from '@nextcloud/l10n'
import moment from '@nextcloud/moment'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
import MessagesGroup from './MessagesGroup/MessagesGroup.vue'
import MessagesSystemGroup from './MessagesGroup/MessagesSystemGroup.vue'
Expand All @@ -84,6 +85,7 @@ export default {
LoadingPlaceholder,
Message,
NcEmptyContent,
NcLoadingIcon,
TransitionWrapper
},
Expand Down Expand Up @@ -886,9 +888,9 @@ export default {
this.displayMessagesLoader = false
if (this.$refs.scroller.scrollHeight !== scrollHeight) {
// scroll to previous position + added height - loading spinner height
// scroll to previous position + added height
this.$refs.scroller.scrollTo({
top: scrollTop + (this.$refs.scroller.scrollHeight - scrollHeight) - 40,
top: scrollTop + (this.$refs.scroller.scrollHeight - scrollHeight),
})
}
}
Expand Down Expand Up @@ -1245,7 +1247,7 @@ export default {
.scroller {
position: relative;
flex: 1 0;
padding-top: 20px;
padding-top: var(--default-grid-baseline);
overflow-y: scroll;
overflow-x: hidden;
border-bottom: 1px solid var(--color-border);
Expand All @@ -1261,8 +1263,9 @@ export default {
}
&__loading {
height: 40px;
transform: translatex(-64px);
position: absolute;
top: var(--default-grid-baseline);
left: var(--chat-spacing, 8px);
}
}
Expand Down

0 comments on commit c27d8a4

Please sign in to comment.