Skip to content

[FIX] Remove size prop from StatusBullet component #21428

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
ggazzo merged 3 commits into from
Apr 20, 2021
Merged

[FIX] Remove size prop from StatusBullet component #21428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a11ee5
remove from all presence icons the prop size
tiagoevanp Apr 2, 2021
3a7d693
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
tiagoevanp Apr 15, 2021
d43dc9d
Update SidebarIcon.js
ggazzo Apr 20, 2021
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
6 changes: 1 addition & 5 deletions client/hooks/useRoomIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ export const colors = {
offline: 'neutral-600',
};

export const useRoomIcon = (
room: IRoom,
small = true,
): JSX.Element | { name: string; color?: string } | null => {
export const useRoomIcon = (room: IRoom): JSX.Element | { name: string; color?: string } | null => {
if (room.prid) {
return { name: 'baloons' };
}
Expand All @@ -38,7 +35,6 @@ export const useRoomIcon = (
return (
<ReactiveUserStatus
{...({
small,
uid: direct.uids.filter((uid) => uid !== room.u._id)[0] || room.u._id,
} as any)}
/>
Expand Down
4 changes: 2 additions & 2 deletions client/sidebar/RoomList/SidebarIcon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import React from 'react';

import { useRoomIcon } from '../../hooks/useRoomIcon';

const SidebarIcon = ({ room, small }) => {
const icon = useRoomIcon(room, small);
const SidebarIcon = ({ room }) => {
const icon = useRoomIcon(room);

return <Sidebar.Item.Icon {...(icon.name && icon)}>{!icon.name && icon}</Sidebar.Item.Icon>;
};
Expand Down
14 changes: 2 additions & 12 deletions client/sidebar/search/UserItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,11 @@ import React, { memo } from 'react';
import { roomTypes } from '../../../app/utils/client';
import { ReactiveUserStatus } from '../../components/UserStatus';

const UserItem = ({
item,
id,
style,
t,
SideBarItemTemplate,
AvatarTemplate,
useRealName,
sidebarViewMode,
}) => {
const UserItem = ({ item, id, style, t, SideBarItemTemplate, AvatarTemplate, useRealName }) => {
const title = useRealName ? item.fname || item.name : item.name || item.fname;
const small = sidebarViewMode !== 'medium';
const icon = (
<Sidebar.Item.Icon>
<ReactiveUserStatus small={small && 'small'} uid={item._id} />
<ReactiveUserStatus uid={item._id} />
</Sidebar.Item.Icon>
);
const href = roomTypes.getRouteLink(item.t, item);
Expand Down