@xyo-network/react-appbar 2.25.39 → 2.25.42

package/dist/esm/components/{Toolbar/System/SiteMenu.d.ts → SiteMenu/Menu.d.ts}

@@ -1,14 +1,7 @@
 /// <reference types="react" />
 import { FlexBoxProps } from '@xylabs/sdk-react';
-import { To } from 'react-router-dom';
-export interface SiteMenuItem {
-    name: string;
-    to?: To;
-    href?: string;
-    onClick?: () => void;
-}
 export interface SiteMenuProps extends FlexBoxProps {
     hideSettingsMenuItem?: boolean;
-    menuItems?: SiteMenuItem[];
+    side?: 'left' | 'right' | 'top' | 'bottom';
 }
 export declare const SiteMenu: React.FC<SiteMenuProps>;

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

@@ -0,0 +1,14 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import MenuIcon from '@mui/icons-material/Menu';
+import SettingsIcon from '@mui/icons-material/Settings';
+import { Box, IconButton, List, SwipeableDrawer } from '@mui/material';
+import { FlexRow } from '@xylabs/sdk-react';
+import { useState } from 'react';
+import { DrawerListItem } from './MenuItems';
+export const SiteMenu = ({ side = 'right', children, ...props }) => {
+    const [open, setOpen] = useState(false);
+    return (_jsxs(FlexRow, { alignItems: "stretch", ...props, children: [_jsx(IconButton, { size: "small", color: "inherit", onClick: () => {
+                    setOpen(!open);
+                }, children: _jsx(MenuIcon, { fontSize: "large" }) }), _jsx(SwipeableDrawer, { anchor: side, open: open, onClose: () => setOpen(false), onOpen: () => setOpen(true), children: _jsx(Box, { width: "auto", role: "presentation", onClick: () => setOpen(false), onKeyDown: () => setOpen(false), children: children ?? (_jsx(List, { children: _jsx(DrawerListItem, { primary: "Settings", icon: _jsx(SettingsIcon, {}), to: "/settings" }) })) }) })] }));
+};
+//# sourceMappingURL=Menu.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Menu.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/Menu.tsx"],"names":[],"mappings":";AAAA,OAAO,QAAQ,MAAM,0BAA0B,CAAA;AAC/C,OAAO,YAAY,MAAM,8BAA8B,CAAA;AACvD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AACtE,OAAO,EAAgB,OAAO,EAAE,MAAM,mBAAmB,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAO5C,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAAC,EAAE,IAAI,GAAG,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC1F,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAEvC,OAAO,CACL,MAAC,OAAO,IAAC,UAAU,EAAC,SAAS,KAAK,KAAK,aACrC,KAAC,UAAU,IACT,IAAI,EAAC,OAAO,EACZ,KAAK,EAAC,SAAS,EACf,OAAO,EAAE,GAAG,EAAE;oBACZ,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;gBAChB,CAAC,YAED,KAAC,QAAQ,IAAC,QAAQ,EAAC,OAAO,GAAG,GAClB,EACb,KAAC,eAAe,IAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,YACnG,KAAC,GAAG,IAAC,KAAK,EAAC,MAAM,EAAC,IAAI,EAAC,cAAc,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,YACjG,QAAQ,IAAI,CACX,KAAC,IAAI,cACH,KAAC,cAAc,IAAC,OAAO,EAAC,UAAU,EAAC,IAAI,EAAE,KAAC,YAAY,KAAG,EAAE,EAAE,EAAC,WAAW,GAAG,GACvE,CACR,GACG,GACU,IACV,CACX,CAAA;AACH,CAAC,CAAA"}

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

@@ -0,0 +1,11 @@
+import { ListItemProps, ListItemTextProps } from '@mui/material';
+import { ListItemButtonExProps } from '@xyo-network/react-shared';
+import { ReactNode } from 'react';
+import { To } from 'react-router-dom';
+export interface DrawerListItemProps extends ListItemProps {
+    primary: ListItemTextProps['primary'];
+    to?: To;
+    icon?: ReactNode;
+    onButtonClick?: ListItemButtonExProps['onClick'];
+}
+export declare const DrawerListItem: React.FC<DrawerListItemProps>;

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

