Skip to content

feat: Add weekendColor prop to highlight weekend columns #2

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
jeonghanyun merged 2 commits into from
Aug 2, 2025
Merged

feat: Add weekendColor prop to highlight weekend columns #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce61fc3
feat: Add weekendColor prop to highlight weekend columns
jeonghanyun Aug 2, 2025
58e7414
fix: Correct weekend column highlighting offset issue
jeonghanyun Aug 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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ npm start
| arrowColor | string | Specifies the relationship arrow fill color. |
| arrowIndent | number | Specifies the relationship arrow right indent. Sets in px |
| todayColor | string | Specifies the current period column fill color. |
| weekendColor | string | Specifies the weekend columns fill color. |
| TooltipContent | | Specifies the Tooltip view for selected taskbar. |
| TaskListHeader | | Specifies the task list Header view |
| TaskListTable | | Specifies the task list Table view |
Expand Down
2 changes: 2 additions & 0 deletions example/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ const App = () => {
onExpanderClick={handleExpanderClick}
listCellWidth={isChecked ? "155px" : ""}
columnWidth={columnWidth}
weekendColor={"#97979714"}
/>
<h3>Gantt With Limited Height</h3>
<Gantt
Expand All @@ -102,6 +103,7 @@ const App = () => {
listCellWidth={isChecked ? "155px" : ""}
ganttHeight={300}
columnWidth={columnWidth}
weekendColor={"#97979714"}
/>
</div>
);
Expand Down
4 changes: 3 additions & 1 deletion src/components/gantt/gantt.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export const Gantt: React.FunctionComponent<GanttProps> = ({
fontFamily = "Arial, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue",
fontSize = "14px",
arrowIndent = 20,
todayColor = "rgba(252, 248, 227, 0.5)",
todayColor = "rgba(252, 248, 227, 1)",
weekendColor = "transparent",
viewDate,
TooltipContent = StandardTooltipContent,
TaskListHeader = TaskListHeaderDefault,
Expand Down Expand Up @@ -394,6 +395,7 @@ export const Gantt: React.FunctionComponent<GanttProps> = ({
rowHeight,
dates: dateSetup.dates,
todayColor,
weekendColor,
rtl,
};
const calendarProps: CalendarProps = {
Expand Down
17 changes: 17 additions & 0 deletions src/components/grid/grid-body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export type GridBodyProps = {
rowHeight: number;
columnWidth: number;
todayColor: string;
weekendColor: string;
rtl: boolean;
};
export const GridBody: React.FC<GridBodyProps> = ({
Expand All @@ -19,6 +20,7 @@ export const GridBody: React.FC<GridBodyProps> = ({
svgWidth,
columnWidth,
todayColor,
weekendColor,
rtl,
}) => {
let y = 0;
Expand Down Expand Up @@ -60,6 +62,7 @@ export const GridBody: React.FC<GridBodyProps> = ({
const now = new Date();
let tickX = 0;
const ticks: ReactElement[] = [];
const weekends: ReactElement[] = [];
let today: ReactElement = <rect />;
for (let i = 0; i < dates.length; i++) {
const date = dates[i];
Expand All @@ -73,6 +76,19 @@ export const GridBody: React.FC<GridBodyProps> = ({
className={styles.gridTick}
/>
);

if (weekendColor !== "transparent" && dates[i + 1] && [0, 6].includes(dates[i + 1].getDay())) {
weekends.push(
<rect
key={"WeekendColumn" + i}
x={tickX + columnWidth}
Copy link

Copilot AI Aug 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The weekend detection logic uses dates[i + 1] but should use dates[i] to check the current date being processed. Using dates[i + 1] will cause the weekend highlighting to be offset by one column.

Suggested change
if (weekendColor !== "transparent" && dates[i + 1] && [0, 6].includes(dates[i + 1].getDay())) {
weekends.push(
<rect
key={"WeekendColumn" + i}
x={tickX + columnWidth}
if (weekendColor !== "transparent" && [0, 6].includes(date.getDay())) {
weekends.push(
<rect
key={"WeekendColumn" + i}
x={tickX}

Copilot uses AI. Check for mistakes.
y={0}
width={columnWidth}
height={y}
fill={weekendColor}
/>
);
}
if (
(i + 1 !== dates.length &&
date.getTime() < now.getTime() &&
Expand Down Expand Up @@ -121,6 +137,7 @@ export const GridBody: React.FC<GridBodyProps> = ({
<g className="rows">{gridRows}</g>
<g className="rowLines">{rowLines}</g>
<g className="ticks">{ticks}</g>
<g className="weekends">{weekends}</g>
<g className="today">{today}</g>
</g>
);
Expand Down
1 change: 1 addition & 0 deletions src/types/public-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export interface StylingOption {
arrowColor?: string;
arrowIndent?: number;
todayColor?: string;
weekendColor?: string;
TooltipContent?: React.FC<{
task: Task;
fontSize: string;
Expand Down