Skip to content

The open alternative to Salesforce, designed for AI.

Split the multi-item draft hook into focused bricks (#28751)

Charles Bochet8448bc6bcc5d
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
index f7fad95e758..96f0742a064 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
@@ -415,7 +415,7 @@ export const FormArrayFieldInput = ({
<Dropdown.Separator />
{isInputDisplayed ? (
- <MultiItemFieldInputRow>
+ <MultiItemFieldInputRow hasPadding>
<MultiItemFieldTextInput
autoFocus
placeholder={placeholder}
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 5165b386fdf..671256519d9 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
@@ -4,16 +4,17 @@ import { ArrayFieldMenuItem } from '@/object-record/record-field/ui/meta-types/i
import { MultiItemFieldAddButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldAddButton';
import { MultiItemFieldEditedItem } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldEditedItem';
import { MultiItemFieldInputRow } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow';
+import { MultiItemFieldList } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldList';
import { MultiItemFieldSaveButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSaveButton';
-import { MultiItemFieldSearchHeader } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSearchHeader';
import { MultiItemFieldTextInput } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput';
import { MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX } from '@/object-record/record-field/ui/meta-types/input/constants/MultiItemFieldInputDropdownClickOutsideId';
-import { useMultiItemDraft } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemDraft';
import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemFieldDismiss';
+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 { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
-import { OverlayMenuListSeparator } from '@/ui/layout/overlay/components/OverlayMenuListSeparator';
import { t } from '@lingui/core/macro';
import { useContext, useMemo, useRef } from 'react';
import { MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES } from 'twenty-shared/constants';
@@ -54,6 +55,10 @@ export const ArrayFieldInput = () => {
};
const handleSubmit = (updatedItems: string[]) => {
+ if (isDeeplyEqual(arrayItems, updatedItems)) {
+ return;
+ }
+
onSubmit?.({
newValue: parseStringArrayToArrayValue(updatedItems),
skipClose: true,
@@ -63,28 +68,23 @@ export const ArrayFieldInput = () => {
const maxNumberOfValues =
fieldDefinition.metadata.settings?.maxNumberOfValues ??
MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES;
+ const isSingleItemMode = maxNumberOfValues === 1;
+ const isLimitReached = arrayItems.length >= maxNumberOfValues;
const {
- isInputDisplayed,
+ inputTarget,
inputValue,
- isAddingNewItem,
- editedItemIndex,
- isEditingItemInPlace,
hasError,
- isSingleItemMode,
- isLimitReached,
+ openInput,
handleInputChange,
- startAdding,
- startEditing,
- closeInput,
- resetInputForItems,
- commitInput,
- } = useMultiItemDraft({
+ validateInputValue,
+ } = useMultiItemInput({
items: arrayItems,
- onItemsChange: handleChange,
- onItemsSubmit: handleSubmit,
getItemText: getArrayItemText,
- maxItemCount: maxNumberOfValues,
+ initialInputTarget: getInitialMultiItemInputTarget({
+ itemCount: arrayItems.length,
+ isSingleItemMode,
+ }),
});
const {
@@ -94,6 +94,32 @@ 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 sanitizedInput = validateInputValue();
+
+ if (!isDefined(sanitizedInput)) {
+ return null;
+ }
+
+ const updatedItems = computeUpdatedMultiItemFieldItems({
+ sanitizedInput,
+ items: arrayItems,
+ editingIndex: editedItemIndex,
+ singleItemMode: isSingleItemMode,
+ });
+
+ handleChange(updatedItems);
+
+ return updatedItems;
+ };
+
const handleInputEnter = () => {
const updatedItems = commitInput();
@@ -103,13 +129,28 @@ export const ArrayFieldInput = () => {
if (isSingleItemMode) {
onEnter?.({ newValue: parseStringArrayToArrayValue(updatedItems) });
- } else if (!isDeeplyEqual(arrayItems, updatedItems)) {
+ } else {
handleSubmit(updatedItems);
}
closeInput();
};
+ const handleAddClick = () => {
+ if (isEditingItemInPlace) {
+ const updatedItems = commitInput();
+
+ if (!isDefined(updatedItems)) {
+ return;
+ }
+
+ handleSubmit(updatedItems);
+ }
+
+ setSearchFilter('');
+ openInput({ type: 'new-item' });
+ };
+
const handleEscape = () => {
onEscape?.({ newValue: parseStringArrayToArrayValue(arrayItems) });
};
@@ -136,26 +177,27 @@ export const ArrayFieldInput = () => {
handleChange(updatedItems);
handleSubmit(updatedItems);
- resetInputForItems(updatedItems);
+ openInput(
+ isNonEmptyArray(updatedItems) ? { type: 'closed' } : { type: 'new-item' },
+ );
};
const shouldShowItems =
isNonEmptyArray(filteredItemEntries) &&
(!isSingleItemMode || !isInputDisplayed);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const visibleItemCount = visibleItemEntries?.length ?? 0;
const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
- const shouldShowAddButton = !shouldShowInputInFooter && !isLimitReached;
- const isInputInRow = isNonEmptyArray(arrayItems) && !isSingleItemMode;
+ const inputSpacing: MultiItemFieldInputSpacing =
+ isNonEmptyArray(arrayItems) && !isSingleItemMode ? 'compact' : 'default';
const itemInput = (
<MultiItemFieldInputRow
- isInRow={isInputInRow}
- isInFooter={shouldShowInputInFooter}
+ spacing={inputSpacing}
+ hasPadding={shouldShowInputInFooter && shouldShowItems}
rightComponent={
isNonEmptyArray(arrayItems) ? (
<MultiItemFieldSaveButton
- isAddingNewItem={isAddingNewItem}
+ isAddingNewItem={inputTarget.type === 'new-item'}
onClick={handleInputEnter}
/>
) : undefined
@@ -163,7 +205,7 @@ export const ArrayFieldInput = () => {
>
<MultiItemFieldTextInput
autoFocus
- isInRow={isInputInRow}
+ spacing={inputSpacing}
placeholder={t`Enter value`}
value={inputValue}
hasError={hasError}
@@ -176,38 +218,28 @@ export const ArrayFieldInput = () => {
);
return (
- <OverlayMenuList
+ <MultiItemFieldList
ref={containerRef}
- header={
- shouldShowSearch && !isInputDisplayed ? (
- <MultiItemFieldSearchHeader
- value={searchFilter}
- onChange={setSearchFilter}
+ hasItems={shouldShowItems}
+ shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ searchFilter={searchFilter}
+ onSearchFilterChange={setSearchFilter}
+ footerInput={shouldShowInputInFooter ? itemInput : undefined}
+ addButton={
+ !shouldShowInputInFooter && !isLimitReached ? (
+ <MultiItemFieldAddButton
+ label={t`Add Item`}
+ onClick={handleAddClick}
/>
) : undefined
}
- footer={
- <>
- {shouldShowItems &&
- (shouldShowInputInFooter || shouldShowAddButton) && (
- <OverlayMenuListSeparator />
- )}
- {shouldShowInputInFooter && itemInput}
- {shouldShowAddButton && (
- <MultiItemFieldAddButton
- label={t`Add Item`}
- onClick={startAdding}
- />
- )}
- </>
- }
>
- {visibleItemEntries?.map(({ item, index }, position) =>
- isEditingItemInPlace && index === editedItemIndex ? (
+ {visibleItemEntries?.map(({ item, index }, position, entries) =>
+ index === editedItemIndex && isEditingItemInPlace ? (
<MultiItemFieldEditedItem
key={index}
hasSeparatorBefore={position > 0}
- hasSeparatorAfter={position < visibleItemCount - 1}
+ hasSeparatorAfter={position < entries.length - 1}
>
{itemInput}
</MultiItemFieldEditedItem>
@@ -216,11 +248,13 @@ export const ArrayFieldInput = () => {
key={index}
dropdownId={`${MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX}-${fieldDefinition.metadata.fieldName}-${index}`}
value={item}
- onEdit={() => startEditing(index)}
+ onEdit={() =>
+ openInput({ type: 'existing-item', itemIndex: index })
+ }
onDelete={() => handleDelete(index)}
/>
),
)}
- </OverlayMenuList>
+ </MultiItemFieldList>
);
};
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 ae914171345..7a44b5f68e0 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
@@ -4,26 +4,27 @@ import { EmailsFieldMenuItem } from '@/object-record/record-field/ui/meta-types/
import { MultiItemFieldAddButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldAddButton';
import { MultiItemFieldEditedItem } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldEditedItem';
import { MultiItemFieldInputRow } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow';
+import { MultiItemFieldList } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldList';
import { MultiItemFieldSaveButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSaveButton';
-import { MultiItemFieldSearchHeader } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSearchHeader';
import { MultiItemFieldTextInput } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput';
import { MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX } from '@/object-record/record-field/ui/meta-types/input/constants/MultiItemFieldInputDropdownClickOutsideId';
-import { useMultiItemDraft } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemDraft';
import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemFieldDismiss';
+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';
import { emailsFieldValueSchema } from '@/object-record/record-field/ui/validation-schemas/emailsFieldValueSchema';
-import { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
-import { OverlayMenuListSeparator } from '@/ui/layout/overlay/components/OverlayMenuListSeparator';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useLingui } from '@lingui/react/macro';
import { useContext, useMemo, useRef } from 'react';
import { MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES } from 'twenty-shared/constants';
import { emailSchema, isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
import { moveArrayItem } from '~/utils/array/moveArrayItem';
import { toSpliced } from '~/utils/array/toSpliced';
-import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
const getEmailText = (email: string) => email;
@@ -77,6 +78,10 @@ export const EmailsFieldInput = () => {
};
const handleSubmit = (updatedEmails: string[]) => {
+ if (isDeeplyEqual(emails, updatedEmails)) {
+ return;
+ }
+
onSubmit?.({
newValue: parseStringArrayToEmailsValue(updatedEmails),
skipClose: true,
@@ -90,30 +95,25 @@ export const EmailsFieldInput = () => {
const maxNumberOfValues =
fieldDefinition.metadata.settings?.maxNumberOfValues ??
MULTI_ITEM_FIELD_DEFAULT_MAX_VALUES;
+ const isSingleItemMode = maxNumberOfValues === 1;
+ const isLimitReached = emails.length >= maxNumberOfValues;
const {
- isInputDisplayed,
+ inputTarget,
inputValue,
- isAddingNewItem,
- editedItemIndex,
- isEditingItemInPlace,
hasError,
- isSingleItemMode,
- isLimitReached,
+ openInput,
handleInputChange,
- startAdding,
- startEditing,
- closeInput,
- resetInputForItems,
- commitInput,
- } = useMultiItemDraft({
+ validateInputValue,
+ } = useMultiItemInput({
items: emails,
- onItemsChange: handleChange,
- onItemsSubmit: handleSubmit,
getItemText: getEmailText,
+ initialInputTarget: getInitialMultiItemInputTarget({
+ itemCount: emails.length,
+ isSingleItemMode,
+ }),
validateInput: validateEmail,
- maxItemCount: maxNumberOfValues,
- onError: (hasError) =>
+ onHasErrorChange: (hasError) =>
setRecordFieldInputIsFieldInError(hasError && emails.length === 0),
});
@@ -124,22 +124,63 @@ 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 sanitizedInput = validateInputValue();
+
+ if (!isDefined(sanitizedInput)) {
+ return null;
+ }
+
+ const updatedEmails = computeUpdatedMultiItemFieldItems({
+ sanitizedInput,
+ items: emails,
+ editingIndex: editedItemIndex,
+ singleItemMode: isSingleItemMode,
+ });
+
+ handleChange(updatedEmails);
+
+ return updatedEmails;
+ };
+
const handleInputEnter = () => {
- const updatedItems = commitInput();
+ const updatedEmails = commitInput();
- if (!isDefined(updatedItems)) {
+ if (!isDefined(updatedEmails)) {
return;
}
if (isSingleItemMode) {
- onEnter?.({ newValue: parseStringArrayToEmailsValue(updatedItems) });
- } else if (!isDeeplyEqual(emails, updatedItems)) {
- handleSubmit(updatedItems);
+ onEnter?.({ newValue: parseStringArrayToEmailsValue(updatedEmails) });
+ } else {
+ handleSubmit(updatedEmails);
}
closeInput();
};
+ const handleAddClick = () => {
+ if (isEditingItemInPlace) {
+ const updatedEmails = commitInput();
+
+ if (!isDefined(updatedEmails)) {
+ return;
+ }
+
+ handleSubmit(updatedEmails);
+ }
+
+ setSearchFilter('');
+ openInput({ type: 'new-item' });
+ };
+
const handleEscape = () => {
onEscape?.({ newValue: parseStringArrayToEmailsValue(emails) });
};
@@ -148,14 +189,14 @@ export const EmailsFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedItems = isInputDisplayed ? commitInput() : emails;
+ const updatedEmails = isInputDisplayed ? commitInput() : emails;
- if (!isDefined(updatedItems)) {
+ if (!isDefined(updatedEmails)) {
return;
}
onClickOutside?.({
- newValue: parseStringArrayToEmailsValue(updatedItems),
+ newValue: parseStringArrayToEmailsValue(updatedEmails),
event,
});
},
@@ -180,7 +221,11 @@ export const EmailsFieldInput = () => {
handleChange(updatedEmails);
handleSubmit(updatedEmails);
- resetInputForItems(updatedEmails);
+ openInput(
+ isNonEmptyArray(updatedEmails)
+ ? { type: 'closed' }
+ : { type: 'new-item' },
+ );
};
const handleCopy = (email: string) => {
@@ -191,19 +236,18 @@ export const EmailsFieldInput = () => {
isNonEmptyArray(filteredItemEntries) &&
(!isSingleItemMode || !isInputDisplayed);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const visibleItemCount = visibleItemEntries?.length ?? 0;
const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
- const shouldShowAddButton = !shouldShowInputInFooter && !isLimitReached;
- const isInputInRow = isNonEmptyArray(emails) && !isSingleItemMode;
+ const inputSpacing: MultiItemFieldInputSpacing =
+ isNonEmptyArray(emails) && !isSingleItemMode ? 'compact' : 'default';
const itemInput = (
<MultiItemFieldInputRow
- isInRow={isInputInRow}
- isInFooter={shouldShowInputInFooter}
+ spacing={inputSpacing}
+ hasPadding={shouldShowInputInFooter && shouldShowItems}
rightComponent={
isNonEmptyArray(emails) ? (
<MultiItemFieldSaveButton
- isAddingNewItem={isAddingNewItem}
+ isAddingNewItem={inputTarget.type === 'new-item'}
onClick={handleInputEnter}
/>
) : undefined
@@ -211,7 +255,7 @@ export const EmailsFieldInput = () => {
>
<MultiItemFieldTextInput
autoFocus
- isInRow={isInputInRow}
+ spacing={inputSpacing}
placeholder={t`Email`}
value={inputValue}
hasError={hasError}
@@ -224,38 +268,28 @@ export const EmailsFieldInput = () => {
);
return (
- <OverlayMenuList
+ <MultiItemFieldList
ref={containerRef}
- header={
- shouldShowSearch && !isInputDisplayed ? (
- <MultiItemFieldSearchHeader
- value={searchFilter}
- onChange={setSearchFilter}
+ hasItems={shouldShowItems}
+ shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ searchFilter={searchFilter}
+ onSearchFilterChange={setSearchFilter}
+ footerInput={shouldShowInputInFooter ? itemInput : undefined}
+ addButton={
+ !shouldShowInputInFooter && !isLimitReached ? (
+ <MultiItemFieldAddButton
+ label={t`Add Email`}
+ onClick={handleAddClick}
/>
) : undefined
}
- footer={
- <>
- {shouldShowItems &&
- (shouldShowInputInFooter || shouldShowAddButton) && (
- <OverlayMenuListSeparator />
- )}
- {shouldShowInputInFooter && itemInput}
- {shouldShowAddButton && (
- <MultiItemFieldAddButton
- label={t`Add Email`}
- onClick={startAdding}
- />
- )}
- </>
- }
>
- {visibleItemEntries?.map(({ item: email, index }, position) =>
- isEditingItemInPlace && index === editedItemIndex ? (
+ {visibleItemEntries?.map(({ item: email, index }, position, entries) =>
+ index === editedItemIndex && isEditingItemInPlace ? (
<MultiItemFieldEditedItem
key={index}
hasSeparatorBefore={position > 0}
- hasSeparatorAfter={position < visibleItemCount - 1}
+ hasSeparatorAfter={position < entries.length - 1}
>
{itemInput}
</MultiItemFieldEditedItem>
@@ -267,13 +301,15 @@ export const EmailsFieldInput = () => {
showSetAsPrimaryButton={index > 0}
showCopyButton={true}
email={email}
- onEdit={() => startEditing(index)}
+ onEdit={() =>
+ openInput({ type: 'existing-item', itemIndex: index })
+ }
onSetAsPrimary={() => handleSetAsPrimary(index)}
onDelete={() => handleDelete(index)}
onCopy={handleCopy}
/>
),
)}
- </OverlayMenuList>
+ </MultiItemFieldList>
);
};
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 ce3fbfc72bd..858ef10ba33 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
@@ -8,19 +8,19 @@ import { FilesFieldLabelInput } from '@/object-record/record-field/ui/meta-types
import { MultiItemFieldEditedItem } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldEditedItem';
import { MultiItemFieldAddButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldAddButton';
import { MultiItemFieldInputRow } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow';
+import { MultiItemFieldList } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldList';
import { MultiItemFieldSaveButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSaveButton';
-import { MultiItemFieldSearchHeader } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSearchHeader';
import { MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX } from '@/object-record/record-field/ui/meta-types/input/constants/MultiItemFieldInputDropdownClickOutsideId';
-import { useMultiItemDraft } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemDraft';
import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemFieldDismiss';
+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';
import { filesFieldValueSchema } from '@/object-record/record-field/ui/validation-schemas/filesFieldValueSchema';
import { filePreviewState } from '@/ui/field/display/states/filePreviewState';
-import { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
-import { OverlayMenuListSeparator } from '@/ui/layout/overlay/components/OverlayMenuListSeparator';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
@@ -86,6 +86,10 @@ export const FilesFieldInput = () => {
};
const handleSubmit = (updatedFiles: FieldFilesValue[]) => {
+ if (isDeeplyEqual(files, updatedFiles)) {
+ return;
+ }
+
onSubmit?.({
newValue: parseFilesArrayToFilesValue(updatedFiles),
skipClose: true,
@@ -97,7 +101,7 @@ export const FilesFieldInput = () => {
return;
}
- const currentFiles = commitEditedItem();
+ const currentFiles = commitEditedItemInPlace();
if (!isDefined(currentFiles)) {
return;
@@ -161,30 +165,26 @@ export const FilesFieldInput = () => {
);
};
+ const isSingleItemMode = maxNumberOfValues === 1;
+ const isLimitReached = files.length >= maxNumberOfValues;
+
const {
- isInputDisplayed,
+ inputTarget,
inputValue,
- editedItemIndex,
- isEditingItemInPlace,
hasError,
- isSingleItemMode,
- isLimitReached,
+ openInput,
handleInputChange,
- startEditing,
- closeInput,
- resetInputForItems,
- commitInput,
- commitEditedItem,
- } = useMultiItemDraft({
+ validateInputValue,
+ } = useMultiItemInput({
items: files,
- onItemsChange: handleChange,
- onItemsSubmit: handleSubmit,
getItemText: getFileText,
+ initialInputTarget: getInitialMultiItemInputTarget({
+ itemCount: files.length,
+ isSingleItemMode,
+ shouldOpenWhenEmpty: false,
+ }),
validateInput: validateFileLabel,
- formatInput: formatFileLabelInputOrThrow,
- maxItemCount: maxNumberOfValues,
- shouldOpenInputWhenEmpty: false,
- onError: (hasError) =>
+ onHasErrorChange: (hasError) =>
setRecordFieldInputIsFieldInError(hasError && files.length === 0),
});
@@ -195,17 +195,58 @@ 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 sanitizedInput = validateInputValue();
+
+ if (!isDefined(sanitizedInput)) {
+ return null;
+ }
+
+ const updatedFiles = computeUpdatedMultiItemFieldItems({
+ sanitizedInput,
+ items: files,
+ editingIndex: editedItemIndex,
+ singleItemMode: isSingleItemMode,
+ formatInput: formatFileLabelInputOrThrow,
+ });
+
+ handleChange(updatedFiles);
+
+ return updatedFiles;
+ };
+
+ const commitEditedItemInPlace = () => {
+ if (!isEditingItemInPlace) {
+ return files;
+ }
+
+ const updatedFiles = commitInput();
+
+ if (isDefined(updatedFiles)) {
+ handleSubmit(updatedFiles);
+ }
+
+ return updatedFiles;
+ };
+
const handleInputEnter = () => {
- const updatedItems = commitInput();
+ const updatedFiles = commitInput();
- if (!isDefined(updatedItems)) {
+ if (!isDefined(updatedFiles)) {
return;
}
if (isSingleItemMode) {
- onEnter?.({ newValue: parseFilesArrayToFilesValue(updatedItems) });
- } else if (!isDeeplyEqual(files, updatedItems)) {
- handleSubmit(updatedItems);
+ onEnter?.({ newValue: parseFilesArrayToFilesValue(updatedFiles) });
+ } else {
+ handleSubmit(updatedFiles);
}
closeInput();
@@ -219,14 +260,14 @@ export const FilesFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedItems = isInputDisplayed ? commitInput() : files;
+ const updatedFiles = isInputDisplayed ? commitInput() : files;
- if (!isDefined(updatedItems)) {
+ if (!isDefined(updatedFiles)) {
return;
}
onClickOutside?.({
- newValue: parseFilesArrayToFilesValue(updatedItems),
+ newValue: parseFilesArrayToFilesValue(updatedFiles),
event,
});
},
@@ -237,7 +278,7 @@ export const FilesFieldInput = () => {
handleChange(updatedFiles);
handleSubmit(updatedFiles);
- resetInputForItems(updatedFiles);
+ closeInput();
};
const handlePreview = (file: FieldFilesValue) => {
@@ -253,15 +294,15 @@ export const FilesFieldInput = () => {
isNonEmptyArray(filteredItemEntries) &&
(!isSingleItemMode || !isInputDisplayed);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const visibleItemCount = visibleItemEntries?.length ?? 0;
const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
- const shouldShowUploadButton = !shouldShowInputInFooter && !isLimitReached;
- const editedFile = files[editedItemIndex];
+ const editedFile = isDefined(editedItemIndex)
+ ? files[editedItemIndex]
+ : undefined;
const fileLabelInput = isDefined(editedFile) && (
<MultiItemFieldInputRow
- isInRow={isEditingItemInPlace}
- isInFooter={shouldShowInputInFooter}
+ spacing={isEditingItemInPlace ? 'compact' : 'default'}
+ hasPadding={shouldShowInputInFooter && shouldShowItems}
rightComponent={
<MultiItemFieldSaveButton
isAddingNewItem={false}
@@ -281,38 +322,28 @@ export const FilesFieldInput = () => {
);
return (
- <OverlayMenuList
+ <MultiItemFieldList
ref={containerRef}
- header={
- shouldShowSearch && !isInputDisplayed ? (
- <MultiItemFieldSearchHeader
- value={searchFilter}
- onChange={setSearchFilter}
+ hasItems={shouldShowItems}
+ shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ searchFilter={searchFilter}
+ onSearchFilterChange={setSearchFilter}
+ footerInput={shouldShowInputInFooter ? fileLabelInput : undefined}
+ addButton={
+ !shouldShowInputInFooter && !isLimitReached ? (
+ <MultiItemFieldAddButton
+ label={isUploading ? t`Uploading...` : t`Upload file`}
+ onClick={handleUploadClick}
/>
) : undefined
}
- footer={
- <>
- {shouldShowItems &&
- (shouldShowInputInFooter || shouldShowUploadButton) && (
- <OverlayMenuListSeparator />
- )}
- {shouldShowInputInFooter && fileLabelInput}
- {shouldShowUploadButton && (
- <MultiItemFieldAddButton
- label={isUploading ? t`Uploading...` : t`Upload file`}
- onClick={handleUploadClick}
- />
- )}
- </>
- }
>
- {visibleItemEntries?.map(({ item: file, index }, position) =>
- isEditingItemInPlace && index === editedItemIndex ? (
+ {visibleItemEntries?.map(({ item: file, index }, position, entries) =>
+ index === editedItemIndex && isEditingItemInPlace ? (
<MultiItemFieldEditedItem
key={file.fileId}
hasSeparatorBefore={position > 0}
- hasSeparatorAfter={position < visibleItemCount - 1}
+ hasSeparatorAfter={position < entries.length - 1}
>
{fileLabelInput}
</MultiItemFieldEditedItem>
@@ -321,12 +352,14 @@ export const FilesFieldInput = () => {
key={file.fileId}
dropdownId={`${MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX}-${fieldDefinition.metadata.fieldName}-${index}`}
file={file}
- onEdit={() => startEditing(index)}
+ onEdit={() =>
+ openInput({ type: 'existing-item', itemIndex: index })
+ }
onDelete={() => handleDelete(index)}
onClick={() => handlePreview(file)}
/>
),
)}
- </OverlayMenuList>
+ </MultiItemFieldList>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldLabelInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldLabelInput.tsx
index 5a0ccd1978c..96b7b984e1d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldLabelInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/FilesFieldLabelInput.tsx
@@ -39,7 +39,7 @@ export const FilesFieldLabelInput = ({
/>
<MultiItemFieldTextInput
autoFocus
- isInRow
+ spacing="compact"
value={value}
hasError={hasError}
onChange={onChange}
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 993f0beb9ba..36640d59ea0 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
@@ -8,21 +8,22 @@ import { MultiItemFieldAddButton } from '@/object-record/record-field/ui/meta-ty
import { MultiItemFieldEditedItem } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldEditedItem';
import { MultiItemFieldInputRow } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow';
import { MultiItemFieldItemSeparator } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldItemSeparator';
+import { MultiItemFieldList } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldList';
import { MultiItemFieldSaveButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSaveButton';
-import { MultiItemFieldSearchHeader } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSearchHeader';
import { MultiItemFieldTextInput } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput';
import { MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX } from '@/object-record/record-field/ui/meta-types/input/constants/MultiItemFieldInputDropdownClickOutsideId';
-import { useMultiItemDraft } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemDraft';
import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemFieldDismiss';
+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 { 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';
import { type FieldLinksValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { linksFieldValueSchema } from '@/object-record/record-field/ui/validation-schemas/linksFieldValueSchema';
-import { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
-import { OverlayMenuListSeparator } from '@/ui/layout/overlay/components/OverlayMenuListSeparator';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { useLingui } from '@lingui/react/macro';
import { useContext, useMemo, useRef, useState } from 'react';
@@ -78,6 +79,10 @@ export const LinksFieldInput = () => {
};
const handleSubmit = (updatedLinks: LinkRecord[]) => {
+ if (isDeeplyEqual(links, updatedLinks)) {
+ return;
+ }
+
onSubmit?.({
newValue: parseArrayToLinksValue(updatedLinks),
skipClose: true,
@@ -110,35 +115,25 @@ export const LinksFieldInput = () => {
errorMessage: '',
});
+ const isSingleItemMode = maxNumberOfValues === 1;
+ const isLimitReached = links.length >= maxNumberOfValues;
+
const {
- isInputDisplayed,
+ inputTarget,
inputValue,
- isAddingNewItem,
- editedItemIndex,
- isEditingItemInPlace,
hasError,
- isSingleItemMode,
- isLimitReached,
+ openInput,
handleInputChange,
- startAdding,
- startEditing,
- closeInput,
- resetInputForItems,
- commitInput,
- } = useMultiItemDraft({
+ validateInputValue,
+ } = useMultiItemInput({
items: links,
- onItemsChange: handleChange,
- onItemsSubmit: handleSubmit,
getItemText: getLinkText,
- validateInput: validateLink,
- formatInput: ({ input, itemIndex }): LinkRecord => ({
- url: input,
- label: shouldEditLabel
- ? getLinkLabelFromDraft(labelDraft)
- : getExistingLinkLabel(itemIndex),
+ initialInputTarget: getInitialMultiItemInputTarget({
+ itemCount: links.length,
+ isSingleItemMode,
}),
- maxItemCount: maxNumberOfValues,
- onError: (hasError) =>
+ validateInput: validateLink,
+ onHasErrorChange: (hasError) =>
setRecordFieldInputIsFieldInError(hasError && links.length === 0),
});
@@ -149,22 +144,70 @@ 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 sanitizedInput = validateInputValue();
+
+ if (!isDefined(sanitizedInput)) {
+ return null;
+ }
+
+ const updatedLinks = computeUpdatedMultiItemFieldItems({
+ sanitizedInput,
+ items: links,
+ editingIndex: editedItemIndex,
+ singleItemMode: isSingleItemMode,
+ formatInput: ({ input, itemIndex }): LinkRecord => ({
+ url: input,
+ label: shouldEditLabel
+ ? getLinkLabelFromDraft(labelDraft)
+ : getExistingLinkLabel(itemIndex),
+ }),
+ });
+
+ handleChange(updatedLinks);
+
+ return updatedLinks;
+ };
+
const handleInputEnter = () => {
- const updatedItems = commitInput();
+ const updatedLinks = commitInput();
- if (!isDefined(updatedItems)) {
+ if (!isDefined(updatedLinks)) {
return;
}
if (isSingleItemMode) {
- onEnter?.({ newValue: parseArrayToLinksValue(updatedItems) });
- } else if (!isDeeplyEqual(links, updatedItems)) {
- handleSubmit(updatedItems);
+ onEnter?.({ newValue: parseArrayToLinksValue(updatedLinks) });
+ } else {
+ handleSubmit(updatedLinks);
}
closeInput();
};
+ const handleAddClick = () => {
+ if (isEditingItemInPlace) {
+ const updatedLinks = commitInput();
+
+ if (!isDefined(updatedLinks)) {
+ return;
+ }
+
+ handleSubmit(updatedLinks);
+ }
+
+ setSearchFilter('');
+ openInput({ type: 'new-item' });
+ };
+
const handleEscape = () => {
onEscape?.({ newValue: parseArrayToLinksValue(links) });
};
@@ -173,14 +216,14 @@ export const LinksFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedItems = isInputDisplayed ? commitInput() : links;
+ const updatedLinks = isInputDisplayed ? commitInput() : links;
- if (!isDefined(updatedItems)) {
+ if (!isDefined(updatedLinks)) {
return;
}
onClickOutside?.({
- newValue: parseArrayToLinksValue(updatedItems),
+ newValue: parseArrayToLinksValue(updatedLinks),
event,
});
},
@@ -188,7 +231,7 @@ export const LinksFieldInput = () => {
const handleEdit = (index: number) => {
setLabelDraft(links[index]?.label ?? '');
- startEditing(index);
+ openInput({ type: 'existing-item', itemIndex: index });
};
const handleSetAsPrimary = (index: number) => {
@@ -207,7 +250,9 @@ export const LinksFieldInput = () => {
handleChange(updatedLinks);
handleSubmit(updatedLinks);
- resetInputForItems(updatedLinks);
+ openInput(
+ isNonEmptyArray(updatedLinks) ? { type: 'closed' } : { type: 'new-item' },
+ );
};
const placeholder = isDomainField ? t`Domain` : t`URL`;
@@ -216,28 +261,26 @@ export const LinksFieldInput = () => {
isNonEmptyArray(filteredItemEntries) &&
(!isSingleItemMode || !isInputDisplayed);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const visibleItemCount = visibleItemEntries?.length ?? 0;
const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
- const shouldShowAddButton = !shouldShowInputInFooter && !isLimitReached;
- const isInputInRow = isNonEmptyArray(links) && !isSingleItemMode;
- const shouldEditLabel = isEditingItemInPlace && !isDomainField;
+ const inputSpacing: MultiItemFieldInputSpacing =
+ isNonEmptyArray(links) && !isSingleItemMode ? 'compact' : 'default';
const saveButton = isNonEmptyArray(links) ? (
<MultiItemFieldSaveButton
- isAddingNewItem={isAddingNewItem}
+ isAddingNewItem={inputTarget.type === 'new-item'}
onClick={handleInputEnter}
/>
) : undefined;
const itemInput = (
<MultiItemFieldInputRow
- isInRow={isInputInRow}
- isInFooter={shouldShowInputInFooter}
+ spacing={inputSpacing}
+ hasPadding={shouldShowInputInFooter && shouldShowItems}
rightComponent={saveButton}
>
<MultiItemFieldTextInput
autoFocus
- isInRow={isInputInRow}
+ spacing={inputSpacing}
placeholder={placeholder}
value={inputValue}
hasError={hasError}
@@ -271,38 +314,28 @@ export const LinksFieldInput = () => {
);
return (
- <OverlayMenuList
+ <MultiItemFieldList
ref={containerRef}
- header={
- shouldShowSearch && !isInputDisplayed ? (
- <MultiItemFieldSearchHeader
- value={searchFilter}
- onChange={setSearchFilter}
+ hasItems={shouldShowItems}
+ shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ searchFilter={searchFilter}
+ onSearchFilterChange={setSearchFilter}
+ footerInput={shouldShowInputInFooter ? itemInput : undefined}
+ addButton={
+ !shouldShowInputInFooter && !isLimitReached ? (
+ <MultiItemFieldAddButton
+ label={t`Add ${placeholder}`}
+ onClick={handleAddClick}
/>
) : undefined
}
- footer={
- <>
- {shouldShowItems &&
- (shouldShowInputInFooter || shouldShowAddButton) && (
- <OverlayMenuListSeparator />
- )}
- {shouldShowInputInFooter && itemInput}
- {shouldShowAddButton && (
- <MultiItemFieldAddButton
- label={t`Add ${placeholder}`}
- onClick={startAdding}
- />
- )}
- </>
- }
>
- {visibleItemEntries?.map(({ item: link, index }, position) =>
- isEditingItemInPlace && index === editedItemIndex ? (
+ {visibleItemEntries?.map(({ item: link, index }, position, entries) =>
+ index === editedItemIndex && isEditingItemInPlace ? (
<MultiItemFieldEditedItem
key={index}
hasSeparatorBefore={!shouldEditLabel && position > 0}
- hasSeparatorAfter={position < visibleItemCount - 1}
+ hasSeparatorAfter={position < entries.length - 1}
>
{editedLinkInputs}
</MultiItemFieldEditedItem>
@@ -320,6 +353,6 @@ export const LinksFieldInput = () => {
/>
),
)}
- </OverlayMenuList>
+ </MultiItemFieldList>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow.tsx
index 14f2c75964a..37670a589a4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow.tsx
@@ -1,45 +1,70 @@
+import { type MultiItemFieldInputSpacing } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing';
import { styled } from '@linaria/react';
import { type ReactNode } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme';
-const StyledInputRow = styled.div<{ isInRow: boolean; isInFooter: boolean }>`
+const COMPACT_ROW_HEIGHT = themeCssVariables.spacing[8];
+const COMPACT_ROW_WITH_PADDING_HEIGHT = `calc(${themeCssVariables.spacing[8]} + 2 * ${themeCssVariables.spacing[1]})`;
+
+const getInputRowHeight = ({
+ spacing,
+ hasPadding,
+}: {
+ spacing: MultiItemFieldInputSpacing;
+ hasPadding: boolean;
+}) => {
+ if (spacing === 'default') {
+ return 'auto';
+ }
+
+ return hasPadding ? COMPACT_ROW_WITH_PADDING_HEIGHT : COMPACT_ROW_HEIGHT;
+};
+
+const StyledInputRow = styled.div<{
+ spacing: MultiItemFieldInputSpacing;
+ hasPadding: boolean;
+}>`
align-items: center;
box-sizing: border-box;
display: flex;
- gap: ${({ isInRow }) => (isInRow ? themeCssVariables.spacing[1] : '0')};
- height: ${({ isInRow }) => (isInRow ? themeCssVariables.spacing[8] : 'auto')};
- margin: ${({ isInRow, isInFooter }) =>
- isInRow && isInFooter ? themeCssVariables.spacing[1] : '0'};
+ gap: ${({ spacing }) =>
+ spacing === 'compact' ? themeCssVariables.spacing[1] : '0'};
+ height: ${getInputRowHeight};
min-height: ${themeCssVariables.spacing[8]};
- width: ${({ isInRow, isInFooter }) =>
- isInRow && isInFooter ? 'auto' : '100%'};
+ padding: ${({ hasPadding }) =>
+ hasPadding ? themeCssVariables.spacing[1] : '0'};
+ width: 100%;
`;
-const StyledRightContainer = styled.div<{ isInRow: boolean }>`
+const StyledRightContainer = styled.div<{
+ spacing: MultiItemFieldInputSpacing;
+}>`
display: flex;
flex-shrink: 0;
- padding-inline-end: ${({ isInRow }) =>
- isInRow ? themeCssVariables.spacing[1] : themeCssVariables.spacing[2]};
+ padding-inline-end: ${({ spacing }) =>
+ spacing === 'compact'
+ ? themeCssVariables.spacing[1]
+ : themeCssVariables.spacing[2]};
`;
type MultiItemFieldInputRowProps = {
children: ReactNode;
rightComponent?: ReactNode;
- isInRow?: boolean;
- isInFooter?: boolean;
+ spacing?: MultiItemFieldInputSpacing;
+ hasPadding?: boolean;
};
export const MultiItemFieldInputRow = ({
children,
rightComponent,
- isInRow = false,
- isInFooter = false,
+ spacing = 'default',
+ hasPadding = false,
}: MultiItemFieldInputRowProps) => (
- <StyledInputRow isInRow={isInRow} isInFooter={isInFooter}>
+ <StyledInputRow spacing={spacing} hasPadding={hasPadding}>
{children}
{isDefined(rightComponent) && (
- <StyledRightContainer isInRow={isInRow}>
+ <StyledRightContainer spacing={spacing}>
{rightComponent}
</StyledRightContainer>
)}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldList.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldList.tsx
new file mode 100644
index 00000000000..9c021666334
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldList.tsx
@@ -0,0 +1,52 @@
+import { MultiItemFieldSearchHeader } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSearchHeader';
+import { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
+import { OverlayMenuListSeparator } from '@/ui/layout/overlay/components/OverlayMenuListSeparator';
+import { type ReactNode, type Ref } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+type MultiItemFieldListProps = {
+ ref: Ref<HTMLDivElement>;
+ children?: ReactNode;
+ hasItems: boolean;
+ footerInput?: ReactNode;
+ addButton?: ReactNode;
+ shouldShowSearch: boolean;
+ searchFilter: string;
+ onSearchFilterChange: (searchFilter: string) => void;
+};
+
+export const MultiItemFieldList = ({
+ ref,
+ children,
+ hasItems,
+ footerInput,
+ addButton,
+ shouldShowSearch,
+ searchFilter,
+ onSearchFilterChange,
+}: MultiItemFieldListProps) => {
+ const hasFooterContent = isDefined(footerInput) || isDefined(addButton);
+
+ return (
+ <OverlayMenuList
+ ref={ref}
+ header={
+ shouldShowSearch ? (
+ <MultiItemFieldSearchHeader
+ value={searchFilter}
+ onChange={onSearchFilterChange}
+ />
+ ) : undefined
+ }
+ footer={
+ <>
+ {hasItems && hasFooterContent && <OverlayMenuListSeparator />}
+ {footerInput}
+ {addButton}
+ </>
+ }
+ >
+ {children}
+ </OverlayMenuList>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput.tsx
index 395d4b43250..7e32620c54c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/MultiItemFieldTextInput.tsx
@@ -1,18 +1,23 @@
import { getMultiItemInputKeyDownHandler } from '@/object-record/record-field/ui/meta-types/input/utils/getMultiItemInputKeyDownHandler';
+import { type MultiItemFieldInputSpacing } from '@/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing';
import { styled } from '@linaria/react';
import { type FocusEvent, type Ref } from 'react';
import { Input } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
-const StyledInputContent = styled.div<{ isInRow: boolean }>`
+const StyledInputContent = styled.div<{
+ spacing: MultiItemFieldInputSpacing;
+}>`
align-items: center;
align-self: stretch;
box-sizing: border-box;
display: flex;
flex: 1;
min-width: 0;
- padding-inline-start: ${({ isInRow }) =>
- isInRow ? themeCssVariables.spacing[1] : themeCssVariables.spacing[2]};
+ padding-inline-start: ${({ spacing }) =>
+ spacing === 'compact'
+ ? themeCssVariables.spacing[1]
+ : themeCssVariables.spacing[2]};
`;
type MultiItemFieldTextInputProps = {
@@ -21,7 +26,7 @@ type MultiItemFieldTextInputProps = {
placeholder?: string;
autoFocus?: boolean;
hasError?: boolean;
- isInRow?: boolean;
+ spacing?: MultiItemFieldInputSpacing;
onEnter?: () => void;
onEscape?: () => void;
onTab?: () => void;
@@ -38,7 +43,7 @@ export const MultiItemFieldTextInput = ({
placeholder,
autoFocus,
hasError = false,
- isInRow = false,
+ spacing = 'default',
onEnter,
onEscape,
onTab,
@@ -48,7 +53,7 @@ export const MultiItemFieldTextInput = ({
onBlur,
ref,
}: MultiItemFieldTextInputProps) => (
- <StyledInputContent isInRow={isInRow}>
+ <StyledInputContent spacing={spacing}>
<Input
variant="plain"
hasFocusRing={false}
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 b8da51d1e33..ef0cee336e9 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
@@ -3,15 +3,18 @@ import { usePhonesField } from '@/object-record/record-field/ui/meta-types/hooks
import { MultiItemFieldEditedItem } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldEditedItem';
import { MultiItemFieldAddButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldAddButton';
import { MultiItemFieldInputRow } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldInputRow';
+import { MultiItemFieldList } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldList';
import { MultiItemFieldSaveButton } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSaveButton';
-import { MultiItemFieldSearchHeader } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemFieldSearchHeader';
import { PhonesFieldMenuItem } from '@/object-record/record-field/ui/meta-types/input/components/PhonesFieldMenuItem';
import { MULTI_ITEM_FIELD_INPUT_DROPDOWN_ID_PREFIX } from '@/object-record/record-field/ui/meta-types/input/constants/MultiItemFieldInputDropdownClickOutsideId';
-import { useMultiItemDraft } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemDraft';
import { useMultiItemFieldDismiss } from '@/object-record/record-field/ui/meta-types/input/hooks/useMultiItemFieldDismiss';
+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';
import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/record-field/ui/states/recordFieldInputIsFieldInErrorComponentState';
import {
type FieldPhonesValue,
@@ -20,8 +23,6 @@ import {
import { phoneSchema } from '@/object-record/record-field/ui/validation-schemas/phoneSchema';
import { phonesFieldValueSchema } from '@/object-record/record-field/ui/validation-schemas/phonesFieldValueSchema';
import { PhoneCountryPickerDropdownButton } from '@/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton';
-import { OverlayMenuList } from '@/ui/layout/overlay/components/OverlayMenuList';
-import { OverlayMenuListSeparator } from '@/ui/layout/overlay/components/OverlayMenuListSeparator';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
@@ -40,9 +41,9 @@ import { stripSimpleQuotesFromString } from '~/utils/string/stripSimpleQuotesFro
const StyledCustomPhoneInputContainer = styled.div<{
hasItem: boolean;
hasError?: boolean;
- isInRow: boolean;
+ spacing: MultiItemFieldInputSpacing;
}>`
- align-self: ${({ isInRow }) => (isInRow ? 'stretch' : 'auto')};
+ align-self: ${({ spacing }) => (spacing === 'compact' ? 'stretch' : 'auto')};
background-color: ${({ hasItem }) =>
hasItem ? themeCssVariables.background.transparent.lighter : 'transparent'};
border: ${({ hasItem, hasError }) =>
@@ -57,7 +58,9 @@ const StyledCustomPhoneInputContainer = styled.div<{
min-width: 0;
`;
-const StyledCustomPhoneInputWrapper = styled.div<{ isInRow: boolean }>`
+const StyledCustomPhoneInputWrapper = styled.div<{
+ spacing: MultiItemFieldInputSpacing;
+}>`
background-color: transparent;
border: none;
color: ${themeCssVariables.font.color.primary};
@@ -77,8 +80,10 @@ const StyledCustomPhoneInputWrapper = styled.div<{ isInRow: boolean }>`
box-sizing: border-box;
color: ${themeCssVariables.font.color.primary};
height: 100%;
- padding-left: ${({ isInRow }) =>
- isInRow ? themeCssVariables.spacing[1] : themeCssVariables.spacing[2]};
+ padding-left: ${({ spacing }) =>
+ spacing === 'compact'
+ ? themeCssVariables.spacing[1]
+ : themeCssVariables.spacing[2]};
&::placeholder,
&::-webkit-input-placeholder {
@@ -170,6 +175,10 @@ export const PhonesFieldInput = () => {
};
const handleSubmit = (updatedPhones: PhoneRecord[]) => {
+ if (isDeeplyEqual(phones, updatedPhones)) {
+ return;
+ }
+
onSubmit?.({
newValue: parseArrayToPhonesValue(updatedPhones),
skipClose: true,
@@ -180,30 +189,25 @@ export const PhonesFieldInput = () => {
recordFieldInputIsFieldInErrorComponentState,
);
+ const isSingleItemMode = maxNumberOfValues === 1;
+ const isLimitReached = phones.length >= maxNumberOfValues;
+
const {
- isInputDisplayed,
+ inputTarget,
inputValue,
- isAddingNewItem,
- editedItemIndex,
- isEditingItemInPlace,
hasError,
- isSingleItemMode,
- isLimitReached,
+ openInput,
handleInputChange,
- startAdding,
- startEditing,
- closeInput,
- resetInputForItems,
- commitInput,
- } = useMultiItemDraft({
+ validateInputValue,
+ } = useMultiItemInput({
items: phones,
- onItemsChange: handleChange,
- onItemsSubmit: handleSubmit,
getItemText: getPhoneText,
+ initialInputTarget: getInitialMultiItemInputTarget({
+ itemCount: phones.length,
+ isSingleItemMode,
+ }),
validateInput: validatePhone,
- formatInput: formatPhoneInput,
- maxItemCount: maxNumberOfValues,
- onError: (hasError) =>
+ onHasErrorChange: (hasError) =>
setRecordFieldInputIsFieldInError(hasError && phones.length === 0),
});
@@ -214,22 +218,64 @@ 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 sanitizedInput = validateInputValue();
+
+ if (!isDefined(sanitizedInput)) {
+ return null;
+ }
+
+ const updatedPhones = computeUpdatedMultiItemFieldItems({
+ sanitizedInput,
+ items: phones,
+ editingIndex: editedItemIndex,
+ singleItemMode: isSingleItemMode,
+ formatInput: formatPhoneInput,
+ });
+
+ handleChange(updatedPhones);
+
+ return updatedPhones;
+ };
+
const handleInputEnter = () => {
- const updatedItems = commitInput();
+ const updatedPhones = commitInput();
- if (!isDefined(updatedItems)) {
+ if (!isDefined(updatedPhones)) {
return;
}
if (isSingleItemMode) {
- onEnter?.({ newValue: parseArrayToPhonesValue(updatedItems) });
- } else if (!isDeeplyEqual(phones, updatedItems)) {
- handleSubmit(updatedItems);
+ onEnter?.({ newValue: parseArrayToPhonesValue(updatedPhones) });
+ } else {
+ handleSubmit(updatedPhones);
}
closeInput();
};
+ const handleAddClick = () => {
+ if (isEditingItemInPlace) {
+ const updatedPhones = commitInput();
+
+ if (!isDefined(updatedPhones)) {
+ return;
+ }
+
+ handleSubmit(updatedPhones);
+ }
+
+ setSearchFilter('');
+ openInput({ type: 'new-item' });
+ };
+
const handleEscape = () => {
onEscape?.({ newValue: parseArrayToPhonesValue(phones) });
};
@@ -238,14 +284,14 @@ export const PhonesFieldInput = () => {
containerRef,
onEscape: handleEscape,
onClickOutside: (event) => {
- const updatedItems = isInputDisplayed ? commitInput() : phones;
+ const updatedPhones = isInputDisplayed ? commitInput() : phones;
- if (!isDefined(updatedItems)) {
+ if (!isDefined(updatedPhones)) {
return;
}
onClickOutside?.({
- newValue: parseArrayToPhonesValue(updatedItems),
+ newValue: parseArrayToPhonesValue(updatedPhones),
event,
});
},
@@ -270,37 +316,40 @@ export const PhonesFieldInput = () => {
handleChange(updatedPhones);
handleSubmit(updatedPhones);
- resetInputForItems(updatedPhones);
+ openInput(
+ isNonEmptyArray(updatedPhones)
+ ? { type: 'closed' }
+ : { type: 'new-item' },
+ );
};
const shouldShowItems =
isNonEmptyArray(filteredItemEntries) &&
(!isSingleItemMode || !isInputDisplayed);
const visibleItemEntries = shouldShowItems ? filteredItemEntries : undefined;
- const visibleItemCount = visibleItemEntries?.length ?? 0;
const shouldShowInputInFooter = isInputDisplayed && !isEditingItemInPlace;
- const shouldShowAddButton = !shouldShowInputInFooter && !isLimitReached;
- const isInputInRow = isNonEmptyArray(phones) && !isSingleItemMode;
+ const inputSpacing: MultiItemFieldInputSpacing =
+ isNonEmptyArray(phones) && !isSingleItemMode ? 'compact' : 'default';
const itemInput = (
<MultiItemFieldInputRow
- isInRow={isInputInRow}
- isInFooter={shouldShowInputInFooter}
+ spacing={inputSpacing}
+ hasPadding={shouldShowInputInFooter && shouldShowItems}
rightComponent={
isNonEmptyArray(phones) ? (
<MultiItemFieldSaveButton
- isAddingNewItem={isAddingNewItem}
+ isAddingNewItem={inputTarget.type === 'new-item'}
onClick={handleInputEnter}
/>
) : undefined
}
>
<StyledCustomPhoneInputContainer
- hasItem={isNonEmptyArray(phones) && !isInputInRow}
+ hasItem={isNonEmptyArray(phones) && inputSpacing === 'default'}
hasError={hasError}
- isInRow={isInputInRow}
+ spacing={inputSpacing}
>
- <StyledCustomPhoneInputWrapper isInRow={isInputInRow}>
+ <StyledCustomPhoneInputWrapper spacing={inputSpacing}>
<ReactPhoneNumberInput
autoFocus
placeholder={t`Phone`}
@@ -322,38 +371,28 @@ export const PhonesFieldInput = () => {
);
return (
- <OverlayMenuList
+ <MultiItemFieldList
ref={containerRef}
- header={
- shouldShowSearch && !isInputDisplayed ? (
- <MultiItemFieldSearchHeader
- value={searchFilter}
- onChange={setSearchFilter}
+ hasItems={shouldShowItems}
+ shouldShowSearch={shouldShowSearch && !isInputDisplayed}
+ searchFilter={searchFilter}
+ onSearchFilterChange={setSearchFilter}
+ footerInput={shouldShowInputInFooter ? itemInput : undefined}
+ addButton={
+ !shouldShowInputInFooter && !isLimitReached ? (
+ <MultiItemFieldAddButton
+ label={t`Add Phone`}
+ onClick={handleAddClick}
/>
) : undefined
}
- footer={
- <>
- {shouldShowItems &&
- (shouldShowInputInFooter || shouldShowAddButton) && (
- <OverlayMenuListSeparator />
- )}
- {shouldShowInputInFooter && itemInput}
- {shouldShowAddButton && (
- <MultiItemFieldAddButton
- label={t`Add Phone`}
- onClick={startAdding}
- />
- )}
- </>
- }
>
- {visibleItemEntries?.map(({ item: phone, index }, position) =>
- isEditingItemInPlace && index === editedItemIndex ? (
+ {visibleItemEntries?.map(({ item: phone, index }, position, entries) =>
+ index === editedItemIndex && isEditingItemInPlace ? (
<MultiItemFieldEditedItem
key={index}
hasSeparatorBefore={position > 0}
- hasSeparatorAfter={position < visibleItemCount - 1}
+ hasSeparatorAfter={position < entries.length - 1}
>
{itemInput}
</MultiItemFieldEditedItem>
@@ -364,12 +403,14 @@ export const PhonesFieldInput = () => {
showPrimaryIcon={index === 0 && phones.length > 1}
showSetAsPrimaryButton={index > 0}
phone={phone}
- onEdit={() => startEditing(index)}
+ onEdit={() =>
+ openInput({ type: 'existing-item', itemIndex: index })
+ }
onSetAsPrimary={() => handleSetAsPrimary(index)}
onDelete={() => handleDelete(index)}
/>
),
)}
- </OverlayMenuList>
+ </MultiItemFieldList>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useMultiItemDraft.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useMultiItemDraft.ts
deleted file mode 100644
index 2a79fc55088..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useMultiItemDraft.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { computeUpdatedMultiItemFieldItems } from '@/object-record/record-field/ui/meta-types/input/utils/computeUpdatedMultiItemFieldItems';
-import { sanitizeAndValidateInput } from '@/object-record/record-field/ui/meta-types/input/utils/sanitizeAndValidateInput';
-import { isNonEmptyString } from '@sniptt/guards';
-import { useState } from 'react';
-import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
-import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
-
-type UseMultiItemDraftParams<TItem> = {
- items: TItem[];
- getItemText: (item: TItem) => string;
- onItemsChange: (items: TItem[]) => void;
- onItemsSubmit?: (items: TItem[]) => void;
- validateInput?: (input: string) => { isValid: boolean; errorMessage: string };
- formatInput?: (params: { input: string; itemIndex?: number }) => TItem;
- maxItemCount?: number;
- shouldOpenInputWhenEmpty?: boolean;
- onError?: (hasError: boolean) => void;
-};
-
-export const useMultiItemDraft = <TItem>({
- items,
- getItemText,
- onItemsChange,
- onItemsSubmit,
- validateInput,
- formatInput,
- maxItemCount,
- shouldOpenInputWhenEmpty = true,
- onError,
-}: UseMultiItemDraftParams<TItem>) => {
- const isSingleItemMode = maxItemCount === 1;
- const isLimitReached =
- isDefined(maxItemCount) && items.length >= maxItemCount;
-
- const shouldOpenInputOnMount =
- shouldOpenInputWhenEmpty && (items.length === 0 || isSingleItemMode);
-
- const [isInputDisplayed, setIsInputDisplayed] = useState(
- shouldOpenInputOnMount,
- );
- const [inputValue, setInputValue] = useState(
- shouldOpenInputOnMount && isNonEmptyArray(items)
- ? getItemText(items[0])
- : '',
- );
- const [editedItemIndex, setEditedItemIndex] = useState(0);
- const [isAddingNewItem, setIsAddingNewItem] = useState(false);
- const [hasError, setHasError] = useState(false);
-
- const isEditingItemInPlace =
- isInputDisplayed &&
- !isAddingNewItem &&
- !isSingleItemMode &&
- editedItemIndex < items.length;
-
- const handleInputChange = (value: string) => {
- setInputValue(turnIntoEmptyStringIfWhitespacesOnly(value));
-
- if (!isDefined(validateInput)) {
- return;
- }
-
- setHasError(false);
- onError?.(false);
- };
-
- const startAdding = () => {
- if (isLimitReached || !isDefined(commitEditedItem())) {
- return;
- }
-
- setIsAddingNewItem(true);
- setInputValue('');
- setIsInputDisplayed(true);
- };
-
- const startEditing = (index: number) => {
- setEditedItemIndex(index);
- setInputValue(getItemText(items[index]));
- setIsAddingNewItem(false);
- setIsInputDisplayed(true);
- };
-
- const closeInput = () => {
- setIsInputDisplayed(false);
- setIsAddingNewItem(false);
- setInputValue('');
- };
-
- const resetInputForItems = (remainingItems: TItem[]) => {
- const shouldShowInput =
- remainingItems.length === 0 && shouldOpenInputWhenEmpty;
-
- setIsInputDisplayed(shouldShowInput);
- setIsAddingNewItem(false);
-
- if (shouldShowInput) {
- setInputValue('');
- }
- };
-
- const commitInput = (): TItem[] | null => {
- const { sanitizedInput, isValid } = sanitizeAndValidateInput(
- inputValue,
- validateInput,
- );
-
- if (!isValid) {
- setHasError(true);
- onError?.(true);
-
- return null;
- }
-
- const editingIndex = isAddingNewItem ? null : editedItemIndex;
-
- const updatedItems = computeUpdatedMultiItemFieldItems({
- sanitizedInput,
- items,
- editingIndex,
- singleItemMode: isSingleItemMode,
- formatInput,
- });
-
- const isItemDeletion =
- !isNonEmptyString(sanitizedInput) &&
- isDefined(editingIndex) &&
- !isSingleItemMode;
-
- if (isItemDeletion) {
- resetInputForItems(updatedItems);
- }
-
- onItemsChange(updatedItems);
-
- return updatedItems;
- };
-
- const commitEditedItem = (): TItem[] | null => {
- if (!isEditingItemInPlace) {
- return items;
- }
-
- const updatedItems = commitInput();
-
- if (!isDefined(updatedItems)) {
- return null;
- }
-
- if (!isDeeplyEqual(items, updatedItems)) {
- onItemsSubmit?.(updatedItems);
- }
-
- return updatedItems;
- };
-
- return {
- isInputDisplayed,
- inputValue,
- isAddingNewItem,
- editedItemIndex,
- isEditingItemInPlace,
- hasError,
- isSingleItemMode,
- isLimitReached,
- handleInputChange,
- startAdding,
- startEditing,
- closeInput,
- resetInputForItems,
- commitInput,
- commitEditedItem,
- };
-};
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
new file mode 100644
index 00000000000..53fbe13f121
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useMultiItemInput.ts
@@ -0,0 +1,76 @@
+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';
+import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
+
+export const useMultiItemInput = <TItem>({
+ items,
+ getItemText,
+ initialInputTarget,
+ validateInput,
+ onHasErrorChange,
+}: {
+ items: TItem[];
+ getItemText: (item: TItem) => string;
+ initialInputTarget: MultiItemInputTarget;
+ 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 [inputValue, setInputValue] = useState(() =>
+ getInputTextForTarget(initialInputTarget),
+ );
+ const [hasError, setHasError] = useState(false);
+
+ const updateHasError = (nextHasError: boolean) => {
+ setHasError(nextHasError);
+ onHasErrorChange?.(nextHasError);
+ };
+
+ const openInput = (nextInputTarget: MultiItemInputTarget) => {
+ setInputTarget(nextInputTarget);
+ setInputValue(getInputTextForTarget(nextInputTarget));
+
+ if (hasError) {
+ updateHasError(false);
+ }
+ };
+
+ const handleInputChange = (value: string) => {
+ setInputValue(turnIntoEmptyStringIfWhitespacesOnly(value));
+
+ if (isDefined(validateInput)) {
+ updateHasError(false);
+ }
+ };
+
+ const validateInputValue = (): string | null => {
+ const { sanitizedInput, isValid } = sanitizeAndValidateInput(
+ inputValue,
+ validateInput,
+ );
+
+ if (!isValid) {
+ updateHasError(true);
+
+ return null;
+ }
+
+ return sanitizedInput;
+ };
+
+ return {
+ inputTarget,
+ inputValue,
+ hasError,
+ openInput,
+ handleInputChange,
+ validateInputValue,
+ };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing.ts
new file mode 100644
index 00000000000..edf1da4c64d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/types/MultiItemFieldInputSpacing.ts
@@ -0,0 +1 @@
+export type MultiItemFieldInputSpacing = 'default' | 'compact';
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
new file mode 100644
index 00000000000..e0382320d4e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/types/MultiItemInputTarget.ts
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000000..66f2a276cc8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/getInitialMultiItemInputTarget.test.ts
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000000..c22278a69d3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/getInitialMultiItemInputTarget.ts
@@ -0,0 +1,23 @@
+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' };
+};