Regression: Verticalbar size (#19670)

Co-authored-by: Gabriel Henriques <gabriel.henriques@rocket.chat>
pull/19679/head
Guilherme Gazzo 5 years ago committed by GitHub
parent dbfbef279b
commit e2536d3026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      client/channel/Discussions/ContextualBar/List.js
  2. 6
      client/channel/Threads/ContextualBar/List.js

@ -198,7 +198,7 @@ export function DiscussionList({ total = 10, discussions = [], loadMoreItems, lo
/>, [onClick, showRealNames, userId]);
const isItemLoaded = useCallback((index) => index < discussionsRef.current.length, []);
const { ref, contentBoxSize: { inlineSize = 378, blockSize = 750 } = {} } = useResizeObserver();
const { ref, contentBoxSize: { inlineSize = 378, blockSize = 750 } = {} } = useResizeObserver({ debounceDelay: 100 });
return <VerticalBar>
<VerticalBar.Header>
@ -210,10 +210,10 @@ export function DiscussionList({ total = 10, discussions = [], loadMoreItems, lo
<Box display='flex' flexDirection='row' p='x24' borderBlockEndWidth='x2' borderBlockEndStyle='solid' borderBlockEndColor='neutral-200' flexShrink={0}>
<TextInput placeholder={t('Search_Messages')} value={text} onChange={setText} addon={<Icon name='magnifier' size='x20'/>}/>
</Box>
<Box flexGrow={1} flexShrink={1} ref={ref}>
<Box flexGrow={1} flexShrink={1} ref={ref} overflow='hidden'>
{error && <Callout mi='x24' type='danger'>{error.toString()}</Callout>}
{total === 0 && <Box p='x24'>{t('No_Discussions_found')}</Box>}
<InfiniteLoader
{!error && total > 0 && <InfiniteLoader
isItemLoaded={isItemLoaded}
itemCount={total}
loadMoreItems={ loading ? () => {} : loadMoreItems}
@ -229,7 +229,7 @@ export function DiscussionList({ total = 10, discussions = [], loadMoreItems, lo
onItemsRendered={onItemsRendered}
>{rowRenderer}</List>
)}
</InfiniteLoader>
</InfiniteLoader>}
</Box>
</VerticalBar.Content>
</VerticalBar>;

@ -252,10 +252,10 @@ export function ThreadList({ total = 10, threads = [], room, unread = [], unread
</Margins>
</Box>
</Box>
<Box flexGrow={1} flexShrink={1} ref={ref}>
<Box flexGrow={1} flexShrink={1} ref={ref} overflow='hidden'>
{error && <Callout mi='x24' type='danger'>{error.toString()}</Callout>}
{total === 0 && <Box p='x24'>{t('No_Threads')}</Box>}
<InfiniteLoader
{!error && total > 0 && <InfiniteLoader
isItemLoaded={isItemLoaded}
itemCount={total}
loadMoreItems={ loading ? () => {} : loadMoreItems}
@ -271,7 +271,7 @@ export function ThreadList({ total = 10, threads = [], room, unread = [], unread
onItemsRendered={onItemsRendered}
>{rowRenderer}</List>
)}
</InfiniteLoader>
</InfiniteLoader>}
</Box>
</VerticalBar.Content>
</VerticalBar>;

Loading…
Cancel
Save