@@ -0,0 +1,7 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { ListItem, ListItemIcon, ListItemText } from '@mui/material';
+import { ListItemButtonEx } from '@xyo-network/react-shared';
+export const DrawerListItem = ({ primary, to, icon, onButtonClick, ...props }) => {
+    return (_jsx(ListItem, { ...props, children: _jsxs(ListItemButtonEx, { to: to, onClick: onButtonClick, children: [_jsx(ListItemIcon, { children: icon }), _jsx(ListItemText, { primary: primary })] }) }));
+};
+//# sourceMappingURL=MenuItems.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"MenuItems.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAiB,YAAY,EAAqB,MAAM,eAAe,CAAA;AACtG,OAAO,EAAE,gBAAgB,EAAyB,MAAM,2BAA2B,CAAA;AAWnF,MAAM,CAAC,MAAM,cAAc,GAAkC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9G,OAAO,CACL,KAAC,QAAQ,OAAK,KAAK,YACjB,MAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,aAC9C,KAAC,YAAY,cAAE,IAAI,GAAgB,EACnC,KAAC,YAAY,IAAC,OAAO,EAAE,OAAO,GAAI,IACjB,GACV,CACZ,CAAA;AACH,CAAC,CAAA"}

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

@@ -0,0 +1,2 @@
+export * from './Menu';
+export * from './MenuItems';

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

@@ -0,0 +1,3 @@
+export * from './Menu';
+export * from './MenuItems';
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,aAAa,CAAA"}

package/dist/esm/components/Toolbar/System/SystemToolbar.d.ts

@@ -1,14 +1,13 @@
-/// <reference types="react" />
 import { ToolbarProps } from '@mui/material';
 import { SelectExProps } from '@xylabs/sdk-react';
 import { NetworkSelectExProps } from '@xyo-network/react-network';
