mirror of
https://github.com/urosran/cally.git
synced 2025-07-15 17:47:08 +00:00
fixed some calendar bugs
This commit is contained in:
@ -6,6 +6,7 @@ import {useAtom, useSetAtom} from "jotai";
|
|||||||
import {
|
import {
|
||||||
editVisibleAtom,
|
editVisibleAtom,
|
||||||
eventForEditAtom,
|
eventForEditAtom,
|
||||||
|
isAllDayAtom,
|
||||||
modeAtom,
|
modeAtom,
|
||||||
selectedDateAtom,
|
selectedDateAtom,
|
||||||
selectedNewEventDateAtom,
|
selectedNewEventDateAtom,
|
||||||
@ -34,6 +35,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
|
|||||||
const [mode, setMode] = useAtom(modeAtom);
|
const [mode, setMode] = useAtom(modeAtom);
|
||||||
|
|
||||||
const setEditVisible = useSetAtom(editVisibleAtom);
|
const setEditVisible = useSetAtom(editVisibleAtom);
|
||||||
|
const [isAllDay, setIsAllDay] = useAtom(isAllDayAtom);
|
||||||
const setEventForEdit = useSetAtom(eventForEditAtom);
|
const setEventForEdit = useSetAtom(eventForEditAtom);
|
||||||
const setSelectedNewEndDate = useSetAtom(selectedNewEventDateAtom);
|
const setSelectedNewEndDate = useSetAtom(selectedNewEventDateAtom);
|
||||||
|
|
||||||
@ -67,6 +69,16 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
|
|||||||
[mode, setSelectedNewEndDate, setSelectedDate]
|
[mode, setSelectedNewEndDate, setSelectedDate]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const handlePressDayHeader = useCallback(
|
||||||
|
(date: Date) => {
|
||||||
|
setIsAllDay(true);
|
||||||
|
console.log(isAllDay);
|
||||||
|
setSelectedNewEndDate(date);
|
||||||
|
setEditVisible(true);
|
||||||
|
},
|
||||||
|
[setSelectedNewEndDate]
|
||||||
|
);
|
||||||
|
|
||||||
const handleSwipeEnd = useCallback(
|
const handleSwipeEnd = useCallback(
|
||||||
(date: Date) => {
|
(date: Date) => {
|
||||||
setSelectedDate(date);
|
setSelectedDate(date);
|
||||||
@ -84,7 +96,10 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
|
|||||||
[profileData]
|
[profileData]
|
||||||
);
|
);
|
||||||
|
|
||||||
console.log({memoizedWeekStartsOn, profileData: profileData?.firstDayOfWeek})
|
console.log({
|
||||||
|
memoizedWeekStartsOn,
|
||||||
|
profileData: profileData?.firstDayOfWeek,
|
||||||
|
});
|
||||||
|
|
||||||
const isSameDate = useCallback((date1: Date, date2: Date) => {
|
const isSameDate = useCallback((date1: Date, date2: Date) => {
|
||||||
return (
|
return (
|
||||||
@ -117,32 +132,34 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
|
|||||||
}
|
}
|
||||||
}, [mode]);
|
}, [mode]);
|
||||||
|
|
||||||
|
|
||||||
const { enrichedEvents, filteredEvents } = useMemo(() => {
|
const { enrichedEvents, filteredEvents } = useMemo(() => {
|
||||||
const startTime = Date.now(); // Start timer
|
const startTime = Date.now(); // Start timer
|
||||||
|
|
||||||
const startOffset = mode === "month" ? 40 : mode === "week" ? 10 : 1;
|
const startOffset = mode === "month" ? 40 : mode === "week" ? 10 : 1;
|
||||||
const endOffset = mode === "month" ? 40 : mode === "week" ? 10 : 1;
|
const endOffset = mode === "month" ? 40 : mode === "week" ? 10 : 1;
|
||||||
|
|
||||||
const filteredEvents = events?.filter(event =>
|
const filteredEvents =
|
||||||
event.start && event.end &&
|
events?.filter(
|
||||||
|
(event) =>
|
||||||
|
event.start &&
|
||||||
|
event.end &&
|
||||||
isWithinInterval(event.start, {
|
isWithinInterval(event.start, {
|
||||||
start: subDays(selectedDate, startOffset),
|
start: subDays(selectedDate, startOffset),
|
||||||
end: addDays(selectedDate, endOffset)
|
end: addDays(selectedDate, endOffset),
|
||||||
}) &&
|
}) &&
|
||||||
isWithinInterval(event.end, {
|
isWithinInterval(event.end, {
|
||||||
start: subDays(selectedDate, startOffset),
|
start: subDays(selectedDate, startOffset),
|
||||||
end: addDays(selectedDate, endOffset)
|
end: addDays(selectedDate, endOffset),
|
||||||
})
|
})
|
||||||
) ?? [];
|
) ?? [];
|
||||||
|
|
||||||
const enrichedEvents = filteredEvents.reduce((acc, event) => {
|
const enrichedEvents = filteredEvents.reduce((acc, event) => {
|
||||||
const dateKey = event.start.toISOString().split('T')[0];
|
const dateKey = event.start.toISOString().split("T")[0];
|
||||||
acc[dateKey] = acc[dateKey] || [];
|
acc[dateKey] = acc[dateKey] || [];
|
||||||
acc[dateKey].push({
|
acc[dateKey].push({
|
||||||
...event,
|
...event,
|
||||||
overlapPosition: false,
|
overlapPosition: false,
|
||||||
overlapCount: 0
|
overlapCount: 0,
|
||||||
});
|
});
|
||||||
|
|
||||||
acc[dateKey].sort((a, b) => compareAsc(a.start, b.start));
|
acc[dateKey].sort((a, b) => compareAsc(a.start, b.start));
|
||||||
@ -151,7 +168,11 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
|
|||||||
}, {} as Record<string, CalendarEvent[]>);
|
}, {} as Record<string, CalendarEvent[]>);
|
||||||
|
|
||||||
const endTime = Date.now();
|
const endTime = Date.now();
|
||||||
console.log("memoizedEvents computation time:", endTime - startTime, "ms");
|
console.log(
|
||||||
|
"memoizedEvents computation time:",
|
||||||
|
endTime - startTime,
|
||||||
|
"ms"
|
||||||
|
);
|
||||||
|
|
||||||
return { enrichedEvents, filteredEvents };
|
return { enrichedEvents, filteredEvents };
|
||||||
}, [events, selectedDate, mode]);
|
}, [events, selectedDate, mode]);
|
||||||
@ -262,6 +283,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
|
|||||||
dayHeaderHighlightColor={"white"}
|
dayHeaderHighlightColor={"white"}
|
||||||
showAdjacentMonths
|
showAdjacentMonths
|
||||||
hourStyle={styles.hourStyle}
|
hourStyle={styles.hourStyle}
|
||||||
|
onPressDateHeader={handlePressDayHeader}
|
||||||
ampm
|
ampm
|
||||||
// renderCustomDateForMonth={renderCustomDateForMonth}
|
// renderCustomDateForMonth={renderCustomDateForMonth}
|
||||||
/>
|
/>
|
||||||
|
@ -29,8 +29,12 @@ import LockIcon from "@/assets/svgs/LockIcon";
|
|||||||
import MenuIcon from "@/assets/svgs/MenuIcon";
|
import MenuIcon from "@/assets/svgs/MenuIcon";
|
||||||
import CameraIcon from "@/assets/svgs/CameraIcon";
|
import CameraIcon from "@/assets/svgs/CameraIcon";
|
||||||
import AssigneesDisplay from "@/components/shared/AssigneesDisplay";
|
import AssigneesDisplay from "@/components/shared/AssigneesDisplay";
|
||||||
import {useAtom} from "jotai";
|
import { useAtom, useAtomValue } from "jotai";
|
||||||
import {eventForEditAtom, selectedNewEventDateAtom,} from "@/components/pages/calendar/atoms";
|
import {
|
||||||
|
eventForEditAtom,
|
||||||
|
selectedNewEventDateAtom,
|
||||||
|
isAllDayAtom,
|
||||||
|
} from "@/components/pages/calendar/atoms";
|
||||||
import { useGetFamilyMembers } from "@/hooks/firebase/useGetFamilyMembers";
|
import { useGetFamilyMembers } from "@/hooks/firebase/useGetFamilyMembers";
|
||||||
import BinIcon from "@/assets/svgs/BinIcon";
|
import BinIcon from "@/assets/svgs/BinIcon";
|
||||||
import DeleteEventDialog from "./DeleteEventDialog";
|
import DeleteEventDialog from "./DeleteEventDialog";
|
||||||
@ -53,8 +57,9 @@ export const ManuallyAddEventModal = () => {
|
|||||||
selectedNewEventDateAtom
|
selectedNewEventDateAtom
|
||||||
);
|
);
|
||||||
const [editEvent, setEditEvent] = useAtom(eventForEditAtom);
|
const [editEvent, setEditEvent] = useAtom(eventForEditAtom);
|
||||||
|
const [allDayAtom, setAllDayAtom] = useAtom(isAllDayAtom);
|
||||||
const [deleteModalVisible, setDeleteModalVisible] = useState<boolean>(false);
|
const [deleteModalVisible, setDeleteModalVisible] = useState<boolean>(false);
|
||||||
const {mutateAsync: deleteEvent, isLoading: isDeleting} = useDeleteEvent()
|
const { mutateAsync: deleteEvent, isLoading: isDeleting } = useDeleteEvent();
|
||||||
|
|
||||||
const { show, close, initialDate } = {
|
const { show, close, initialDate } = {
|
||||||
show: !!selectedNewEventDate || !!editEvent,
|
show: !!selectedNewEventDate || !!editEvent,
|
||||||
@ -74,22 +79,51 @@ export const ManuallyAddEventModal = () => {
|
|||||||
const [isPrivate, setIsPrivate] = useState<boolean>(
|
const [isPrivate, setIsPrivate] = useState<boolean>(
|
||||||
editEvent?.private || false
|
editEvent?.private || false
|
||||||
);
|
);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
console.log(allDayAtom);
|
||||||
|
return () => {
|
||||||
|
setAllDayAtom(false);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
const [startTime, setStartTime] = useState(() => {
|
const [startTime, setStartTime] = useState(() => {
|
||||||
const date = initialDate ?? new Date();
|
const date = initialDate ?? new Date();
|
||||||
date.setSeconds(0, 0);
|
if (
|
||||||
|
date.getMinutes() > 0 ||
|
||||||
|
date.getSeconds() > 0 ||
|
||||||
|
date.getMilliseconds() > 0
|
||||||
|
) {
|
||||||
|
date.setHours(date.getHours() + 1);
|
||||||
|
}
|
||||||
|
date.setMinutes(0);
|
||||||
|
date.setSeconds(0);
|
||||||
|
date.setMilliseconds(0);
|
||||||
return date;
|
return date;
|
||||||
});
|
});
|
||||||
|
|
||||||
const [endTime, setEndTime] = useState(() => {
|
const [endTime, setEndTime] = useState(() => {
|
||||||
if (editEvent?.end) {
|
if (editEvent?.end) {
|
||||||
const date = new Date(editEvent.end);
|
const date = new Date(editEvent.end);
|
||||||
date.setSeconds(0, 0);
|
date.setSeconds(0, 0);
|
||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
const date =
|
|
||||||
editEvent?.end ?? initialDate
|
const baseDate = editEvent?.end ?? initialDate ?? new Date();
|
||||||
? addHours(editEvent?.end ?? initialDate!, 1)
|
const date = new Date(baseDate);
|
||||||
: addHours(new Date(), 1);
|
|
||||||
date.setSeconds(0, 0);
|
if (
|
||||||
|
date.getMinutes() > 0 ||
|
||||||
|
date.getSeconds() > 0 ||
|
||||||
|
date.getMilliseconds() > 0
|
||||||
|
) {
|
||||||
|
date.setHours(date.getHours() + 1);
|
||||||
|
}
|
||||||
|
date.setMinutes(0);
|
||||||
|
date.setSeconds(0);
|
||||||
|
date.setMilliseconds(0);
|
||||||
|
|
||||||
|
date.setHours(date.getHours() + 1);
|
||||||
return date;
|
return date;
|
||||||
});
|
});
|
||||||
const [startDate, setStartDate] = useState(initialDate ?? new Date());
|
const [startDate, setStartDate] = useState(initialDate ?? new Date());
|
||||||
@ -101,35 +135,57 @@ export const ManuallyAddEventModal = () => {
|
|||||||
);
|
);
|
||||||
const [repeatInterval, setRepeatInterval] = useState<PickerMultiValue>([]);
|
const [repeatInterval, setRepeatInterval] = useState<PickerMultiValue>([]);
|
||||||
|
|
||||||
const {mutateAsync: createEvent, isLoading: isAdding, isError} = useCreateEvent();
|
const {
|
||||||
|
mutateAsync: createEvent,
|
||||||
|
isLoading: isAdding,
|
||||||
|
isError,
|
||||||
|
} = useCreateEvent();
|
||||||
const { data: members } = useGetFamilyMembers(true);
|
const { data: members } = useGetFamilyMembers(true);
|
||||||
const titleRef = useRef<TextFieldRef>(null)
|
const titleRef = useRef<TextFieldRef>(null);
|
||||||
|
|
||||||
const isLoading = isDeleting || isAdding
|
const isLoading = isDeleting || isAdding;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setTitle(editEvent?.title || "");
|
setTitle(editEvent?.title || "");
|
||||||
setDetails(editEvent?.notes || "");
|
setDetails(editEvent?.notes || "");
|
||||||
setIsAllDay(editEvent?.allDay || false);
|
setIsAllDay(editEvent?.allDay || false);
|
||||||
setIsPrivate(editEvent?.private || false);
|
setIsPrivate(editEvent?.private || false);
|
||||||
|
|
||||||
setStartTime(() => {
|
setStartTime(() => {
|
||||||
const date = initialDate ?? new Date();
|
const date = new Date(initialDate ?? new Date());
|
||||||
date.setSeconds(0, 0);
|
const minutes = date.getMinutes();
|
||||||
|
date.setMinutes(0, 0, 0);
|
||||||
|
if (minutes >= 30) {
|
||||||
|
date.setHours(date.getHours() + 1);
|
||||||
|
}
|
||||||
return date;
|
return date;
|
||||||
});
|
});
|
||||||
|
|
||||||
setEndTime(() => {
|
setEndTime(() => {
|
||||||
if (editEvent?.end) {
|
if (editEvent?.end) {
|
||||||
const date = new Date(editEvent.end);
|
const date = new Date(editEvent.end);
|
||||||
date.setSeconds(0, 0);
|
date.setSeconds(0, 0);
|
||||||
return date;
|
return date;
|
||||||
}
|
}
|
||||||
const date =
|
|
||||||
editEvent?.end ?? initialDate
|
const baseDate = editEvent?.end ?? initialDate ?? new Date();
|
||||||
? addHours(editEvent?.end ?? initialDate!, 1)
|
const date = new Date(baseDate);
|
||||||
: addHours(new Date(), 1);
|
|
||||||
date.setSeconds(0, 0);
|
if (
|
||||||
|
date.getMinutes() > 0 ||
|
||||||
|
date.getSeconds() > 0 ||
|
||||||
|
date.getMilliseconds() > 0
|
||||||
|
) {
|
||||||
|
date.setHours(date.getHours() + 1);
|
||||||
|
}
|
||||||
|
date.setMinutes(0);
|
||||||
|
date.setSeconds(0);
|
||||||
|
date.setMilliseconds(0);
|
||||||
|
|
||||||
|
date.setHours(date.getHours() + 1);
|
||||||
return date;
|
return date;
|
||||||
});
|
});
|
||||||
|
|
||||||
setStartDate(initialDate ?? new Date());
|
setStartDate(initialDate ?? new Date());
|
||||||
setEndDate(editEvent?.end ?? initialDate ?? new Date());
|
setEndDate(editEvent?.end ?? initialDate ?? new Date());
|
||||||
setSelectedAttendees(editEvent?.participants ?? []);
|
setSelectedAttendees(editEvent?.participants ?? []);
|
||||||
@ -139,7 +195,7 @@ export const ManuallyAddEventModal = () => {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (show && !editEvent) {
|
if (show && !editEvent) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
titleRef?.current?.focus()
|
titleRef?.current?.focus();
|
||||||
}, 500);
|
}, 500);
|
||||||
}
|
}
|
||||||
}, [selectedNewEventDate]);
|
}, [selectedNewEventDate]);
|
||||||
@ -160,8 +216,8 @@ export const ManuallyAddEventModal = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleDeleteEvent = async () => {
|
const handleDeleteEvent = async () => {
|
||||||
await deleteEvent({eventId: `${editEvent?.id}`})
|
await deleteEvent({ eventId: `${editEvent?.id}` });
|
||||||
close()
|
close();
|
||||||
};
|
};
|
||||||
|
|
||||||
const hideDeleteEventModal = () => {
|
const hideDeleteEventModal = () => {
|
||||||
@ -246,7 +302,10 @@ export const ManuallyAddEventModal = () => {
|
|||||||
onRequestClose={close}
|
onRequestClose={close}
|
||||||
transparent={false}
|
transparent={false}
|
||||||
>
|
>
|
||||||
<LoaderScreen message={isDeleting ? "Deleting event..." : "Saving event..."} color={Colors.grey40}/>
|
<LoaderScreen
|
||||||
|
message={isDeleting ? "Deleting event..." : "Saving event..."}
|
||||||
|
color={Colors.grey40}
|
||||||
|
/>
|
||||||
</Modal>
|
</Modal>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -345,7 +404,6 @@ export const ManuallyAddEventModal = () => {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
|
|
||||||
</View>
|
</View>
|
||||||
{/*)}*/}
|
{/*)}*/}
|
||||||
<ScrollView style={{ minHeight: "85%" }}>
|
<ScrollView style={{ minHeight: "85%" }}>
|
||||||
|
@ -2,6 +2,7 @@ import { atom } from "jotai";
|
|||||||
import { CalendarEvent } from "@/components/pages/calendar/interfaces";
|
import { CalendarEvent } from "@/components/pages/calendar/interfaces";
|
||||||
|
|
||||||
export const editVisibleAtom = atom<boolean>(false);
|
export const editVisibleAtom = atom<boolean>(false);
|
||||||
|
export const isAllDayAtom = atom<boolean>(false);
|
||||||
export const eventForEditAtom = atom<CalendarEvent | undefined>(undefined);
|
export const eventForEditAtom = atom<CalendarEvent | undefined>(undefined);
|
||||||
export const isFamilyViewAtom = atom<boolean>(false);
|
export const isFamilyViewAtom = atom<boolean>(false);
|
||||||
export const modeAtom = atom<"week" | "month" | "day">("week");
|
export const modeAtom = atom<"week" | "month" | "day">("week");
|
||||||
|
@ -25,7 +25,7 @@ const DeleteProfileDialogs: React.FC<ConfirmationDialogProps> = ({
|
|||||||
containerStyle={styles.dialog}
|
containerStyle={styles.dialog}
|
||||||
>
|
>
|
||||||
<View centerH>
|
<View centerH>
|
||||||
<Feather name="alert-triangle" size={70} color="#FF5449" />
|
<Feather name="alert-triangle" size={70} color="#ff1637" />
|
||||||
</View>
|
</View>
|
||||||
<Text center style={styles.title}>
|
<Text center style={styles.title}>
|
||||||
Are you sure?
|
Are you sure?
|
||||||
@ -101,7 +101,7 @@ const DeleteProfileDialogs: React.FC<ConfirmationDialogProps> = ({
|
|||||||
// Empty stylesheet for future styles
|
// Empty stylesheet for future styles
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
confirmBtn: {
|
confirmBtn: {
|
||||||
backgroundColor: "#FF5449",
|
backgroundColor: "#ff1637",
|
||||||
},
|
},
|
||||||
cancelBtn: {
|
cancelBtn: {
|
||||||
backgroundColor: "white",
|
backgroundColor: "white",
|
||||||
|
@ -217,7 +217,7 @@ const MyProfile = () => {
|
|||||||
</View>
|
</View>
|
||||||
<Button
|
<Button
|
||||||
size="large"
|
size="large"
|
||||||
backgroundColor="#FF5449"
|
backgroundColor="#ff1637"
|
||||||
label="Delete Profile"
|
label="Delete Profile"
|
||||||
style={{ marginTop: 10 }}
|
style={{ marginTop: 10 }}
|
||||||
labelStyle={{ fontFamily: "PlusJakartaSans_500Medium", fontSize: 15 }}
|
labelStyle={{ fontFamily: "PlusJakartaSans_500Medium", fontSize: 15 }}
|
||||||
|
@ -111,7 +111,7 @@ const ToDoItem = (props: {
|
|||||||
height={0.7}
|
height={0.7}
|
||||||
width={"100%"}
|
width={"100%"}
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: props.item.done ? "#b8b8b8" : "#e7e7e7",
|
backgroundColor: "#e7e7e7",
|
||||||
}}
|
}}
|
||||||
centerH
|
centerH
|
||||||
/>
|
/>
|
||||||
|
Reference in New Issue
Block a user