Skip to content

The open alternative to Salesforce, designed for AI.

Add field description tooltips (#25408)

Thomas des Francse17b6e3d38df
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-surfaces-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-surfaces-gallery.front-component.tsx
index 483295c1666..9e71e1451ed 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-surfaces-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-surfaces-gallery.front-component.tsx
@@ -27,7 +27,7 @@ const SURFACES_ENTRIES: GalleryEntry[] = [
<span id="gallery-tooltip-anchor">Tooltip anchor</span>
<AppTooltip
anchorSelect="#gallery-tooltip-anchor"
- content="Tooltip content"
+ title="Tooltip content"
isOpen={true}
/>
</>
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventCallRecorderAvatar.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventCallRecorderAvatar.tsx
index 9fe115d71bc..0e805a44d2b 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventCallRecorderAvatar.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventCallRecorderAvatar.tsx
@@ -72,7 +72,7 @@ export const CalendarEventCallRecorderAvatar = ({
{createPortal(
<AppTooltip
anchorSelect={`#${tooltipAnchorId}`}
- content={getCallRecordingStatusLabel(status)}
+ title={getCallRecordingStatusLabel(status)}
delay={TooltipDelay.shortDelay}
place={TooltipPosition.Top}
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
index f50831d29e7..24f719724b7 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
@@ -46,7 +46,7 @@ export const EmailThreadMessageSender = ({
</StyledThreadMessageSentAt>
<AppTooltip
anchorSelect={`#${tooltipId}`}
- content={formatToHumanReadableDate(sentAt)}
+ title={formatToHumanReadableDate(sentAt)}
place={TooltipPosition.Top}
/>
</>
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
index fa4490fdc0c..90a396bff1a 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
@@ -48,7 +48,7 @@ export const EmailThreadNotShared = ({
{visibility === MessageChannelVisibility.SUBJECT && (
<AppTooltip
anchorSelect={`#${containerId}`}
- content={t`Only the subject is shared`}
+ title={t`Only the subject is shared`}
delay={TooltipDelay.mediumDelay}
noArrow
place="bottom"
diff --git a/packages/twenty-front/src/modules/activities/notes/components/NoteList.tsx b/packages/twenty-front/src/modules/activities/notes/components/NoteList.tsx
index e87a9c8a2a1..8b477b9a2c5 100644
--- a/packages/twenty-front/src/modules/activities/notes/components/NoteList.tsx
+++ b/packages/twenty-front/src/modules/activities/notes/components/NoteList.tsx
@@ -1,6 +1,7 @@
import { styled } from '@linaria/react';
import { type Note } from '@/activities/types/Note';
+import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { NoteTile } from './NoteTile';
@@ -29,17 +30,19 @@ export const NoteList = ({ notes }: NoteListProps) => {
return (
<>
{notes.length > 0 && (
- <StyledContainer>
- <StyledNoteContainer>
- {notes.map((note) => (
- <NoteTile
- key={note.id}
- note={note}
- isSingleNote={notes.length === 1}
- />
- ))}
- </StyledNoteContainer>
- </StyledContainer>
+ <FieldDescriptionTooltipProvider>
+ <StyledContainer>
+ <StyledNoteContainer>
+ {notes.map((note) => (
+ <NoteTile
+ key={note.id}
+ note={note}
+ isSingleNote={notes.length === 1}
+ />
+ ))}
+ </StyledNoteContainer>
+ </StyledContainer>
+ </FieldDescriptionTooltipProvider>
)}
</>
);
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
index 0b6b995b5f3..e04f29f5a3d 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
@@ -53,7 +53,7 @@ export const EventRowDate = ({ happensAt }: EventRowDateProps) => {
</StyledEventRowDate>
<AppTooltip
anchorSelect={`#${dateElementId}`}
- content={exactHappensAt}
+ title={exactHappensAt}
delay={TooltipDelay.mediumDelay}
noArrow
place="left"
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRelationFieldDiffValues.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRelationFieldDiffValues.tsx
index 0f8396ff974..a5a79b3c99e 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRelationFieldDiffValues.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRelationFieldDiffValues.tsx
@@ -152,7 +152,7 @@ const RelationFieldDiffValue = ({
)}
<AppTooltip
anchorSelect={`#${tooltipAnchorId}`}
- content={tooltipContent}
+ title={tooltipContent}
delay={TooltipDelay.shortDelay}
place={TooltipPosition.Bottom}
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx b/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
index 890ac4b71b1..f0feaaef7f2 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
@@ -483,7 +483,7 @@ export const AiChatQuestionCard = ({
</span>
<AppTooltip
anchorSelect={`#${tooltipId}`}
- content={option.description}
+ title={option.description}
delay={TooltipDelay.shortDelay}
place="left"
/>
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
index cfdde03121c..0d0b78a35a6 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
@@ -71,7 +71,7 @@ export const CommandMenuButton = ({
<StyledWrapper>
<AppTooltip
anchorSelect={`#command-menu-item-entry-${command.key}`}
- content={command.label}
+ title={command.label}
delay={TooltipDelay.longDelay}
place={TooltipPosition.Bottom}
offset={5}
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx
index 33622e804be..92aaea93354 100644
--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx
@@ -154,7 +154,7 @@ export const MainNavigationDrawerModeSwitcher = () => {
<AppTooltip
key={mode}
anchorSelect={`[data-tooltip-id='${tooltipId}-${mode}']`}
- content={label}
+ title={label}
delay={TooltipDelay.noDelay}
place={TooltipPosition.Right}
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
index 43b8248a191..b1ea30f1b3a 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
@@ -33,6 +33,7 @@ export const formatFieldMetadataItemAsFieldDefinition = ({
: undefined;
const fieldDefintionMetadata = {
+ description: field.description,
fieldName: field.name,
placeHolder: field.label,
relationType,
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
index 03ce52a1bae..68813fd37fb 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCustomView.tsx
@@ -272,10 +272,10 @@ export const ObjectOptionsDropdownCustomView = ({
{isDefaultView && (
<AppTooltip
anchorSelect={`#group-by-menu-item`}
- content={t`Not available on Default View`}
+ title={t`Not available on Default View`}
noArrow
place="bottom"
- width="100%"
+ maxWidth="100%"
/>
)}
</DropdownMenuItemsContainer>
@@ -299,14 +299,14 @@ export const ObjectOptionsDropdownCustomView = ({
{(isDefaultView || isLastView) && (
<AppTooltip
anchorSelect={`#delete-view-menu-item`}
- content={
+ title={
isDefaultView
? t`Not available on Default View`
: t`Cannot delete the only view`
}
noArrow
place="bottom"
- width="100%"
+ maxWidth="100%"
/>
)}
</DropdownMenuItemsContainer>
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
index 6b8b6aafcf2..4a214b91a80 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownVisibilityContent.tsx
@@ -117,7 +117,7 @@ export const ObjectOptionsDropdownVisibilityContent = () => {
createPortal(
<AppTooltip
anchorSelect="#workspace-visibility-option"
- content={t`Workspace views require manage views permission`}
+ title={t`Workspace views require manage views permission`}
positionStrategy="fixed"
/>,
document.body,
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
index 7355c07ac15..536ab5843a7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
@@ -1,4 +1,5 @@
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
@@ -81,132 +82,134 @@ export const RecordFieldList = ({
});
return (
- <RecordFieldListComponentInstanceContext.Provider
- value={{
- instanceId,
- }}
- >
- <PropertyBox dataTestId="record-fields-list-container">
- {inlineFieldMetadataItems?.map((fieldMetadataItem, index) => {
- const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({
- field: fieldMetadataItem,
- position: index,
- objectMetadataItem,
- showLabel: true,
- labelWidth: 90,
- });
+ <FieldDescriptionTooltipProvider>
+ <RecordFieldListComponentInstanceContext.Provider
+ value={{
+ instanceId,
+ }}
+ >
+ <PropertyBox dataTestId="record-fields-list-container">
+ {inlineFieldMetadataItems?.map((fieldMetadataItem, index) => {
+ const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({
+ field: fieldMetadataItem,
+ position: index,
+ objectMetadataItem,
+ showLabel: true,
+ labelWidth: 90,
+ });
- return (
- <FieldContext.Provider
- key={objectRecordId + fieldMetadataItem.id}
- value={{
- recordId: objectRecordId,
- maxWidth: 200,
- isLabelIdentifier: false,
- fieldDefinition,
- useUpdateRecord: useUpdateOneObjectRecordMutation,
- isDisplayModeFixHeight: true,
- isRecordFieldReadOnly: isRecordFieldReadOnly({
- isRecordReadOnly,
- objectPermissions:
- getObjectPermissionsFromMapByObjectMetadataId({
- objectPermissionsByObjectMetadataId,
- objectMetadataId: objectMetadataItem.id,
- }),
- fieldMetadataItem,
- fieldDefinition,
- objectPermissionsByObjectMetadataId,
- }),
- onMouseEnter: () => handleMouseEnter(index),
- anchorId: `${getRecordFieldInputInstanceId({
- recordId: objectRecordId,
- fieldName: fieldMetadataItem.name,
- prefix: instanceId,
- })}`,
- isForbidden: isJunctionRelationForbidden({
- fieldMetadataItem,
- sourceObjectMetadataId: objectMetadataItem.id,
- objectMetadataItems,
- objectPermissionsByObjectMetadataId,
- }),
- }}
- >
- <RecordFieldComponentInstanceContext.Provider
+ return (
+ <FieldContext.Provider
+ key={objectRecordId + fieldMetadataItem.id}
value={{
- instanceId: getRecordFieldInputInstanceId({
+ recordId: objectRecordId,
+ maxWidth: 200,
+ isLabelIdentifier: false,
+ fieldDefinition,
+ useUpdateRecord: useUpdateOneObjectRecordMutation,
+ isDisplayModeFixHeight: true,
+ isRecordFieldReadOnly: isRecordFieldReadOnly({
+ isRecordReadOnly,
+ objectPermissions:
+ getObjectPermissionsFromMapByObjectMetadataId({
+ objectPermissionsByObjectMetadataId,
+ objectMetadataId: objectMetadataItem.id,
+ }),
+ fieldMetadataItem,
+ fieldDefinition,
+ objectPermissionsByObjectMetadataId,
+ }),
+ onMouseEnter: () => handleMouseEnter(index),
+ anchorId: `${getRecordFieldInputInstanceId({
recordId: objectRecordId,
fieldName: fieldMetadataItem.name,
prefix: instanceId,
+ })}`,
+ isForbidden: isJunctionRelationForbidden({
+ fieldMetadataItem,
+ sourceObjectMetadataId: objectMetadataItem.id,
+ objectMetadataItems,
+ objectPermissionsByObjectMetadataId,
}),
}}
>
- <RecordInlineCell
- loading={recordLoading}
- instanceIdPrefix={instanceId}
- />
- </RecordFieldComponentInstanceContext.Provider>
- </FieldContext.Provider>
- );
- })}
- </PropertyBox>
- {showDuplicatesSection && (
- <RecordDetailDuplicatesSection
- objectRecordId={objectRecordId}
- objectNameSingular={objectNameSingular}
- />
- )}
- {boxedRelationFieldMetadataItems
- .filter(
- (fieldMetadataItem) =>
- fieldMetadataItem.type === FieldMetadataType.RELATION ||
- fieldMetadataItem.type === FieldMetadataType.MORPH_RELATION,
- )
- .map((fieldMetadataItem, index) => {
- const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({
- field: fieldMetadataItem,
- position: index,
- objectMetadataItem,
- });
-
- return (
- <FieldContext.Provider
- key={objectRecordId + fieldMetadataItem.id}
- value={{
- recordId: objectRecordId,
- isLabelIdentifier: false,
- fieldDefinition,
- useUpdateRecord: useUpdateOneObjectRecordMutation,
- isDisplayModeFixHeight: true,
- isRecordFieldReadOnly: isRecordFieldReadOnly({
- isRecordReadOnly,
- objectPermissions:
- getObjectPermissionsFromMapByObjectMetadataId({
- objectPermissionsByObjectMetadataId,
- objectMetadataId: objectMetadataItem.id,
+ <RecordFieldComponentInstanceContext.Provider
+ value={{
+ instanceId: getRecordFieldInputInstanceId({
+ recordId: objectRecordId,
+ fieldName: fieldMetadataItem.name,
+ prefix: instanceId,
}),
- fieldMetadataItem,
+ }}
+ >
+ <RecordInlineCell
+ loading={recordLoading}
+ instanceIdPrefix={instanceId}
+ />
+ </RecordFieldComponentInstanceContext.Provider>
+ </FieldContext.Provider>
+ );
+ })}
+ </PropertyBox>
+ {showDuplicatesSection && (
+ <RecordDetailDuplicatesSection
+ objectRecordId={objectRecordId}
+ objectNameSingular={objectNameSingular}
+ />
+ )}
+ {boxedRelationFieldMetadataItems
+ .filter(
+ (fieldMetadataItem) =>
+ fieldMetadataItem.type === FieldMetadataType.RELATION ||
+ fieldMetadataItem.type === FieldMetadataType.MORPH_RELATION,
+ )
+ .map((fieldMetadataItem, index) => {
+ const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({
+ field: fieldMetadataItem,
+ position: index,
+ objectMetadataItem,
+ });
+
+ return (
+ <FieldContext.Provider
+ key={objectRecordId + fieldMetadataItem.id}
+ value={{
+ recordId: objectRecordId,
+ isLabelIdentifier: false,
fieldDefinition,
- objectPermissionsByObjectMetadataId,
- }),
- }}
- >
- {fieldMetadataItem.type === FieldMetadataType.MORPH_RELATION ? (
- <RecordDetailMorphRelationSection loading={recordLoading} />
- ) : (
- <RecordDetailRelationSection loading={recordLoading} />
- )}
- </FieldContext.Provider>
- );
- })}
+ useUpdateRecord: useUpdateOneObjectRecordMutation,
+ isDisplayModeFixHeight: true,
+ isRecordFieldReadOnly: isRecordFieldReadOnly({
+ isRecordReadOnly,
+ objectPermissions:
+ getObjectPermissionsFromMapByObjectMetadataId({
+ objectPermissionsByObjectMetadataId,
+ objectMetadataId: objectMetadataItem.id,
+ }),
+ fieldMetadataItem,
+ fieldDefinition,
+ objectPermissionsByObjectMetadataId,
+ }),
+ }}
+ >
+ {fieldMetadataItem.type === FieldMetadataType.MORPH_RELATION ? (
+ <RecordDetailMorphRelationSection loading={recordLoading} />
+ ) : (
+ <RecordDetailRelationSection loading={recordLoading} />
+ )}
+ </FieldContext.Provider>
+ );
+ })}
- <RecordFieldListCellHoveredPortal
- objectMetadataItem={objectMetadataItem}
- recordId={objectRecordId}
- />
- <RecordFieldListCellEditModePortal
- objectMetadataItem={objectMetadataItem}
- recordId={objectRecordId}
- />
- </RecordFieldListComponentInstanceContext.Provider>
+ <RecordFieldListCellHoveredPortal
+ objectMetadataItem={objectMetadataItem}
+ recordId={objectRecordId}
+ />
+ <RecordFieldListCellEditModePortal
+ objectMetadataItem={objectMetadataItem}
+ recordId={objectRecordId}
+ />
+ </RecordFieldListComponentInstanceContext.Provider>
+ </FieldDescriptionTooltipProvider>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDescriptionTooltip.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDescriptionTooltip.tsx
new file mode 100644
index 00000000000..826440438f5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDescriptionTooltip.tsx
@@ -0,0 +1,57 @@
+import { FieldDescriptionTooltipContext } from '@/object-record/record-field/ui/contexts/FieldDescriptionTooltipContext';
+import { styled } from '@linaria/react';
+import { isNonEmptyString } from '@sniptt/guards';
+import { type ReactNode, useContext, useId } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+const StyledLabel = styled.span`
+ display: block;
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+`;
+
+type FieldDescriptionTooltipProps = {
+ label?: string;
+ description?: string | null;
+ fallback?: ReactNode;
+};
+
+export const FieldDescriptionTooltip = ({
+ label,
+ description,
+ fallback,
+}: FieldDescriptionTooltipProps) => {
+ const context = useContext(FieldDescriptionTooltipContext);
+ const descriptionId = useId();
+
+ if (
+ !isDefined(context) ||
+ !isNonEmptyString(label) ||
+ !isNonEmptyString(description)
+ ) {
+ return fallback ?? <StyledLabel>{label}</StyledLabel>;
+ }
+
+ const handleEnter = () => {
+ context.setTooltipContent({ title: label, description });
+ };
+
+ return (
+ <>
+ <StyledLabel
+ data-tooltip-id={context.tooltipId}
+ aria-describedby={descriptionId}
+ tabIndex={0}
+ onMouseEnter={handleEnter}
+ onFocus={handleEnter}
+ >
+ {label}
+ </StyledLabel>
+ <span id={descriptionId} hidden>
+ {description}
+ </span>
+ </>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDescriptionTooltipProvider.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDescriptionTooltipProvider.tsx
new file mode 100644
index 00000000000..11114e5ac49
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDescriptionTooltipProvider.tsx
@@ -0,0 +1,38 @@
+import { FieldDescriptionTooltipContext } from '@/object-record/record-field/ui/contexts/FieldDescriptionTooltipContext';
+import { type ReactNode, useId, useMemo, useState } from 'react';
+import {
+ AppTooltip,
+ type AppTooltipProps,
+ TooltipDelay,
+} from 'twenty-ui/surfaces';
+
+type FieldDescriptionTooltipProviderProps = {
+ children: ReactNode;
+};
+
+export const FieldDescriptionTooltipProvider = ({
+ children,
+}: FieldDescriptionTooltipProviderProps) => {
+ const tooltipId = useId();
+ const [tooltipContent, setTooltipContent] = useState<
+ Pick<AppTooltipProps, 'title' | 'description'>
+ >({});
+ const contextValue = useMemo(
+ () => ({ tooltipId, setTooltipContent }),
+ [tooltipId],
+ );
+
+ return (
+ <FieldDescriptionTooltipContext.Provider value={contextValue}>
+ {children}
+ <AppTooltip
+ anchorSelect={`[data-tooltip-id='${tooltipId}']`}
+ title={tooltipContent.title}
+ description={tooltipContent.description}
+ delay={TooltipDelay.longDelay}
+ place="bottom"
+ positionStrategy="fixed"
+ />
+ </FieldDescriptionTooltipContext.Provider>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/__stories__/FieldDescriptionTooltip.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/__stories__/FieldDescriptionTooltip.stories.tsx
new file mode 100644
index 00000000000..a2432e69343
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/__stories__/FieldDescriptionTooltip.stories.tsx
@@ -0,0 +1,137 @@
+import { FieldDescriptionTooltip } from '@/object-record/record-field/ui/components/FieldDescriptionTooltip';
+import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+const meta: Meta<typeof FieldDescriptionTooltip> = {
+ title: 'UI/Data/Field/FieldDescriptionTooltip',
+ component: FieldDescriptionTooltip,
+ decorators: [ComponentDecorator],
+ args: {
+ label: 'Domain Name',
+ description: 'The company website URL',
+ },
+ render: (args) => (
+ <FieldDescriptionTooltipProvider>
+ <FieldDescriptionTooltip {...args} />
+ <FieldDescriptionTooltip
+ label="Account Owner"
+ description="The team member responsible for this company"
+ />
+ </FieldDescriptionTooltipProvider>
+ ),
+};
+
+export default meta;
+type Story = StoryObj<typeof FieldDescriptionTooltip>;
+
+export const Hover: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const firstLabel = canvas.getByText('Domain Name');
+ const secondLabel = canvas.getByText('Account Owner');
+
+ await userEvent.hover(firstLabel);
+ expect(body.queryByRole('tooltip')).not.toBeInTheDocument();
+ const tooltip = await body.findByRole('tooltip', undefined, {
+ timeout: 5000,
+ });
+ await waitFor(() => expect(tooltip).toBeVisible());
+ expect(tooltip).toHaveTextContent('The company website URL');
+
+ await userEvent.unhover(firstLabel);
+ await userEvent.hover(secondLabel);
+ await waitFor(() =>
+ expect(tooltip).toHaveTextContent(
+ 'The team member responsible for this company',
+ ),
+ );
+ expect(body.getAllByRole('tooltip')).toHaveLength(1);
+ expect(tooltip).not.toHaveTextContent('The company website URL');
+ },
+};
+
+export const KeyboardFocus: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const firstLabel = canvas.getByText('Domain Name');
+ const secondLabel = canvas.getByText('Account Owner');
+
+ await userEvent.tab();
+ expect(firstLabel).toHaveFocus();
+ expect(firstLabel).toHaveAccessibleDescription('The company website URL');
+ await userEvent.hover(firstLabel);
+ await userEvent.unhover(firstLabel);
+ const tooltip = await body.findByRole('tooltip', undefined, {
+ timeout: 5000,
+ });
+ await waitFor(() => expect(tooltip).toBeVisible());
+
+ await userEvent.hover(firstLabel);
+ await userEvent.unhover(firstLabel);
+ await new Promise((resolve) => setTimeout(resolve, 100));
+ expect(tooltip).toBeVisible();
+ expect(firstLabel).toHaveFocus();
+
+ await userEvent.tab();
+ expect(secondLabel).toHaveFocus();
+ await waitFor(() =>
+ expect(tooltip).toHaveTextContent(
+ 'The team member responsible for this company',
+ ),
+ );
+
+ await userEvent.tab();
+ await waitFor(() => expect(body.queryByRole('tooltip')).toBeNull());
+ },
+};
+
+export const WithoutDescription: Story = {
+ args: { description: '' },
+ play: async ({ canvasElement }) => {
+ const label = within(canvasElement).getByText('Domain Name');
+
+ expect(label).not.toHaveAttribute('tabindex');
+ expect(label).not.toHaveAttribute('data-tooltip-id');
+ expect(label).not.toHaveAttribute('aria-describedby');
+ await userEvent.tab();
+ expect(within(canvasElement).getByText('Account Owner')).toHaveFocus();
+ },
+};
+
+export const SeparateSurfaces: Story = {
+ render: () => (
+ <>
+ <FieldDescriptionTooltipProvider>
+ <FieldDescriptionTooltip label="Company" description="Company name" />
+ </FieldDescriptionTooltipProvider>
+ <FieldDescriptionTooltipProvider>
+ <FieldDescriptionTooltip label="Person" description="Person name" />
+ </FieldDescriptionTooltipProvider>
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const companyLabel = canvas.getByText('Company');
+ const personLabel = canvas.getByText('Person');
+
+ await userEvent.hover(companyLabel);
+ await waitFor(
+ () => expect(body.getByRole('tooltip')).toHaveTextContent('Company name'),
+ { timeout: 5000 },
+ );
+
+ await userEvent.unhover(companyLabel);
+ await userEvent.hover(personLabel);
+ await waitFor(
+ () => expect(body.getByRole('tooltip')).toHaveTextContent('Person name'),
+ { timeout: 5000 },
+ );
+ expect(body.getAllByRole('tooltip')).toHaveLength(1);
+ expect(body.getByRole('tooltip')).not.toHaveTextContent('Company name');
+ },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldDescriptionTooltipContext.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldDescriptionTooltipContext.ts
new file mode 100644
index 00000000000..cf3c43d0650
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldDescriptionTooltipContext.ts
@@ -0,0 +1,13 @@
+import { createContext } from 'react';
+import { type AppTooltipProps } from 'twenty-ui/surfaces';
+
+type FieldDescriptionTooltipContextValue = {
+ tooltipId: string;
+ setTooltipContent: (
+ content: Pick<AppTooltipProps, 'title' | 'description'>,
+ ) => void;
+};
+
+export const FieldDescriptionTooltipContext = createContext<
+ FieldDescriptionTooltipContextValue | undefined
+>(undefined);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/FieldMetadata.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/FieldMetadata.ts
index f90924e70a7..9cc5eff72f5 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/FieldMetadata.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/FieldMetadata.ts
@@ -13,6 +13,7 @@ import { z } from 'zod';
import { type RelationType } from '~/generated-metadata/graphql';
type BaseFieldMetadata = {
+ description?: string | null;
fieldName: string;
objectMetadataNameSingular?: string;
applicationId?: string | null;
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownButton.tsx
index d256601ea7c..dc575ed834c 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownButton.tsx
@@ -45,7 +45,7 @@ export const RecordGroupAggregateDropdownButton = ({
{!isDropdownOpen && (
<AppTooltip
anchorSelect={`#${dropdownId}`}
- content={tooltip ?? ''}
+ title={tooltip ?? ''}
noArrow
place="right"
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
index 75f546873d7..c876a3991a5 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
@@ -1,5 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
+import { FieldDescriptionTooltip } from '@/object-record/record-field/ui/components/FieldDescriptionTooltip';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
@@ -110,7 +111,7 @@ export const RecordInlineCellContainer = () => {
onMouseLeave={handleContainerMouseLeave}
>
{(IconLabel || label) && (
- <StyledLabelAndIconContainer id={labelId}>
+ <StyledLabelAndIconContainer id={!showLabel ? labelId : undefined}>
{IconLabel && (
<StyledIconContainer>
<IconLabel stroke={theme.icon.stroke.sm} />
@@ -118,15 +119,24 @@ export const RecordInlineCellContainer = () => {
)}
{showLabel && (
<StyledLabelContainer width={labelWidth}>
- <OverflowingTextWithTooltip text={label} displayedMaxRows={1} />
+ <FieldDescriptionTooltip
+ label={label}
+ description={fieldDefinition?.metadata?.description}
+ fallback={
+ <OverflowingTextWithTooltip
+ text={label}
+ displayedMaxRows={1}
+ />
+ }
+ />
</StyledLabelContainer>
)}
{/* TODO: Displaying Tooltips on the board is causing performance issues https://react-tooltip.com/docs/examples/render */}
{!showLabel && (
<AppTooltip
anchorSelect={`#${labelId}`}
- content={label}
- clickable
+ title={label}
+ interactive
noArrow
place="bottom"
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListFieldTooltip.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListFieldTooltip.tsx
index 1b61f014e8b..f30d149ec94 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListFieldTooltip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListFieldTooltip.tsx
@@ -4,21 +4,11 @@ import { RECORD_LIST_ROW_FIELD_ANCHOR_CLASS_NAME } from '@/object-record/record-
import { recordListHoveredFieldMetadataItemIdComponentState } from '@/object-record/record-list/states/recordListHoveredFieldMetadataItemIdComponentState';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { styled } from '@linaria/react';
-import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { useIcons } from 'twenty-ui/icon';
import { AppTooltip, TooltipDelay } from 'twenty-ui/surfaces';
-import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledTooltipContent = styled.div`
- align-items: center;
- display: flex;
- gap: ${themeCssVariables.spacing[1]};
-`;
export const RecordListFieldTooltip = () => {
- const { theme } = useContext(ThemeContext);
const { getIcon } = useIcons();
const { fieldDefinitionByFieldMetadataItemId } =
@@ -48,22 +38,12 @@ export const RecordListFieldTooltip = () => {
<AppTooltip
key={visibleRecordFieldIds}
anchorSelect={`.${RECORD_LIST_ROW_FIELD_ANCHOR_CLASS_NAME}`}
+ title={hoveredFieldDefinition?.label}
+ Icon={FieldIcon ?? undefined}
noArrow
place="bottom"
positionStrategy="fixed"
delay={TooltipDelay.shortDelay}
- >
- {isDefined(hoveredFieldDefinition) && (
- <StyledTooltipContent>
- {isDefined(FieldIcon) && (
- <FieldIcon
- size={theme.icon.size.sm}
- stroke={theme.icon.stroke.sm}
- />
- )}
- {hoveredFieldDefinition.label}
- </StyledTooltipContent>
- )}
- </AppTooltip>
+ />
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarCreatedAt.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarCreatedAt.tsx
index 0ff1d14b185..1aab8f6776d 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarCreatedAt.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarCreatedAt.tsx
@@ -48,8 +48,8 @@ export const RecordIdentifierBarCreatedAt = ({
</StyledCreatedAt>
<AppTooltip
anchorSelect={`#${createdAtElementId}`}
- content={beautifyExactDateTime(recordCreatedAt)}
- clickable
+ title={beautifyExactDateTime(recordCreatedAt)}
+ interactive
noArrow
place="left"
/>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
index 864fb9d4406..6b682fed69f 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
@@ -1,5 +1,6 @@
import { styled } from '@linaria/react';
import { useContext } from 'react';
+import { FieldDescriptionTooltip } from '@/object-record/record-field/ui/components/FieldDescriptionTooltip';
import { fieldMetadataItemByIdSelector } from '@/object-metadata/states/fieldMetadataItemByIdSelector';
import { type RecordField } from '@/object-record/record-field/types/RecordField';
@@ -29,12 +30,6 @@ const StyledIcon = styled.div`
}
`;
-const StyledText = styled.span`
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-`;
-
type RecordTableColumnHeadProps = {
recordField: RecordField;
};
@@ -53,15 +48,18 @@ export const RecordTableColumnHead = ({
const Icon = getIcon(
correspondingFieldMetadataItem.foundFieldMetadataItem?.icon,
);
+ const fieldMetadataItem =
+ correspondingFieldMetadataItem.foundFieldMetadataItem;
return (
<StyledTitle className={RECORD_TABLE_CELL_CONTENT_CLASS_NAME}>
<StyledIcon>
<Icon size={theme.icon.size.md} />
</StyledIcon>
- <StyledText>
- {correspondingFieldMetadataItem.foundFieldMetadataItem?.label}
- </StyledText>
+ <FieldDescriptionTooltip
+ label={fieldMetadataItem?.label}
+ description={fieldMetadataItem?.description}
+ />
</StyledTitle>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeader.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeader.tsx
index 7e5aef4f63b..80beffd6f90 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeader.tsx
@@ -1,3 +1,4 @@
+import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
import { RECORD_TABLE_ROW_HEIGHT } from '@/object-record/record-table/constants/RecordTableRowHeight';
import { TABLE_Z_INDEX } from '@/object-record/record-table/constants/TableZIndex';
import { RecordTableHeaderCheckboxColumn } from '@/object-record/record-table/record-table-header/components/RecordTableHeaderCheckboxColumn';
@@ -35,13 +36,15 @@ export const RecordTableHeader = () => {
useResizeTableHeader();
return (
- <StyledHeaderContainer>
- {!isRecordTableDragColumnHidden && <RecordTableHeaderDragDropColumn />}
- {!isRecordTableCheckboxColumnHidden && (
- <RecordTableHeaderCheckboxColumn />
- )}
- <RecordTableHeaderFirstCell />
- <RecordTableHeaderDnd />
- </StyledHeaderContainer>
+ <FieldDescriptionTooltipProvider>
+ <StyledHeaderContainer>
+ {!isRecordTableDragColumnHidden && <RecordTableHeaderDragDropColumn />}
+ {!isRecordTableCheckboxColumnHidden && (
+ <RecordTableHeaderCheckboxColumn />
+ )}
+ <RecordTableHeaderFirstCell />
+ <RecordTableHeaderDnd />
+ </StyledHeaderContainer>
+ </FieldDescriptionTooltipProvider>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay.tsx
index 69e3724b719..fed265b4bd0 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay.tsx
@@ -43,7 +43,7 @@ export const PageLayoutWidgetForbiddenDisplay = ({
</div>
<AppTooltip
anchorSelect={`#${tooltipId}`}
- content={getTooltipContent()}
+ title={getTooltipContent()}
place="top"
/>
</>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay.tsx
index e1c42c80ccc..2fbcb264a13 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay.tsx
@@ -30,7 +30,7 @@ export const PageLayoutWidgetInvalidConfigDisplay = ({
</div>
<AppTooltip
anchorSelect={`#${tooltipId}`}
- content={tooltipContent}
+ title={tooltipContent}
place="top"
/>
</StyledInvalidConfigContainer>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetStatusDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetStatusDisplay.tsx
index c9470dadf42..9161d7f50c0 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetStatusDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/PageLayoutWidgetStatusDisplay.tsx
@@ -29,7 +29,7 @@ export const PageLayoutWidgetStatusDisplay = ({
</div>
<AppTooltip
anchorSelect={`#${tooltipId}`}
- content={tooltipContent}
+ title={tooltipContent}
place="top"
/>
</StyledContainer>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
index b6e60f5cb7d..dedb05e922b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx
@@ -1,4 +1,5 @@
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
import { RecordFieldListComponentInstanceContext } from '@/object-record/record-field-list/states/contexts/RecordFieldListComponentInstanceContext';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
@@ -121,61 +122,63 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {
}
return (
- <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
- <StyledWidgetScrollContainer>
- <RecordFieldListComponentInstanceContext.Provider
- value={{
- instanceId,
- }}
- >
- {shouldDisplayGroupHeaders ? (
- groups.map((group) => (
- <FieldsWidgetGroupContainer key={group.id} title={group.name}>
+ <FieldDescriptionTooltipProvider>
+ <RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>
+ <StyledWidgetScrollContainer>
+ <RecordFieldListComponentInstanceContext.Provider
+ value={{
+ instanceId,
+ }}
+ >
+ {shouldDisplayGroupHeaders ? (
+ groups.map((group) => (
+ <FieldsWidgetGroupContainer key={group.id} title={group.name}>
+ <StyledPropertyBox>
+ <FieldsWidgetFieldList
+ fields={group.fields}
+ instanceId={instanceId}
+ />
+ </StyledPropertyBox>
+ </FieldsWidgetGroupContainer>
+ ))
+ ) : (
+ <StyledInlineFieldsPropertyBox
+ hasMoreGroup={shouldShowHiddenFields}
+ >
+ <FieldsWidgetFieldList
+ fields={visibleFields}
+ instanceId={instanceId}
+ />
+ </StyledInlineFieldsPropertyBox>
+ )}
+
+ {shouldShowHiddenFields && (
+ <FieldsWidgetGroupContainer
+ title={t`More (${hiddenFieldsWithOffsetGlobalIndex.length})`}
+ defaultExpanded={false}
+ >
<StyledPropertyBox>
<FieldsWidgetFieldList
- fields={group.fields}
+ fields={hiddenFieldsWithOffsetGlobalIndex}
instanceId={instanceId}
/>
</StyledPropertyBox>
</FieldsWidgetGroupContainer>
- ))
- ) : (
- <StyledInlineFieldsPropertyBox
- hasMoreGroup={shouldShowHiddenFields}
- >
- <FieldsWidgetFieldList
- fields={visibleFields}
- instanceId={instanceId}
- />
- </StyledInlineFieldsPropertyBox>
- )}
-
- {shouldShowHiddenFields && (
- <FieldsWidgetGroupContainer
- title={t`More (${hiddenFieldsWithOffsetGlobalIndex.length})`}
- defaultExpanded={false}
- >
- <StyledPropertyBox>
- <FieldsWidgetFieldList
- fields={hiddenFieldsWithOffsetGlobalIndex}
- instanceId={instanceId}
- />
- </StyledPropertyBox>
- </FieldsWidgetGroupContainer>
- )}
-
- <FieldsWidgetCellHoveredPortal
- objectMetadataItem={objectMetadataItem}
- recordId={targetRecord.id}
- flattenedFieldMetadataItems={flattenedFieldMetadataItems}
- />
- <FieldsWidgetCellEditModePortal
- objectMetadataItem={objectMetadataItem}
- recordId={targetRecord.id}
- flattenedFieldMetadataItems={flattenedFieldMetadataItems}
- />
- </RecordFieldListComponentInstanceContext.Provider>
- </StyledWidgetScrollContainer>
- </RecordFieldsScopeContextProvider>
+ )}
+
+ <FieldsWidgetCellHoveredPortal
+ objectMetadataItem={objectMetadataItem}
+ recordId={targetRecord.id}
+ flattenedFieldMetadataItems={flattenedFieldMetadataItems}
+ />
+ <FieldsWidgetCellEditModePortal
+ objectMetadataItem={objectMetadataItem}
+ recordId={targetRecord.id}
+ flattenedFieldMetadataItems={flattenedFieldMetadataItems}
+ />
+ </RecordFieldListComponentInstanceContext.Provider>
+ </StyledWidgetScrollContainer>
+ </RecordFieldsScopeContextProvider>
+ </FieldDescriptionTooltipProvider>
);
};
diff --git a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
index 10eb143e801..5095771fa4e 100644
--- a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
@@ -218,7 +218,7 @@ export const SettingsAiModelsTable = <TModel extends AiModelSummary>({
offset={8}
delay={TooltipDelay.noDelay}
className={hoverCardTooltipClass}
- width="320px"
+ maxWidth="320px"
isOpen={true}
>
<SettingsAiModelHoverCard model={hoveredModel} />
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLabelValueItem.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLabelValueItem.tsx
index 978cabde541..801f0dc5e62 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLabelValueItem.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingLabelValueItem.tsx
@@ -60,7 +60,7 @@ export const SettingsBillingLabelValueItem = ({
<StyledInfoIcon id={tooltipId} size={12} />
<AppTooltip
anchorSelect={`#${tooltipId}`}
- content={tooltipText}
+ title={tooltipText}
noArrow={false}
place="top"
delay={TooltipDelay.shortDelay}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
index d66400fc85f..f730a0a75ff 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
@@ -214,7 +214,7 @@ export const SettingsDataModelFieldIconLabelForm = ({
/>
<AppTooltip
anchorSelect="#info-circle-id-name"
- content={apiNameTooltipText}
+ title={apiNameTooltipText}
offset={5}
noArrow
place="bottom"
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
index d1494dd6096..b91adc2f9cf 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
@@ -201,7 +201,7 @@ export const SettingsObjectFieldItemTableRow = ({
</SettingsNameCellSecondaryLabel>
<AppTooltip
anchorSelect={`#${mostlyEmptyLabelId}`}
- content={t`Appears filled in fewer than 5% of ${objectMetadataItem.labelPlural}. Fields that stay empty can be deactivated.`}
+ title={t`Appears filled in fewer than 5% of ${objectMetadataItem.labelPlural}. Fields that stay empty can be deactivated.`}
delay={TooltipDelay.shortDelay}
/>
</>
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
index e7fcbc06f0e..830a2bbebf6 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
@@ -338,7 +338,7 @@ export const SettingsDataModelObjectAboutForm = ({
/>
<AppTooltip
anchorSelect={`#${infoCircleElementId}${fieldName}`}
- content={tooltip}
+ title={tooltip}
offset={5}
noArrow
place="bottom"
diff --git a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetupCard.tsx b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetupCard.tsx
index 215fdb5e188..35d144f3523 100644
--- a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetupCard.tsx
+++ b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetupCard.tsx
@@ -119,7 +119,7 @@ const SettingsMcpSetupCardAction = ({
{isDefined(card.disabledTooltip) && isDefined(card.tooltipId) && (
<AppTooltip
anchorSelect={`[data-tooltip-id='${card.tooltipId}']`}
- content={card.disabledTooltip}
+ title={card.disabledTooltip}
delay={TooltipDelay.shortDelay}
noArrow
place="bottom"
diff --git a/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx b/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
index a2447f04be5..66992a6e176 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
@@ -148,7 +148,7 @@ export const EmailField = () => {
{shouldShowWorkspaceLimitTooltip && (
<AppTooltip
anchorSelect={`#${EMAIL_EDIT_DISABLED_TOOLTIP_ANCHOR_ID}`}
- content={t`You can't change your email because you belong to 2 or more workspaces.`}
+ title={t`You can't change your email because you belong to 2 or more workspaces.`}
delay={TooltipDelay.noDelay}
place="top"
/>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
index 0d11d9a9055..9ac357c8015 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
@@ -79,7 +79,7 @@ export const RoleAssignmentSection = ({
{config.tooltip && (
<AppTooltip
anchorSelect={`#${config.tooltip.anchorId}`}
- content={config.tooltip.content()}
+ title={config.tooltip.content()}
delay={TooltipDelay.noDelay}
hidden={
!config.tooltip.shouldShow(allWorkspaceMembersHaveThisRole)
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCell.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCell.tsx
index a0233a51a13..5870b969ced 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCell.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCell.tsx
@@ -74,7 +74,7 @@ export const SettingsRolePermissionsObjectLevelOverrideCell = ({
</StyledContainer>
<AppTooltip
anchorSelect={`#${containerId}`}
- content={
+ title={
permissionValue === false
? t`${roleLabel} can't ${humanReadableAction} ${objectLabel} records`
: t`${roleLabel} can ${humanReadableAction} ${objectLabel} records`
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx
index 42ef293fbf1..1dbdec7d2f9 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput.tsx
@@ -225,7 +225,7 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionValueInput =
</StyledContainer>
<AppTooltip
anchorSelect={`#${tooltipId}`}
- content={fullLabel}
+ title={fullLabel}
delay={TooltipDelay.shortDelay}
noArrow
place="bottom"
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx
index 2adb21f1603..43798845154 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelToggleButton.tsx
@@ -91,7 +91,7 @@ export const SidePanelToggleButton = () => {
<StyledTooltipWrapper>
<AppTooltip
anchorSelect="#toggle-side-panel-button"
- content={tooltipContent}
+ title={tooltipContent}
delay={TooltipDelay.longDelay}
place={TooltipPosition.Bottom}
offset={5}
diff --git a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelToggleButton.test.tsx b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelToggleButton.test.tsx
index 1e82a21f464..b8fe9a178f2 100644
--- a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelToggleButton.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelToggleButton.test.tsx
@@ -27,7 +27,7 @@ jest.mock('twenty-ui/utilities', () => ({
jest.mock('twenty-ui/surfaces', () => ({
...jest.requireActual('twenty-ui/surfaces'),
- AppTooltip: (props: { content: string }) => {
+ AppTooltip: (props: { title: string }) => {
mockAppTooltip(props);
return null;
@@ -224,7 +224,7 @@ describe('SidePanelToggleButton', () => {
expect(mockAppTooltip).toHaveBeenCalledWith(
expect.objectContaining({
- content: 'Command menu | ⌘K',
+ title: 'Command menu | ⌘K',
}),
);
});
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
index aee7ac3c375..201bacdfd20 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
@@ -107,7 +107,7 @@ export const RegularTabSettingsContent = ({
{isResetToDefaultDisabled && (
<AppTooltip
anchorSelect={`#${RESET_TAB_TO_DEFAULT_MENU_ITEM_ID}`}
- content={t`No default configuration available for this tab`}
+ title={t`No default configuration available for this tab`}
noArrow
place="bottom"
/>
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
index cfa7f700132..5fe8806ad6c 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
@@ -134,7 +134,7 @@ export const SingleWidgetTabSettingsContent = ({
{isResetToDefaultDisabled && (
<AppTooltip
anchorSelect={`#${RESET_TAB_TO_DEFAULT_MENU_ITEM_ID}`}
- content={t`No default configuration available for this tab`}
+ title={t`No default configuration available for this tab`}
noArrow
place="bottom"
/>
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
index 82b28a19543..dcee30cf0e2 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
@@ -126,7 +126,7 @@ export const WidgetSettingsManageSection = ({
{isResetToDefaultDisabled && (
<AppTooltip
anchorSelect={`#${RESET_WIDGET_TO_DEFAULT_MENU_ITEM_ID}`}
- content={t`No default configuration available for this widget`}
+ title={t`No default configuration available for this widget`}
noArrow
place="bottom"
/>
diff --git a/packages/twenty-front/src/modules/side-panel/pages/search/components/SidePanelSearchRecordsPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/search/components/SidePanelSearchRecordsPage.tsx
index 734f47da83b..69c4b0ea631 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/search/components/SidePanelSearchRecordsPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/search/components/SidePanelSearchRecordsPage.tsx
@@ -116,11 +116,11 @@ export const SidePanelSearchRecordsPage = () => {
place="left-start"
offset={16}
noArrow
- clickable
+ interactive
isOpen
delay={TooltipDelay.noDelay}
className={previewTooltipClass}
- width={`${SIDE_PANEL_SEARCH_RECORD_PREVIEW_WIDTH}px`}
+ maxWidth={`${SIDE_PANEL_SEARCH_RECORD_PREVIEW_WIDTH}px`}
>
<SidePanelSearchRecordPreviewCard
key={previewedItem.recordId}
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
index 11e03814663..16e750e2c90 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
@@ -127,7 +127,7 @@ export const generateColumns = (
<AppTooltip
anchorSelect={`#${formatSafeId(column.key)}`}
place="top"
- content={column.description}
+ title={column.description}
/>,
document.body,
)}
@@ -223,7 +223,7 @@ export const generateColumns = (
<AppTooltip
anchorSelect={`#${formatSafeId(`${columnKey}-${row.__index}`)}`}
place="top"
- content={row.__errors?.[columnKey]?.message}
+ title={row.__errors?.[columnKey]?.message}
delay={TooltipDelay.shortDelay}
/>,
document.body,
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
index 3bd87e40656..2fdc3463619 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
@@ -87,7 +87,7 @@ export const CurrencyDisplay = ({
createPortal(
<AppTooltip
anchorSelect={`#${tooltipAnchorId}`}
- content={currencyTooltipContent}
+ title={currencyTooltipContent}
delay={TooltipDelay.shortDelay}
place={TooltipPosition.Top}
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
index 9120fa49460..234d2777e63 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx
@@ -51,7 +51,7 @@ export const NavigationDrawerCollapseButton = ({
/>
<AppTooltip
anchorSelect={`[data-tooltip-id='${tooltipId}'] > button`}
- content={label}
+ title={label}
delay={TooltipDelay.longDelay}
place={TooltipPosition.Bottom}
offset={5}
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
index 19748579ee8..4154357b7aa 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx
@@ -461,7 +461,7 @@ export const NavigationDrawerItem = ({
{!isExpanded && !isMobile && (
<AppTooltip
anchorSelect={`#${navigationItemId}`}
- content={label}
+ title={label}
place={TooltipPosition.Right}
delay={TooltipDelay.noDelay}
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx
index 32e3e5d8352..8e2928e5a18 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdown.tsx
@@ -106,7 +106,7 @@ export const WorkflowVariablesDropdown = ({
</StyledDropdownVariableButtonContainer>
<AppTooltip
anchorSelect={`[data-variable-picker-disabled-anchor="${dropdownId}"]`}
- content={t`No variables are available yet. Variables come from the workflow trigger and previous steps.`}
+ title={t`No variables are available yet. Variables come from the workflow trigger and previous steps.`}
place={TooltipPosition.Top}
delay={TooltipDelay.mediumDelay}
offset={5}
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
index 79be9887f02..2d6cce46960 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
@@ -208,7 +208,7 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
{hasActiveInstalls && (
<AppTooltip
anchorSelect={`#${DELETE_REGISTRATION_BUTTON_ID}`}
- content={t`Uninstall this app from all workspaces before deleting it`}
+ title={t`Uninstall this app from all workspaces before deleting it`}
noArrow
place="bottom"
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
index 5e741ce1131..a1e2c39c877 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsSkillForm.tsx
@@ -531,7 +531,7 @@ export const SettingsSkillForm = ({ mode }: { mode: 'create' | 'edit' }) => {
/>
<AppTooltip
anchorSelect="#info-circle-id-skill-name"
- content={apiNameTooltipText}
+ title={apiNameTooltipText}
offset={5}
noArrow
place="bottom"
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
index b778f8f0777..03b866dff67 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
@@ -156,7 +156,7 @@ export const SettingsToolParameterTable = ({
/>
<AppTooltip
anchorSelect={`#${infoIconId}`}
- content={property.description}
+ title={property.description}
offset={5}
noArrow
place="bottom"
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVariableLabelRow.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVariableLabelRow.tsx
index e6d2d992acf..e93667a1f62 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVariableLabelRow.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationVariableLabelRow.tsx
@@ -50,7 +50,7 @@ export const SettingsApplicationVariableLabelRow = ({
/>
<AppTooltip
anchorSelect={`#${tooltipId}`}
- content={description}
+ title={description}
offset={5}
noArrow
place="bottom"
diff --git a/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx b/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx
index ebf871ab240..1d15b0a1e00 100644
--- a/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx
+++ b/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx
@@ -76,11 +76,11 @@ export const OrganizationAdornment = ({
{adornment}
<AppTooltip
anchorSelect={`#${anchorId}`}
- content={tooltipContent}
+ title={tooltipContent}
delay={TooltipDelay.shortDelay}
place="top"
- width="260px"
- clickable
+ maxWidth="260px"
+ interactive
/>
</>
);
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
index 8ba837b19be..d8922f06ab9 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
@@ -185,7 +185,7 @@ export const SettingsWorkspaceMembersInviteTab = () => {
</StyledTextContainerWithEllipsis>
<AppTooltip
anchorSelect={`#invitation-email-${workspaceInvitation.id}`}
- content={workspaceInvitation.email}
+ title={workspaceInvitation.email}
noArrow
place="top"
positionStrategy="fixed"
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
index 5004962376c..890353bb3d2 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
@@ -267,7 +267,7 @@ export const SettingsWorkspaceMembersTeamTab = () => {
</StyledTextContainerWithEllipsis>
<AppTooltip
anchorSelect={`#hover-text-${workspaceMember.id}`}
- content={`${workspaceMember.name.firstName} ${workspaceMember.name.lastName}`}
+ title={`${workspaceMember.name.firstName} ${workspaceMember.name.lastName}`}
noArrow
place="top"
positionStrategy="fixed"
diff --git a/packages/twenty-ui/design-tokens/designTokens.ts b/packages/twenty-ui/design-tokens/designTokens.ts
index 531ca39dd61..3fd49936ccb 100644
--- a/packages/twenty-ui/design-tokens/designTokens.ts
+++ b/packages/twenty-ui/design-tokens/designTokens.ts
@@ -18,12 +18,14 @@ import { TABLE_TOKENS } from './table';
import { TAG_TOKENS } from './tag';
import { TEXT_TOKENS } from './text';
import { token } from './token';
+import { TOOLTIP_TOKENS } from './tooltip';
import { type DesignTokenNode } from './types/DesignTokenNode';
export const DESIGN_TOKENS: DesignTokenNode = {
icon: ICON_TOKENS,
modal: MODAL_TOKENS,
text: TEXT_TOKENS,
+ tooltip: TOOLTIP_TOKENS,
animation: ANIMATION_TOKENS,
spacingMultiplicator: token('4', { unit: 'number' }),
spacing: SPACING_TOKENS,
diff --git a/packages/twenty-ui/design-tokens/themeCommonRootKeys.ts b/packages/twenty-ui/design-tokens/themeCommonRootKeys.ts
index 42571a16b77..5df2c43b9bc 100644
--- a/packages/twenty-ui/design-tokens/themeCommonRootKeys.ts
+++ b/packages/twenty-ui/design-tokens/themeCommonRootKeys.ts
@@ -2,6 +2,7 @@ export const THEME_COMMON_ROOT_KEYS: readonly string[] = [
'icon',
'modal',
'text',
+ 'tooltip',
'animation',
'spacingMultiplicator',
'spacing',
diff --git a/packages/twenty-ui/design-tokens/tooltip.ts b/packages/twenty-ui/design-tokens/tooltip.ts
new file mode 100644
index 00000000000..433dc7b7a9e
--- /dev/null
+++ b/packages/twenty-ui/design-tokens/tooltip.ts
@@ -0,0 +1,7 @@
+import { token } from './token';
+
+export const TOOLTIP_TOKENS = {
+ background: token('color(display-p3 0 0 0 / 0.72)'),
+ color: token('color(display-p3 1 1 1 / 1)'),
+ descriptionColor: token('color(display-p3 1 1 1 / 0.64)'),
+};
diff --git a/packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx b/packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx
index 0ea86147f42..656ee8ed973 100644
--- a/packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx
+++ b/packages/twenty-ui/src/feedback/SidePanelInformationBanner/SidePanelInformationBanner.tsx
@@ -38,7 +38,7 @@ export const SidePanelInformationBanner = ({
{isDefined(tooltipMessage) && (
<AppTooltip
anchorSelect={`[data-tooltip-id='${tooltipId}']`}
- content={tooltipMessage}
+ title={tooltipMessage}
place="bottom"
/>
)}
diff --git a/packages/twenty-ui/src/input/IconButtonWithTooltip/IconButtonWithTooltip.tsx b/packages/twenty-ui/src/input/IconButtonWithTooltip/IconButtonWithTooltip.tsx
index bd8fa09babe..55291601a0b 100644
--- a/packages/twenty-ui/src/input/IconButtonWithTooltip/IconButtonWithTooltip.tsx
+++ b/packages/twenty-ui/src/input/IconButtonWithTooltip/IconButtonWithTooltip.tsx
@@ -41,7 +41,7 @@ export const IconButtonWithTooltip = ({
</div>
<AppTooltip
anchorSelect={`[data-tooltip-id='${tooltipId}'] > button`}
- content={tooltipContent}
+ title={tooltipContent}
delay={tooltipDelay}
place={tooltipPlace}
offset={tooltipOffset}
diff --git a/packages/twenty-ui/src/input/TabButton/TabButton.tsx b/packages/twenty-ui/src/input/TabButton/TabButton.tsx
index 8879961400c..484a8a1cd97 100644
--- a/packages/twenty-ui/src/input/TabButton/TabButton.tsx
+++ b/packages/twenty-ui/src/input/TabButton/TabButton.tsx
@@ -88,7 +88,7 @@ export const TabButton = ({
{tooltipContent && (
<AppTooltip
anchorSelect={`#${tabElementId}`}
- content={tooltipContent}
+ title={tooltipContent}
noArrow
place="bottom"
positionStrategy="fixed"
diff --git a/packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.tsx b/packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.tsx
index b68591c7e70..2a169de2aac 100644
--- a/packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.tsx
+++ b/packages/twenty-ui/src/navigation/MenuPicker/MenuPicker.tsx
@@ -71,7 +71,7 @@ export const MenuPicker = ({
<AppTooltip
anchorSelect={`#${id}`}
offset={tooltipOffset}
- content={tooltipContent}
+ title={tooltipContent}
place={TooltipPosition.Bottom}
positionStrategy="fixed"
delay={tooltipDelay}
diff --git a/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss
index 4197a363ee7..315cb860b08 100644
--- a/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss
+++ b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss
@@ -1,5 +1,5 @@
.positioner {
- // the tooltip never intercepts pointer events unless clickable,
+ // the tooltip never intercepts pointer events unless interactive,
// like react-tooltip's core styles
pointer-events: none;
z-index: var(--t-last-layer-z-index);
@@ -7,14 +7,15 @@
.tooltip {
backdrop-filter: var(--t-blur-strong);
- background-color: var(--t-color-transparent-gray11);
+ background-color: var(--t-tooltip-background);
border-radius: var(--t-border-radius-md);
+ box-sizing: border-box;
box-shadow: var(--t-box-shadow-light);
- color: var(--t-gray-scale-gray1);
+ color: var(--t-tooltip-color);
font-size: var(--t-font-size-sm);
font-weight: var(--t-font-weight-regular);
overflow: visible;
- padding: var(--t-spacing-2);
+ padding: var(--t-spacing-1) var(--t-spacing-1_5);
word-break: break-word;
width: max-content;
max-width: 100%;
@@ -31,12 +32,41 @@
}
}
-.clickable {
+.textContent {
+ display: flex;
+ flex-direction: column;
+ line-height: var(--t-spacing-4);
+}
+
+.title {
+ align-items: center;
+ display: flex;
+ font-weight: var(--t-font-weight-medium);
+ gap: var(--t-spacing-1);
+ min-width: 0;
+
+ span {
+ min-width: 0;
+ overflow-wrap: anywhere;
+ }
+}
+
+.icon {
+ flex-shrink: 0;
+ height: calc(var(--t-icon-size-sm) * 1px);
+ width: calc(var(--t-icon-size-sm) * 1px);
+}
+
+.description {
+ color: var(--t-tooltip-description-color);
+ overflow-wrap: anywhere;
+ white-space: pre-wrap;
+}
+
+.interactive {
pointer-events: auto;
}
-// the background is translucent, so the arrow has to sit flush outside the
-// popup: any overlap composites the two layers and shows up as a darker shape
.arrow {
--tooltip-arrow-size: 6px;
diff --git a/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss.d.ts b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss.d.ts
index 188739cb852..7d1f22a2cc4 100644
--- a/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss.d.ts
+++ b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.module.scss.d.ts
@@ -1,7 +1,11 @@
declare const classNames: {
readonly positioner: 'positioner';
readonly tooltip: 'tooltip';
- readonly clickable: 'clickable';
+ readonly textContent: 'textContent';
+ readonly title: 'title';
+ readonly icon: 'icon';
+ readonly description: 'description';
+ readonly interactive: 'interactive';
readonly arrow: 'arrow';
};
export default classNames;
diff --git a/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx
index 422906684f4..f06c2903272 100644
--- a/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx
+++ b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx
@@ -2,6 +2,7 @@ import { Tooltip } from '@base-ui/react/tooltip';
import { isNonEmptyString } from '@sniptt/guards';
import { clsx } from 'clsx';
import { useEffect, useRef, useState } from 'react';
+import { type IconComponent } from '@ui/icon/types/IconComponent';
import { useThemeContainer } from '@ui/theme-constants';
import { isDefined } from '@ui/utilities/utils/isDefined';
@@ -48,32 +49,36 @@ const DEFAULT_OFFSET = 10;
export type AppTooltipProps = {
className?: string;
anchorSelect?: string;
- content?: string;
- children?: React.ReactNode;
offset?: number;
noArrow?: boolean;
hidden?: boolean;
place?: PlacesType;
delay?: TooltipDelay;
positionStrategy?: PositionStrategy;
- clickable?: boolean;
- width?: string;
+ interactive?: boolean;
+ maxWidth?: string;
isOpen?: boolean;
+ title?: string;
+ Icon?: IconComponent;
+ description?: string;
+ children?: React.ReactNode;
};
export const AppTooltip = ({
anchorSelect,
className,
- content,
+ title,
+ Icon,
+ description,
hidden = false,
- noArrow,
+ noArrow = true,
offset,
delay = TooltipDelay.mediumDelay,
place,
positionStrategy,
children,
- clickable,
- width,
+ interactive,
+ maxWidth = '300px',
isOpen,
}: AppTooltipProps) => {
const getDelayInMis = (delay: TooltipDelay) => {
@@ -200,7 +205,11 @@ export const AppTooltip = ({
clearTimeout(hideDelayTimerRef.current);
};
- const handleAnchorLeave = () => {
+ const handleAnchorLeave = (anchorElement: Element) => {
+ if (anchorElement.contains(anchorElement.ownerDocument.activeElement)) {
+ return;
+ }
+
clearTimeout(hideDelayTimerRef.current);
hideDelayTimerRef.current = setTimeout(() => {
if (isHoveringTooltipRef.current) {
@@ -213,7 +222,7 @@ export const AppTooltip = ({
const removeListeners = anchorElements.map((anchorElement) => {
const handleEnter = () => handleAnchorEnter(anchorElement);
- const handleLeave = () => handleAnchorLeave();
+ const handleLeave = () => handleAnchorLeave(anchorElement);
// mouseover/mouseout instead of mouseenter/mouseleave to replicate
// react-tooltip's default open and close events
@@ -246,6 +255,9 @@ export const AppTooltip = ({
const handleTooltipMouseLeave = () => {
isHoveringTooltipRef.current = false;
+ if (activeAnchor?.contains(activeAnchor.ownerDocument.activeElement)) {
+ return;
+ }
clearTimeout(hideDelayTimerRef.current);
hideDelayTimerRef.current = setTimeout(() => {
if (isHoveringTooltipRef.current) {
@@ -258,8 +270,27 @@ export const AppTooltip = ({
clearTimeout(showDelayTimerRef.current);
};
- // react-tooltip's content priority: content prop wins over children
- const renderedContent = isNonEmptyString(content) ? content : children;
+ const hasTitle = isNonEmptyString(title);
+ const hasDescription = isNonEmptyString(description);
+ const renderedContent =
+ hasTitle || hasDescription ? (
+ <>
+ <div className={styles.textContent}>
+ {hasTitle && (
+ <div className={styles.title}>
+ {isDefined(Icon) && <Icon className={styles.icon} aria-hidden />}
+ <span>{title}</span>
+ </div>
+ )}
+ {hasDescription && (
+ <div className={styles.description}>{description}</div>
+ )}
+ </div>
+ {children}
+ </>
+ ) : (
+ children
+ );
const isTooltipOpen =
!hidden &&
@@ -294,17 +325,17 @@ export const AppTooltip = ({
sideOffset={offset ?? DEFAULT_OFFSET}
positionMethod={positionStrategy}
className={styles.positioner}
- style={{ maxWidth: width ?? '40%' }}
+ style={{ maxWidth }}
>
<Tooltip.Popup
role="tooltip"
className={clsx(
styles.tooltip,
- clickable && styles.clickable,
+ interactive && styles.interactive,
className,
)}
- onMouseEnter={clickable ? handleTooltipMouseEnter : undefined}
- onMouseLeave={clickable ? handleTooltipMouseLeave : undefined}
+ onMouseEnter={interactive ? handleTooltipMouseEnter : undefined}
+ onMouseLeave={interactive ? handleTooltipMouseLeave : undefined}
>
{renderedContent}
{!noArrow && <Tooltip.Arrow className={styles.arrow} />}
diff --git a/packages/twenty-ui/src/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx b/packages/twenty-ui/src/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
index 3d70cbe40ba..caf8301d7a8 100644
--- a/packages/twenty-ui/src/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
+++ b/packages/twenty-ui/src/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
@@ -1,5 +1,7 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { IconInfoCircle } from '@ui/icon';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
@@ -13,161 +15,324 @@ import {
TooltipPosition,
} from '../AppTooltip';
+const CUSTOM_CONTENT = (
+ <span>
+ <strong>Custom</strong> formatted content
+ </span>
+);
+
+const findTooltip = async (canvasElement: HTMLElement) => {
+ const tooltip = await within(canvasElement.ownerDocument.body).findByRole(
+ 'tooltip',
+ undefined,
+ { timeout: 5000 },
+ );
+
+ await waitFor(() => expect(tooltip).toBeVisible(), { timeout: 5000 });
+
+ return tooltip;
+};
+
+const onCustomActionClick = fn();
+
const meta: Meta<typeof Tooltip> = {
title: 'UI/Surfaces/Tooltip',
component: Tooltip,
+ args: {
+ title: 'Amount',
+ description: '',
+ anchorSelect: '#tooltip-anchor',
+ place: TooltipPosition.Bottom,
+ delay: TooltipDelay.mediumDelay,
+ },
+ argTypes: {
+ title: { control: 'text' },
+ description: { control: 'text' },
+ Icon: {
+ control: 'select',
+ options: ['None', 'Info'],
+ mapping: { None: undefined, Info: IconInfoCircle },
+ },
+ },
+ render: (args) => (
+ <>
+ <button type="button" id={args.anchorSelect?.slice(1)}>
+ Hover or focus me
+ </button>
+ <Tooltip {...args} />
+ </>
+ ),
+ play: async ({ canvasElement, args }) => {
+ await userEvent.hover(within(canvasElement).getByRole('button'));
+
+ const tooltip = await findTooltip(canvasElement);
+
+ expect(tooltip.parentElement).toHaveStyle({
+ maxWidth: args.maxWidth ?? '300px',
+ });
+ if (args.title) {
+ expect(within(tooltip).getByText(args.title)).toBeVisible();
+ }
+ if (args.description) {
+ expect(within(tooltip).getByText(args.description)).toBeVisible();
+ }
+ if (args.Icon) {
+ expect(tooltip.querySelector('svg')).toHaveAttribute(
+ 'aria-hidden',
+ 'true',
+ );
+ }
+ expect(
+ tooltip.querySelector(':scope > [aria-hidden="true"]') !== null,
+ ).toBe(args.noArrow === false);
+ },
};
export default meta;
type Story = StoryObj<typeof Tooltip>;
export const Default: Story = {
+ decorators: [ComponentDecorator],
+};
+
+export const WithArrow: Story = {
+ args: { noArrow: false },
+ decorators: [ComponentDecorator],
+};
+
+export const WithDescription: Story = {
args: {
- place: TooltipPosition.Bottom,
- delay: TooltipDelay.mediumDelay,
- content: 'Tooltip Test',
- hidden: false,
- anchorSelect: '#hover-text',
+ description: 'The amount of this opportunity',
+ delay: TooltipDelay.longDelay,
},
decorators: [ComponentDecorator],
- render: ({
- anchorSelect,
- className,
- content,
- delay,
- hidden,
- noArrow,
- offset,
- place,
- positionStrategy,
- clickable,
- }) => (
- <>
- <p id="hover-text" data-testid="tooltip">
- Hover me!
- </p>
- <Tooltip
- {...{
- anchorSelect,
- className,
- content,
- delay,
- hidden,
- noArrow,
- offset,
- place,
- positionStrategy,
- clickable,
- }}
- />
- </>
- ),
+ play: async ({ canvasElement }) => {
+ await userEvent.hover(within(canvasElement).getByRole('button'));
+
+ expect(
+ within(canvasElement.ownerDocument.body).queryByRole('tooltip'),
+ ).not.toBeInTheDocument();
+
+ const tooltip = await findTooltip(canvasElement);
+ expect(within(tooltip).getByText('Amount')).toBeVisible();
+ expect(
+ within(tooltip).getByText('The amount of this opportunity'),
+ ).toBeVisible();
+ },
+};
+
+export const WithIcon: Story = {
+ args: {
+ description: 'The amount of this opportunity',
+ Icon: IconInfoCircle,
+ },
+ decorators: [ComponentDecorator],
+};
+
+export const DescriptionOnly: Story = {
+ args: { title: '', description: 'The amount of this opportunity' },
+ decorators: [ComponentDecorator],
+};
+
+export const KeyboardFocus: Story = {
+ args: {
+ description: 'The amount of this opportunity',
+ delay: TooltipDelay.longDelay,
+ },
+ decorators: [ComponentDecorator],
+ play: async ({ canvasElement }) => {
+ await userEvent.tab();
+
+ expect(within(canvasElement).getByRole('button')).toHaveFocus();
+ const tooltip = await findTooltip(canvasElement);
+
+ expect(tooltip).toHaveTextContent('The amount of this opportunity');
+
+ await userEvent.tab();
+
+ await waitFor(() =>
+ expect(
+ within(canvasElement.ownerDocument.body).queryByRole('tooltip'),
+ ).not.toBeInTheDocument(),
+ );
+ },
};
export const Hoverable: Story = {
+ args: { interactive: true },
+ decorators: [ComponentDecorator],
+};
+
+export const WithMaxWidth: Story = {
args: {
- place: TooltipPosition.Bottom,
- delay: TooltipDelay.mediumDelay,
- content: 'Tooltip Test',
- hidden: false,
- anchorSelect: '#hover-text',
+ description:
+ 'A longer description that wraps naturally within the maximum tooltip width.',
+ maxWidth: '200px',
},
decorators: [ComponentDecorator],
- render: ({
- anchorSelect,
- className,
- content,
- delay,
- noArrow,
- offset,
- place,
- positionStrategy,
- }) => (
- <>
- <p id="hover-text" data-testid="tooltip">
- Hover me!
- </p>
- <Tooltip
- {...{
- anchorSelect,
- className,
- content,
- delay,
- noArrow,
- offset,
- place,
- positionStrategy,
- }}
- />
- </>
- ),
};
-export const WithWidth: Story = {
+export const CustomContent: Story = {
args: {
- place: TooltipPosition.Top,
- delay: TooltipDelay.mediumDelay,
- content: 'Tooltip with custom width',
- hidden: false,
- anchorSelect: '#width-text',
- width: '200px',
+ title: undefined,
+ description: undefined,
+ children: CUSTOM_CONTENT,
},
decorators: [ComponentDecorator],
- render: ({
- anchorSelect,
- className,
- content,
- delay,
- noArrow,
- offset,
- place,
- positionStrategy,
- width,
- }) => (
- <>
- <p id="width-text" data-testid="tooltip">
- Hover me to see custom width!
- </p>
- <Tooltip
- {...{
- anchorSelect,
- className,
- content,
- delay,
- noArrow,
- offset,
- place,
- positionStrategy,
- width,
- }}
- />
- </>
- ),
+ play: async ({ canvasElement }) => {
+ await userEvent.hover(within(canvasElement).getByRole('button'));
+
+ expect(await findTooltip(canvasElement)).toHaveTextContent(
+ 'Custom formatted content',
+ );
+ },
+};
+
+export const WithDescriptionAndCustomContent: Story = {
+ args: {
+ title: 'Amount',
+ description: 'The amount of this opportunity',
+ Icon: IconInfoCircle,
+ children: CUSTOM_CONTENT,
+ },
+ decorators: [ComponentDecorator],
+ play: async ({ canvasElement }) => {
+ await userEvent.hover(within(canvasElement).getByRole('button'));
+
+ const tooltip = await findTooltip(canvasElement);
+
+ expect(within(tooltip).getByText('Amount')).toBeVisible();
+ expect(
+ within(tooltip).getByText('The amount of this opportunity'),
+ ).toBeVisible();
+ expect(within(tooltip).getByText('Custom')).toBeVisible();
+ expect(tooltip).toHaveTextContent('Custom formatted content');
+ expect(tooltip.querySelector('svg')).toHaveAttribute('aria-hidden', 'true');
+ },
+};
+
+export const InteractiveCustomContent: Story = {
+ args: {
+ title: undefined,
+ description: undefined,
+ interactive: true,
+ children: (
+ <button type="button" onClick={onCustomActionClick}>
+ Show more
+ </button>
+ ),
+ },
+ decorators: [ComponentDecorator],
+ play: async ({ canvasElement }) => {
+ await userEvent.hover(within(canvasElement).getByRole('button'));
+
+ const tooltip = await findTooltip(canvasElement);
+
+ await userEvent.hover(tooltip);
+ await userEvent.click(
+ within(tooltip).getByRole('button', { name: 'Show more' }),
+ );
+ expect(onCustomActionClick).toHaveBeenCalledTimes(1);
+ expect(tooltip).toBeVisible();
+
+ await userEvent.unhover(tooltip);
+
+ await waitFor(() =>
+ expect(
+ within(canvasElement.ownerDocument.body).queryByRole('tooltip'),
+ ).not.toBeInTheDocument(),
+ );
+ },
+};
+
+export const LongTitle: Story = {
+ args: {
+ title: 'LongUnbrokenFieldName'.repeat(10),
+ Icon: IconInfoCircle,
+ },
+ decorators: [ComponentDecorator],
+ play: async ({ canvasElement }) => {
+ await userEvent.hover(within(canvasElement).getByRole('button'));
+
+ const tooltip = await findTooltip(canvasElement);
+
+ expect(tooltip.scrollWidth).toBeLessThanOrEqual(tooltip.clientWidth);
+ expect(tooltip.getBoundingClientRect().width).toBeLessThanOrEqual(300);
+ },
+};
+
+export const Hidden: Story = {
+ args: { hidden: true, isOpen: true },
+ decorators: [ComponentDecorator],
+ play: async ({ canvasElement }) => {
+ await userEvent.hover(within(canvasElement).getByRole('button'));
+
+ expect(
+ within(canvasElement.ownerDocument.body).queryByRole('tooltip'),
+ ).not.toBeInTheDocument();
+ },
+};
+
+export const Empty: Story = {
+ args: { title: '', description: '', Icon: IconInfoCircle, isOpen: true },
+ decorators: [ComponentDecorator],
+ play: async ({ canvasElement }) => {
+ await userEvent.hover(within(canvasElement).getByRole('button'));
+
+ expect(
+ within(canvasElement.ownerDocument.body).queryByRole('tooltip'),
+ ).not.toBeInTheDocument();
+ },
};
export const Catalog: CatalogStory<Story, typeof Tooltip> = {
- args: { hidden: false, content: 'Tooltip Test' },
+ args: { isOpen: true },
play: async ({ canvasElement }) => {
- Object.values(TooltipPosition).forEach((position) => {
- const element = canvasElement.querySelector(
- `#${position}`,
- ) as HTMLElement;
- element.style.margin = '75px';
- });
+ const body = within(canvasElement.ownerDocument.body);
+
+ await waitFor(() => expect(body.getAllByRole('tooltip')).toHaveLength(6));
+
+ for (const tooltip of body.getAllByRole('tooltip')) {
+ await waitFor(() => expect(tooltip).toBeVisible());
+ }
},
parameters: {
a11y: A11Y_DEFER_COLOR_CONTRAST,
catalog: {
dimensions: [
{
- name: 'anchorSelect',
- values: Object.values(TooltipPosition),
- props: (anchorSelect: TooltipPosition) => ({
- anchorSelect: `#${anchorSelect}`,
- place: anchorSelect,
- }),
+ name: 'Content',
+ values: [
+ 'title',
+ 'description',
+ 'icon',
+ 'description-only',
+ 'custom',
+ 'combined',
+ ],
+ props: (example: string) =>
+ example === 'custom'
+ ? {
+ anchorSelect: '#tooltip-custom',
+ title: undefined,
+ description: undefined,
+ Icon: undefined,
+ children: CUSTOM_CONTENT,
+ }
+ : {
+ anchorSelect: `#tooltip-${example}`,
+ title: example === 'description-only' ? '' : 'Amount',
+ description:
+ example === 'title' ? '' : 'The amount of this opportunity',
+ Icon:
+ example === 'icon' || example === 'combined'
+ ? IconInfoCircle
+ : undefined,
+ children: example === 'combined' ? CUSTOM_CONTENT : undefined,
+ },
},
],
+ options: { elementContainer: { style: { margin: '60px 30px' } } },
},
},
decorators: [CatalogDecorator],
diff --git a/packages/twenty-ui/src/surfaces/AppTooltip/__tests__/AppTooltip.types.test.ts b/packages/twenty-ui/src/surfaces/AppTooltip/__tests__/AppTooltip.types.test.ts
new file mode 100644
index 00000000000..f8783a92b7f
--- /dev/null
+++ b/packages/twenty-ui/src/surfaces/AppTooltip/__tests__/AppTooltip.types.test.ts
@@ -0,0 +1,58 @@
+import { type ReactElement } from 'react';
+
+import { type IconComponent } from '@ui/icon/types/IconComponent';
+
+import { type AppTooltipProps } from '../AppTooltip';
+
+type IsAssignableToTooltipProps<Props> = Props extends AppTooltipProps
+ ? true
+ : false;
+
+describe('AppTooltip prop contract', () => {
+ it('accepts standard text or custom children on their own', () => {
+ const title: IsAssignableToTooltipProps<{ title: string }> = true;
+ const description: IsAssignableToTooltipProps<{ description: string }> =
+ true;
+ const standard: IsAssignableToTooltipProps<{
+ title: string;
+ Icon: IconComponent;
+ description: string;
+ }> = true;
+ const custom: IsAssignableToTooltipProps<{ children: ReactElement }> = true;
+
+ expect([title, description, standard, custom]).toEqual([
+ true,
+ true,
+ true,
+ true,
+ ]);
+ });
+
+ it('accepts custom children alongside standard content props', () => {
+ const title: IsAssignableToTooltipProps<{
+ title: string;
+ children: ReactElement;
+ }> = true;
+ const description: IsAssignableToTooltipProps<{
+ description: string;
+ children: ReactElement;
+ }> = true;
+ const icon: IsAssignableToTooltipProps<{
+ Icon: IconComponent;
+ children: ReactElement;
+ }> = true;
+ const combined: IsAssignableToTooltipProps<{
+ title: string;
+ description: string;
+ Icon: IconComponent;
+ children: ReactElement;
+ }> = true;
+
+ expect([title, description, icon, combined]).toEqual([
+ true,
+ true,
+ true,
+ true,
+ ]);
+ });
+});
diff --git a/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss
index 23915dff487..16011ad5dfc 100644
--- a/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss
+++ b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss
@@ -32,7 +32,7 @@
height: var(--t-spacing-4);
}
-.pre {
+.multilineTooltip {
font-family: inherit;
white-space: pre-wrap;
}
diff --git a/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts
index 79976f24d0f..166e6370ea8 100644
--- a/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts
+++ b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.module.scss.d.ts
@@ -2,6 +2,6 @@ declare const classNames: {
readonly overflowingMultilineText: 'overflowingMultilineText';
readonly overflowingText: 'overflowingText';
readonly large: 'large';
- readonly pre: 'pre';
+ readonly multilineTooltip: 'multilineTooltip';
};
export default classNames;
diff --git a/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
index d6a93fd4221..c09f0a0cffc 100644
--- a/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
+++ b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx
@@ -119,19 +119,17 @@ export const OverflowingTextWithTooltip = ({
<div onClick={handleTooltipClick}>
<AppTooltip
anchorSelect={`#${textElementId}`}
+ title={tooltipText}
+ className={
+ isTooltipMultiline ? styles.multilineTooltip : undefined
+ }
offset={5}
noArrow
place={tooltipPlace}
positionStrategy="absolute"
delay={tooltipDelay}
isOpen={true}
- >
- {isTooltipMultiline ? (
- <pre className={styles.pre}>{tooltipText}</pre>
- ) : (
- tooltipText
- )}
- </AppTooltip>
+ />
</div>,
document.body,
)}
diff --git a/packages/twenty-ui/src/theme-constants/theme-dark.css b/packages/twenty-ui/src/theme-constants/theme-dark.css
index 9229fdb70f2..e1cdd253995 100644
--- a/packages/twenty-ui/src/theme-constants/theme-dark.css
+++ b/packages/twenty-ui/src/theme-constants/theme-dark.css
@@ -23,6 +23,9 @@
--t-text-icon-strike-light: 1.6;
--t-text-icon-strike-medium: 2;
--t-text-icon-strike-bold: 2.5;
+ --t-tooltip-background: color(display-p3 0 0 0 / 0.72);
+ --t-tooltip-color: color(display-p3 1 1 1 / 1);
+ --t-tooltip-description-color: color(display-p3 1 1 1 / 0.64);
--t-animation-duration-instant: 0.075;
--t-animation-duration-fast: 0.15;
--t-animation-duration-normal: 0.3;
diff --git a/packages/twenty-ui/src/theme-constants/theme-light.css b/packages/twenty-ui/src/theme-constants/theme-light.css
index 0d9db2b36e1..c903b110e67 100644
--- a/packages/twenty-ui/src/theme-constants/theme-light.css
+++ b/packages/twenty-ui/src/theme-constants/theme-light.css
@@ -23,6 +23,9 @@
--t-text-icon-strike-light: 1.6;
--t-text-icon-strike-medium: 2;
--t-text-icon-strike-bold: 2.5;
+ --t-tooltip-background: color(display-p3 0 0 0 / 0.72);
+ --t-tooltip-color: color(display-p3 1 1 1 / 1);
+ --t-tooltip-description-color: color(display-p3 1 1 1 / 0.64);
--t-animation-duration-instant: 0.075;
--t-animation-duration-fast: 0.15;
--t-animation-duration-normal: 0.3;
diff --git a/packages/twenty-ui/src/theme-constants/themeCssVariables.ts b/packages/twenty-ui/src/theme-constants/themeCssVariables.ts
index 6b955765f4a..3326aac3ec4 100644
--- a/packages/twenty-ui/src/theme-constants/themeCssVariables.ts
+++ b/packages/twenty-ui/src/theme-constants/themeCssVariables.ts
@@ -46,6 +46,11 @@ export const themeCssVariables = {
iconStrikeMedium: 'var(--t-text-icon-strike-medium)',
iconStrikeBold: 'var(--t-text-icon-strike-bold)',
},
+ tooltip: {
+ background: 'var(--t-tooltip-background)',
+ color: 'var(--t-tooltip-color)',
+ descriptionColor: 'var(--t-tooltip-description-color)',
+ },
animation: {
duration: {
instant: 'var(--t-animation-duration-instant)',
diff --git a/packages/twenty-ui/src/theme-constants/themeTypes.ts b/packages/twenty-ui/src/theme-constants/themeTypes.ts
index 51aa5a644bb..e73fe154a89 100644
--- a/packages/twenty-ui/src/theme-constants/themeTypes.ts
+++ b/packages/twenty-ui/src/theme-constants/themeTypes.ts
@@ -46,6 +46,11 @@ export type ThemeType = {
iconStrikeMedium: number;
iconStrikeBold: number;
};
+ tooltip: {
+ background: string;
+ color: string;
+ descriptionColor: string;
+ };
animation: {
duration: {
instant: number;
diff --git a/packages/twenty-ui/src/theme/constants/ThemeCommon.ts b/packages/twenty-ui/src/theme/constants/ThemeCommon.ts
index b9e06b1e99b..bc87d29ce48 100644
--- a/packages/twenty-ui/src/theme/constants/ThemeCommon.ts
+++ b/packages/twenty-ui/src/theme/constants/ThemeCommon.ts
@@ -48,6 +48,11 @@ export const THEME_COMMON = {
iconStrikeMedium: 2,
iconStrikeBold: 2.5,
},
+ tooltip: {
+ background: 'color(display-p3 0 0 0 / 0.72)',
+ color: 'color(display-p3 1 1 1 / 1)',
+ descriptionColor: 'color(display-p3 1 1 1 / 0.64)',
+ },
animation: {
duration: {
instant: 0.075,
diff --git a/packages/twenty-ui/src/theme/constants/ThemeDark.ts b/packages/twenty-ui/src/theme/constants/ThemeDark.ts
index 3f7675215dd..3c4c2872884 100644
--- a/packages/twenty-ui/src/theme/constants/ThemeDark.ts
+++ b/packages/twenty-ui/src/theme/constants/ThemeDark.ts
@@ -49,6 +49,11 @@ export const THEME_DARK: typeof THEME_LIGHT = {
iconStrikeMedium: 2,
iconStrikeBold: 2.5,
},
+ tooltip: {
+ background: 'color(display-p3 0 0 0 / 0.72)',
+ color: 'color(display-p3 1 1 1 / 1)',
+ descriptionColor: 'color(display-p3 1 1 1 / 0.64)',
+ },
animation: {
duration: {
instant: 0.075,
diff --git a/packages/twenty-ui/src/theme/constants/ThemeLight.ts b/packages/twenty-ui/src/theme/constants/ThemeLight.ts
index ae915c5a8dc..9370ee3f00a 100644
--- a/packages/twenty-ui/src/theme/constants/ThemeLight.ts
+++ b/packages/twenty-ui/src/theme/constants/ThemeLight.ts
@@ -48,6 +48,11 @@ export const THEME_LIGHT = {
iconStrikeMedium: 2,
iconStrikeBold: 2.5,
},
+ tooltip: {
+ background: 'color(display-p3 0 0 0 / 0.72)',
+ color: 'color(display-p3 1 1 1 / 1)',
+ descriptionColor: 'color(display-p3 1 1 1 / 0.64)',
+ },
animation: {
duration: {
instant: 0.075,