Skip to content

Handle one day long events with 'background' style #90

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Handle one day long events with 'background' style #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b9a5e4
add package name
Feb 20, 2023
ae1e1ad
handle one day long data source events rendering when is style is 'ba…
Feb 20, 2023
2832335
add test
Feb 20, 2023
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
1 change: 1 addition & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion src/less/js-year-calendar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,16 @@
}

&.round-right {
webkit-border-radius: 0 8px 8px 0 ;
-webkit-border-radius: 0 8px 8px 0 ;
-moz-border-radius: 0 8px 8px 0;
border-radius: 0 8px 8px 0;
}

&.round-left-right {
-webkit-border-radius: 8px 8px 8px 8px ;
-moz-border-radius: 8px 8px 8px 8px;
border-radius: 8px 8px 8px 8px;
}

.day-content {
-webkit-border-radius: 4px;
Expand Down
26 changes: 25 additions & 1 deletion src/ts/js-year-calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,31 @@ export default class Calendar<T extends CalendarDataSourceElement> {

var currentTime = currentDate.getTime();

if (events[events.length - 1].startDate.getTime() == currentTime)
if (events[events.length - 1].startDate.getTime() == currentTime && events[events.length - 1].endDate.getTime() == currentTime) {
parent.classList.add('day-start');

if (events[events.length - 1].startHalfDay || events[events.length - 1].endHalfDay &&
(events[events.length - 1].startHalfDay !== events[events.length - 1].endHalfDay)) {
parent.classList.add('day-half');

// Find color for other half
var otherColor = 'transparent';
for (var i = events.length - 2; i >= 0; i--) {
if (events[i].startDate.getTime() != currentTime || (!events[i].startHalfDay && !events[i].endHalfDay && !this.options.alwaysHalfDay)) {
otherColor = events[i].color;
break;
}
}

const deg = events[events.length - 1].startHalfDay ? '-45deg' : '135deg'

parent.style.background = `linear-gradient(${deg}, ${events[events.length - 1].color}, ${events[events.length - 1].color} 49%, ${otherColor} 51%, ${otherColor})`;
}
else if (this.options.roundRangeLimits) {
parent.classList.add('round-left-right');
}
}
else if (events[events.length - 1].startDate.getTime() == currentTime)
{
parent.classList.add('day-start');

Expand Down
15 changes: 15 additions & 0 deletions tests/initialization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,21 @@ test('instantiate calendar with round limits', () => {
expect(Array.from(getDay(6, 20).classList)).toContain("round-right");
});

test('instantiate calendar with round limits for one day long event', () => {
const calendar = new Calendar('#calendar', {
style: 'background',
roundRangeLimits: true,
dataSource: [
{
startDate: new Date(currentYear, 6, 10),
endDate: new Date(currentYear, 6, 10)
}
]
});

expect(Array.from(getDay(6, 10).classList)).toContain("round-left-right");
});

test('instantiate calendar with disable days', () => {
const calendar = new Calendar('#calendar', {
disabledDays: [
Expand Down