Attempting to fix and issue with the currDay highlight. Made a currDate in thecontext state rather than using new Date() accross the app.

This commit is contained in:
Lucid Kobold
2022-04-11 12:11:43 -05:00
parent ae9ce83d9c
commit 077a38e891
5 changed files with 22 additions and 11 deletions

View File

@@ -21,6 +21,7 @@ interface DayProps {
sticker: StickerVal;
date: Date;
selectedDate: Date;
currDate: Date;
}
/**
@@ -37,7 +38,8 @@ const Day = ({
overflowDirection,
sticker,
date,
selectedDate
selectedDate,
currDate
}: DayProps): JSX.Element => {
const handleNav = (direction: "next" | "prev") => {
if (direction === "next") {
@@ -90,7 +92,7 @@ const Day = ({
w="100%"
h="100%"
_hover={{
cursor: isBefore(date, endOfDay(new Date()))
cursor: isBefore(date, endOfDay(currDate))
? "pointer"
: "default",
background: "gray.700",
@@ -131,7 +133,7 @@ const Day = ({
justifyContent="flex-start"
pt={2}
_hover={{
cursor: isBefore(date, endOfDay(new Date()))
cursor: isBefore(date, endOfDay(currDate))
? "pointer"
: "default",
background: "gray.700",
@@ -140,7 +142,7 @@ const Day = ({
>
<Text
p={
isSameDay(new Date(), date)
isSameDay(currDate, date)
? getDate(date) > 10
? "0px 6px 3px 6px"
: "0px 9px 3px 9px"
@@ -148,8 +150,8 @@ const Day = ({
}
h="auto"
w="auto"
border={isSameDay(new Date(), date) ? "1px solid #0068ff" : "0px"}
borderRadius={isSameDay(new Date(), date) ? "100px" : "0px"}
border={isSameDay(currDate, date) ? "1px solid #0068ff" : "0px"}
borderRadius={isSameDay(currDate, date) ? "100px" : "0px"}
>
{`${getDate(date)}`}
</Text>
@@ -162,7 +164,7 @@ const Day = ({
/>
</Box>
<StickersContextProvider>
{isBefore(date, endOfDay(new Date())) && (
{isBefore(date, endOfDay(currDate)) && (
<AddUpdateSticker
date={date}
isOpen={isOpen}
@@ -173,6 +175,7 @@ const Day = ({
updateStep={setStep}
selectedSticker={selectedSticker}
updateSelectedSticker={setSelectedSticker}
currDate={currDate}
/>
)}
</StickersContextProvider>

View File

@@ -7,7 +7,7 @@ import CalenderNav from "./CalenderNav";
import Day from "./Day";
const Calender = (newDate?: UpdateCalendarProps): JSX.Element => {
const { selectedDate, layout, updateDate } = useContext(CalenderContext);
const { selectedDate, layout, updateDate, currDate } = useContext(CalenderContext);
const { stickersMonth } = useContext(StickersContext);
useEffect(() => {
@@ -91,6 +91,7 @@ const Calender = (newDate?: UpdateCalendarProps): JSX.Element => {
sticker={sticker}
date={date}
selectedDate={selectedDate}
currDate={currDate}
key={
id.length
? id

View File

@@ -30,6 +30,7 @@ interface AddStickerProps {
updateStep: React.Dispatch<React.SetStateAction<number>>;
selectedSticker: StickerVal;
updateSelectedSticker: React.Dispatch<React.SetStateAction<StickerVal>>;
currDate: Date;
}
/**
@@ -52,7 +53,8 @@ const AddUpdateSticker = ({
step,
updateStep,
selectedSticker,
updateSelectedSticker
updateSelectedSticker,
currDate
}: AddStickerProps): JSX.Element => {
// TODO: Import the stickers array from the calender context.
@@ -61,7 +63,7 @@ const AddUpdateSticker = ({
// ! Update these states to say "add" and "edit" for easier reading.
const [modalVariant] = useState<"currDate" | "notCurrDate">(
isSameDay(date, new Date()) ? "currDate" : "notCurrDate"
isSameDay(date, currDate) ? "currDate" : "notCurrDate"
);
const handleClose = () => {