The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
List views ready for prod (#25257)
Thomas des Francs7a1cd5bf18e2
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.tsxindex 97cbee3b178..03ce52a1bae 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@@ -233,7 +233,7 @@ export const ObjectOptionsDropdownCustomView = ({onClick={() => onContentChange('fields')}LeftIcon={IconListDetails}text={t`Fields`}- contextualText={t`${visibleFieldsCount} shown`}+ contextualText={t`${visibleFieldsCount} selected`}contextualTextPosition="right"hasSubMenu/>diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsxindex c41a1042614..4dbe09e6de4 100644--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownDefaultView.tsx@@ -91,7 +91,7 @@ export const ObjectOptionsDropdownDefaultView = () => {onClick={() => onContentChange('fields')}LeftIcon={IconListDetails}text={t`Fields`}- contextualText={t`${visibleFieldsCount} shown`}+ contextualText={t`${visibleFieldsCount} selected`}contextualTextPosition="right"hasSubMenu/>diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldsEffect.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldsEffect.tsxindex 072394d73ef..b36a1198d8f 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldsEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListResponsiveFieldsEffect.tsx@@ -1,5 +1,4 @@-import { recordListDisplayedFieldsComponentState } from '@/object-record/record-list/states/recordListDisplayedFieldsComponentState';-import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';+import { recordListRowWidthComponentState } from '@/object-record/record-list/states/recordListRowWidthComponentState';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useLayoutEffect } from 'react';import { isDefined } from 'twenty-shared/utils';@@ -16,8 +15,8 @@ type RecordListResponsiveFieldsEffectProps = {export const RecordListResponsiveFieldsEffect = ({containerElement,}: RecordListResponsiveFieldsEffectProps) => {- const setRecordListDisplayedFields = useSetAtomComponentState(- recordListDisplayedFieldsComponentState,+ const setRecordListRowWidth = useSetAtomComponentState(+ recordListRowWidthComponentState,);useLayoutEffect(() => {@@ -31,12 +30,10 @@ export const RecordListResponsiveFieldsEffect = ({const updateDisplayedFields = () => {const { paddingLeft, paddingRight } = getComputedStyle(containerElement);- setRecordListDisplayedFields(- computeRecordListDisplayedFields(- containerElement.clientWidth -- parseFloat(paddingLeft) -- parseFloat(paddingRight),- ),+ setRecordListRowWidth(+ containerElement.clientWidth -+ parseFloat(paddingLeft) -+ parseFloat(paddingRight),);};@@ -47,7 +44,7 @@ export const RecordListResponsiveFieldsEffect = ({resizeObserver.observe(containerElement);return () => resizeObserver.disconnect();- }, [containerElement, setRecordListDisplayedFields]);+ }, [containerElement, setRecordListRowWidth]);return null;};diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsxindex 6fb0ece8b72..40c472b22a9 100644--- a/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx+++ b/packages/twenty-front/src/modules/object-record/record-list/components/RecordListRow.tsx@@ -1,4 +1,5 @@import { RecordChip } from '@/object-record/components/RecordChip';+import { getLinkToShowPage } from '@/object-metadata/utils/getLinkToShowPage';import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';import { isFieldValueEmpty } from '@/object-record/record-field/ui/utils/isFieldValueEmpty';@@ -6,16 +7,20 @@ import { useRecordIndexContextOrThrow } from '@/object-record/record-index/conteimport { useOpenRecordFromIndexView } from '@/object-record/record-index/hooks/useOpenRecordFromIndexView';import { RecordListRowField } from '@/object-record/record-list/components/RecordListRowField';import { RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH } from '@/object-record/record-list/constants/RecordListRowLabelIdentifierWidth';+import { RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH } from '@/object-record/record-list/constants/RecordListRowOverflowChipSlotWidth';import { useRecordListContextOrThrow } from '@/object-record/record-list/contexts/RecordListContext';-import { recordListDisplayedFieldsComponentState } from '@/object-record/record-list/states/recordListDisplayedFieldsComponentState';+import { recordListRowWidthComponentState } from '@/object-record/record-list/states/recordListRowWidthComponentState';+import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';import { styled } from '@linaria/react';-import { t } from '@lingui/core/macro';+import { plural, t } from '@lingui/core/macro';+import { isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';-import { ChipVariant } from 'twenty-ui/data-display';+import { Chip, ChipVariant, LinkChip } from 'twenty-ui/data-display';+import { TooltipPosition } from 'twenty-ui/surfaces';import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledRowContainer = styled.div`@@ -43,35 +48,25 @@ const StyledRow = styled.div`const StyledRecordChipContainer = styled.div`display: flex;- min-width: ${RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH}px;+ flex: 1 1 ${RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH}px;+ min-width: 0;overflow: hidden;`;const StyledFieldsContainer = styled.div`align-items: center;display: flex;+ flex-shrink: 0;gap: ${themeCssVariables.spacing[3]};justify-content: flex-end;overflow: hidden;`;-const StyledHiddenFieldCountChip = styled.div`- align-items: center;- background: ${themeCssVariables.background.transparent.light};- border-radius: ${themeCssVariables.border.radius.sm};- color: ${themeCssVariables.font.color.primary};+const StyledOverflowChipContainer = styled.div`display: flex;flex-shrink: 0;- font-size: ${themeCssVariables.font.size.md};- gap: 2px;- height: 20px;- padding: 0 ${themeCssVariables.spacing[1]};-- &::before {- color: ${themeCssVariables.font.color.secondary};- content: '+';- font-size: ${themeCssVariables.font.size.sm};- }+ justify-content: flex-end;+ width: ${RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH}px;`;type RecordListRowProps = {@@ -91,8 +86,9 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {visibleRecordFieldsComponentSelector,);- const { displayedFieldCount, displayedFieldMaxWidth } =- useAtomComponentStateValue(recordListDisplayedFieldsComponentState);+ const recordListRowWidth = useAtomComponentStateValue(+ recordListRowWidthComponentState,+ );const { openRecordFromIndexView } = useOpenRecordFromIndexView();@@ -124,9 +120,14 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {},);+ const displayedFieldsLayout = computeRecordListDisplayedFields({+ rowWidth: recordListRowWidth,+ populatedFieldCount: nonEmptyRecordFields.length,+ });+const displayedRecordFields = nonEmptyRecordFields.slice(0,- displayedFieldCount,+ displayedFieldsLayout.displayedFieldCount,);const hiddenFieldCount =@@ -134,6 +135,14 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {const openRecord = () => openRecordFromIndexView({ recordId });+ const linkToRecord = getLinkToShowPage(objectNameSingular, recordStore);++ const overflowChipLabel = `+${hiddenFieldCount}`;+ const overflowChipTooltipLabel = plural(hiddenFieldCount, {+ one: '# more populated field available',+ other: '# more populated fields available',+ });+return (<StyledRowContainerrole="button"@@ -157,7 +166,9 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {<RecordChipobjectNameSingular={objectNameSingular}record={recordStore}+ to={linkToRecord}variant={ChipVariant.Transparent}+ isBoldonClick={openRecord}triggerEvent={'CLICK'}/>@@ -170,13 +181,32 @@ export const RecordListRow = ({ recordId }: RecordListRowProps) => {recordId={recordId}recordField={recordField}fieldDefinition={fieldDefinition}- maxWidth={displayedFieldMaxWidth}+ maxWidth={displayedFieldsLayout.displayedFieldMaxWidth}/>))}{hiddenFieldCount > 0 && (- <StyledHiddenFieldCountChip>- {hiddenFieldCount}- </StyledHiddenFieldCountChip>+ <StyledOverflowChipContainer>+ {isNonEmptyString(linkToRecord) ? (+ <LinkChip+ label={overflowChipLabel}+ to={linkToRecord}+ onClick={openRecord}+ triggerEvent="CLICK"+ tooltipLabel={overflowChipTooltipLabel}+ tooltipPlace={TooltipPosition.Top}+ alwaysShowTooltip+ variant={ChipVariant.Highlighted}+ />+ ) : (+ <Chip+ label={overflowChipLabel}+ tooltipLabel={overflowChipTooltipLabel}+ tooltipPlace={TooltipPosition.Top}+ alwaysShowTooltip+ variant={ChipVariant.Highlighted}+ />+ )}+ </StyledOverflowChipContainer>)}</StyledFieldsContainer></StyledRow>diff --git a/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx b/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsxnew file mode 100644index 00000000000..010bcf9cc26--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-list/components/__stories__/RecordListRow.stories.tsx@@ -0,0 +1,92 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, userEvent, within } from 'storybook/test';++import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';+import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';+import { RecordList } from '@/object-record/record-list/components/RecordList';+import { RecordListContextProvider } from '@/object-record/record-list/contexts/RecordListContext';+import { ComponentDecorator } from 'twenty-ui/testing';+import { ContextStoreDecorator } from '~/testing/decorators/ContextStoreDecorator';+import { FileUploadDecorator } from '~/testing/decorators/FileUploadDecorator';+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';+import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';+import { RecordTableDecorator } from '~/testing/decorators/RecordTableDecorator';+import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';+import { graphqlMocks } from '~/testing/graphqlMocks';+import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';++const RecordListRowStory = () => {+ const { objectMetadataItem } = useObjectMetadataItem({+ objectNameSingular: 'company',+ });+ const objectPermissions = useObjectPermissionsForObject(+ objectMetadataItem.id,+ );++ return (+ <RecordListContextProvider+ value={{+ viewBarInstanceId: 'view-bar',+ objectNameSingular: 'company',+ objectMetadataItem,+ objectPermissions,+ }}+ >+ <RecordList />+ </RecordListContextProvider>+ );+};++const meta: Meta<typeof RecordListRowStory> = {+ title: 'Modules/ObjectRecord/RecordList/RecordListRow',+ component: RecordListRowStory,+ decorators: [+ ComponentDecorator,+ MemoryRouterDecorator,+ FileUploadDecorator,+ RecordTableDecorator,+ ContextStoreDecorator,+ SnackBarDecorator,+ ObjectMetadataItemsDecorator,+ ],+ parameters: {+ container: { height: 300, width: 800 },+ recordTableObjectNameSingular: 'company',+ msw: graphqlMocks,+ },+};++export default meta;+type Story = StoryObj<typeof RecordListRowStory>;++export const ResponsiveFields: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);++ const recordIdentifier = await canvas.findByText(+ mockedCompanyRecords[0].name,+ {},+ { timeout: 3000 },+ );+ const recordIdentifierChip = recordIdentifier.closest(+ '[data-testid="chip"]',+ );++ await expect(recordIdentifierChip).toHaveClass(/fontMedium/);++ const overflowChips = await canvas.findAllByRole('link', {+ name: /^\+\d+$/,+ });+ const firstOverflowChip = overflowChips[0];++ await expect(firstOverflowChip).toHaveAttribute('href');+ await expect(firstOverflowChip.getAttribute('href')).toContain(+ '/object/company/',+ );++ await userEvent.hover(within(firstOverflowChip).getByText(/^\+\d+$/));++ await body.findByRole('tooltip', {}, { timeout: 3000 });+ },+};diff --git a/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowOverflowChipSlotWidth.ts b/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowOverflowChipSlotWidth.tsnew file mode 100644index 00000000000..db770a88cc6--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowOverflowChipSlotWidth.ts@@ -0,0 +1 @@+export const RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH = 40;diff --git a/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowVisibleFieldLimit.ts b/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowVisibleFieldLimit.tsdeleted file mode 100644index 2814d954326..00000000000--- a/packages/twenty-front/src/modules/object-record/record-list/constants/RecordListRowVisibleFieldLimit.ts+++ /dev/null@@ -1 +0,0 @@-export const RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT = 6;diff --git a/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldsComponentState.ts b/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldsComponentState.tsdeleted file mode 100644index 312669e190e..00000000000--- a/packages/twenty-front/src/modules/object-record/record-list/states/recordListDisplayedFieldsComponentState.ts+++ /dev/null@@ -1,17 +0,0 @@-import { RECORD_LIST_ROW_FIELD_MAX_WIDTH } from '@/object-record/record-list/constants/RecordListRowFieldMaxWidth';-import { RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT } from '@/object-record/record-list/constants/RecordListRowVisibleFieldLimit';-import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';-import { type RecordListDisplayedFields } from '@/object-record/record-list/types/RecordListDisplayedFields';-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';--const DEFAULT_RECORD_LIST_DISPLAYED_FIELDS: RecordListDisplayedFields = {- displayedFieldCount: RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT,- displayedFieldMaxWidth: RECORD_LIST_ROW_FIELD_MAX_WIDTH,-};--export const recordListDisplayedFieldsComponentState =- createAtomComponentState<RecordListDisplayedFields>({- key: 'recordListDisplayedFieldsComponentState',- defaultValue: DEFAULT_RECORD_LIST_DISPLAYED_FIELDS,- componentInstanceContext: RecordListComponentInstanceContext,- });diff --git a/packages/twenty-front/src/modules/object-record/record-list/states/recordListRowWidthComponentState.ts b/packages/twenty-front/src/modules/object-record/record-list/states/recordListRowWidthComponentState.tsnew file mode 100644index 00000000000..10223edb68a--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-list/states/recordListRowWidthComponentState.ts@@ -0,0 +1,9 @@+import { RecordListComponentInstanceContext } from '@/object-record/record-list/states/contexts/RecordListComponentInstanceContext';+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';++export const recordListRowWidthComponentState =+ createAtomComponentState<number>({+ key: 'recordListRowWidthComponentState',+ defaultValue: Number.MAX_SAFE_INTEGER,+ componentInstanceContext: RecordListComponentInstanceContext,+ });diff --git a/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFields.test.ts b/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFields.test.tsindex f33bc520b21..77e08fec7e4 100644--- a/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFields.test.ts+++ b/packages/twenty-front/src/modules/object-record/record-list/utils/__tests__/computeRecordListDisplayedFields.test.ts@@ -1,59 +1,94 @@+import { RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH } from '@/object-record/record-list/constants/RecordListRowOverflowChipSlotWidth';import { computeRecordListDisplayedFields } from '@/object-record/record-list/utils/computeRecordListDisplayedFields';describe('computeRecordListDisplayedFields', () => {- it('accounts for row padding when calculating field breakpoints', () => {- expect(computeRecordListDisplayedFields(408).displayedFieldCount).toBe(1);- expect(computeRecordListDisplayedFields(576).displayedFieldCount).toBe(2);+ it('shows every field while they can fit at their minimum width', () => {+ expect(+ computeRecordListDisplayedFields({+ rowWidth: 524,+ populatedFieldCount: 3,+ }),+ ).toEqual({+ displayedFieldCount: 3,+ displayedFieldMaxWidth: 100,+ });});- it('keeps one narrowed field on rows too tight for a full-width one', () => {- expect(computeRecordListDisplayedFields(407).displayedFieldCount).toBe(1);- expect(computeRecordListDisplayedFields(332).displayedFieldCount).toBe(1);+ it('uses an overflow chip only after every field can no longer fit', () => {+ expect(+ computeRecordListDisplayedFields({+ rowWidth: 523,+ populatedFieldCount: 4,+ }),+ ).toEqual({+ displayedFieldCount: 3,+ displayedFieldMaxWidth: 82,+ });});- it('returns no field when not even a narrowed one fits', () => {- expect(computeRecordListDisplayedFields(331).displayedFieldCount).toBe(0);- expect(computeRecordListDisplayedFields(0).displayedFieldCount).toBe(0);+ it('returns no field when not even a minimum-width field fits', () => {+ expect(+ computeRecordListDisplayedFields({+ rowWidth: 331,+ populatedFieldCount: 7,+ }).displayedFieldCount,+ ).toBe(0);});- it('caps the displayed field count at the visible field limit', () => {- expect(computeRecordListDisplayedFields(10_000).displayedFieldCount).toBe(- 6,- );+ it('does not cap the number of fields that fit', () => {+ expect(+ computeRecordListDisplayedFields({+ rowWidth: 10_000,+ populatedFieldCount: 58,+ }).displayedFieldCount,+ ).toBe(58);});- it('gives fields their full width as soon as the row can afford it', () => {- expect(computeRecordListDisplayedFields(408).displayedFieldMaxWidth).toBe(- 156,- );+ it('gives fields their full width when the row can afford it', () => {expect(- computeRecordListDisplayedFields(10_000).displayedFieldMaxWidth,+ computeRecordListDisplayedFields({+ rowWidth: 408,+ populatedFieldCount: 1,+ }).displayedFieldMaxWidth,).toBe(156);});- it('narrows the field to its slot on rows below the full-width breakpoint', () => {- // A 390px viewport leaves a 342px row, so the single field gets 90px.- expect(computeRecordListDisplayedFields(342).displayedFieldMaxWidth).toBe(- 90,- );+ it('narrows fields to fill the available row width', () => {+ expect(+ computeRecordListDisplayedFields({+ rowWidth: 342,+ populatedFieldCount: 2,+ }).displayedFieldMaxWidth,+ ).toBe(90);});- // Row padding 12 + label 176 + gap 12 + hidden-count chip 40.- const WIDTH_RESERVED_AROUND_FIELDS = 240;- const GAP_BEFORE_EACH_FIELD = 12;+ const WIDTH_RESERVED_BEFORE_FIELDS = 200;+ const FIELD_GAP_WIDTH = 12;- it.each([332, 342, 380, 407, 408, 500, 576, 900, 1200])(- 'never promises a %ipx row more field width than it has',+ it.each([240, 280, 331, 332, 342, 407, 408, 523, 524, 900, 1200])(+ 'never promises a %ipx row more width than it has',(rowWidth) => {- const { displayedFieldCount, displayedFieldMaxWidth } =- computeRecordListDisplayedFields(rowWidth);+ for (const populatedFieldCount of [0, 1, 2, 3, 7, 20]) {+ const { displayedFieldCount, displayedFieldMaxWidth } =+ computeRecordListDisplayedFields({ rowWidth, populatedFieldCount });++ const hiddenFieldCount = populatedFieldCount - displayedFieldCount;+ const displayedFieldsGapWidth =+ Math.max(displayedFieldCount - 1, 0) * FIELD_GAP_WIDTH;+ const overflowChipWidth =+ hiddenFieldCount > 0+ ? RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH ++ (displayedFieldCount > 0 ? FIELD_GAP_WIDTH : 0)+ : 0;- const widthTakenByFields =- displayedFieldCount * (displayedFieldMaxWidth + GAP_BEFORE_EACH_FIELD);+ const rowContentWidth =+ WIDTH_RESERVED_BEFORE_FIELDS ++ displayedFieldCount * displayedFieldMaxWidth ++ displayedFieldsGapWidth ++ overflowChipWidth;- expect(widthTakenByFields).toBeLessThanOrEqual(- rowWidth - WIDTH_RESERVED_AROUND_FIELDS,- );+ expect(rowContentWidth).toBeLessThanOrEqual(rowWidth);+ }},);});diff --git a/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFields.ts b/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFields.tsindex d7cd1399571..89bb3a704ca 100644--- a/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFields.ts+++ b/packages/twenty-front/src/modules/object-record/record-list/utils/computeRecordListDisplayedFields.ts@@ -1,47 +1,48 @@import { RECORD_LIST_ROW_FIELD_MAX_WIDTH } from '@/object-record/record-list/constants/RecordListRowFieldMaxWidth';import { RECORD_LIST_ROW_FIELD_MIN_WIDTH } from '@/object-record/record-list/constants/RecordListRowFieldMinWidth';import { RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH } from '@/object-record/record-list/constants/RecordListRowLabelIdentifierWidth';-import { RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT } from '@/object-record/record-list/constants/RecordListRowVisibleFieldLimit';+import { RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH } from '@/object-record/record-list/constants/RecordListRowOverflowChipSlotWidth';import { type RecordListDisplayedFields } from '@/object-record/record-list/types/RecordListDisplayedFields';const ROW_HORIZONTAL_PADDING_WIDTH = 12;const ROW_ITEM_GAP_WIDTH = 12;-const HIDDEN_FIELD_COUNT_CHIP_WIDTH = 40;--const computeDisplayedFieldCount = (widthLeftForFields: number) => {- const fullWidthFieldCount = Math.floor(- widthLeftForFields / (RECORD_LIST_ROW_FIELD_MAX_WIDTH + ROW_ITEM_GAP_WIDTH),- );-- if (fullWidthFieldCount >= 1) {- return Math.min(RECORD_LIST_ROW_VISIBLE_FIELD_LIMIT, fullWidthFieldCount);- }-- // No phone is wide enough for a full-width field once the record label and- // the hidden-count chip are paid for, and a row that shows only "+5" says- // nothing about the record. Below that breakpoint, keep a single field and- // narrow it into whatever is left.- return widthLeftForFields >=- RECORD_LIST_ROW_FIELD_MIN_WIDTH + ROW_ITEM_GAP_WIDTH- ? 1- : 0;-};// Takes the width a row actually renders in, not the list container's own// width: a field told it may be wider than its slot is cut rather than// ellipsised.-export const computeRecordListDisplayedFields = (- rowWidth: number,-): RecordListDisplayedFields => {- const reservedWidth =- ROW_HORIZONTAL_PADDING_WIDTH +- RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH +- ROW_ITEM_GAP_WIDTH +- HIDDEN_FIELD_COUNT_CHIP_WIDTH;+export const computeRecordListDisplayedFields = ({+ rowWidth,+ populatedFieldCount,+}: {+ rowWidth: number;+ populatedFieldCount: number;+}): RecordListDisplayedFields => {+ const widthAvailableWithoutOverflowChip =+ rowWidth -+ ROW_HORIZONTAL_PADDING_WIDTH -+ RECORD_LIST_ROW_LABEL_IDENTIFIER_WIDTH -+ ROW_ITEM_GAP_WIDTH;++ const widthNeededToDisplayAllFields =+ populatedFieldCount * RECORD_LIST_ROW_FIELD_MIN_WIDTH ++ Math.max(populatedFieldCount - 1, 0) * ROW_ITEM_GAP_WIDTH;- const widthLeftForFields = rowWidth - reservedWidth;+ const shouldShowOverflowChip =+ widthNeededToDisplayAllFields > widthAvailableWithoutOverflowChip;- const displayedFieldCount = computeDisplayedFieldCount(widthLeftForFields);+ const widthAvailableForFields =+ widthAvailableWithoutOverflowChip -+ (shouldShowOverflowChip ? RECORD_LIST_ROW_OVERFLOW_CHIP_SLOT_WIDTH : 0);++ const displayedFieldCount = shouldShowOverflowChip+ ? Math.max(+ 0,+ Math.floor(+ widthAvailableForFields /+ (RECORD_LIST_ROW_FIELD_MIN_WIDTH + ROW_ITEM_GAP_WIDTH),+ ),+ )+ : populatedFieldCount;if (displayedFieldCount === 0) {return {@@ -50,12 +51,16 @@ export const computeRecordListDisplayedFields = (};}- // Fields truncate at the width they are given rather than at the width they- // were promised: one told it may take 156px inside a 131px slot renders past- // its box and is cut mid-word instead of ellipsised.+ const gapCount = shouldShowOverflowChip+ ? displayedFieldCount+ : displayedFieldCount - 1;+const displayedFieldMaxWidth = Math.min(RECORD_LIST_ROW_FIELD_MAX_WIDTH,- Math.floor(widthLeftForFields / displayedFieldCount) - ROW_ITEM_GAP_WIDTH,+ Math.floor(+ (widthAvailableForFields - gapCount * ROW_ITEM_GAP_WIDTH) /+ displayedFieldCount,+ ),);return { displayedFieldCount, displayedFieldMaxWidth };diff --git a/packages/twenty-ui/src/data-display/Chip/Chip.tsx b/packages/twenty-ui/src/data-display/Chip/Chip.tsxindex 58b3fe8f030..bd57beb3407 100644--- a/packages/twenty-ui/src/data-display/Chip/Chip.tsx+++ b/packages/twenty-ui/src/data-display/Chip/Chip.tsx@@ -1,6 +1,7 @@import { type ReactNode } from 'react';import { isNonEmptyString } from '@sniptt/guards';+import { type TooltipPosition } from '@ui/surfaces/AppTooltip/AppTooltip';import { OverflowingTextWithTooltip } from '@ui/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';import { clsx } from 'clsx';import { isDefined } from '@ui/utilities/utils/isDefined';@@ -31,6 +32,7 @@ export type ChipProps = {clickable?: boolean;label: string;tooltipLabel?: string;+ tooltipPlace?: TooltipPosition;alwaysShowTooltip?: boolean;isLabelHidden?: boolean;isBold?: boolean;@@ -72,6 +74,7 @@ export const Chip = ({size = ChipSize.Small,label,tooltipLabel,+ tooltipPlace,alwaysShowTooltip = false,isLabelHidden = false,isBold = false,@@ -136,6 +139,7 @@ export const Chip = ({size={size}text={label}tooltipContent={tooltipLabel}+ tooltipPlace={tooltipPlace}alwaysShowTooltip={alwaysShowTooltip}/>) : !forceEmptyText && !isLabelHidden ? (diff --git a/packages/twenty-ui/src/data-display/LinkChip/LinkChip.tsx b/packages/twenty-ui/src/data-display/LinkChip/LinkChip.tsxindex 24d830cd05e..92a7a67675a 100644--- a/packages/twenty-ui/src/data-display/LinkChip/LinkChip.tsx+++ b/packages/twenty-ui/src/data-display/LinkChip/LinkChip.tsx@@ -27,6 +27,9 @@ export const LinkChip = ({to,size = ChipSize.Small,label,+ tooltipLabel,+ tooltipPlace,+ alwaysShowTooltip,isLabelHidden = false,isBold = false,variant = ChipVariant.Regular,@@ -64,6 +67,9 @@ export const LinkChip = ({<Chipsize={size}label={label}+ tooltipLabel={tooltipLabel}+ tooltipPlace={tooltipPlace}+ alwaysShowTooltip={alwaysShowTooltip}isLabelHidden={isLabelHidden}isBold={isBold}clickable={true}diff --git a/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsxindex 1e7ba97f545..d6a93fd4221 100644--- a/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx+++ b/packages/twenty-ui/src/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip.tsx@@ -6,7 +6,11 @@ import { clsx } from 'clsx';import { LinkifiedText } from '@ui/typography/LinkifiedText/LinkifiedText';import { Text } from '@ui/typography/Text/Text';import { isDefined } from '@ui/utilities/utils/isDefined';-import { AppTooltip, TooltipDelay } from '@ui/surfaces/AppTooltip/AppTooltip';+import {+ AppTooltip,+ TooltipDelay,+ TooltipPosition,+} from '@ui/surfaces/AppTooltip/AppTooltip';import styles from './OverflowingTextWithTooltip.module.scss';@@ -15,6 +19,7 @@ type OverflowingTextWithTooltipProps = {isTooltipMultiline?: boolean;displayedMaxRows?: number;tooltipDelay?: TooltipDelay;+ tooltipPlace?: TooltipPosition;alwaysShowTooltip?: boolean;} & (| {@@ -34,6 +39,7 @@ export const OverflowingTextWithTooltip = ({displayedMaxRows,tooltipContent,tooltipDelay = TooltipDelay.mediumDelay,+ tooltipPlace = TooltipPosition.Bottom,alwaysShowTooltip = false,}: OverflowingTextWithTooltipProps) => {const textElementId = `title-id-${useId().replace(/:/g, '')}`;@@ -115,7 +121,7 @@ export const OverflowingTextWithTooltip = ({anchorSelect={`#${textElementId}`}offset={5}noArrow- place="bottom"+ place={tooltipPlace}positionStrategy="absolute"delay={tooltipDelay}isOpen={true}