@@ -561,18 +561,13 @@ export class SubMenu extends React.Component<SubMenuProps> {
561561 </ div >
562562 ) ;
563563
564- // [Legacy] `getMotion` should call before `renderChildren`
565- const baseProps = this . getBaseProps ( ) ;
566- const motion = this . getMotion ( baseProps . mode , baseProps . visible ) ;
567-
568564 const children = this . renderChildren ( props . children ) ;
569565
570566 const getPopupContainer = props . parentMenu . isRootMenu
571567 ? props . parentMenu . props . getPopupContainer
572568 : ( triggerNode : HTMLElement ) => triggerNode . parentNode ;
573569 const popupPlacement = popupPlacementMap [ props . mode ] ;
574570 const popupAlign = props . popupOffset ? { offset : props . popupOffset } : { } ;
575- const popupClassName = props . mode === 'inline' ? '' : props . popupClassName ;
576571 const {
577572 disabled,
578573 triggerSubMenuAction,
@@ -597,7 +592,10 @@ export class SubMenu extends React.Component<SubMenuProps> {
597592 { ! isInlineMode && (
598593 < Trigger
599594 prefixCls = { prefixCls }
600- popupClassName = { `${ prefixCls } -popup ${ popupClassName } ` }
595+ popupClassName = { classNames ( `${ prefixCls } -popup` , {
596+ [ props . popupClassName ] :
597+ props . mode !== 'inline' && props . popupClassName ,
598+ } ) }
601599 getPopupContainer = { getPopupContainer }
602600 builtinPlacements = { Object . assign ( { } , placements , builtinPlacements ) }
603601 popupPlacement = { popupPlacement }
@@ -609,7 +607,6 @@ export class SubMenu extends React.Component<SubMenuProps> {
609607 mouseLeaveDelay = { subMenuCloseDelay }
610608 onPopupVisibleChange = { this . onPopupVisibleChange }
611609 forceRender = { forceSubMenuRender }
612- popupMotion = { motion }
613610 >
614611 { title }
615612 </ Trigger >
0 commit comments