Skip to content

[WEB-4834] fix: range date picker weekStartsOn #7699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pushya22 merged 2 commits into from
Sep 2, 2025
Merged

[WEB-4834] fix: range date picker weekStartsOn #7699

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef3aa4
fix: range date picker weekStartsOn
anmolsinghbhatia Sep 2, 2025
cd63cca
chore: code refactor
anmolsinghbhatia Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions apps/web/core/components/dropdowns/date-range.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -59,7 +61,7 @@ type Props = {
customTooltipHeading?: string;
};

export const DateRangeDropdown: React.FC<Props> = (props) => {
export const DateRangeDropdown: React.FC<Props> = observer((props) => {
const { t } = useTranslation();
const {
buttonClassName,
Expand Down Expand Up @@ -95,6 +97,9 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
// states
const [isOpen, setIsOpen] = useState(false);
const [dateRange, setDateRange] = useState<DateRange>(value);
// hooks
const { data } = useUserProfile();
const startOfWeek = data?.start_of_the_week;
// refs
const dropdownRef = useRef<HTMLDivElement | null>(null);
// popper-js refs
Expand Down Expand Up @@ -274,11 +279,12 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
disabled={disabledDays}
showOutsideDays
fixedWeeks
weekStartsOn={startOfWeek}
initialFocus
/>
</div>
</Combobox.Options>
)}
</ComboDropDown>
);
};
});
Loading