fix(datetime): ionChange/ngModel returns the correct value

ionic-team · Apr 27, 2017 · af394b5 · af394b5
1 parent 505d27a
commit af394b5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/src/components/datetime/datetime.ts b/src/components/datetime/datetime.ts
@@ -267,13 +267,14 @@ import { dateValueRange, renderDateTime, renderTextFormat, convertFormatToKey, g
   providers: [ { provide: NG_VALUE_ACCESSOR, useExisting: DateTime, multi: true } ],
   encapsulation: ViewEncapsulation.None,
 })
-export class DateTime extends BaseInput<DateTimeData> implements AfterViewInit, ControlValueAccessor, OnDestroy {
+export class DateTime extends BaseInput<DateTimeData|string> implements AfterViewInit, ControlValueAccessor, OnDestroy {
 
   _text: string = '';
   _min: DateTimeData;
   _max: DateTimeData;
   _locale: LocaleData = {};
   _picker: Picker;
+  _internalValue: DateTimeData = {};
 
   /**
    * @input {string} The minimum datetime allowed. Value must be a date string
@@ -439,16 +440,23 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterViewInit,
   /**
    * @hidden
    */
-  _inputUpdated() {
-    this.updateText();
+  _inputReset() {
+    this._internalValue = {};
+  }
+
+  /**
+   * @hidden
+   */
+  _inputCheckHasValue(val: any) {
+    updateDate(this._internalValue, val);
+    super._inputCheckHasValue(val);
   }
 
   /**
    * @hidden
    */
-  _inputNormalize(val: any): DateTimeData {
-    updateDate(this._value, val);
-    return this._value;
+  _inputUpdated() {
+    this.updateText();
   }
 
   /**
@@ -458,6 +466,14 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterViewInit,
     return true;
   }
 
+  /**
+   * TODO: REMOVE THIS
+   * @hidden
+   */
+  _inputChangeEvent(): any {
+    return this.value;
+  }
+
   @HostListener('click', ['$event'])
   _click(ev: UIEvent) {
     // do not continue if the click event came from a form submit
@@ -742,7 +758,7 @@ export class DateTime extends BaseInput<DateTimeData> implements AfterViewInit,
    * @hidden
    */
   getValue(): DateTimeData {
-    return this._value;
+    return this._internalValue;
   }
 
   /**

diff --git a/src/util/base-input.ts b/src/util/base-input.ts
@@ -143,9 +143,13 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
     if (isUndefined(val)) {
       return false;
     }
-    const normalized = (val === null)
-      ? deepCopy(this._defaultValue)
-      : this._inputNormalize(val);
+    let normalized;
+    if (val === null) {
+      normalized = deepCopy(this._defaultValue);
+      this._inputReset();
+    } else {
+      normalized = this._inputNormalize(val);
+    }
 
     const notUpdate = isUndefined(normalized) || !this._inputShouldChange(normalized);
     if (notUpdate) {
@@ -285,7 +289,12 @@ export class BaseInput<T> extends Ion implements CommonInput<T> {
   /**
    * @hidden
    */
-  initFocus() {}
+  initFocus() { }
+
+  /**
+   * @hidden
+   */
+  _inputReset() { }
 
   /**
    * @hidden