Skip to content

Commit e080720

Browse files
authored
fix(datepicker): pass through flatpickr inline prop (#9702)
* fix(datepicker): pass through flatpickr inline prop * fix(datepicker): ensure inline is not spread onto div
1 parent d545dd6 commit e080720

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

packages/react/src/components/DatePicker/DatePicker.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ export default class DatePicker extends Component {
309309
onClose,
310310
disable,
311311
enable,
312+
...rest
312313
} = this.props;
313314
if (datePickerType === 'single' || datePickerType === 'range') {
314315
const onHook = (electedDates, dateStr, instance) => {
@@ -338,6 +339,7 @@ export default class DatePicker extends Component {
338339
// inputField ref might not be set in enzyme tests
339340
if (this.inputField) {
340341
this.cal = new flatpickr(this.inputField, {
342+
inline: rest.inline ?? false,
341343
disableMobile: true,
342344
defaultDate: value,
343345
mode: datePickerType,
@@ -404,8 +406,17 @@ export default class DatePicker extends Component {
404406
value: prevValue,
405407
disable: prevDisable,
406408
enable: prevEnable,
409+
...prevRest
407410
}) {
408-
const { dateFormat, minDate, maxDate, value, disable, enable } = this.props;
411+
const {
412+
dateFormat,
413+
minDate,
414+
maxDate,
415+
value,
416+
disable,
417+
enable,
418+
...rest
419+
} = this.props;
409420
if (this.cal) {
410421
if (prevDateFormat !== dateFormat) {
411422
this.cal.set({ dateFormat });
@@ -422,6 +433,9 @@ export default class DatePicker extends Component {
422433
if (enable !== prevEnable) {
423434
this.cal.set('enable', enable);
424435
}
436+
if (rest.inline && rest.inline !== prevRest?.inline) {
437+
this.cal.set('inline', rest.inline);
438+
}
425439
}
426440

427441
// Coordinate when the given `value` prop changes. When this happens, we
@@ -605,7 +619,8 @@ export default class DatePicker extends Component {
605619
onChange, // eslint-disable-line
606620
locale, // eslint-disable-line
607621
value, // eslint-disable-line
608-
...other
622+
inline, // eslint-disable-line
623+
...rest
609624
} = this.props;
610625

611626
const scope = this.context;
@@ -668,7 +683,7 @@ export default class DatePicker extends Component {
668683
});
669684
return (
670685
<div className={wrapperClasses}>
671-
<div className={datePickerClasses} {...other}>
686+
<div className={datePickerClasses} {...rest}>
672687
{childrenWithProps}
673688
</div>
674689
</div>

0 commit comments

Comments
 (0)