From 86ca527a70df2d170de67d7f9d43a3afe5fd962a Mon Sep 17 00:00:00 2001
From: Phil McCloghry-Laing <phil@philistine.com.au>
Date: Thu, 7 Dec 2017 17:24:49 +1100
Subject: [PATCH] fix(forms): make Validators.email support optional controls
 (#20869)

Bring email validator in line with other validators so that empty values are ignored.

PR Close #20869
---
 packages/forms/src/validators.ts                 | 3 +++
 packages/forms/test/template_integration_spec.ts | 7 +++++++
 packages/forms/test/validators_spec.ts           | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/packages/forms/src/validators.ts b/packages/forms/src/validators.ts
index 63a962b051b5c5..b4ee7d1ec3dc96 100644
--- a/packages/forms/src/validators.ts
+++ b/packages/forms/src/validators.ts
@@ -125,6 +125,9 @@ export class Validators {
    * Validator that performs email validation.
    */
   static email(control: AbstractControl): ValidationErrors|null {
+    if (isEmptyInputValue(control.value)) {
+      return null;  // don't validate empty values to allow optional controls
+    }
     return EMAIL_REGEXP.test(control.value) ? null : {'email': true};
   }
 
diff --git a/packages/forms/test/template_integration_spec.ts b/packages/forms/test/template_integration_spec.ts
index 7426b74fda9379..783045f6f62f59 100644
--- a/packages/forms/test/template_integration_spec.ts
+++ b/packages/forms/test/template_integration_spec.ts
@@ -1265,6 +1265,13 @@ import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integrat
            tick();
 
            expect(input.nativeElement.value).toEqual('');
+           expect(control.hasError('email')).toBe(false);
+
+           input.nativeElement.value = '@';
+           dispatchEvent(input.nativeElement, 'input');
+           tick();
+
+           expect(input.nativeElement.value).toEqual('@');
            expect(control.hasError('email')).toBe(true);
 
            input.nativeElement.value = 'test@gmail.com';
diff --git a/packages/forms/test/validators_spec.ts b/packages/forms/test/validators_spec.ts
index dc750534ef6918..6102542c84f0d9 100644
--- a/packages/forms/test/validators_spec.ts
+++ b/packages/forms/test/validators_spec.ts
@@ -159,6 +159,12 @@ import {map} from 'rxjs/operator/map';
     });
 
     describe('email', () => {
+      it('should not error on an empty string',
+         () => expect(Validators.email(new FormControl(''))).toBeNull());
+
+      it('should not error on null',
+         () => expect(Validators.email(new FormControl(null))).toBeNull());
+
       it('should error on invalid email',
          () => expect(Validators.email(new FormControl('some text'))).toEqual({'email': true}));