Skip to content

The open alternative to Salesforce, designed for AI.

[forms 2/3] Improve record form field presentation (#26031)

Thomas des Francsfd31074d20eb
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx
index 25633fe2d85..2d5311db34f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput.tsx
@@ -38,13 +38,22 @@ type FormMultiSelectFieldInputProps = {
dropdownWidth?: number;
};
+const StyledFormFieldInputRowContainer = styled(FormFieldInputRowContainer)`
+ height: auto;
+ min-height: 32px;
+`;
+
+const StyledMultiSelectDisplay = styled(MultiSelectDisplay)`
+ flex-wrap: wrap;
+`;
+
const StyledDisplayModeReadonlyContainer = styled.div`
align-items: center;
background: transparent;
border: none;
display: flex;
font-family: inherit;
- padding-inline: ${themeCssVariables.spacing[2]};
+ padding: ${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[2]};
width: 100%;
`;
@@ -55,13 +64,13 @@ const StyledDisplayModeContainer = styled.div`
cursor: pointer;
display: flex;
font-family: inherit;
- padding-inline: ${themeCssVariables.spacing[2]};
+ padding: ${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[2]};
width: 100%;
`;
const StyledSelectInputContainer = styled.div`
position: absolute;
- top: ${themeCssVariables.spacing[9]};
+ top: calc(100% + ${themeCssVariables.spacing[1]});
z-index: 1;
`;
@@ -209,7 +218,7 @@ export const FormMultiSelectFieldInput = ({
<FormFieldInputContainer data-testid={testId}>
{label ? <Field.Label>{label}</Field.Label> : null}
- <FormFieldInputRowContainer>
+ <StyledFormFieldInputRowContainer>
<FormFieldInputInnerContainer
formFieldInputInstanceId={instanceId}
hasRightElement={isDefined(VariablePicker) && !readonly}
@@ -219,7 +228,7 @@ export const FormMultiSelectFieldInput = ({
readonly ? (
<StyledDisplayModeReadonlyContainer>
{isDefined(selectedOptions) && selectedOptions.length > 0 ? (
- <MultiSelectDisplay
+ <StyledMultiSelectDisplay
values={selectedNames}
options={selectedOptions}
/>
@@ -241,7 +250,7 @@ export const FormMultiSelectFieldInput = ({
<VisibilityHidden>{t`Edit`}</VisibilityHidden>
{isDefined(selectedOptions) && selectedOptions.length > 0 ? (
- <MultiSelectDisplay
+ <StyledMultiSelectDisplay
values={selectedNames}
options={selectedOptions}
/>
@@ -292,7 +301,7 @@ export const FormMultiSelectFieldInput = ({
onVariableSelect={handleVariableTagInsert}
/>
)}
- </FormFieldInputRowContainer>
+ </StyledFormFieldInputRowContainer>
{hint ? <Field.Description>{hint}</Field.Description> : null}
</FormFieldInputContainer>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormPhoneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormPhoneFieldInput.tsx
index f0510b69458..40b8575eabd 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormPhoneFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormPhoneFieldInput.tsx
@@ -4,12 +4,11 @@ import {
} from '@/object-record/record-field/ui/form-types/components/FormCallingCodeSelectInput';
import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
import { FormNestedFieldInputContainer } from '@/object-record/record-field/ui/form-types/components/FormNestedFieldInputContainer';
-import { FormNumberFieldInput } from '@/object-record/record-field/ui/form-types/components/FormNumberFieldInput';
+import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';
import { type FieldPhonesValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { Field } from 'twenty-ui/primitives/input';
import { t } from '@lingui/core/macro';
-import { isDefined } from 'twenty-shared/utils';
type FormPhoneFieldInputProps = {
label?: string;
@@ -36,11 +35,11 @@ export const FormPhoneFieldInput = ({
});
};
- const handleNumberChange = (number: string | number | null) => {
+ const handleNumberChange = (number: string) => {
onChange({
primaryPhoneCountryCode: defaultValue?.primaryPhoneCountryCode ?? '',
primaryPhoneCallingCode: defaultValue?.primaryPhoneCallingCode ?? '',
- primaryPhoneNumber: isDefined(number) ? `${number}` : '',
+ primaryPhoneNumber: number,
});
};
@@ -56,7 +55,7 @@ export const FormPhoneFieldInput = ({
readonly={readonly}
VariablePicker={VariablePicker}
/>
- <FormNumberFieldInput
+ <FormTextFieldInput
label={t`Phone Number`}
defaultValue={defaultValue?.primaryPhoneNumber ?? ''}
onChange={handleNumberChange}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx
index 9572c419b98..9d7b2ecb3b4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSelectFieldInput.tsx
@@ -146,6 +146,7 @@ export const FormSelectFieldInput = ({
onChange={onSelect}
callToActionButton={callToActionButton}
fullWidth
+ renderAsTag
hasRightElement={isDefined(VariablePicker) && !readonly}
withSearchInput
disabled={readonly}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
index 5cfb1ef3ac1..ab0a37e07dd 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
@@ -120,9 +120,8 @@ export const SelectingVariables: Story = {
expect(callingCodeDefaultValue).toBeVisible();
- const phoneNumberDefaultValue =
- await canvas.findByPlaceholderText('Enter phone number');
- expect(phoneNumberDefaultValue).toHaveDisplayValue('');
+ const phoneNumberDefaultValue = await canvas.findByRole('textbox');
+ expect(phoneNumberDefaultValue).toHaveTextContent('');
const addVariableButtons = await canvas.findAllByText('Add variable');
const phoneNumberVariablePicker = addVariableButtons[1];
@@ -159,11 +158,31 @@ export const Disabled: Story = {
const searchInputInModal = canvas.queryByPlaceholderText('Search');
expect(searchInputInModal).not.toBeInTheDocument();
- const phoneNumberInput =
- await canvas.findByPlaceholderText('Enter phone number');
- expect(phoneNumberInput).toBeDisabled();
+ const phoneNumberInput = await canvas.findByRole('textbox');
+ expect(phoneNumberInput).toHaveAttribute('contenteditable', 'false');
const variablePickers = canvas.queryAllByText('VariablePicker');
expect(variablePickers).toHaveLength(0);
},
};
+
+export const PreservesPhoneFormatting: Story = {
+ args: {
+ label: 'Phone',
+ defaultValue: defaultPhoneValue,
+ onChange: fn(),
+ },
+ render: (args) => <FormPhoneFieldInputWithState {...args} />,
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const phoneInput = await canvas.findByRole('textbox');
+ await expect(phoneInput).toHaveTextContent('0612345678');
+ await userEvent.clear(phoneInput);
+ await userEvent.type(phoneInput, '06 12 34 56 78');
+ await expect(phoneInput).toHaveTextContent('06 12 34 56 78');
+ await expect(args.onChange).toHaveBeenLastCalledWith({
+ ...defaultPhoneValue,
+ primaryPhoneNumber: '06 12 34 56 78',
+ });
+ },
+};
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/MultiSelectDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/MultiSelectDisplay.tsx
index 9e627227d63..dbee38e9e7f 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/MultiSelectDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/MultiSelectDisplay.tsx
@@ -20,9 +20,11 @@ const StyledContainer = styled.div`
export const MultiSelectDisplay = ({
values,
options,
+ className,
}: {
values: FieldMultiSelectValue | undefined;
options: SelectOption[];
+ className?: string;
}) => {
const selectedOptions = values
? options?.filter((option) => values.includes(option.value))
@@ -31,7 +33,7 @@ export const MultiSelectDisplay = ({
if (!isDefined(selectedOptions)) return null;
return (
- <StyledContainer>
+ <StyledContainer className={className}>
{selectedOptions.map((selectedOption, index) => (
<Tag
preventShrink
diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
index 47020e70973..dcd8499e7db 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx
@@ -22,7 +22,11 @@ import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
import { type IconComponent } from 'twenty-ui/icon';
import { type SelectOption } from 'twenty-ui/primitives/input';
-import { MenuItem, MenuItemSelect } from 'twenty-ui/primitives/navigation';
+import {
+ MenuItem,
+ MenuItemSelect,
+ MenuItemSelectTag,
+} from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { normalizeSearchText } from '~/utils/normalizeSearchText';
@@ -36,6 +40,7 @@ export type CallToActionButton = {
export type SelectProps<Value extends SelectValue> = {
className?: string;
+ renderAsTag?: boolean;
disabled?: boolean;
selectSizeVariant?: SelectSizeVariant;
dropdownId: string;
@@ -103,6 +108,7 @@ export const Select = <Value extends SelectValue>({
showIconInControl = true,
isDropdownInModal = false,
variant = 'default',
+ renderAsTag = false,
}: SelectProps<Value>) => {
const selectContainerRef = useRef<HTMLDivElement>(null);
@@ -208,6 +214,7 @@ export const Select = <Value extends SelectValue>({
{isNonEmptyString(label) && <StyledLabel>{label}</StyledLabel>}
{isDisabled ? (
<SelectControl
+ renderAsTag={renderAsTag}
selectedOption={controlSelectedOption}
isDisabled={isDisabled}
selectSizeVariant={selectSizeVariant}
@@ -223,6 +230,7 @@ export const Select = <Value extends SelectValue>({
onOpen={handleDropdownOpen}
clickableComponent={
<SelectControl
+ renderAsTag={renderAsTag}
selectedOption={controlSelectedOption}
isDisabled={isDisabled}
selectSizeVariant={selectSizeVariant}
@@ -272,35 +280,47 @@ export const Select = <Value extends SelectValue>({
focusId={dropdownId}
selectableItemIdArray={selectableItemIdArray}
>
- {filteredOptions.map((option) => (
- <SelectableListItem
- key={`${option.value}-${option.label}`}
- itemId={option.label}
- onEnter={() => {
- onChange?.(option.value);
- onBlur?.();
- closeDropdown(dropdownId);
- }}
- >
- <MenuItemSelect
- LeftIcon={option.Icon}
- LeftComponent={option.LeftComponent}
- leftIconColor={option.iconThemeColor}
- text={option.label}
- contextualText={option.contextualText}
- selected={
- controlSelectedOption.value === option.value
- }
- focused={selectedItemId === option.label}
- needIconCheck={needIconCheck}
- onClick={() => {
- onChange?.(option.value);
- onBlur?.();
- closeDropdown(dropdownId);
- }}
- />
- </SelectableListItem>
- ))}
+ {filteredOptions.map((option) => {
+ const handleSelectOption = () => {
+ onChange?.(option.value);
+ onBlur?.();
+ closeDropdown(dropdownId);
+ };
+
+ return (
+ <SelectableListItem
+ key={`${option.value}-${option.label}`}
+ itemId={option.label}
+ onEnter={handleSelectOption}
+ >
+ {renderAsTag && isDefined(option.color) ? (
+ <MenuItemSelectTag
+ text={option.label}
+ color={option.color}
+ selected={
+ controlSelectedOption.value === option.value
+ }
+ focused={selectedItemId === option.label}
+ onClick={handleSelectOption}
+ />
+ ) : (
+ <MenuItemSelect
+ LeftIcon={option.Icon}
+ LeftComponent={option.LeftComponent}
+ leftIconColor={option.iconThemeColor}
+ text={option.label}
+ contextualText={option.contextualText}
+ selected={
+ controlSelectedOption.value === option.value
+ }
+ focused={selectedItemId === option.label}
+ needIconCheck={needIconCheck}
+ onClick={handleSelectOption}
+ />
+ )}
+ </SelectableListItem>
+ );
+ })}
</SelectableList>
</DropdownMenuItemsContainer>
)}
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
index 91340e1587e..18e9fa1a6de 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
@@ -3,7 +3,7 @@ import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVaria
import { styled } from '@linaria/react';
import { type ReactNode, useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { TintedIconTile } from 'twenty-ui/primitives/data-display';
+import { Tag, TintedIconTile } from 'twenty-ui/primitives/data-display';
import { IconChevronDown } from 'twenty-ui/icon';
import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/surfaces';
import { type SelectOption } from 'twenty-ui/primitives/input';
@@ -93,7 +93,18 @@ const StyledIconChevronDownWrapper = styled.div<{
display: flex;
`;
+const StyledTagContainer = styled.div`
+ min-width: 0;
+ overflow: hidden;
+`;
+
+const StyledTag = styled(Tag)`
+ box-sizing: border-box;
+ max-width: 100%;
+`;
+
export type SelectControlProps = {
+ renderAsTag?: boolean;
selectedOption: SelectOption<string | number | boolean | null>;
LeftComponent?: ReactNode;
isDisabled?: boolean;
@@ -105,6 +116,7 @@ export type SelectControlProps = {
export const SelectControl = ({
selectedOption,
+ renderAsTag = false,
LeftComponent,
isDisabled,
selectSizeVariant,
@@ -152,13 +164,21 @@ export const SelectControl = ({
{selectedOption.LeftComponent}
</StyledLeadingContent>
) : null}
- <OverflowingTextWithTooltip
- text={
- selectedOption.contextualText
- ? `${selectedOption.label} · ${selectedOption.contextualText}`
- : selectedOption.label
- }
- />
+ {renderAsTag && isDefined(selectedOption.color) ? (
+ <StyledTagContainer>
+ <StyledTag color={selectedOption.color}>
+ {selectedOption.label}
+ </StyledTag>
+ </StyledTagContainer>
+ ) : (
+ <OverflowingTextWithTooltip
+ text={
+ selectedOption.contextualText
+ ? `${selectedOption.label} · ${selectedOption.contextualText}`
+ : selectedOption.label
+ }
+ />
+ )}
<StyledIconChevronDownWrapper disabled={isDisabled}>
<IconChevronDown size={theme.icon.size.md} />
</StyledIconChevronDownWrapper>
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemSelectTag/MenuItemSelectTag.tsx b/packages/twenty-ui/src/primitives/navigation/MenuItemSelectTag/MenuItemSelectTag.tsx
index 1f3bd1a23d0..aa3c5c63536 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItemSelectTag/MenuItemSelectTag.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/MenuItemSelectTag/MenuItemSelectTag.tsx
@@ -37,6 +37,8 @@ export const MenuItemSelectTag = ({
return (
<StyledMenuItemSelect
+ role="option"
+ aria-selected={selected ?? false}
onClick={onClick}
className={className}
focused={focused}
diff --git a/packages/twenty-ui/src/primitives/navigation/MenuItemSelectTag/__stories__/MenuItemSelectTag.stories.tsx b/packages/twenty-ui/src/primitives/navigation/MenuItemSelectTag/__stories__/MenuItemSelectTag.stories.tsx
index ed586ac591d..ff795028684 100644
--- a/packages/twenty-ui/src/primitives/navigation/MenuItemSelectTag/__stories__/MenuItemSelectTag.stories.tsx
+++ b/packages/twenty-ui/src/primitives/navigation/MenuItemSelectTag/__stories__/MenuItemSelectTag.stories.tsx
@@ -1,3 +1,4 @@
+import { expect, within } from 'storybook/test';
import { type Meta, type StoryObj } from '@storybook/react-vite';
import {
@@ -35,7 +36,14 @@ export const Default: Story = {
control: false,
},
},
- decorators: [ComponentDecorator],
+ decorators: [
+ (Story) => (
+ <div role="listbox" aria-label="Options">
+ <Story />
+ </div>
+ ),
+ ComponentDecorator,
+ ],
};
export const Catalog: CatalogStory<Story, typeof MenuItemSelectTag> = {
@@ -92,5 +100,37 @@ export const Catalog: CatalogStory<Story, typeof MenuItemSelectTag> = {
} as CatalogOptions,
},
},
- decorators: [CatalogDecorator],
+ decorators: [
+ (Story) => (
+ <div role="listbox" aria-label="Options">
+ <Story />
+ </div>
+ ),
+ CatalogDecorator,
+ ],
+};
+
+export const Selected: Story = {
+ args: {
+ color: 'green',
+ selected: true,
+ text: 'Selected option',
+ },
+ decorators: [
+ (Story) => (
+ <div role="listbox" aria-label="Options">
+ <Story />
+ </div>
+ ),
+ ComponentDecorator,
+ ],
+ parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
+ play: async ({ canvasElement }) => {
+ await expect(
+ within(canvasElement).getByRole('option', {
+ name: 'Selected option',
+ selected: true,
+ }),
+ ).toBeVisible();
+ },
};