Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 26 additions & 21 deletions client/components/Header/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
import { Box } from '@rocket.chat/fuselage';
import React, { FC } from 'react';

import { useLayout } from '../../contexts/LayoutContext';
import HeaderDivider from './HeaderDivider';

const Header: FC<any> = (props) => (
<Box
rcx-room-header
is='header'
height='x64'
display='flex'
justifyContent='center'
flexDirection='column'
overflow='hidden'
flexShrink={0}
>
const Header: FC<any> = (props) => {
const { isMobile } = useLayout();

return (
<Box
rcx-room-header
is='header'
height='x64'
mi='neg-x4'
pi='x24'
display='flex'
flexGrow={1}
justifyContent='center'
alignItems='center'
flexDirection='column'
overflow='hidden'
flexDirection='row'
{...props}
/>
<HeaderDivider />
</Box>
);
flexShrink={0}
>
<Box
height='x64'
mi='neg-x4'
pi={isMobile ? 'x12' : 'x24'}
display='flex'
flexGrow={1}
justifyContent='center'
alignItems='center'
overflow='hidden'
flexDirection='row'
{...props}
/>
<HeaderDivider />
</Box>
);
};

export default Header;
4 changes: 2 additions & 2 deletions client/views/room/Header/DirectRoomHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import { useUserId } from '../../../contexts/UserContext';
import { useUserData } from '../../../hooks/useUserData';
import RoomHeader from './RoomHeader';

const DirectRoomHeader = ({ room }) => {
const DirectRoomHeader = ({ room, slots }) => {
const userId = useUserId();
const directUserId = room.uids.filter((uid) => uid !== userId).shift();
const directUserData = useUserData(directUserId);

return <RoomHeader room={room} topic={directUserData?.statusText} />;
return <RoomHeader slots={slots} room={room} topic={directUserData?.statusText} />;
};

export default DirectRoomHeader;
1 change: 1 addition & 0 deletions client/views/room/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import RoomHeader from './RoomHeader';

const Header = ({ room }) => {
const { isMobile, isEmbedded, showTopNavbarEmbeddedLayout } = useLayout();

const slots = useMemo(
() => ({
start: isMobile && (
Expand Down