Skip to content

Add some icons to context menu items #160

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

Open
robojumper wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add some icons to context menu items #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 32 additions & 11 deletions src/locationTracker/LocationContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Menu, Item, Separator, Submenu, ItemParams } from 'react-contexify';

import hintItems from '../data/hintItems.json';
import { LocationContextMenuProps } from './Location';
import images from '../itemTracker/Images';

type CtxProps<T = void> = ItemParams<LocationContextMenuProps, T>;
interface ItemData {
Expand Down Expand Up @@ -37,19 +38,39 @@ export default function LocationContextMenu() {
<Item onClick={handleUncheckClick}>Uncheck</Item>
<Separator />
<Submenu label="Set Item">
{
_.map(hintItems, (items, category) => (
<Submenu label={category}>
{
_.map(items, (listItem) => (
<Item onClick={handleSetItemClick} data={{ item: listItem } satisfies ItemData}>{listItem}</Item>
))
}
</Submenu>
))
}
{_.map(hintItems, (items, category) => (
<Submenu label={category}>
{_.map(items, (listItem) => (
<Item
onClick={handleSetItemClick}
data={{ item: listItem } satisfies ItemData}
>
<MenuItemWithIcon name={listItem} image={_.last(images[listItem])!} />
</Item>
))}
</Submenu>
))}
</Submenu>
<Item onClick={handleClearItemClick}>Clear Item</Item>
</Menu>
);
}

export function MenuItemWithIcon({ name, image }: { name: string, image: string }) {
return (
<span style={{ display: 'flex', flexFlow: 'row nowrap' }}>
<div style={{ width: '26px', height: '26px', paddingRight: '6px' }}>
<img
style={{
width: '100%',
height: '100%',
objectFit: 'contain',
}}
src={image}
alt={name}
/>
</div>
{name}
</span>
);
}
27 changes: 19 additions & 8 deletions src/locationTracker/LocationGroupContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import _ from 'lodash';
import { useCallback } from 'react';
import { Menu, Item, Separator, Submenu, ItemParams } from 'react-contexify';
import { LocationGroupContextMenuProps } from './LocationGroupHeader';
import { LocationGroupContextMenuProps, pathImages } from './LocationGroupHeader';
import { MenuItemWithIcon } from './LocationContextMenu';
import sotsImage from '../assets/hints/sots.png';
import barrenImage from '../assets/hints/barren.png';

const bosses = {
0: 'Ghirahim 1',
Expand Down Expand Up @@ -52,14 +55,22 @@ function LocationGroupContextMenu() {
<Item onClick={uncheckAll}>Uncheck All</Item>
<Separator />
<Submenu label="Set Path">
{
_.map(bosses, (bossName, bossIndex) => (
<Item onClick={handlePathClick} data={{ boss: parseInt(bossIndex, 10) } satisfies BossData}>{bossName}</Item>
))
}
{_.map(bosses, (bossName, bossIndex) => (
<Item
onClick={handlePathClick}
data={
{ boss: parseInt(bossIndex, 10) } satisfies BossData
}
>
<MenuItemWithIcon
name={bossName}
image={pathImages[parseInt(bossIndex, 10)]}
/>
</Item>
))}
</Submenu>
<Item onClick={handleSotsClick}>Set SotS</Item>
<Item onClick={handleBarrenClick}>Set Barren</Item>
<Item onClick={handleSotsClick}><MenuItemWithIcon name="Set SotS" image={sotsImage} /></Item>
<Item onClick={handleBarrenClick}><MenuItemWithIcon name="Set Barren" image={barrenImage} /></Item>
<Item onClick={handleClearCheck}>Clear Hint</Item>
</Menu>
);
Expand Down
2 changes: 1 addition & 1 deletion src/locationTracker/LocationGroupHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import g2 from '../assets/hints/g2.png';
import 'react-contexify/dist/ReactContexify.css';
import { useContextMenu } from './context-menu';

const pathImages = [
export const pathImages = [
g1,
scaldera,
moldarach,
Expand Down