scottk/twenty
1
0
Fork 0
mirror of https://github.com/lingble/twenty.git synced 2025-11-01 21:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dropdown menu field settings (#8374)

Browse Source 
2 dropdown menu components were used. Using only one and using dropdown
props for passing width to its internal dropdown menu component.
This commit is contained in:
Lucas Bordeau
2024-11-08 17:11:37 +01:00
committed by GitHub
parent e8bf81de5b
commit 045f569d62
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
View File

@@ -9,7 +9,6 @@ import {
} from 'twenty-ui'; } from 'twenty-ui';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; 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 { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown'; import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
@@ -57,30 +56,29 @@ export const SettingsObjectFieldActiveActionDropdown = ({
accent="tertiary" accent="tertiary"
/> />
} }
dropdownMenuWidth={160}
dropdownComponents={ dropdownComponents={
<DropdownMenu width="160px"> <DropdownMenuItemsContainer>
<DropdownMenuItemsContainer> <MenuItem
text={isCustomField ? 'Edit' : 'View'}
LeftIcon={isCustomField ? IconPencil : IconEye}
onClick={handleEdit}
/>
{!!onSetAsLabelIdentifier && (
<MenuItem <MenuItem
text={isCustomField ? 'Edit' : 'View'} text="Set as record text"
LeftIcon={isCustomField ? IconPencil : IconEye} LeftIcon={IconTextSize}
onClick={handleEdit} onClick={handleSetAsLabelIdentifier}
/> />
{!!onSetAsLabelIdentifier && ( )}
<MenuItem {!!onDeactivate && (
text="Set as record text" <MenuItem
LeftIcon={IconTextSize} text="Deactivate"
onClick={handleSetAsLabelIdentifier} LeftIcon={IconArchive}
/> onClick={handleDeactivate}
)} />
{!!onDeactivate && ( )}
<MenuItem </DropdownMenuItemsContainer>
text="Deactivate"
LeftIcon={IconArchive}
onClick={handleDeactivate}
/>
)}
</DropdownMenuItemsContainer>
</DropdownMenu>
} }
dropdownHotkeyScope={{ dropdownHotkeyScope={{
scope: dropdownId, scope: dropdownId,