diff --git a/src/locationTracker/LocationContextMenu.tsx b/src/locationTracker/LocationContextMenu.tsx index efff6a13..bbb60b0c 100644 --- a/src/locationTracker/LocationContextMenu.tsx +++ b/src/locationTracker/LocationContextMenu.tsx @@ -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 = ItemParams; interface ItemData { @@ -37,19 +38,39 @@ export default function LocationContextMenu() { Uncheck - { - _.map(hintItems, (items, category) => ( - - { - _.map(items, (listItem) => ( - {listItem} - )) - } - - )) - } + {_.map(hintItems, (items, category) => ( + + {_.map(items, (listItem) => ( + + + + ))} + + ))} Clear Item ); +} + +export function MenuItemWithIcon({ name, image }: { name: string, image: string }) { + return ( + +
+ {name} +
+ {name} +
+ ); } \ No newline at end of file diff --git a/src/locationTracker/LocationGroupContextMenu.tsx b/src/locationTracker/LocationGroupContextMenu.tsx index fec6bd21..c1541e23 100644 --- a/src/locationTracker/LocationGroupContextMenu.tsx +++ b/src/locationTracker/LocationGroupContextMenu.tsx @@ -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', @@ -52,14 +55,22 @@ function LocationGroupContextMenu() { Uncheck All - { - _.map(bosses, (bossName, bossIndex) => ( - {bossName} - )) - } + {_.map(bosses, (bossName, bossIndex) => ( + + + + ))} - Set SotS - Set Barren + + Clear Hint ); diff --git a/src/locationTracker/LocationGroupHeader.tsx b/src/locationTracker/LocationGroupHeader.tsx index 10e7f3e1..3a154dd8 100644 --- a/src/locationTracker/LocationGroupHeader.tsx +++ b/src/locationTracker/LocationGroupHeader.tsx @@ -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,