Merge pull request #2297 from Autodesk/fix/icon-button

fix: do not trigger focus/hover/pressed states when disabled
Autodesk · Sep 21, 2020 · 5528e35 · 5528e35
2 parents d05bd7f + 19ab026
commit 5528e35
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/packages/icon-button/src/IconButton.js b/packages/icon-button/src/IconButton.js
@@ -77,6 +77,7 @@ export default class IconButton extends Component {
 
   render() {
     const {
+      disabled,
       onBlur,
       onFocus,
       onMouseDown,
@@ -107,9 +108,10 @@ export default class IconButton extends Component {
           onMouseUp: handleMouseUp
         }) => (
           <IconButtonPresenter
-            hasFocus={hasFocus}
-            hasHover={hasHover}
-            isPressed={isPressed}
+            disabled={disabled}
+            hasFocus={hasFocus && !disabled}
+            hasHover={hasHover && !disabled}
+            isPressed={isPressed && !disabled}
             onBlur={handleBlur}
             onFocus={handleFocus}
             onMouseDown={handleMouseDown}