Skip to content

The open alternative to Salesforce, designed for AI.

Edit emails and array values as lists in the record form (#28753)

Charles Bochet6f01e2d5f177
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/ArrayFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/ArrayFieldInput.tsx
index 671256519d9..1f18369fb73 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/ArrayFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/ArrayFieldInput.tsx
@@ -12,7 +12,6 @@ import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-t
import { useMultiItemInput } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput';
import { useMultiItemSearch } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemSearch';
import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/ui/meta-types/input/utils/computeUpdatedMultiItemFieldItems';
-import { getInitialMultiItemInputTarget } from '@/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget';
import { type MultiItemFieldInputSpacing } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing';
import { arrayFieldValueSchema } from '@/object-record/record-field/ui/validation-schemas/arrayFieldValueSchema';
import { t } from '@lingui/core/macro';
@@ -72,19 +71,21 @@ export const ArrayFieldInput = () => {
const isLimitReached = arrayItems.length >= maxNumberOfValues;
const {
- inputTarget,
+ isInputOpen,
+ editedItemIndex,
inputValue,
hasError,
- openInput,
+ startAddingItem,
+ startEditingItem,
+ closeInput,
handleInputChange,
validateInputValue,
} = useMultiItemInput({
items: arrayItems,
getItemText: getArrayItemText,
- initialInputTarget: getInitialMultiItemInputTarget({
- itemCount: arrayItems.length,
- isSingleItemMode,
- }),
+ isInputInitiallyOpen: arrayItems.length === 0 || isSingleItemMode,
+ initialEditedItemIndex:
+ isSingleItemMode && arrayItems.length > 0 ? 0 : null,
});
const {
@@ -94,14 +95,9 @@ export const ArrayFieldInput = () => {
filteredItemEntries,
} = useMultiItemSearch({ items: arrayItems, getItemText: getArrayItemText });
- const isInputDisplayed = inputTarget.type !== 'closed';
- const editedItemIndex =
- inputTarget.type === 'existing-item' ? inputTarget.itemIndex : null;
const isEditingItemInPlace = isDefined(editedItemIndex) && !isSingleItemMode;
- const closeInput = () => openInput({ type: 'closed' });
-
- const commitInput = () => {
+ const saveInputValue = () => {
const sanitizedInput = validateInputValue();
if (!isDefined(sanitizedInput)) {
@@ -121,7 +117,7 @@ export const ArrayFieldInput = () => {
};
const handleInputEnter = () => {
- const updatedItems = commitInput();
+ const updatedItems = saveInputValue();
if (!isDefined(updatedItems)) {
return;
@@ -138,7 +134,7 @@ export const ArrayFieldInput = () => {
const handleAddClick = () => {
if (isEditingItemInPlace) {
- const updatedItems = commitInput();
+ const updatedItems = saveInputValue();
if (!isDefined(updatedItems)) {
return;
@@ -148,7 +144,7 @@ export const ArrayFieldInput = () => {
}
setSearchFilter('');
- openInput({ type: 'new-item' });
+ startAddingItem();
};
const handleEscape = () => {
@@ -159,7 +155,7 @@ export const ArrayFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedItems = isInputDisplayed ? commitInput() : arrayItems;
+ const updatedItems = isInputOpen ? saveInputValue() : arrayItems;
if (!isDefined(updatedItems)) {
return;
@@ -177,16 +173,17 @@ export const ArrayFieldInput = () => {
handleChange(updatedItems);
handleSubmit(updatedItems);
- openInput(
- isNonEmptyArray(updatedItems) ? { type: 'closed' } : { type: 'new-item' },
- );
+ if (isNonEmptyArray(updatedItems)) {
+ closeInput();
+ } else {
+ startAddingItem();
+ }
};
const shouldShowItems =
- isNonEmptyArray(filteredItemEntries) &&
- (!isSingleItemMode || !isInputDisplayed);
+ isNonEmptyArray(filteredItemEntries) && (!isSingleItemMode || !isInputOpen);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
+ const shouldShowInputInFooter = isInputOpen && !isEditingItemInPlace;
const inputSpacing: MultiItemFieldInputSpacing =
isNonEmptyArray(arrayItems) && !isSingleItemMode ? 'compact' : 'default';
@@ -197,7 +194,7 @@ export const ArrayFieldInput = () => {
rightComponent={
isNonEmptyArray(arrayItems) ? (
<MultiItemFieldSaveButton
- isAddingNewItem={inputTarget.type === 'new-item'}
+ isAddingNewItem={!isDefined(editedItemIndex)}
onClick={handleInputEnter}
/>
) : undefined
@@ -221,7 +218,7 @@ export const ArrayFieldInput = () => {
<MultiItemFieldList
ref={containerRef}
hasItems={shouldShowItems}
- shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ shouldShowSearch={shouldShowSearch && !isInputOpen}
searchFilter={searchFilter}
onSearchFilterChange={setSearchFilter}
footerInput={shouldShowInputInFooter ? itemInput : undefined}
@@ -248,9 +245,7 @@ export const ArrayFieldInput = () => {
key={index}
dropdownId={`${MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX}-${fieldDefinition.metadata.fieldName}-${index}`}
value={item}
- onEdit={() =>
- openInput({ type: 'existing-item', itemIndex: index })
- }
+ onEdit={() => startEditingItem({ itemIndex: index })}
onDelete={() => handleDelete(index)}
/>
),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput.tsx
index 7a44b5f68e0..baf7a83bcbe 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput.tsx
@@ -12,7 +12,6 @@ import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-t
import { useMultiItemInput } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput';
import { useMultiItemSearch } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemSearch';
import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/ui/meta-types/input/utils/computeUpdatedMultiItemFieldItems';
-import { getInitialMultiItemInputTarget } from '@/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget';
import { type MultiItemFieldInputSpacing } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing';
import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/ui/states/recordFieldInputIsFieldInErrorComponentState';
import { type FieldEmailsValue } from '@/object-record/record-field/ui/types/FieldMetadata';
@@ -99,19 +98,20 @@ export const EmailsFieldInput = () => {
const isLimitReached = emails.length >= maxNumberOfValues;
const {
- inputTarget,
+ isInputOpen,
+ editedItemIndex,
inputValue,
hasError,
- openInput,
+ startAddingItem,
+ startEditingItem,
+ closeInput,
handleInputChange,
validateInputValue,
} = useMultiItemInput({
items: emails,
getItemText: getEmailText,
- initialInputTarget: getInitialMultiItemInputTarget({
- itemCount: emails.length,
- isSingleItemMode,
- }),
+ isInputInitiallyOpen: emails.length === 0 || isSingleItemMode,
+ initialEditedItemIndex: isSingleItemMode && emails.length > 0 ? 0 : null,
validateInput: validateEmail,
onHasErrorChange: (hasError) =>
setRecordFieldInputIsFieldInError(hasError && emails.length === 0),
@@ -124,14 +124,9 @@ export const EmailsFieldInput = () => {
filteredItemEntries,
} = useMultiItemSearch({ items: emails, getItemText: getEmailText });
- const isInputDisplayed = inputTarget.type !== 'closed';
- const editedItemIndex =
- inputTarget.type === 'existing-item' ? inputTarget.itemIndex : null;
const isEditingItemInPlace = isDefined(editedItemIndex) && !isSingleItemMode;
- const closeInput = () => openInput({ type: 'closed' });
-
- const commitInput = () => {
+ const saveInputValue = () => {
const sanitizedInput = validateInputValue();
if (!isDefined(sanitizedInput)) {
@@ -151,7 +146,7 @@ export const EmailsFieldInput = () => {
};
const handleInputEnter = () => {
- const updatedEmails = commitInput();
+ const updatedEmails = saveInputValue();
if (!isDefined(updatedEmails)) {
return;
@@ -168,7 +163,7 @@ export const EmailsFieldInput = () => {
const handleAddClick = () => {
if (isEditingItemInPlace) {
- const updatedEmails = commitInput();
+ const updatedEmails = saveInputValue();
if (!isDefined(updatedEmails)) {
return;
@@ -178,7 +173,7 @@ export const EmailsFieldInput = () => {
}
setSearchFilter('');
- openInput({ type: 'new-item' });
+ startAddingItem();
};
const handleEscape = () => {
@@ -189,7 +184,7 @@ export const EmailsFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedEmails = isInputDisplayed ? commitInput() : emails;
+ const updatedEmails = isInputOpen ? saveInputValue() : emails;
if (!isDefined(updatedEmails)) {
return;
@@ -221,11 +216,11 @@ export const EmailsFieldInput = () => {
handleChange(updatedEmails);
handleSubmit(updatedEmails);
- openInput(
- isNonEmptyArray(updatedEmails)
- ? { type: 'closed' }
- : { type: 'new-item' },
- );
+ if (isNonEmptyArray(updatedEmails)) {
+ closeInput();
+ } else {
+ startAddingItem();
+ }
};
const handleCopy = (email: string) => {
@@ -233,10 +228,9 @@ export const EmailsFieldInput = () => {
};
const shouldShowItems =
- isNonEmptyArray(filteredItemEntries) &&
- (!isSingleItemMode || !isInputDisplayed);
+ isNonEmptyArray(filteredItemEntries) && (!isSingleItemMode || !isInputOpen);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
+ const shouldShowInputInFooter = isInputOpen && !isEditingItemInPlace;
const inputSpacing: MultiItemFieldInputSpacing =
isNonEmptyArray(emails) && !isSingleItemMode ? 'compact' : 'default';
@@ -247,7 +241,7 @@ export const EmailsFieldInput = () => {
rightComponent={
isNonEmptyArray(emails) ? (
<MultiItemFieldSaveButton
- isAddingNewItem={inputTarget.type === 'new-item'}
+ isAddingNewItem={!isDefined(editedItemIndex)}
onClick={handleInputEnter}
/>
) : undefined
@@ -271,7 +265,7 @@ export const EmailsFieldInput = () => {
<MultiItemFieldList
ref={containerRef}
hasItems={shouldShowItems}
- shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ shouldShowSearch={shouldShowSearch && !isInputOpen}
searchFilter={searchFilter}
onSearchFilterChange={setSearchFilter}
footerInput={shouldShowInputInFooter ? itemInput : undefined}
@@ -301,9 +295,7 @@ export const EmailsFieldInput = () => {
showSetAsPrimaryButton={index > 0}
showCopyButton={true}
email={email}
- onEdit={() =>
- openInput({ type: 'existing-item', itemIndex: index })
- }
+ onEdit={() => startEditingItem({ itemIndex: index })}
onSetAsPrimary={() => handleSetAsPrimary(index)}
onDelete={() => handleDelete(index)}
onCopy={handleCopy}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx
index 858ef10ba33..9c4e85c7f40 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldInput.tsx
@@ -15,7 +15,6 @@ import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-t
import { useMultiItemInput } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput';
import { useMultiItemSearch } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemSearch';
import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/ui/meta-types/input/utils/computeUpdatedMultiItemFieldItems';
-import { getInitialMultiItemInputTarget } from '@/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget';
import { uploadMultipleFiles } from '@/object-record/record-field/ui/meta-types/utils/uploadMultipleFiles';
import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/ui/states/recordFieldInputIsFieldInErrorComponentState';
import { type FieldFilesValue } from '@/object-record/record-field/ui/types/FieldMetadata';
@@ -101,7 +100,7 @@ export const FilesFieldInput = () => {
return;
}
- const currentFiles = commitEditedItemInPlace();
+ const currentFiles = saveEditedItemInPlace();
if (!isDefined(currentFiles)) {
return;
@@ -169,20 +168,18 @@ export const FilesFieldInput = () => {
const isLimitReached = files.length >= maxNumberOfValues;
const {
- inputTarget,
+ isInputOpen,
+ editedItemIndex,
inputValue,
hasError,
- openInput,
+ startEditingItem,
+ closeInput,
handleInputChange,
validateInputValue,
} = useMultiItemInput({
items: files,
getItemText: getFileText,
- initialInputTarget: getInitialMultiItemInputTarget({
- itemCount: files.length,
- isSingleItemMode,
- shouldOpenWhenEmpty: false,
- }),
+ isInputInitiallyOpen: false,
validateInput: validateFileLabel,
onHasErrorChange: (hasError) =>
setRecordFieldInputIsFieldInError(hasError && files.length === 0),
@@ -195,14 +192,9 @@ export const FilesFieldInput = () => {
filteredItemEntries,
} = useMultiItemSearch({ items: files, getItemText: getFileText });
- const isInputDisplayed = inputTarget.type !== 'closed';
- const editedItemIndex =
- inputTarget.type === 'existing-item' ? inputTarget.itemIndex : null;
const isEditingItemInPlace = isDefined(editedItemIndex) && !isSingleItemMode;
- const closeInput = () => openInput({ type: 'closed' });
-
- const commitInput = () => {
+ const saveInputValue = () => {
const sanitizedInput = validateInputValue();
if (!isDefined(sanitizedInput)) {
@@ -222,12 +214,12 @@ export const FilesFieldInput = () => {
return updatedFiles;
};
- const commitEditedItemInPlace = () => {
+ const saveEditedItemInPlace = () => {
if (!isEditingItemInPlace) {
return files;
}
- const updatedFiles = commitInput();
+ const updatedFiles = saveInputValue();
if (isDefined(updatedFiles)) {
handleSubmit(updatedFiles);
@@ -237,7 +229,7 @@ export const FilesFieldInput = () => {
};
const handleInputEnter = () => {
- const updatedFiles = commitInput();
+ const updatedFiles = saveInputValue();
if (!isDefined(updatedFiles)) {
return;
@@ -260,7 +252,7 @@ export const FilesFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedFiles = isInputDisplayed ? commitInput() : files;
+ const updatedFiles = isInputOpen ? saveInputValue() : files;
if (!isDefined(updatedFiles)) {
return;
@@ -291,10 +283,9 @@ export const FilesFieldInput = () => {
}
const shouldShowItems =
- isNonEmptyArray(filteredItemEntries) &&
- (!isSingleItemMode || !isInputDisplayed);
+ isNonEmptyArray(filteredItemEntries) && (!isSingleItemMode || !isInputOpen);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
+ const shouldShowInputInFooter = isInputOpen && !isEditingItemInPlace;
const editedFile = isDefined(editedItemIndex)
? files[editedItemIndex]
: undefined;
@@ -325,7 +316,7 @@ export const FilesFieldInput = () => {
<MultiItemFieldList
ref={containerRef}
hasItems={shouldShowItems}
- shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ shouldShowSearch={shouldShowSearch && !isInputOpen}
searchFilter={searchFilter}
onSearchFilterChange={setSearchFilter}
footerInput={shouldShowInputInFooter ? fileLabelInput : undefined}
@@ -352,9 +343,7 @@ export const FilesFieldInput = () => {
key={file.fileId}
dropdownId={`${MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX}-${fieldDefinition.metadata.fieldName}-${index}`}
file={file}
- onEdit={() =>
- openInput({ type: 'existing-item', itemIndex: index })
- }
+ onEdit={() => startEditingItem({ itemIndex: index })}
onDelete={() => handleDelete(index)}
onClick={() => handlePreview(file)}
/>
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldInput.tsx
index 36640d59ea0..648f79ba951 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldInput.tsx
@@ -18,7 +18,6 @@ import { useMultiItemSearch } from '@/object-record/record-field/ui/meta-types/i
import { type LinkRecord } from '@/object-record/record-field/ui/meta-types/input/types/LinkRecord';
import { getFieldLinkDefinedLinks } from '@/object-record/record-field/ui/meta-types/input/utils/getFieldLinkDefinedLinks';
import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/ui/meta-types/input/utils/computeUpdatedMultiItemFieldItems';
-import { getInitialMultiItemInputTarget } from '@/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget';
import { getLinkLabelFromDraft } from '@/object-record/record-field/ui/meta-types/input/utils/getLinkLabelFromDraft';
import { type MultiItemFieldInputSpacing } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing';
import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/ui/states/recordFieldInputIsFieldInErrorComponentState';
@@ -119,19 +118,20 @@ export const LinksFieldInput = () => {
const isLimitReached = links.length >= maxNumberOfValues;
const {
- inputTarget,
+ isInputOpen,
+ editedItemIndex,
inputValue,
hasError,
- openInput,
+ startAddingItem,
+ startEditingItem,
+ closeInput,
handleInputChange,
validateInputValue,
} = useMultiItemInput({
items: links,
getItemText: getLinkText,
- initialInputTarget: getInitialMultiItemInputTarget({
- itemCount: links.length,
- isSingleItemMode,
- }),
+ isInputInitiallyOpen: links.length === 0 || isSingleItemMode,
+ initialEditedItemIndex: isSingleItemMode && links.length > 0 ? 0 : null,
validateInput: validateLink,
onHasErrorChange: (hasError) =>
setRecordFieldInputIsFieldInError(hasError && links.length === 0),
@@ -144,15 +144,10 @@ export const LinksFieldInput = () => {
filteredItemEntries,
} = useMultiItemSearch({ items: links, getItemText: getLinkText });
- const isInputDisplayed = inputTarget.type !== 'closed';
- const editedItemIndex =
- inputTarget.type === 'existing-item' ? inputTarget.itemIndex : null;
const isEditingItemInPlace = isDefined(editedItemIndex) && !isSingleItemMode;
const shouldEditLabel = isEditingItemInPlace && !isDomainField;
- const closeInput = () => openInput({ type: 'closed' });
-
- const commitInput = () => {
+ const saveInputValue = () => {
const sanitizedInput = validateInputValue();
if (!isDefined(sanitizedInput)) {
@@ -178,7 +173,7 @@ export const LinksFieldInput = () => {
};
const handleInputEnter = () => {
- const updatedLinks = commitInput();
+ const updatedLinks = saveInputValue();
if (!isDefined(updatedLinks)) {
return;
@@ -195,7 +190,7 @@ export const LinksFieldInput = () => {
const handleAddClick = () => {
if (isEditingItemInPlace) {
- const updatedLinks = commitInput();
+ const updatedLinks = saveInputValue();
if (!isDefined(updatedLinks)) {
return;
@@ -205,7 +200,7 @@ export const LinksFieldInput = () => {
}
setSearchFilter('');
- openInput({ type: 'new-item' });
+ startAddingItem();
};
const handleEscape = () => {
@@ -216,7 +211,7 @@ export const LinksFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedLinks = isInputDisplayed ? commitInput() : links;
+ const updatedLinks = isInputOpen ? saveInputValue() : links;
if (!isDefined(updatedLinks)) {
return;
@@ -231,7 +226,7 @@ export const LinksFieldInput = () => {
const handleEdit = (index: number) => {
setLabelDraft(links[index]?.label ?? '');
- openInput({ type: 'existing-item', itemIndex: index });
+ startEditingItem({ itemIndex: index });
};
const handleSetAsPrimary = (index: number) => {
@@ -250,24 +245,25 @@ export const LinksFieldInput = () => {
handleChange(updatedLinks);
handleSubmit(updatedLinks);
- openInput(
- isNonEmptyArray(updatedLinks) ? { type: 'closed' } : { type: 'new-item' },
- );
+ if (isNonEmptyArray(updatedLinks)) {
+ closeInput();
+ } else {
+ startAddingItem();
+ }
};
const placeholder = isDomainField ? t`Domain` : t`URL`;
const shouldShowItems =
- isNonEmptyArray(filteredItemEntries) &&
- (!isSingleItemMode || !isInputDisplayed);
+ isNonEmptyArray(filteredItemEntries) && (!isSingleItemMode || !isInputOpen);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
+ const shouldShowInputInFooter = isInputOpen && !isEditingItemInPlace;
const inputSpacing: MultiItemFieldInputSpacing =
isNonEmptyArray(links) && !isSingleItemMode ? 'compact' : 'default';
const saveButton = isNonEmptyArray(links) ? (
<MultiItemFieldSaveButton
- isAddingNewItem={inputTarget.type === 'new-item'}
+ isAddingNewItem={!isDefined(editedItemIndex)}
onClick={handleInputEnter}
/>
) : undefined;
@@ -317,7 +313,7 @@ export const LinksFieldInput = () => {
<MultiItemFieldList
ref={containerRef}
hasItems={shouldShowItems}
- shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ shouldShowSearch={shouldShowSearch && !isInputOpen}
searchFilter={searchFilter}
onSearchFilterChange={setSearchFilter}
footerInput={shouldShowInputInFooter ? itemInput : undefined}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx
index ef0cee336e9..d1407386d22 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx
@@ -11,7 +11,6 @@ import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-t
import { useMultiItemInput } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput';
import { useMultiItemSearch } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemSearch';
import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/ui/meta-types/input/utils/computeUpdatedMultiItemFieldItems';
-import { getInitialMultiItemInputTarget } from '@/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget';
import { getMultiItemInputKeyDownHandler } from '@/object-record/record-field/ui/meta-types/input/utils/getMultiItemInputKeyDownHandler';
import { createPhonesFromFieldValue } from '@/object-record/record-field/ui/meta-types/input/utils/phonesUtils';
import { type MultiItemFieldInputSpacing } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing';
@@ -193,19 +192,20 @@ export const PhonesFieldInput = () => {
const isLimitReached = phones.length >= maxNumberOfValues;
const {
- inputTarget,
+ isInputOpen,
+ editedItemIndex,
inputValue,
hasError,
- openInput,
+ startAddingItem,
+ startEditingItem,
+ closeInput,
handleInputChange,
validateInputValue,
} = useMultiItemInput({
items: phones,
getItemText: getPhoneText,
- initialInputTarget: getInitialMultiItemInputTarget({
- itemCount: phones.length,
- isSingleItemMode,
- }),
+ isInputInitiallyOpen: phones.length === 0 || isSingleItemMode,
+ initialEditedItemIndex: isSingleItemMode && phones.length > 0 ? 0 : null,
validateInput: validatePhone,
onHasErrorChange: (hasError) =>
setRecordFieldInputIsFieldInError(hasError && phones.length === 0),
@@ -218,14 +218,9 @@ export const PhonesFieldInput = () => {
filteredItemEntries,
} = useMultiItemSearch({ items: phones, getItemText: getPhoneText });
- const isInputDisplayed = inputTarget.type !== 'closed';
- const editedItemIndex =
- inputTarget.type === 'existing-item' ? inputTarget.itemIndex : null;
const isEditingItemInPlace = isDefined(editedItemIndex) && !isSingleItemMode;
- const closeInput = () => openInput({ type: 'closed' });
-
- const commitInput = () => {
+ const saveInputValue = () => {
const sanitizedInput = validateInputValue();
if (!isDefined(sanitizedInput)) {
@@ -246,7 +241,7 @@ export const PhonesFieldInput = () => {
};
const handleInputEnter = () => {
- const updatedPhones = commitInput();
+ const updatedPhones = saveInputValue();
if (!isDefined(updatedPhones)) {
return;
@@ -263,7 +258,7 @@ export const PhonesFieldInput = () => {
const handleAddClick = () => {
if (isEditingItemInPlace) {
- const updatedPhones = commitInput();
+ const updatedPhones = saveInputValue();
if (!isDefined(updatedPhones)) {
return;
@@ -273,7 +268,7 @@ export const PhonesFieldInput = () => {
}
setSearchFilter('');
- openInput({ type: 'new-item' });
+ startAddingItem();
};
const handleEscape = () => {
@@ -284,7 +279,7 @@ export const PhonesFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedPhones = isInputDisplayed ? commitInput() : phones;
+ const updatedPhones = isInputOpen ? saveInputValue() : phones;
if (!isDefined(updatedPhones)) {
return;
@@ -316,18 +311,17 @@ export const PhonesFieldInput = () => {
handleChange(updatedPhones);
handleSubmit(updatedPhones);
- openInput(
- isNonEmptyArray(updatedPhones)
- ? { type: 'closed' }
- : { type: 'new-item' },
- );
+ if (isNonEmptyArray(updatedPhones)) {
+ closeInput();
+ } else {
+ startAddingItem();
+ }
};
const shouldShowItems =
- isNonEmptyArray(filteredItemEntries) &&
- (!isSingleItemMode || !isInputDisplayed);
+ isNonEmptyArray(filteredItemEntries) && (!isSingleItemMode || !isInputOpen);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
+ const shouldShowInputInFooter = isInputOpen && !isEditingItemInPlace;
const inputSpacing: MultiItemFieldInputSpacing =
isNonEmptyArray(phones) && !isSingleItemMode ? 'compact' : 'default';
@@ -338,7 +332,7 @@ export const PhonesFieldInput = () => {
rightComponent={
isNonEmptyArray(phones) ? (
<MultiItemFieldSaveButton
- isAddingNewItem={inputTarget.type === 'new-item'}
+ isAddingNewItem={!isDefined(editedItemIndex)}
onClick={handleInputEnter}
/>
) : undefined
@@ -374,7 +368,7 @@ export const PhonesFieldInput = () => {
<MultiItemFieldList
ref={containerRef}
hasItems={shouldShowItems}
- shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ shouldShowSearch={shouldShowSearch && !isInputOpen}
searchFilter={searchFilter}
onSearchFilterChange={setSearchFilter}
footerInput={shouldShowInputInFooter ? itemInput : undefined}
@@ -403,9 +397,7 @@ export const PhonesFieldInput = () => {
showPrimaryIcon={index === 0 && phones.length > 1}
showSetAsPrimaryButton={index > 0}
phone={phone}
- onEdit={() =>
- openInput({ type: 'existing-item', itemIndex: index })
- }
+ onEdit={() => startEditingItem({ itemIndex: index })}
onSetAsPrimary={() => handleSetAsPrimary(index)}
onDelete={() => handleDelete(index)}
/>
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput.ts
index 53fbe13f121..90d0d3b3d35 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput.ts
@@ -1,4 +1,3 @@
-import { type MultiItemInputTarget } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemInputTarget';
import { sanitizeAndValidateInput } from '@/object-record/record-field/ui/meta-types/input/utils/sanitizeAndValidateInput';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
@@ -7,24 +6,26 @@ import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmp
export const useMultiItemInput = <TItem>({
items,
getItemText,
- initialInputTarget,
+ isInputInitiallyOpen,
+ initialEditedItemIndex = null,
validateInput,
onHasErrorChange,
}: {
items: TItem[];
getItemText: (item: TItem) => string;
- initialInputTarget: MultiItemInputTarget;
+ isInputInitiallyOpen: boolean;
+ initialEditedItemIndex?: number | null;
validateInput?: (input: string) => { isValid: boolean; errorMessage: string };
onHasErrorChange?: (hasError: boolean) => void;
}) => {
- const getInputTextForTarget = (inputTarget: MultiItemInputTarget) =>
- inputTarget.type === 'existing-item'
- ? getItemText(items[inputTarget.itemIndex])
- : '';
-
- const [inputTarget, setInputTarget] = useState(initialInputTarget);
+ const [isInputOpen, setIsInputOpen] = useState(isInputInitiallyOpen);
+ const [editedItemIndex, setEditedItemIndex] = useState<number | null>(
+ isInputInitiallyOpen ? initialEditedItemIndex : null,
+ );
const [inputValue, setInputValue] = useState(() =>
- getInputTextForTarget(initialInputTarget),
+ isInputInitiallyOpen && isDefined(initialEditedItemIndex)
+ ? getItemText(items[initialEditedItemIndex])
+ : '',
);
const [hasError, setHasError] = useState(false);
@@ -33,15 +34,39 @@ export const useMultiItemInput = <TItem>({
onHasErrorChange?.(nextHasError);
};
- const openInput = (nextInputTarget: MultiItemInputTarget) => {
- setInputTarget(nextInputTarget);
- setInputValue(getInputTextForTarget(nextInputTarget));
-
+ const clearError = () => {
if (hasError) {
updateHasError(false);
}
};
+ const startAddingItem = () => {
+ setIsInputOpen(true);
+ setEditedItemIndex(null);
+ setInputValue('');
+ clearError();
+ };
+
+ const startEditingItem = ({
+ itemIndex,
+ currentItems = items,
+ }: {
+ itemIndex: number;
+ currentItems?: TItem[];
+ }) => {
+ setIsInputOpen(true);
+ setEditedItemIndex(itemIndex);
+ setInputValue(getItemText(currentItems[itemIndex]));
+ clearError();
+ };
+
+ const closeInput = () => {
+ setIsInputOpen(false);
+ setEditedItemIndex(null);
+ setInputValue('');
+ clearError();
+ };
+
const handleInputChange = (value: string) => {
setInputValue(turnIntoEmptyStringIfWhitespacesOnly(value));
@@ -66,10 +91,13 @@ export const useMultiItemInput = <TItem>({
};
return {
- inputTarget,
+ isInputOpen,
+ editedItemIndex,
inputValue,
hasError,
- openInput,
+ startAddingItem,
+ startEditingItem,
+ closeInput,
handleInputChange,
validateInputValue,
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/types/MultiItemInputTarget.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/types/MultiItemInputTarget.ts
deleted file mode 100644
index e0382320d4e..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/types/MultiItemInputTarget.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type MultiItemInputTarget =
- | { type: 'closed' }
- | { type: 'new-item' }
- | { type: 'existing-item'; itemIndex: number };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/getInitialMultiItemInputTarget.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/getInitialMultiItemInputTarget.test.ts
deleted file mode 100644
index 66f2a276cc8..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/getInitialMultiItemInputTarget.test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { getInitialMultiItemInputTarget } from '@/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget';
-
-describe('getInitialMultiItemInputTarget', () => {
- it('opens a new item input when there are no items', () => {
- expect(
- getInitialMultiItemInputTarget({ itemCount: 0, isSingleItemMode: false }),
- ).toEqual({ type: 'new-item' });
- });
-
- it('edits the only item in single item mode', () => {
- expect(
- getInitialMultiItemInputTarget({ itemCount: 1, isSingleItemMode: true }),
- ).toEqual({ type: 'existing-item', itemIndex: 0 });
- });
-
- it('stays closed when there are items to list', () => {
- expect(
- getInitialMultiItemInputTarget({ itemCount: 2, isSingleItemMode: false }),
- ).toEqual({ type: 'closed' });
- });
-
- it('stays closed when the field does not open empty', () => {
- expect(
- getInitialMultiItemInputTarget({
- itemCount: 0,
- isSingleItemMode: true,
- shouldOpenWhenEmpty: false,
- }),
- ).toEqual({ type: 'closed' });
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget.ts
deleted file mode 100644
index c22278a69d3..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { type MultiItemInputTarget } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemInputTarget';
-
-export const getInitialMultiItemInputTarget = ({
- itemCount,
- isSingleItemMode,
- shouldOpenWhenEmpty = true,
-}: {
- itemCount: number;
- isSingleItemMode: boolean;
- shouldOpenWhenEmpty?: boolean;
-}): MultiItemInputTarget => {
- if (!shouldOpenWhenEmpty) {
- return { type: 'closed' };
- }
-
- if (itemCount === 0) {
- return { type: 'new-item' };
- }
-
- return isSingleItemMode
- ? { type: 'existing-item', itemIndex: 0 }
- : { type: 'closed' };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormArrayFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormArrayFieldInput.tsx
new file mode 100644
index 00000000000..ff6716e7077
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormArrayFieldInput.tsx
@@ -0,0 +1,243 @@
+import { ArrayFieldMenuItem } from '@/object-record/record-field/ui/meta-types/input/components/ArrayFieldMenuItem';
+import { MultiItemFieldEditedItem } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldEditedItem';
+import { RecordFormMultiItemList } from '@/object-record/record-form/components/RecordFormMultiItemList';
+import { MultiItemFieldInputRow } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow';
+import { MultiItemFieldSaveButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSaveButton';
+import { MultiItemFieldTextInput } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput';
+import { useMultiItemInput } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput';
+import { type MultiItemFieldInputSpacing } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing';
+import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/ui/meta-types/input/utils/computeUpdatedMultiItemFieldItems';
+import { getRecordFormItemIndexAfterSave } from '@/object-record/record-form/utils/getRecordFormItemIndexAfterSave';
+import { type FieldArrayValue } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { useLingui } from '@lingui/react/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+import { useId, useRef, useState } from 'react';
+import { MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES } from 'twenty-shared/constants';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+import { Field } from 'twenty-ui/primitives/input';
+import { toSpliced } from '~/utils/array/toSpliced';
+
+const getArrayItemText = (item: string) => item;
+
+type RecordFormArrayFieldInputProps = {
+ label?: string;
+ defaultValue?: FieldArrayValue | null;
+ maxNumberOfValues?: number | null;
+ onChange: (value: FieldArrayValue) => void;
+};
+
+export const RecordFormArrayFieldInput = ({
+ label,
+ defaultValue,
+ maxNumberOfValues,
+ onChange,
+}: RecordFormArrayFieldInputProps) => {
+ const { t } = useLingui();
+ const instanceId = useId();
+
+ const maxItemCount = maxNumberOfValues ?? MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES;
+ const isSingleItemMode = maxItemCount === 1;
+
+ const [savedItems, setSavedItems] = useState<string[]>(
+ () => defaultValue ?? [],
+ );
+ const [shouldFocusInput, setShouldFocusInput] = useState(false);
+ const inputRef = useRef<HTMLInputElement>(null);
+
+ const {
+ isInputOpen,
+ editedItemIndex,
+ inputValue,
+ startAddingItem,
+ startEditingItem,
+ closeInput,
+ handleInputChange,
+ validateInputValue,
+ } = useMultiItemInput({
+ items: savedItems,
+ getItemText: getArrayItemText,
+ isInputInitiallyOpen: isSingleItemMode || savedItems.length < maxItemCount,
+ initialEditedItemIndex:
+ isSingleItemMode && savedItems.length > 0 ? 0 : null,
+ });
+
+ const openNextInput = (items: string[]) => {
+ if (isSingleItemMode && isNonEmptyArray(items)) {
+ startEditingItem({ itemIndex: 0, currentItems: items });
+ return;
+ }
+
+ if (items.length < maxItemCount) {
+ startAddingItem();
+ return;
+ }
+
+ closeInput();
+ };
+
+ const isEditingItemInPlace = isDefined(editedItemIndex) && !isSingleItemMode;
+
+ const getItemsWithInput = (sanitizedInput: string) =>
+ computeUpdatedMultiItemFieldItems({
+ sanitizedInput,
+ items: savedItems,
+ editingIndex: isSingleItemMode ? 0 : editedItemIndex,
+ singleItemMode: isSingleItemMode,
+ });
+
+ const saveItems = (items: string[]) => {
+ setSavedItems(items);
+ onChange(items);
+ };
+
+ const handleTyping = (value: string) => {
+ handleInputChange(value);
+ onChange(getItemsWithInput(value.trim()));
+ };
+
+ const saveInputValue = () => {
+ const sanitizedInput = validateInputValue();
+
+ if (!isDefined(sanitizedInput)) {
+ return null;
+ }
+
+ const updatedItems = getItemsWithInput(sanitizedInput);
+
+ saveItems(updatedItems);
+
+ return updatedItems;
+ };
+
+ const handleEnter = () => {
+ const updatedItems = saveInputValue();
+
+ if (!isDefined(updatedItems) || isSingleItemMode) {
+ return;
+ }
+
+ setShouldFocusInput(true);
+ openNextInput(updatedItems);
+ inputRef.current?.focus();
+ };
+
+ const handleEscape = () => {
+ saveItems(savedItems);
+ openNextInput(savedItems);
+ };
+
+ const saveInputValueBeforeRowAction = (itemIndex: number) => {
+ const updatedItems = saveInputValue();
+
+ if (!isDefined(updatedItems)) {
+ return null;
+ }
+
+ const hasRemovedEditedItem = updatedItems.length < savedItems.length;
+
+ return {
+ updatedItems,
+ itemIndexAfterSave: getRecordFormItemIndexAfterSave({
+ itemIndex,
+ removedItemIndex: hasRemovedEditedItem ? editedItemIndex : null,
+ }),
+ };
+ };
+
+ const handleEdit = (index: number) => {
+ const saveResult = saveInputValueBeforeRowAction(index);
+
+ if (!isDefined(saveResult)) {
+ return;
+ }
+
+ setShouldFocusInput(true);
+ if (isDefined(saveResult.itemIndexAfterSave)) {
+ startEditingItem({
+ itemIndex: saveResult.itemIndexAfterSave,
+ currentItems: saveResult.updatedItems,
+ });
+ return;
+ }
+
+ openNextInput(saveResult.updatedItems);
+ };
+
+ const handleDelete = (index: number) => {
+ const saveResult = saveInputValueBeforeRowAction(index);
+
+ if (!isDefined(saveResult)) {
+ return;
+ }
+
+ const updatedItems = isDefined(saveResult.itemIndexAfterSave)
+ ? toSpliced(saveResult.updatedItems, saveResult.itemIndexAfterSave, 1)
+ : saveResult.updatedItems;
+
+ saveItems(updatedItems);
+ openNextInput(updatedItems);
+ };
+
+ const shouldShowItems = !isSingleItemMode && isNonEmptyArray(savedItems);
+ const visibleItems = shouldShowItems ? savedItems : undefined;
+ const shouldShowInputInFooter = isInputOpen && !isEditingItemInPlace;
+ const inputSpacing: MultiItemFieldInputSpacing = shouldShowItems
+ ? 'compact'
+ : 'default';
+
+ const itemInput = (
+ <MultiItemFieldInputRow
+ spacing={inputSpacing}
+ hasPadding={shouldShowItems && shouldShowInputInFooter}
+ rightComponent={
+ isSingleItemMode ? undefined : (
+ <MultiItemFieldSaveButton
+ isAddingNewItem={!isDefined(editedItemIndex)}
+ onClick={handleEnter}
+ />
+ )
+ }
+ >
+ <MultiItemFieldTextInput
+ ref={inputRef}
+ autoFocus={shouldFocusInput}
+ spacing={inputSpacing}
+ placeholder={t`Enter value`}
+ value={inputValue}
+ onChange={handleTyping}
+ onEnter={handleEnter}
+ onEscape={handleEscape}
+ />
+ </MultiItemFieldInputRow>
+ );
+
+ return (
+ <FormFieldInputContainer>
+ {isNonEmptyString(label) ? <Field.Label>{label}</Field.Label> : null}
+ <RecordFormMultiItemList
+ footer={shouldShowInputInFooter ? itemInput : undefined}
+ >
+ {visibleItems?.map((item, index) =>
+ index === editedItemIndex && isEditingItemInPlace ? (
+ <MultiItemFieldEditedItem
+ key={index}
+ hasSeparatorBefore={index > 0}
+ hasSeparatorAfter={index < savedItems.length - 1}
+ >
+ {itemInput}
+ </MultiItemFieldEditedItem>
+ ) : (
+ <ArrayFieldMenuItem
+ key={index}
+ dropdownId={`${instanceId}-item-${index}`}
+ value={item}
+ onEdit={() => handleEdit(index)}
+ onDelete={() => handleDelete(index)}
+ />
+ ),
+ )}
+ </RecordFormMultiItemList>
+ </FormFieldInputContainer>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormEmailsFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormEmailsFieldInput.tsx
new file mode 100644
index 00000000000..b082deeb11f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormEmailsFieldInput.tsx
@@ -0,0 +1,335 @@
+import { EmailsFieldMenuItem } from '@/object-record/record-field/ui/meta-types/input/components/EmailsFieldMenuItem';
+import { MultiItemFieldEditedItem } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldEditedItem';
+import { RecordFormMultiItemList } from '@/object-record/record-form/components/RecordFormMultiItemList';
+import { MultiItemFieldInputRow } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow';
+import { MultiItemFieldSaveButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSaveButton';
+import { MultiItemFieldTextInput } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput';
+import { useMultiItemInput } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput';
+import { type MultiItemFieldInputSpacing } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing';
+import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/ui/meta-types/input/utils/computeUpdatedMultiItemFieldItems';
+import { getRecordFormItemIndexAfterSave } from '@/object-record/record-form/utils/getRecordFormItemIndexAfterSave';
+import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/ui/states/recordFieldInputIsFieldInErrorComponentState';
+import { type FieldEmailsValue } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
+import { useLingui } from '@lingui/react/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+import { useId, useRef, useState } from 'react';
+import { MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES } from 'twenty-shared/constants';
+import { emailSchema, isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+import { Field } from 'twenty-ui/primitives/input';
+import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
+import { moveArrayItem } from '~/utils/array/moveArrayItem';
+import { toSpliced } from '~/utils/array/toSpliced';
+
+const getEmailText = (email: string) => email;
+
+const validateEmail = (input: string) => ({
+ isValid: emailSchema.safeParse(input).success,
+ errorMessage: '',
+});
+
+const getEmailsFromValue = (value: FieldEmailsValue | undefined) =>
+ [
+ isNonEmptyString(value?.primaryEmail) ? value.primaryEmail : null,
+ ...(value?.additionalEmails ?? []),
+ ].filter(isDefined);
+
+const getEmailsValue = (emails: string[]): FieldEmailsValue => {
+ const [primaryEmail, ...additionalEmails] = emails;
+
+ return { primaryEmail: primaryEmail ?? '', additionalEmails };
+};
+
+type RecordFormEmailsFieldInputProps = {
+ label?: string;
+ defaultValue?: FieldEmailsValue;
+ maxNumberOfValues?: number | null;
+ placeholder?: string;
+ onChange: (value: FieldEmailsValue) => void;
+};
+
+export const RecordFormEmailsFieldInput = ({
+ label,
+ defaultValue,
+ maxNumberOfValues,
+ placeholder,
+ onChange,
+}: RecordFormEmailsFieldInputProps) => {
+ const { t } = useLingui();
+ const { copyToClipboard } = useCopyToClipboard();
+ const instanceId = useId();
+
+ const setRecordFieldInputIsFieldInError = useSetAtomComponentState(
+ recordFieldInputIsFieldInErrorComponentState,
+ );
+
+ const maxItemCount = maxNumberOfValues ?? MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES;
+ const isSingleItemMode = maxItemCount === 1;
+
+ const [savedEmails, setSavedEmails] = useState(() =>
+ getEmailsFromValue(defaultValue),
+ );
+ const [shouldFocusInput, setShouldFocusInput] = useState(false);
+ const inputRef = useRef<HTMLInputElement>(null);
+ const [isInvalidInputLeft, setIsInvalidInputLeft] = useState(false);
+
+ const {
+ isInputOpen,
+ editedItemIndex,
+ inputValue,
+ hasError,
+ startAddingItem,
+ startEditingItem,
+ closeInput,
+ handleInputChange,
+ validateInputValue,
+ } = useMultiItemInput({
+ items: savedEmails,
+ getItemText: getEmailText,
+ isInputInitiallyOpen: isSingleItemMode || savedEmails.length < maxItemCount,
+ initialEditedItemIndex:
+ isSingleItemMode && savedEmails.length > 0 ? 0 : null,
+ validateInput: validateEmail,
+ });
+
+ const openNextInput = (emails: string[]) => {
+ if (isSingleItemMode && isNonEmptyArray(emails)) {
+ startEditingItem({ itemIndex: 0, currentItems: emails });
+ return;
+ }
+
+ if (emails.length < maxItemCount) {
+ startAddingItem();
+ return;
+ }
+
+ closeInput();
+ };
+
+ const isEditingItemInPlace = isDefined(editedItemIndex) && !isSingleItemMode;
+
+ const getEmailsWithInput = (sanitizedInput: string) =>
+ computeUpdatedMultiItemFieldItems({
+ sanitizedInput,
+ items: savedEmails,
+ editingIndex: isSingleItemMode ? 0 : editedItemIndex,
+ singleItemMode: isSingleItemMode,
+ });
+
+ const saveEmails = (emails: string[]) => {
+ setSavedEmails(emails);
+ setIsInvalidInputLeft(false);
+ setRecordFieldInputIsFieldInError(false);
+ onChange(getEmailsValue(emails));
+ };
+
+ const isInputValueValid = (value: string) => {
+ const sanitizedInput = value.trim();
+
+ return (
+ !isNonEmptyString(sanitizedInput) || validateEmail(sanitizedInput).isValid
+ );
+ };
+
+ const handleTyping = (value: string) => {
+ handleInputChange(value);
+ setIsInvalidInputLeft(false);
+
+ const sanitizedInput = value.trim();
+ const isValid = isInputValueValid(value);
+
+ setRecordFieldInputIsFieldInError(!isValid);
+ onChange(
+ getEmailsValue(
+ isValid ? getEmailsWithInput(sanitizedInput) : savedEmails,
+ ),
+ );
+ };
+
+ const saveInputValue = () => {
+ const sanitizedInput = validateInputValue();
+
+ if (!isDefined(sanitizedInput)) {
+ return null;
+ }
+
+ const updatedEmails = getEmailsWithInput(sanitizedInput);
+
+ saveEmails(updatedEmails);
+
+ return updatedEmails;
+ };
+
+ const handleEnter = () => {
+ const updatedEmails = saveInputValue();
+
+ if (!isDefined(updatedEmails) || isSingleItemMode) {
+ return;
+ }
+
+ setShouldFocusInput(true);
+ openNextInput(updatedEmails);
+ inputRef.current?.focus();
+ };
+
+ const handleEscape = () => {
+ saveEmails(savedEmails);
+ openNextInput(savedEmails);
+ };
+
+ const saveInputValueBeforeRowAction = (itemIndex: number) => {
+ const updatedEmails = saveInputValue();
+
+ if (!isDefined(updatedEmails)) {
+ return null;
+ }
+
+ const hasRemovedEditedItem = updatedEmails.length < savedEmails.length;
+
+ return {
+ updatedEmails,
+ itemIndexAfterSave: getRecordFormItemIndexAfterSave({
+ itemIndex,
+ removedItemIndex: hasRemovedEditedItem ? editedItemIndex : null,
+ }),
+ };
+ };
+
+ const handleEdit = (index: number) => {
+ const saveResult = saveInputValueBeforeRowAction(index);
+
+ if (!isDefined(saveResult)) {
+ return;
+ }
+
+ setShouldFocusInput(true);
+ if (isDefined(saveResult.itemIndexAfterSave)) {
+ startEditingItem({
+ itemIndex: saveResult.itemIndexAfterSave,
+ currentItems: saveResult.updatedEmails,
+ });
+ return;
+ }
+
+ openNextInput(saveResult.updatedEmails);
+ };
+
+ const updateEmails = ({
+ itemIndex,
+ getUpdatedEmails,
+ }: {
+ itemIndex: number;
+ getUpdatedEmails: (params: {
+ emails: string[];
+ itemIndex: number;
+ }) => string[];
+ }) => {
+ const saveResult = saveInputValueBeforeRowAction(itemIndex);
+
+ if (!isDefined(saveResult)) {
+ return;
+ }
+
+ const updatedEmails = isDefined(saveResult.itemIndexAfterSave)
+ ? getUpdatedEmails({
+ emails: saveResult.updatedEmails,
+ itemIndex: saveResult.itemIndexAfterSave,
+ })
+ : saveResult.updatedEmails;
+
+ saveEmails(updatedEmails);
+ openNextInput(updatedEmails);
+ };
+
+ const shouldShowItems = !isSingleItemMode && isNonEmptyArray(savedEmails);
+ const visibleEmails = shouldShowItems ? savedEmails : undefined;
+ const shouldShowInputInFooter = isInputOpen && !isEditingItemInPlace;
+ const inputSpacing: MultiItemFieldInputSpacing = shouldShowItems
+ ? 'compact'
+ : 'default';
+
+ const itemInput = (
+ <MultiItemFieldInputRow
+ spacing={inputSpacing}
+ hasPadding={shouldShowItems && shouldShowInputInFooter}
+ rightComponent={
+ isSingleItemMode ? undefined : (
+ <MultiItemFieldSaveButton
+ isAddingNewItem={!isDefined(editedItemIndex)}
+ onClick={handleEnter}
+ />
+ )
+ }
+ >
+ <MultiItemFieldTextInput
+ ref={inputRef}
+ autoFocus={shouldFocusInput}
+ spacing={inputSpacing}
+ placeholder={placeholder ?? t`Email`}
+ value={inputValue}
+ hasError={hasError || isInvalidInputLeft}
+ onBlur={() => setIsInvalidInputLeft(!isInputValueValid(inputValue))}
+ onChange={handleTyping}
+ onEnter={handleEnter}
+ onEscape={handleEscape}
+ />
+ </MultiItemFieldInputRow>
+ );
+
+ return (
+ <FormFieldInputContainer>
+ {isNonEmptyString(label) ? <Field.Label>{label}</Field.Label> : null}
+ <RecordFormMultiItemList
+ footer={shouldShowInputInFooter ? itemInput : undefined}
+ >
+ {visibleEmails?.map((email, index) =>
+ index === editedItemIndex && isEditingItemInPlace ? (
+ <MultiItemFieldEditedItem
+ key={index}
+ hasSeparatorBefore={index > 0}
+ hasSeparatorAfter={index < savedEmails.length - 1}
+ >
+ {itemInput}
+ </MultiItemFieldEditedItem>
+ ) : (
+ <EmailsFieldMenuItem
+ key={index}
+ dropdownId={`${instanceId}-email-${index}`}
+ showPrimaryIcon={index === 0 && savedEmails.length > 1}
+ showSetAsPrimaryButton={index > 0}
+ showCopyButton={true}
+ email={email}
+ onEdit={() => handleEdit(index)}
+ onSetAsPrimary={() =>
+ updateEmails({
+ itemIndex: index,
+ getUpdatedEmails: ({ emails, itemIndex }) =>
+ moveArrayItem(emails, {
+ fromIndex: itemIndex,
+ toIndex: 0,
+ }),
+ })
+ }
+ onDelete={() =>
+ updateEmails({
+ itemIndex: index,
+ getUpdatedEmails: ({ emails, itemIndex }) =>
+ toSpliced(emails, itemIndex, 1),
+ })
+ }
+ onCopy={(emailToCopy) =>
+ copyToClipboard(emailToCopy, t`Email copied to clipboard`)
+ }
+ />
+ ),
+ )}
+ </RecordFormMultiItemList>
+ {hasError || isInvalidInputLeft ? (
+ <Field.Error match role="alert">
+ {t`Enter a valid email`}
+ </Field.Error>
+ ) : null}
+ </FormFieldInputContainer>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInput.tsx
index 7253aa2e19d..bb003be8b69 100644
--- a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInput.tsx
@@ -5,6 +5,8 @@ import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/re
import { type FormFieldInputSubFieldPlaceholders } from '@/object-record/record-field/ui/form-types/types/FormFieldInputSubFieldPlaceholders';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { isFieldArray } from '@/object-record/record-field/ui/types/guards/isFieldArray';
+import { isFieldArrayValue } from '@/object-record/record-field/ui/types/guards/isFieldArrayValue';
import { isFieldBoolean } from '@/object-record/record-field/ui/types/guards/isFieldBoolean';
import { isFieldBooleanValue } from '@/object-record/record-field/ui/types/guards/isFieldBooleanValue';
import { isFieldCurrency } from '@/object-record/record-field/ui/types/guards/isFieldCurrency';
@@ -17,8 +19,10 @@ import { isFieldNumber } from '@/object-record/record-field/ui/types/guards/isFi
import { isFieldNumberValue } from '@/object-record/record-field/ui/types/guards/isFieldNumberValue';
import { isFieldPhones } from '@/object-record/record-field/ui/types/guards/isFieldPhones';
import { isFieldPhonesValue } from '@/object-record/record-field/ui/types/guards/isFieldPhonesValue';
+import { RecordFormArrayFieldInput } from '@/object-record/record-form/components/RecordFormArrayFieldInput';
import { RecordFormBooleanFieldInput } from '@/object-record/record-form/components/RecordFormBooleanFieldInput';
import { RecordFormCurrencyFieldInput } from '@/object-record/record-form/components/RecordFormCurrencyFieldInput';
+import { RecordFormEmailsFieldInput } from '@/object-record/record-form/components/RecordFormEmailsFieldInput';
import { RecordFormPercentageFieldInput } from '@/object-record/record-form/components/RecordFormPercentageFieldInput';
import { RecordFormPhoneFieldInput } from '@/object-record/record-form/components/RecordFormPhoneFieldInput';
import { getRecordFormCurrencyFieldDefaultValue } from '@/object-record/record-form/utils/getRecordFormCurrencyFieldDefaultValue';
@@ -68,6 +72,33 @@ export const RecordFormFieldInput = ({
);
}
+ if (isFieldEmails(field) && !readonly) {
+ return (
+ <RecordFormEmailsFieldInput
+ label={field.label}
+ defaultValue={
+ isFieldEmailsValue(defaultValue) ? defaultValue : undefined
+ }
+ maxNumberOfValues={field.metadata.settings?.maxNumberOfValues}
+ placeholder={subFieldPlaceholders?.primaryEmail}
+ onChange={onChange}
+ />
+ );
+ }
+
+ if (isFieldArray(field) && !readonly) {
+ return (
+ <RecordFormArrayFieldInput
+ label={field.label}
+ defaultValue={
+ isFieldArrayValue(defaultValue) ? defaultValue : undefined
+ }
+ maxNumberOfValues={field.metadata.settings?.maxNumberOfValues}
+ onChange={onChange}
+ />
+ );
+ }
+
if (isFieldEmails(field)) {
return (
<FormEmailsFieldInput
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormMultiItemList.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormMultiItemList.tsx
new file mode 100644
index 00000000000..23264292d32
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormMultiItemList.tsx
@@ -0,0 +1,42 @@
+import { OverlayMenuListSeparator } from '@/ui/layout/overlay/components/OverlayMenuListSeparator';
+import { styled } from '@linaria/react';
+import { type ReactNode } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { themeCssVariables } from 'twenty-ui/theme';
+
+const StyledContainer = styled.div`
+ background-color: ${themeCssVariables.background.transparent.lighter};
+ border-radius: ${themeCssVariables.border.radius.md};
+ box-shadow: inset 0 0 0 1px ${themeCssVariables.border.color.medium};
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+
+ &:has(input:focus-visible) {
+ box-shadow: inset 0 0 0 1px ${themeCssVariables.color.blue};
+ }
+`;
+
+const StyledItems = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.betweenSiblingsGap};
+ padding: ${themeCssVariables.spacing[1]};
+`;
+
+type RecordFormMultiItemListProps = {
+ children?: ReactNode;
+ footer?: ReactNode;
+};
+
+export const RecordFormMultiItemList = ({
+ children,
+ footer,
+}: RecordFormMultiItemListProps) => (
+ <StyledContainer>
+ {isDefined(children) && <StyledItems>{children}</StyledItems>}
+ {isDefined(children) && isDefined(footer) && <OverlayMenuListSeparator />}
+ {footer}
+ </StyledContainer>
+);
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/__stories__/RecordFormFieldInputs.stories.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/__stories__/RecordFormFieldInputs.stories.tsx
index d8caf4909ed..fb5c41f134a 100644
--- a/packages/twenty-front/src/modules/object-record/record-form/components/__stories__/RecordFormFieldInputs.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/__stories__/RecordFormFieldInputs.stories.tsx
@@ -1,6 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
-import { expect, fn, userEvent, within } from 'storybook/test';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { RecordFormFieldInputs } from '@/object-record/record-form/components/RecordFormFieldInputs';
@@ -8,6 +8,8 @@ import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { CurrencyCode } from 'twenty-shared/constants';
import { type JsonValue } from 'type-fest';
import { ComponentDecorator } from 'twenty-ui/testing';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';
import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
@@ -43,6 +45,26 @@ const currencyFieldMetadataItem: FieldMetadataItem = {
defaultValue: { amountMicros: null, currencyCode: "'USD'" },
};
+const personObjectMetadataItem = getMockObjectMetadataItemOrThrow('person');
+
+const emailsFieldMetadataItem: FieldMetadataItem = {
+ ...getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: personObjectMetadataItem,
+ fieldName: 'emails',
+ }),
+ label: 'Emails',
+ settings: null,
+};
+
+const tagsFieldMetadataItem: FieldMetadataItem = {
+ ...emailsFieldMetadataItem,
+ id: 'tags-field-metadata-id',
+ name: 'tags',
+ label: 'Tags',
+ type: FieldMetadataType.ARRAY,
+ defaultValue: null,
+};
+
type RecordFormFieldInputsWithDraftProps = {
fieldMetadataItems: FieldMetadataItem[];
initialDraftRecord?: Partial<ObjectRecord>;
@@ -90,7 +112,7 @@ const RecordFormFieldInputsWithDraft = ({
const meta: Meta<typeof RecordFormFieldInputsWithDraft> = {
title: 'Modules/ObjectRecord/RecordForm/RecordFormFieldInputs',
component: RecordFormFieldInputsWithDraft,
- decorators: [ComponentDecorator],
+ decorators: [ComponentDecorator, ToastDecorator],
args: {
fieldMetadataItems: [percentageFieldMetadataItem, booleanFieldMetadataItem],
onFieldValueChange: fn(),
@@ -228,3 +250,238 @@ export const Currency: Story = {
await expect(canvas.getByRole('alert')).toHaveTextContent('Invalid number');
},
};
+
+export const Emails: Story = {
+ args: {
+ fieldMetadataItems: [emailsFieldMetadataItem],
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const input = canvas.getByRole('textbox');
+
+ await userEvent.type(input, '[email protected]');
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('emails', {
+ primaryEmail: '[email protected]',
+ additionalEmails: [],
+ });
+
+ await userEvent.keyboard('{Enter}');
+
+ await expect(canvas.getByText('[email protected]')).toBeVisible();
+ await expect(canvas.getByRole('textbox')).toHaveValue('');
+ await expect(canvas.getByRole('textbox')).toHaveFocus();
+
+ await userEvent.keyboard('[email protected]');
+ await userEvent.click(canvas.getByRole('button', { name: 'Add item' }));
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('emails', {
+ primaryEmail: '[email protected]',
+ additionalEmails: ['[email protected]'],
+ });
+ await expect(canvas.getByText('[email protected]')).toBeVisible();
+ await expect(canvas.getByRole('textbox')).toHaveFocus();
+ await expect(canvas.queryByText('Add Email')).not.toBeInTheDocument();
+ },
+};
+
+export const EmailsCancelWithEscape: Story = {
+ args: {
+ fieldMetadataItems: [emailsFieldMetadataItem],
+ initialDraftRecord: {
+ emails: { primaryEmail: '[email protected]', additionalEmails: [] },
+ },
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const input = canvas.getByRole('textbox');
+
+ await expect(canvas.getByText('[email protected]')).toBeVisible();
+ await expect(input).not.toHaveFocus();
+
+ await userEvent.type(input, '[email protected]');
+ await userEvent.keyboard('{Escape}');
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('emails', {
+ primaryEmail: '[email protected]',
+ additionalEmails: [],
+ });
+ await expect(input).toHaveValue('');
+ },
+};
+
+export const InvalidEmail: Story = {
+ args: {
+ fieldMetadataItems: [emailsFieldMetadataItem],
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const input = canvas.getByRole('textbox');
+
+ await userEvent.type(input, 'lea@');
+
+ await expect(canvas.queryByRole('alert')).not.toBeInTheDocument();
+
+ await userEvent.keyboard('{Enter}');
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('emails', {
+ primaryEmail: '',
+ additionalEmails: [],
+ });
+ await expect(input).toHaveAttribute('aria-invalid', 'true');
+ await expect(canvas.getByRole('alert')).toHaveTextContent(
+ 'Enter a valid email',
+ );
+
+ await userEvent.type(input, 'northwind.io');
+
+ await expect(input).not.toHaveAttribute('aria-invalid');
+ await expect(canvas.queryByRole('alert')).not.toBeInTheDocument();
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('emails', {
+ primaryEmail: '[email protected]',
+ additionalEmails: [],
+ });
+ },
+};
+
+export const InvalidEmailLeftUnsubmitted: Story = {
+ args: {
+ fieldMetadataItems: [emailsFieldMetadataItem],
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const input = canvas.getByRole('textbox');
+
+ await userEvent.type(input, 'lea@');
+ await userEvent.tab();
+
+ await expect(input).toHaveAttribute('aria-invalid', 'true');
+ await expect(canvas.getByRole('alert')).toHaveTextContent(
+ 'Enter a valid email',
+ );
+
+ await userEvent.click(input);
+ await userEvent.keyboard('{Escape}');
+
+ await expect(input).toHaveValue('');
+ await expect(canvas.queryByRole('alert')).not.toBeInTheDocument();
+ },
+};
+
+export const SingleEmail: Story = {
+ args: {
+ fieldMetadataItems: [
+ { ...emailsFieldMetadataItem, settings: { maxNumberOfValues: 1 } },
+ ],
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const input = canvas.getByRole('textbox');
+
+ await userEvent.type(input, '[email protected]{Enter}');
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('emails', {
+ primaryEmail: '[email protected]',
+ additionalEmails: [],
+ });
+ await expect(input).toHaveValue('[email protected]');
+ await expect(
+ canvas.queryByRole('button', { name: 'More options' }),
+ ).not.toBeInTheDocument();
+ },
+};
+
+export const ArrayValues: Story = {
+ args: {
+ fieldMetadataItems: [tagsFieldMetadataItem],
+ initialDraftRecord: { tags: ['Shopify', 'Shopify', 'Stripe'] },
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.type(
+ canvas.getByPlaceholderText('Enter value'),
+ 'Klaviyo{Enter}',
+ );
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('tags', [
+ 'Shopify',
+ 'Shopify',
+ 'Stripe',
+ 'Klaviyo',
+ ]);
+
+ await userEvent.click(
+ canvas.getAllByRole('button', { name: 'More options' })[1],
+ );
+ await userEvent.click(await body.findByRole('menuitem', { name: 'Edit' }));
+
+ const editedInput = await canvas.findByDisplayValue('Shopify');
+
+ await waitFor(() => expect(editedInput).toHaveFocus());
+ await expect(canvas.getAllByRole('separator')).toHaveLength(2);
+
+ await userEvent.clear(editedInput);
+ await userEvent.type(editedInput, 'HubSpot{Enter}');
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('tags', [
+ 'Shopify',
+ 'HubSpot',
+ 'Stripe',
+ 'Klaviyo',
+ ]);
+ },
+};
+
+export const ArrayRowActionAfterClearedEdit: Story = {
+ args: {
+ fieldMetadataItems: [tagsFieldMetadataItem],
+ initialDraftRecord: { tags: ['Shopify', 'Klaviyo', 'Stripe'] },
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+
+ await userEvent.click(
+ canvas.getAllByRole('button', { name: 'More options' })[1],
+ );
+ await userEvent.click(await body.findByRole('menuitem', { name: 'Edit' }));
+ await userEvent.clear(await canvas.findByDisplayValue('Klaviyo'));
+
+ await userEvent.click(
+ canvas.getAllByRole('button', { name: 'More options' })[1],
+ );
+ await userEvent.click(
+ await body.findByRole('menuitem', { name: 'Delete' }),
+ );
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith('tags', [
+ 'Shopify',
+ ]);
+ await expect(canvas.getByText('Shopify')).toBeVisible();
+ await expect(canvas.queryByText('Stripe')).not.toBeInTheDocument();
+ },
+};
+
+export const StoredListValues: Story = {
+ args: {
+ fieldMetadataItems: [emailsFieldMetadataItem, tagsFieldMetadataItem],
+ initialDraftRecord: {
+ emails: {
+ primaryEmail: '[email protected]',
+ additionalEmails: ['[email protected]'],
+ },
+ tags: ['Shopify', 'Stripe'],
+ },
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+
+ await expect(canvas.getByText('[email protected]')).toBeVisible();
+ await expect(canvas.getByText('[email protected]')).toBeVisible();
+ await expect(canvas.getByText('Shopify')).toBeVisible();
+ await expect(canvas.getByText('Stripe')).toBeVisible();
+ await expect(args.onFieldValueChange).not.toHaveBeenCalled();
+ },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-form/utils/__tests__/getRecordFormItemIndexAfterSave.test.ts b/packages/twenty-front/src/modules/object-record/record-form/utils/__tests__/getRecordFormItemIndexAfterSave.test.ts
new file mode 100644
index 00000000000..d531123a488
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-form/utils/__tests__/getRecordFormItemIndexAfterSave.test.ts
@@ -0,0 +1,30 @@
+import { getRecordFormItemIndexAfterSave } from '@/object-record/record-form/utils/getRecordFormItemIndexAfterSave';
+
+describe('getRecordFormItemIndexAfterSave', () => {
+ it('keeps the index when no item was removed', () => {
+ expect(
+ getRecordFormItemIndexAfterSave({
+ itemIndex: 2,
+ removedItemIndex: null,
+ }),
+ ).toBe(2);
+ });
+
+ it('shifts an index that came after the removed item', () => {
+ expect(
+ getRecordFormItemIndexAfterSave({ itemIndex: 3, removedItemIndex: 1 }),
+ ).toBe(2);
+ });
+
+ it('keeps an index that came before the removed item', () => {
+ expect(
+ getRecordFormItemIndexAfterSave({ itemIndex: 0, removedItemIndex: 1 }),
+ ).toBe(0);
+ });
+
+ it('returns null for the removed item itself', () => {
+ expect(
+ getRecordFormItemIndexAfterSave({ itemIndex: 1, removedItemIndex: 1 }),
+ ).toBeNull();
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-form/utils/getRecordFormItemIndexAfterSave.ts b/packages/twenty-front/src/modules/object-record/record-form/utils/getRecordFormItemIndexAfterSave.ts
new file mode 100644
index 00000000000..2632ce3d078
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-form/utils/getRecordFormItemIndexAfterSave.ts
@@ -0,0 +1,19 @@
+import { isDefined } from 'twenty-shared/utils';
+
+export const getRecordFormItemIndexAfterSave = ({
+ itemIndex,
+ removedItemIndex,
+}: {
+ itemIndex: number;
+ removedItemIndex: number | null;
+}): number | null => {
+ if (!isDefined(removedItemIndex)) {
+ return itemIndex;
+ }
+
+ if (itemIndex === removedItemIndex) {
+ return null;
+ }
+
+ return itemIndex > removedItemIndex ? itemIndex - 1 : itemIndex;
+};