Merge branch 'hotfix/0.1.2'

demo/src/app/reactive-form/reactive-form.component.html

@@ -33,6 +33,8 @@ <h4>Reactive forms: with validators</h4>
       <br>
       <strong>Form values:</strong> {{form.value | json}}
       <br>
+      <strong>start date is touched? </strong> {{form.get('start').touched}}
+      <br>
 
       <button class="btn btn-default" (click)="startReset()">Clear start date</button>
       <button class="btn btn-default" (click)="endReset()">Clear end date</button>

demo/src/app/reactive-form/reactive-form.component.spec.ts

@@ -80,4 +80,21 @@ describe('ReactiveFormComponent', () => {
       expect(component.form.value.end.format(format)).toBe(tomorrow.format(format));
     });
   });
+  it('select start date and start date shoule be touched - reset it and start date should be untouched', () => {
+    fixture.whenStable().then(() => {
+      // open start date input
+      fixture.debugElement.queryAll(By.css(opener))[0].nativeElement.click();
+      fixture.detectChanges();
+      dateTag(yesterday).click();
+      fixture.detectChanges();
+      // start date input is now touched
+      expect(component.form.controls['start'].touched).toBeTruthy();
+      // click on reset
+      const btn = fixture.debugElement.query(By.css('button')).nativeElement;
+      btn.click();
+      fixture.detectChanges();
+      // start date input is now untouched
+      expect(component.form.controls['start'].touched).toBeFalsy();
+    });
+  });
 });

package.json

@@ -1,14 +1,16 @@
 {
   "name": "ng2-eonasdan-datetimepicker",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Angular2+ component for bootstrap-datetimepicker library.",
   "keywords": [
     "angular2",
     "angular4",
     "angular5",
     "ng2",
+    "datepicker",
     "bootstrap",
     "datetimepicker",
+    "eonasdan",
     "component",
     "directive"
   ],

src/datetimepicker.directive.ts

@@ -68,11 +68,16 @@ export class DateTimePickerDirective implements OnInit, OnDestroy, DoCheck {
     set value(val) {
         this._value = val;
         this._onChange(val);
-        this._onTouched();
+        if (val) {
+            this._onTouched();
+        }
         this.changeDetector.markForCheck();
     }
 
     writeValue(value) {
+        if (!value) {
+            this.value = null;
+        }
         this.value = value;
         this.setDpValue(value);
     }