Merge pull request #15156 from ant-design/date-picker-popup

fix configProvider getPopupContainer not work with DatePicker
ant-design · Mar 4, 2019 · 19d916f · 19d916f
2 parents 42f5aea + 0af6bde
commit 19d916f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/components/date-picker/wrapPicker.tsx b/components/date-picker/wrapPicker.tsx
@@ -130,13 +130,15 @@ export default function wrapPicker(Picker: React.ComponentClass<any>, pickerType
 
       return (
         <ConfigConsumer>
-          {({ getPrefixCls }: ConfigConsumerProps) => {
+          {({ getPrefixCls, getPopupContainer: getContextPopupContainer }: ConfigConsumerProps) => {
             const {
               prefixCls: customizePrefixCls,
               inputPrefixCls: customizeInputPrefixCls,
+              getCalendarContainer,
               size,
               disabled,
             } = this.props;
+            const getPopupContainer = getCalendarContainer || getContextPopupContainer;
             const prefixCls = getPrefixCls('calendar', customizePrefixCls);
             const inputPrefixCls = getPrefixCls('input', customizeInputPrefixCls);
             const pickerClass = classNames(`${prefixCls}-picker`, {
@@ -170,6 +172,7 @@ export default function wrapPicker(Picker: React.ComponentClass<any>, pickerType
             return (
               <Picker
                 {...this.props}
+                getCalendarContainer={getPopupContainer}
                 format={mergedFormat}
                 ref={this.savePicker}
                 pickerClass={pickerClass}