From 0cd75975c2faa5251cd5d567c1167793dc517354 Mon Sep 17 00:00:00 2001
From: Bilal ABBAD <bilal@opsmill.com>
Date: Wed, 30 Oct 2024 17:31:01 +0100
Subject: [PATCH] update on Menu accordion UX/UI (#4774)

- scroll vertical is a props on ScrollArea
MenuItem:
- Accordion are open by default
- Chevron is on the right
- CSS updates
---
 .../src/components/search/search-anywhere.tsx |  4 +--
 frontend/app/src/components/ui/accordion.tsx  | 23 +++++++++------
 .../app/src/components/ui/dropdown-menu.tsx   |  6 ++--
 .../app/src/components/ui/scroll-area.tsx     | 11 +++++---
 frontend/app/src/pages/ipam/layout.tsx        |  2 +-
 frontend/app/src/pages/objects/layout.tsx     |  2 +-
 .../components/menu-section-internal.tsx      |  4 +++
 .../components/menu-section-object.tsx        | 28 +++++++++++--------
 .../screens/layout/menu-navigation/styles.tsx |  2 +-
 9 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/frontend/app/src/components/search/search-anywhere.tsx b/frontend/app/src/components/search/search-anywhere.tsx
index c691c501de..f69f2a367d 100644
--- a/frontend/app/src/components/search/search-anywhere.tsx
+++ b/frontend/app/src/components/search/search-anywhere.tsx
@@ -23,9 +23,9 @@ const SearchAnywhereTriggerButton = ({ className, ...props }: ButtonProps) => {
       data-testid="search-anywhere-trigger"
       {...props}
     >
-      <div className="flex items-center gap-2">
+      <div className="flex items-center gap-2 overflow-hidden">
         <Icon icon="mdi:magnify" aria-hidden="true" className="text-xl" />
-        <span className="text-neutral-700 text-sm group-data-[collapsed=true]/sidebar:hidden transition-all">
+        <span className="text-neutral-700 text-sm group-data-[collapsed=true]/sidebar:hidden transition-all truncate">
           Search
         </span>
       </div>
diff --git a/frontend/app/src/components/ui/accordion.tsx b/frontend/app/src/components/ui/accordion.tsx
index 244d0afbee..5c8fcb248c 100644
--- a/frontend/app/src/components/ui/accordion.tsx
+++ b/frontend/app/src/components/ui/accordion.tsx
@@ -11,22 +11,25 @@ export const AccordionItem = AccordionPrimitive.Item;
 
 export const AccordionTrigger = React.forwardRef<
   React.ElementRef<typeof AccordionPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger>
->(({ className, children, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Trigger> & { iconClassName?: string }
+>(({ className, children, iconClassName, ...props }, ref) => (
   <AccordionPrimitive.Header className="flex">
     <AccordionPrimitive.Trigger
       ref={ref}
       className={classNames(
-        "flex flex-1 items-center py-4 font-medium transition-all [&[data-state=open]>iconify-icon]:rotate-90",
+        "flex flex-1 items-center py-4 font-medium transition-all [&[data-state=open]>div>iconify-icon]:rotate-90",
         className
       )}
       {...props}
     >
-      <Icon
-        icon="mdi:chevron-right"
-        className="text-xl shrink-0 transition-transform duration-200"
-      />
       {children}
+
+      <div className={classNames("flex ml-auto rounded p-1", iconClassName)}>
+        <Icon
+          icon="mdi:chevron-right"
+          className="text-xl shrink-0 transition-transform duration-200"
+        />
+      </div>
     </AccordionPrimitive.Trigger>
   </AccordionPrimitive.Header>
 ));
@@ -34,12 +37,14 @@ export const AccordionTrigger = React.forwardRef<
 export const AccordionContent = React.forwardRef<
   React.ElementRef<typeof AccordionPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof AccordionPrimitive.Content>
->(({ className, children, ...props }, ref) => (
+>(({ className, children, style, ...props }, ref) => (
   <AccordionPrimitive.Content
     ref={ref}
     className="overflow-hidden text-sm transition-all data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"
     {...props}
   >
-    <div className={classNames(className)}>{children}</div>
+    <div className={classNames(className)} style={style}>
+      {children}
+    </div>
   </AccordionPrimitive.Content>
 ));
diff --git a/frontend/app/src/components/ui/dropdown-menu.tsx b/frontend/app/src/components/ui/dropdown-menu.tsx
index 9c9a8630ce..dd7764a15f 100644
--- a/frontend/app/src/components/ui/dropdown-menu.tsx
+++ b/frontend/app/src/components/ui/dropdown-menu.tsx
@@ -104,10 +104,10 @@ export const DropdownMenuSubContent = forwardRef<
 
 export const DropdownMenuAccordion = forwardRef<
   ElementRef<typeof AccordionItem>,
-  ComponentPropsWithoutRef<typeof AccordionItem>
->((props, ref) => {
+  ComponentPropsWithoutRef<typeof AccordionItem> & { defaultOpen?: boolean }
+>(({ defaultOpen, ...props }, ref) => {
   return (
-    <Accordion type="single" collapsible>
+    <Accordion type="single" collapsible defaultValue={defaultOpen ? props.value : undefined}>
       <AccordionItem {...props} ref={ref} />
     </Accordion>
   );
diff --git a/frontend/app/src/components/ui/scroll-area.tsx b/frontend/app/src/components/ui/scroll-area.tsx
index 5d536bb255..e507689571 100644
--- a/frontend/app/src/components/ui/scroll-area.tsx
+++ b/frontend/app/src/components/ui/scroll-area.tsx
@@ -6,8 +6,11 @@ import * as React from "react";
 
 export const ScrollArea = React.forwardRef<
   React.ElementRef<typeof ScrollAreaPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
->(({ className, children, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root> & {
+    scrollX?: boolean;
+    scrollY?: boolean;
+  }
+>(({ className, children, scrollX = false, scrollY = true, ...props }, ref) => (
   <ScrollAreaPrimitive.Root
     ref={ref}
     scrollHideDelay={0}
@@ -17,8 +20,8 @@ export const ScrollArea = React.forwardRef<
     <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
       {children}
     </ScrollAreaPrimitive.Viewport>
-    <ScrollBar orientation="vertical" />
-    <ScrollBar orientation="horizontal" />
+    {scrollX && <ScrollBar orientation="horizontal" />}
+    {scrollY && <ScrollBar orientation="vertical" />}
     <ScrollAreaPrimitive.Corner />
   </ScrollAreaPrimitive.Root>
 ));
diff --git a/frontend/app/src/pages/ipam/layout.tsx b/frontend/app/src/pages/ipam/layout.tsx
index 7a214b0c06..f408cbc9fe 100644
--- a/frontend/app/src/pages/ipam/layout.tsx
+++ b/frontend/app/src/pages/ipam/layout.tsx
@@ -13,7 +13,7 @@ function IpamLayout() {
 
       <div className="flex-grow flex overflow-auto">
         <div className="min-w-64 max-w-[400px] border-r flex">
-          <ScrollArea className="w-full p-2">
+          <ScrollArea scrollX className="w-full p-2">
             <IpamTree className="w-full" />
           </ScrollArea>
         </div>
diff --git a/frontend/app/src/pages/objects/layout.tsx b/frontend/app/src/pages/objects/layout.tsx
index d99924d8eb..c961002e67 100644
--- a/frontend/app/src/pages/objects/layout.tsx
+++ b/frontend/app/src/pages/objects/layout.tsx
@@ -55,7 +55,7 @@ const ObjectPageLayout = () => {
           {treeSchema && (
             <>
               <ResizablePanel defaultSize={20} minSize={10} maxSize={50}>
-                <ScrollArea className="h-full">
+                <ScrollArea scrollX className="h-full">
                   <HierarchicalTree
                     schema={treeSchema}
                     currentNodeId={objectid}
diff --git a/frontend/app/src/screens/layout/menu-navigation/components/menu-section-internal.tsx b/frontend/app/src/screens/layout/menu-navigation/components/menu-section-internal.tsx
index 2318690ec2..b613adf53a 100644
--- a/frontend/app/src/screens/layout/menu-navigation/components/menu-section-internal.tsx
+++ b/frontend/app/src/screens/layout/menu-navigation/components/menu-section-internal.tsx
@@ -52,6 +52,10 @@ const ExpandedMenuItemLink: React.FC<{ item: MenuItem }> = ({ item }) => (
   <Link to={constructPath(item.path)} className={classNames(menuNavigationItemStyle, "h-10")}>
     <Icon icon={item.icon} className="min-w-4" />
     <span className="text-sm truncate">{item.label}</span>
+    <Icon
+      icon="mdi:arrow-top-right"
+      className="m-1 ml-auto text-sm opacity-0 group-hover:opacity-100 group-focus:opacity-100 group-data-[state=open]:opacity-100"
+    />
   </Link>
 );
 
diff --git a/frontend/app/src/screens/layout/menu-navigation/components/menu-section-object.tsx b/frontend/app/src/screens/layout/menu-navigation/components/menu-section-object.tsx
index c759eaeedb..74bcd50596 100644
--- a/frontend/app/src/screens/layout/menu-navigation/components/menu-section-object.tsx
+++ b/frontend/app/src/screens/layout/menu-navigation/components/menu-section-object.tsx
@@ -34,14 +34,9 @@ const RecursiveObjectMenuItem: React.FC<{
   isCollapsed?: boolean;
   level?: number;
 }> = ({ item, isCollapsed, level = 0 }) => {
-  const commonStyleProps = {
-    className: menuNavigationItemStyle,
-    style: { marginLeft: level * 20 },
-  };
-
   if (!item.children?.length) {
     return (
-      <DropdownMenuItem {...commonStyleProps} asChild>
+      <DropdownMenuItem className={menuNavigationItemStyle} asChild>
         <Link to={constructPath(item.path)}>
           <Icon icon={item.icon} className="w-5 shrink-0 inline-flex justify-center items-center" />
           {item.label}
@@ -51,17 +46,28 @@ const RecursiveObjectMenuItem: React.FC<{
   }
 
   return (
-    <DropdownMenuAccordion value={item.identifier}>
-      <DropdownMenuAccordionTrigger {...commonStyleProps}>
+    <DropdownMenuAccordion value={item.identifier} defaultOpen>
+      <DropdownMenuAccordionTrigger
+        className={classNames(
+          menuNavigationItemStyle,
+          "font-bold py-1 data-[state=open]:bg-transparent data-[state=open]:text-inherit data-[state=open]:data-[highlighted]:bg-neutral-100"
+        )}
+        iconClassName="hover:bg-neutral-200"
+      >
+        <Icon icon={item.icon} className="w-5 shrink-0 inline-flex justify-center items-center" />
         {item.path ? (
-          <Link to={constructPath(item.path)} className="w-full text-left cursor-pointer">
+          <Link to={constructPath(item.path)} className="text-left cursor-pointer">
             {item.label}
           </Link>
         ) : (
           item.label
         )}
       </DropdownMenuAccordionTrigger>
-      <DropdownMenuAccordionContent>
+
+      <DropdownMenuAccordionContent
+        style={{ marginLeft: (level + 1) * 18 }}
+        className="border-l border-neutral-200"
+      >
         {item.children.map((child) => (
           <RecursiveObjectMenuItem
             key={child.identifier}
@@ -106,7 +112,7 @@ const TopLevelMenuItem: React.FC<{
         side="left"
         align="start"
         sideOffset={isCollapsed ? 6 : 12}
-        className="h-[calc(100vh-57px)] mt-[57px] min-w-[224px] px-4 py-5 bg-white border rounded-r-lg rounded-l-none shadow-none relative -top-px overflow-auto data-[side=right]:slide-in-from-left-[100px]"
+        className="h-[calc(100vh-57px)] mt-[57px] min-w-[275px] px-4 py-5 bg-white border rounded-r-lg rounded-l-none shadow-none relative -top-px overflow-auto data-[side=right]:slide-in-from-left-[100px]"
       >
         <h3 className="text-xl font-medium text-neutral-800 mb-5">{item.label}</h3>
         {item.children.map((child) => (
diff --git a/frontend/app/src/screens/layout/menu-navigation/styles.tsx b/frontend/app/src/screens/layout/menu-navigation/styles.tsx
index 744acbf33e..57ba3b5f19 100644
--- a/frontend/app/src/screens/layout/menu-navigation/styles.tsx
+++ b/frontend/app/src/screens/layout/menu-navigation/styles.tsx
@@ -1,2 +1,2 @@
 export const menuNavigationItemStyle =
-  "flex items-center outline-none gap-2 px-3 py-2 rounded font-medium text-neutral-900 hover:bg-neutral-100 focus:bg-neutral-100 group data-[state=open]:bg-indigo-50 data-[state=open]:text-indigo-700";
+  "flex items-center outline-none gap-2 p-2 rounded font-medium text-neutral-900 hover:bg-neutral-100 focus:bg-neutral-100 group data-[state=open]:bg-indigo-50 data-[state=open]:text-indigo-700";