|
@@ -754,14 +754,13 @@ export default class DatePicker extends BaseComponent<DatePickerProps, DatePicke
|
|
|
autoAdjustOverflow,
|
|
autoAdjustOverflow,
|
|
|
spacing,
|
|
spacing,
|
|
|
} = this.props;
|
|
} = this.props;
|
|
|
- const mergedMotion = this.foundation.getMergedMotion(motion);
|
|
|
|
|
return (
|
|
return (
|
|
|
<Popover
|
|
<Popover
|
|
|
getPopupContainer={getPopupContainer}
|
|
getPopupContainer={getPopupContainer}
|
|
|
// wrapWhenSpecial={false}
|
|
// wrapWhenSpecial={false}
|
|
|
autoAdjustOverflow={autoAdjustOverflow}
|
|
autoAdjustOverflow={autoAdjustOverflow}
|
|
|
zIndex={zIndex}
|
|
zIndex={zIndex}
|
|
|
- motion={mergedMotion}
|
|
|
|
|
|
|
+ motion={motion}
|
|
|
content={this.renderPanel(locale, localeCode, dateFnsLocale)}
|
|
content={this.renderPanel(locale, localeCode, dateFnsLocale)}
|
|
|
trigger="custom"
|
|
trigger="custom"
|
|
|
position={position}
|
|
position={position}
|
|
@@ -769,6 +768,7 @@ export default class DatePicker extends BaseComponent<DatePickerProps, DatePicke
|
|
|
stopPropagation={stopPropagation}
|
|
stopPropagation={stopPropagation}
|
|
|
spacing={spacing}
|
|
spacing={spacing}
|
|
|
onVisibleChange={this.handlePanelVisibleChange}
|
|
onVisibleChange={this.handlePanelVisibleChange}
|
|
|
|
|
+ afterClose={()=>this.setState({ motionEnd: true }, ()=>this.setState({ motionEnd: false }))}
|
|
|
>
|
|
>
|
|
|
{children}
|
|
{children}
|
|
|
</Popover>
|
|
</Popover>
|