Merge pull request #182 from ynput/develop

Release: dropdown remove icon for anything selected
ynput · Sep 4, 2024 · ad7b04c · ad7b04c
2 parents 6c0f40e + 09c35f2
commit ad7b04c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/src/Dropdowns/AssigneeSelect/AssigneeDropdownTemplate.tsx b/src/Dropdowns/AssigneeSelect/AssigneeDropdownTemplate.tsx
@@ -1,4 +1,4 @@
-import styled, { css } from 'styled-components'
+import styled from 'styled-components'
 import { UserImage } from '../../User/UserImage'
 import { Icon } from '../../Icon'
 import clsx from 'clsx'
@@ -39,10 +39,7 @@ export interface AssigneeDropdownProps {
   fullName?: string
   avatarUrl?: string
   isSelected?: boolean
-  isMultiple: boolean
-  mixedSelected: string[]
   multiSelect: boolean
-  multipleOverride: boolean
   onClick?: () => void
   size?: number
   selectAll?: string | boolean
@@ -55,10 +52,7 @@ export const AssigneeDropdownTemplate = ({
   avatarUrl,
   fullName,
   isSelected,
-  isMultiple,
-  mixedSelected,
   multiSelect,
-  multipleOverride,
   onClick,
   size = 21,
   selectAll,
@@ -83,10 +77,7 @@ export const AssigneeDropdownTemplate = ({
       <UserImage src={avatarUrl} fullName={fullName} name={name} size={size} />
       {fullName || name}
       {!!error && ' (missing)'}
-      {multiSelect &&
-        isMultiple &&
-        !multipleOverride &&
-        (mixedSelected?.includes(name) || isSelected) && <Icon icon={'close'} className="remove" />}
+      {multiSelect && isSelected && <Icon icon={'close'} className="remove" />}
     </RowStyled>
   )
 }
diff --git a/src/Dropdowns/AssigneeSelect/AssigneeSelect.tsx b/src/Dropdowns/AssigneeSelect/AssigneeSelect.tsx
@@ -101,16 +101,13 @@ export const AssigneeSelect = forwardRef<DropdownRef, AssigneeSelectProps>(
         options={sortedOptions}
         dataKey={'name'}
         disabled={disabled}
-        itemTemplate={(ops, isActive, isSelected, index, mixedSelected) => (
+        itemTemplate={(ops, isActive, isSelected) => (
           <AssigneeDropdownTemplate
             {...ops}
             isSelected={isSelected}
             selectAll={props.onSelectAll && selectAllKey}
             allSelected={!!(isAllSelected && props.onSelectAll)}
-            mixedSelected={mixedSelected}
             multiSelect={multiSelect}
-            multipleOverride={multipleOverride}
-            isMultiple={isMultiple}
           />
         )}
         onChange={(added, removed) => onChange && onChange(added, removed)}

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