Skip to content
Open
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions webview-ui/src/components/chat/ContextMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
commands = [],
}) => {
const [materialIconsBaseUri, setMaterialIconsBaseUri] = useState("")
const [hasMouseMoved, setHasMouseMoved] = useState(false)
const menuRef = useRef<HTMLDivElement>(null)

const filteredOptions = useMemo(() => {
Expand Down Expand Up @@ -73,6 +74,11 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
setMaterialIconsBaseUri(w.MATERIAL_ICONS_BASE_URI)
}, [])

// Reset mouse moved state when menu changes
useEffect(() => {
setHasMouseMoved(false)
}, [searchQuery, selectedType])

const renderOptionContent = (option: ContextMenuQueryItem) => {
switch (option.type) {
case ContextMenuOptionType.SectionHeader:
Expand Down Expand Up @@ -265,6 +271,12 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
})
}

const handleMouseMove = () => {
if (!hasMouseMoved) {
setHasMouseMoved(true)
}
}

return (
<div
style={{
Expand All @@ -274,7 +286,8 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
right: 15,
overflowX: "hidden",
}}
onMouseDown={onMouseDown}>
onMouseDown={onMouseDown}
onMouseMove={handleMouseMove}>
<div
ref={menuRef}
style={{
Expand Down Expand Up @@ -365,7 +378,7 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
}
: {}),
}}
onMouseEnter={() => isOptionSelectable(option) && setSelectedIndex(index)}>
onMouseEnter={() => hasMouseMoved && isOptionSelectable(option) && setSelectedIndex(index)}>
<div
style={{
display: "flex",
Expand Down