fix(UserSelect): fixed disable state of item (#1353)

consta-design-system · Jul 21, 2021 · 35d25f9 · 35d25f9
1 parent 0dabcd1
commit 35d25f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/components/UserSelect/UserSelectItem/UserSelectItem.css b/src/components/UserSelect/UserSelectItem/UserSelectItem.css
@@ -35,7 +35,7 @@
   }
 
   &_disable {
-    color: var(--color-control-typo-disabled);
+    color: var(--color-control-typo-disable);
   }
 
   &_hovered {
@@ -116,5 +116,9 @@
   &-SubLabel {
     opacity: 0.7;
     font-size: var(--sub-label-font-size);
+
+    &_disable {
+      opacity: 1;
+    }
   }
 }
diff --git a/src/components/UserSelect/UserSelectItem/UserSelectItem.tsx b/src/components/UserSelect/UserSelectItem/UserSelectItem.tsx
@@ -46,12 +46,12 @@ export const UserSelectItem: React.FC<UserSelectItemProps> = (props) => {
   return (
     <div
       {...otherProps}
-      className={cnUserSelectItem({ active, hovered, size, indent }, [className])}
+      className={cnUserSelectItem({ active, hovered, size, indent, disable }, [className])}
       aria-selected={active}
       role="option"
     >
       <div className={cnUserSelectItem('AvatarContainer')}>
-        <Avatar className={cnUserSelectItem('Avatar', { disable })} url={avatarUrl} name={label} />
+        <Avatar className={cnUserSelectItem('Avatar')} url={avatarUrl} name={label} />
         {multiple && (
           <CSSTransition
             in={active}
@@ -69,7 +69,7 @@ export const UserSelectItem: React.FC<UserSelectItemProps> = (props) => {
       ) : (
         <div className={cnUserSelectItem('Info')}>
           <div>{label}</div>
-          <div className={cnUserSelectItem('SubLabel')}>{subLabel}</div>
+          <div className={cnUserSelectItem('SubLabel', { disable })}>{subLabel}</div>
         </div>
       )}
     </div>