diff --git a/apps/web/core/components/dropdowns/date-range.tsx b/apps/web/core/components/dropdowns/date-range.tsx index d8c9bd4ba69..7f56b530a05 100644 --- a/apps/web/core/components/dropdowns/date-range.tsx +++ b/apps/web/core/components/dropdowns/date-range.tsx @@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from "react"; import { Placement } from "@popperjs/core"; +import { observer } from "mobx-react"; import { DateRange, Matcher } from "react-day-picker"; import { usePopper } from "react-popper"; import { ArrowRight, CalendarCheck2, CalendarDays, X } from "lucide-react"; @@ -13,6 +14,7 @@ import { ComboDropDown, Calendar } from "@plane/ui"; import { cn, renderFormattedDate } from "@plane/utils"; // helpers // hooks +import { useUserProfile } from "@/hooks/store/user"; import { useDropdown } from "@/hooks/use-dropdown"; // components import { DropdownButton } from "./buttons"; @@ -59,7 +61,7 @@ type Props = { customTooltipHeading?: string; }; -export const DateRangeDropdown: React.FC = (props) => { +export const DateRangeDropdown: React.FC = observer((props) => { const { t } = useTranslation(); const { buttonClassName, @@ -95,6 +97,9 @@ export const DateRangeDropdown: React.FC = (props) => { // states const [isOpen, setIsOpen] = useState(false); const [dateRange, setDateRange] = useState(value); + // hooks + const { data } = useUserProfile(); + const startOfWeek = data?.start_of_the_week; // refs const dropdownRef = useRef(null); // popper-js refs @@ -274,6 +279,7 @@ export const DateRangeDropdown: React.FC = (props) => { disabled={disabledDays} showOutsideDays fixedWeeks + weekStartsOn={startOfWeek} initialFocus /> @@ -281,4 +287,4 @@ export const DateRangeDropdown: React.FC = (props) => { )} ); -}; +});