mirror of
https://github.com/tenrok/vue2-datepicker.git
synced 2026-06-20 18:50:36 +03:00
feat: range on hover (#571)
This commit is contained in:
@@ -80,4 +80,38 @@ describe('CalendarRange', () => {
|
|||||||
expect(startPanel.vm.calendarMonth).toBe(9);
|
expect(startPanel.vm.calendarMonth).toBe(9);
|
||||||
expect(endPanel.vm.calendarMonth).toBe(11);
|
expect(endPanel.vm.calendarMonth).toBe(11);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('feat: hover range', async () => {
|
||||||
|
wrapper = mount(CalendarRange, {
|
||||||
|
propsData: {
|
||||||
|
defaultValue: new Date(2019, 9, 1),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
expect(wrapper.vm.calendars).toEqual([new Date(2019, 9, 1), new Date(2019, 10, 1)]);
|
||||||
|
const tds = wrapper.findAll('.mx-table-date td');
|
||||||
|
await tds.at(2).trigger('click');
|
||||||
|
await tds.at(60).trigger('mouseenter');
|
||||||
|
|
||||||
|
for (let i = 0; i < tds.length; i++) {
|
||||||
|
if (i > 2 && i < 60) {
|
||||||
|
expect(tds.at(i).classes()).toContain('hover-in-range');
|
||||||
|
} else {
|
||||||
|
expect(tds.at(i).classes()).not.toContain('hover-in-range');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await tds.at(60).trigger('click');
|
||||||
|
|
||||||
|
// hover to back
|
||||||
|
await tds.at(60).trigger('click');
|
||||||
|
await tds.at(2).trigger('mouseenter');
|
||||||
|
|
||||||
|
for (let i = 0; i < tds.length; i++) {
|
||||||
|
if (i > 2 && i < 60) {
|
||||||
|
expect(tds.at(i).classes()).toContain('hover-in-range');
|
||||||
|
} else {
|
||||||
|
expect(tds.at(i).classes()).not.toContain('hover-in-range');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -163,6 +163,9 @@ export default {
|
|||||||
handleSelectDate(date) {
|
handleSelectDate(date) {
|
||||||
this.emitDate(date, this.type === 'week' ? 'week' : 'date');
|
this.emitDate(date, this.type === 'week' ? 'week' : 'date');
|
||||||
},
|
},
|
||||||
|
handleMouseEnter(cell) {
|
||||||
|
this.$emit('mouseenter', cell);
|
||||||
|
},
|
||||||
getMonthCellDate(month) {
|
getMonthCellDate(month) {
|
||||||
return createDate(this.calendarYear, month);
|
return createDate(this.calendarYear, month);
|
||||||
},
|
},
|
||||||
@@ -259,6 +262,7 @@ export default {
|
|||||||
onSelect={this.handleSelectDate}
|
onSelect={this.handleSelectDate}
|
||||||
onChangepanel={this.handelPanelChange}
|
onChangepanel={this.handelPanelChange}
|
||||||
onChangecalendar={this.handleCalendarChange}
|
onChangecalendar={this.handleCalendarChange}
|
||||||
|
onMouseenter={this.handleMouseEnter}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
innerValue: [],
|
innerValue: [],
|
||||||
calendars: [],
|
calendars: [],
|
||||||
|
hoveredValue: null,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -65,6 +66,12 @@ export default {
|
|||||||
this.innerValue = [date, new Date(NaN)];
|
this.innerValue = [date, new Date(NaN)];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
handleCellMouseEnter(cell) {
|
||||||
|
this.hoveredValue = cell;
|
||||||
|
},
|
||||||
|
handleRangeMouseLeave() {
|
||||||
|
this.hoveredValue = null;
|
||||||
|
},
|
||||||
emitDate(dates, type) {
|
emitDate(dates, type) {
|
||||||
this.$emit('select', dates, type);
|
this.$emit('select', dates, type);
|
||||||
},
|
},
|
||||||
@@ -101,13 +108,28 @@ export default {
|
|||||||
getRangeClasses(cellDate, currentDates, classnames) {
|
getRangeClasses(cellDate, currentDates, classnames) {
|
||||||
const classes = [].concat(this.getClasses(cellDate, currentDates, classnames));
|
const classes = [].concat(this.getClasses(cellDate, currentDates, classnames));
|
||||||
if (
|
if (
|
||||||
!/disabled|active|not-current-month/.test(classnames) &&
|
|
||||||
currentDates.length === 2 &&
|
currentDates.length === 2 &&
|
||||||
|
!/disabled|active|not-current-month/.test(classnames) &&
|
||||||
cellDate.getTime() > currentDates[0].getTime() &&
|
cellDate.getTime() > currentDates[0].getTime() &&
|
||||||
cellDate.getTime() < currentDates[1].getTime()
|
cellDate.getTime() < currentDates[1].getTime()
|
||||||
) {
|
) {
|
||||||
classes.push('in-range');
|
classes.push('in-range');
|
||||||
|
} else if (
|
||||||
|
currentDates.length === 1 &&
|
||||||
|
this.hoveredValue &&
|
||||||
|
!/disabled|active/.test(classnames)
|
||||||
|
) {
|
||||||
|
let min = this.hoveredValue.getTime();
|
||||||
|
let max = currentDates[0].getTime();
|
||||||
|
|
||||||
|
if (min > max) {
|
||||||
|
[min, max] = [max, min];
|
||||||
|
}
|
||||||
|
if (cellDate.getTime() > min && cellDate.getTime() < max) {
|
||||||
|
classes.push('hover-in-range');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return classes;
|
return classes;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -125,12 +147,17 @@ export default {
|
|||||||
const on = {
|
const on = {
|
||||||
select: this.handleSelect,
|
select: this.handleSelect,
|
||||||
'update:calendar': index === 0 ? this.updateStartCalendar : this.updateEndCalendar,
|
'update:calendar': index === 0 ? this.updateStartCalendar : this.updateEndCalendar,
|
||||||
|
mouseenter: this.handleCellMouseEnter,
|
||||||
};
|
};
|
||||||
return <calendar-panel {...{ props, on }}></calendar-panel>;
|
return <calendar-panel {...{ props, on }}></calendar-panel>;
|
||||||
});
|
});
|
||||||
|
|
||||||
const { prefixClass } = this;
|
const { prefixClass } = this;
|
||||||
|
|
||||||
return <div class={`${prefixClass}-range-wrapper`}>{calendarRange}</div>;
|
return (
|
||||||
|
<div class={`${prefixClass}-range-wrapper`} onMouseleave={this.handleRangeMouseLeave}>
|
||||||
|
{calendarRange}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -47,6 +47,7 @@
|
|||||||
class="cell"
|
class="cell"
|
||||||
:class="getCellClasses(cell)"
|
:class="getCellClasses(cell)"
|
||||||
:title="getCellTitle(cell)"
|
:title="getCellTitle(cell)"
|
||||||
|
@mouseenter="handleMouseEnter(cell)"
|
||||||
>
|
>
|
||||||
<div>{{ cell.getDate() }}</div>
|
<div>{{ cell.getDate() }}</div>
|
||||||
</td>
|
</td>
|
||||||
@@ -153,6 +154,9 @@ export default {
|
|||||||
handlePanelChange(panel) {
|
handlePanelChange(panel) {
|
||||||
this.$emit('changepanel', panel);
|
this.$emit('changepanel', panel);
|
||||||
},
|
},
|
||||||
|
handleMouseEnter(cell) {
|
||||||
|
this.$emit('mouseenter', cell);
|
||||||
|
},
|
||||||
handleCellClick(evt) {
|
handleCellClick(evt) {
|
||||||
let { target } = evt;
|
let { target } = evt;
|
||||||
if (target.tagName.toUpperCase() === 'DIV') {
|
if (target.tagName.toUpperCase() === 'DIV') {
|
||||||
|
|||||||
@@ -201,7 +201,8 @@
|
|||||||
color: $calendar-active-color;
|
color: $calendar-active-color;
|
||||||
background-color: $calendar-active-background-color;
|
background-color: $calendar-active-background-color;
|
||||||
}
|
}
|
||||||
&.in-range {
|
&.in-range,
|
||||||
|
&.hover-in-range {
|
||||||
color: $calendar-in-range-color;
|
color: $calendar-in-range-color;
|
||||||
background-color: $calendar-in-range-background-color;
|
background-color: $calendar-in-range-background-color;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user