Skip to content

Add BorderedMenuItem and use it for delete menu, with updated style #4385

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

Merged
benjiwheeler merged 3 commits into from
Jan 18, 2019
Merged

Add BorderedMenuItem and use it for delete menu, with updated style #4385

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
1d28f52
Revert "Revert "Adds BorderedMenuItem and use it for delete menu""
benjiwheeler Jan 18, 2019
3bbfe94
reduced size, color intensity of sprite context menu separator
benjiwheeler Jan 17, 2019
7fb57a0
use error-primary color rather than error-light
benjiwheeler Jan 18, 2019
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
8 changes: 8 additions & 0 deletions src/components/context-menu/context-menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,11 @@
background: $motion-primary;
color: white;
}

.menu-item-bordered {
border-top: 1px solid $ui-black-transparent;
}

.menu-item-bordered:hover {
background: $error-primary;
}
10 changes: 10 additions & 0 deletions src/components/context-menu/context-menu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import {ContextMenu, MenuItem} from 'react-contextmenu';
import classNames from 'classnames';

import styles from './context-menu.css';

Expand All @@ -17,7 +18,16 @@ const StyledMenuItem = props => (
/>
);

const BorderedMenuItem = props => (
<MenuItem
{...props}
attributes={{className: classNames(styles.menuItem, styles.menuItemBordered)}}
/>
);


export {
BorderedMenuItem,
StyledContextMenu as ContextMenu,
StyledMenuItem as MenuItem
};
20 changes: 10 additions & 10 deletions src/components/sprite-selector-item/sprite-selector-item.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import React from 'react';
import CloseButton from '../close-button/close-button.jsx';
import styles from './sprite-selector-item.css';
import {ContextMenuTrigger} from 'react-contextmenu';
import {ContextMenu, MenuItem} from '../context-menu/context-menu.jsx';
import {BorderedMenuItem, ContextMenu, MenuItem} from '../context-menu/context-menu.jsx';
import {FormattedMessage} from 'react-intl';

// react-contextmenu requires unique id to match trigger and context menu
Expand Down Expand Up @@ -64,15 +64,6 @@ const SpriteSelectorItem = props => (
/>
</MenuItem>
) : null}
{props.onDeleteButtonClick ? (
<MenuItem onClick={props.onDeleteButtonClick}>
<FormattedMessage
defaultMessage="delete"
description="Menu item to delete in the right click menu"
id="gui.spriteSelectorItem.contextMenuDelete"
/>
</MenuItem>
) : null }
{props.onExportButtonClick ? (
<MenuItem onClick={props.onExportButtonClick}>
<FormattedMessage
Expand All @@ -82,6 +73,15 @@ const SpriteSelectorItem = props => (
/>
</MenuItem>
) : null }
{props.onDeleteButtonClick ? (
<BorderedMenuItem onClick={props.onDeleteButtonClick}>
<FormattedMessage
defaultMessage="delete"
description="Menu item to delete in the right click menu"
id="gui.spriteSelectorItem.contextMenuDelete"
/>
</BorderedMenuItem>
) : null }
</ContextMenu>
) : null}
</ContextMenuTrigger>
Expand Down