Fix calendar preview avatar display (#4930)

- Fix avatar preview
- Fix border radius
This commit is contained in:
bosiraphael 2024-04-11 18:02:08 +02:00 committed by GitHub
parent f332213e0d
commit bc3930911e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 12 deletions

View File

@ -161,12 +161,13 @@ export const CalendarEventRow = ({
key={[participant.workspaceMemberId, participant.displayName]
.filter(isDefined)
.join('-')}
avatarUrl={
participant.workspaceMemberId === currentWorkspaceMember?.id
? currentWorkspaceMember?.avatarUrl
: undefined
avatarUrl={participant.avatarUrl}
placeholder={
participant.firstName && participant.lastName
? `${participant.firstName} ${participant.lastName}`
: participant.displayName
}
placeholder={participant.displayName}
entityId={participant.workspaceMemberId ?? participant.personId}
type="rounded"
/>
))}

View File

@ -1,5 +1,4 @@
import { useContext } from 'react';
import styled from '@emotion/styled';
import { CalendarDayCardContent } from '@/activities/calendar/components/CalendarDayCardContent';
import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext';
@ -9,15 +8,11 @@ type CalendarMonthCardProps = {
dayTimes: number[];
};
const StyledCard = styled(Card)`
overflow: visible;
`;
export const CalendarMonthCard = ({ dayTimes }: CalendarMonthCardProps) => {
const { calendarEventsByDayTime } = useContext(CalendarContext);
return (
<StyledCard fullWidth>
<Card fullWidth>
{dayTimes.map((dayTime, index) => {
const dayCalendarEvents = calendarEventsByDayTime[dayTime] || [];
@ -29,6 +24,6 @@ export const CalendarMonthCard = ({ dayTimes }: CalendarMonthCardProps) => {
/>
);
})}
</StyledCard>
</Card>
);
};