Skip to content

[WEB-4874]fix: calendar picker build errors and styles override #7762

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 10, 2025
Merged

[WEB-4874]fix: calendar picker build errors and styles override #7762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
323e3ea
fix: calender picker build errors
vamsikrishnamathala Sep 10, 2025
1d3ed48
fix: styles override in the picker implementation
vamsikrishnamathala Sep 10, 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
12 changes: 2 additions & 10 deletions apps/web/core/components/analytics/total-insights.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const getInsightLabel = (
analyticsType: TAnalyticsTabsBase,
item: IInsightField,
isEpic: boolean | undefined,
t: (key: string, options?: any) => string
t: (key: string, params?: Record<string, unknown>) => string
) => {
if (analyticsType === "work-items") {
return isEpic
Expand Down Expand Up @@ -50,15 +50,7 @@ const TotalInsights: React.FC<{
const params = useParams();
const workspaceSlug = params.workspaceSlug.toString();
const { t } = useTranslation();
const {
selectedDuration,
selectedProjects,
selectedDurationLabel,
selectedCycle,
selectedModule,
isPeekView,
isEpic,
} = useAnalytics();
const { selectedDuration, selectedProjects, selectedCycle, selectedModule, isPeekView, isEpic } = useAnalytics();
const { data: totalInsightsData, isLoading } = useSWR(
`total-insights-${analyticsType}-${selectedDuration}-${selectedProjects}-${selectedCycle}-${selectedModule}-${isEpic}`,
() =>
Expand Down
12 changes: 4 additions & 8 deletions apps/web/core/components/core/filters/date-filter-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,11 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
const date2Value = getDate(watch("date2"));
return (
<Calendar
classNames={{
root: ` border border-custom-border-200 p-3 rounded-md`,
}}
className="rounded-md border border-custom-border-200 p-3"
captionLayout="dropdown"
selected={dateValue}
defaultMonth={dateValue}
onSelect={(date) => {
onSelect={(date: Date | undefined) => {
if (!date) return;
onChange(date);
}}
Expand All @@ -120,13 +118,11 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
const date1Value = getDate(watch("date1"));
return (
<Calendar
classNames={{
root: ` border border-custom-border-200 p-3 rounded-md`,
}}
className="rounded-md border border-custom-border-200 p-3"
captionLayout="dropdown"
selected={dateValue}
defaultMonth={dateValue}
onSelect={(date) => {
onSelect={(date: Date | undefined) => {
if (!date) return;
onChange(date);
}}
Expand Down
4 changes: 2 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 @@ -271,10 +271,10 @@ export const DateRangeDropdown: React.FC<Props> = observer((props) => {
{...attributes.popper}
>
<Calendar
className="rounded-md border border-custom-border-200 p-3"
captionLayout="dropdown"
classNames={{ root: `p-3 rounded-md` }}
selected={dateRange}
onSelect={(val) => {
onSelect={(val: DateRange | undefined) => {
onSelect?.(val);
}}
mode="range"
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/dropdowns/date.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ export const DateDropdown: React.FC<Props> = observer((props) => {
{...attributes.popper}
>
<Calendar
className="rounded-md border border-custom-border-200 p-3"
captionLayout="dropdown"
classNames={{ root: `p-3 rounded-md` }}
selected={getDate(value)}
defaultMonth={getDate(value)}
onSelect={(date) => {
onSelect={(date: Date | undefined) => {
dropdownOnChange(date ?? null);
}}
showOutsideDays
Expand Down
4 changes: 2 additions & 2 deletions apps/web/core/components/inbox/modals/snooze-issue-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ export const InboxIssueSnoozeModal: FC<InboxIssueSnoozeModalProps> = (props) =>
<Dialog.Panel className="relative flex transform rounded-lg bg-custom-background-100 px-5 py-8 text-left shadow-custom-shadow-md transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
<div className="flex h-full w-full flex-col gap-y-1">
<Calendar
className="rounded-md border border-custom-border-200 p-3"
captionLayout="dropdown"
classNames={{ root: `rounded-md border border-custom-border-200 p-3` }}
selected={date ? new Date(date) : undefined}
defaultMonth={date ? new Date(date) : undefined}
onSelect={(date) => {
onSelect={(date: Date | undefined) => {
if (!date) return;
setDate(date);
}}
Expand Down
Loading