Skip to content

Commit

Permalink
fix(DatePicker): make appendTo back working (#4215)
Browse files Browse the repository at this point in the history
Fixes #4158.
  • Loading branch information
asudoh authored Oct 10, 2019
1 parent 5d8dee8 commit 4f6a383
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
7 changes: 7 additions & 0 deletions packages/react/src/components/DatePicker/DatePicker-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ describe('DatePicker', () => {
datePickerType="single"
dateFormat="m/d/Y"
value={'02/26/2017'}
appendTo={document.body.firstChild}
onChange={() => {}}>
<DatePickerInput
key="label"
Expand All @@ -163,6 +164,12 @@ describe('DatePicker', () => {
wrapper.setProps({ value: '02/17/2017' });
expect(wrapper.props().value).toEqual('02/17/2017');
});

it('sends appendTo to Flatpickr', () => {
expect(wrapper.instance().cal.config.appendTo).toBe(
document.body.firstChild
);
});
});

describe('Range date picker', () => {
Expand Down
9 changes: 4 additions & 5 deletions packages/react/src/components/DatePicker/DatePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,9 @@ export default class DatePicker extends Component {
]),

/**
* The DOM element or selector the Flatpicker should be inserted into. `<body>` by default.
* The DOM element the Flatpicker should be inserted into. `<body>` by default.
*/
appendTo: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
appendTo: PropTypes.object,

/**
* The `change` event handler.
Expand Down Expand Up @@ -321,6 +321,7 @@ export default class DatePicker extends Component {

componentDidMount() {
const {
appendTo,
datePickerType,
dateFormat,
locale,
Expand All @@ -334,13 +335,11 @@ export default class DatePicker extends Component {
this.updateClassNames(instance);
};

let appendToNode;

// inputField ref might not be set in enzyme tests
if (this.inputField) {
this.cal = new flatpickr(this.inputField, {
defaultDate: value,
appendTo: appendToNode,
appendTo,
mode: datePickerType,
allowInput: true,
dateFormat: dateFormat,
Expand Down

0 comments on commit 4f6a383

Please sign in to comment.