Skip to content
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

Jump to bottom

Regression: fix fuselage import, remove directory css #17116

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Regression: fix fuselage import, remove directory css #17116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions app/ui/client/views/app/components/Directory/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ export function DirectoryPage() {

return <Avatar.Context.Provider value={avatarBase}><Page>
<Page.Header title={t('Directory')} />
<Tabs>
<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> }
</Tabs>
<Page.Content style={style}>
<Tabs>
<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> }
</Tabs>
<Margins inline='x24'>
<Box>
{
Expand Down
78 changes: 0 additions & 78 deletions app/ui/client/views/app/directory.css
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions client/components/admin/settings/GroupPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ export function GroupPage({ children, headerButtons, save, cancel, _id, i18nLabe
</ButtonGroup>
</Page.Header>

<Page.Content>
<Page.ContentShadowScroll>
<Box style={useMemo(() => ({ margin: '0 auto', width: '100%', maxWidth: '590px' }), [])}>
{t.has(i18nDescription) && <Paragraph hintColor>{t(i18nDescription)}</Paragraph>}

<Accordion className='page-settings'>
{children}
</Accordion>
</Box>
</Page.Content>
</Page.ContentShadowScroll>
</Page>;
}

Expand Down
9 changes: 7 additions & 2 deletions client/components/basic/Page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,17 @@ export function PageHeader({ children, title, ...props }) {
</Box>;
}

export function PageContent(props) {
export function PageContentShadowScroll({ onScrollContent, ...props }) {
const [, setBorder] = useContext(PageContext);
return <Scrollable onScrollContent={({ top }) => { setBorder(!top); }}>
return <PageContent onScrollContent={({ top, ...args }) => { setBorder(!top); onScrollContent && onScrollContent({ top, ...args }); }} { ...props } ></PageContent>;
}

export function PageContent({ onScrollContent, ...props }) {
return <Scrollable onScrollContent={onScrollContent} >
<Box style={useMemo(() => ({ padding: '1rem' }), [])} {...props} />
</Scrollable>;
}

Page.Header = PageHeader;
Page.Content = PageContent;
Page.ContentShadowScroll = PageContentShadowScroll;
56 changes: 28 additions & 28 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,13 @@
"@nivo/heatmap": "^0.61.0",
"@nivo/line": "^0.61.1",
"@nivo/pie": "^0.61.1",
"@rocket.chat/fuselage-polyfills": "^0.6.2",
"@rocket.chat/apps-engine": "^1.13.0-beta.3003",
"@rocket.chat/fuselage": "^0.6.2",
"@rocket.chat/fuselage-hooks": "^0.6.2",
"@rocket.chat/fuselage-ui-kit": "^0.6.2",
"@rocket.chat/icons": "^0.6.2",
"@rocket.chat/ui-kit": "^0.6.2",
"@rocket.chat/fuselage": "^0.7.0",
"@rocket.chat/fuselage-hooks": "^0.7.0",
"@rocket.chat/fuselage-polyfills": "^0.7.0",
"@rocket.chat/fuselage-ui-kit": "^0.7.0",
"@rocket.chat/icons": "^0.7.0",
"@rocket.chat/ui-kit": "^0.7.0",
"@slack/client": "^4.8.0",
"adm-zip": "RocketChat/adm-zip",
"archiver": "^3.0.0",
Expand Down