Adds a function processProps() to be used by both the constructor and the componentWillReceiveProps() from the Calendar component

Author: Ricardo Machado

components/calendar/calendar.js

@@ -9,57 +9,76 @@ const {
   CALENDAR_SELECTION_TYPE_RANGE,
 } = calendarConstants;
 
-export default class Calendar extends Component {
-  constructor(props) {
-    super();
 
-    const { initialDates, maxDate, minDate, selectionType } = props;
-    const maxLimit = maxDate ? normalizeDate(new Date(maxDate), 23, 59, 59, 999) : null;
-    const renderDate = normalizeDate(((initialDates && initialDates.length) ? new Date(initialDates[0]) : new Date()));
+/**
+ * Processes the given props and the existing state and returns
+ * a new state.
+ *
+ * @function processProps
+ * @param {Object} props Props to base the new state on.
+ * @param {Object} state (Existing) state to be based on for the existing values.
+ * @return {Object} New state to be set/used.
+ * @static
+ */
+function processProps(props) {
+  const { initialDates, maxDate, minDate, selectionType } = props;
+  const maxLimit = maxDate ? normalizeDate(new Date(maxDate), 23, 59, 59, 999) : null;
+  const renderDate = normalizeDate(((initialDates && initialDates.length) ? new Date(initialDates[0]) : new Date()));
+
+  let minLimit = minDate ? normalizeDate(new Date(minDate)) : null;
+  let selectedDates = [null, null];
+
+  if (initialDates) {
+    selectedDates = selectedDates.map((item, idx) => {
+      if (!initialDates[idx]) {
+        return null;
+      }
 
-    let minLimit = minDate ? normalizeDate(new Date(minDate)) : null;
-    let selectedDates = [null, null];
-    if (initialDates) {
-      selectedDates = selectedDates.map((item, idx) => {
-        if (!initialDates[idx]) {
-          return null;
-        }
+      return normalizeDate(new Date(initialDates[idx]));
+    });
+  }
 
-        return normalizeDate(new Date(initialDates[idx]));
-      });
+  /**
+   * If a minDate or a maxDate is set, let's check if any selectedDates are outside of the boundaries.
+   * If so, resets the selectedDates.
+   */
+  if (minLimit || maxLimit) {
+    const isAnyDateOutOfLimit = selectedDates.some(item => (
+      item && (
+        (minLimit && (minLimit.getTime() > item.getTime())) ||
+        (maxLimit && (maxLimit.getTime() < item.getTime()))
+      )
+    ));
+
+    if (isAnyDateOutOfLimit) {
+      selectedDates = [null, null];
+      console.warn(`A calendar instance contains a selectedDate outside of the minDate and maxDate boundaries`); // eslint-disable-line
     }
+  }
 
-    /**
-     * If a minDate or a maxDate is set, let's check if any selectedDates are outside of the boundaries.
-     * If so, resets the selectedDates.
-     */
-    if (minLimit || maxLimit) {
-      const isAnyDateOutOfLimit = selectedDates.some(item => (
-        item && (
-          (minLimit && (minLimit.getTime() > item.getTime())) ||
-          (maxLimit && (maxLimit.getTime() < item.getTime()))
-        )
-      ));
-
-      if (isAnyDateOutOfLimit) {
-        selectedDates = [null, null];
-        console.warn(`A calendar instance contains a selectedDate outside of the minDate and maxDate boundaries`); // eslint-disable-line
-      }
-    }
+  /** If initialDates is defined and we have a start date, we want to set it as the minLimit */
+  if (selectedDates[0] && (selectionType === CALENDAR_SELECTION_TYPE_RANGE)) {
+    minLimit = selectedDates[0];
+  }
 
-    /** If initialDates is defined and we have a start date, we want to set it as the minLimit */
-    if (selectedDates[0] && (selectionType === CALENDAR_SELECTION_TYPE_RANGE)) {
-      minLimit = selectedDates[0];
-    }
+  return {
+    maxLimit,
+    minLimit,
+    renderDate,
+    selectedDates,
+  };
+}
 
-    this.state = {
-      maxLimit,
-      minLimit,
-      renderDate,
-      selectedDates,
-    };
+export default class Calendar extends Component {
+  constructor(props) {
+    super();
 
     this.moveToMonth = this.moveToMonth.bind(this);
+    this.state = processProps(props);
+  }
+
+  componentWillReceiveProps(newProps) {
+    this.setState(() => processProps(newProps));
   }
 
   /**