ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-11-26 08:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed event coloring issue on the my view/family view

Browse Source
This commit is contained in:
Dejan
2024-11-21 23:53:18 +01:00
parent fb27079f10
commit 29ec985ffa
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/pages/calendar/EventCalendar.tsx
View File

@ -104,7 +104,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
const memoizedEventCellStyle = useCallback( const memoizedEventCellStyle = useCallback(
(event: CalendarEvent) => { (event: CalendarEvent) => {
let eventColor = event.eventColor; let eventColor = event.eventColor;
if (!isFamilyView && event.attendees?.includes(user?.uid)) { if (!isFamilyView && (event.attendees?.includes(user?.uid) || event.creatorId === user?.uid)) {
eventColor = profileData?.eventColor ?? colorMap.teal; eventColor = profileData?.eventColor ?? colorMap.teal;
} }
@ -283,6 +283,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
// enrichedEventsByDate={enrichedEvents} // enrichedEventsByDate={enrichedEvents}
events={filteredEvents} events={filteredEvents}
eventCellStyle={memoizedEventCellStyle} eventCellStyle={memoizedEventCellStyle}
allDayEventCellStyle={memoizedEventCellStyle}
onPressEvent={handlePressEvent} onPressEvent={handlePressEvent}
weekStartsOn={memoizedWeekStartsOn} weekStartsOn={memoizedWeekStartsOn}
height={calendarHeight} height={calendarHeight}

3
components/pages/calendar/ManuallyAddEventModal.tsx
View File

@ -67,6 +67,7 @@ export const ManuallyAddEventModal = () => {
setDeleteModalVisible(false); setDeleteModalVisible(false);
setSelectedNewEndDate(undefined); setSelectedNewEndDate(undefined);
setEditEvent(undefined); setEditEvent(undefined);
setCreator(null)
}, },
initialDate: selectedNewEventDate || editEvent?.start, initialDate: selectedNewEventDate || editEvent?.start,
}; };
@ -149,7 +150,7 @@ export const ManuallyAddEventModal = () => {
const fullName = `${creatorMember?.firstName ?? ""}`; const fullName = `${creatorMember?.firstName ?? ""}`;
setCreator(fullName); setCreator(fullName);
} }
}, []) }, [members])
const isLoading = isDeleting || isAdding; const isLoading = isDeleting || isAdding;