feat: add support for class name generator for InlineDatePicker

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.vaadin.addons.flowingcode</groupId>
 	<artifactId>year-month-calendar</artifactId>
-	<version>4.3.2-SNAPSHOT</version>
+	<version>4.4.0-SNAPSHOT</version>
 	<name>Year Month Calendar Add-on</name>
 	<description>Year Month Calendar Add-on for Vaadin Flow</description>
 
@@ -201,12 +201,13 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>1.14</version>
+				<version>2.3.0</version>
 				<configuration>
 					<licenseName>apache_v2</licenseName>
 					<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
 					<excludes>
 						<exclude>**/shadow-focus-mixin.js</exclude>
+						<exclude>**/main/dev-bundle/**</exclude>
 					</excludes>
 				</configuration>
 			</plugin>

src/main/java/com/flowingcode/addons/ycalendar/AbstractCalendarComponent.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2024 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/flowingcode/addons/ycalendar/DateSelectedEvent.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/flowingcode/addons/ycalendar/InlineDatePicker.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2024 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +27,13 @@
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.Uses;
 import com.vaadin.flow.function.SerializableFunction;
+import com.vaadin.flow.function.ValueProvider;
 import com.vaadin.flow.internal.JsonSerializer;
 import java.time.LocalDate;
+import java.time.YearMonth;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.IntStream;
 
 @SuppressWarnings("serial")
 @Tag("fc-inline-date-picker")
@@ -40,7 +43,11 @@
 public class InlineDatePicker extends AbstractSinglePropertyField<InlineDatePicker, LocalDate> implements HasSize, HasTheme {
 
   private static final String VALUE_PROPERTY = "value";
-
+
+  private ValueProvider<LocalDate, String> classNameGenerator;
+
+  private YearMonth yearMonth;
+
   private static <R,S> SerializableFunction<R,S> map(SerializableFunction<R,S> f) {
     return r->Optional.ofNullable(r).map(f).orElse(null);
   }
@@ -50,6 +57,9 @@ public InlineDatePicker() {
     super(VALUE_PROPERTY, null, String.class, map(LocalDate::parse), map(LocalDate::toString));
     setValue(LocalDate.now());
     setWeekNumbersVisible(true);
+    getElement().addEventListener("month-change", event -> {
+      setYearMonth(YearMonth.parse(event.getEventData().getString("event.detail.value")));
+    }).addEventData("event.detail.value");
   }
 
   /**
@@ -85,4 +95,54 @@ public void setI18n(DatePickerI18n i18n) {
     getElement().setPropertyJson("i18n", JsonSerializer.toJson(i18n));
   }
 
+  /**
+   * Sets the function that generates CSS class names for days in this calendar.
+   *
+   * Returning {@code null} from the generator results in no custom class name being set. Multiple
+   * class names can be returned from the generator as space-separated.
+   *
+   * @param classNameGenerator the {@code ValueProvider} to use for generating class names
+   */
+  public void setClassNameGenerator(ValueProvider<LocalDate, String> classNameGenerator) {
+    this.classNameGenerator = classNameGenerator;
+    refreshAll();
+  }
+
+  /** Refresh the styles of all dates in the displayed year and month. */
+  public void refreshAll() {
+    IntStream
+        .rangeClosed(1, yearMonth.lengthOfMonth())
+        .mapToObj(yearMonth::atDay).forEach(this::refreshItem);
+    getElement().executeJs("setTimeout(()=>this._clearEmptyDaysStyle())");
+  }
+
+  /**
+   * Refresh the style of the given date.
+   *
+   * @param date the date to update the style for
+   */
+  public void refreshItem(LocalDate date) {
+    if (date.getYear() == yearMonth.getYear() && date.getMonth() == yearMonth.getMonth()) {
+      String className =
+          Optional.ofNullable(classNameGenerator).map(g -> g.apply(date)).orElse(null);
+      getElement().executeJs("setTimeout(()=>{this._setStyleForDay($0,$1);})", date.getDayOfMonth(),
+          className);
+    }
+  }
+
+  @Override
+  public void setValue(LocalDate value) {
+    Objects.requireNonNull(value);
+    super.setValue(value);
+    setYearMonth(YearMonth.from(value));
+  }
+
+  private void setYearMonth(YearMonth value) {
+    Objects.requireNonNull(value);
+    if (!value.equals(yearMonth)) {
+      yearMonth = value;
+      refreshAll();
+    }
+  }
+
 }

src/main/java/com/flowingcode/addons/ycalendar/MonthCalendar.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
 import java.time.Month;
 import java.time.YearMonth;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.IntStream;
 
 /** A component for displaying a calendar view of a specific month and year. */
