4255: Check props to ensure Select is not focused when isDisabled cha…

…nged (#4329) Co-authored-by: Eric Bonow <[email protected]> Co-authored-by: Jed Watson <[email protected]> Co-authored-by: Nathan Bierema <[email protected]>
JedWatson · Jan 13, 2021 · ad2ff6c · ad2ff6c
2 parents a1e1db2 + a2971e6
commit ad2ff6c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/packages/react-select/src/Select.js b/packages/react-select/src/Select.js
@@ -443,6 +443,11 @@ export default class Select extends Component<Props, State> {
       this.focusInput();
     }
 
+    if (isFocused && isDisabled && !prevProps.isDisabled) {
+      // ensure select state gets blurred in case Select is programatically disabled while focused
+      this.setState({ isFocused: false }, this.onMenuClose);
+    }
+
     // scroll the focused option into view if necessary
     if (
       this.menuListRef &&