Skip to content

Commit 22e022e

Browse files
ycjcl868zombieJ
authored andcommitted
fix: rangePicker footer hide when empty (#19)
* fix: rangePicker footer hide when empty * test: with footer test case * fix: engines use 8.x
1 parent 3aeab6c commit 22e022e

File tree

3 files changed

+33
-4
lines changed

3 files changed

+33
-4
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
"rc-trigger": "^4.0.0-alpha.6",
4545
"rc-util": "^4.17.0"
4646
},
47+
"engines": {
48+
"node": ">=8.x"
49+
},
4750
"devDependencies": {
4851
"@types/classnames": "^2.2.9",
4952
"@types/enzyme": "^3.10.3",

src/RangePicker.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -852,10 +852,12 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
852852
}}
853853
>
854854
<div className={`${prefixCls}-panels`}>{panels}</div>
855-
<div className={`${prefixCls}-footer`}>
856-
{extraNode}
857-
{rangesNode}
858-
</div>
855+
{(extraNode || rangesNode) && (
856+
<div className={`${prefixCls}-footer`}>
857+
{extraNode}
858+
{rangesNode}
859+
</div>
860+
)}
859861
</div>
860862
);
861863
}

tests/range.spec.tsx

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,30 @@ describe('Picker.Range', () => {
124124
it('year', () => {
125125
const wrapper = mount(<MomentRangePicker picker="year" />);
126126
wrapper.openPicker();
127+
expect(wrapper.exists('.rc-picker-footer')).toBeFalsy();
128+
expect(
129+
wrapper
130+
.find('.rc-picker-header-view')
131+
.first()
132+
.text(),
133+
).toEqual('1990-1999');
134+
expect(
135+
wrapper
136+
.find('.rc-picker-header-view')
137+
.last()
138+
.text(),
139+
).toEqual('2000-2009');
140+
});
141+
142+
it('year with footer', () => {
143+
const wrapper = mount(
144+
<MomentRangePicker
145+
renderExtraFooter={() => <p>footer</p>}
146+
picker="year"
147+
/>,
148+
);
149+
wrapper.openPicker();
150+
expect(wrapper.find('.rc-picker-footer').text()).toEqual('footer');
127151
expect(
128152
wrapper
129153
.find('.rc-picker-header-view')

0 commit comments

Comments
 (0)