gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(netlify-cms-core): remove double focusable elements on profile menu button (#1900)

Browse Source
This commit is contained in:
Alexander Nanberg 2018-11-22 15:18:11 +01:00 committed by Shawn Erquhart
parent fe6af1986f
commit 888ae6b053
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/netlify-cms-core/src/components/UI/SettingsDropdown.js
View File

@ -12,8 +12,8 @@ const styles = {
`, `,
}; };
const AppHeaderAvatar = styled.button` const AvatarDropdownButton = styled(DropdownButton)`
border: 0; display: inline-block;
padding: 8px; padding: 8px;
cursor: pointer; cursor: pointer;
color: #1e2532; color: #1e2532;
@ -38,11 +38,8 @@ const AppHeaderSiteLink = styled.a`
padding: 10px 16px; padding: 10px 16px;
`; `;
const Avatar = ({ imageUrl }) => ( const Avatar = ({ imageUrl }) =>
<AppHeaderAvatar> imageUrl ? <AvatarImage src={imageUrl} /> : <AvatarPlaceholderIcon type="user" size="large" />;
{imageUrl ? <AvatarImage src={imageUrl} /> : <AvatarPlaceholderIcon type="user" size="large" />}
</AppHeaderAvatar>
);
Avatar.propTypes = { Avatar.propTypes = {
imageUrl: PropTypes.string, imageUrl: PropTypes.string,
@ -60,9 +57,9 @@ const SettingsDropdown = ({ displayUrl, imageUrl, onLogoutClick, t }) => (
dropdownWidth="100px" dropdownWidth="100px"
dropdownPosition="right" dropdownPosition="right"
renderButton={() => ( renderButton={() => (
<DropdownButton> <AvatarDropdownButton>
<Avatar imageUrl={imageUrl} /> <Avatar imageUrl={imageUrl} />
</DropdownButton> </AvatarDropdownButton>
)} )}
> >
<DropdownItem label={t('ui.settingsDropdown.logOut')} onClick={onLogoutClick} /> <DropdownItem label={t('ui.settingsDropdown.logOut')} onClick={onLogoutClick} />