1
1
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown' ;
2
2
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent' ;
3
3
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer' ;
4
+ import { TabAvatar } from '@/ui/layout/tab/components/TabAvatar' ;
4
5
import { SingleTabProps } from '@/ui/layout/tab/components/TabList' ;
5
6
import { TabMoreButton } from '@/ui/layout/tab/components/TabMoreButton' ;
6
- import { useTheme } from '@emotion/react' ;
7
- import { Avatar } from 'twenty-ui/display' ;
8
7
import { MenuItemSelectAvatar } from 'twenty-ui/navigation' ;
9
8
10
9
type TabListDropdownProps = {
@@ -32,7 +31,6 @@ export const TabListDropdown = ({
32
31
loading,
33
32
} : TabListDropdownProps ) => {
34
33
const hiddenTabs = tabs . visible . slice ( overflow . firstHiddenTabIndex ) ;
35
- const theme = useTheme ( ) ;
36
34
37
35
return (
38
36
< Dropdown
@@ -51,29 +49,12 @@ export const TabListDropdown = ({
51
49
< DropdownMenuItemsContainer >
52
50
{ hiddenTabs . map ( ( tab ) => {
53
51
const isDisabled = tab . disabled ?? loading ;
54
- const avatar = tab . logo ? (
55
- < Avatar
56
- avatarUrl = { tab . logo }
57
- size = "md"
58
- placeholder = { tab . title }
59
- />
60
- ) : tab . Icon ? (
61
- < Avatar
62
- Icon = { tab . Icon }
63
- size = "md"
64
- placeholder = { tab . title }
65
- iconColor = {
66
- tab . disabled
67
- ? theme . font . color . tertiary
68
- : theme . font . color . secondary
69
- }
70
- />
71
- ) : null ;
52
+
72
53
return (
73
54
< MenuItemSelectAvatar
74
55
key = { tab . id }
75
56
text = { tab . title }
76
- avatar = { avatar }
57
+ avatar = { < TabAvatar tab = { tab } /> }
77
58
selected = { tab . id === tabs . activeId }
78
59
onClick = { isDisabled ? undefined : ( ) => onTabSelect ( tab . id ) }
79
60
disabled = { isDisabled }
0 commit comments