From 25d6c326cbb0cf4af17c0f0669f316065d2c4241 Mon Sep 17 00:00:00 2001
From: Alex Bettadapur <alebet@microsoft.com>
Date: Wed, 31 Aug 2016 16:08:32 -0700
Subject: [PATCH 1/2] Fixed validation when allowTextInput is false

---
 src/components/DatePicker/DatePicker.tsx | 43 ++++++++++++------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/components/DatePicker/DatePicker.tsx b/src/components/DatePicker/DatePicker.tsx
index 273f950c0a248..e6e7787f57cf9 100644
--- a/src/components/DatePicker/DatePicker.tsx
+++ b/src/components/DatePicker/DatePicker.tsx
@@ -356,34 +356,35 @@ export class DatePicker extends React.Component<IDatePickerProps, IDatePickerSta
       return;
     }
 
-    let date = null;
     if (allowTextInput) {
-      if (inputValue) {
-        date = parseDateFromString(inputValue);
-        if (!date) {
-          this.setState({
-            errorMessage: strings.invalidInputErrorMessage || '*'
-          });
+      let date = null;
+
+        if (inputValue) {
+          date = parseDateFromString(inputValue);
+          if (!date) {
+            this.setState({
+              errorMessage: strings.invalidInputErrorMessage || '*'
+            });
+          } else {
+            this.setState({
+              selectedDate: date,
+              formattedDate: formatDate && date ? formatDate(date) : null,
+              errorMessage: ''
+            });
+          }
         } else {
+          // No input date string shouldn't be an error if field is not required
           this.setState({
-            selectedDate: date,
-            formattedDate: formatDate && date ? formatDate(date) : null,
             errorMessage: ''
           });
         }
-      } else {
-        // No input date string shouldn't be an error if field is not required
-        this.setState({
-          errorMessage: ''
-        });
-      }
-    }
 
-    // Execute onSelectDate callback
-    if (onSelectDate) {
-      // If no input date string or input date string is invalid
-      // date variable will be null, callback should expect null value for this case
-      onSelectDate(date);
+      // Execute onSelectDate callback
+      if (onSelectDate) {
+        // If no input date string or input date string is invalid
+        // date variable will be null, callback should expect null value for this case
+        onSelectDate(date);
+      }
     }
   }
 }

From c8fa2e70d1990455b56e76f01df3d27582bfb3a7 Mon Sep 17 00:00:00 2001
From: Alex Bettadapur <alebet@microsoft.com>
Date: Wed, 31 Aug 2016 16:11:41 -0700
Subject: [PATCH 2/2] Fixed formatting

---
 src/components/DatePicker/DatePicker.tsx | 29 ++++++++++++------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/DatePicker/DatePicker.tsx b/src/components/DatePicker/DatePicker.tsx
index e6e7787f57cf9..000b7b52773b6 100644
--- a/src/components/DatePicker/DatePicker.tsx
+++ b/src/components/DatePicker/DatePicker.tsx
@@ -358,26 +358,25 @@ export class DatePicker extends React.Component<IDatePickerProps, IDatePickerSta
 
     if (allowTextInput) {
       let date = null;
-
-        if (inputValue) {
-          date = parseDateFromString(inputValue);
-          if (!date) {
-            this.setState({
-              errorMessage: strings.invalidInputErrorMessage || '*'
-            });
-          } else {
-            this.setState({
-              selectedDate: date,
-              formattedDate: formatDate && date ? formatDate(date) : null,
-              errorMessage: ''
-            });
-          }
+      if (inputValue) {
+        date = parseDateFromString(inputValue);
+        if (!date) {
+          this.setState({
+            errorMessage: strings.invalidInputErrorMessage || '*'
+          });
         } else {
-          // No input date string shouldn't be an error if field is not required
           this.setState({
+            selectedDate: date,
+            formattedDate: formatDate && date ? formatDate(date) : null,
             errorMessage: ''
           });
         }
+      } else {
+        // No input date string shouldn't be an error if field is not required
+        this.setState({
+          errorMessage: ''
+        });
+      }
 
       // Execute onSelectDate callback
       if (onSelectDate) {