Skip to content

fix(datepicker): don't allow clicks on disabled cells in year and multi-year views #13448

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
merged 1 commit into from
Oct 19, 2018
Merged

fix(datepicker): don't allow clicks on disabled cells in year and multi-year views #13448

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
51 changes: 0 additions & 51 deletions src/lib/datepicker/calendar-body.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ describe('MatCalendarBody', () => {

// Test components.
StandardCalendarBody,
CalendarBodyWithDisabledCells,
],
});

Expand Down Expand Up @@ -101,37 +100,6 @@ describe('MatCalendarBody', () => {
});
});

describe('calendar body with disabled cells', () => {
let fixture: ComponentFixture<CalendarBodyWithDisabledCells>;
let testComponent: CalendarBodyWithDisabledCells;
let calendarBodyNativeElement: Element;
let cellEls: HTMLElement[];

beforeEach(() => {
fixture = TestBed.createComponent(CalendarBodyWithDisabledCells);
fixture.detectChanges();

const calendarBodyDebugElement = fixture.debugElement.query(By.directive(MatCalendarBody));
calendarBodyNativeElement = calendarBodyDebugElement.nativeElement;
testComponent = fixture.componentInstance;
cellEls = Array.from(calendarBodyNativeElement.querySelectorAll('.mat-calendar-body-cell'));
});

it('should only allow selection of disabled cells when allowDisabledSelection is true', () => {
cellEls[0].click();
fixture.detectChanges();

expect(testComponent.selected).toBeFalsy();

testComponent.allowDisabledSelection = true;
fixture.detectChanges();

cellEls[0].click();
fixture.detectChanges();

expect(testComponent.selected).toBe(1);
});
});
});


Expand Down Expand Up @@ -160,25 +128,6 @@ class StandardCalendarBody {
}
}


@Component({
template: `<table mat-calendar-body
[rows]="rows"
[allowDisabledSelection]="allowDisabledSelection"
(selectedValueChange)="selected = $event">
</table>`
})
class CalendarBodyWithDisabledCells {
rows = [[1, 2, 3, 4]].map(r => r.map(d => {
let cell = createCell(d);
cell.enabled = d % 2 == 0;
return cell;
}));
allowDisabledSelection = false;
selected: number;
}


function createCell(value: number) {
return new MatCalendarCell(value, `${value}`, `${value}-label`, true);
}
8 changes: 2 additions & 6 deletions src/lib/datepicker/calendar-body.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ export class MatCalendarBody {
/** The number of columns in the table. */
@Input() numCols = 7;

/** Whether to allow selection of disabled cells. */
@Input() allowDisabledSelection = false;

/** The cell number of the active cell in the table. */
@Input() activeCell = 0;

Expand All @@ -85,10 +82,9 @@ export class MatCalendarBody {
constructor(private _elementRef: ElementRef<HTMLElement>, private _ngZone: NgZone) { }

_cellClicked(cell: MatCalendarCell): void {
if (!this.allowDisabledSelection && !cell.enabled) {
return;
if (cell.enabled) {
this.selectedValueChange.emit(cell.value);
}
this.selectedValueChange.emit(cell.value);
}

/** The number of blank cells to put at the beginning for the first row. */
Expand Down
1 change: 0 additions & 1 deletion src/lib/datepicker/multi-year-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<tr><th class="mat-calendar-table-header-divider" colspan="4"></th></tr>
</thead>
<tbody mat-calendar-body
allowDisabledSelection="true"
Copy link
Member Author

Choose a reason for hiding this comment

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

@mmalerba this behavior seems pretty deliberate, but I'm not sure whether it makes sense. Also it only applies to mouse users, because you can't reach disabled cells with the keyboard.

Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like its been that way since the beginning, but I don't remember why I did it, and I agree that it doesn't really make sense. Can we also remove the allowDisabledSelection input from calendar body?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

[rows]="_years"
[todayValue]="_todayYear"
[selectedValue]="_selectedYear"
Expand Down
1 change: 0 additions & 1 deletion src/lib/datepicker/year-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<tr><th class="mat-calendar-table-header-divider" colspan="4"></th></tr>
</thead>
<tbody mat-calendar-body
allowDisabledSelection="true"
[label]="_yearLabel"
[rows]="_months"
[todayValue]="_todayMonth"
Expand Down