From 409c17cba040eb3f562198c6ee71fd7f5ec10ee3 Mon Sep 17 00:00:00 2001 From: Daniel Riera Date: Wed, 7 Oct 2020 12:29:53 +0000 Subject: [PATCH 1/2] Add textColor support --- src/ts/interfaces/CalendarDataSourceElement.ts | 6 +++++- src/ts/js-year-calendar.ts | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ts/interfaces/CalendarDataSourceElement.ts b/src/ts/interfaces/CalendarDataSourceElement.ts index e4fe2cb..67804e1 100644 --- a/src/ts/interfaces/CalendarDataSourceElement.ts +++ b/src/ts/interfaces/CalendarDataSourceElement.ts @@ -11,7 +11,11 @@ export default interface CalendarDataSourceElement { * The color of the element. This property will be computed automatically if not defined. */ color?: string; - + + /** + * The text color of event + */ + textColor?: string; /** * The date of the beginning of the element range. */ diff --git a/src/ts/js-year-calendar.ts b/src/ts/js-year-calendar.ts index 325f0a7..10dfcbf 100644 --- a/src/ts/js-year-calendar.ts +++ b/src/ts/js-year-calendar.ts @@ -707,6 +707,9 @@ export default class Calendar { this.options.customDataSourceRenderer.call(this, elt, currentDate, events); } break; + case 'textColor': + parent.style.color = events[events.length - 1].textColor; + break; } } From 0363c2df46c720fc1a8af801948287d5d5d57338 Mon Sep 17 00:00:00 2001 From: Daniel Riera Date: Thu, 8 Oct 2020 11:16:49 +0000 Subject: [PATCH 2/2] Fix: Add Text Color --- src/ts/js-year-calendar.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ts/js-year-calendar.ts b/src/ts/js-year-calendar.ts index 10dfcbf..2573528 100644 --- a/src/ts/js-year-calendar.ts +++ b/src/ts/js-year-calendar.ts @@ -653,7 +653,10 @@ export default class Calendar { case 'background': parent.style.backgroundColor = events[events.length - 1].color; - + + if(events[events.length - 1].textColor) { + parent.style.color = events[events.length - 1].textColor; + } var currentTime = currentDate.getTime(); if (events[events.length - 1].startDate.getTime() == currentTime) @@ -707,9 +710,6 @@ export default class Calendar { this.options.customDataSourceRenderer.call(this, elt, currentDate, events); } break; - case 'textColor': - parent.style.color = events[events.length - 1].textColor; - break; } }