fix(Logo): fix condition display logo (#306)

gravity-ui · Sep 10, 2024 · 38f234a · 38f234a
1 parent 0b8abd3
commit 38f234a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/components/AsideHeader/components/FirstPanel.tsx b/src/components/AsideHeader/components/FirstPanel.tsx
@@ -25,7 +25,6 @@ export const FirstPanel = React.forwardRef<HTMLDivElement>((_props, ref) => {
         customBackgroundClassName,
         className,
         hideCollapseButton,
-        logo,
         qa,
     } = useAsideHeaderInnerContext();
     const visibleMenuItems = useVisibleMenuItems();
@@ -47,8 +46,7 @@ export const FirstPanel = React.forwardRef<HTMLDivElement>((_props, ref) => {
                             {customBackground}
                         </div>
                     )}
-                    {/* TODO add new prop for hiding Header */}
-                    {logo && <Header />}
+                    <Header />
                     {visibleMenuItems?.length ? (
                         <CompositeBar
                             type="menu"

diff --git a/src/components/AsideHeader/components/Header.tsx b/src/components/AsideHeader/components/Header.tsx
@@ -26,19 +26,17 @@ export const Header = () => {
         [onClosePanel, logo],
     );
 
-    if (!logo) {
-        return null;
-    }
-
     return (
         <div className={b('header', {['with-decoration']: headerDecoration})}>
-            <Logo
-                {...logo}
-                onClick={onLogoClick}
-                compact={compact}
-                buttonWrapperClassName={b('logo-button-wrapper')}
-                buttonClassName={b('logo-button')}
-            />
+            {logo && (
+                <Logo
+                    {...logo}
+                    onClick={onLogoClick}
+                    compact={compact}
+                    buttonWrapperClassName={b('logo-button-wrapper')}
+                    buttonClassName={b('logo-button')}
+                />
+            )}
 
             <CompositeBar
                 type="subheader"