@xyo-network/react-appbar 2.36.2 → 2.37.0

package/dist/esm/components/SiteMenu/MenuItems.d.ts

@@ -1,5 +1,5 @@
 import { ListItemProps, ListItemTextProps } from '@mui/material';
-import { ListItemButtonExProps } from '@xyo-network/react-shared';
+import { LinkExProps } from '@xylabs/react-link';
 import { ReactNode } from 'react';
 import { To } from 'react-router-dom';
 import { SiteMenuListItemBase } from './lib';
@@ -8,17 +8,18 @@ export interface SiteMenuListItemProps extends SiteMenuListItemBase, ListItemPro
     to?: To;
     href?: string;
     icon?: ReactNode;
-    onButtonClick?: ListItemButtonExProps['onClick'];
+    onButtonClick?: LinkExProps['onClick'];
     subNavListItems?: SubNavListItemProps[];
     tooltip?: string;
     subNavOpen?: boolean;
+    iconOnly?: boolean;
 }
 export interface SubNavListItemProps {
     primary: ListItemTextProps['primary'];
     to?: To;
     href?: string;
     icon?: ReactNode;
-    onButtonClick?: ListItemButtonExProps['onClick'];
+    onButtonClick?: LinkExProps['onClick'];
     tooltip?: string;
 }
 export declare const SiteMenuListItem: React.FC<SiteMenuListItemProps>;

package/dist/esm/components/SiteMenu/MenuItems.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MenuItems.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA8B,aAAa,EAAE,iBAAiB,EAAqB,MAAM,eAAe,CAAA;AAE/G,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACjE,OAAO,EAAE,SAAS,EAAY,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAGrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAM5C,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB,EAAE,aAAa;IAChF,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACrC,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,aAAa,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAChD,eAAe,CAAC,EAAE,mBAAmB,EAAE,CAAA;IACvC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACrC,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,aAAa,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;IAChD,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CA8D5D,CAAA"}
+{"version":3,"file":"MenuItems.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA8B,aAAa,EAAE,iBAAiB,EAAqB,MAAM,eAAe,CAAA;AAE/G,OAAO,EAAU,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAY,MAAM,OAAO,CAAA;AAE3C,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAGrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAM5C,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB,EAAE,aAAa;IAChF,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACrC,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,aAAa,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACtC,eAAe,CAAC,EAAE,mBAAmB,EAAE,CAAA;IACvC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAA;IACrC,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,SAAS,CAAA;IAChB,aAAa,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACtC,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAiE5D,CAAA"}

package/dist/esm/components/SiteMenu/MenuItems.js

@@ -1,20 +1,26 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Collapse, IconButton, List, Tooltip, useTheme } from '@mui/material';
 import { FlexCol, FlexRow } from '@xylabs/react-flexbox';
+import { LinkEx } from '@xylabs/react-link';
 import { useState } from 'react';
 import { VscChevronDown, VscInfo } from 'react-icons/vsc';
 import { useCollapsible } from '../../contexts';
 import { MenuIcon } from './MenuIcon';
 import { MenuListItem } from './MenuListItem';
-import { MenuListItemButtonEx } from './MenuListItemButtonEx';
+import { MenuListItemEx } from './MenuListItemEx';
 import { MenuListItemText } from './MenuListItemText';
