Skip to content

[FIX] Missing Throbber while thread list is loading #22316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gabriellsh merged 6 commits into from
Jun 18, 2021
Merged

[FIX] Missing Throbber while thread list is loading #22316

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6100812
fix: add throbber
Jun 10, 2021
cf222a5
Merge branch 'develop' into fix/thread-list-loader
Jun 16, 2021
fc2c459
improve: fallback visual
Jun 16, 2021
26edbfb
Merge branch 'develop' into fix/thread-list-loader
gabriellsh Jun 17, 2021
6f5583e
Merge branch 'develop' into fix/thread-list-loader
Jun 18, 2021
20a20fa
Merge branch 'develop' into fix/thread-list-loader
gabriellsh Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions client/views/room/contextualBar/Threads/ThreadList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Icon, TextInput, Select, Margins, Callout } from '@rocket.chat/fuselage';
import { Box, Icon, TextInput, Select, Margins, Callout, Throbber } from '@rocket.chat/fuselage';
import { useResizeObserver, useMutableCallback, useAutoFocus } from '@rocket.chat/fuselage-hooks';
import React, { useMemo } from 'react';
import { Virtuoso } from 'react-virtuoso';
Expand Down Expand Up @@ -73,6 +73,7 @@ function ThreadList({
<VerticalBar.Text>{t('Threads')}</VerticalBar.Text>
<VerticalBar.Close onClick={onClose} />
</VerticalBar.Header>

<VerticalBar.Content paddingInline={0} ref={ref}>
<Box
display='flex'
Expand Down Expand Up @@ -102,19 +103,26 @@ function ThreadList({
</Margins>
</Box>
</Box>
<Box flexGrow={1} flexShrink={1} overflow='hidden' display='flex'>
{error && (
<Callout mi='x24' type='danger'>
{error.toString()}
</Callout>
)}

{total === 0 && (
<Box p='x24' textAlign='center' color='neutral-600'>
{t('No_Threads')}
</Box>
)}
{loading && (
<Box pi='x24' pb='x12'>
<Throbber size='x12' />
</Box>
)}

{error && (
<Callout mi='x24' type='danger'>
{error.toString()}
</Callout>
)}

{!loading && total === 0 && (
<Box p='x24' color='neutral-600' textAlign='center' width='full'>
{t('No_Threads')}
</Box>
)}

<Box flexGrow={1} flexShrink={1} overflow='hidden' display='flex'>
{!error && total > 0 && threads.length > 0 && (
<Virtuoso
style={{
Expand Down Expand Up @@ -143,6 +151,7 @@ function ThreadList({
)}
</Box>
</VerticalBar.Content>

{mid && (
<VerticalBar.InnerContent>
<ThreadComponent onClickBack={onClick} mid={mid} jump={jump} room={room} />
Expand Down