Skip to content

Commit 9f86dd4

Browse files
Balaji-Sridharan_NYULHBalaji-Sridharan_NYULH
authored andcommitted
🔨 Remove the "react-datepicker__week-number--keyboard-selected" class for the <WeekNumber /> component
- Removed as highlighting the first day of the week alone highlights the week number - Because we set the date prop of the <WeekNumber /> to first date of the week. As a result this highlight will work only for the first day of week
1 parent 30babb9 commit 9f86dd4

File tree

3 files changed

+37
-50
lines changed

3 files changed

+37
-50
lines changed

‎src/stylesheets/datepicker.scss‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,7 @@ h2.react-datepicker__current-month {
347347
&.react-datepicker__week-number--clickable {
348348
cursor: pointer;
349349

350-
&:not(
351-
.react-datepicker__week-number--selected,
352-
.react-datepicker__week-number--keyboard-selected
353-
):hover {
350+
&:not(.react-datepicker__week-number--selected):hover {
354351
border-radius: $datepicker__border-radius;
355352
background-color: $datepicker__background-color;
356353
}
@@ -362,17 +359,10 @@ h2.react-datepicker__current-month {
362359
color: #fff;
363360

364361
&:hover {
365-
background-color: color.adjust($datepicker__selected-color, $lightness: -5%);
366-
}
367-
}
368-
369-
&--keyboard-selected {
370-
border-radius: $datepicker__border-radius;
371-
background-color: color.adjust($datepicker__selected-color, $lightness: 10%);
372-
color: #fff;
373-
374-
&:hover {
375-
background-color: color.adjust($datepicker__selected-color, $lightness: -5%);
362+
background-color: color.adjust(
363+
$datepicker__selected-color,
364+
$lightness: -5%
365+
);
376366
}
377367
}
378368
}
@@ -418,7 +408,10 @@ h2.react-datepicker__current-month {
418408
color: #fff;
419409

420410
&:not([aria-disabled="true"]):hover {
421-
background-color: color.adjust($datepicker__highlighted-color, $lightness: -5%);
411+
background-color: color.adjust(
412+
$datepicker__highlighted-color,
413+
$lightness: -5%
414+
);
422415
}
423416

424417
&-custom-1 {
@@ -454,7 +447,10 @@ h2.react-datepicker__current-month {
454447
}
455448

456449
&:not([aria-disabled="true"]):hover {
457-
background-color: color.adjust($datepicker__holidays-color, $lightness: -10%);
450+
background-color: color.adjust(
451+
$datepicker__holidays-color,
452+
$lightness: -10%
453+
);
458454
}
459455

460456
&:hover .overlay {
@@ -471,17 +467,26 @@ h2.react-datepicker__current-month {
471467
color: #fff;
472468

473469
&:not([aria-disabled="true"]):hover {
474-
background-color: color.adjust($datepicker__selected-color, $lightness: -5%);
470+
background-color: color.adjust(
471+
$datepicker__selected-color,
472+
$lightness: -5%
473+
);
475474
}
476475
}
477476

478477
&--keyboard-selected {
479478
border-radius: $datepicker__border-radius;
480-
background-color: color.adjust($datepicker__selected-color, $lightness: 45%);
479+
background-color: color.adjust(
480+
$datepicker__selected-color,
481+
$lightness: 45%
482+
);
481483
color: rgb(0, 0, 0);
482484

483485
&:not([aria-disabled="true"]):hover {
484-
background-color: color.adjust($datepicker__selected-color, $lightness: -5%);
486+
background-color: color.adjust(
487+
$datepicker__selected-color,
488+
$lightness: -5%
489+
);
485490
}
486491
}
487492

@@ -550,7 +555,10 @@ h2.react-datepicker__current-month {
550555

551556
.react-datepicker__year-read-view--down-arrow,
552557
.react-datepicker__month-read-view--down-arrow {
553-
border-top-color: color.adjust($datepicker__muted-color, $lightness: -10%);
558+
border-top-color: color.adjust(
559+
$datepicker__muted-color,
560+
$lightness: -10%
561+
);
554562
}
555563
}
556564

@@ -613,11 +621,17 @@ h2.react-datepicker__current-month {
613621
background-color: $datepicker__muted-color;
614622

615623
.react-datepicker__navigation--years-upcoming {
616-
border-bottom-color: color.adjust($datepicker__muted-color, $lightness: -10%);
624+
border-bottom-color: color.adjust(
625+
$datepicker__muted-color,
626+
$lightness: -10%
627+
);
617628
}
618629

619630
.react-datepicker__navigation--years-previous {
620-
border-top-color: color.adjust($datepicker__muted-color, $lightness: -10%);
631+
border-top-color: color.adjust(
632+
$datepicker__muted-color,
633+
$lightness: -10%
634+
);
621635
}
622636
}
623637

‎src/test/week_number_test.test.tsx‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,6 @@ describe("WeekNumber", () => {
186186
) as HTMLDivElement;
187187
expect(weekNumber).not.toBeNull();
188188

189-
expect(
190-
weekNumber?.classList.contains(
191-
"react-datepicker__week-number--keyboard-selected",
192-
),
193-
).toBe(false);
194189
expect(weekNumber?.tabIndex).toBe(0);
195190
});
196191

@@ -212,11 +207,6 @@ describe("WeekNumber", () => {
212207
".react-datepicker__week-number",
213208
) as HTMLDivElement;
214209
expect(weekNumber).not.toBeNull();
215-
expect(
216-
weekNumber?.classList.contains(
217-
"react-datepicker__week-number--keyboard-selected",
218-
),
219-
).toBe(true);
220210
expect(weekNumber.tabIndex).toBe(0);
221211
});
222212

@@ -267,11 +257,6 @@ describe("WeekNumber", () => {
267257
const weekNumber = container.querySelector(
268258
".react-datepicker__week-number",
269259
) as HTMLDivElement;
270-
expect(
271-
weekNumber?.classList.contains(
272-
"react-datepicker__week-number--keyboard-selected",
273-
),
274-
).toBe(false);
275260
expect(weekNumber.tabIndex).toBe(-1);
276261
});
277262
});
@@ -403,11 +388,6 @@ describe("WeekNumber", () => {
403388
"react-datepicker__week-number--selected",
404389
),
405390
).toBe(false);
406-
expect(
407-
weekNumber?.classList.contains(
408-
"react-datepicker__week-number--keyboard-selected",
409-
),
410-
).toBe(true);
411391
});
412392

413393
it("should have the class 'react-datepicker__week-number--selected' if selected is not current week and preselected is not current week", () => {
@@ -430,11 +410,6 @@ describe("WeekNumber", () => {
430410
"react-datepicker__week-number--selected",
431411
),
432412
).toBe(false);
433-
expect(
434-
weekNumber?.classList.contains(
435-
"react-datepicker__week-number--keyboard-selected",
436-
),
437-
).toBe(false);
438413
});
439414
});
440415
});

‎src/week_number.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ export default class WeekNumber extends Component<WeekNumberProps> {
120120
"react-datepicker__week-number--clickable": !!onClick,
121121
"react-datepicker__week-number--selected":
122122
!!onClick && isSameDay(this.props.date, this.props.selected),
123-
"react-datepicker__week-number--keyboard-selected":
124-
this.isKeyboardSelected(),
125123
};
126124
return (
127125
<div

0 commit comments

Comments
 (0)