From bf0730421ad3aeac4c1f5d9afba064ce6e2f9be1 Mon Sep 17 00:00:00 2001
From: Daniel Sogl <daniel@sogls.de>
Date: Thu, 13 Dec 2018 18:12:04 +0100
Subject: [PATCH] refactor(date-picker): remove redundant code (#4863)

* refactor(date-picker): remove redundant code

* fix(datepicker): add report invalid date in range
---
 src/datepicker/bs-daterangepicker-input.directive.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/datepicker/bs-daterangepicker-input.directive.ts b/src/datepicker/bs-daterangepicker-input.directive.ts
index f6a5cb77f4..54df3d187d 100644
--- a/src/datepicker/bs-daterangepicker-input.directive.ts
+++ b/src/datepicker/bs-daterangepicker-input.directive.ts
@@ -106,11 +106,15 @@ export class BsDaterangepickerInputDirective
       return null;
     }
 
+    const _isFirstDateValid = isDateValid(_value[0]);
+    const _isSecondDateValid = isDateValid(_value[1]);
 
-    const _isDateValid = isDateValid(_value[0]) && isDateValid(_value[0]);
+    if (!_isFirstDateValid) {
+      return { bsDate: { invalid: _value[0] } };
+    }
 
-    if (!_isDateValid) {
-      return { bsDate: { invalid: _value } };
+    if (!_isSecondDateValid) {
+      return { bsDate: { invalid: _value[1] } };
     }
 
     if (this._picker && this._picker.minDate && isBefore(_value[0], this._picker.minDate, 'date')) {