diff --git a/src/MenuItemGroup.jsx b/src/MenuItemGroup.jsx index 938f8685..6464b519 100644 --- a/src/MenuItemGroup.jsx +++ b/src/MenuItemGroup.jsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { menuInheritProps } from './util'; +import { menuAllProps } from './util'; class MenuItemGroup extends React.Component { static propTypes = { @@ -25,7 +25,7 @@ class MenuItemGroup extends React.Component { const { className = '', rootPrefixCls } = props; const titleClassName = `${rootPrefixCls}-item-group-title`; const listClassName = `${rootPrefixCls}-item-group-list`; - const { title } = props; + const { title, children } = props; menuAllProps.forEach(key => delete props[key]); return (
  • @@ -36,7 +36,7 @@ class MenuItemGroup extends React.Component { {title}
  • ); diff --git a/src/SubPopupMenu.js b/src/SubPopupMenu.js index 4048ff52..fb26e907 100644 --- a/src/SubPopupMenu.js +++ b/src/SubPopupMenu.js @@ -4,7 +4,7 @@ import { connect } from 'mini-store'; import KeyCode from 'rc-util/lib/KeyCode'; import createChainedFunction from 'rc-util/lib/createChainedFunction'; import classNames from 'classnames'; -import { getKeyFromChildrenIndex, loopMenuItem, noop, menuInheritProps } from './util'; +import { getKeyFromChildrenIndex, loopMenuItem, noop, menuAllProps } from './util'; import DOMWrap from './DOMWrap'; function allDisabled(arr) { @@ -87,7 +87,7 @@ export class SubPopupMenu extends React.Component { level: PropTypes.number, mode: PropTypes.oneOf(['horizontal', 'vertical', 'vertical-left', 'vertical-right', 'inline']), triggerSubMenuAction: PropTypes.oneOf(['click', 'hover']), - inlineIndent: PropTypes.oneOfType(PropTypes.number, PropTypes.string), + inlineIndent: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), manualRef: PropTypes.func, }; @@ -304,7 +304,7 @@ export class SubPopupMenu extends React.Component { }; render() { - const props = this.props; + const { ...props } = this.props; this.instanceArray = []; const className = classNames( props.prefixCls, @@ -330,7 +330,6 @@ export class SubPopupMenu extends React.Component { /* eslint-disable */