ayo/lion
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #217 from ing-bank/fix/calendarClickDisabled

Browse source 
fix(calendar): disabled dates don't trigger @user-selected-date-changed
This commit is contained in:
Thijs Louisse 2019-08-01 15:18:34 +02:00 committed by GitHub
commit a4e8c71790
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/calendar/src/LionCalendar.js
View file

@ -454,11 +454,10 @@ export class LionCalendar extends LocalizeMixin(LitElement) {
}
__addEventDelegationForClickDate() {
const isDayCellOrButton = el =>
el.classList.contains('calendar__day-cell') || el.classList.contains('calendar__day-button');
const isDayButton = el => el.classList.contains('calendar__day-button');
this.__clickDateDelegation = this.__contentWrapperElement.addEventListener('click', ev => {
const el = ev.composedPath()[0];
if (isDayCellOrButton(el)) {
const el = ev.target;
if (isDayButton(el)) {
this.__dateSelectedByUser(el.date);
}
});

16
packages/calendar/test/lion-calendar.test.js
View file

@ -204,6 +204,22 @@ describe('<lion-calendar>', () => {
).to.equal(true);
});
it('doesn\'t send event "user-selected-date-changed" when user selects a disabled date', async () => {
const dateChangedSpy = sinon.spy();
const disable15th = d => d.getDate() === 15;
const el = await fixture(html`
<lion-calendar
.selectedDate="${new Date('2000/12/12')}"
@user-selected-date-changed="${dateChangedSpy}"
.disableDates=${disable15th}
></lion-calendar>
`);
const elObj = new CalendarObject(el);
elObj.getDayEl(15).click();
await el.updateComplete;
expect(dateChangedSpy.called).to.equal(false);
});
it('exposes focusedDate getter', async () => {
const el = await fixture(html`
<lion-calendar .centralDate="${new Date('2019/06/01')}"></lion-calendar>