Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TypeScript] Add UserMenuProps #6320

Merged
merged 3 commits into from
Jun 1, 2021
Merged

[TypeScript] Add UserMenuProps #6320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3828ea
[TypeScript] Add UserMenuProps
fzaninotto May 31, 2021
46ec8c6
Fix propType warning
fzaninotto May 31, 2021
41dfe8d
Fix PropType order
fzaninotto May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/ra-ui-materialui/src/layout/AppBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,13 @@ const AppBar = (props: AppBarProps): JSX.Element => {
children
)}
<LoadingIndicator />
{typeof userMenu === 'boolean'
? userMenu === true
? cloneElement(<DefaultUserMenu />, { logout })
: null
: cloneElement(userMenu, { logout })}
{typeof userMenu === 'boolean' ? (
userMenu === true ? (
<DefaultUserMenu logout={logout} />
) : null
) : (
cloneElement(userMenu, { logout })
)}
</Toolbar>
</MuiAppBar>
</Container>
Expand Down
28 changes: 21 additions & 7 deletions packages/ra-ui-materialui/src/layout/UserMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ import {
import { makeStyles } from '@material-ui/core/styles';
import AccountCircle from '@material-ui/icons/AccountCircle';

import { ClassesOverride } from '../types';

const defaultIcon = <AccountCircle />;

const useStyles = makeStyles(
theme => ({
user: {},
Expand All @@ -37,13 +41,19 @@ const TransformOrigin: PopoverOrigin = {
horizontal: 'right',
};

const UserMenu = props => {
const UserMenu = (props: UserMenuProps) => {
const [anchorEl, setAnchorEl] = useState(null);
const translate = useTranslate();
const { loaded, identity } = useGetIdentity();
const classes = useStyles(props);

const { children, label, icon, logout } = props;
const {
children,
label = 'ra.auth.user_menu',
icon = defaultIcon,
logout,
} = props;

if (!logout && !children) return null;
const open = Boolean(anchorEl);

Expand Down Expand Up @@ -112,14 +122,18 @@ const UserMenu = props => {

UserMenu.propTypes = {
children: PropTypes.node,
label: PropTypes.string.isRequired,
classes: PropTypes.object,
label: PropTypes.string,
logout: PropTypes.element,
icon: PropTypes.node,
};

UserMenu.defaultProps = {
label: 'ra.auth.user_menu',
icon: <AccountCircle />,
};
export interface UserMenuProps {
children?: React.ReactNode;
classes?: ClassesOverride<typeof useStyles>;
label?: string;
logout?: React.ReactNode;
icon?: React.ReactNode;
}

export default UserMenu;
3 changes: 2 additions & 1 deletion packages/ra-ui-materialui/src/layout/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Sidebar, { SidebarProps } from './Sidebar';
import Title, { TitleProps, TitlePropType } from './Title';
import TitleForRecord from './TitleForRecord';
import TopToolbar from './TopToolbar';
import UserMenu from './UserMenu';
import UserMenu, { UserMenuProps } from './UserMenu';

export {
AppBar,
Expand Down Expand Up @@ -63,4 +63,5 @@ export type {
ResponsiveProps,
SidebarProps,
TitleProps,
UserMenuProps,
};