@xyo-network/react-appbar 2.35.2 → 2.35.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/dist/cjs/components/SiteMenu/MenuIcon.d.ts +1 -2
  2. package/dist/cjs/components/SiteMenu/MenuIcon.d.ts.map +1 -1
  3. package/dist/cjs/components/SiteMenu/MenuIcon.js +2 -2
  4. package/dist/cjs/components/SiteMenu/MenuIcon.js.map +1 -1
  5. package/dist/cjs/components/SiteMenu/MenuItems.d.ts.map +1 -1
  6. package/dist/cjs/components/SiteMenu/MenuItems.js +2 -2
  7. package/dist/cjs/components/SiteMenu/MenuItems.js.map +1 -1
  8. package/dist/cjs/components/SiteMenu/MenuListItem.d.ts.map +1 -1
  9. package/dist/cjs/components/SiteMenu/MenuListItem.js +1 -2
  10. package/dist/cjs/components/SiteMenu/MenuListItem.js.map +1 -1
  11. package/dist/cjs/components/SiteMenu/MenuListItemButtonEx.d.ts.map +1 -1
  12. package/dist/cjs/components/SiteMenu/MenuListItemButtonEx.js +4 -3
  13. package/dist/cjs/components/SiteMenu/MenuListItemButtonEx.js.map +1 -1
  14. package/dist/cjs/components/SiteMenu/MenuListItemText.d.ts.map +1 -1
  15. package/dist/cjs/components/SiteMenu/MenuListItemText.js +2 -2
  16. package/dist/cjs/components/SiteMenu/MenuListItemText.js.map +1 -1
  17. package/dist/cjs/components/SiteMenu/lib/SiteMenuListItemBase.d.ts +1 -0
  18. package/dist/cjs/components/SiteMenu/lib/SiteMenuListItemBase.d.ts.map +1 -1
  19. package/dist/docs.json +111 -85
  20. package/dist/esm/components/SiteMenu/MenuIcon.d.ts +1 -2
  21. package/dist/esm/components/SiteMenu/MenuIcon.d.ts.map +1 -1
  22. package/dist/esm/components/SiteMenu/MenuIcon.js +2 -2
  23. package/dist/esm/components/SiteMenu/MenuIcon.js.map +1 -1
  24. package/dist/esm/components/SiteMenu/MenuItems.d.ts.map +1 -1
  25. package/dist/esm/components/SiteMenu/MenuItems.js +2 -2
  26. package/dist/esm/components/SiteMenu/MenuItems.js.map +1 -1
  27. package/dist/esm/components/SiteMenu/MenuListItem.d.ts.map +1 -1
  28. package/dist/esm/components/SiteMenu/MenuListItem.js +1 -2
  29. package/dist/esm/components/SiteMenu/MenuListItem.js.map +1 -1
  30. package/dist/esm/components/SiteMenu/MenuListItemButtonEx.d.ts.map +1 -1
  31. package/dist/esm/components/SiteMenu/MenuListItemButtonEx.js +4 -3
  32. package/dist/esm/components/SiteMenu/MenuListItemButtonEx.js.map +1 -1
  33. package/dist/esm/components/SiteMenu/MenuListItemText.d.ts.map +1 -1
  34. package/dist/esm/components/SiteMenu/MenuListItemText.js +8 -2
  35. package/dist/esm/components/SiteMenu/MenuListItemText.js.map +1 -1
  36. package/dist/esm/components/SiteMenu/lib/SiteMenuListItemBase.d.ts +1 -0
  37. package/dist/esm/components/SiteMenu/lib/SiteMenuListItemBase.d.ts.map +1 -1
  38. package/package.json +6 -6
  39. package/src/components/SiteMenu/MenuIcon.tsx +3 -5
  40. package/src/components/SiteMenu/MenuItem.stories.tsx +44 -5
  41. package/src/components/SiteMenu/MenuItems.tsx +12 -3
  42. package/src/components/SiteMenu/MenuListItem.tsx +1 -2
  43. package/src/components/SiteMenu/MenuListItemButtonEx.tsx +4 -3
  44. package/src/components/SiteMenu/MenuListItemText.tsx +13 -2
  45. package/src/components/SiteMenu/lib/SiteMenuListItemBase.tsx +1 -0
@@ -1,7 +1,6 @@
1
1
  import { TypographyExProps } from '@xyo-network/react-shared';
2
2
  import { ReactNode } from 'react';
