fix sarafi

RocketChat · Apr 14, 2020 · 833cb1e · 833cb1e
1 parent cb2e636
commit 833cb1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/ui/client/views/app/components/Directory/DirectoryTable.js b/app/ui/client/views/app/components/Directory/DirectoryTable.js
@@ -42,6 +42,8 @@ const LoadingRow = ({ cols }) => <Table.Row>
 	</Table.Cell>)}
 </Table.Row>;
 
+const style = { minHeight: '40px' };
+
 export function DirectoryTable({
 	data = {},
 	renderRow,
@@ -77,7 +79,7 @@ export function DirectoryTable({
 	return <>
 		<Flex.Container direction='column'>
 			<Box>
-				<Box mb='x16' display='flex' flexDirection='column'>
+				<Box mb='x16' display='flex' flexDirection='column' style={style}>
 					<TextInput placeholder={searchPlaceholder} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
 				</Box>
 				{channels && !channels.length

diff --git a/app/ui/client/views/app/components/Directory/index.js b/app/ui/client/views/app/components/Directory/index.js
@@ -13,7 +13,7 @@ const avatarBase = { baseUrl: '/avatar/' };
 export function DirectoryPage() {
 	const t = useTranslation();
 
-	const defaultTab = useSetting('Accounts_Directory_DefaultView', 'channels');
+	const defaultTab = useSetting('Accounts_Directory_DefaultView');
 
 	const federationEnabled = useSetting('FEDERATION_Enabled');
 
@@ -30,7 +30,7 @@ export function DirectoryPage() {
 
 	return <Avatar.Context.Provider value={avatarBase}><Page>
 		<Page.Header title={t('Directory')} />
-		<Tabs>
+		<Tabs flexShrink={0} >
 			<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>{t('Channels')}</Tabs.Item>
 			<Tabs.Item selected={tab === 'users'} onClick={handleTabClick('users')}>{t('Users')}</Tabs.Item>
 			{ federationEnabled && <Tabs.Item selected={tab === 'external'} onClick={handleTabClick('external')}>{t('External_Users')}</Tabs.Item> }