fix: support getPopupContainer for vertical scroll issue

DFocusGroup · Oct 28, 2018 · 91a42b3 · 91a42b3
1 parent d7d1c71
commit 91a42b3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/example/src/Document/Routes/Components/RegionPicker2Doc.js b/example/src/Document/Routes/Components/RegionPicker2Doc.js
@@ -42,6 +42,7 @@ class RegionPicker2Doc extends Component {
 <RegionPicker2 
   placeholder={Placeholder}
   disabled={Disabled}
+  getPopupContainer={GetPopupContainer}
   defaultConstructLevel={DefaultConstructLevel}
   dataRetriever={DataRetriever}
   value={Value}
@@ -83,6 +84,11 @@ class RegionPicker2Doc extends Component {
               type: 'Boolean',
               description: '是否禁用该组件'
             },
+            {
+              prop: 'getPopupContainer',
+              type: 'Function(node: HTMLElement) => HTMLElement',
+              description: '默认值：() => document.body'
+            },
             {
               prop: 'value',
               type: 'Object',

diff --git a/example/src/Document/Routes/Components/RegionPickerDoc.js b/example/src/Document/Routes/Components/RegionPickerDoc.js
@@ -57,6 +57,7 @@ class RegionPickerDoc extends Component {
   placeholders={Placeholders}
   showLines={ShowLines}
   showDistrict={ShowDistrict}
+  getPopupContainer={GetPopupContainer}
   disabled={Disabled}
   dataRetriever={DataRetriever}
   value={Value}
@@ -103,6 +104,11 @@ class RegionPickerDoc extends Component {
               type: 'Boolean',
               description: '是否禁用该组件'
             },
+            {
+              prop: 'getPopupContainer',
+              type: 'Function(node: HTMLElement) => HTMLElement',
+              description: '默认值：() => document.body'
+            },
             {
               prop: 'value',
               type: 'Object',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd-extensions",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "",
   "author": "leftstick",
   "license": "MIT",

diff --git a/src/exts/RegionPicker.js b/src/exts/RegionPicker.js
@@ -33,6 +33,7 @@ class RegionPicker extends Component {
       noData: PropTypes.string
     }),
     showDistrict: PropTypes.bool,
+    getPopupContainer: PropTypes.func,
     disabled: PropTypes.bool,
     showLines: PropTypes.oneOf([1, 2, 3, 4]),
     dataRetriever: PropTypes.func,
@@ -238,7 +239,7 @@ class RegionPicker extends Component {
   }
 
   render() {
-    const { placeholders, showDistrict, showLines, disabled } = this.props
+    const { placeholders, showDistrict, showLines, disabled, getPopupContainer } = this.props
 
     const finalPlaceholders = Object.assign({}, DEFAULT_PLACEHOLDERS, placeholders)
     return (
@@ -253,6 +254,7 @@ class RegionPicker extends Component {
         <Select
           disabled={disabled}
           value={this.state.countryValue}
+          getPopupContainer={getPopupContainer}
           showSearch
           style={getStyleForSelect(1, showLines, showDistrict)}
           placeholder={finalPlaceholders.country}
@@ -271,6 +273,7 @@ class RegionPicker extends Component {
         <Select
           disabled={disabled}
           value={this.state.stateValue}
+          getPopupContainer={getPopupContainer}
           showSearch
           style={getStyleForSelect(2, showLines, showDistrict)}
           placeholder={finalPlaceholders.state}
@@ -289,6 +292,7 @@ class RegionPicker extends Component {
         <Select
           disabled={disabled}
           value={this.state.cityValue}
+          getPopupContainer={getPopupContainer}
           showSearch
           style={getStyleForSelect(3, showLines, showDistrict)}
           placeholder={finalPlaceholders.city}
@@ -308,6 +312,7 @@ class RegionPicker extends Component {
           <Select
             disabled={disabled}
             value={this.state.districtValue}
+            getPopupContainer={getPopupContainer}
             showSearch
             style={BASE_SELECT_STYLE}
             placeholder={finalPlaceholders.district}

diff --git a/src/exts/RegionPicker2.js b/src/exts/RegionPicker2.js
@@ -17,6 +17,7 @@ class RegionPicker2 extends Component {
     style: PropTypes.object,
     placeholder: PropTypes.string,
     disabled: PropTypes.bool,
+    getPopupContainer: PropTypes.func,
     defaultConstructLevel: PropTypes.oneOf([1, 2, 3, 4]),
     dataRetriever: PropTypes.func,
     onChange: PropTypes.func,
@@ -199,10 +200,11 @@ class RegionPicker2 extends Component {
   }
 
   render() {
-    const { className, style, placeholder, disabled } = this.props
+    const { className, style, placeholder, disabled, getPopupContainer } = this.props
     const { options, internalVal } = this.state
     return (
       <Cascader
+        getPopupContainer={getPopupContainer}
         disabled={disabled}
         className={className}
         style={style}