The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Let keyboard users focus and open relation fields in forms (#28161)
Thomas Trompettedc03d04394be
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsxindex b5b5f1517b7..40d2dc7bcde 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx@@ -17,12 +17,14 @@ import { Field } from 'twenty-ui/primitives/input';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';+import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { isStandaloneVariableString } from 'twenty-shared/workflow';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { useCallback, useId } from 'react';+import { type KeyboardEvent, useCallback, useId } from 'react';import { CustomError, isDefined, isValidUuid } from 'twenty-shared/utils';+import { Key } from 'ts-key-enum';import { doNotTranslate } from 'twenty-shared/i18n';import { IconChevronDown, IconForbid } from 'twenty-ui/icon';import { useTheme, themeCssVariables } from 'twenty-ui/theme';@@ -143,8 +145,10 @@ export const FormSingleRecordPicker = ({const componentId = useId();const dropdownId = dropdownIdFromProps ?? `form-record-picker-${componentId}`;const variablesDropdownId = `form-record-picker-${componentId}-variables`;+ const triggerId = `form-record-picker-${componentId}-trigger`;const { closeDropdown } = useCloseDropdown();+ const { openDropdown } = useOpenDropdown();const setSingleRecordPickerSearchFilter = useSetAtomComponentState(singleRecordPickerSearchFilterComponentState,@@ -153,7 +157,11 @@ export const FormSingleRecordPicker = ({const handleCloseRelationPickerDropdown = useCallback(() => {setSingleRecordPickerSearchFilter('');- }, [setSingleRecordPickerSearchFilter]);++ if (document.activeElement === document.body) {+ document.getElementById(triggerId)?.focus();+ }+ }, [setSingleRecordPickerSearchFilter, triggerId]);const handleMorphItemSelected = (selectedMorphItem: RecordPickerPickableMorphItem | null | undefined,@@ -212,6 +220,19 @@ export const FormSingleRecordPicker = ({}};+ const handleTriggerKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {+ if (+ event.target !== event.currentTarget ||+ (event.key !== Key.Enter && event.key !== ' ')+ ) {+ return;+ }++ event.preventDefault();+ event.stopPropagation();+ openDropdown({ dropdownComponentInstanceIdFromProps: dropdownId });+ };+return (<FormFieldInputContainer data-testid={testId}>{label ? <Field.Label>{label}</Field.Label> : null}@@ -245,7 +266,12 @@ export const FormSingleRecordPicker = ({y: parseInt(theme.spacing[1], 10),}}clickableComponent={- <StyledFormSelectContainerWrapper $variant={variant}>+ <StyledFormSelectContainerWrapper+ id={triggerId}+ $variant={variant}+ tabIndex={0}+ onKeyDown={handleTriggerKeyDown}+ ><FormFieldInputInnerContainerformFieldInputInstanceId={componentId}hasRightElement={isDefined(VariablePicker) && !disabled}