Skip to content

Commit

Permalink
Regression: Sidebar icons spacing (#26139)
Browse files Browse the repository at this point in the history
Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
  • Loading branch information
guijun13 and ggazzo authored Jul 14, 2022
1 parent 37fa59c commit 3f5254d
Show file tree
Hide file tree
Showing 21 changed files with 66 additions and 76 deletions.
2 changes: 1 addition & 1 deletion apps/meteor/client/sidebar/Item/Condensed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const Condensed: FC<CondensedProps> = ({ icon, title = '', avatar, actions, href
{badges && <Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>}
{menu && (
<Sidebar.Item.Menu {...handleMenuEvent}>
{menuVisibility ? menu() : <IconButton square mini rcx-sidebar-item__menu icon='kebab' />}
{menuVisibility ? menu() : <IconButton mini rcx-sidebar-item__menu icon='kebab' />}
</Sidebar.Item.Menu>
)}
</Sidebar.Item.Content>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/sidebar/Item/Extended.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const Extended: VFC<ExtendedProps> = ({
<Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>
{menu && (
<Sidebar.Item.Menu {...handleMenuEvent}>
{menuVisibility ? menu() : <IconButton square mini rcx-sidebar-item__menu icon='kebab' />}
{menuVisibility ? menu() : <IconButton mini rcx-sidebar-item__menu icon='kebab' />}
</Sidebar.Item.Menu>
)}
</Sidebar.Item.Wrapper>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/sidebar/Item/Medium.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Medium: VFC<MediumProps> = ({ icon, title = '', avatar, actions, href, bad
{badges && <Sidebar.Item.Badge>{badges}</Sidebar.Item.Badge>}
{menu && (
<Sidebar.Item.Menu {...handleMenuEvent}>
{menuVisibility ? menu() : <IconButton square mini rcx-sidebar-item__menu icon='kebab' />}
{menuVisibility ? menu() : <IconButton mini rcx-sidebar-item__menu icon='kebab' />}
</Sidebar.Item.Menu>
)}
</Sidebar.Item.Content>
Expand Down
2 changes: 0 additions & 2 deletions apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ export const VoipFooter = ({
color={muted ? 'neutral-500' : 'info'}
icon='mic'
small
square
onClick={(e): void => {
e.stopPropagation();
toggleMic(!muted);
Expand All @@ -108,7 +107,6 @@ export const VoipFooter = ({
icon='pause-unfilled'
color={paused ? 'neutral-500' : 'info'}
small
square
onClick={handleHold}
/>
{options && <Menu color='neutral-500' options={options} />}
Expand Down
8 changes: 2 additions & 6 deletions apps/meteor/client/sidebar/header/actions/CreateRoom.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Sidebar, Dropdown } from '@rocket.chat/fuselage';
import { Sidebar, Dropdown } from '@rocket.chat/fuselage';
import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
import React, { HTMLAttributes, useRef, VFC } from 'react';
import { createPortal } from 'react-dom';
Expand All @@ -17,11 +17,7 @@ const CreateRoom: VFC<Omit<HTMLAttributes<HTMLElement>, 'is'>> = (props) => {

return (
<>
{showCreate && (
<Box ref={reference}>
<Sidebar.TopBar.Action {...props} icon='edit-rounded' onClick={(): void => toggle()} />
</Box>
)}
{showCreate && <Sidebar.TopBar.Action icon='edit-rounded' onClick={(): void => toggle()} {...props} ref={reference} />}
{isVisible &&
createPortal(
<Dropdown reference={reference} ref={target}>
Expand Down
6 changes: 2 additions & 4 deletions apps/meteor/client/sidebar/header/actions/Sort.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Sidebar, Dropdown } from '@rocket.chat/fuselage';
import { Sidebar, Dropdown } from '@rocket.chat/fuselage';
import React, { VFC, useRef, HTMLAttributes } from 'react';
import { createPortal } from 'react-dom';

Expand All @@ -12,9 +12,7 @@ const Sort: VFC<Omit<HTMLAttributes<HTMLElement>, 'is'>> = (props) => {

return (
<>
<Box ref={reference}>
<Sidebar.TopBar.Action {...props} icon='sort' onClick={(): void => toggle()} />
</Box>
<Sidebar.TopBar.Action {...props} icon='sort' onClick={(): void => toggle()} ref={reference} />
{isVisible &&
createPortal(
<Dropdown reference={reference} ref={target}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import React, { ReactElement } from 'react';
import { useVoipOutboundStates } from '../../../contexts/CallContext';
import { useDialModal } from '../../../hooks/useDialModal';

export const OmniChannelCallDialPad = (): ReactElement => {
export const OmniChannelCallDialPad = ({ ...props }): ReactElement => {
const t = useTranslation();

const { openDialModal } = useDialModal();
Expand All @@ -18,6 +18,7 @@ export const OmniChannelCallDialPad = (): ReactElement => {
icon='dialpad'
onClick={(): void => openDialModal()}
disabled={!outBoundCallsEnabledForUser}
{...props}
/>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ import { OmnichannelCallToggleError } from './OmnichannelCallToggleError';
import { OmnichannelCallToggleLoading } from './OmnichannelCallToggleLoading';
import { OmnichannelCallToggleReady } from './OmnichannelCallToggleReady';

export const OmnichannelCallToggle = (): ReactElement => {
export const OmnichannelCallToggle = ({ ...props }): ReactElement => {
const isCallReady = useIsCallReady();
const isCallError = useIsCallError();
if (isCallError) {
return <OmnichannelCallToggleError />;
return <OmnichannelCallToggleError {...props} />;
}

if (!isCallReady) {
return <OmnichannelCallToggleLoading />;
return <OmnichannelCallToggleLoading {...props} />;
}

return <OmnichannelCallToggleReady />;
return <OmnichannelCallToggleReady {...props} />;
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Sidebar } from '@rocket.chat/fuselage';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React, { ReactElement } from 'react';

export const OmnichannelCallToggleError = (): ReactElement => {
export const OmnichannelCallToggleError = ({ ...props }): ReactElement => {
const t = useTranslation();
return <Sidebar.TopBar.Action icon='phone' danger data-title={t('Error')} disabled />;
return <Sidebar.TopBar.Action icon='phone' danger data-title={t('Error')} disabled {...props} />;
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Sidebar } from '@rocket.chat/fuselage';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React, { ReactElement } from 'react';

export const OmnichannelCallToggleLoading = (): ReactElement => {
export const OmnichannelCallToggleLoading = ({ ...props }): ReactElement => {
const t = useTranslation();
return <Sidebar.TopBar.Action icon='phone' data-title={t('Loading')} disabled />;
return <Sidebar.TopBar.Action icon='phone' data-title={t('Loading')} disabled {...props} />;
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React, { ReactElement, useCallback } from 'react';

import { useCallerInfo, useCallRegisterClient, useCallUnregisterClient } from '../../../contexts/CallContext';

export const OmnichannelCallToggleReady = (): ReactElement => {
export const OmnichannelCallToggleReady = ({ ...props }): ReactElement => {
const t = useTranslation();

const caller = useCallerInfo();
Expand Down Expand Up @@ -59,5 +59,5 @@ export const OmnichannelCallToggleReady = (): ReactElement => {
color: getColor(),
};

return <Sidebar.TopBar.Action disabled={inCall} {...voipCallIcon} onClick={onClickVoipButton} />;
return <Sidebar.TopBar.Action disabled={inCall} {...voipCallIcon} {...props} onClick={onClickVoipButton} />;
};
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const EditCustomEmoji: FC<EditCustomEmojiProps> = ({ close, onChange, data, ...p
<Field>
<Field.Label alignSelf='stretch' display='flex' justifyContent='space-between' alignItems='center'>
{t('Custom_Emoji')}
<IconButton icon='upload' secondary square onClick={clickUpload} />
<IconButton icon='upload' secondary onClick={clickUpload} />
</Field.Label>
{newEmojiPreview && (
<Box display='flex' flexDirection='row' mbs='none' justifyContent='center'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ function CustomSoundsRoute(): ReactElement {
<IconButton
icon='play'
small
square
aria-label={t('Play')}
onClick={(e): void => {
e.preventDefault();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const RemoveAllClosed: FC<{
},
}),
};
return <Menu alignSelf='flex-end' small={false} square options={menuOptions} placement='bottom-start' {...props} />;
return <Menu alignSelf='flex-end' small={false} options={menuOptions} placement='bottom-start' {...props} />;
};

export default RemoveAllClosed;
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export const CallDialpadButton = ({ phoneNumber }: { phoneNumber: string }): Rea
title={outBoundCallsAllowed ? t('Call_number') : t('Call_number_enterprise_only')}
disabled={!outBoundCallsEnabledForUser || !phoneNumber}
tiny
square
icon='phone'
onClick={onClick}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const NotificationPreferences = ({
options={handleOptions.sound}
optionDefault={formValues?.desktopSound}
>
<IconButton icon='play' mis='x4' square onClick={handlePlaySound} />
<IconButton icon='play' mis='x4' onClick={handlePlaySound} />
</Preferences>
</NotificationByDevice>
<NotificationByDevice device={t('Mobile')} icon={'mobile'}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const IconButton = ({ name, action, title }: IconButtonProps): ReactElement => (
size='24px'
color='neutral-700'
small
square
display='flex'
justifyContent='center'
alignItems='center'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ const ContentForDays = ({ displacement, onPreviousDateClick, onNextDateClick, ti
<>
<Flex.Container alignItems='center' justifyContent='center'>
<Box>
<IconButton icon='chevron-down' square small onClick={onPreviousDateClick} style={{ verticalAlign: 'middle' }} />
<IconButton icon='chevron-down' small onClick={onPreviousDateClick} style={{ verticalAlign: 'middle' }} />
<Flex.Item basis='50%'>
<Margins inline='x8'>
<Box is='span' style={{ textAlign: 'center' }}>
{formattedCurrentDate}
</Box>
</Margins>
</Flex.Item>
<IconButton icon='chevron-down' square small disabled={displacement === 0} onClick={onNextDateClick} />
<IconButton icon='chevron-down' small disabled={displacement === 0} onClick={onNextDateClick} />
</Box>
</Flex.Container>
<Flex.Container>
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/client/voip/modal/DialPad/DialInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const DialInput = forwardRef(function DialInput(
ref={_ref}
textAlign='center'
placeholder={t('Phone_number')}
addon={<IconButton icon='backspace' small square size='20px' disabled={isButtonDisabled} onClick={handleBackspaceClick} />}
addon={<IconButton icon='backspace' small size='20px' disabled={isButtonDisabled} onClick={handleBackspaceClick} />}
error={inputError}
onChange={handleOnChange}
name={inputName}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/forked-matrix-appservice-bridge": "^4.0.1",
"@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.2",
"@rocket.chat/fuselage": "^0.32.0-dev.80",
"@rocket.chat/fuselage": "^0.32.0-dev.83",
"@rocket.chat/fuselage-hooks": "~0.31.15-dev.6",
"@rocket.chat/fuselage-polyfills": "~0.31.15-dev.6",
"@rocket.chat/fuselage-toastbar": "^0.32.0-dev.47",
Expand Down
80 changes: 40 additions & 40 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3373,16 +3373,16 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-in-js@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/css-in-js@npm:0.31.15-dev.13"
"@rocket.chat/css-in-js@npm:~0.31.15-dev.16":
version: 0.31.15-dev.16
resolution: "@rocket.chat/css-in-js@npm:0.31.15-dev.16"
dependencies:
"@emotion/hash": ^0.8.0
"@rocket.chat/css-supports": ~0.31.15-dev.13
"@rocket.chat/memo": ~0.31.15-dev.13
"@rocket.chat/stylis-logical-props-middleware": ~0.31.15-dev.13
"@rocket.chat/css-supports": ~0.31.15-dev.16
"@rocket.chat/memo": ~0.31.15-dev.16
"@rocket.chat/stylis-logical-props-middleware": ~0.31.15-dev.16
stylis: ~4.0.13
checksum: fd184810341c93d638339511b966a3f31a5c047db9d45f288b17fbc0fca16ef40dc17c0255ceab860989a181ea8460641c18ef584138423470dfc38521d72a9e
checksum: 493c97eaafcaa843d1d8317ff49b47efad3ed4df0672be0a3f5362745eec2f82e043bef0bdb5aa91a5dbcbd905d0a46b3d32e1e2aaa21b547b98861a67d22fb2
languageName: node
linkType: hard

Expand Down Expand Up @@ -3421,12 +3421,12 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/css-supports@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/css-supports@npm:0.31.15-dev.13"
"@rocket.chat/css-supports@npm:~0.31.15-dev.16":
version: 0.31.15-dev.16
resolution: "@rocket.chat/css-supports@npm:0.31.15-dev.16"
dependencies:
"@rocket.chat/memo": ~0.31.15-dev.13
checksum: 66acbc25e38c5f658a7dae49ca8b901dd73b6bcf456bf5081aab1bf6bf6f3a2015d0a58f2e2e37ca447d12d4ebd9b79aae47d12f7bac12a69078e45e4ba35345
"@rocket.chat/memo": ~0.31.15-dev.16
checksum: 7c6a1a50a772c42e9995e630e060f7bae38f208b6152c08e5a1767052f8935cc5536c9e9ae68cb5888344b3a7eb61dea0dcc50337c0b377a429dacb3f4e6a42f
languageName: node
linkType: hard

Expand Down Expand Up @@ -3671,10 +3671,10 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.30":
version: 0.32.0-dev.30
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.30"
checksum: bc1852f705a8a33077f218094f39b378928a86f95b6f22161e0832448175671134c03867efc160a9882d0f9e10ba7c2501928e35edee64bb5d570001212d0e0d
"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.33":
version: 0.32.0-dev.33
resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.33"
checksum: 3c11a6945c2951776ea2d270a9e3d019d8c06a511a902d739e99c73b90b57faa4ad367cabdeccafbfb3fa92d5fd09df86c9158a15d58cc1c60945c20718ee810
languageName: node
linkType: hard

Expand Down Expand Up @@ -3718,15 +3718,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/fuselage@npm:^0.32.0-dev.80":
version: 0.32.0-dev.80
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.80"
"@rocket.chat/fuselage@npm:^0.32.0-dev.83":
version: 0.32.0-dev.83
resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.83"
dependencies:
"@rocket.chat/css-in-js": ~0.31.15-dev.13
"@rocket.chat/css-supports": ~0.31.15-dev.13
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.30
"@rocket.chat/memo": ~0.31.15-dev.13
"@rocket.chat/styled": ~0.31.15-dev.13
"@rocket.chat/css-in-js": ~0.31.15-dev.16
"@rocket.chat/css-supports": ~0.31.15-dev.16
"@rocket.chat/fuselage-tokens": ~0.32.0-dev.33
"@rocket.chat/memo": ~0.31.15-dev.16
"@rocket.chat/styled": ~0.31.15-dev.16
invariant: ^2.2.4
react-keyed-flatten-children: ^1.3.0
peerDependencies:
Expand All @@ -3736,7 +3736,7 @@ __metadata:
react: ^17.0.2
react-dom: ^17.0.2
react-virtuoso: 1.2.4
checksum: 4d5faff19704b3665cd7d4c5c621fdbe3b021e2d17de695ce5ba92b76a1f1c205025560249ad018bdfadfaf26663e29b571603a782467138c7af8b19fbecb4f2
checksum: b9d7c7fd11f9653950542b25dcad93bdb2077f6bac1ea03c3b2497ef43e32b994904cb46d36122966fa3151b704e8829a3adc5722a594c862f72c7962735353a
languageName: node
linkType: hard

Expand Down Expand Up @@ -3953,10 +3953,10 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/memo@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/memo@npm:0.31.15-dev.13"
checksum: 41a5a8006ea9356e1a3cf83d73649d797c6d48f3373be31a1dd1c9e3a0ba05a6101d8462e0e22cc47c0d116b439c7ba3d2f03a3d4b12d9bbd7fd0cc9879f77da
"@rocket.chat/memo@npm:~0.31.15-dev.16":
version: 0.31.15-dev.16
resolution: "@rocket.chat/memo@npm:0.31.15-dev.16"
checksum: b9902dcc072d9cb6f1ed9132e2fd51f537b47f5bc985d77b4c792fd1de23c60caea4f55ed685e1fea4dd3e32bbeb911029bb01617cccee18949271b0f9ea329f
languageName: node
linkType: hard

Expand Down Expand Up @@ -4019,7 +4019,7 @@ __metadata:
"@rocket.chat/favicon": "workspace:^"
"@rocket.chat/forked-matrix-appservice-bridge": ^4.0.1
"@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.2
"@rocket.chat/fuselage": ^0.32.0-dev.80
"@rocket.chat/fuselage": ^0.32.0-dev.83
"@rocket.chat/fuselage-hooks": ~0.31.15-dev.6
"@rocket.chat/fuselage-polyfills": ~0.31.15-dev.6
"@rocket.chat/fuselage-toastbar": ^0.32.0-dev.47
Expand Down Expand Up @@ -4435,13 +4435,13 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/styled@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/styled@npm:0.31.15-dev.13"
"@rocket.chat/styled@npm:~0.31.15-dev.16":
version: 0.31.15-dev.16
resolution: "@rocket.chat/styled@npm:0.31.15-dev.16"
dependencies:
"@rocket.chat/css-in-js": ~0.31.15-dev.13
"@rocket.chat/css-in-js": ~0.31.15-dev.16
tslib: ^2.3.1
checksum: 08ed3e23a24a4d88da403bfd7ee2eb1f0f749300ffde972410676b2eff6eebd39a77a786b6394d51b0461aae40a1990779cf6b682b47bc3899319d12afbe46e4
checksum: 744b50305bf277ff4ecbf790c9216f9db9b0f7024d007431c67d3a8fc9ce09822c46b2ea4dd2b1696a5cc4584eb9bdb600e8f5ab74a09b8621b0692e874e36f4
languageName: node
linkType: hard

Expand Down Expand Up @@ -4477,15 +4477,15 @@ __metadata:
languageName: node
linkType: hard

"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.15-dev.13":
version: 0.31.15-dev.13
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.15-dev.13"
"@rocket.chat/stylis-logical-props-middleware@npm:~0.31.15-dev.16":
version: 0.31.15-dev.16
resolution: "@rocket.chat/stylis-logical-props-middleware@npm:0.31.15-dev.16"
dependencies:
"@rocket.chat/css-supports": ~0.31.15-dev.13
"@rocket.chat/css-supports": ~0.31.15-dev.16
tslib: ^2.3.1
peerDependencies:
stylis: 4.0.10
checksum: 8991b675eb18c18e46926deab8b1a684bb8b5f6a4bfc3e71222815fc2842c24182c4cdc970850b6213d79daa1816026d09703c3c14365762de40c0ef179cab1e
checksum: 5879adda3823e5feea786184a131e1595be3eb6696edb915cf38db21698b2660a44e69eba2f2d530a32c06b483e3352da353d6fa1251fe4e87cb12c51c9dc2a1
languageName: node
linkType: hard

Expand Down

0 comments on commit 3f5254d

Please sign in to comment.