diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx index 3ccbc45d5..a7716f6ee 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx @@ -2,7 +2,6 @@ import { useApplyObjectFilterDropdownFilterValue } from '@/object-record/object- import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector'; import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState'; import { turnCurrencyIntoSelectableItem } from '@/object-record/object-filter-dropdown/utils/turnCurrencyIntoSelectableItem'; -import { StyledMultipleSelectDropdownAvatarChip } from '@/object-record/select/components/StyledMultipleSelectDropdownAvatarChip'; import { SelectableItem } from '@/object-record/select/types/SelectableItem'; import { CURRENCIES } from '@/settings/data-model/constants/Currencies'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; @@ -117,17 +116,8 @@ export const ObjectFilterDropdownCurrencySelect = () => { onSelectChange={(newCheckedValue) => { handleMultipleItemSelectChange(item, newCheckedValue); }} - avatar={ - - } + text={item.name} + avatar={item.AvatarIcon && } /> ); })} @@ -139,17 +129,8 @@ export const ObjectFilterDropdownCurrencySelect = () => { onSelectChange={(newCheckedValue) => { handleMultipleItemSelectChange(item, newCheckedValue); }} - avatar={ - - } + text={item.name} + avatar={item.AvatarIcon && } /> ); })} diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems.tsx index de74ebcd3..a36cd64b1 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems.tsx +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems.tsx @@ -1,6 +1,6 @@ -import { StyledMultipleSelectDropdownAvatarChip } from '@/object-record/select/components/StyledMultipleSelectDropdownAvatarChip'; import { SelectableItem } from '@/object-record/select/types/SelectableItem'; import styled from '@emotion/styled'; +import { Avatar } from 'twenty-ui/display'; import { MenuItemMultiSelectAvatar } from 'twenty-ui/navigation'; const StyledPinnedItemsContainer = styled.div` @@ -26,16 +26,21 @@ export const ObjectFilterDropdownRecordPinnedItems = (props: { onSelectChange={(newCheckedValue) => { props.onChange(selectableItem, newCheckedValue); }} + text={selectableItem.name} avatar={ - + selectableItem.avatarUrl ? ( + + ) : ( + selectableItem.AvatarIcon && ( + + ) + ) } /> ); diff --git a/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx b/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx index 6943731f4..2d988f984 100644 --- a/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx +++ b/packages/twenty-front/src/modules/object-record/select/components/MultipleSelectDropdown.tsx @@ -1,6 +1,5 @@ import { Key } from 'ts-key-enum'; -import { StyledMultipleSelectDropdownAvatarChip } from '@/object-record/select/components/StyledMultipleSelectDropdownAvatarChip'; import { SelectableItem } from '@/object-record/select/types/SelectableItem'; import { DropdownMenuSkeletonItem } from '@/ui/input/relation-picker/components/skeletons/DropdownMenuSkeletonItem'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; @@ -12,6 +11,7 @@ import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectab import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; +import { Avatar } from 'twenty-ui/display'; import { MenuItem, MenuItemMultiSelectAvatar } from 'twenty-ui/navigation'; export const MultipleSelectDropdown = ({ @@ -105,15 +105,14 @@ export const MultipleSelectDropdown = ({ resetSelectedItem(); handleItemSelectChange(item, newCheckedValue); }} + text={item.name} avatar={ - } /> diff --git a/packages/twenty-front/src/modules/object-record/select/components/StyledMultipleSelectDropdownAvatarChip.tsx b/packages/twenty-front/src/modules/object-record/select/components/StyledMultipleSelectDropdownAvatarChip.tsx deleted file mode 100644 index d813088d1..000000000 --- a/packages/twenty-front/src/modules/object-record/select/components/StyledMultipleSelectDropdownAvatarChip.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import styled from '@emotion/styled'; -import { AvatarChip } from 'twenty-ui/components'; - -export const StyledMultipleSelectDropdownAvatarChip = styled(AvatarChip)` - &.avatar-icon-container { - color: ${({ theme }) => theme.font.color.secondary}; - gap: ${({ theme }) => theme.spacing(2)}; - padding-left: 0px; - padding-right: 0px; - font-size: ${({ theme }) => theme.font.size.md}; - } -`; diff --git a/packages/twenty-ui/src/components/avatar-chip/AvatarChipLeftComponent.tsx b/packages/twenty-ui/src/components/avatar-chip/AvatarChipLeftComponent.tsx index efe08146e..cf6c36165 100644 --- a/packages/twenty-ui/src/components/avatar-chip/AvatarChipLeftComponent.tsx +++ b/packages/twenty-ui/src/components/avatar-chip/AvatarChipLeftComponent.tsx @@ -56,8 +56,8 @@ export const AvatarChipsLeftComponent: React.FC< backgroundColor={theme.background.invertedSecondary} > @@ -66,7 +66,7 @@ export const AvatarChipsLeftComponent: React.FC< return ( diff --git a/packages/twenty-ui/src/components/chip/Chip.tsx b/packages/twenty-ui/src/components/chip/Chip.tsx index 204c9e492..225548003 100644 --- a/packages/twenty-ui/src/components/chip/Chip.tsx +++ b/packages/twenty-ui/src/components/chip/Chip.tsx @@ -109,17 +109,11 @@ const StyledContainer = withTheme(styled.div< background-color: ${({ theme, variant }) => variant === ChipVariant.Highlighted || variant === ChipVariant.Static ? theme.background.transparent.light - : variant === ChipVariant.Rounded - ? theme.background.transparent.lighter - : 'inherit'}; + : 'inherit'}; - border: ${({ theme, variant }) => - variant === ChipVariant.Rounded - ? `1px solid ${theme.border.color.medium}` - : 'none'}; + border: none; - border-radius: ${({ theme, variant }) => - variant === ChipVariant.Rounded ? '50px' : theme.border.radius.sm}; + border-radius: ${({ theme }) => theme.border.radius.sm}; & > svg { flex-shrink: 0;