Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix calendar layout distortion because of scrollbar (#3770)

rahulramesha5f6c9a416640
diff --git a/web/components/issues/issue-layouts/calendar/calendar.tsx b/web/components/issues/issue-layouts/calendar/calendar.tsx
index 4dcaab3353..badb849fb8 100644
--- a/web/components/issues/issue-layouts/calendar/calendar.tsx
+++ b/web/components/issues/issue-layouts/calendar/calendar.tsx
@@ -73,42 +73,44 @@ export const CalendarChart: React.FC<Props> = observer((props) => {
<>
<div className="flex h-full w-full flex-col overflow-hidden">
<CalendarHeader issuesFilterStore={issuesFilterStore} viewId={viewId} />
- <CalendarWeekHeader isLoading={!issues} showWeekends={showWeekends} />
- <div className="h-full w-full overflow-y-auto vertical-scrollbar scrollbar-lg">
- {layout === "month" && (
- <div className="grid h-full w-full grid-cols-1 divide-y-[0.5px] divide-custom-border-200">
- {allWeeksOfActiveMonth &&
- Object.values(allWeeksOfActiveMonth).map((week: ICalendarWeek, weekIndex) => (
- <CalendarWeekDays
- issuesFilterStore={issuesFilterStore}
- key={weekIndex}
- week={week}
- issues={issues}
- groupedIssueIds={groupedIssueIds}
- enableQuickIssueCreate
- disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
- quickActions={quickActions}
- quickAddCallback={quickAddCallback}
- viewId={viewId}
- readOnly={readOnly}
- />
- ))}
- </div>
- )}
- {layout === "week" && (
- <CalendarWeekDays
- issuesFilterStore={issuesFilterStore}
- week={issueCalendarView.allDaysOfActiveWeek}
- issues={issues}
- groupedIssueIds={groupedIssueIds}
- enableQuickIssueCreate
- disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
- quickActions={quickActions}
- quickAddCallback={quickAddCallback}
- viewId={viewId}
- readOnly={readOnly}
- />
- )}
+ <div className="flex h-full w-full vertical-scrollbar scrollbar-lg flex-col">
+ <CalendarWeekHeader isLoading={!issues} showWeekends={showWeekends} />
+ <div className="h-full w-full">
+ {layout === "month" && (
+ <div className="grid h-full w-full grid-cols-1 divide-y-[0.5px] divide-custom-border-200">
+ {allWeeksOfActiveMonth &&
+ Object.values(allWeeksOfActiveMonth).map((week: ICalendarWeek, weekIndex) => (
+ <CalendarWeekDays
+ issuesFilterStore={issuesFilterStore}
+ key={weekIndex}
+ week={week}
+ issues={issues}
+ groupedIssueIds={groupedIssueIds}
+ enableQuickIssueCreate
+ disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
+ quickActions={quickActions}
+ quickAddCallback={quickAddCallback}
+ viewId={viewId}
+ readOnly={readOnly}
+ />
+ ))}
+ </div>
+ )}
+ {layout === "week" && (
+ <CalendarWeekDays
+ issuesFilterStore={issuesFilterStore}
+ week={issueCalendarView.allDaysOfActiveWeek}
+ issues={issues}
+ groupedIssueIds={groupedIssueIds}
+ enableQuickIssueCreate
+ disableIssueCreation={!enableIssueCreation || !isEditingAllowed}
+ quickActions={quickActions}
+ quickAddCallback={quickAddCallback}
+ viewId={viewId}
+ readOnly={readOnly}
+ />
+ )}
+ </div>
</div>
</div>
</>
diff --git a/web/components/issues/issue-layouts/calendar/day-tile.tsx b/web/components/issues/issue-layouts/calendar/day-tile.tsx
index 85ab152a7a..f92365a58a 100644
--- a/web/components/issues/issue-layouts/calendar/day-tile.tsx
+++ b/web/components/issues/issue-layouts/calendar/day-tile.tsx
@@ -91,7 +91,7 @@ export const CalendarDayTile: React.FC<Props> = observer((props) => {
snapshot.isDraggingOver || date.date.getDay() === 0 || date.date.getDay() === 6
? "bg-custom-background-90"
: "bg-custom-background-100"
- } ${calendarLayout === "month" ? "min-h-[9rem]" : ""}`}
+ } ${calendarLayout === "month" ? "min-h-[5rem]" : ""}`}
{...provided.droppableProps}
ref={provided.innerRef}
>
diff --git a/web/components/issues/issue-layouts/calendar/week-header.tsx b/web/components/issues/issue-layouts/calendar/week-header.tsx
index f5ec41e96c..a4b714c94e 100644
--- a/web/components/issues/issue-layouts/calendar/week-header.tsx
+++ b/web/components/issues/issue-layouts/calendar/week-header.tsx
@@ -13,7 +13,7 @@ export const CalendarWeekHeader: React.FC<Props> = observer((props) => {
return (
<div
- className={`relative grid divide-x-[0.5px] divide-custom-border-200 text-sm font-medium ${
+ className={`relative sticky top-0 z-[1] grid divide-x-[0.5px] divide-custom-border-200 text-sm font-medium ${
showWeekends ? "grid-cols-7" : "grid-cols-5"
}`}
>