grep-components 1.20.0-grepf-1803.1 → 1.20.0-grepf-1808.1

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

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

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

@@ -36,7 +36,6 @@ export interface GrepTableProps<T> extends Pick<TableProps, 'size' | 'stickyHead
     onContextIdChanged?: (row: T) => void;
     onSortBy?: (col: TableColumn<T>) => any;
     caption?: React.ReactNode;
-    menuButtonLabel?: string;
     /**
      * @deprecated No longer in use.
      */
@@ -65,6 +64,6 @@ export declare const useStyles: (params: StyleProps, styleOverrides?: {
  * @todo enhance page handling
  *
  */
-export declare const GrepTable: <T>({ placeholderText, dropdownItems, isRowDisabled, pagination, outlined, columns, header, data, onSelectedRowChange, sortBy, sortDirection, onSortBy, onRowClick, size, caption, stickyHeader, padding, disableSelectOnClick, menuButtonLabel, ...props }: GrepTableProps<T>) => JSX.Element;
+export declare const GrepTable: <T>({ placeholderText, dropdownItems, isRowDisabled, pagination, outlined, columns, header, data, onSelectedRowChange, sortBy, sortDirection, onSortBy, onRowClick, size, caption, stickyHeader, padding, disableSelectOnClick, ...props }: GrepTableProps<T>) => JSX.Element;
 export { GrepTableRow };
 export default GrepTable;

package/dist/index.js

@@ -3546,7 +3546,7 @@ var getElementIndex = function (el) {
  *
  */
 var GrepTable = function (_a) {
-    var placeholderText = _a.placeholderText, dropdownItems = _a.dropdownItems, isRowDisabled = _a.isRowDisabled, pagination = _a.pagination, outlined = _a.outlined, columns = _a.columns, header = _a.header, data = _a.data, onSelectedRowChange = _a.onSelectedRowChange, sortBy = _a.sortBy, sortDirection = _a.sortDirection, onSortBy = _a.onSortBy, onRowClick = _a.onRowClick, size = _a.size, caption = _a.caption, stickyHeader = _a.stickyHeader, padding = _a.padding, _b = _a.disableSelectOnClick, disableSelectOnClick = _b === void 0 ? false : _b, menuButtonLabel = _a.menuButtonLabel, props = __rest$1(_a, ["placeholderText", "dropdownItems", "isRowDisabled", "pagination", "outlined", "columns", "header", "data", "onSelectedRowChange", "sortBy", "sortDirection", "onSortBy", "onRowClick", "size", "caption", "stickyHeader", "padding", "disableSelectOnClick", "menuButtonLabel"]);
+    var placeholderText = _a.placeholderText, dropdownItems = _a.dropdownItems, isRowDisabled = _a.isRowDisabled, pagination = _a.pagination, outlined = _a.outlined, columns = _a.columns, header = _a.header, data = _a.data, onSelectedRowChange = _a.onSelectedRowChange, sortBy = _a.sortBy, sortDirection = _a.sortDirection, onSortBy = _a.onSortBy, onRowClick = _a.onRowClick, size = _a.size, caption = _a.caption, stickyHeader = _a.stickyHeader, padding = _a.padding, _b = _a.disableSelectOnClick, disableSelectOnClick = _b === void 0 ? false : _b, props = __rest$1(_a, ["placeholderText", "dropdownItems", "isRowDisabled", "pagination", "outlined", "columns", "header", "data", "onSelectedRowChange", "sortBy", "sortDirection", "onSortBy", "onRowClick", "size", "caption", "stickyHeader", "padding", "disableSelectOnClick"]);
     var _c = __read(React__default.useState(props.rowsPerPage || 10), 2), rowsPerPage = _c[0], setRowsPerPage = _c[1];
     var _d = __read(React__default.useState(null), 2), menuAnchor = _d[0], setMenuAnchor = _d[1];
     var _e = __read(React__default.useState(0), 2), currentPage = _e[0], _setCurrentPage = _e[1];
@@ -3625,7 +3625,7 @@ var GrepTable = function (_a) {
                                 e.preventDefault();
                                 break;
                         }
-                    }, tabIndex: 0, size: "large", "aria-label": menuButtonLabel !== null && menuButtonLabel !== void 0 ? menuButtonLabel : 'Åpne meny' },
+                    }, tabIndex: 0, size: "large" },
                     React__default.createElement(MoreVert, null)))));
     };
     var _renderRow = function (row, index) {
@@ -20872,7 +20872,6 @@ 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 () {
@@ -20884,6 +20883,24 @@ 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" },
@@ -20892,7 +20909,7 @@ var AppBar = function (_a) {
                         appTitle,
                         !isProd && (React.createElement(EnvironmentTitle, null, process.env.REACT_APP_HOST)))),
                 React.createElement(ToolbarRight, null,
-                    React.createElement(Button$1, { onClick: _handleIconButtonClick },
+                    React.createElement(Button$1, { "aria-controls": userMenuAnchor ? 'basic-menu' : undefined, "aria-haspopup": "true", "aria-expanded": userMenuAnchor ? 'true' : undefined, onClick: _handleIconButtonClick },
                         React.createElement(AccountCircle, { color: "primary", fontSize: "large" }),
                         React.createElement(UserContainer, null,
                             React.createElement(AccountName, null, username),
@@ -20904,17 +20921,7 @@ var AppBar = function (_a) {
                         }, transformOrigin: {
                             vertical: 'top',
                             horizontal: 'center',
-                        } }, 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)));
-                    })))),
+                        } }, renderMenuItems()))),
             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 }))));