diff --git a/src/app/dim-ui/PressTip.tsx b/src/app/dim-ui/PressTip.tsx index c23b98c2e6..98e6cb98db 100644 --- a/src/app/dim-ui/PressTip.tsx +++ b/src/app/dim-ui/PressTip.tsx @@ -30,7 +30,7 @@ interface Props { */ tooltip: React.ReactNode | (() => React.ReactNode); /** - * Whether the presstip should be shown or not. + * Whether the presstip should react to events or not. */ disabled?: boolean; /** @@ -153,12 +153,14 @@ function PressTip(props: Props) { const hover = useCallback( (e: React.MouseEvent | React.TouchEvent | TouchEvent) => { - e.preventDefault(); - clearTimeout(timer.current); - timer.current = window.setTimeout(() => { - setOpen(!props.disabled); - }, hoverDelay); - touchStartTime.current = performance.now(); + if (!props.disabled) { + e.preventDefault(); + clearTimeout(timer.current); + timer.current = window.setTimeout(() => { + setOpen(true); + }, hoverDelay); + touchStartTime.current = performance.now(); + } }, [props.disabled] ); diff --git a/src/app/inventory/InventoryItem.tsx b/src/app/inventory/InventoryItem.tsx index 22fb083cf6..e5029609de 100644 --- a/src/app/inventory/InventoryItem.tsx +++ b/src/app/inventory/InventoryItem.tsx @@ -30,7 +30,7 @@ interface Props { wishlistRoll?: InventoryWishListRoll; /** Don't show information that relates to currently selected perks (only used for subclasses currently) */ ignoreSelectedPerks?: boolean; - /** Don't show information that relates to currently selected perks (only used for subclasses currently) */ + /** Show a tooltip summarizing the item for when a click on the item has other effects than bringing up item popup */ includeTooltip?: boolean; innerRef?: React.Ref; /** TODO: item locked needs to be passed in */ diff --git a/src/app/inventory/ItemTooltip.m.scss b/src/app/inventory/ItemTooltip.m.scss index 015545dd89..43ac358faf 100644 --- a/src/app/inventory/ItemTooltip.m.scss +++ b/src/app/inventory/ItemTooltip.m.scss @@ -29,12 +29,7 @@ } .note { - margin-left: -4px; -} - -.noteIcon { - height: 24px; - width: 24px; + margin-left: 2px; } .stats { diff --git a/src/app/inventory/ItemTooltip.m.scss.d.ts b/src/app/inventory/ItemTooltip.m.scss.d.ts index 23027153be..c6cb703e1b 100644 --- a/src/app/inventory/ItemTooltip.m.scss.d.ts +++ b/src/app/inventory/ItemTooltip.m.scss.d.ts @@ -2,7 +2,6 @@ // Please do not change this file! interface CssExports { 'note': string; - 'noteIcon': string; 'notes': string; 'perkSelected': string; 'perks': string; diff --git a/src/app/inventory/ItemTooltip.tsx b/src/app/inventory/ItemTooltip.tsx index d6e0432503..057010ac0f 100644 --- a/src/app/inventory/ItemTooltip.tsx +++ b/src/app/inventory/ItemTooltip.tsx @@ -81,7 +81,7 @@ function Tooltip({ {def.itemTypeDisplayName &&

{def.itemTypeDisplayName}

} {notes && (
- + {notes}
)}