3
- import { SiteMenuListItemBase } from './lib';
4
- export interface MenuIconProps extends SiteMenuListItemBase, TypographyExProps {
3
+ export interface MenuIconProps extends TypographyExProps {
5
4
  icon?: ReactNode;
6
5
  }
7
6
  export declare const MenuIcon: React.FC<MenuIconProps>;
@@ -1 +1 @@
1
- {"version":3,"file":"MenuIcon.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuIcon.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,WAAW,aAAc,SAAQ,oBAAoB,EAAE,iBAAiB;IAC5E,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAM5C,CAAA"}
1
+ {"version":3,"file":"MenuIcon.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuIcon.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjC,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAM5C,CAAA"}
@@ -1,6 +1,6 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { Typography } from '@mui/material';
3
- export const MenuIcon = ({ iconOnly, icon, ...props }) => {
4
- return (_jsx(Typography, { mr: iconOnly ? 0 : 1, display: "flex", variant: "caption", ...props, children: icon }));
3
+ export const MenuIcon = ({ icon, ...props }) => {
4
+ return (_jsx(Typography, { display: "flex", variant: "caption", ...props, children: icon }));
5
5
  };
6
6
  //# sourceMappingURL=MenuIcon.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"MenuIcon.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuIcon.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAU1C,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAChF,OAAO,CACL,KAAC,UAAU,IAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAC,MAAM,EAAC,OAAO,EAAC,SAAS,KAAK,KAAK,YACzE,IAAI,GACM,CACd,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"MenuIcon.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuIcon.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAQ1C,MAAM,CAAC,MAAM,QAAQ,GAA4B,CAAC,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACtE,OAAO,CACL,KAAC,UAAU,IAAC,OAAO,EAAC,MAAM,EAAC,OAAO,EAAC,SAAS,KAAK,KAAK,YACnD,IAAI,GACM,CACd,CAAA;AACH,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItems.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAErC,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,SAAS,CAAA;IAChB,aAAa,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;CACjD;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAU5D,CAAA"}
1
+ {"version":3,"file":"MenuItems.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAErC,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,SAAS,CAAA;IAChB,aAAa,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAA;CACjD;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAmB5D,CAAA"}
@@ -3,7 +3,7 @@ import { MenuIcon } from './MenuIcon';
3
3
  import { MenuListItem } from './MenuListItem';
4
4
  import { MenuListItemButtonEx } from './MenuListItemButtonEx';
5
5
  import { MenuListItemText } from './MenuListItemText';
6
- export const SiteMenuListItem = ({ style, children, iconOnly, icon, primary, onButtonClick, ...props }) => {
7
- return (_jsxs(MenuListItem, { style: style, iconOnly: iconOnly, ...props, children: [_jsxs(MenuListItemButtonEx, { iconOnly: iconOnly, onClick: onButtonClick, children: [_jsx(MenuIcon, { icon: icon, iconOnly: iconOnly }), _jsx(MenuListItemText, { primary: primary, iconOnly: iconOnly })] }), children] }));
6
+ export const SiteMenuListItem = ({ style, children, iconOnly, collapseEnd, icon, primary, onButtonClick, ...props }) => {
7
+ return (_jsxs(MenuListItem, { style: style, iconOnly: iconOnly, ...props, children: [_jsxs(MenuListItemButtonEx, { iconOnly: iconOnly, onClick: onButtonClick, collapseEnd: collapseEnd, children: [_jsx(MenuIcon, { icon: icon }), _jsx(MenuListItemText, { primary: primary, iconOnly: iconOnly })] }), children] }));
8
8
  };
9
9
  //# sourceMappingURL=MenuItems.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"MenuItems.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AASrD,MAAM,CAAC,MAAM,gBAAgB,GAAoC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACzI,OAAO,CACL,MAAC,YAAY,IAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,KAAM,KAAK,aACvD,MAAC,oBAAoB,IAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,aAC9D,KAAC,QAAQ,IAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAI,EAC5C,KAAC,gBAAgB,IAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAI,IACrC,EACtB,QAAQ,IACI,CAChB,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"MenuItems.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuItems.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AASrD,MAAM,CAAC,MAAM,gBAAgB,GAAoC,CAAC,EAChE,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,OAAO,EACP,aAAa,EACb,GAAG,KAAK,EACT,EAAE,EAAE;IACH,OAAO,CACL,MAAC,YAAY,IAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,KAAM,KAAK,aACvD,MAAC,oBAAoB,IAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,aACxF,KAAC,QAAQ,IAAC,IAAI,EAAE,IAAI,GAAI,EACxB,KAAC,gBAAgB,IAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAI,IACrC,EACtB,QAAQ,IACI,CAChB,CAAA;AACH,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"MenuListItem.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAY,aAAa,EAAE,MAAM,eAAe,CAAA;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB,EAAE,aAAa;CAAG;AAEjF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAUpD,CAAA"}
1
+ {"version":3,"file":"MenuListItem.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAY,aAAa,EAAE,MAAM,eAAe,CAAA;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB,EAAE,aAAa;CAAG;AAEjF,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CASpD,CAAA"}
@@ -2,9 +2,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { ListItem } from '@mui/material';
3
3
  export const MenuListItem = ({ children, style, iconOnly, ...props }) => {
4
4
  const listItemStyles = {
5
- display: iconOnly ? 'inline-flex' : 'block',
6
5
  width: iconOnly ? 'auto' : '100%',
7
6
  };
8
- return (_jsx(ListItem, { style: { ...listItemStyles, ...style }, ...props, children: children }));
7
+ return (_jsx(ListItem, { style: { display: 'block', ...listItemStyles, ...style }, ...props, children: children }));
9
8
  };
10
9
  //# sourceMappingURL=MenuListItem.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"MenuListItem.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,eAAe,CAAA;AAMvD,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACnG,MAAM,cAAc,GAAG;QACrB,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO;QAC3C,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;KAClC,CAAA;IACD,OAAO,CACL,KAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,GAAG,cAAc,EAAE,GAAG,KAAK,EAAE,KAAM,KAAK,YACxD,QAAQ,GACA,CACZ,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"MenuListItem.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAiB,MAAM,eAAe,CAAA;AAMvD,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IACnG,MAAM,cAAc,GAAG;QACrB,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;KAClC,CAAA;IACD,OAAO,CACL,KAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,cAAc,EAAE,GAAG,KAAK,EAAE,KAAM,KAAK,YAC1E,QAAQ,GACA,CACZ,CAAA;AACH,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"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,CAOpE,CAAA"}
1
+ {"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,CAQpE,CAAA"}
@@ -1,7 +1,8 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { ListItemButtonEx } from '@xyo-network/react-shared';
3
- export const MenuListItemButtonEx = ({ iconOnly, sx, children, ...props }) => {
4
- const listItemButtonSx = iconOnly ? { borderRadius: '50%', display: 'inline-flex' } : {};
5
- return (_jsx(ListItemButtonEx, { sx: { ...listItemButtonSx, ...sx }, ...props, children: children }));
3
+ export const MenuListItemButtonEx = ({ iconOnly, collapseEnd, sx, children, ...props }) => {
4
+ const listItemButtonSx = iconOnly ? { borderRadius: '50%', display: 'inline-flex', flexGrow: 0 } : {};
5
+ const spacingSx = collapseEnd ? { columnGap: 0 } : { columnGap: 1.5 };
6
+ return (_jsx(ListItemButtonEx, { sx: { ...listItemButtonSx, ...spacingSx, ...sx }, ...props, children: children }));
6
7
  };
7
8
  //# sourceMappingURL=MenuListItemButtonEx.js.map
@@ -1 +1 @@
1
- {"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,EAAE,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAChH,MAAM,gBAAgB,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACxF,OAAO,CACL,KAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,EAAE,EAAE,KAAM,KAAK,YAC5D,QAAQ,GACQ,CACpB,CAAA;AACH,CAAC,CAAA"}
1
+ {"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,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,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAA;IACrE,OAAO,CACL,KAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,GAAG,gBAAgB,EAAE,GAAG,SAAS,EAAE,GAAG,EAAE,EAAE,KAAM,KAAK,YAC1E,QAAQ,GACQ,CACpB,CAAA;AACH,CAAC,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"MenuListItemText.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemText.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAgB,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAE/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB,EAAE,iBAAiB;CAAG;AAEzF,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAG5D,CAAA"}
1
+ {"version":3,"file":"MenuListItemText.d.ts","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemText.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAgB,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAE/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAE5C,MAAM,WAAW,qBAAsB,SAAQ,oBAAoB,EAAE,iBAAiB;CAAG;AAEzF,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CAc5D,CAAA"}
@@ -1,7 +1,13 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { ListItemText } from '@mui/material';
3
3
  export const MenuListItemText = ({ iconOnly, sx, ...props }) => {
4
- const listItemTextSxProps = iconOnly ? { visibility: 'hidden', width: 0, ...sx } : {};
5
- return _jsx(ListItemText, { sx: { ...listItemTextSxProps, ...sx }, ...props });
4
+ const listItemTextSxProps = iconOnly ? { maxWidth: 0, ...sx } : { ...sx };
5
+ return (_jsx(ListItemText, { sx: {
6
+ flexGrow: 0,
7
+ maxWidth: '100%',
8
+ overflow: 'hidden',
9
+ transition: 'max-width 300ms linear',
10
+ ...listItemTextSxProps,
11
+ }, ...props }));
6
12
  };
7
13
  //# sourceMappingURL=MenuListItemText.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"MenuListItemText.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemText.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAqB,MAAM,eAAe,CAAA;AAM/D,MAAM,CAAC,MAAM,gBAAgB,GAAoC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,MAAM,mBAAmB,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACrF,OAAO,KAAC,YAAY,IAAC,EAAE,EAAE,EAAE,GAAG,mBAAmB,EAAE,GAAG,EAAE,EAAE,KAAM,KAAK,GAAI,CAAA;AAC3E,CAAC,CAAA"}
1
+ {"version":3,"file":"MenuListItemText.js","sourceRoot":"","sources":["../../../../src/components/SiteMenu/MenuListItemText.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAqB,MAAM,eAAe,CAAA;AAM/D,MAAM,CAAC,MAAM,gBAAgB,GAAoC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;IAC9F,MAAM,mBAAmB,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAA;IACzE,OAAO,CACL,KAAC,YAAY,IACX,EAAE,EAAE;YACF,QAAQ,EAAE,CAAC;YACX,QAAQ,EAAE,MAAM;YAChB,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,wBAAwB;YACpC,GAAG,mBAAmB;SACvB,KACG,KAAK,GACT,CACH,CAAA;AACH,CAAC,CAAA"}
@@ -1,4 +1,5 @@
1
1
  export interface SiteMenuListItemBase {
2
2
  iconOnly?: boolean;
3
+ collapseEnd?: boolean;
3
4
  }
4
5
  //# sourceMappingURL=SiteMenuListItemBase.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"SiteMenuListItemBase.d.ts","sourceRoot":"","sources":["../../../../../src/components/SiteMenu/lib/SiteMenuListItemBase.tsx"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB"}
1
+ {"version":3,"file":"SiteMenuListItemBase.d.ts","sourceRoot":"","sources":["../../../../../src/components/SiteMenu/lib/SiteMenuListItemBase.tsx"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB"}
package/package.json CHANGED
@@ -16,11 +16,11 @@
16
16
  "@xylabs/react-flexbox": "^2.14.20",
17
17
  "@xylabs/react-link": "^2.14.20",
18
18
  "@xylabs/react-shared": "^2.14.20",
19
- "@xyo-network/react-app-settings": "^2.35.2",
20
- "@xyo-network/react-archive": "^2.35.2",
21
- "@xyo-network/react-auth-sets": "^2.35.2",
22
- "@xyo-network/react-network": "^2.35.2",
23
- "@xyo-network/react-shared": "^2.35.2",
19
+ "@xyo-network/react-app-settings": "^2.35.3",
20
+ "@xyo-network/react-archive": "^2.35.3",
21
+ "@xyo-network/react-auth-sets": "^2.35.3",
22
+ "@xyo-network/react-network": "^2.35.3",
23
+ "@xyo-network/react-shared": "^2.35.3",
24
24
  "tslib": "^2.4.0"
25
25
  },
26
26
  "peerDependencies": {
@@ -76,5 +76,5 @@
76
76
  },
77
77
  "sideEffects": false,
78
78
  "types": "dist/esm/index.d.ts",
79
- "version": "2.35.2"
79
+ "version": "2.35.3"
80
80
  }
@@ -2,15 +2,13 @@ import { Typography } from '@mui/material'
2
2
  import { TypographyExProps } from '@xyo-network/react-shared'
3
3
  import { ReactNode } from 'react'
4
4
 
5
- import { SiteMenuListItemBase } from './lib'
6
-
7
- export interface MenuIconProps extends SiteMenuListItemBase, TypographyExProps {
5
+ export interface MenuIconProps extends TypographyExProps {
8
6
  icon?: ReactNode
9
7
  }
10
8
 
11
- export const MenuIcon: React.FC<MenuIconProps> = ({ iconOnly, icon, ...props }) => {
9
+ export const MenuIcon: React.FC<MenuIconProps> = ({ icon, ...props }) => {
12
10
  return (
13
- <Typography mr={iconOnly ? 0 : 1} display="flex" variant="caption" {...props}>
11
+ <Typography display="flex" variant="caption" {...props}>
14
12
  {icon}
15
13
  </Typography>
16
14
  )
@@ -1,8 +1,10 @@
1
1
  import PublicRoundedIcon from '@mui/icons-material/PublicRounded'
2
- import { List } from '@mui/material'
2
+ import { Button, Collapse, Divider, List, useTheme } from '@mui/material'
3
3
  import { ComponentMeta, ComponentStory } from '@storybook/react'
4
+ import { FlexRow } from '@xylabs/react-flexbox'
5
+ import { useState } from 'react'
4
6
 
5
- import { SiteMenuListItem } from './MenuItems'
7
+ import { SiteMenuListItem, SiteMenuListItemProps } from './MenuItems'
6
8
 
7
9
  const StorybookEntry = {
8
10
  argTypes: {},
@@ -15,32 +17,69 @@ const StorybookEntry = {
15
17
  title: 'appbar/SiteMenuListItem',
16
18
  } as ComponentMeta<typeof SiteMenuListItem>
17
19
 
18
- const Template: ComponentStory<typeof SiteMenuListItem> = (args) => {
20
+ const SiteMenuList: React.FC<SiteMenuListItemProps> = (args) => {
19
21
  return (
20
22
  <List>
21
23
  <SiteMenuListItem {...args} />
24
+ <SiteMenuListItem {...args} />
25
+ <SiteMenuListItem {...args} />
22
26
  </List>
23
27
  )
24
28
  }
25
29
 
30
+ const CollapseTemplate: ComponentStory<typeof SiteMenuListItem> = (args) => {
31
+ const [collapse, setCollapse] = useState(false)
32
+ const [onCollapseEnd, setOnCollapseEnd] = useState(false)
33
+ const theme = useTheme()
34
+ return (
35
+ <>
36
+ <FlexRow justifyContent="start">
37
+ <Collapse in={!collapse} orientation="horizontal" collapsedSize={theme.spacing(5)} onExited={() => setOnCollapseEnd(true)}>
38
+ <SiteMenuList {...args} iconOnly={collapse} collapseEnd={onCollapseEnd} />
39
+ </Collapse>
40
+ <Divider orientation="vertical" flexItem />
41
+ </FlexRow>
42
+ <Button
43
+ onClick={() => {
44
+ setOnCollapseEnd((previous) => (previous ? false : previous))
45
+ setCollapse(!collapse)
46
+ }}
47
+ >
48
+ Toggle
49
+ </Button>
50
+ </>
51
+ )
52
+ }
53
+
54
+ const Template: ComponentStory<typeof SiteMenuListItem> = (args) => {
55
+ console.log(args)
56
+ return <SiteMenuList {...args} />
57
+ }
58
+
26
59
  const Default = Template.bind({})
27
60
  Default.args = {
28
61
  icon: <PublicRoundedIcon />,
29
62
  primary: 'Test',
30
63
  }
31
64
 
65
+ const WithCollapse = CollapseTemplate.bind({})
66
+ WithCollapse.args = {
67
+ icon: <PublicRoundedIcon />,
68
+ primary: 'Test',
69
+ }
70
+
32
71
  const WithChildren = Template.bind({})
33
72
  WithChildren.args = {
34
73
  children: (
35
74
  <List>
36
- <SiteMenuListItem primary="Test Child" />
75
+ <SiteMenuListItem primary="Test Child" icon={<PublicRoundedIcon />} />
37
76
  </List>
38
77
  ),
39
78
  icon: <PublicRoundedIcon />,
40
79
  primary: 'Test',
41
80
  }
42
81
 
43
- export { Default, WithChildren }
82
+ export { Default, WithChildren, WithCollapse }
44
83
 
45
84
  // eslint-disable-next-line import/no-default-export
46
85
  export default StorybookEntry
@@ -16,11 +16,20 @@ export interface SiteMenuListItemProps extends SiteMenuListItemBase, ListItemPro
16
16
  onButtonClick?: ListItemButtonExProps['onClick']
17
17
  }
18
18
 
19
- export const SiteMenuListItem: React.FC<SiteMenuListItemProps> = ({ style, children, iconOnly, icon, primary, onButtonClick, ...props }) => {
19
+ export const SiteMenuListItem: React.FC<SiteMenuListItemProps> = ({
20
+ style,
21
+ children,
22
+ iconOnly,
23
+ collapseEnd,
24
+ icon,
25
+ primary,
26
+ onButtonClick,
27
+ ...props
28
+ }) => {
20
29
  return (
21
30
  <MenuListItem style={style} iconOnly={iconOnly} {...props}>
22
- <MenuListItemButtonEx iconOnly={iconOnly} onClick={onButtonClick}>
23
- <MenuIcon icon={icon} iconOnly={iconOnly} />
31
+ <MenuListItemButtonEx iconOnly={iconOnly} onClick={onButtonClick} collapseEnd={collapseEnd}>
32
+ <MenuIcon icon={icon} />
24
33
  <MenuListItemText primary={primary} iconOnly={iconOnly} />
25
34
  </MenuListItemButtonEx>
26
35
  {children}
@@ -6,11 +6,10 @@ export interface MenuListItemProps extends SiteMenuListItemBase, ListItemProps {
6
6
 
7
7
  export const MenuListItem: React.FC<MenuListItemProps> = ({ children, style, iconOnly, ...props }) => {
8
8
  const listItemStyles = {
9
- display: iconOnly ? 'inline-flex' : 'block',
10
9
  width: iconOnly ? 'auto' : '100%',
11
10
  }
12
11
  return (
13
- <ListItem style={{ ...listItemStyles, ...style }} {...props}>
12
+ <ListItem style={{ display: 'block', ...listItemStyles, ...style }} {...props}>
14
13
  {children}
15
14
  </ListItem>
16
15
  )
@@ -4,10 +4,11 @@ import { SiteMenuListItemBase } from './lib'
4
4
 
5
5
  export interface MenuListItemButtonExProps extends SiteMenuListItemBase, ListItemButtonExProps {}
6
6
 
7
- export const MenuListItemButtonEx: React.FC<MenuListItemButtonExProps> = ({ iconOnly, sx, children, ...props }) => {
8
- const listItemButtonSx = iconOnly ? { borderRadius: '50%', display: 'inline-flex' } : {}
7
+ export const MenuListItemButtonEx: React.FC<MenuListItemButtonExProps> = ({ iconOnly, collapseEnd, sx, children, ...props }) => {
8
+ const listItemButtonSx = iconOnly ? { borderRadius: '50%', display: 'inline-flex', flexGrow: 0 } : {}
9
+ const spacingSx = collapseEnd ? { columnGap: 0 } : { columnGap: 1.5 }
9
10
  return (
10
- <ListItemButtonEx sx={{ ...listItemButtonSx, ...sx }} {...props}>
11
+ <ListItemButtonEx sx={{ ...listItemButtonSx, ...spacingSx, ...sx }} {...props}>
11
12
  {children}
12
13
  </ListItemButtonEx>
13
14
  )
@@ -5,6 +5,17 @@ import { SiteMenuListItemBase } from './lib'
5
5
  export interface MenuListItemTextProps extends SiteMenuListItemBase, ListItemTextProps {}
6
6
 
7
7
  export const MenuListItemText: React.FC<MenuListItemTextProps> = ({ iconOnly, sx, ...props }) => {
8
- const listItemTextSxProps = iconOnly ? { visibility: 'hidden', width: 0, ...sx } : {}
9
- return <ListItemText sx={{ ...listItemTextSxProps, ...sx }} {...props} />
8
+ const listItemTextSxProps = iconOnly ? { maxWidth: 0, ...sx } : { ...sx }
9
+ return (
10
+ <ListItemText
11
+ sx={{
12
+ flexGrow: 0,
13
+ maxWidth: '100%',
14
+ overflow: 'hidden',
15
+ transition: 'max-width 300ms linear',
16
+ ...listItemTextSxProps,
17
+ }}
18
+ {...props}
19
+ />
20
+ )
10
21
  }
@@ -1,3 +1,4 @@
1
1
  export interface SiteMenuListItemBase {
2
2
  iconOnly?: boolean
3
+ collapseEnd?: boolean
3
4
  }