Skip to content

Use items instead of children #197

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use items instead of children #197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c689145
fix: MenuItem should not leave undefined `key`.
minosss Aug 23, 2023
555bfd2
Use `items` instead
minosss Aug 23, 2023
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
41 changes: 19 additions & 22 deletions src/DropdownMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Menu, { MenuItem } from 'rc-menu';
import Menu from 'rc-menu';
import * as React from 'react';
import MentionsContext from './MentionsContext';
import type { DataDrivenOptionProps } from './Mentions';
import MentionsContext from './MentionsContext';
interface DropdownMenuProps {
prefixCls?: string;
options: DataDrivenOptionProps[];
Expand Down Expand Up @@ -34,26 +34,23 @@ function DropdownMenu(props: DropdownMenuProps) {
}}
onFocus={onFocus}
onBlur={onBlur}
>
{options.map((option, index) => {
const { key, disabled, className, style, label } = option;
return (
<MenuItem
key={key}
disabled={disabled}
className={className}
style={style}
onMouseEnter={() => {
setActiveIndex(index);
}}
>
{label}
</MenuItem>
);
})}

{!options.length && <MenuItem disabled>{notFoundContent}</MenuItem>}
</Menu>
items={
options.length > 0
? options.map(
({ key, disabled, className, label, style }, index) => ({
key,
disabled,
className,
style,
label,
onMouseEnter: () => {
setActiveIndex(index);
},
}),
)
: [{ key: 'not-found', disabled: true, label: notFoundContent }]
}
/>
);
}

Expand Down