From 5d5d1fb400cd757cb739cd6f9368f9082835998d Mon Sep 17 00:00:00 2001 From: Akira Sudoh Date: Wed, 11 Dec 2019 09:27:01 +0900 Subject: [PATCH 1/2] fix(date-picker): support changing date format This change allows change in `dateFormat` prop after initialization reflected correctly to the underlying Flatpickr. Fixes #4848. --- packages/react/src/components/DatePicker/DatePicker.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/react/src/components/DatePicker/DatePicker.js b/packages/react/src/components/DatePicker/DatePicker.js index e288203f821f..c37bbc0f3f02 100644 --- a/packages/react/src/components/DatePicker/DatePicker.js +++ b/packages/react/src/components/DatePicker/DatePicker.js @@ -383,6 +383,13 @@ export default class DatePicker extends Component { } } + componentDidUpdate({ dateFormat: prevDateFormat }) { + const { dateFormat } = this.props; + if (prevDateFormat !== dateFormat) { + this.cal.set({ dateFormat }); + } + } + componentWillUnmount() { if (this.cal) { this.cal.destroy(); From 921a163348e461e87725b8845abfdb17173745df Mon Sep 17 00:00:00 2001 From: Akira Sudoh Date: Thu, 12 Dec 2019 12:32:43 +0900 Subject: [PATCH 2/2] fix(DatePicker): fix NPE in tests --- packages/react/src/components/DatePicker/DatePicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/components/DatePicker/DatePicker.js b/packages/react/src/components/DatePicker/DatePicker.js index c37bbc0f3f02..e6143ab2bb10 100644 --- a/packages/react/src/components/DatePicker/DatePicker.js +++ b/packages/react/src/components/DatePicker/DatePicker.js @@ -385,7 +385,7 @@ export default class DatePicker extends Component { componentDidUpdate({ dateFormat: prevDateFormat }) { const { dateFormat } = this.props; - if (prevDateFormat !== dateFormat) { + if (this.cal && prevDateFormat !== dateFormat) { this.cal.set({ dateFormat }); } }