Merge branch 'master' into checkbox-skeleton

carbon-design-system · Jan 7, 2020 · 62e84d4 · 62e84d4
2 parents 45ed96f + ef0752e
commit 62e84d4
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/packages/react/src/components/DatePicker/DatePicker.js b/packages/react/src/components/DatePicker/DatePicker.js
@@ -383,10 +383,22 @@ export default class DatePicker extends Component {
     }
   }
 
-  componentDidUpdate({ dateFormat: prevDateFormat }) {
-    const { dateFormat } = this.props;
-    if (this.cal && prevDateFormat !== dateFormat) {
-      this.cal.set({ dateFormat });
+  componentDidUpdate({
+    dateFormat: prevDateFormat,
+    minDate: prevMinDate,
+    maxDate: prevMaxDate,
+  }) {
+    const { dateFormat, minDate, maxDate } = this.props;
+    if (this.cal) {
+      if (prevDateFormat !== dateFormat) {
+        this.cal.set({ dateFormat });
+      }
+      if (prevMinDate !== minDate) {
+        this.cal.set('minDate', minDate);
+      }
+      if (prevMaxDate !== maxDate) {
+        this.cal.set('maxDate', maxDate);
+      }
     }
   }