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 128b4a205..18f926d64 100644 --- a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx +++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx @@ -8,7 +8,6 @@ import { } from 'twenty-ui'; 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 { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; @@ -50,27 +49,26 @@ export const AttachmentDropdown = ({ clickableComponent={ } + dropdownMenuWidth={160} dropdownComponents={ - - - - - - - + + + + + } dropdownHotkeyScope={{ scope: dropdownId, diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx index d4edf45e6..b03bb533d 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx @@ -14,7 +14,6 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi import { useDestroyOneRecord } from '@/object-record/hooks/useDestroyOneRecord'; import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth'; 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 { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; @@ -46,46 +45,45 @@ export const SettingsAccountsRowDropdownMenu = ({ clickableComponent={ } + dropdownMenuWidth={160} dropdownComponents={ - - + + { + navigate(`/settings/accounts/emails`); + closeDropdown(); + }} + /> + { + navigate(`/settings/accounts/calendars`); + closeDropdown(); + }} + /> + {account.authFailedAt && ( { - navigate(`/settings/accounts/emails`); + triggerApisOAuth(account.provider); closeDropdown(); }} /> - { - navigate(`/settings/accounts/calendars`); - closeDropdown(); - }} - /> - {account.authFailedAt && ( - { - triggerApisOAuth(account.provider); - closeDropdown(); - }} - /> - )} - { - destroyOneRecord(account.id); - closeDropdown(); - }} - /> - - + )} + { + destroyOneRecord(account.id); + closeDropdown(); + }} + /> + } /> ); diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx index fc5384fbe..8d413fa63 100644 --- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown.tsx @@ -9,7 +9,6 @@ import { } from 'twenty-ui'; 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 { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { FieldMetadataType } from '~/generated-metadata/graphql'; @@ -55,31 +54,34 @@ export const SettingsObjectFieldInactiveActionDropdown = ({ + } + dropdownMenuWidth={160} dropdownComponents={ - - + + + + {isDeletable && ( - - {isDeletable && ( - - )} - - + )} + } dropdownHotkeyScope={{ scope: dropdownId, diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx index ab99c9a61..be75f8525 100644 --- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx @@ -7,7 +7,6 @@ import { } from 'twenty-ui'; 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 { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; @@ -42,26 +41,29 @@ export const SettingsObjectInactiveMenuDropDown = ({ + } + dropdownMenuWidth={160} dropdownComponents={ - - + + + {isCustomObject && ( - {isCustomObject && ( - - )} - - + )} + } dropdownHotkeyScope={{ scope: dropdownId, diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySSORowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySSORowDropdownMenu.tsx index 55b43525d..d7de1d3b2 100644 --- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySSORowDropdownMenu.tsx +++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySSORowDropdownMenu.tsx @@ -14,7 +14,6 @@ import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdent import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar'; import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar'; 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 { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { UnwrapRecoilValue } from 'recoil'; @@ -77,29 +76,28 @@ export const SettingsSecuritySSORowDropdownMenu = ({ clickableComponent={ } + dropdownMenuWidth={160} dropdownComponents={ - - - { - toggleSSOIdentityProviderStatus(SSOIdp.id); - closeDropdown(); - }} - /> - { - handleDeleteSSOIdentityProvider(SSOIdp.id); - closeDropdown(); - }} - /> - - + + { + toggleSSOIdentityProviderStatus(SSOIdp.id); + closeDropdown(); + }} + /> + { + handleDeleteSSOIdentityProvider(SSOIdp.id); + closeDropdown(); + }} + /> + } /> ); diff --git a/packages/twenty-front/src/modules/support/components/SupportDropdown.tsx b/packages/twenty-front/src/modules/support/components/SupportDropdown.tsx index ee7b6886e..53f127e9f 100644 --- a/packages/twenty-front/src/modules/support/components/SupportDropdown.tsx +++ b/packages/twenty-front/src/modules/support/components/SupportDropdown.tsx @@ -1,6 +1,5 @@ import { SupportButton } from '@/support/components/SupportButton'; 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 { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { IconHelpCircle, IconMessage, MenuItem } from 'twenty-ui'; @@ -26,21 +25,20 @@ export const SupportDropdown = () => { dropdownPlacement="top-start" dropdownOffset={{ x: 0, y: -28 }} clickableComponent={} + dropdownMenuWidth={160} dropdownComponents={ - - - - - - + + + + } dropdownHotkeyScope={{ scope: dropdownId, diff --git a/packages/twenty-front/src/modules/workflow/search-variables/components/SearchVariablesDropdown.tsx b/packages/twenty-front/src/modules/workflow/search-variables/components/SearchVariablesDropdown.tsx index 17042658c..ee6b48745 100644 --- a/packages/twenty-front/src/modules/workflow/search-variables/components/SearchVariablesDropdown.tsx +++ b/packages/twenty-front/src/modules/workflow/search-variables/components/SearchVariablesDropdown.tsx @@ -1,5 +1,4 @@ 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 { StyledDropdownButtonContainer } from '@/ui/layout/dropdown/components/StyledDropdownButtonContainer'; import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; @@ -71,22 +70,20 @@ const SearchVariablesDropdown = ({ } dropdownComponents={ - - - {selectedStep ? ( - - ) : ( - - )} - - + + {selectedStep ? ( + + ) : ( + + )} + } dropdownPlacement="bottom-end" dropdownOffset={{ x: 0, y: 4 }}