-import { SiteMenuProps } from './SiteMenu';
+import { ReactNode } from 'react';
 export interface SystemToolbarProps extends ToolbarProps {
     networkSelectProps?: NetworkSelectExProps;
     archiveSelectProps?: SelectExProps<string>;
     hideNetworkSelect?: boolean;
     hideArchiveSelect?: boolean;
-    siteMenuProps?: SiteMenuProps;
+    menu?: ReactNode;
     darkModeButton?: boolean;
     authButton?: boolean;
     noMenu?: boolean;

package/dist/esm/components/Toolbar/System/SystemToolbar.js

@@ -5,8 +5,8 @@ import { ArchiveSelectEx } from '@xyo-network/react-archive';
 import { AuthStatusIconButton } from '@xyo-network/react-auth';
 import { NetworkSelectEx } from '@xyo-network/react-network';
 import { DarkModeIconButton } from '@xyo-network/react-shared';
-import { SiteMenu } from './SiteMenu';
-export const SystemToolbar = ({ children, networkSelectProps, archiveSelectProps, hideNetworkSelect, hideArchiveSelect, siteMenuProps, darkModeButton = false, authButton = false, noMenu = false, ...props }) => {
-    return (_jsxs(Toolbar, { ...props, children: [hideNetworkSelect ? null : (_jsx(FlexRow, { marginX: 0.5, maxWidth: 120, children: _jsx(Paper, { variant: "elevation", children: _jsx(NetworkSelectEx, { fullWidth: true, ...networkSelectProps }) }) })), hideArchiveSelect ? null : (_jsx(FlexRow, { marginX: 0.5, maxWidth: 120, children: _jsx(Paper, { variant: "elevation", children: _jsx(ArchiveSelectEx, { fullWidth: true, ...archiveSelectProps }) }) })), children, authButton ? _jsx(AuthStatusIconButton, { color: "inherit" }) : null, darkModeButton ? _jsx(DarkModeIconButton, { color: "inherit" }) : null, noMenu ? null : _jsx(SiteMenu, { ...siteMenuProps })] }));
+import { SiteMenu } from '../../SiteMenu';
+export const SystemToolbar = ({ children, networkSelectProps, archiveSelectProps, hideNetworkSelect, hideArchiveSelect, menu, darkModeButton = false, authButton = false, noMenu = false, ...props }) => {
+    return (_jsxs(Toolbar, { ...props, children: [hideNetworkSelect ? null : (_jsx(FlexRow, { marginX: 0.5, maxWidth: 120, children: _jsx(Paper, { variant: "elevation", children: _jsx(NetworkSelectEx, { fullWidth: true, ...networkSelectProps }) }) })), hideArchiveSelect ? null : (_jsx(FlexRow, { marginX: 0.5, maxWidth: 120, children: _jsx(Paper, { variant: "elevation", children: _jsx(ArchiveSelectEx, { fullWidth: true, ...archiveSelectProps }) }) })), children, authButton ? _jsx(AuthStatusIconButton, { color: "inherit" }) : null, darkModeButton ? _jsx(DarkModeIconButton, { color: "inherit" }) : null, noMenu ? null : _jsx(SiteMenu, { children: menu })] }));
 };
 //# sourceMappingURL=SystemToolbar.js.map

package/dist/esm/components/Toolbar/System/SystemToolbar.js.map

@@ -1 +1 @@
-{"version":3,"file":"SystemToolbar.js","sourceRoot":"","sources":["../../../../../src/components/Toolbar/System/SystemToolbar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAgB,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAiB,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAwB,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAE9D,OAAO,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAA;AAapD,MAAM,CAAC,MAAM,aAAa,GAAiC,CAAC,EAC1D,QAAQ,EACR,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,cAAc,GAAG,KAAK,EACtB,UAAU,GAAG,KAAK,EAClB,MAAM,GAAG,KAAK,EACd,GAAG,KAAK,EACT,EAAE,EAAE;IACH,OAAO,CACL,MAAC,OAAO,OAAK,KAAK,aACf,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC1B,KAAC,OAAO,IAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,YAClC,KAAC,KAAK,IAAC,OAAO,EAAC,WAAW,YACxB,KAAC,eAAe,IAAC,SAAS,WAAK,kBAAkB,GAAI,GAC/C,GACA,CACX,EACA,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC1B,KAAC,OAAO,IAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,YAClC,KAAC,KAAK,IAAC,OAAO,EAAC,WAAW,YACxB,KAAC,eAAe,IAAC,SAAS,WAAK,kBAAkB,GAAI,GAC/C,GACA,CACX,EACA,QAAQ,EACR,UAAU,CAAC,CAAC,CAAC,KAAC,oBAAoB,IAAC,KAAK,EAAC,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,EAC5D,cAAc,CAAC,CAAC,CAAC,KAAC,kBAAkB,IAAC,KAAK,EAAC,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,EAC9D,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAC,QAAQ,OAAK,aAAa,GAAI,IACxC,CACX,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"SystemToolbar.js","sourceRoot":"","sources":["../../../../../src/components/Toolbar/System/SystemToolbar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAgB,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAiB,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAwB,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAG9D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAazC,MAAM,CAAC,MAAM,aAAa,GAAiC,CAAC,EAC1D,QAAQ,EACR,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,IAAI,EACJ,cAAc,GAAG,KAAK,EACtB,UAAU,GAAG,KAAK,EAClB,MAAM,GAAG,KAAK,EACd,GAAG,KAAK,EACT,EAAE,EAAE;IACH,OAAO,CACL,MAAC,OAAO,OAAK,KAAK,aACf,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC1B,KAAC,OAAO,IAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,YAClC,KAAC,KAAK,IAAC,OAAO,EAAC,WAAW,YACxB,KAAC,eAAe,IAAC,SAAS,WAAK,kBAAkB,GAAI,GAC/C,GACA,CACX,EACA,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC1B,KAAC,OAAO,IAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,YAClC,KAAC,KAAK,IAAC,OAAO,EAAC,WAAW,YACxB,KAAC,eAAe,IAAC,SAAS,WAAK,kBAAkB,GAAI,GAC/C,GACA,CACX,EACA,QAAQ,EACR,UAAU,CAAC,CAAC,CAAC,KAAC,oBAAoB,IAAC,KAAK,EAAC,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,EAC5D,cAAc,CAAC,CAAC,CAAC,KAAC,kBAAkB,IAAC,KAAK,EAAC,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,EAC9D,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAC,QAAQ,cAAE,IAAI,GAAY,IACpC,CACX,CAAA;AACH,CAAC,CAAA"}

package/dist/esm/components/Toolbar/System/index.d.ts

@@ -1,2 +1 @@
-export * from './SiteMenu';
 export * from './SystemToolbar';

package/dist/esm/components/Toolbar/System/index.js

@@ -1,3 +1,2 @@
-export * from './SiteMenu';
 export * from './SystemToolbar';
 //# sourceMappingURL=index.js.map

package/dist/esm/components/Toolbar/System/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/Toolbar/System/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/components/Toolbar/System/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA"}

package/dist/esm/components/index.d.ts

@@ -1,4 +1,5 @@
 export * from './AppBar';
 export * from './MobileSystemControls';
 export * from './SearchBar';
+export * from './SiteMenu';
 export * from './Toolbar';

package/dist/esm/components/index.js

@@ -1,5 +1,6 @@
 export * from './AppBar';
 export * from './MobileSystemControls';
 export * from './SearchBar';
+export * from './SiteMenu';
 export * from './Toolbar';
 //# sourceMappingURL=index.js.map

package/dist/esm/components/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA"}

package/package.json

@@ -15,13 +15,13 @@
     "@mui/icons-material": "^5.8.3",
     "@mui/material": "^5.8.3",
     "@xylabs/sdk-react": "^2.13.7",
-    "@xyo-network/core": "^2.20.43",
-    "@xyo-network/react-archive": "^2.25.39",
-    "@xyo-network/react-archivist-api": "^2.25.39",
-    "@xyo-network/react-auth": "^2.25.39",
-    "@xyo-network/react-network": "^2.25.39",
-    "@xyo-network/react-shared": "^2.25.39",
-    "@xyo-network/react-theme": "^2.25.39",
+    "@xyo-network/core": "^2.20.44",
+    "@xyo-network/react-archive": "^2.25.42",
+    "@xyo-network/react-archivist-api": "^2.25.42",
+    "@xyo-network/react-auth": "^2.25.42",
+    "@xyo-network/react-network": "^2.25.42",
+    "@xyo-network/react-shared": "^2.25.42",
+    "@xyo-network/react-theme": "^2.25.42",
     "lodash": "^4.17.21",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
@@ -33,12 +33,12 @@
   "devDependencies": {
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
-    "@storybook/addons": "^6.5.7",
-    "@storybook/api": "^6.5.7",
-    "@storybook/components": "^6.5.7",
-    "@storybook/core-events": "^6.5.7",
-    "@storybook/react": "^6.5.7",
-    "@storybook/theming": "^6.5.7",
+    "@storybook/addons": "^6.5.8",
+    "@storybook/api": "^6.5.8",
+    "@storybook/components": "^6.5.8",
+    "@storybook/core-events": "^6.5.8",
+    "@storybook/react": "^6.5.8",
+    "@storybook/theming": "^6.5.8",
     "@types/lodash": "^4.14.182",
     "@xylabs/sdk-react": "^2.13.7",
     "@xylabs/ts-scripts": "^1.0.66",
@@ -105,6 +105,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.25.39",
+  "version": "2.25.42",
   "packageManager": "yarn@3.1.1"
 }

package/src/components/SiteMenu/Menu.tsx

@@ -0,0 +1,39 @@
+import MenuIcon from '@mui/icons-material/Menu'
+import SettingsIcon from '@mui/icons-material/Settings'
+import { Box, IconButton, List, SwipeableDrawer } from '@mui/material'
+import { FlexBoxProps, FlexRow } from '@xylabs/sdk-react'
+import { useState } from 'react'
+
+import { DrawerListItem } from './MenuItems'
+
+export interface SiteMenuProps extends FlexBoxProps {
+  hideSettingsMenuItem?: boolean
+  side?: 'left' | 'right' | 'top' | 'bottom'
+}
+
+export const SiteMenu: React.FC<SiteMenuProps> = ({ side = 'right', children, ...props }) => {
+  const [open, setOpen] = useState(false)
+
+  return (
+    <FlexRow alignItems="stretch" {...props}>
+      <IconButton
+        size="small"
+        color="inherit"
+        onClick={() => {
+          setOpen(!open)
+        }}
+      >
+        <MenuIcon fontSize="large" />
+      </IconButton>
+      <SwipeableDrawer anchor={side} open={open} onClose={() => setOpen(false)} onOpen={() => setOpen(true)}>
+        <Box width="auto" role="presentation" onClick={() => setOpen(false)} onKeyDown={() => setOpen(false)}>
+          {children ?? (
+            <List>
+              <DrawerListItem primary="Settings" icon={<SettingsIcon />} to="/settings" />
+            </List>
+          )}
+        </Box>
+      </SwipeableDrawer>
+    </FlexRow>
+  )
+}

package/src/components/SiteMenu/MenuItems.tsx

@@ -0,0 +1,22 @@
+import { ListItem, ListItemIcon, ListItemProps, ListItemText, ListItemTextProps } from '@mui/material'
+import { ListItemButtonEx, ListItemButtonExProps } from '@xyo-network/react-shared'
+import { ReactNode } from 'react'
+import { To } from 'react-router-dom'
+
+export interface DrawerListItemProps extends ListItemProps {
+  primary: ListItemTextProps['primary']
+  to?: To
+  icon?: ReactNode
+  onButtonClick?: ListItemButtonExProps['onClick']
+}
+
+export const DrawerListItem: React.FC<DrawerListItemProps> = ({ primary, to, icon, onButtonClick, ...props }) => {
+  return (
+    <ListItem {...props}>
+      <ListItemButtonEx to={to} onClick={onButtonClick}>
+        <ListItemIcon>{icon}</ListItemIcon>
+        <ListItemText primary={primary} />
+      </ListItemButtonEx>
+    </ListItem>
+  )
+}

package/src/components/SiteMenu/index.ts

@@ -0,0 +1,2 @@
+export * from './Menu'
+export * from './MenuItems'

package/src/components/Toolbar/System/SystemToolbar.tsx

@@ -4,15 +4,16 @@ import { ArchiveSelectEx } from '@xyo-network/react-archive'
 import { AuthStatusIconButton } from '@xyo-network/react-auth'
 import { NetworkSelectEx, NetworkSelectExProps } from '@xyo-network/react-network'
 import { DarkModeIconButton } from '@xyo-network/react-shared'
+import { ReactNode } from 'react'
 
-import { SiteMenu, SiteMenuProps } from './SiteMenu'
+import { SiteMenu } from '../../SiteMenu'
 
 export interface SystemToolbarProps extends ToolbarProps {
   networkSelectProps?: NetworkSelectExProps
   archiveSelectProps?: SelectExProps<string>
   hideNetworkSelect?: boolean
   hideArchiveSelect?: boolean
-  siteMenuProps?: SiteMenuProps
+  menu?: ReactNode
   darkModeButton?: boolean
   authButton?: boolean
   noMenu?: boolean
@@ -24,7 +25,7 @@ export const SystemToolbar: React.FC<SystemToolbarProps> = ({
   archiveSelectProps,
   hideNetworkSelect,
   hideArchiveSelect,
-  siteMenuProps,
+  menu,
   darkModeButton = false,
   authButton = false,
   noMenu = false,
@@ -49,7 +50,7 @@ export const SystemToolbar: React.FC<SystemToolbarProps> = ({
       {children}
       {authButton ? <AuthStatusIconButton color="inherit" /> : null}
       {darkModeButton ? <DarkModeIconButton color="inherit" /> : null}
-      {noMenu ? null : <SiteMenu {...siteMenuProps} />}
+      {noMenu ? null : <SiteMenu>{menu}</SiteMenu>}
     </Toolbar>
   )
 }

package/src/components/Toolbar/System/index.ts

@@ -1,2 +1 @@
-export * from './SiteMenu'
 export * from './SystemToolbar'

package/src/components/index.ts

@@ -1,4 +1,5 @@
 export * from './AppBar'
 export * from './MobileSystemControls'
 export * from './SearchBar'
+export * from './SiteMenu'
 export * from './Toolbar'

package/dist/cjs/components/Toolbar/System/SiteMenu.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SiteMenu = void 0;
-const tslib_1 = require("tslib");
-const jsx_runtime_1 = require("react/jsx-runtime");
-const icons_material_1 = require("@mui/icons-material");
-const material_1 = require("@mui/material");
-const sdk_react_1 = require("@xylabs/sdk-react");
-const react_1 = require("react");
-const react_router_dom_1 = require("react-router-dom");
-const SiteMenu = (_a) => {
-    var { hideSettingsMenuItem, menuItems } = _a, props = tslib_1.__rest(_a, ["hideSettingsMenuItem", "menuItems"]);
-    const [menuElement, setMenuElement] = (0, react_1.useState)(null);
-    const open = Boolean(menuElement);
-    const navigate = (0, react_router_dom_1.useNavigate)();
-    const handleMenuClose = () => {
-        setMenuElement(null);
-    };
-    const ref = (0, react_1.useRef)(null);
-    return ((0, jsx_runtime_1.jsxs)(sdk_react_1.FlexRow, Object.assign({ alignItems: "stretch" }, props, { children: [(0, jsx_runtime_1.jsx)(sdk_react_1.LinkEx, Object.assign({ color: "inherit", onClick: () => {
-                    setMenuElement(ref.current);
-                } }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ style: { alignItems: 'center', cursor: 'pointer', display: 'flex' }, ref: ref }, { children: (0, jsx_runtime_1.jsx)(icons_material_1.Menu, { fontSize: "large" }) })) })), (0, jsx_runtime_1.jsxs)(material_1.Menu, Object.assign({ anchorEl: menuElement, open: open, onClose: handleMenuClose }, { children: [menuItems === null || menuItems === void 0 ? void 0 : menuItems.map(({ name, to, href, onClick }) => {
-                        return ((0, jsx_runtime_1.jsx)(material_1.MenuItem, Object.assign({ onClick: () => {
-                                if (onClick) {
-                                    onClick();
-                                }
-                                else if (to) {
-                                    navigate(to);
-                                }
-                                else if (href) {
-                                    window.open(href);
-                                }
-                                handleMenuClose();
-                            }, disableRipple: true }, { children: name }), name));
-                    }), hideSettingsMenuItem ? null : ((0, jsx_runtime_1.jsx)(material_1.MenuItem, Object.assign({ onClick: () => {
-                            navigate('/settings');
-                            handleMenuClose();
-                        }, disableRipple: true }, { children: "Settings" })))] }))] })));
-};
-exports.SiteMenu = SiteMenu;
-//# sourceMappingURL=SiteMenu.js.map

package/dist/cjs/components/Toolbar/System/SiteMenu.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SiteMenu.js","sourceRoot":"","sources":["../../../../../src/components/Toolbar/System/SiteMenu.tsx"],"names":[],"mappings":";;;;;AAAA,wDAAsD;AACtD,4CAA8C;AAC9C,iDAAiE;AACjE,iCAAwC;AACxC,uDAAkD;AAc3C,MAAM,QAAQ,GAA4B,CAAC,EAA6C,EAAE,EAAE;QAAjD,EAAE,oBAAoB,EAAE,SAAS,OAAY,EAAP,KAAK,sBAA3C,qCAA6C,CAAF;IAC3F,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAA2B,IAAI,CAAC,CAAA;IAC9E,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IACjC,MAAM,QAAQ,GAAG,IAAA,8BAAW,GAAE,CAAA;IAE9B,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,cAAc,CAAC,IAAI,CAAC,CAAA;IACtB,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,IAAA,cAAM,EAAC,IAAI,CAAC,CAAA;IAExB,OAAO,CACL,wBAAC,mBAAO,kBAAC,UAAU,EAAC,SAAS,IAAK,KAAK,eACrC,uBAAC,kBAAM,kBACL,KAAK,EAAC,SAAS,EACf,OAAO,EAAE,GAAG,EAAE;oBACZ,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAC7B,CAAC,gBAED,8CAAK,KAAK,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,gBAChF,uBAAC,qBAAQ,IAAC,QAAQ,EAAC,OAAO,GAAG,IACzB,IACC,EACT,wBAAC,eAAI,kBAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,iBAC9D,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;wBAC9C,OAAO,CACL,uBAAC,mBAAQ,kBAEP,OAAO,EAAE,GAAG,EAAE;gCACZ,IAAI,OAAO,EAAE;oCACX,OAAO,EAAE,CAAA;iCACV;qCAAM,IAAI,EAAE,EAAE;oCACb,QAAQ,CAAC,EAAE,CAAC,CAAA;iCACb;qCAAM,IAAI,IAAI,EAAE;oCACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iCAClB;gCACD,eAAe,EAAE,CAAA;4BACnB,CAAC,EACD,aAAa,sBAEZ,IAAI,KAbA,IAAI,CAcA,CACZ,CAAA;oBACH,CAAC,CAAC,EACD,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC7B,uBAAC,mBAAQ,kBACP,OAAO,EAAE,GAAG,EAAE;4BACZ,QAAQ,CAAC,WAAW,CAAC,CAAA;4BACrB,eAAe,EAAE,CAAA;wBACnB,CAAC,EACD,aAAa,oCAGJ,CACZ,KACI,KACC,CACX,CAAA;AACH,CAAC,CAAA;AA1DY,QAAA,QAAQ,YA0DpB"}

package/dist/esm/components/Toolbar/System/SiteMenu.js

@@ -1,35 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Menu as MenuIcon } from '@mui/icons-material';
-import { Menu, MenuItem } from '@mui/material';
-import { FlexRow, LinkEx } from '@xylabs/sdk-react';
-import { useRef, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-export const SiteMenu = ({ hideSettingsMenuItem, menuItems, ...props }) => {
-    const [menuElement, setMenuElement] = useState(null);
-    const open = Boolean(menuElement);
-    const navigate = useNavigate();
-    const handleMenuClose = () => {
-        setMenuElement(null);
-    };
-    const ref = useRef(null);
-    return (_jsxs(FlexRow, { alignItems: "stretch", ...props, children: [_jsx(LinkEx, { color: "inherit", onClick: () => {
-                    setMenuElement(ref.current);
-                }, children: _jsx("div", { style: { alignItems: 'center', cursor: 'pointer', display: 'flex' }, ref: ref, children: _jsx(MenuIcon, { fontSize: "large" }) }) }), _jsxs(Menu, { anchorEl: menuElement, open: open, onClose: handleMenuClose, children: [menuItems?.map(({ name, to, href, onClick }) => {
-                        return (_jsx(MenuItem, { onClick: () => {
-                                if (onClick) {
-                                    onClick();
-                                }
-                                else if (to) {
-                                    navigate(to);
-                                }
-                                else if (href) {
-                                    window.open(href);
-                                }
-                                handleMenuClose();
-                            }, disableRipple: true, children: name }, name));
-                    }), hideSettingsMenuItem ? null : (_jsx(MenuItem, { onClick: () => {
-                            navigate('/settings');
-                            handleMenuClose();
-                        }, disableRipple: true, children: "Settings" }))] })] }));
-};
-//# sourceMappingURL=SiteMenu.js.map

package/dist/esm/components/Toolbar/System/SiteMenu.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SiteMenu.js","sourceRoot":"","sources":["../../../../../src/components/Toolbar/System/SiteMenu.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAgB,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACxC,OAAO,EAAM,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAclD,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAAC,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACjG,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAA2B,IAAI,CAAC,CAAA;IAC9E,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;IACjC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAA;IAE9B,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,cAAc,CAAC,IAAI,CAAC,CAAA;IACtB,CAAC,CAAA;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IAExB,OAAO,CACL,MAAC,OAAO,IAAC,UAAU,EAAC,SAAS,KAAK,KAAK,aACrC,KAAC,MAAM,IACL,KAAK,EAAC,SAAS,EACf,OAAO,EAAE,GAAG,EAAE;oBACZ,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAC7B,CAAC,YAED,cAAK,KAAK,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,YAChF,KAAC,QAAQ,IAAC,QAAQ,EAAC,OAAO,GAAG,GACzB,GACC,EACT,MAAC,IAAI,IAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,aAC9D,SAAS,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;wBAC9C,OAAO,CACL,KAAC,QAAQ,IAEP,OAAO,EAAE,GAAG,EAAE;gCACZ,IAAI,OAAO,EAAE;oCACX,OAAO,EAAE,CAAA;iCACV;qCAAM,IAAI,EAAE,EAAE;oCACb,QAAQ,CAAC,EAAE,CAAC,CAAA;iCACb;qCAAM,IAAI,IAAI,EAAE;oCACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iCAClB;gCACD,eAAe,EAAE,CAAA;4BACnB,CAAC,EACD,aAAa,kBAEZ,IAAI,IAbA,IAAI,CAcA,CACZ,CAAA;oBACH,CAAC,CAAC,EACD,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAC7B,KAAC,QAAQ,IACP,OAAO,EAAE,GAAG,EAAE;4BACZ,QAAQ,CAAC,WAAW,CAAC,CAAA;4BACrB,eAAe,EAAE,CAAA;wBACnB,CAAC,EACD,aAAa,+BAGJ,CACZ,IACI,IACC,CACX,CAAA;AACH,CAAC,CAAA"}

package/src/components/Toolbar/System/SiteMenu.tsx

@@ -1,77 +0,0 @@
-import { Menu as MenuIcon } from '@mui/icons-material'
-import { Menu, MenuItem } from '@mui/material'
-import { FlexBoxProps, FlexRow, LinkEx } from '@xylabs/sdk-react'
-import { useRef, useState } from 'react'
-import { To, useNavigate } from 'react-router-dom'
-
-export interface SiteMenuItem {
-  name: string
-  to?: To
-  href?: string
-  onClick?: () => void
-}
-
-export interface SiteMenuProps extends FlexBoxProps {
-  hideSettingsMenuItem?: boolean
-  menuItems?: SiteMenuItem[]
-}
-
-export const SiteMenu: React.FC<SiteMenuProps> = ({ hideSettingsMenuItem, menuItems, ...props }) => {
-  const [menuElement, setMenuElement] = useState<HTMLButtonElement | null>(null)
-  const open = Boolean(menuElement)
-  const navigate = useNavigate()
-
-  const handleMenuClose = () => {
-    setMenuElement(null)
-  }
-
-  const ref = useRef(null)
-
-  return (
-    <FlexRow alignItems="stretch" {...props}>
-      <LinkEx
-        color="inherit"
-        onClick={() => {
-          setMenuElement(ref.current)
-        }}
-      >
-        <div style={{ alignItems: 'center', cursor: 'pointer', display: 'flex' }} ref={ref}>
-          <MenuIcon fontSize="large" />
-        </div>
-      </LinkEx>
-      <Menu anchorEl={menuElement} open={open} onClose={handleMenuClose}>
-        {menuItems?.map(({ name, to, href, onClick }) => {
-          return (
-            <MenuItem
-              key={name}
-              onClick={() => {
-                if (onClick) {
-                  onClick()
-                } else if (to) {
-                  navigate(to)
-                } else if (href) {
-                  window.open(href)
-                }
-                handleMenuClose()
-              }}
-              disableRipple
-            >
-              {name}
-            </MenuItem>
-          )
-        })}
-        {hideSettingsMenuItem ? null : (
-          <MenuItem
-            onClick={() => {
-              navigate('/settings')
-              handleMenuClose()
-            }}
-            disableRipple
-          >
-            Settings
-          </MenuItem>
-        )}
-      </Menu>
-    </FlexRow>
-  )
-}