From 12d829491601eeff07fc1e7a8c122bcf56578130 Mon Sep 17 00:00:00 2001
From: Gina A <70909035+gndz07@users.noreply.github.com>
Date: Thu, 23 Mar 2023 14:56:06 +0100
Subject: [PATCH] feat: navigation tree item subtitle and default expanded
 state

---
 .../NavigationTree/NavigationTree.stories.tsx | 35 +++++++++++++++++--
 .../NavigationTreeItem.stories.tsx            |  2 +-
 .../NavigationTree/NavigationTreeItem.tsx     | 22 ++++++++++--
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/components/NavigationTree/NavigationTree.stories.tsx b/components/NavigationTree/NavigationTree.stories.tsx
index cdf2f40d..b01b6796 100644
--- a/components/NavigationTree/NavigationTree.stories.tsx
+++ b/components/NavigationTree/NavigationTree.stories.tsx
@@ -45,8 +45,13 @@ const Template: ComponentStory<typeof NavigationTreeContainer> = (args) => {
   return (
     <NavigationDrawer>
       <NavigationTreeContainer {...args}>
-        <NavigationTreeItem {...navigationHandlerProps('one')} label="One">
-          <NavigationTreeItem {...navigationHandlerProps('one-one')} as="a" label="One.One" />
+        <NavigationTreeItem {...navigationHandlerProps('one')} label="One" subtitle="/one">
+          <NavigationTreeItem
+            {...navigationHandlerProps('one-one')}
+            as="a"
+            label="One.One"
+            subtitle="/one-one"
+          />
           <NavigationTreeItem {...navigationHandlerProps('one-two')} label="One.Two">
             <NavigationTreeItem
               {...navigationHandlerProps('one-two-one')}
@@ -55,7 +60,31 @@ const Template: ComponentStory<typeof NavigationTreeContainer> = (args) => {
             />
           </NavigationTreeItem>
         </NavigationTreeItem>
-        <NavigationTreeItem {...navigationHandlerProps('two')} label="Two" />
+        <NavigationTreeItem
+          {...navigationHandlerProps('two')}
+          label="Two"
+          subtitle="/two"
+          defaultExpanded
+        >
+          <NavigationTreeItem
+            {...navigationHandlerProps('two-one')}
+            as="a"
+            label="Two.One"
+            subtitle="/two-one"
+          />
+          <NavigationTreeItem
+            {...navigationHandlerProps('two-two')}
+            label="Two.Two"
+            subtitle="/two-two"
+          >
+            <NavigationTreeItem
+              {...navigationHandlerProps('two-two-one')}
+              startAdornment={<ArchiveIcon />}
+              label="Two.Two.One"
+            />
+          </NavigationTreeItem>
+        </NavigationTreeItem>
+        <NavigationTreeItem {...navigationHandlerProps('three')} label="Three" />
       </NavigationTreeContainer>
     </NavigationDrawer>
   );
diff --git a/components/NavigationTree/NavigationTreeItem.stories.tsx b/components/NavigationTree/NavigationTreeItem.stories.tsx
index 0be74f1c..fe88f50d 100644
--- a/components/NavigationTree/NavigationTreeItem.stories.tsx
+++ b/components/NavigationTree/NavigationTreeItem.stories.tsx
@@ -94,7 +94,7 @@ const Template: ComponentStory<typeof NavigationTreeItem> = (args) => {
         defaultCollapseIcon={args.defaultCollapseIcon}
         defaultExpandIcon={args.defaultExpandIcon}
       >
-        <NavigationTreeItem {...navigationHandlerProps('one')} label="One">
+        <NavigationTreeItem {...navigationHandlerProps('one')} label="One" subtitle="/parent">
           <NavigationTreeItem {...navigationHandlerProps('one-one')} {...args}>
             <NavigationTreeItem
               {...navigationHandlerProps('one-one-one')}
diff --git a/components/NavigationTree/NavigationTreeItem.tsx b/components/NavigationTree/NavigationTreeItem.tsx
index fab49a61..7ddda913 100644
--- a/components/NavigationTree/NavigationTreeItem.tsx
+++ b/components/NavigationTree/NavigationTreeItem.tsx
@@ -2,10 +2,14 @@ import React, { useMemo, useState } from 'react';
 import { Box } from '../Box';
 import { NavigationItem, NavigationItemProps } from '../Navigation';
 import { NavigationTreeContainer } from './NavigationTreeContainer';
+import { Flex } from '../Flex';
+import { Text } from '../Text';
 
 export interface NavigationTreeItemProps {
   label: string;
+  subtitle?: string;
   children?: React.ReactNode;
+  defaultExpanded?: boolean;
   onClick?: () => void;
   defaultExpandIcon?: React.ReactNode;
   defaultCollapseIcon?: React.ReactNode;
@@ -15,15 +19,17 @@ export interface NavigationTreeItemProps {
 
 export const NavigationTreeItem = ({
   label,
+  subtitle,
   children,
   onClick,
+  defaultExpanded = false,
   defaultCollapseIcon,
   defaultExpandIcon,
   customCollapseIcon,
   customExpandIcon,
   ...props
 }: NavigationTreeItemProps & NavigationItemProps) => {
-  const [isExpanded, setIsExpanded] = useState(false);
+  const [isExpanded, setIsExpanded] = useState(defaultExpanded);
   const isExpandable = useMemo(() => React.Children.count(children) > 0, [children]);
   const hasStartAdornment = useMemo(() => !!props.startAdornment, [props.startAdornment]);
   const usedStartAdornment = useMemo(
@@ -55,7 +61,19 @@ export const NavigationTreeItem = ({
         startAdornment={usedStartAdornment}
         onClick={isExpandable ? () => setIsExpanded(!isExpanded) : onClick}
       >
-        <Box css={{ ml: isExpandable || hasStartAdornment ? 0 : '$4' }}>{label}</Box>
+        <Flex
+          direction="column"
+          align="start"
+          gap={1}
+          css={{ ml: isExpandable || hasStartAdornment ? 0 : '$4' }}
+        >
+          <Text>{label}</Text>
+          {subtitle && (
+            <Text variant="subtle" css={{ fontSize: '$3', opacity: 0.8 }}>
+              {subtitle}
+            </Text>
+          )}
+        </Flex>
       </NavigationItem>
       {isExpanded && (
         <NavigationTreeContainer