The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Align timeline event icons with their row text (#24957)
Félix Malfaite1961cfc7781
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsxindex 0ced1588347..fcf3415a833 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventRow.tsx@@ -4,6 +4,7 @@ import { useContext } from 'react';import { TimelineActivityContext } from '@/activities/timeline-activities/contexts/TimelineActivityContext';+import { TIMELINE_ICON_SLOT_SIZE } from '@/activities/timeline-activities/constants/TimelineIconSlotSize';import { EventIconDynamicComponent } from '@/activities/timeline-activities/rows/components/EventIconDynamicComponent';import { EventRowDynamicComponent } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent';import { getStandardTimelineActivityRenderer } from '@/activities/timeline-activities/rows/components/StandardTimelineActivityRenderer';@@ -30,42 +31,36 @@ const StyledTimelineItemContainer = styled.div`color: ${themeCssVariables.font.color.primary};display: flex;gap: ${themeCssVariables.spacing[4]};- height: 'auto';justify-content: space-between;overflow: hidden;white-space: nowrap;`;const StyledLeftContainer = styled.div`+ align-items: center;display: flex;flex-direction: column;+ flex-shrink: 0;+ width: ${TIMELINE_ICON_SLOT_SIZE}px;`;const StyledIconContainer = styled.div`align-items: center;color: ${themeCssVariables.font.color.tertiary};- display: flex;- height: 16px;- justify-content: center;- margin: 5px;- text-decoration-line: underline;- user-select: none;- width: 16px;- z-index: 2;-`;--const StyledVerticalLineContainer = styled.div`display: flex;flex-shrink: 0;- height: 100%;+ height: ${TIMELINE_ICON_SLOT_SIZE}px;justify-content: center;+ user-select: none;+ width: 100%;z-index: 2;`;const StyledVerticalLine = styled.div`background: ${themeCssVariables.border.color.light};- height: 100%;+ flex: 1;width: 2px;+ z-index: 2;`;const StyledItemContainer = styled.div<{ isMarginBottom?: boolean }>`@@ -76,7 +71,8 @@ const StyledItemContainer = styled.div<{ isMarginBottom?: boolean }>`gap: ${themeCssVariables.spacing[1]};margin-bottom: ${({ isMarginBottom }) =>isMarginBottom ? themeCssVariables.spacing[3] : '0'};- min-height: 26px;+ min-height: ${TIMELINE_ICON_SLOT_SIZE}px;+ min-width: 0;overflow: hidden;`;@@ -189,11 +185,7 @@ export const EventRow = ({linkedObjectMetadataItem={linkedObjectMetadataItem}/></StyledIconContainer>- {!isLastEvent && (- <StyledVerticalLineContainer>- <StyledVerticalLine />- </StyledVerticalLineContainer>- )}+ {!isLastEvent && <StyledVerticalLine />}</StyledLeftContainer><StyledItemContainer isMarginBottom={!isLastEvent}><EventRowDynamicComponentdiff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventsGroup.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventsGroup.tsxindex e0d032e1350..019a52ad680 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventsGroup.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventsGroup.tsx@@ -1,6 +1,7 @@import { styled } from '@linaria/react';import { EventRow } from '@/activities/timeline-activities/components/EventRow';+import { TIMELINE_ICON_SLOT_SIZE } from '@/activities/timeline-activities/constants/TimelineIconSlotSize';import { type EventGroup } from '@/activities/timeline-activities/utils/groupEventsByMonth';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -27,17 +28,14 @@ const StyledActivityGroupContainer = styled.div``;const StyledActivityGroupBar = styled.div`- align-items: center;background: ${themeCssVariables.background.secondary};border: 1px solid ${themeCssVariables.border.color.light};border-radius: ${themeCssVariables.border.radius.md};- display: flex;- flex-direction: column;height: 100%;- justify-content: center;+ left: 0;position: absolute;top: 0;- width: 24px;+ width: ${TIMELINE_ICON_SLOT_SIZE}px;`;const StyledMonthSeperator = styled.div`diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/constants/TimelineIconSlotSize.ts b/packages/twenty-front/src/modules/activities/timeline-activities/constants/TimelineIconSlotSize.tsnew file mode 100644index 00000000000..82dcac041b9--- /dev/null+++ b/packages/twenty-front/src/modules/activities/timeline-activities/constants/TimelineIconSlotSize.ts@@ -0,0 +1,2 @@+// One shared value is what keeps icon, rail and row text on the same center.+export const TIMELINE_ICON_SLOT_SIZE = 26;diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsxindex 1b0a501d027..037f7036aec 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventCardToggleButton.tsx@@ -1,3 +1,4 @@+import { TIMELINE_ICON_SLOT_SIZE } from '@/activities/timeline-activities/constants/TimelineIconSlotSize';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { IconButton } from 'twenty-ui/input';@@ -10,7 +11,11 @@ type EventCardToggleButtonProps = {};const StyledButtonContainer = styled.div`+ align-items: center;border-radius: ${themeCssVariables.border.radius.sm};+ display: flex;+ flex-shrink: 0;+ height: ${TIMELINE_ICON_SLOT_SIZE}px;`;export const EventCardToggleButton = ({diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsxindex 0450f35682b..54a80b256fd 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx@@ -2,6 +2,7 @@ import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIimport { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { isDefined } from 'twenty-shared/utils';import { useIcons } from 'twenty-ui/icon';+import { useTheme } from 'twenty-ui/theme-constants';export const EventIconDynamicComponent = ({eventIcon,@@ -11,6 +12,7 @@ export const EventIconDynamicComponent = ({linkedObjectMetadataItem: EnrichedObjectMetadataItem | null;}) => {const { getIcon } = useIcons();+ const theme = useTheme();if (!isDefined(eventIcon)) {return <ObjectMetadataIcon objectMetadataItem={linkedObjectMetadataItem} />;@@ -18,5 +20,5 @@ export const EventIconDynamicComponent = ({const EventIcon = getIcon(eventIcon);- return <EventIcon />;+ return <EventIcon size={theme.icon.size.md} />;};diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowStyles.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowStyles.tsxindex 42b49c3780c..36594d636f1 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowStyles.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowStyles.tsx@@ -1,18 +1,28 @@import { styled } from '@linaria/react';+import { TIMELINE_ICON_SLOT_SIZE } from '@/activities/timeline-activities/constants/TimelineIconSlotSize';import { themeCssVariables } from 'twenty-ui/theme-constants';+export const StyledEventRow = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[1]};+ width: 100%;+`;+export const StyledEventRowContainer = styled.div`align-items: center;display: flex;gap: ${themeCssVariables.spacing[1]};justify-content: space-between;+ min-height: ${TIMELINE_ICON_SLOT_SIZE}px;`;export const StyledEventRowContent = styled.div`align-items: center;display: flex;gap: ${themeCssVariables.spacing[1]};+ min-width: 0;overflow: hidden;`;diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsxindex 9f5bc51935f..60d5778ac52 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/generic/components/EventRowGenericLinked.tsx@@ -8,6 +8,7 @@ import { type EventRowNativeComponentProps } from '@/activities/timeline-activitimport { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';import { getAuthorizedLinkedRecordName } from '@/activities/timeline-activities/rows/generic/utils/getAuthorizedLinkedRecordName';import {+ StyledEventRow,StyledEventRowContainer,StyledEventRowContent,StyledEventRowLinkedRecord,@@ -20,18 +21,9 @@ import { allowRequestsToTwentyIconsState } from '@/client-config/states/allowReqimport { recordStoreIdentifierFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreIdentifierFamilySelector';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme-constants';type EventRowGenericLinkedProps = EventRowNativeComponentProps;-const StyledGenericLinkedContainer = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[1]};- width: 100%;-`;-export const EventRowGenericLinked = ({event,eventTypeLabel,@@ -94,7 +86,7 @@ export const EventRowGenericLinked = ({};return (- <StyledGenericLinkedContainer>+ <StyledEventRow><StyledEventRowContainer><StyledEventRowContent><EventRowItem>{authorFullName}</EventRowItem>@@ -126,6 +118,6 @@ export const EventRowGenericLinked = ({/></EventCard>)}- </StyledGenericLinkedContainer>+ </StyledEventRow>);};diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsxindex 1370f55c4b0..ab96fcc45be 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObject.tsx@@ -1,35 +1,17 @@import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';import { type EventRowNativeComponentProps } from '@/activities/timeline-activities/rows/components/EventRowDynamicComponent.types';import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';+import {+ StyledEventRow,+ StyledEventRowContainer,+ StyledEventRowContent,+} from '@/activities/timeline-activities/rows/components/EventRowStyles';import { EventRowMainObjectUpdated } from '@/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated';-import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';-import { themeCssVariables } from 'twenty-ui/theme-constants';type EventRowMainObjectProps = EventRowNativeComponentProps;-const StyledMainContainer = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[1]};- width: 100%;-`;--const StyledRowContainer = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[1]};- justify-content: space-between;-`;--const StyledRow = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[1]};- overflow: hidden;-`;-export const EventRowMainObject = ({authorFullName,labelIdentifierValue,@@ -43,18 +25,18 @@ export const EventRowMainObject = ({switch (eventAction) {case 'created': {return (- <StyledMainContainer>- <StyledRowContainer>- <StyledRow>+ <StyledEventRow>+ <StyledEventRowContainer>+ <StyledEventRowContent><EventRowItem>{labelIdentifierValue}</EventRowItem><EventRowItem variant="action">{eventTypeLabel ?? t`was created by`}</EventRowItem><EventRowItem>{authorFullName}</EventRowItem>- </StyledRow>+ </StyledEventRowContent><EventRowDate happensAt={happensAt} />- </StyledRowContainer>- </StyledMainContainer>+ </StyledEventRowContainer>+ </StyledEventRow>);}case 'updated': {@@ -72,34 +54,34 @@ export const EventRowMainObject = ({}case 'deleted': {return (- <StyledMainContainer>- <StyledRowContainer>- <StyledRow>+ <StyledEventRow>+ <StyledEventRowContainer>+ <StyledEventRowContent><EventRowItem>{labelIdentifierValue}</EventRowItem><EventRowItem variant="action">{eventTypeLabel ?? t`was deleted by`}</EventRowItem><EventRowItem>{authorFullName}</EventRowItem>- </StyledRow>+ </StyledEventRowContent><EventRowDate happensAt={happensAt} />- </StyledRowContainer>- </StyledMainContainer>+ </StyledEventRowContainer>+ </StyledEventRow>);}case 'restored': {return (- <StyledMainContainer>- <StyledRowContainer>- <StyledRow>+ <StyledEventRow>+ <StyledEventRowContainer>+ <StyledEventRowContent><EventRowItem>{labelIdentifierValue}</EventRowItem><EventRowItem variant="action">{eventTypeLabel ?? t`was restored by`}</EventRowItem><EventRowItem>{authorFullName}</EventRowItem>- </StyledRow>+ </StyledEventRowContent><EventRowDate happensAt={happensAt} />- </StyledRowContainer>- </StyledMainContainer>+ </StyledEventRowContainer>+ </StyledEventRow>);}default: {@@ -108,16 +90,16 @@ export const EventRowMainObject = ({}return (- <StyledMainContainer>- <StyledRowContainer>- <StyledRow>+ <StyledEventRow>+ <StyledEventRowContainer>+ <StyledEventRowContent><EventRowItem>{authorFullName}</EventRowItem><EventRowItem variant="action">{eventTypeLabel}</EventRowItem><EventRowItem>{labelIdentifierValue}</EventRowItem>- </StyledRow>+ </StyledEventRowContent><EventRowDate happensAt={happensAt} />- </StyledRowContainer>- </StyledMainContainer>+ </StyledEventRowContainer>+ </StyledEventRow>);}}diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsxindex 9ae4e0f002a..65fde2258f1 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/main-object/components/EventRowMainObjectUpdated.tsx@@ -1,4 +1,3 @@-import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { useState } from 'react';@@ -6,10 +5,14 @@ import { EventCard } from '@/activities/timeline-activities/rows/components/Evenimport { EventCardToggleButton } from '@/activities/timeline-activities/rows/components/EventCardToggleButton';import { EventRowDate } from '@/activities/timeline-activities/rows/components/EventRowDate';import { EventRowItem } from '@/activities/timeline-activities/rows/components/EventRowItem';+import {+ StyledEventRow,+ StyledEventRowContainer,+ StyledEventRowContent,+} from '@/activities/timeline-activities/rows/components/EventRowStyles';import { EventFieldDiffContainer } from '@/activities/timeline-activities/rows/main-object/components/EventFieldDiffContainer';import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { themeCssVariables } from 'twenty-ui/theme-constants';type EventRowMainObjectUpdatedProps = {mainObjectMetadataItem: EnrichedObjectMetadataItem;@@ -21,27 +24,6 @@ type EventRowMainObjectUpdatedProps = {hasRenderer?: boolean;};-const StyledRowContainer = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[1]};- justify-content: space-between;-`;--const StyledRow = styled.div`- align-items: center;- display: flex;- gap: ${themeCssVariables.spacing[1]};- overflow: hidden;-`;--const StyledEventRowMainObjectUpdatedContainer = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[1]};- width: 100%;-`;-export const EventRowMainObjectUpdated = ({authorFullName,labelIdentifierValue,@@ -59,18 +41,18 @@ export const EventRowMainObjectUpdated = ({const diffEntries = Object.entries(diff);if (diffEntries.length === 0) {return (- <StyledEventRowMainObjectUpdatedContainer>- <StyledRowContainer>- <StyledRow>+ <StyledEventRow>+ <StyledEventRowContainer>+ <StyledEventRowContent><EventRowItem>{authorFullName}</EventRowItem><EventRowItem variant="action">{eventTypeLabel ?? t`updated`}</EventRowItem><EventRowItem>{labelIdentifierValue}</EventRowItem>- </StyledRow>+ </StyledEventRowContent><EventRowDate happensAt={happensAt} />- </StyledRowContainer>- </StyledEventRowMainObjectUpdatedContainer>+ </StyledEventRowContainer>+ </StyledEventRow>);}@@ -78,9 +60,9 @@ export const EventRowMainObjectUpdated = ({const recordLabel = labelIdentifierValue;return (- <StyledEventRowMainObjectUpdatedContainer>- <StyledRowContainer>- <StyledRow>+ <StyledEventRow>+ <StyledEventRowContainer>+ <StyledEventRowContent><EventRowItem>{authorFullName}</EventRowItem><EventRowItem variant="action">{eventTypeLabel ?? t`updated`}@@ -101,9 +83,9 @@ export const EventRowMainObjectUpdated = ({)}</>)}- </StyledRow>+ </StyledEventRowContent><EventRowDate happensAt={happensAt} />- </StyledRowContainer>+ </StyledEventRowContainer>{diffEntries.length > 1 && !hasRenderer && (<EventCard isOpen={isOpen}>{diffEntries.map(([diffKey, diffValue]) => (@@ -117,6 +99,6 @@ export const EventRowMainObjectUpdated = ({))}</EventCard>)}- </StyledEventRowMainObjectUpdatedContainer>+ </StyledEventRow>);};