From 07f48bcd0ae1683dc6e3703d0b17ea02f045cf80 Mon Sep 17 00:00:00 2001
From: Zhaoming Li <deart1mer@gmail.com>
Date: Sat, 9 Sep 2017 10:21:56 -0500
Subject: [PATCH] fix(module:select, datepicker, timepicker, radio, checkbox,
 input-number): fix touched state (#248)

close #228
---
 src/components/checkbox/nz-checkbox.component.ts         | 2 +-
 src/components/datepicker/nz-datepicker.component.ts     | 3 ++-
 src/components/input-number/nz-input-number.component.ts | 2 +-
 src/components/radio/nz-radio.component.ts               | 1 +
 src/components/select/nz-select.component.ts             | 5 ++++-
 src/components/time-picker/nz-timepicker.component.ts    | 1 +
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/checkbox/nz-checkbox.component.ts b/src/components/checkbox/nz-checkbox.component.ts
index 0d280985db4..eab41f23e01 100644
--- a/src/components/checkbox/nz-checkbox.component.ts
+++ b/src/components/checkbox/nz-checkbox.component.ts
@@ -20,7 +20,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
         [ngClass]="_inputPrefixCls"
         [ngModel]="nzChecked"
         (focus)="nzFocus()"
-        (blur)="nzBlur()">
+        (blur)="onTouched();nzBlur()">
     </span>
     <ng-content></ng-content>
   `,
diff --git a/src/components/datepicker/nz-datepicker.component.ts b/src/components/datepicker/nz-datepicker.component.ts
index d82854ceed4..41d0178edba 100644
--- a/src/components/datepicker/nz-datepicker.component.ts
+++ b/src/components/datepicker/nz-datepicker.component.ts
@@ -29,6 +29,7 @@ import { ConnectionPositionPair } from '../core/overlay/index';
       #trigger>
       <input
         nz-input
+        (blur)="onTouched()"
         [class.ant-input-disabled]="nzDisabled"
         [attr.placeholder]="nzPlaceHolder"
         [disabled]="nzDisabled"
@@ -37,7 +38,7 @@ import { ConnectionPositionPair } from '../core/overlay/index';
         [value]="_value|nzDate:nzFormat">
       <i class="ant-calendar-picker-clear anticon anticon-cross-circle"
         *ngIf="_showClearIcon"
-        (click)="_clearValue($event)">
+        (click)="onTouched();_clearValue($event)">
       </i>
       <span class="ant-calendar-picker-icon"></span>
     </span>
diff --git a/src/components/input-number/nz-input-number.component.ts b/src/components/input-number/nz-input-number.component.ts
index 7081244c541..9874dda3902 100644
--- a/src/components/input-number/nz-input-number.component.ts
+++ b/src/components/input-number/nz-input-number.component.ts
@@ -37,7 +37,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
       class="ant-input-number-input-wrap">
       <input class="ant-input-number-input"
         #inputNumber
-        (blur)="_checkValue()"
+        (blur)="onTouched();_checkValue()"
         [placeholder]="nzPlaceHolder"
         [disabled]="nzDisabled"
         [(ngModel)]="_displayValue"
diff --git a/src/components/radio/nz-radio.component.ts b/src/components/radio/nz-radio.component.ts
index a3db7466e58..c20d7c76684 100644
--- a/src/components/radio/nz-radio.component.ts
+++ b/src/components/radio/nz-radio.component.ts
@@ -91,6 +91,7 @@ export class NzRadioComponent implements OnInit {
   nzBlur() {
     this._focused = false;
     this.setClassMap();
+    this._nzRadioGroup.onTouched();
   }
 
   setClassMap(): void {
diff --git a/src/components/select/nz-select.component.ts b/src/components/select/nz-select.component.ts
index 4ee3b5de71e..ce764bb42ea 100644
--- a/src/components/select/nz-select.component.ts
+++ b/src/components/select/nz-select.component.ts
@@ -79,6 +79,7 @@ import { TagAnimation } from '../core/animation/tag-animations';
                 [(ngModel)]="_searchText"
                 (ngModelChange)="updateFilterOption();onSearchChange($event);"
                 (keydown)="updateWidth(searchInput,_searchText)"
+                (blur)="onTouched()"
                 #searchInput>
               <span class="ant-select-search__field__mirror"></span></div>
           </li>
@@ -93,6 +94,7 @@ import { TagAnimation } from '../core/animation/tag-animations';
           <div class="ant-select-search__field__wrap">
             <input
               class="ant-select-search__field"
+              (blur)="onTouched()"
               (compositionstart)="compositionStart()"
               (compositionend)="compositionEnd()"
               [(ngModel)]="_searchText"
@@ -103,7 +105,7 @@ import { TagAnimation } from '../core/animation/tag-animations';
         </div>
       </div>
       <span
-        (click)="clearSelect($event)"
+        (click)="onTouched();clearSelect($event)"
         class="ant-select-selection__clear"
         style="-webkit-user-select: none;"
         *ngIf="_selectedOption?.nzLabel&&nzAllowClear&&!nzMultiple">
@@ -591,6 +593,7 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent
     if (!this.nzOpen) {
       return;
     }
+    this.onTouched();
     if (this.nzMultiple) {
       this._renderer.removeStyle(this.searchInputElementRef.nativeElement, 'width');
     }
diff --git a/src/components/time-picker/nz-timepicker.component.ts b/src/components/time-picker/nz-timepicker.component.ts
index 4f415a96468..09e96d78601 100644
--- a/src/components/time-picker/nz-timepicker.component.ts
+++ b/src/components/time-picker/nz-timepicker.component.ts
@@ -30,6 +30,7 @@ import { ConnectionPositionPair } from '../core/overlay/index';
         class="ant-time-picker-input"
         [attr.placeholder]="nzPlaceHolder"
         (click)="_openCalendar()"
+        (blur)="onTouched()"
         [value]="_value|nzDate:_format">
       <span class="ant-time-picker-icon"></span>
     </span>