Skip to content
Open
Show file tree
Hide file tree
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
31 changes: 29 additions & 2 deletions src/components/DropdownMenu/DropdownMenuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,42 @@ export const DropdownMenuItem = <T,>({
}, [closeMenu, closeSubmenu, hasSubmenu, toggle]);

const handleMenuItemClick = React.useCallback(
(event: React.MouseEvent<HTMLElement, MouseEvent>) => {
(
event: React.MouseEvent<HTMLElement, MouseEvent> &
React.MouseEvent<HTMLAnchorElement, MouseEvent>,
) => {
event.preventDefault();

props.extraProps?.onClick?.(
event as React.MouseEvent<HTMLDivElement, MouseEvent> &
React.MouseEvent<HTMLAnchorElement, MouseEvent>,
);

if (hasSubmenu) {
event.stopPropagation();

if (isSubmenuOpen) {
closeSubmenu();
} else {
openSubmenu();
}

return;
}

action?.(event, data as unknown as T);
handleCloseMenu();
},
[action, data, handleCloseMenu, hasSubmenu],
[
action,
data,
handleCloseMenu,
hasSubmenu,
isSubmenuOpen,
openSubmenu,
closeSubmenu,
props.extraProps,
],
);

const extraProps = React.useMemo(() => {
Expand Down
5 changes: 3 additions & 2 deletions src/components/DropdownMenu/DropdownMenuPopup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import * as React from 'react';

import {KeyCode} from '../../constants';
import {useListNavigation} from '../../hooks';
import {Menu} from '../Menu';
import type {MenuProps} from '../Menu';
import {Popup} from '../Popup';
import {Menu} from '../Menu';
import type {PopupProps} from '../Popup';
import {Popup} from '../Popup';

import {cnDropdownMenu} from './DropdownMenu.classname';
import {DropdownMenuContext} from './DropdownMenuContext';
Expand Down Expand Up @@ -161,6 +161,7 @@ export const DropdownMenuPopup = <T,>({

const extraProps = {
...item.extraProps,
onClick: activate,
onMouseEnter: activate,
};

Expand Down
Loading