grep-components 1.20.0-grepf-1808.1 → 1.20.0-grepf-1818.1

package/dist/components/AppBar/types.d.ts

@@ -5,7 +5,6 @@ export declare type UserMenuItem = {
     isAnchor?: boolean;
     href?: string;
     onClick?: (e: any) => void;
-    isDivider?: boolean;
 };
 export interface IAuthorizedPage {
     name: string;

package/dist/index.js

@@ -7,7 +7,7 @@ import * as React from 'react';
 import React__default, { useRef, useContext, createContext, createElement, Fragment, forwardRef, useMemo as useMemo$1, useState, useCallback as useCallback$1, useEffect, useLayoutEffect } from 'react';
 import AccountCircle from '@mui/icons-material/AccountCircle';
 import ArrowDropdown from '@mui/icons-material/ArrowDropDown';
-import { Button, Box, Typography, IconButton, Menu, MenuItem, Tabs, Tab, Collapse, MenuList, Tooltip, Container, List, ListItem, ListItemText, ListItemIcon, Divider, styled, TableCell, TableRow, TableSortLabel, TableHead, TablePagination, TableContainer, Table, TableBody, TableFooter, CircularProgress, Link, TextField, FormControl, InputLabel, Select, OutlinedInput, Input, Checkbox, FormHelperText, Grid, ToggleButtonGroup, AppBar as AppBar$1, Toolbar as Toolbar$1, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions } from '@mui/material';
+import { Button, Box, Typography, IconButton, Menu, MenuItem, Tabs, Tab, Collapse, MenuList, Tooltip, Container, List, ListItem, ListItemText, ListItemIcon, Divider, ListItemButton, styled, TableCell, TableRow, TableSortLabel, TableHead, TablePagination, TableContainer, Table, TableBody, TableFooter, CircularProgress, Link, TextField, FormControl, InputLabel, Select, OutlinedInput, Input, Checkbox, FormHelperText, Grid, ToggleButtonGroup, AppBar as AppBar$1, Toolbar as Toolbar$1, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
 import { useHistory, NavLink, Prompt } from 'react-router-dom';
 import MenuIcon from '@mui/icons-material/Menu';
@@ -3328,9 +3328,10 @@ var ContainedLinkList = function (props) {
     var classes = useStyles$e().classes;
     return (React.createElement(Box, { className: classes.container, style: props.style },
         React.createElement(Typography, { className: classes.title }, props.title),
-        React.createElement(List, { style: { padding: 0 } }, props.pages.map(function (page) { return (React.createElement(ListItem, { button: true, divider: true, key: page.id, onClick: function () { return props.onPageClick(page); } },
-            page.linkIcon && React.createElement(ListItemIcon$1, null, page.linkIcon),
-            React.createElement(ListItemText, { primary: page.label }))); }))));
+        React.createElement(List, { style: { padding: 0 } }, props.pages.map(function (page) { return (React.createElement(ListItem, { divider: true, key: page.id, disablePadding: true },
+            React.createElement(ListItemButton, { onClick: function () { return props.onPageClick(page); } },
+                page.linkIcon && React.createElement(ListItemIcon$1, null, page.linkIcon),
+                React.createElement(ListItemText, { primary: page.label })))); }))));
 };
 
 var OverflowTooltip = /** @class */ (function (_super) {
@@ -20872,6 +20873,7 @@ var AppBar = function (_a) {
     var username = _a.username, currentPath = _a.currentPath, isProd = _a.isProd, appTitle = _a.appTitle, userMenuItems = _a.userMenuItems, menuItems = _a.menuItems, userRole = _a.userRole, colors = _a.colors;
     var _b = __read(React.useState(null), 2), userMenuAnchor = _b[0], setUserMenuAnchor = _b[1];
     var _handleIconButtonClick = function (event) {
+        event.preventDefault();
         setUserMenuAnchor(event.currentTarget);
     };
     var _handleCloseUserMenu = function () {
@@ -20883,24 +20885,6 @@ var AppBar = function (_a) {
             : currentPath.includes(page.redirectUrl || '');
         return (React.createElement(ToolbarMenuItem, { className: isActive ? 'active' : '', to: page.redirectUrl || '', key: page.name, tabIndex: 0 }, page === null || page === void 0 ? void 0 : page.translatedTextRef));
     };
-    var renderMenuItems = function () {
-        var newItemList = [];
-        userMenuItems.forEach(function (item, index) {
-            newItemList.push(item);
-            if (userMenuItems.length > index + 1) {
-                newItemList.push({ isDivider: true, id: '', label: '' });
-            }
-        });
-        return newItemList.map(function (i, index) {
-            return i.isDivider ? (React.createElement(Divider$1, { key: index })) : (React.createElement(MenuItem$1, { key: i.id, onClick: function () {
-                    setUserMenuAnchor(null);
-                    i.action && i.action();
-                } }, i.isAnchor ? (React.createElement("a", { style: {
-                    textDecoration: 'inherit',
-                    color: 'inherit',
-                }, tabIndex: -1, rel: "noreferrer", href: i.href, onClick: i.onClick }, i.label)) : (i.label)));
-        });
-    };
     return (React.createElement(Toolbar, null,
         React.createElement(ToolbarFixer, null,
             React.createElement(ToolbarInner, { colors: colors, role: "banner" },
@@ -20909,7 +20893,7 @@ var AppBar = function (_a) {
                         appTitle,
                         !isProd && (React.createElement(EnvironmentTitle, null, process.env.REACT_APP_HOST)))),
                 React.createElement(ToolbarRight, null,
-                    React.createElement(Button$1, { "aria-controls": userMenuAnchor ? 'basic-menu' : undefined, "aria-haspopup": "true", "aria-expanded": userMenuAnchor ? 'true' : undefined, onClick: _handleIconButtonClick },
+                    React.createElement(Button$1, { onClick: _handleIconButtonClick },
                         React.createElement(AccountCircle, { color: "primary", fontSize: "large" }),
                         React.createElement(UserContainer, null,
                             React.createElement(AccountName, null, username),
@@ -20921,7 +20905,17 @@ var AppBar = function (_a) {
                         }, transformOrigin: {
                             vertical: 'top',
                             horizontal: 'center',
-                        } }, renderMenuItems()))),
+                        } }, userMenuItems.map(function (i, index) {
+                        return (React.createElement(Box, { key: i.id },
+                            React.createElement(MenuItem$1, { key: i.id, onClick: function () {
+                                    setUserMenuAnchor(null);
+                                    i.action && i.action();
+                                } }, i.isAnchor ? (React.createElement("a", { style: {
+                                    textDecoration: 'inherit',
+                                    color: 'inherit',
+                                }, rel: "noreferrer", href: i.href, onClick: i.onClick }, i.label)) : (i.label)),
+                            userMenuItems.length > index + 1 && React.createElement(Divider$1, null)));
+                    })))),
             React.createElement(ToolbarMenu, { role: "navigation" },
                 React.createElement(ToolbarMenuInner, null, menuItems.map(function (page) { return _renderToolbarMenuItem(page); }))),
             React.createElement(MobileAppBar, { menuItems: menuItems, userMenuItems: userMenuItems, colors: colors }))));