diff --git a/packages/twenty-front/src/modules/action-menu/components/CommandMenuActionMenuDropdown.tsx b/packages/twenty-front/src/modules/action-menu/components/CommandMenuActionMenuDropdown.tsx index 3592a1d2f..683a109b7 100644 --- a/packages/twenty-front/src/modules/action-menu/components/CommandMenuActionMenuDropdown.tsx +++ b/packages/twenty-front/src/modules/action-menu/components/CommandMenuActionMenuDropdown.tsx @@ -5,6 +5,7 @@ import { ActionMenuComponentInstanceContext } from '@/action-menu/states/context import { CommandMenuActionMenuDropdownHotkeyScope } from '@/action-menu/types/CommandMenuActionMenuDropdownHotkeyScope'; import { getRightDrawerActionMenuDropdownIdFromActionMenuId } from '@/action-menu/utils/getRightDrawerActionMenuDropdownIdFromActionMenuId'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { useDropdownV2 } from '@/ui/layout/dropdown/hooks/useDropdownV2'; import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; @@ -72,19 +73,21 @@ export const CommandMenuActionMenuDropdown = () => { setSelectedItemId(selectableItemIdArray[0]); }} dropdownComponents={ - - - {recordSelectionActions.map((action) => ( - - ))} - - + + + + {recordSelectionActions.map((action) => ( + + ))} + + + } /> ); diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx index e2aa47b19..669835403 100644 --- a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx +++ b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuDropdown.tsx @@ -9,6 +9,7 @@ import { ActionMenuDropdownHotkeyScope } from '@/action-menu/types/ActionMenuDro import { getActionMenuDropdownIdFromActionMenuId } from '@/action-menu/utils/getActionMenuDropdownIdFromActionMenuId'; import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { useDropdownV2 } from '@/ui/layout/dropdown/hooks/useDropdownV2'; import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList'; @@ -82,39 +83,41 @@ export const RecordIndexActionMenuDropdown = () => { y: actionMenuDropdownPosition.y ?? 0, }} dropdownComponents={ - - - - {recordIndexActions.map((action) => ( - - ))} - { - closeDropdown(dropdownId); - openCommandMenu(); - }} + + + + - { + {recordIndexActions.map((action) => ( + + ))} + { closeDropdown(dropdownId); openCommandMenu(); }} - focused={selectedItemId === 'more-actions'} - text="More actions" - /> - - - - + > + { + closeDropdown(dropdownId); + openCommandMenu(); + }} + focused={selectedItemId === 'more-actions'} + text="More actions" + /> + + + + + } /> ); diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMembersChip.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMembersChip.tsx deleted file mode 100644 index 192b1ed3a..000000000 --- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMembersChip.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { MessageThreadSubscribersDropdownButton } from '@/activities/emails/components/MessageThreadSubscribersDropdownButton'; -import { MessageThread } from '@/activities/emails/types/MessageThread'; - -export const EmailThreadMembersChip = ({ - messageThread, -}: { - messageThread: MessageThread; -}) => { - const subscribers = messageThread.subscribers ?? []; - - return ( - - ); -}; diff --git a/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersChip.tsx b/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersChip.tsx deleted file mode 100644 index e78e29159..000000000 --- a/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersChip.tsx +++ /dev/null @@ -1,75 +0,0 @@ -import { MessageThreadSubscriber } from '@/activities/emails/types/MessageThreadSubscriber'; -import { isNonEmptyString } from '@sniptt/guards'; -import { useContext } from 'react'; -import { Chip, ChipVariant } from 'twenty-ui/components'; -import { Avatar, AvatarGroup, IconChevronDown } from 'twenty-ui/display'; -import { ThemeContext } from 'twenty-ui/theme'; - -const MAX_NUMBER_OF_AVATARS = 3; - -export const MessageThreadSubscribersChip = ({ - messageThreadSubscribers, -}: { - messageThreadSubscribers: MessageThreadSubscriber[]; -}) => { - const { theme } = useContext(ThemeContext); - - const numberOfMessageThreadSubscribers = messageThreadSubscribers.length; - - const isOnlyOneSubscriber = numberOfMessageThreadSubscribers === 1; - - const isPrivateThread = isOnlyOneSubscriber; - - const privateLabel = 'Private'; - - const susbcriberAvatarUrls = messageThreadSubscribers - .map((member) => member.workspaceMember.avatarUrl) - .filter(isNonEmptyString); - - const firstAvatarUrl = susbcriberAvatarUrls[0]; - const firstAvatarColorSeed = messageThreadSubscribers?.[0].workspaceMember.id; - const firstAvatarPlaceholder = - messageThreadSubscribers?.[0].workspaceMember.name.firstName; - - const subscriberNames = messageThreadSubscribers.map( - (member) => member.workspaceMember?.name.firstName, - ); - - const moreAvatarsLabel = - numberOfMessageThreadSubscribers > MAX_NUMBER_OF_AVATARS - ? `+${numberOfMessageThreadSubscribers - MAX_NUMBER_OF_AVATARS}` - : null; - - const label = isPrivateThread ? privateLabel : (moreAvatarsLabel ?? ''); - - return ( - - ) : ( - ( - - ))} - /> - ) - } - rightComponent={() => } - clickable - /> - ); -}; diff --git a/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersDropdownButton.tsx b/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersDropdownButton.tsx deleted file mode 100644 index 1c35a91a4..000000000 --- a/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersDropdownButton.tsx +++ /dev/null @@ -1,107 +0,0 @@ -import { offset } from '@floating-ui/react'; - -import { MessageThreadSubscriberDropdownAddSubscriber } from '@/activities/emails/components/MessageThreadSubscriberDropdownAddSubscriber'; -import { MessageThreadSubscribersChip } from '@/activities/emails/components/MessageThreadSubscribersChip'; -import { MessageThreadSubscriber } from '@/activities/emails/types/MessageThreadSubscriber'; -import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; -import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu'; -import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; -import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; -import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; -import { useListenRightDrawerClose } from '@/ui/layout/right-drawer/hooks/useListenRightDrawerClose'; -import { useState } from 'react'; -import { IconMinus, IconPlus } from 'twenty-ui/display'; -import { MenuItem, MenuItemAvatar } from 'twenty-ui/navigation'; - -export const MESSAGE_THREAD_SUBSCRIBER_DROPDOWN_ID = - 'message-thread-subscriber'; - -export const MessageThreadSubscribersDropdownButton = ({ - messageThreadSubscribers, -}: { - messageThreadSubscribers: MessageThreadSubscriber[]; -}) => { - const [isAddingSubscriber, setIsAddingSubscriber] = useState(false); - - const { closeDropdown } = useDropdown(MESSAGE_THREAD_SUBSCRIBER_DROPDOWN_ID); - - const mockSubscribers = [ - ...messageThreadSubscribers, - ...messageThreadSubscribers, - ...messageThreadSubscribers, - ...messageThreadSubscribers, - ]; - - // TODO: implement - const handleAddSubscriberClick = () => { - setIsAddingSubscriber(true); - }; - - // TODO: implement - const handleRemoveSubscriber = (_subscriber: MessageThreadSubscriber) => { - closeDropdown(); - }; - - useListenRightDrawerClose(() => { - closeDropdown(); - }); - - return ( - - } - dropdownComponents={ - - {isAddingSubscriber ? ( - - ) : ( - - {messageThreadSubscribers?.map((subscriber) => ( - { - handleRemoveSubscriber(subscriber); - }} - text={ - subscriber.workspaceMember.name.firstName + - ' ' + - subscriber.workspaceMember.name.lastName - } - avatar={{ - placeholder: subscriber.workspaceMember.name.firstName, - avatarUrl: subscriber.workspaceMember.avatarUrl, - placeholderColorSeed: subscriber.workspaceMember.id, - size: 'md', - type: 'rounded', - }} - iconButtons={[ - { - Icon: IconMinus, - onClick: () => { - handleRemoveSubscriber(subscriber); - }, - }, - ]} - /> - ))} - - - - )} - - } - dropdownHotkeyScope={{ scope: MESSAGE_THREAD_SUBSCRIBER_DROPDOWN_ID }} - /> - ); -}; diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx index 4a3bddc56..0d29c1879 100644 --- a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx +++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx @@ -1,5 +1,7 @@ import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { IconDotsVertical, @@ -48,26 +50,27 @@ export const AttachmentDropdown = ({ clickableComponent={ } - dropdownWidth={160} dropdownComponents={ - - - - - + + + + + + + } dropdownHotkeyScope={{ scope: dropdownId }} /> diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx index 0b85a8026..c82076fa7 100644 --- a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx +++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx @@ -4,11 +4,11 @@ import { SubTitle } from '@/auth/components/SubTitle'; import { Title } from '@/auth/components/Title'; import { useHandleResendEmailVerificationToken } from '@/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken'; import { useTheme } from '@emotion/react'; -import { AnimatedEaseIn } from 'twenty-ui/utilities'; import { IconMail } from 'twenty-ui/display'; import { Loader } from 'twenty-ui/feedback'; import { MainButton } from 'twenty-ui/input'; import { RGBA } from 'twenty-ui/theme'; +import { AnimatedEaseIn } from 'twenty-ui/utilities'; const StyledMailContainer = styled.div` align-items: center; diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextChipGroups.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextChipGroups.tsx index 928f4c3bf..de32e94c4 100644 --- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextChipGroups.tsx +++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextChipGroups.tsx @@ -1,14 +1,15 @@ import { COMMAND_MENU_CONTEXT_CHIP_GROUPS_DROPDOWN_ID } from '@/command-menu/constants/CommandMenuContextChipGroupsDropdownId'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { useDropdownV2 } from '@/ui/layout/dropdown/hooks/useDropdownV2'; import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope'; import { isDefined } from 'twenty-shared/utils'; +import { MenuItem } from 'twenty-ui/navigation'; import { CommandMenuContextChip, CommandMenuContextChipProps, } from './CommandMenuContextChip'; -import { MenuItem } from 'twenty-ui/navigation'; export const CommandMenuContextChipGroups = ({ contextChips, @@ -53,19 +54,23 @@ export const CommandMenuContextChipGroups = ({ /> } dropdownComponents={ - - {firstChips.map((chip, index) => ( - { - closeDropdown(COMMAND_MENU_CONTEXT_CHIP_GROUPS_DROPDOWN_ID); - chip.onClick?.(); - }} - /> - ))} - + + + {firstChips.map((chip, index) => ( + { + closeDropdown( + COMMAND_MENU_CONTEXT_CHIP_GROUPS_DROPDOWN_ID, + ); + chip.onClick?.(); + }} + /> + ))} + + } dropdownHotkeyScope={{ scope: AppHotkeyScope.CommandMenu, diff --git a/packages/twenty-front/src/modules/favorites/components/FavoriteFolderNavigationDrawerItemDropdown.tsx b/packages/twenty-front/src/modules/favorites/components/FavoriteFolderNavigationDrawerItemDropdown.tsx index 10d479c4a..9ed862212 100644 --- a/packages/twenty-front/src/modules/favorites/components/FavoriteFolderNavigationDrawerItemDropdown.tsx +++ b/packages/twenty-front/src/modules/favorites/components/FavoriteFolderNavigationDrawerItemDropdown.tsx @@ -1,6 +1,8 @@ import { FavoriteFolderHotkeyScope } from '@/favorites/constants/FavoriteFolderRightIconDropdownHotkeyScope'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; +import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; import { IconDotsVertical, IconPencil, IconTrash } from 'twenty-ui/display'; import { LightIconButton } from 'twenty-ui/input'; import { MenuItem } from 'twenty-ui/navigation'; @@ -40,20 +42,22 @@ export const FavoriteFolderNavigationDrawerItemDropdown = ({ } dropdownPlacement="bottom-start" dropdownComponents={ - - - - + + + + + + } /> ); diff --git a/packages/twenty-front/src/modules/favorites/components/PageFavoriteFolderDropdown.tsx b/packages/twenty-front/src/modules/favorites/components/PageFavoriteFolderDropdown.tsx deleted file mode 100644 index d147ccfdf..000000000 --- a/packages/twenty-front/src/modules/favorites/components/PageFavoriteFolderDropdown.tsx +++ /dev/null @@ -1,50 +0,0 @@ -import { PageFavoriteButton } from '@/favorites/components/PageFavoriteButton'; -import { FavoriteFolderPicker } from '@/favorites/favorite-folder-picker/components/FavoriteFolderPicker'; -import { FavoriteFolderPickerEffect } from '@/favorites/favorite-folder-picker/components/FavoriteFolderPickerEffect'; -import { FavoriteFolderPickerComponentInstanceContext } from '@/favorites/favorite-folder-picker/scopes/FavoriteFolderPickerScope'; -import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; -import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; -import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope'; - -type PageFavoriteFoldersDropdownProps = { - dropdownId: string; - isFavorite: boolean; - record?: ObjectRecord; - objectNameSingular: string; -}; - -export const PageFavoriteFoldersDropdown = ({ - dropdownId, - isFavorite, - record, - objectNameSingular, -}: PageFavoriteFoldersDropdownProps) => { - const { closeDropdown } = useDropdown(dropdownId); - - return ( - - - } - dropdownComponents={ - <> - - - - } - dropdownHotkeyScope={{ scope: dropdownId }} - /> - - - ); -}; diff --git a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPicker.tsx b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPicker.tsx index d64b04cbf..b633275d9 100644 --- a/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPicker.tsx +++ b/packages/twenty-front/src/modules/favorites/favorite-folder-picker/components/FavoriteFolderPicker.tsx @@ -6,7 +6,7 @@ import { FavoriteFolderPickerInstanceContext } from '@/favorites/favorite-folder import { favoriteFolderSearchFilterComponentState } from '@/favorites/favorite-folder-picker/states/favoriteFoldersSearchFilterComponentState'; import { isFavoriteFolderCreatingState } from '@/favorites/states/isFavoriteFolderCreatingState'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; @@ -90,7 +90,7 @@ export const FavoriteFolderPicker = ({ ); return ( - + @@ -101,6 +101,6 @@ export const FavoriteFolderPicker = ({ - + ); }; diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx index b1e75599e..64a0c04f6 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx @@ -11,6 +11,7 @@ import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; import { getDefaultSubFieldNameForCompositeFilterableFieldType } from '@/object-record/record-filter/utils/getDefaultSubFieldNameForCompositeFilterableFieldType'; import { getRecordFilterOperands } from '@/object-record/record-filter/utils/getRecordFilterOperands'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer'; import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly'; @@ -151,20 +152,22 @@ export const AdvancedFilterAddFilterRuleSelect = ({ } dropdownComponents={ - - - {isFilterRuleGroupOptionVisible && ( + + - )} - + {isFilterRuleGroupOptionVisible && ( + + )} + + } dropdownHotkeyScope={{ scope: dropdownId }} dropdownOffset={{ y: 8, x: 0 }} diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx index f3b6dc5e8..e9bbd0031 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterDropdownFilterInput.tsx @@ -16,6 +16,7 @@ import { subFieldNameUsedInDropdownComponentState } from '@/object-record/object import { isExpectedSubFieldName } from '@/object-record/object-filter-dropdown/utils/isExpectedSubFieldName'; import { isFilterOnActorSourceSubField } from '@/object-record/object-filter-dropdown/utils/isFilterOnActorSourceSubField'; import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; import { FieldMetadataType } from 'twenty-shared/types'; @@ -52,28 +53,24 @@ export const AdvancedFilterDropdownFilterInput = ({ )} {filterType === 'RELATION' && ( - <> + - + )} {filterType === 'ACTOR' && (isActorSourceCompositeFilter ? ( - <> - - + ) : ( - <> - - + ))} {['SELECT', 'MULTI_SELECT'].includes(filterType) && ( - <> + - + )} {filterType === 'BOOLEAN' && } {filterType === 'CURRENCY' && @@ -82,9 +79,7 @@ export const AdvancedFilterDropdownFilterInput = ({ 'currencyCode', recordFilter.subFieldName, ) ? ( - <> - - + ) : ( <> ))} diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx index d949beb88..e8f5d2f91 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterFieldSelectMenu.tsx @@ -21,6 +21,7 @@ import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/o import { objectFilterDropdownSubMenuFieldTypeComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState'; import { isCompositeFieldType } from '@/object-record/object-filter-dropdown/utils/isCompositeFieldType'; import { useFilterableFieldMetadataItemsInRecordIndexContext } from '@/object-record/record-filter/hooks/useFilterableFieldMetadataItemsInRecordIndexContext'; +import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2'; import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2'; @@ -132,7 +133,7 @@ export const AdvancedFilterFieldSelectMenu = ({ ]; return ( - <> + - + ); }; diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown.tsx index 54112cc12..68b643ebb 100644 --- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown.tsx +++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterLogicalOperatorDropdown.tsx @@ -4,6 +4,7 @@ import { useUpsertRecordFilterGroup } from '@/object-record/record-filter-group/ import { RecordFilterGroup } from '@/object-record/record-filter-group/types/RecordFilterGroup'; import { RecordFilterGroupLogicalOperator } from '@/object-record/record-filter-group/types/RecordFilterGroupLogicalOperator'; import { Select } from '@/ui/input/components/Select'; +import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth'; type AdvancedFilterLogicalOperatorDropdownProps = { recordFilterGroup: RecordFilterGroup; @@ -27,6 +28,7 @@ export const AdvancedFilterLogicalOperatorDropdown = ({ return (