Merge branch 'master' into joshblack-patch-1

carbon-design-system · Jan 7, 2020 · c2b8490 · c2b8490
2 parents 363784e + 1c763f8
commit c2b8490
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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 (this.cal && prevDateFormat !== dateFormat) {
+      this.cal.set({ dateFormat });
+    }
+  }
+
   componentWillUnmount() {
     if (this.cal) {
       this.cal.destroy();