[FIX] Missing burger menu on direct messages (#22211)

pull/22301/head^2
Douglas Fabris 5 years ago committed by GitHub
parent 7b28e7d43a
commit 60ff3c690d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 47
      client/components/Header/Header.tsx
  2. 4
      client/views/room/Header/DirectRoomHeader.js
  3. 1
      client/views/room/Header/Header.js

@ -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,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;

@ -9,6 +9,7 @@ import RoomHeader from './RoomHeader';
const Header = ({ room }) => {
const { isMobile, isEmbedded, showTopNavbarEmbeddedLayout } = useLayout();
const slots = useMemo(
() => ({
start: isMobile && (

Loading…
Cancel
Save