Skip to content

Commit 28a0f8b

Browse files
committed
Merge branch 'master' of github.com:react-component/menu
2 parents 08cf1d4 + 3a344af commit 28a0f8b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ class Menu extends React.Component<MenuProps, MenuState> {
427427

428428
return (
429429
<Provider store={this.store}>
430-
<SubPopupMenu {...props} ref={this.setInnerMenu}>
430+
<SubPopupMenu {...props as any} ref={this.setInnerMenu}>
431431
{this.props.children}
432432
</SubPopupMenu>
433433
</Provider>

src/SubMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ export class SubMenu extends React.Component<SubMenuProps, SubMenuState> {
440440
onClick: this.onSubMenuClick,
441441
onSelect: this.onSelect,
442442
onDeselect: this.onDeselect,
443-
onDestroy: this.onDestroy,
443+
onDestroy: this.onDestroy as any,
444444
selectedKeys: props.selectedKeys,
445445
eventKey: `${props.eventKey}-menu-`,
446446
openKeys: props.openKeys,
@@ -458,7 +458,7 @@ export class SubMenu extends React.Component<SubMenuProps, SubMenuState> {
458458
multiple: props.multiple,
459459
prefixCls: props.rootPrefixCls,
460460
id: this.internalMenuId,
461-
manualRef: this.saveMenuInstance,
461+
manualRef: this.saveMenuInstance as any,
462462
itemIcon: props.itemIcon,
463463
expandIcon: props.expandIcon,
464464
direction: props.direction,

0 commit comments

Comments
 (0)