Skip to content

Chore: Remove medium prop from ButtonGroup #27784

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
kodiakhq merged 1 commit into from
Jan 20, 2023
Merged

Chore: Remove medium prop from ButtonGroup #27784

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
2 changes: 1 addition & 1 deletion apps/meteor/client/components/VerticalBar/VerticalBarActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import { ButtonGroup } from '@rocket.chat/fuselage';
import type { ReactElement, ComponentProps } from 'react';
import React, { memo } from 'react';

const VerticalBarActions = (props: ComponentProps<typeof ButtonGroup>): ReactElement => <ButtonGroup medium {...props} />;
const VerticalBarActions = (props: ComponentProps<typeof ButtonGroup>): ReactElement => <ButtonGroup {...props} />;

export default memo(VerticalBarActions);
2 changes: 1 addition & 1 deletion apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import React from 'react';
import ActionAttachmentButton from './ActionAttachmentButton';

export const ActionAttachment: FC<MessageAttachmentAction> = ({ actions }) => (
<ButtonGroup mb='x4' {...({ small: true } as any)}>
<ButtonGroup mb='x4' small>
{actions
.filter(
({ type, msg_in_chat_window: msgInChatWindow, url, image_url: image, text }) =>
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const VoipFooter = ({
{title}
</Box>
{(callerState === 'IN_CALL' || callerState === 'ON_HOLD') && (
<ButtonGroup medium onClick={(e): void => e.stopPropagation()}>
<ButtonGroup onClick={(e): void => e.stopPropagation()}>
<IconButton
small
disabled={paused}
Expand Down Expand Up @@ -125,7 +125,7 @@ export const VoipFooter = ({
</Box>
</Box>

<ButtonGroup medium>
<ButtonGroup>
{(callerState === 'IN_CALL' || callerState === 'ON_HOLD' || callerState === 'OFFER_SENT') && (
<Button
small
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/admin/apps/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const AppDetails = ({ app }: { app: AppInfo }): ReactElement => {
<Box fontScale='h4' mbe='x8' color='titles-labels'>
{t('Categories')}
</Box>
<ButtonGroup medium flexWrap='wrap'>
<ButtonGroup flexWrap='wrap'>
{categories?.map((current) => (
<Chip key={current} textTransform='uppercase'>
{current}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-client/src/components/Card/CardFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ButtonGroup } from '@rocket.chat/fuselage';
import type { FC } from 'react';

const CardFooter: FC = ({ children }) => <ButtonGroup medium>{children}</ButtonGroup>;
const CardFooter: FC = ({ children }) => <ButtonGroup>{children}</ButtonGroup>;

export default CardFooter;
2 changes: 1 addition & 1 deletion packages/ui-client/src/components/Header/ToolBox/ToolBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ButtonGroup } from '@rocket.chat/fuselage';
import type { FC, ComponentProps } from 'react';

const ToolBox: FC<ComponentProps<typeof ButtonGroup>> = (props) => <ButtonGroup role='toolbar' mi='x4' medium {...props} />;
const ToolBox: FC<ComponentProps<typeof ButtonGroup>> = (props) => <ButtonGroup role='toolbar' mi='x4' {...props} />;

export default ToolBox;
2 changes: 1 addition & 1 deletion packages/ui-video-conf/src/VideoConfPopup/VideoConfPopupControllers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ButtonGroup } from '@rocket.chat/fuselage';
import type { ReactNode, ReactElement } from 'react';

const VideoConfPopupControllers = ({ children }: { children: ReactNode }): ReactElement => <ButtonGroup medium>{children}</ButtonGroup>;
const VideoConfPopupControllers = ({ children }: { children: ReactNode }): ReactElement => <ButtonGroup>{children}</ButtonGroup>;

export default VideoConfPopupControllers;
2 changes: 1 addition & 1 deletion packages/ui-video-conf/src/VideoConfPopup/VideoConfPopupFooterButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ButtonGroup } from '@rocket.chat/fuselage';
import type { ReactNode, ReactElement } from 'react';

const VideoConfPopupFooterButtons = ({ children }: { children: ReactNode }): ReactElement => (
<ButtonGroup medium width='full' stretch>
<ButtonGroup width='full' stretch>
{children}
</ButtonGroup>
);
Expand Down
3 changes: 1 addition & 2 deletions packages/web-ui-registration/src/RegisterFormDisabled.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ButtonGroup, Callout } from '@rocket.chat/fuselage';
import { Callout } from '@rocket.chat/fuselage';
import { Form, ActionLink } from '@rocket.chat/layout';
import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
Expand All @@ -21,7 +21,6 @@ export const RegisterFormDisabled = ({ setLoginRoute }: { setLoginRoute: Dispatc
</Callout>
</Form.Container>
<Form.Footer>
<ButtonGroup></ButtonGroup>
<ActionLink
onClick={(): void => {
setLoginRoute('login');
Expand Down
78 changes: 68 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6352,6 +6352,19 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.23-dev.32":
version: 0.31.23-dev.32
resolution: "@rocket.chat/css-in-js@npm:0.31.23-dev.32"
dependencies:
"@emotion/hash": ^0.9.0
"@rocket.chat/css-supports": ~0.31.23-dev.32
"@rocket.chat/memo": ~0.31.23-dev.32
"@rocket.chat/stylis-logical-props-middleware": ~0.31.23-dev.32
stylis: ~4.1.3
checksum: ba4a791b093a515884000c9c1b60d1b604913a8e20a026c840d55e8df6646c2eb04f0cca9f535113deb201363d5831de247529c70f2da6d0e3364fdb9f33437c
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.23-dev.19":
version: 0.31.23-dev.19
resolution: "@rocket.chat/css-supports@npm:0.31.23-dev.19"
Expand All @@ -6361,6 +6374,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.23-dev.32":
version: 0.31.23-dev.32
resolution: "@rocket.chat/css-supports@npm:0.31.23-dev.32"
dependencies:
"@rocket.chat/memo": ~0.31.23-dev.32
checksum: f81a5740be2f8aed085097d184e295f8d05aa607f33092b404d98107381f5bdd73d4d43d024c008033cb6d25a8976885d5cdd494a0e0c1051561c9b153de87fd
languageName: node
linkType: hard

"@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer":
version: 0.0.0-use.local
resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer"
Expand Down Expand Up @@ -6537,13 +6559,20 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:next, @rocket.chat/fuselage-tokens@npm:~0.32.0-dev.195":
"@rocket.chat/fuselage-tokens@npm:next":
version: 0.32.0-dev.195
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.195"
checksum: 04fa9dfb8c13f33db4f6457ebe95e00a0bc5df7276a71614b8029a1489b79a6b5335f99c40bab382c0a791f4d078efc243007864dbc51da86322b13cc736b1c3
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.208":
version: 0.32.0-dev.208
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.208"
checksum: 8932879ecf699fd2d5aecdd02fa6c1cc2de84843f7d7113b89210954dfb6793103dba18520d6a0a1e22e5b534098aa0d7d143c24e44866becb253d47dad0f298
languageName: node
linkType: hard

"@rocket.chat/fuselage-ui-kit@workspace:^, @rocket.chat/fuselage-ui-kit@workspace:packages/fuselage-ui-kit":
version: 0.0.0-use.local
resolution: "@rocket.chat/fuselage-ui-kit@workspace:packages/fuselage-ui-kit"
Expand Down Expand Up @@ -6600,14 +6629,14 @@ __metadata:
linkType: soft

"@rocket.chat/fuselage@npm:next":
version: 0.32.0-dev.245
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.245"
dependencies:
"@rocket.chat/css-in-js": ~0.31.23-dev.19
"@rocket.chat/css-supports": ~0.31.23-dev.19
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.195
"@rocket.chat/memo": ~0.31.23-dev.19
"@rocket.chat/styled": ~0.31.23-dev.19
version: 0.32.0-dev.258
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.258"
dependencies:
"@rocket.chat/css-in-js": ~0.31.23-dev.32
"@rocket.chat/css-supports": ~0.31.23-dev.32
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.208
"@rocket.chat/memo": ~0.31.23-dev.32
"@rocket.chat/styled": ~0.31.23-dev.32
invariant: ^2.2.4
react-aria: ~3.19.0
react-keyed-flatten-children: ^1.3.0
Expand All @@ -6619,7 +6648,7 @@ __metadata:
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: e472a85fe9a0850070b51e5780a05eb030a10a8c50e6c6f5176f6939d8a868b1ea040e82268cc426bbe3f66618188bef58ab755103177aad01fbc2fda1648527
checksum: 22765771344b390b12063a6c6d9b5bc980178e9f69048a81b463da68ac73c3c16e74ce64d1d9d23505ecf2a9a7ea96c20df603d47fd8ddcf4d17f3b179dba6b5
languageName: node
linkType: hard

Expand Down Expand Up @@ -6807,6 +6836,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.23-dev.32":
version: 0.31.23-dev.32
resolution: "@rocket.chat/memo@npm:0.31.23-dev.32"
checksum: 43f89a00717ff5f9d3e1d01e70f546723c16a717ba61f2e0f9b990294675bc47e00567407afc6564a5b279eb38fc52cc0515ee731a52f7d820afbab3180739ab
languageName: node
linkType: hard

"@rocket.chat/message-parser@npm:next":
version: 0.32.0-dev.193
resolution: "@rocket.chat/message-parser@npm:0.32.0-dev.193"
Expand Down Expand Up @@ -7367,6 +7403,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.23-dev.32":
version: 0.31.23-dev.32
resolution: "@rocket.chat/styled@npm:0.31.23-dev.32"
dependencies:
"@rocket.chat/css-in-js": ~0.31.23-dev.32
tslib: ^2.3.1
checksum: b7cc29dc51365cf757a77688ebc5bb5e5a1a101dc378e3006d7af72c3db21a5fde0ab5d3da02915119743c0ed15504854eadb8997384a79ccd594d180b315405
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.23-dev.19":
version: 0.31.23-dev.19
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.23-dev.19"
Expand All @@ -7379,6 +7425,18 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.23-dev.32":
version: 0.31.23-dev.32
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.23-dev.32"
dependencies:
"@rocket.chat/css-supports": ~0.31.23-dev.32
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: e58a326213f73f609dfb1425a5adf17ee35d311de5b6da0e56e11a0b342ea1af0405b92abb9d2232a8b26378dff05cad0540f1ca30f15529258e354837800b09
languageName: node
linkType: hard

"@rocket.chat/ui-client@workspace:^, @rocket.chat/ui-client@workspace:packages/ui-client":
version: 0.0.0-use.local
resolution: "@rocket.chat/ui-client@workspace:packages/ui-client"
Expand Down