Преглед изворни кода

Merge pull request #8640 from weseek/fix/sidebar-rendering-in-collapsed-mode

fix: Set `d-none` when the sidebar is closed in order to prevent scrollbars from appearing
Yuki Takei пре 2 година
родитељ
комит
a1e6715b29
1 измењених фајлова са 6 додато и 2 уклоњено
  1. 6 2
      apps/app/src/components/Sidebar/Sidebar.tsx

+ 6 - 2
apps/app/src/components/Sidebar/Sidebar.tsx

@@ -130,13 +130,17 @@ const CollapsibleContainer = memo((props: CollapsibleContainerProps): JSX.Elemen
     mutateCollapsedContentsOpened(false);
     mutateCollapsedContentsOpened(false);
   }, [isCollapsedMode, mutateCollapsedContentsOpened]);
   }, [isCollapsedMode, mutateCollapsedContentsOpened]);
 
 
-  const openClass = `${isCollapsedContentsOpened ? 'open' : ''}`;
+  const closedClass = isCollapsedMode() && !isCollapsedContentsOpened ? 'd-none' : '';
+  const openedClass = isCollapsedMode() && isCollapsedContentsOpened ? 'open' : '';
   const collapsibleContentsWidth = isCollapsedMode() ? currentProductNavWidth : undefined;
   const collapsibleContentsWidth = isCollapsedMode() ? currentProductNavWidth : undefined;
 
 
   return (
   return (
     <div className={`flex-expand-horiz ${className}`} onMouseLeave={mouseLeaveHandler}>
     <div className={`flex-expand-horiz ${className}`} onMouseLeave={mouseLeaveHandler}>
       <Nav onPrimaryItemHover={primaryItemHoverHandler} />
       <Nav onPrimaryItemHover={primaryItemHoverHandler} />
-      <div className={`sidebar-contents-container flex-grow-1 overflow-y-auto overflow-x-hidden ${openClass}`} style={{ width: collapsibleContentsWidth }}>
+      <div
+        className={`sidebar-contents-container flex-grow-1 overflow-y-auto overflow-x-hidden ${closedClass} ${openedClass}`}
+        style={{ width: collapsibleContentsWidth }}
+      >
         {children}
         {children}
       </div>
       </div>
     </div>
     </div>