mirror of
https://github.com/lingble/twenty.git
synced 2025-11-01 05:07:56 +00:00
[FIX] Text overflow on timeline (#8325)
FIX: #6977 Implementation: 1. Parent (Summary componenet) width is set to 100%. (dosen't grow even if the child exceeds width) 2. span element is set to `text-overflow: ellipses` when overflown. --------- Co-authored-by: Félix Malfait <felix@twenty.com>
This commit is contained in:
@@ -9,6 +9,7 @@ import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableE
|
|||||||
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
|
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
|
||||||
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
|
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
|
||||||
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
|
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
|
||||||
|
import { MOBILE_VIEWPORT } from 'twenty-ui';
|
||||||
|
|
||||||
type EventListProps = {
|
type EventListProps = {
|
||||||
targetableObject: ActivityTargetableObject;
|
targetableObject: ActivityTargetableObject;
|
||||||
@@ -28,6 +29,10 @@ const StyledTimelineContainer = styled.div`
|
|||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
|
|
||||||
width: calc(100% - ${({ theme }) => theme.spacing(8)});
|
width: calc(100% - ${({ theme }) => theme.spacing(8)});
|
||||||
|
|
||||||
|
@media (max-width: ${MOBILE_VIEWPORT}px) {
|
||||||
|
width: calc(100% - ${({ theme }) => theme.spacing(2)});
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const EventList = ({ events, targetableObject }: EventListProps) => {
|
export const EventList = ({ events, targetableObject }: EventListProps) => {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import { TimelineActivity } from '@/activities/timeline-activities/types/Timelin
|
|||||||
import { getTimelineActivityAuthorFullName } from '@/activities/timeline-activities/utils/getTimelineActivityAuthorFullName';
|
import { getTimelineActivityAuthorFullName } from '@/activities/timeline-activities/utils/getTimelineActivityAuthorFullName';
|
||||||
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
|
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
|
||||||
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
|
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
|
||||||
|
import { MOBILE_VIEWPORT } from 'twenty-ui';
|
||||||
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
|
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
|
||||||
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
|
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
|
||||||
|
|
||||||
@@ -62,6 +63,7 @@ const StyledSummary = styled.summary`
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
gap: ${({ theme }) => theme.spacing(1)};
|
gap: ${({ theme }) => theme.spacing(1)};
|
||||||
|
width: 100%;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledItemContainer = styled.div<{ isMarginBottom?: boolean }>`
|
const StyledItemContainer = styled.div<{ isMarginBottom?: boolean }>`
|
||||||
@@ -77,6 +79,9 @@ const StyledItemContainer = styled.div<{ isMarginBottom?: boolean }>`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledItemTitleDate = styled.div`
|
const StyledItemTitleDate = styled.div`
|
||||||
|
@media (max-width: ${MOBILE_VIEWPORT}px) {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
padding-top: ${({ theme }) => theme.spacing(1)};
|
padding-top: ${({ theme }) => theme.spacing(1)};
|
||||||
color: ${({ theme }) => theme.font.color.tertiary};
|
color: ${({ theme }) => theme.font.color.tertiary};
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import {
|
|||||||
AnimatedPlaceholderEmptyTextContainer,
|
AnimatedPlaceholderEmptyTextContainer,
|
||||||
AnimatedPlaceholderEmptyTitle,
|
AnimatedPlaceholderEmptyTitle,
|
||||||
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
|
EMPTY_PLACEHOLDER_TRANSITION_PROPS,
|
||||||
|
MOBILE_VIEWPORT,
|
||||||
} from 'twenty-ui';
|
} from 'twenty-ui';
|
||||||
|
|
||||||
const StyledMainContainer = styled.div`
|
const StyledMainContainer = styled.div`
|
||||||
@@ -31,6 +32,11 @@ const StyledMainContainer = styled.div`
|
|||||||
padding-right: ${({ theme }) => theme.spacing(6)};
|
padding-right: ${({ theme }) => theme.spacing(6)};
|
||||||
padding-left: ${({ theme }) => theme.spacing(6)};
|
padding-left: ${({ theme }) => theme.spacing(6)};
|
||||||
gap: ${({ theme }) => theme.spacing(4)};
|
gap: ${({ theme }) => theme.spacing(4)};
|
||||||
|
|
||||||
|
@media (max-width: ${MOBILE_VIEWPORT}px) {
|
||||||
|
padding-right: ${({ theme }) => theme.spacing(1)};
|
||||||
|
padding-left: ${({ theme }) => theme.spacing(1)};
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const TimelineActivities = ({
|
export const TimelineActivities = ({
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ const StyledLinkedActivity = styled.span`
|
|||||||
color: ${({ theme }) => theme.font.color.primary};
|
color: ${({ theme }) => theme.font.color.primary};
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
|
width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export const StyledEventRowItemText = styled.span`
|
export const StyledEventRowItemText = styled.span`
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import styled from '@emotion/styled';
|
import styled from '@emotion/styled';
|
||||||
|
|
||||||
import { Card } from 'twenty-ui';
|
import { Card, MOBILE_VIEWPORT } from 'twenty-ui';
|
||||||
|
|
||||||
type EventCardProps = {
|
type EventCardProps = {
|
||||||
children: React.ReactNode;
|
children: React.ReactNode;
|
||||||
@@ -16,6 +16,10 @@ const StyledCardContainer = styled.div`
|
|||||||
width: 400px;
|
width: 400px;
|
||||||
padding: ${({ theme }) => theme.spacing(2)} 0px
|
padding: ${({ theme }) => theme.spacing(2)} 0px
|
||||||
${({ theme }) => theme.spacing(1)} 0px;
|
${({ theme }) => theme.spacing(1)} 0px;
|
||||||
|
|
||||||
|
@media (max-width: ${MOBILE_VIEWPORT}px) {
|
||||||
|
width: 300px;
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledCard = styled(Card)`
|
const StyledCard = styled(Card)`
|
||||||
|
|||||||
@@ -20,7 +20,10 @@ const StyledEventFieldDiffContainer = styled.div`
|
|||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
gap: ${({ theme }) => theme.spacing(1)};
|
gap: ${({ theme }) => theme.spacing(1)};
|
||||||
height: 24px;
|
height: 24px;
|
||||||
width: 380px;
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const StyledEmptyValue = styled.div`
|
const StyledEmptyValue = styled.div`
|
||||||
|
|||||||
Reference in New Issue
Block a user