-export const SiteMenuListItem = ({ style, subNavListItems, iconOnly, tooltip, collapseEnd, icon, primary, onButtonClick, to, ...props }) => {
+export const SiteMenuListItem = ({ style, subNavListItems, iconOnly, tooltip, icon, primary, onButtonClick, to, ...props }) => {
     const { dense } = props;
     const theme = useTheme();
     const { collapse } = useCollapsible();
     const [openSubNav, setOpenSubNav] = useState(false);
     const [hovered, setHovered] = useState(false);
-    return (_jsxs(MenuListItem, { disableGutters: true, style: { whiteSpace: 'nowrap', ...style }, iconOnly: iconOnly, ...props, children: [_jsxs(MenuListItemButtonEx, { iconOnly: iconOnly, onClick: onButtonClick, collapseEnd: collapseEnd, dense: dense, to: to, sx: { justifyContent: 'space-between' }, onMouseEnter: () => setHovered(true), onMouseLeave: () => setHovered(false), children: [_jsxs(FlexRow, { children: [_jsx(MenuIcon, { icon: icon, paddingRight: theme.spacing(1), color: hovered ? 'primary' : 'inherit' }), _jsx(MenuListItemText, { primary: primary, iconOnly: iconOnly })] }), _jsxs(FlexRow, { children: [subNavListItems ? (_jsx(IconButton, { onClick: () => setOpenSubNav(!openSubNav), sx: { marginRight: theme.spacing(1) }, children: _jsx(VscChevronDown, { fontSize: "16px" }) })) : null, tooltip ? (_jsx(Tooltip, { title: tooltip, placement: "right", children: _jsx("div", { children: _jsx(FlexCol, { justifyContent: "center", children: _jsx(VscInfo, { color: "grey" }) }) }) })) : null] })] }), subNavListItems ? (_jsx(Collapse, { in: collapse == true ? false : openSubNav, children: _jsx(List, { children: subNavListItems.map((item, index) => {
+    return (_jsxs(MenuListItem, { disableGutters: true, style: { whiteSpace: 'nowrap', ...style }, iconOnly: iconOnly, ...props, children: [_jsxs(MenuListItemEx, { iconOnly: iconOnly, onClick: onButtonClick, dense: dense, sx: { justifyContent: 'space-between' }, children: [_jsxs(FlexRow, { children: [_jsx(MenuIcon, { icon: icon, paddingRight: theme.spacing(1), color: hovered ? 'secondary' : 'inherit' }), _jsx(LinkEx, { onMouseEnter: () => setHovered(true), onMouseLeave: () => setHovered(false), color: "inherit", to: to, sx: {
+                                    '& :hover': {
+                                        cursor: 'pointer',
+                                        textDecoration: 'underline',
+                                    },
+                                }, children: _jsx(MenuListItemText, { primary: primary, iconOnly: iconOnly }) })] }), _jsxs(FlexRow, { style: { marginLeft: theme.spacing(1) }, children: [subNavListItems ? (_jsx(IconButton, { onClick: () => setOpenSubNav(!openSubNav), sx: { marginRight: theme.spacing(0.5) }, children: _jsx(VscChevronDown, { fontSize: "16px" }) })) : null, tooltip ? (_jsx(Tooltip, { title: tooltip, placement: "right", children: _jsx("div", { children: _jsx(FlexCol, { justifyContent: "center", children: _jsx(VscInfo, { color: "grey" }) }) }) })) : null] })] }), subNavListItems ? (_jsx(Collapse, { in: collapse == true ? false : openSubNav, children: _jsx(List, { children: subNavListItems.map((item, index) => {
                         return _jsx(SiteMenuListItem, { sx: { pl: theme.spacing(1) }, ...item }, index);
                     }) }) })) : null] }));
 };

package/dist/esm/components/SiteMenu/MenuItems.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuItems.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"MenuItems.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":"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"}

package/dist/esm/components/SiteMenu/MenuListItemEx.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+import { ListItemProps } from '@mui/material';
+import { SiteMenuListItemBase } from './lib';
+export interface ListItemExProps extends SiteMenuListItemBase, ListItemProps {
+}
+export declare const MenuListItemEx: React.FC<ListItemExProps>;
+//# sourceMappingURL=MenuListItemEx.d.ts.map

package/dist/esm/components/SiteMenu/MenuListItemEx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MenuListItemEx.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemEx.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAY,aAAa,EAAE,MAAM,eAAe,CAAA;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,WAAW,eAAgB,SAAQ,oBAAoB,EAAE,aAAa;CAAG;AAE/E,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAYpD,CAAA"}

package/dist/esm/components/SiteMenu/{MenuListItemButtonEx.js → MenuListItemEx.js}

@@ -1,12 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ListItemButtonEx } from '@xyo-network/react-shared';
-export const MenuListItemButtonEx = ({ iconOnly, collapseEnd, sx, children, ...props }) => {
+import { ListItem } from '@mui/material';
+export const MenuListItemEx = ({ iconOnly, collapseEnd, sx, children, ...props }) => {
     const dense = props;
     const listItemButtonSx = iconOnly ? { borderRadius: '50%', display: 'inline-flex', flexGrow: 0 } : {};
     // wait till collapseEnds to remove the spacing between items
     const spacingSx = collapseEnd ? { columnGap: 0 } : { columnGap: 1.5 };
     // adjusts to the paddingY value which does NOT scale along the theme.spacing
     const paddingSx = dense ? { px: '8px' } : { px: '12px' };
-    return (_jsx(ListItemButtonEx, { sx: { ...listItemButtonSx, ...spacingSx, ...paddingSx, ...sx }, ...props, children: children }));
+    return (_jsx(ListItem, { sx: { ...listItemButtonSx, ...spacingSx, ...paddingSx, ...sx }, ...props, children: children }));
 };
-//# sourceMappingURL=MenuListItemButtonEx.js.map
+//# sourceMappingURL=MenuListItemEx.js.map

package/dist/esm/components/SiteMenu/MenuListItemEx.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MenuListItemEx.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemEx.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,eAAe,CAAA;AAMvD,MAAM,CAAC,MAAM,cAAc,GAA8B,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC7G,MAAM,KAAK,GAAG,KAAK,CAAA;IACnB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACrG,6DAA6D;IAC7D,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAA;IACrE,6EAA6E;IAC7E,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAA;IACxD,OAAO,CACL,KAAC,QAAQ,IAAC,EAAE,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,EAAE,EAAE,KAAM,KAAK,YAChF,QAAQ,GACA,CACZ,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/components/SiteMenu/MenuSection.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import { ListProps } from '@mui/material';
+import { FlexBoxProps } from '@xylabs/react-flexbox';
 import { SiteMenuListItemProps } from './MenuItems';
-export interface MenuSectionProps extends ListProps {
+export interface MenuSectionProps extends FlexBoxProps {
     title: string;
     listItems: SiteMenuListItemProps[];
     showTitle?: boolean;

package/dist/esm/components/SiteMenu/MenuSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MenuSection.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuSection.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAQ,SAAS,EAAiB,MAAM,eAAe,CAAA;AAE9D,OAAO,EAAoB,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAErE,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,qBAAqB,EAAE,CAAA;IAClC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAWlD,CAAA"}
+{"version":3,"file":"MenuSection.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuSection.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAW,MAAM,uBAAuB,CAAA;AAE7D,OAAO,EAAoB,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAErE,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,qBAAqB,EAAE,CAAA;IAClC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAclD,CAAA"}

package/dist/esm/components/SiteMenu/MenuSection.js

@@ -1,7 +1,8 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { List, ListSubheader } from '@mui/material';
+import { Collapse, ListSubheader } from '@mui/material';
+import { FlexCol } from '@xylabs/react-flexbox';
 import { SiteMenuListItem } from './MenuItems';
 export const MenuSection = ({ title, listItems, showTitle = true, ...props }) => {
-    return (_jsxs(List, { ...props, children: [showTitle ? _jsx(ListSubheader, { children: title }) : null, listItems.map((item, index) => (_jsx(_Fragment, { children: _jsx(SiteMenuListItem, { ...item }, index) })))] }));
+    return (_jsxs(FlexCol, { alignItems: "stretch", ...props, children: [_jsx(Collapse, { in: showTitle, timeout: 700, children: _jsx(ListSubheader, { children: title }) }), listItems.map((item, index) => (_jsx(_Fragment, { children: _jsx(SiteMenuListItem, { ...item }, index) })))] }));
 };
 //# sourceMappingURL=MenuSection.js.map

package/dist/esm/components/SiteMenu/MenuSection.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuSection.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuSection.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAa,aAAa,EAAE,MAAM,eAAe,CAAA;AAE9D,OAAO,EAAE,gBAAgB,EAAyB,MAAM,aAAa,CAAA;AAQrE,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC1G,OAAO,CACL,MAAC,IAAI,OAAK,KAAK,aACZ,SAAS,CAAC,CAAC,CAAC,KAAC,aAAa,cAAE,KAAK,GAAiB,CAAC,CAAC,CAAC,IAAI,EACzD,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAC9B,4BACE,KAAC,gBAAgB,OAAiB,IAAI,IAAf,KAAK,CAA+B,GAC1D,CACJ,CAAC,IACG,CACR,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"MenuSection.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuSection.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAgB,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,EAAE,gBAAgB,EAAyB,MAAM,aAAa,CAAA;AAQrE,MAAM,CAAC,MAAM,WAAW,GAA+B,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC1G,OAAO,CACL,MAAC,OAAO,IAAC,UAAU,EAAC,SAAS,KAAK,KAAK,aACrC,KAAC,QAAQ,IAAC,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,YACnC,KAAC,aAAa,cAAE,KAAK,GAAiB,GAC7B,EAEV,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAC9B,4BACE,KAAC,gBAAgB,OAAiB,IAAI,IAAf,KAAK,CAA+B,GAC1D,CACJ,CAAC,IACM,CACX,CAAA;AACH,CAAC,CAAA"}

package/package.json

@@ -16,11 +16,11 @@
     "@xylabs/react-flexbox": "^2.14.20",
     "@xylabs/react-link": "^2.14.20",
     "@xylabs/react-shared": "^2.14.20",
-    "@xyo-network/react-app-settings": "^2.36.2",
-    "@xyo-network/react-archive": "^2.36.2",
-    "@xyo-network/react-auth-sets": "^2.36.2",
-    "@xyo-network/react-network": "^2.36.2",
-    "@xyo-network/react-shared": "^2.36.2",
+    "@xyo-network/react-app-settings": "^2.37.0",
+    "@xyo-network/react-archive": "^2.37.0",
+    "@xyo-network/react-auth-sets": "^2.37.0",
+    "@xyo-network/react-network": "^2.37.0",
+    "@xyo-network/react-shared": "^2.37.0",
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
@@ -77,5 +77,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.36.2"
+  "version": "2.37.0"
 }

package/src/components/CollapsibleDrawer/CollapseDrawer.stories.tsx

@@ -33,11 +33,11 @@ const Template: ComponentStory<typeof CollapsibleDrawer> = (args) => {
   const theme = useTheme()
   return (
     <>
-      <FlexGrowCol alignItems="start" height="calc(100vh - 2rem)">
+      <FlexGrowCol alignItems="start">
         <CollapsibleDrawer in={!collapse} orientation="horizontal" collapsedSize={theme.spacing(5)} onExited={() => setCollapseEnd?.(true)} {...args}>
           <MenuSection title="Explore & Create" listItems={menuDataTop} showTitle={!collapse} />
           <MenuSection title="Settings & Analytics" listItems={menuDataBottom} showTitle={!collapse} />
-          <FlexGrowCol />
+          <FlexGrowCol height="100%" />
           <CollapseToggleFlex justifyContent="start" />
         </CollapsibleDrawer>
       </FlexGrowCol>

package/src/components/SiteMenu/MenuItems.tsx

@@ -1,6 +1,6 @@
 import { Collapse, IconButton, List, ListItemProps, ListItemTextProps, Tooltip, useTheme } from '@mui/material'
 import { FlexCol, FlexRow } from '@xylabs/react-flexbox'
-import { ListItemButtonExProps } from '@xyo-network/react-shared'
+import { LinkEx, LinkExProps } from '@xylabs/react-link'
 import { ReactNode, useState } from 'react'
 import { VscChevronDown, VscInfo } from 'react-icons/vsc'
 import { To } from 'react-router-dom'
@@ -9,7 +9,7 @@ import { useCollapsible } from '../../contexts'
 import { SiteMenuListItemBase } from './lib'
 import { MenuIcon } from './MenuIcon'
 import { MenuListItem } from './MenuListItem'
-import { MenuListItemButtonEx } from './MenuListItemButtonEx'
+import { MenuListItemEx } from './MenuListItemEx'
 import { MenuListItemText } from './MenuListItemText'
 
 export interface SiteMenuListItemProps extends SiteMenuListItemBase, ListItemProps {
@@ -17,10 +17,11 @@ export interface SiteMenuListItemProps extends SiteMenuListItemBase, ListItemPro
   to?: To
   href?: string
   icon?: ReactNode
-  onButtonClick?: ListItemButtonExProps['onClick']
+  onButtonClick?: LinkExProps['onClick']
   subNavListItems?: SubNavListItemProps[]
   tooltip?: string
   subNavOpen?: boolean
+  iconOnly?: boolean
 }
 
 export interface SubNavListItemProps {
@@ -28,7 +29,7 @@ export interface SubNavListItemProps {
   to?: To
   href?: string
   icon?: ReactNode
-  onButtonClick?: ListItemButtonExProps['onClick']
+  onButtonClick?: LinkExProps['onClick']
   tooltip?: string
 }
 
@@ -37,7 +38,6 @@ export const SiteMenuListItem: React.FC<SiteMenuListItemProps> = ({
   subNavListItems,
   iconOnly,
   tooltip,
-  collapseEnd,
   icon,
   primary,
   onButtonClick,
@@ -51,23 +51,27 @@ export const SiteMenuListItem: React.FC<SiteMenuListItemProps> = ({
   const [hovered, setHovered] = useState(false)
   return (
     <MenuListItem disableGutters style={{ whiteSpace: 'nowrap', ...style }} iconOnly={iconOnly} {...props}>
-      <MenuListItemButtonEx
-        iconOnly={iconOnly}
-        onClick={onButtonClick}
-        collapseEnd={collapseEnd}
-        dense={dense}
-        to={to}
-        sx={{ justifyContent: 'space-between' }}
-        onMouseEnter={() => setHovered(true)}
-        onMouseLeave={() => setHovered(false)}
-      >
+      <MenuListItemEx iconOnly={iconOnly} onClick={onButtonClick} dense={dense} sx={{ justifyContent: 'space-between' }}>
         <FlexRow>
-          <MenuIcon icon={icon} paddingRight={theme.spacing(1)} color={hovered ? 'primary' : 'inherit'} />
-          <MenuListItemText primary={primary} iconOnly={iconOnly} />
+          <MenuIcon icon={icon} paddingRight={theme.spacing(1)} color={hovered ? 'secondary' : 'inherit'} />
+          <LinkEx
+            onMouseEnter={() => setHovered(true)}
+            onMouseLeave={() => setHovered(false)}
+            color="inherit"
+            to={to}
+            sx={{
+              '& :hover': {
+                cursor: 'pointer',
+                textDecoration: 'underline',
+              },
+            }}
+          >
+            <MenuListItemText primary={primary} iconOnly={iconOnly} />
+          </LinkEx>
         </FlexRow>
-        <FlexRow>
+        <FlexRow style={{ marginLeft: theme.spacing(1) }}>
           {subNavListItems ? (
-            <IconButton onClick={() => setOpenSubNav(!openSubNav)} sx={{ marginRight: theme.spacing(1) }}>
+            <IconButton onClick={() => setOpenSubNav(!openSubNav)} sx={{ marginRight: theme.spacing(0.5) }}>
               <VscChevronDown fontSize="16px" />
             </IconButton>
           ) : null}
@@ -82,7 +86,7 @@ export const SiteMenuListItem: React.FC<SiteMenuListItemProps> = ({
             </Tooltip>
           ) : null}
         </FlexRow>
-      </MenuListItemButtonEx>
+      </MenuListItemEx>
       {subNavListItems ? (
         <Collapse in={collapse == true ? false : openSubNav}>
           <List>

package/src/components/SiteMenu/{MenuListItemButtonEx.tsx → MenuListItemEx.tsx}

@@ -1,10 +1,10 @@
-import { ListItemButtonEx, ListItemButtonExProps } from '@xyo-network/react-shared'
+import { ListItem, ListItemProps } from '@mui/material'
 
 import { SiteMenuListItemBase } from './lib'
 
-export interface MenuListItemButtonExProps extends SiteMenuListItemBase, ListItemButtonExProps {}
+export interface ListItemExProps extends SiteMenuListItemBase, ListItemProps {}
 
-export const MenuListItemButtonEx: React.FC<MenuListItemButtonExProps> = ({ iconOnly, collapseEnd, sx, children, ...props }) => {
+export const MenuListItemEx: React.FC<ListItemExProps> = ({ iconOnly, collapseEnd, sx, children, ...props }) => {
   const dense = props
   const listItemButtonSx = iconOnly ? { borderRadius: '50%', display: 'inline-flex', flexGrow: 0 } : {}
   // wait till collapseEnds to remove the spacing between items
@@ -12,8 +12,8 @@ export const MenuListItemButtonEx: React.FC<MenuListItemButtonExProps> = ({ icon
   // adjusts to the paddingY value which does NOT scale along the theme.spacing
   const paddingSx = dense ? { px: '8px' } : { px: '12px' }
   return (
-    <ListItemButtonEx sx={{ ...listItemButtonSx, ...spacingSx, ...paddingSx, ...sx }} {...props}>
+    <ListItem sx={{ ...listItemButtonSx, ...spacingSx, ...paddingSx, ...sx }} {...props}>
       {children}
-    </ListItemButtonEx>
+    </ListItem>
   )
 }

package/src/components/SiteMenu/MenuSection.tsx

@@ -1,8 +1,9 @@
-import { List, ListProps, ListSubheader } from '@mui/material'
+import { Collapse, ListSubheader } from '@mui/material'
+import { FlexBoxProps, FlexCol } from '@xylabs/react-flexbox'
 
 import { SiteMenuListItem, SiteMenuListItemProps } from './MenuItems'
 
-export interface MenuSectionProps extends ListProps {
+export interface MenuSectionProps extends FlexBoxProps {
   title: string
   listItems: SiteMenuListItemProps[]
   showTitle?: boolean
@@ -10,13 +11,16 @@ export interface MenuSectionProps extends ListProps {
 
 export const MenuSection: React.FC<MenuSectionProps> = ({ title, listItems, showTitle = true, ...props }) => {
   return (
-    <List {...props}>
-      {showTitle ? <ListSubheader>{title}</ListSubheader> : null}
+    <FlexCol alignItems="stretch" {...props}>
+      <Collapse in={showTitle} timeout={700}>
+        <ListSubheader>{title}</ListSubheader>
+      </Collapse>
+
       {listItems.map((item, index) => (
         <>
           <SiteMenuListItem key={index} {...item}></SiteMenuListItem>
         </>
       ))}
-    </List>
+    </FlexCol>
   )
 }

package/dist/cjs/components/SiteMenu/MenuListItemButtonEx.d.ts

@@ -1,7 +0,0 @@
-/// <reference types="react" />
-import { ListItemButtonExProps } from '@xyo-network/react-shared';
-import { SiteMenuListItemBase } from './lib';
-export interface MenuListItemButtonExProps extends SiteMenuListItemBase, ListItemButtonExProps {
-}
-export declare const MenuListItemButtonEx: React.FC<MenuListItemButtonExProps>;
-//# sourceMappingURL=MenuListItemButtonEx.d.ts.map

package/dist/cjs/components/SiteMenu/MenuListItemButtonEx.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MenuListItemButtonEx.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemButtonEx.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAoB,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAEnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,WAAW,yBAA0B,SAAQ,oBAAoB,EAAE,qBAAqB;CAAG;AAEjG,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAYpE,CAAA"}

package/dist/cjs/components/SiteMenu/MenuListItemButtonEx.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MenuListItemButtonEx.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemButtonEx.tsx"],"names":[],"mappings":";;;;;AAAA,4DAAmF;AAM5E,MAAM,oBAAoB,GAAwC,CAAC,EAAiD,EAAE,EAAE;QAArD,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,OAAY,EAAP,KAAK,sBAA/C,6CAAiD,CAAF;IACvH,MAAM,KAAK,GAAG,KAAK,CAAA;IACnB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACrG,6DAA6D;IAC7D,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAA;IACrE,6EAA6E;IAC7E,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAA;IACxD,OAAO,CACL,uBAAC,+BAAgB,kBAAC,EAAE,8DAAO,gBAAgB,GAAK,SAAS,GAAK,SAAS,GAAK,EAAE,KAAQ,KAAK,cACxF,QAAQ,IACQ,CACpB,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,oBAAoB,wBAYhC"}

package/dist/esm/components/SiteMenu/MenuListItemButtonEx.d.ts

@@ -1,7 +0,0 @@
-/// <reference types="react" />
-import { ListItemButtonExProps } from '@xyo-network/react-shared';
-import { SiteMenuListItemBase } from './lib';
-export interface MenuListItemButtonExProps extends SiteMenuListItemBase, ListItemButtonExProps {
-}
-export declare const MenuListItemButtonEx: React.FC<MenuListItemButtonExProps>;
-//# sourceMappingURL=MenuListItemButtonEx.d.ts.map

package/dist/esm/components/SiteMenu/MenuListItemButtonEx.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MenuListItemButtonEx.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemButtonEx.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAoB,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAEnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,WAAW,yBAA0B,SAAQ,oBAAoB,EAAE,qBAAqB;CAAG;AAEjG,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAYpE,CAAA"}

package/dist/esm/components/SiteMenu/MenuListItemButtonEx.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MenuListItemButtonEx.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemButtonEx.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAyB,MAAM,2BAA2B,CAAA;AAMnF,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC7H,MAAM,KAAK,GAAG,KAAK,CAAA;IACnB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACrG,6DAA6D;IAC7D,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAA;IACrE,6EAA6E;IAC7E,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAA;IACxD,OAAO,CACL,KAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,EAAE,EAAE,KAAM,KAAK,YACxF,QAAQ,GACQ,CACpB,CAAA;AACH,CAAC,CAAA"}