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

Merge pull request #286 from jcperea/fix/calendar

Browse source 
fix(calendar): render the calendar when min and max date are same date
This commit is contained in:
Erik Kroes 2019-09-26 15:40:09 +02:00 committed by GitHub
commit 2f27827e4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -430,6 +430,13 @@ export class LionCalendar extends LocalizeMixin(LitElement) {
this.minDate && this.minDate > date ? new Date(this.minDate) : new Date(date);
const pastDate = this.maxDate && this.maxDate < date ? new Date(this.maxDate) : new Date(date);
if (this.minDate && this.minDate > date) {
futureDate.setDate(futureDate.getDate() - 1);
}
if (this.maxDate && this.maxDate < date) {
pastDate.setDate(pastDate.getDate() + 1);
}
let i = 0;
do {
i += 1;

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

@ -339,6 +339,20 @@ describe('<lion-calendar>', () => {
clock.restore();
});
it('should set centralDate to the unique valid value when minDate and maxDate are equal', async () => {
const clock = sinon.useFakeTimers({ now: new Date('2019/06/03').getTime() });
const el = await fixture(html`
<lion-calendar
.minDate="${new Date('2019/07/03')}"
.maxDate="${new Date('2019/07/03')}"
></lion-calendar>
`);
expect(isSameDate(el.centralDate, new Date('2019/07/03')), 'central date').to.be.true;
clock.restore();
});
describe('Normalization', () => {
it('normalizes all generated dates', async () => {
function isNormalizedDate(d) {
@ -504,7 +518,7 @@ describe('<lion-calendar>', () => {
elObj.previousMonthButtonEl.click();
await el.updateComplete;
expect(elObj.activeMonthAndYear).to.equal('November 2000');
expect(isSameDate(el.centralDate, new Date('2000/11/21'))).to.be.true;
expect(isSameDate(el.centralDate, new Date('2000/11/20'))).to.be.true;
clock.restore();
});
@ -527,7 +541,7 @@ describe('<lion-calendar>', () => {
elObj.nextMonthButtonEl.click();
await el.updateComplete;
expect(elObj.activeMonthAndYear).to.equal('January 2001');
expect(isSameDate(el.centralDate, new Date('2001/01/09'))).to.be.true;
expect(isSameDate(el.centralDate, new Date('2001/01/10'))).to.be.true;
clock.restore();
});