Skip to content

Commit 38f234a

Browse files
authored
fix(Logo): fix condition display logo (#306)
1 parent 0b8abd3 commit 38f234a

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

src/components/AsideHeader/components/FirstPanel.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export const FirstPanel = React.forwardRef<HTMLDivElement>((_props, ref) => {
2525
customBackgroundClassName,
2626
className,
2727
hideCollapseButton,
28-
logo,
2928
qa,
3029
} = useAsideHeaderInnerContext();
3130
const visibleMenuItems = useVisibleMenuItems();
@@ -47,8 +46,7 @@ export const FirstPanel = React.forwardRef<HTMLDivElement>((_props, ref) => {
4746
{customBackground}
4847
</div>
4948
)}
50-
{/* TODO add new prop for hiding Header */}
51-
{logo && <Header />}
49+
<Header />
5250
{visibleMenuItems?.length ? (
5351
<CompositeBar
5452
type="menu"

src/components/AsideHeader/components/Header.tsx

+9-11
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,17 @@ export const Header = () => {
2626
[onClosePanel, logo],
2727
);
2828

29-
if (!logo) {
30-
return null;
31-
}
32-
3329
return (
3430
<div className={b('header', {['with-decoration']: headerDecoration})}>
35-
<Logo
36-
{...logo}
37-
onClick={onLogoClick}
38-
compact={compact}
39-
buttonWrapperClassName={b('logo-button-wrapper')}
40-
buttonClassName={b('logo-button')}
41-
/>
31+
{logo && (
32+
<Logo
33+
{...logo}
34+
onClick={onLogoClick}
35+
compact={compact}
36+
buttonWrapperClassName={b('logo-button-wrapper')}
37+
buttonClassName={b('logo-button')}
38+
/>
39+
)}
4240

4341
<CompositeBar
4442
type="subheader"

0 commit comments

Comments
 (0)