fix(tag): pass props.disabled to close button (#5996)

* fix(tag): pass props.disabled to close button * fix(tag): un-nest disabled style Co-authored-by: Josh Black <[email protected]> Co-authored-by: Alessandra Davila <[email protected]>
carbon-design-system · May 13, 2020 · 7f2d551 · 7f2d551
1 parent 818705a
commit 7f2d551
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/packages/components/src/components/tag/_tag.scss b/packages/components/src/components/tag/_tag.scss
@@ -174,6 +174,10 @@
     }
   }
 
+  .#{$prefix}--tag--disabled .#{$prefix}--tag__close-icon {
+    cursor: not-allowed;
+  }
+
   .#{$prefix}--tag__close-icon:focus {
     outline: none;
     box-shadow: inset 0 0 0 2px $focus;

diff --git a/packages/react/src/components/Tag/Tag.js b/packages/react/src/components/Tag/Tag.js
@@ -60,14 +60,14 @@ const Tag = ({
           : `Clear filter ${children}`
       }
       id={tagId}
-      disabled={disabled}
       {...other}>
       <span className={`${prefix}--tag__label`}>
         {children !== null && children !== undefined ? children : TYPES[type]}
       </span>
       <button
         className={`${prefix}--tag__close-icon`}
         onClick={handleClose}
+        disabled={disabled}
         aria-labelledby={tagId}>
         <Close16 />
       </button>