Skip to content

Commit

Permalink
Merge 0f5d4fa into 8563862
Browse files Browse the repository at this point in the history
  • Loading branch information
c-falardeau committed May 17, 2022
2 parents 8563862 + 0f5d4fa commit 5b0b380
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/day.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,10 @@ export default class Day extends React.Component {
return false;
}

const { day, endDate, selectsEnd } = this.props;
const { day, endDate, selectsEnd, selectsRange } = this.props;
const selectingDate = this.props.selectingDate ?? this.props.preSelection;

if (selectsEnd) {
if (selectsEnd || selectsRange) {
return isSameDay(day, selectingDate);
} else {
return isSameDay(day, endDate);
Expand Down
30 changes: 30 additions & 0 deletions test/day_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,36 @@ describe("Day", () => {
expect(shallowDay.hasClass(rangeDayClassName)).to.be.true;
});
});

describe("for a date picker with selectsRange prop", () => {
it("should have a class if it is a start or end date", () => {
const startDate = newDate();
const midRangeDate = addDays(startDate, 1);
const endDate = addDays(startDate, 2);

const shallowStartDay = renderDay(startDate, {
startDate,
selectingDate: endDate,
selectsRange: true,
});
expect(shallowStartDay.hasClass(rangeDayStartClassName)).to.be.true;

const shallowMidRangeDay = renderDay(midRangeDate, {
startDate,
selectingDate: endDate,
selectsRange: true,
});
expect(shallowMidRangeDay.hasClass(rangeDayStartClassName)).to.be.false;
expect(shallowMidRangeDay.hasClass(rangeDayEndClassName)).to.be.false;

const shallowEndDay = renderDay(endDate, {
startDate,
selectingDate: endDate,
selectsRange: true,
});
expect(shallowEndDay.hasClass(rangeDayEndClassName)).to.be.true;
});
});
});

describe("today", () => {
Expand Down

0 comments on commit 5b0b380

Please sign in to comment.