apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[NEW] Remove Box props from Avatar component (#19491)

Browse Source 
Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
pull/19564/head
Tiago Evangelista Pinto 5 years ago committed by GitHub
parent 9603d5e414
commit 1faffee2ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 106 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      client/components/RoomForeword.js
  2. 10
      client/components/basic/UserCard.js
  3. 4
      client/components/basic/UserInfo.js
  4. 19
      client/components/basic/avatar/UserAvatarEditor.js
  5. 4
      client/views/directory/ChannelsTab.js
  6. 88
      package-lock.json
  7. 18
      package.json

13
client/components/RoomForeword.js
Unescape View File

@ -32,8 +32,17 @@ const RoomForeword = ({ _id: rid }) => {
const avatarUrl = getUserAvatarURL(username, user?.avatarETag);
return <Avatar size='x48' title={username} url={avatarUrl} key={index} data-username={username} />;
})}
return (
<Avatar
key={index}
size='x48'
title={username}
url={avatarUrl}
data-username={username}
/>
);
},
)}
</Avatar.Stack>
</Margins>
</Flex.Item>

10
client/components/basic/UserCard.js
Unescape View File

@ -36,11 +36,11 @@ const Roles = ({ children }) => <Info rcx-user-card__roles m='neg-x2' flexWrap='
{children}
</Info>;
const Role = ({ children }) => (
<Box pb={0} m='x2'>
<Tag disabled small children={children}/>
</Box>
);
const Role = ({ children }) => <Box m='x2'><Tag
disabled
fontScale='c2'
children={children}
/></Box>;
const UserCardContainer = forwardRef((props, ref) => <Box rcx-user-card bg='surface' elevation='2' p='x24' display='flex' borderRadius='x2' width='439px' {...props} ref={ref}/>);
const UserCard = forwardRef(({

4
client/components/basic/UserInfo.js
Unescape View File

@ -46,7 +46,9 @@ export const UserInfo = React.memo(function UserInfo({
return <VerticalBar.ScrollableContent p='x24' {...props}>
<Avatar size={'x332'} username={username} etag={data?.avatarETag}/>
<Box>
<Avatar size={'x332'} username={username} etag={data?.avatarETag}/>
</Box>
{actions}

19
client/components/basic/avatar/UserAvatarEditor.js
Unescape View File

@ -12,9 +12,18 @@ function UserAvatarSuggestions({ suggestions, setAvatarObj, setNewAvatarSource,
}, [setAvatarObj, setNewAvatarSource]);
return <Margins inline='x4' {...props}>
{Object.values(suggestions).map((suggestion) => <Button key={suggestion.service} disabled={disabled} square onClick={handleClick(suggestion)}>
<Avatar title={suggestion.service} size='x36' url={suggestion.blob} mie='x4'/>
</Button>)}
{Object.values(suggestions)
.map((suggestion) =>
<Button
key={suggestion.service}
disabled={disabled}
square
onClick={handleClick(suggestion)}
>
<Box mie='x4'>
<Avatar title={suggestion.service} url={suggestion.blob} />
</Box>
</Button>)}
</Margins>;
}
@ -52,7 +61,9 @@ export function UserAvatarEditor({ username, setAvatarObj, suggestions, disabled
<Box display='flex' flexDirection='column' flexGrow='1' justifyContent='space-between' mis='x4'>
<Box display='flex' flexDirection='row' mbs='none'>
<Margins inline='x4'>
<Button square mis='none' onClick={clickReset} disabled={disabled} mie='x4'><Avatar size='x36' url={`/avatar/%40${ username }`}/></Button>
<Button square mis='none' onClick={clickReset} disabled={disabled} mie='x4'>
<Avatar url={`/avatar/%40${ username }`}/>
</Button>
<Button square onClick={clickUpload} disabled={disabled}><Icon name='upload' size='x20'/></Button>
<Button square mie='none' onClick={clickUrl} disabled={disabled}><Icon name='permalink' size='x20'/></Button>
{suggestions && <UserAvatarSuggestions suggestions={suggestions} setAvatarObj={setAvatarObj} setNewAvatarSource={setNewAvatarSource} disabled={disabled}/>}

4
client/views/directory/ChannelsTab.js
Unescape View File

@ -70,7 +70,9 @@ function ChannelsTable() {
return <Table.Row key={_id} onKeyDown={onClick(name)} onClick={onClick(name)} tabIndex={0} role='link' action>
<Table.Cell>
<Box display='flex'>
<Avatar size='x40' title={fname || name} url={avatarUrl} flexGrow={0} />
<Box flexGrow={0}>
<Avatar size='x40' title={fname || name} url={avatarUrl} />
</Box>
<Box grow={1} mi='x8' style={style}>
<Box display='flex' alignItems='center'>
<Icon name={roomTypes.getIcon(room)} color='hint' /> <Box fontScale='p2' mi='x4'>{fname || name}</Box><RoomTags room={room} style={style} />

88
package-lock.json generated
Unescape View File

@ -5041,18 +5041,18 @@
}
},
"@rocket.chat/css-in-js": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.18.0.tgz",
"integrity": "sha512-j3xYgcI8jFUd7owrcbwCR6JkDfxDIEnzjE7ErzIox9W02Dvy3b4WblbxdicBZgf5cK0HaB/up0ciL8xHh9Fczw==",
"version": "0.6.3-dev.136",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.3-dev.136.tgz",
"integrity": "sha512-ElIU3ErC1jxmB8wGZPfE8FlV+sySD539BNQfP9ZpsKuSO9uImQ3fgcGzD/7u8jA2QXcAg34HqhXaRFIVkwJTZQ==",
"requires": {
"@emotion/hash": "^0.8.0",
"@emotion/stylis": "^0.8.5"
}
},
"@rocket.chat/emitter": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/emitter/-/emitter-0.18.0.tgz",
"integrity": "sha512-uHWSaYm+fEdr8iYkUIQrqRGG+WGzW7DzOBUMhjQpFTTdVpZL6ZTd9btJuAtaGYtet4NLs56Y07aslTviwwVEIA=="
"version": "0.6.3-dev.136",
"resolved": "https://registry.npmjs.org/@rocket.chat/emitter/-/emitter-0.6.3-dev.136.tgz",
"integrity": "sha512-KePArLKwlJmeFh+bSwLriWtRWAYEPKMKNw8783V6hT8SK/31p8+tqiesfq4zxFq90O212AJVD31TYu/KhNYDlA=="
},
"@rocket.chat/eslint-config": {
"version": "0.3.0",
@ -5064,29 +5064,47 @@
}
},
"@rocket.chat/fuselage": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.18.0.tgz",
"integrity": "sha512-ZWvWzvTT/g3FYE64OhkKUT0Glf8VgsssV0q+baHF36hAUNAEm7kKHV1OInXZfgvGbiU3XUdWoLnszzkVDMhxDg==",
"version": "0.6.3-dev.137",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.3-dev.137.tgz",
"integrity": "sha512-VksO9IPQpGdN/+Vs2N0eA+mPeefNYb+to83jbKlKODGgSzbl/z1XVbSWkahvvO0Hw8133tm0Ug4CS+LPH7m7/g==",
"requires": {
"@rocket.chat/css-in-js": "^0.18.0",
"@rocket.chat/fuselage-tokens": "^0.18.0",
"invariant": "^2.2.4",
"react-keyed-flatten-children": "^1.2.0"
},
"dependencies": {
"@rocket.chat/css-in-js": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.18.0.tgz",
"integrity": "sha512-j3xYgcI8jFUd7owrcbwCR6JkDfxDIEnzjE7ErzIox9W02Dvy3b4WblbxdicBZgf5cK0HaB/up0ciL8xHh9Fczw==",
"requires": {
"@emotion/hash": "^0.8.0",
"@emotion/stylis": "^0.8.5"
}
}
}
},
"@rocket.chat/fuselage-hooks": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.18.0.tgz",
"integrity": "sha512-nGwAMHjorR9tEEZUq5eXrcZ4uj/FCnHkb9FRt8XRSuFXFiMIcQr3LAF8VuUdljehg3EE/KP1ImqLGNizu/tgdw==",
"version": "0.6.3-dev.136",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.3-dev.136.tgz",
"integrity": "sha512-FWJzMr0i2zCKlbF+Kcafxbru+wtA0cWB0XmewVf2cXJANVQAU0Ab8f4HaWGgy2zuWjKInvHl6PNMo5tVhIJYOA==",
"requires": {
"@rocket.chat/fuselage-tokens": "^0.18.0",
"@rocket.chat/fuselage-tokens": "^0.6.3-dev.136+713009bf",
"use-subscription": "^1.4.1"
},
"dependencies": {
"@rocket.chat/fuselage-tokens": {
"version": "0.6.3-dev.136",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.3-dev.136.tgz",
"integrity": "sha512-2UKsRIC+Vrc5LaoaiN5t5J1rfYz61YhGQ020iTudYx8vYoaUYtkK4A/XihoubI6tiWQmtq2PGZm5PPNQ8ny/tw=="
}
}
},
"@rocket.chat/fuselage-polyfills": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.18.0.tgz",
"integrity": "sha512-sUD0hq/q7g6s6iHVN82pxw9/V11oiX1ZaNSey/xdieaC934yyG1OqtCyisiESm+r4bKEb6t+2KYAF2sGzPYmEg==",
"version": "0.6.3-dev.136",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.6.3-dev.136.tgz",
"integrity": "sha512-DXCFQRSL65Am41pZHdH//TJiZKF2kAp/NALTPPUXZoP//ZQjzc7eIeKJ/NwCxYihXF8+GJpJhO72NpAjudPWXA==",
"requires": {
"@juggle/resize-observer": "^3.1.2",
"clipboard-polyfill": "^3.0.1",
@ -5101,17 +5119,31 @@
"integrity": "sha512-Zt+QXmvzyPogPRc8OE33d6fZaQ41WRaFqDPh6d79A7TEOTyDv57pZnc/xSpf2MFWl08o43l/7rtLwoY5c4D9Ow=="
},
"@rocket.chat/fuselage-ui-kit": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.18.0.tgz",
"integrity": "sha512-K+0oEj2mi3a4T8ivKmDR+avOwu/SBNmqGUc3PRKVNLy92JAeegNYpY2Ru8arJL9c9qH0IgKuNCOxI70EXWvbnw==",
"version": "0.6.3-dev.137",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.3-dev.137.tgz",
"integrity": "sha512-a7QID8nh+HgGeycP1d9rhFubVwDJ6hTK/0qH0xN2T4mqc6pm4xOzxnv2/wIUL4agocY0TdR9gsy3VoEzxDvzIw==",
"requires": {
"@rocket.chat/fuselage-polyfills": "^0.18.0"
},
"dependencies": {
"@rocket.chat/fuselage-polyfills": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.18.0.tgz",
"integrity": "sha512-sUD0hq/q7g6s6iHVN82pxw9/V11oiX1ZaNSey/xdieaC934yyG1OqtCyisiESm+r4bKEb6t+2KYAF2sGzPYmEg==",
"requires": {
"@juggle/resize-observer": "^3.1.2",
"clipboard-polyfill": "^3.0.1",
"element-closest-polyfill": "^1.0.2",
"focus-visible": "^5.0.2",
"focus-within-polyfill": "^5.1.0"
}
}
}
},
"@rocket.chat/icons": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.18.0.tgz",
"integrity": "sha512-woYrsFjDQw3524WyU3nO1Og6hAKuoPEVGn2qExhoALs+TT8saAohAgwMhVS3dZYsQmx2NtF9GCPP1xaHl5binQ=="
"version": "0.6.3-dev.136",
"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.3-dev.136.tgz",
"integrity": "sha512-lT47rwjVJtNzwFPAR+CCq/sr/9pT5xKlya4ktBbf3SiKAIxnPmR4ZvceG72fKZEqLXu59yoVNkG44Zr2j0J4Kg=="
},
"@rocket.chat/livechat": {
"version": "1.7.6",
@ -5164,9 +5196,9 @@
}
},
"@rocket.chat/mp3-encoder": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/mp3-encoder/-/mp3-encoder-0.18.0.tgz",
"integrity": "sha512-UmmV4DtItK99YRoytWkSKmE7/NscK8+lro9eE/QR0+2neDYNq7d5ak9lH6KPb+Oxfgqj9yP8JC8pRilb0vlXig==",
"version": "0.6.3-dev.136",
"resolved": "https://registry.npmjs.org/@rocket.chat/mp3-encoder/-/mp3-encoder-0.6.3-dev.136.tgz",
"integrity": "sha512-mdu/lMK42fZjlxsFh4lCc08yBCRs4jZY0493+HWwErvlB10Ifr+av5dRjjyHPAsYJuf3rm8d2WTM+syL+gBPnw==",
"requires": {
"lamejs": "git+https://github.com/zhuker/lamejs.git"
}
@ -5214,9 +5246,9 @@
}
},
"@rocket.chat/ui-kit": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.18.0.tgz",
"integrity": "sha512-1Wiex/iT/8RfgNXvvyApvi62xi9NIJBxMStheQYy8EokZWOWX0LVmkYwsDWGAXeFgrjsdMn3Mo+MIkF+NHVq1A=="
"version": "0.6.3-dev.136",
"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.3-dev.136.tgz",
"integrity": "sha512-341dtnW3yJ4o4mheCPkSJt3r0aLgIlZTI1QyRBbIWvlp1ZiB/mLLbNXavLjA9Owlys8lAWe5p2SV4f94gXkETw=="
},
"@samverschueren/stream-to-observable": {
"version": "0.3.1",

18
package.json
Unescape View File

@ -137,15 +137,15 @@
"@nivo/line": "^0.61.1",
"@nivo/pie": "^0.61.1",
"@rocket.chat/apps-engine": "^1.19.0",
"@rocket.chat/css-in-js": "^0.18.0",
"@rocket.chat/emitter": "^0.18.0",
"@rocket.chat/fuselage": "^0.18.0",
"@rocket.chat/fuselage-hooks": "^0.18.0",
"@rocket.chat/fuselage-polyfills": "^0.18.0",
"@rocket.chat/fuselage-ui-kit": "^0.18.0",
"@rocket.chat/icons": "^0.18.0",
"@rocket.chat/mp3-encoder": "^0.18.0",
"@rocket.chat/ui-kit": "^0.18.0",
"@rocket.chat/css-in-js": "^0.6.3-dev.136",
"@rocket.chat/emitter": "^0.6.3-dev.136",
"@rocket.chat/fuselage": "^0.6.3-dev.137",
"@rocket.chat/fuselage-hooks": "^0.6.3-dev.136",
"@rocket.chat/fuselage-polyfills": "^0.6.3-dev.136",
"@rocket.chat/fuselage-ui-kit": "^0.6.3-dev.137",
"@rocket.chat/icons": "^0.6.3-dev.136",
"@rocket.chat/mp3-encoder": "^0.6.3-dev.136",
"@rocket.chat/ui-kit": "^0.6.3-dev.136",
"@slack/client": "^4.12.0",
"@types/fibers": "^3.1.0",
"@types/mkdirp": "^1.0.1",

Write Preview
Loading…
Cancel
Save