Skip to content
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

fix(material/datepicker): change calendar cell bodies to buttons (nesting buttons inside td approach) #24099

Closed
wants to merge 1 commit into from
+27 −25
Closed

fix(material/datepicker): change calendar cell bodies to buttons (nesting buttons inside td approach) #24099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions src/material/datepicker/calendar-body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
role="gridcell"
class="mat-calendar-body-cell"
[ngClass]="item.cssClasses"
[tabindex]="_isActiveCell(rowIndex, colIndex) ? 0 : -1"
[attr.data-mat-row]="rowIndex"
[attr.data-mat-col]="colIndex"
[class.mat-calendar-body-disabled]="!item.enabled"
Expand All @@ -46,20 +45,23 @@
[class.mat-calendar-body-preview-start]="_isPreviewStart(item.compareValue)"
[class.mat-calendar-body-preview-end]="_isPreviewEnd(item.compareValue)"
[class.mat-calendar-body-in-preview]="_isInPreview(item.compareValue)"
[attr.aria-label]="item.ariaLabel"
[attr.aria-disabled]="!item.enabled || null"
[attr.aria-selected]="_isSelected(item.compareValue)"
[attr.aria-current]="todayValue === item.compareValue ? 'date' : null"
(click)="_cellClicked(item, $event)"
[style.width]="_cellWidth"
[style.paddingTop]="_cellPadding"
[style.paddingBottom]="_cellPadding">
<div class="mat-calendar-body-cell-content mat-focus-indicator"
<div role="button" class="mat-calendar-body-cell-content mat-focus-indicator"
[class.mat-calendar-body-selected]="_isSelected(item.compareValue)"
[class.mat-calendar-body-comparison-identical]="_isComparisonIdentical(item.compareValue)"
[class.mat-calendar-body-today]="todayValue === item.compareValue">
[class.mat-calendar-body-today]="todayValue === item.compareValue"
(click)="_cellClicked(item, $event)"
[tabindex]="_isActiveCell(rowIndex, colIndex) ? 0 : -1"
[attr.aria-label]="item.ariaLabel"
[attr.aria-current]="todayValue === item.compareValue ? 'date' : null"
[attr.aria-disabled]="!item.enabled || null"
[attr.aria-pressed]="_isSelected(item.compareValue)"
[attr.aria-selected]="_isSelected(item.compareValue)"
>
{{item.displayValue}}
</div>
<div class="mat-calendar-body-cell-preview"></div>
<div class="mat-calendar-body-cell-preview" aria-hidden="true"></div>
</td>
</tr>
2 changes: 1 addition & 1 deletion src/material/datepicker/calendar-body.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export class MatCalendarBody implements OnChanges, OnDestroy {
this._ngZone.runOutsideAngular(() => {
this._ngZone.onStable.pipe(take(1)).subscribe(() => {
const activeCell: HTMLElement | null = this._elementRef.nativeElement.querySelector(
'.mat-calendar-body-active',
'.mat-calendar-body-active button,[role="button"]',
);

if (activeCell) {
Expand Down
30 changes: 15 additions & 15 deletions src/material/datepicker/calendar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {MatCalendar} from './calendar';
import {MatDatepickerIntl} from './datepicker-intl';
import {MatDatepickerModule} from './datepicker-module';

describe('MatCalendar', () => {
fdescribe('MatCalendar', () => {
let zone: MockNgZone;

beforeEach(
Expand Down Expand Up @@ -86,8 +86,8 @@ describe('MatCalendar', () => {
});

it('should select date in month view', () => {
let monthCells = calendarElement.querySelectorAll('.mat-calendar-body-cell');
(monthCells[monthCells.length - 1] as HTMLElement).click();
let monthCellButtons = calendarElement.querySelectorAll('.mat-calendar-body-cell button,[role="button"]');
(monthCellButtons[monthCellButtons.length - 1] as HTMLElement).click();
fixture.detectChanges();

expect(calendarInstance.currentView).toBe('month');
Expand All @@ -101,13 +101,13 @@ describe('MatCalendar', () => {
expect(calendarInstance.currentView).toBe('multi-year');
expect(calendarInstance.activeDate).toEqual(new Date(2017, JAN, 31));

(calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
(calendarElement.querySelector('.mat-calendar-body-active button,[role="button"]') as HTMLElement).click();

fixture.detectChanges();

expect(calendarInstance.currentView).toBe('year');

(calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
(calendarElement.querySelector('.mat-calendar-body-active button,[role="button"]') as HTMLElement).click();

const normalizedMonth: Date = fixture.componentInstance.selectedMonth;
expect(normalizedMonth.getMonth()).toEqual(0);
Expand All @@ -120,7 +120,7 @@ describe('MatCalendar', () => {
expect(calendarInstance.currentView).toBe('multi-year');
expect(calendarInstance.activeDate).toEqual(new Date(2017, JAN, 31));

(calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
(calendarElement.querySelector('.mat-calendar-body-active button,[role="button"]') as HTMLElement).click();

fixture.detectChanges();

Expand Down Expand Up @@ -195,7 +195,7 @@ describe('MatCalendar', () => {
fixture.detectChanges();

const activeCell = calendarBodyEl.querySelector(
'.mat-calendar-body-active',
'.mat-calendar-body-active button,[role="button"]',
)! as HTMLElement;
spyOn(activeCell, 'focus').and.callThrough();

Expand All @@ -211,7 +211,7 @@ describe('MatCalendar', () => {

expect(calendarInstance.currentView).toBe('multi-year');

(calendarBodyEl.querySelector('.mat-calendar-body-active') as HTMLElement).click();
(calendarBodyEl.querySelector('.mat-calendar-body-active button,[role="button"]') as HTMLElement).click();
fixture.detectChanges();

expect(calendarInstance.currentView).toBe('year');
Expand Down Expand Up @@ -312,7 +312,7 @@ describe('MatCalendar', () => {
periodButton.click();
fixture.detectChanges();

(calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
(calendarElement.querySelector('.mat-calendar-body-active button,[role="button"]') as HTMLElement).click();
fixture.detectChanges();

spyOn(calendarInstance.yearView, '_init').and.callThrough();
Expand Down Expand Up @@ -443,7 +443,7 @@ describe('MatCalendar', () => {
periodButton.click();
fixture.detectChanges();

(calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
(calendarElement.querySelector('.mat-calendar-body-active button,[role="button"]') as HTMLElement).click();
fixture.detectChanges();

spyOn(calendarInstance.yearView, '_init').and.callThrough();
Expand All @@ -462,7 +462,7 @@ describe('MatCalendar', () => {
periodButton.click();
fixture.detectChanges();

(calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
(calendarElement.querySelector('.mat-calendar-body-active button,[role="button"]') as HTMLElement).click();
fixture.detectChanges();

spyOn(calendarInstance.yearView, '_init').and.callThrough();
Expand Down Expand Up @@ -526,7 +526,7 @@ describe('MatCalendar', () => {
.withContext('Expected dates after the 10th to be enabled.')
.toBe(false);

(cells[14] as HTMLElement).click();
(cells[14].querySelector('button, [role="button"]') as HTMLElement)?.click();
dynamicFixture.detectChanges();
cells = Array.from(calendarElement.querySelectorAll('.mat-calendar-body-cell'));

Expand Down Expand Up @@ -558,12 +558,12 @@ describe('MatCalendar', () => {

it('should disable and prevent selection of filtered dates', () => {
let cells = calendarElement.querySelectorAll('.mat-calendar-body-cell');
(cells[0] as HTMLElement).click();
(cells[0]?.querySelector('button [role="button"]') as HTMLElement)?.click();
fixture.detectChanges();

expect(testComponent.selected).toBeFalsy();

(cells[1] as HTMLElement).click();
(cells[1]?.querySelector('button [role="button"]') as HTMLElement)?.click();
fixture.detectChanges();

expect(testComponent.selected).toEqual(new Date(2017, JAN, 2));
Expand Down Expand Up @@ -597,7 +597,7 @@ describe('MatCalendar', () => {
dispatchMouseEvent(periodButton, 'click');
fixture.detectChanges();

(calendarElement.querySelector('.mat-calendar-body-active') as HTMLElement).click();
(calendarElement.querySelector('.mat-calendar-body-active')?.querySelector('button, [role="button"]') as HTMLElement)?.click();
fixture.detectChanges();

calendarInstance.activeDate = new Date(2017, NOV, 1);
Expand Down