For real focus new SR field after role selected

cheshire137 · Sep 7, 2019 · 3cc6c67 · 3cc6c67
1 parent 95a1093
commit 3cc6c67
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/components/MatchForm.js b/src/components/MatchForm.js
@@ -382,12 +382,6 @@ class MatchForm extends Component {
   onRoleChange = (role) => {
     const { season } = this.props
 
-    if (this.placementMatchResultField) {
-      this.placementMatchResultField.focus()
-    } else if (this.matchRankField) {
-      this.matchRankField.focus()
-    }
-
     this.setState(prevState => {
       const heroesInRole = Hero.byRole[role]
       const oldSelectedHeroes = explodeHeroesString(prevState.heroes)
@@ -412,7 +406,15 @@ class MatchForm extends Component {
       }
 
       return newState
-    }, this.onFormFieldUpdate)
+    }, () => {
+      this.onFormFieldUpdate()
+
+      if (this.placementMatchResultField) {
+        this.placementMatchResultField.focus()
+      } else if (this.matchRankField) {
+        this.matchRankField.focus()
+      }
+    })
   }
 
   onHeroChange = (hero, isSelected) => {