fix: overflow menu on history revision is incorrect color when selected
closes #1140
This commit is contained in:
parent
f4c4a11277
commit
6e2ea3ac4b
|
@ -110,6 +110,7 @@ class DocumentHistory extends React.Component<Props> {
|
|||
revision={revision}
|
||||
document={document}
|
||||
showMenu={index !== 0}
|
||||
selected={this.props.match.params.revisionId === revision.id}
|
||||
/>
|
||||
))}
|
||||
</ArrowKeyNavigation>
|
||||
|
|
|
@ -16,14 +16,15 @@ import { documentHistoryUrl } from 'utils/routeHelpers';
|
|||
|
||||
type Props = {
|
||||
theme: Object,
|
||||
showMenu: () => void,
|
||||
showMenu: boolean,
|
||||
selected: boolean,
|
||||
document: Document,
|
||||
revision: Revision,
|
||||
};
|
||||
|
||||
class RevisionListItem extends React.Component<Props> {
|
||||
render() {
|
||||
const { revision, document, showMenu, theme } = this.props;
|
||||
const { revision, document, showMenu, selected, theme } = this.props;
|
||||
|
||||
return (
|
||||
<StyledNavLink
|
||||
|
@ -43,7 +44,9 @@ class RevisionListItem extends React.Component<Props> {
|
|||
<StyledRevisionMenu
|
||||
document={document}
|
||||
revision={revision}
|
||||
label={<MoreIcon color={theme.white} />}
|
||||
label={
|
||||
<MoreIcon color={selected ? theme.white : theme.textTertiary} />
|
||||
}
|
||||
/>
|
||||
)}
|
||||
</StyledNavLink>
|
||||
|
@ -59,7 +62,7 @@ const StyledAvatar = styled(Avatar)`
|
|||
const StyledRevisionMenu = styled(RevisionMenu)`
|
||||
position: absolute;
|
||||
right: 16px;
|
||||
top: 16px;
|
||||
top: 20px;
|
||||
`;
|
||||
|
||||
const StyledNavLink = styled(NavLink)`
|
||||
|
|
|
@ -17,6 +17,7 @@ type Props = {
|
|||
document: Document,
|
||||
revision: Revision,
|
||||
className?: string,
|
||||
label: React.Node,
|
||||
ui: UiStore,
|
||||
};
|
||||
|
||||
|
@ -33,14 +34,19 @@ class RevisionMenu extends React.Component<Props> {
|
|||
};
|
||||
|
||||
render() {
|
||||
const { className, onOpen, onClose } = this.props;
|
||||
const { className, label, onOpen, onClose } = this.props;
|
||||
const url = `${window.location.origin}${documentHistoryUrl(
|
||||
this.props.document,
|
||||
this.props.revision.id
|
||||
)}`;
|
||||
|
||||
return (
|
||||
<DropdownMenu onOpen={onOpen} onClose={onClose} className={className}>
|
||||
<DropdownMenu
|
||||
onOpen={onOpen}
|
||||
onClose={onClose}
|
||||
className={className}
|
||||
label={label}
|
||||
>
|
||||
<DropdownMenuItem onClick={this.handleRestore}>
|
||||
Restore version
|
||||
</DropdownMenuItem>
|
||||
|
|
Reference in New Issue