Merge pull request #183 from ynput/develop

fix(Dropdown): mixed override show remove icon
ynput · Sep 4, 2024 · ec7083c · ec7083c
2 parents ad7b04c + 4d2e9c7
commit ec7083c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Dropdowns/AssigneeSelect/AssigneeDropdownTemplate.tsx b/src/Dropdowns/AssigneeSelect/AssigneeDropdownTemplate.tsx
@@ -39,6 +39,7 @@ export interface AssigneeDropdownProps {
   fullName?: string
   avatarUrl?: string
   isSelected?: boolean
+  isSelectedMixed?: boolean
   multiSelect: boolean
   onClick?: () => void
   size?: number
@@ -52,6 +53,7 @@ export const AssigneeDropdownTemplate = ({
   avatarUrl,
   fullName,
   isSelected,
+  isSelectedMixed,
   multiSelect,
   onClick,
   size = 21,
@@ -77,7 +79,8 @@ export const AssigneeDropdownTemplate = ({
       <UserImage src={avatarUrl} fullName={fullName} name={name} size={size} />
       {fullName || name}
       {!!error && ' (missing)'}
-      {multiSelect && isSelected && <Icon icon={'close'} className="remove" />}
+      {}
+      {multiSelect && (isSelected || isSelectedMixed) && <Icon icon={'close'} className="remove" />}
     </RowStyled>
   )
 }
diff --git a/src/Dropdowns/AssigneeSelect/AssigneeSelect.tsx b/src/Dropdowns/AssigneeSelect/AssigneeSelect.tsx
@@ -101,10 +101,11 @@ export const AssigneeSelect = forwardRef<DropdownRef, AssigneeSelectProps>(
         options={sortedOptions}
         dataKey={'name'}
         disabled={disabled}
-        itemTemplate={(ops, isActive, isSelected) => (
+        itemTemplate={(ops, _isActive, isSelected, _index, selectedMixed) => (
           <AssigneeDropdownTemplate
             {...ops}
             isSelected={isSelected}
+            isSelectedMixed={selectedMixed.includes(ops.name)}
             selectAll={props.onSelectAll && selectAllKey}
             allSelected={!!(isAllSelected && props.onSelectAll)}
             multiSelect={multiSelect}

diff --git a/src/Dropdowns/Dropdown/Dropdown.tsx b/src/Dropdowns/Dropdown/Dropdown.tsx
@@ -965,7 +965,7 @@ export const Dropdown = forwardRef<DropdownRef, DropdownProps>(
                           {option.icon && <Icon icon={option.icon} />}
                           <span>{option[labelKey] || option[dataKey]}</span>
                           {multiSelect &&
-                            selected?.includes(option[dataKey]) &&
+                            [...selected, ...mixedSelected]?.includes(option[dataKey]) &&
                             selected.length > minSelected && (
                               <Icon icon={'close'} className="remove" />
                             )}