Merge 02231fd into 066a697

vaadin · Aug 16, 2018 · 2576bf8 · 2576bf8
2 parents 066a697 + 02231fd
commit 2576bf8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/vaadin-radio-group.html b/src/vaadin-radio-group.html
@@ -206,7 +206,9 @@
 
           this.setAttribute('role', 'radiogroup');
 
-          this.addEventListener('focusout', e => this.validate());
+          // Need to check e.composed as a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1472887
+          // otherwise FF runs validation on keyboard focus
+          this.addEventListener('focusout', e => e.composed && this.validate());
 
           const uniqueId = RadioGroupElement._uniqueId = 1 + RadioGroupElement._uniqueId || 0;
           this._errorId = `${this.constructor.is}-error-${uniqueId}`;

diff --git a/test/vaadin-radio-group.html b/test/vaadin-radio-group.html
@@ -61,8 +61,8 @@
   <script>
     describe('vaadin-radio-group', () => {
 
-      function blur(e) {
-        e.dispatchEvent(new CustomEvent('focusout', {bubbles: true, composed: true}));
+      function blur(e, composed = true) {
+        e.dispatchEvent(new CustomEvent('focusout', {bubbles: true, composed: composed}));
       }
 
       function visible(e) {
@@ -335,6 +335,12 @@
         expect(vaadinRadioButtonGroup.invalid).to.be.true;
       });
 
+      it('should not run validation if focusout is not composed', () => {
+        vaadinRadioButtonGroup.required = true;
+        blur(vaadinRadioButtonGroup, false);
+        expect(vaadinRadioButtonGroup.invalid).to.be.false;
+      });
+
       it('error should have appropriate aria attributes and id', () => {
         expect(errorElement.getAttribute('aria-live')).to.be.equal('assertive');
         expect(errorElement.getAttribute('aria-hidden')).to.be.equal('true');