Skip to content

Commit 743803f

Browse files
committed
update type and key
1 parent e9f46a0 commit 743803f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/Menu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export interface MenuProps
6262
/** @deprecated Please use `items` instead */
6363
children?: React.ReactNode;
6464

65-
itemRender?: (originalNode: React.ReactNode, item?: NonNullable<ItemType>) => React.ReactNode;
65+
itemRender?: (originalNode: React.ReactNode, item?: NonNullable<ItemType>) => React.ReactElement;
6666

6767
disabled?: boolean;
6868
/** @private Disable auto overflow. Pls note the prop name may refactor since we do not final decided. */
@@ -258,7 +258,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
258258
parseItems(children, items, EMPTY_LIST, _internalComponents, prefixCls, itemRender),
259259
parseItems(children, items, EMPTY_LIST, {}, prefixCls, itemRender),
260260
],
261-
[children, items, _internalComponents, prefixCls, itemRender],
261+
[children, items, _internalComponents, prefixCls],
262262
);
263263

264264
const [mounted, setMounted] = React.useState(false);

src/utils/commonUtil.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as React from 'react';
44
export function parseChildren(
55
children: React.ReactNode | undefined,
66
keyPath: string[],
7-
itemRender?: (originNode: React.ReactNode) => React.ReactNode,
7+
itemRender?: (originNode: React.ReactNode) => React.ReactElement,
88
) {
99
return toArray(children).map((child, index) => {
1010
if (React.isValidElement(child)) {

src/utils/nodeUtil.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function convertItemsToNodes(
1010
list: ItemType[],
1111
components: Required<Components>,
1212
prefixCls?: string,
13-
itemRender?: (originNode: React.ReactNode, item: NonNullable<ItemType>) => React.ReactNode,
13+
itemRender?: (originNode: React.ReactNode, item: NonNullable<ItemType>) => React.ReactElement,
1414
) {
1515
const {
1616
item: MergedMenuItem,
@@ -76,7 +76,7 @@ export function parseItems(
7676
keyPath: string[],
7777
components: Components,
7878
prefixCls?: string,
79-
itemRender?: (originNode: React.ReactNode, item?: NonNullable<ItemType>) => React.ReactNode,
79+
itemRender?: (originNode: React.ReactNode, item?: NonNullable<ItemType>) => React.ReactElement,
8080
) {
8181
let childNodes = children;
8282

0 commit comments

Comments
 (0)