Skip to content

The open alternative to Salesforce, designed for AI.

Edit wrapping text in a text area and show the domain favicon in link inputs (#28767)

Charles Bochetef9652dcdafa
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldDomainFavicon.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldDomainFavicon.tsx
new file mode 100644
index 00000000000..8ec07872ce0
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/LinksFieldDomainFavicon.tsx
@@ -0,0 +1,43 @@
+import { styled } from '@linaria/react';
+import {
+ getLogoUrlFromDomainName,
+ isValidDomain,
+ normalizeDomain,
+} from 'twenty-shared/utils';
+import { IconWorld } from 'twenty-ui/icon';
+import { Avatar } from 'twenty-ui/primitives/data-display';
+import { themeCssVariables, useTheme } from 'twenty-ui/theme';
+
+const StyledFaviconContainer = styled.span`
+ align-items: center;
+ align-self: stretch;
+ border-right: 1px solid ${themeCssVariables.border.color.medium};
+ box-sizing: border-box;
+ display: flex;
+ flex-shrink: 0;
+ justify-content: center;
+ width: ${themeCssVariables.spacing[8]};
+`;
+
+type LinksFieldDomainFaviconProps = {
+ domain: string;
+};
+
+export const LinksFieldDomainFavicon = ({
+ domain,
+}: LinksFieldDomainFaviconProps) => {
+ const theme = useTheme();
+
+ const faviconUrl = isValidDomain(domain)
+ ? getLogoUrlFromDomainName(normalizeDomain(domain))
+ : undefined;
+
+ return (
+ <StyledFaviconContainer aria-hidden>
+ <Avatar.Root size="md" shape="square" backgroundColor="transparent">
+ <Avatar.Image src={faviconUrl} alt="" />
+ <Avatar.Fallback render={<IconWorld size={theme.icon.size.md} />} />
+ </Avatar.Root>
+ </StyledFaviconContainer>
+ );
+};
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 8947f21baef..43c716d60ea 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
@@ -1,6 +1,7 @@
import { getLinksVariant } from '@/object-record/spreadsheet-import/utils/getLinksVariant';
import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
import { useLinksField } from '@/object-record/record-field/ui/meta-types/hooks/useLinksField';
+import { LinksFieldDomainFavicon } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldDomainFavicon';
import { LinksFieldEditInputs } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldEditInputs';
import { LinksFieldEditPreview } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldEditPreview';
import { LinksFieldMenuItem } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldMenuItem';
@@ -266,6 +267,7 @@ export const LinksFieldInput = () => {
hasPadding={shouldShowInputInFooter && shouldShowItems}
rightComponent={saveButton}
>
+ {isDomainField && <LinksFieldDomainFavicon domain={inputValue} />}
<MultiItemFieldTextInput
autoFocus
spacing={inputSpacing}
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 7c5864220d0..c4d46637e83 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
@@ -18,6 +18,8 @@ import { isFieldFiles } from '@/object-record/record-field/ui/types/guards/isFie
import { isFieldFilesValue } from '@/object-record/record-field/ui/types/guards/isFieldFilesValue';
import { isFieldFullName } from '@/object-record/record-field/ui/types/guards/isFieldFullName';
import { isFieldFullNameValue } from '@/object-record/record-field/ui/types/guards/isFieldFullNameValue';
+import { isFieldText } from '@/object-record/record-field/ui/types/guards/isFieldText';
+import { isFieldTextValue } from '@/object-record/record-field/ui/types/guards/isFieldTextValue';
import { isFieldLinks } from '@/object-record/record-field/ui/types/guards/isFieldLinks';
import { isFieldLinksValue } from '@/object-record/record-field/ui/types/guards/isFieldLinksValue';
import { isFieldNumber } from '@/object-record/record-field/ui/types/guards/isFieldNumber';
@@ -34,6 +36,7 @@ import { RecordFormFilesFieldInput } from '@/object-record/record-form/component
import { RecordFormFullNameFieldInput } from '@/object-record/record-form/components/RecordFormFullNameFieldInput';
import { RecordFormLinksFieldInput } from '@/object-record/record-form/components/RecordFormLinksFieldInput';
import { RecordFormPhonesFieldInput } from '@/object-record/record-form/components/RecordFormPhonesFieldInput';
+import { RecordFormTextAreaFieldInput } from '@/object-record/record-form/components/RecordFormTextAreaFieldInput';
import { getRecordFormCurrencyFieldDefaultValue } from '@/object-record/record-form/utils/getRecordFormCurrencyFieldDefaultValue';
import { getLinksVariant } from '@/object-record/spreadsheet-import/utils/getLinksVariant';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
@@ -160,6 +163,21 @@ export const RecordFormFieldInput = ({
);
}
+ if (
+ isFieldText(field) &&
+ !readonly &&
+ (field.metadata.settings?.displayedMaxRows ?? 0) > 1
+ ) {
+ return (
+ <RecordFormTextAreaFieldInput
+ label={field.label}
+ defaultValue={isFieldTextValue(defaultValue) ? defaultValue : undefined}
+ placeholder={placeholder}
+ onChange={onChange}
+ />
+ );
+ }
+
if (isFieldEmails(field) && !readonly) {
return (
<RecordFormEmailsFieldInput
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormLinksFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormLinksFieldInput.tsx
index c6162c2ce89..063812ea88c 100644
--- a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormLinksFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormLinksFieldInput.tsx
@@ -1,3 +1,4 @@
+import { LinksFieldDomainFavicon } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldDomainFavicon';
import { LinksFieldEditInputs } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldEditInputs';
import { LinksFieldEditPreview } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldEditPreview';
import { LinksFieldMenuItem } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldMenuItem';
@@ -317,6 +318,7 @@ export const RecordFormLinksFieldInput = ({
hasPadding={shouldShowItems && shouldShowInputInFooter}
rightComponent={saveButton}
>
+ {isDomainField && <LinksFieldDomainFavicon domain={inputValue} />}
<MultiItemFieldTextInput
ref={inputRef}
autoFocus={shouldFocusInput}
diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormTextAreaFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormTextAreaFieldInput.tsx
new file mode 100644
index 00000000000..5daad62cd18
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormTextAreaFieldInput.tsx
@@ -0,0 +1,41 @@
+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';
+import { useLingui } from '@lingui/react/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+import { useId } from 'react';
+import { Field, Textarea } from 'twenty-ui/primitives/input';
+import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
+
+type RecordFormTextAreaFieldInputProps = {
+ label?: string;
+ defaultValue?: string | null;
+ placeholder?: string;
+ onChange: (value: string) => void;
+};
+
+export const RecordFormTextAreaFieldInput = ({
+ label,
+ defaultValue,
+ placeholder,
+ onChange,
+}: RecordFormTextAreaFieldInputProps) => {
+ const { t } = useLingui();
+ const instanceId = useId();
+
+ return (
+ <FormFieldInputContainer>
+ {isNonEmptyString(label) ? (
+ <Field.Label htmlFor={instanceId}>{label}</Field.Label>
+ ) : null}
+ <Textarea
+ id={instanceId}
+ autoResize
+ rows={2}
+ defaultValue={defaultValue ?? undefined}
+ placeholder={placeholder ?? t`Enter text`}
+ onChange={(event) =>
+ onChange(turnIntoEmptyStringIfWhitespacesOnly(event.target.value))
+ }
+ />
+ </FormFieldInputContainer>
+ );
+};
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 c60aa8ca4f8..b9fc57afb3d 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
@@ -110,6 +110,15 @@ const addressFieldMetadataItem: FieldMetadataItem = {
settings: null,
};
+const taglineFieldMetadataItem: FieldMetadataItem = {
+ ...getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: companyObjectMetadataItem,
+ fieldName: 'tagline',
+ }),
+ label: 'Tagline',
+ settings: { displayedMaxRows: 3 },
+};
+
type RecordFormFieldInputsWithDraftProps = {
fieldMetadataItems: FieldMetadataItem[];
initialDraftRecord?: Partial<ObjectRecord>;
@@ -801,3 +810,22 @@ export const StoredAddressShowsDetails: Story = {
await expect(args.onFieldValueChange).not.toHaveBeenCalled();
},
};
+
+export const WrappingText: Story = {
+ args: {
+ fieldMetadataItems: [taglineFieldMetadataItem],
+ },
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const textArea = canvas.getByRole('textbox', { name: 'Tagline' });
+
+ await expect(textArea.tagName).toBe('TEXTAREA');
+
+ await userEvent.type(textArea, 'Build{Enter}the CRM');
+
+ await expect(args.onFieldValueChange).toHaveBeenLastCalledWith(
+ 'tagline',
+ 'Build\nthe CRM',
+ );
+ },
+};