fix: restore select focus on fullscreen dropdown close (#3120) (#3121)

Co-authored-by: Tomi Virkki <[email protected]>
vaadin · Nov 26, 2021 · 3d4680b · 3d4680b
1 parent 3f635b3
commit 3d4680b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/dev/select.html b/dev/select.html
@@ -10,7 +10,7 @@
     </script>
   </head>
   <body>
-    <vaadin-select></vaadin-select>
+    <vaadin-select label="Size"></vaadin-select>
 
     <script>
       const select = document.querySelector('vaadin-select');

diff --git a/packages/select/src/vaadin-select.js b/packages/select/src/vaadin-select.js
@@ -489,13 +489,9 @@ class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(Themab
 
       this._menuElement.focus();
     } else if (wasOpened) {
-      if (this._phone) {
-        this._setFocused(false);
-      } else {
-        this.focus();
-        if (this._openedWithFocusRing) {
-          this.setAttribute('focus-ring', '');
-        }
+      this.focus();
+      if (this._openedWithFocusRing) {
+        this.setAttribute('focus-ring', '');
       }
       this.validate();
     }

diff --git a/packages/select/test/select.test.js b/packages/select/test/select.test.js
@@ -375,19 +375,19 @@ describe('vaadin-select', () => {
         expect(focusedSpy.called).to.be.true;
       });
 
-      it('should remove focused state on closing the overlay if phone', () => {
+      it('should restore focused state on closing the overlay if phone', () => {
         select._phone = true;
         click(select._items[1]);
-        expect(select.hasAttribute('focused')).to.be.false;
+        expect(select.hasAttribute('focused')).to.be.true;
       });
 
-      it('should not focus the button on closing the overlay if phone', () => {
+      it('should focus the button on closing the overlay if phone', () => {
         const focusedSpy = sinon.spy();
         select.focusElement.focus = focusedSpy;
 
         select._phone = true;
         click(select._items[1]);
-        expect(focusedSpy.called).to.be.false;
+        expect(focusedSpy.called).to.be.true;
       });
 
       it('should focus the button before moving the focus to next selectable element', () => {