@@ -121,15 +122,9 @@ public void setClassNameGenerator(ValueProvider<LocalDate, String> classNameGene
   /** Refresh the styles of all dates in the displayed year and month. */
   @Override
   public void refreshAll() {
-    IntStream.rangeClosed(1, yearMonth.lengthOfMonth()).forEach(dayOfMonth -> {
-      String className;
-      if (classNameGenerator != null) {
-        className = classNameGenerator.apply(yearMonth.atDay(dayOfMonth));
-      } else {
-        className = null;
-      }
-      setStyleForDay(dayOfMonth, className);
-    });
+    IntStream.rangeClosed(1, yearMonth.lengthOfMonth())
+        .mapToObj(yearMonth::atDay)
+        .forEach(this::refreshItem);
     getElement().executeJs("setTimeout(()=>this._clearEmptyDaysStyle())");
   }
 
@@ -141,20 +136,13 @@ public void refreshAll() {
    */
   public void refreshItem(LocalDate date) {
     if (date.getYear() == yearMonth.getYear() && date.getMonth() == yearMonth.getMonth()) {
-      String className;
-      if (classNameGenerator != null) {
-        className = classNameGenerator.apply(date);
-      } else {
-        className = null;
-      }
-      setStyleForDay(date.getDayOfMonth(), className);
+      String className =
+          Optional.ofNullable(classNameGenerator).map(g -> g.apply(date)).orElse(null);
+      getElement().executeJs("setTimeout(()=>{this._setStyleForDay($0,$1);})", date.getDayOfMonth(),
+          className);
     } else {
       throw new IllegalArgumentException();
     }
   }
 
-  private void setStyleForDay(int dayOfMonth, String className) {
-    getElement().executeJs("setTimeout(()=>{this._setStyleForDay($0,$1);})", dayOfMonth, className);
-  }
-
 }

src/main/java/com/flowingcode/addons/ycalendar/YearCalendar.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import com.vaadin.flow.shared.Registration;
 import java.time.LocalDate;
 import java.time.Year;
+import java.util.Optional;
 import java.util.stream.IntStream;
 
 /** A component that displays the calendar of a whole year. */
@@ -94,13 +95,8 @@ public void refreshAll() {
   /** If the year is currently displayed, refresh the given date. Otherwise do nothing. */
   public void refreshItem(LocalDate date) {
     if (date.getYear() == getYear()) {
-      String className;
-      if (classNameGenerator != null) {
-        className = classNameGenerator.apply(date);
-      } else {
-        className = null;
-      }
-
+      String className =
+          Optional.ofNullable(classNameGenerator).map(g -> g.apply(date)).orElse(null);
       getElement().executeJs("setTimeout(()=>{this._setStyleForDay($0,$1,$2);})",
           date.getDayOfMonth(), date.getMonthValue(), className);
     }

src/main/java/com/flowingcode/addons/ycalendar/YearChangedEvent.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/flowingcode/addons/ycalendar/YearMonthField.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/resources/META-INF/frontend/fc-inline-date-picker/fc-inline-date-picker.js

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2024 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,13 +91,22 @@ export class InlineDatePicker extends LitElement {
   }
 
   __onDisplayMonthChange() {
-    this.displayDate=new Date(this.shadowRoot.querySelector("fc-year-month-field").value+'-02');
+    const yearMonth = this.shadowRoot.querySelector("fc-year-month-field").value;
+    this.displayDate=new Date(yearMonth+'-02');
+    this.dispatchEvent(new CustomEvent("month-change",{detail:{value: yearMonth}}));
   }
 
   __onDateSelected(e) {	
       this.value=e.detail.value;
   }
 
+  _setStyleForDay(i,className) { 
+    this.shadowRoot.querySelector("fc-month-calendar")._setStyleForDay(i,className);
+  }
+
+  _clearEmptyDaysStyle() {
+    this.shadowRoot.querySelector("fc-month-calendar")._clearEmptyDaysStyle();
+  }
 }
 
 customElements.define(InlineDatePicker.is, InlineDatePicker);

src/main/resources/META-INF/frontend/fc-month-calendar/fc-month-calendar.js

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/resources/META-INF/frontend/fc-month-calendar/month-calendar-mixin.js

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/resources/META-INF/frontend/fc-year-calendar/fc-calendar-utils.js

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/resources/META-INF/frontend/fc-year-calendar/fc-year-calendar.js

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/resources/META-INF/frontend/fc-year-month-field/fc-year-month-field.js

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/test/java/com/flowingcode/addons/ycalendar/DemoView.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2023 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/test/java/com/flowingcode/addons/ycalendar/InlineDatePickerDemo.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2024 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
+import java.time.DayOfWeek;
 import java.util.Objects;
 
 @DemoSource
@@ -41,6 +42,17 @@ public InlineDatePickerDemo() {
     field.addValueChangeListener(ev->{
       Notification.show(Objects.toString(ev.getValue()));
     });
+
+    field.setClassNameGenerator(date -> {
+      if (date.getDayOfWeek() == DayOfWeek.SATURDAY || date.getDayOfWeek() == DayOfWeek.SUNDAY) {
+        return "weekend";
+      } else if (TestUtils.isPublicHoliday(date)) {
+        return "holiday";
+      } else {
+        return null;
+      }
+    });
+
     add(field);
   }
 

src/test/java/com/flowingcode/addons/ycalendar/LocaleSelector.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2024 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/test/java/com/flowingcode/addons/ycalendar/MonthDemo.java

@@ -2,7 +2,7 @@
  * #%L
  * Year Month Calendar Add-on
  * %%
- * Copyright (C) 2021 - 2024 Flowing Code
+ * Copyright (C) 2021 - 2025 Flowing Code
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.