Merge pull request #226 from xdev-software/develop

AB-xdev · web-flow · commit 35397f461479 · 2023-04-06T11:53:29.000+02:00
Release v4
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -20,12 +20,3 @@ updates:
     # Run it at a specific time so that we don't get emails all day long
     time: "00:00"
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: "org.yaml:snakeyaml"
-    # Version 2+ requires Spring Boot 3
-    versions: ">=2.0.0"
-  - dependency-name: "org.springframework.boot:*"
-    # Version 3+ requires Vaadin 24
-    versions: ">=3.0.0"
-  - dependency-name: "com.vaadin:*"
-    versions: ">=24.0.0"
diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
@@ -21,7 +21,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [11, 17]
+        java: [17]
         distribution: [temurin]
 
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: 'maven'
       
@@ -122,7 +122,7 @@ jobs:
     - name: Set up JDK Apache Maven Central
       uses: actions/setup-java@v3
       with: # running setup-java again overwrites the settings.xml
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
@@ -154,7 +154,7 @@ jobs:
     - name: Setup - Java
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: 'maven'
 
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -30,11 +30,11 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Set up JDK 11
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
 
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -16,7 +16,7 @@ jobs:
       uses: actions/setup-java@v3
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
         server-id: ossrh
         server-username: MAVEN_CENTRAL_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
diff --git a/.gitignore b/.gitignore
@@ -81,6 +81,7 @@ vite.config.ts
 vite.generated.ts
 /*/frontend/generated/
 /*/frontend/index.html
+/*/src/main/dev-bundle/
 
 #custom
 .flattened-pom.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 4.0.0
+
+⚠️<i>This release contains breaking changes</i>
+
+* Adds support for Vaadin 24+, drops support for Vaadin 23<br/>
+  <i>If you are still using Vaadin 14, use the ``3.x`` versions.</i>
+  * Requires Java 17+
+  * Fixed Broken overlay detection on Vaadin 24 #224 
+* Added ``AllowRangeLimitExceeding``; default value is ``true``
+* Updated dependencies
+
 ## 3.0.3
 * Renamed ``defaultModel`` to ``initialModel``
 * Updated dependencies
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ We encourage you to read the [contribution instructions by GitHub](https://guide
 ### Software Requirements
 You should have the following things installed:
 * Git
-* Java 11 or 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
+* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
 * Maven
 
 ### Recommended setup
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/vaadin-date-range-picker)](https://mvnrepository.com/artifact/com.xdev-software/vaadin-date-range-picker)
 [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-date-range-picker/checkBuild.yml?branch=develop)](https://github.com/xdev-software/vaadin-date-range-picker/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_vaadin-date-range-picker&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_vaadin-date-range-picker)
-![Vaadin 23+](https://img.shields.io/badge/Vaadin%20Platform/Flow-23+-00b4f0.svg)
+![Vaadin 24+](https://img.shields.io/badge/Vaadin%20Platform/Flow-24+-00b4f0.svg)
 
 # vaadin-date-range-picker
 A Vaadin Flow DateRangePicker implementation
@@ -17,7 +17,8 @@ A Vaadin Flow DateRangePicker implementation
 
 | Vaadin version | DateRangePicker version |
 | --- | --- |
-| Vaadin 23+ (latest) | ``3+`` |
+| Vaadin 24+ (latest) | ``4+`` |
+| Vaadin 23 | ``3.x`` |
 | Vaadin 14 (LTS - former release model) | ``2.x`` |
 
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>vaadin-date-range-picker-root</artifactId>
-	<version>3.0.4-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
diff --git a/vaadin-date-range-picker-demo/pom.xml b/vaadin-date-range-picker-demo/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>vaadin-date-range-picker-demo</artifactId>
-	<version>3.0.4-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<inceptionYear>2020</inceptionYear>
@@ -26,7 +26,7 @@
 	<properties>
 		<license.licenseName>apache_v2</license.licenseName>
 
-		<javaVersion>11</javaVersion>
+		<javaVersion>17</javaVersion>
 		<maven.compiler.release>${javaVersion}</maven.compiler.release>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,9 +35,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>23.3.7</vaadin.version>
+		<vaadin.version>24.0.3</vaadin.version>
 
-		<org.springframework.boot.version>2.7.9</org.springframework.boot.version>
+		<org.springframework.boot.version>3.0.5</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>
@@ -83,7 +83,6 @@
 		<dependency>
 			<groupId>org.yaml</groupId>
 			<artifactId>snakeyaml</artifactId>
-			<version>1.33</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/HomeView.java b/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/HomeView.java
@@ -16,6 +16,7 @@
 import software.xdev.vaadin.daterange_picker.example.DateRangePickerCustomizedDemo;
 import software.xdev.vaadin.daterange_picker.example.DateRangePickerLocalizedDemo;
 import software.xdev.vaadin.daterange_picker.example.DateRangePickerParameterDemo;
+import software.xdev.vaadin.daterange_picker.example.DateRangePickerRangeExceedingDemo;
 import software.xdev.vaadin.daterange_picker.example.DateRangePickerStyledDemo;
 
 @PageTitle("DateRangePicker Examples")
@@ -26,7 +27,6 @@ public class HomeView extends Composite<VerticalLayout>
 	
 	public HomeView()
 	{
-		// @formatter:off
 		this.grExamples
 			.addColumn(new ComponentRenderer<>(example -> {
 				final Anchor anchor = new Anchor(example.getRoute(), example.getName());
@@ -40,8 +40,6 @@ public HomeView()
 			}))
 			.setHeader("Available demos");
 		
-		// @formatter:on
-		
 		this.grExamples.setSizeFull();
 		this.grExamples.addThemeVariants(GridVariant.LUMO_COMPACT, GridVariant.LUMO_NO_BORDER);
 		
@@ -52,14 +50,28 @@ public HomeView()
 	@Override
 	protected void onAttach(final AttachEvent attachEvent)
 	{
-		// @formatter:off
 		this.grExamples.setItems(Arrays.asList(
-			new Example(DateRangePickerStyledDemo.NAV, "Styled-Demo", "dark mode 🌑  and more"),
-			new Example(DateRangePickerParameterDemo.NAV, "Parameter-Demo", "configuration is stored in QueryParameters"),
-			new Example(DateRangePickerLocalizedDemo.NAV, "Localized-Demo", "🌐 simple localization"),
-			new Example(DateRangePickerCustomizedDemo.NAV, "Customized-Demo", "usage of a customized DateRange")
+			new Example(
+				DateRangePickerStyledDemo.NAV,
+				"Styled-Demo",
+				"dark mode 🌑  and more"),
+			new Example(
+				DateRangePickerParameterDemo.NAV,
+				"Parameter-Demo",
+				"configuration is stored in QueryParameters"),
+			new Example(
+				DateRangePickerLocalizedDemo.NAV,
+				"Localized-Demo",
+				"🌐 simple localization"),
+			new Example(
+				DateRangePickerRangeExceedingDemo.NAV,
+				"RangeExceeding-Demo",
+				"usage of a range exceeding DateRange"),
+			new Example(
+				DateRangePickerCustomizedDemo.NAV,
+				"Customized-Demo",
+				"usage of a customized DateRange")
 		));
-		// @formatter:on
 	}
 	
 	
diff --git a/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerCustomizedDemo.java b/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerCustomizedDemo.java
@@ -49,14 +49,12 @@ protected void initUI()
 			final DateRangeModel<CustomDateRange> modell = ev.getValue();
 			
 			this.taResult.clear();
-			// @formatter:off
 			this.taResult.setValue(
 					"DateRange: " + modell.getDateRange().getKey() + "\r\n" +
 					"DateRange-Tag: " + modell.getDateRange().getTag() + "\r\n" +
 					"Start: " + modell.getStart() + "\r\n" +
 					"End: " + modell.getEnd()
 				);
-			// @formatter:on
 		});
 	}
 }
diff --git a/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerLocalizedDemo.java b/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerLocalizedDemo.java
@@ -30,7 +30,6 @@ public class DateRangePickerLocalizedDemo extends Composite<VerticalLayout>
 	
 	protected static final List<SimpleDateRange> DATERANGE_VALUES = Arrays.asList(SimpleDateRanges.allValues());
 	
-	// @formatter:off
 	private final DateRangePicker<SimpleDateRange> dateRangePicker =
 		new DateRangePicker<>(
 			() -> new DateRangeModel<>(LocalDate.now(), LocalDate.now(), SimpleDateRanges.TODAY),
@@ -75,7 +74,6 @@ else if(dr == SimpleDateRanges.FREE)
 		.withStartLabel("Start - Anfang")
 		.withEndLabel("End - Ende")
 		.withDateRangeOptionsLabel("Period - Zeitraum");
-	// @formatter:on
 	
 	private final TextArea taResult =
 		new TextArea("ValueChangeEvent", "Change something in the datepicker to see the result");
@@ -103,17 +101,14 @@ protected void initUI()
 			final DateRangeModel<SimpleDateRange> modell = ev.getValue();
 			
 			this.taResult.clear();
-			// @formatter:off
 			this.taResult.setValue(
 					"DateRange: " + modell.getDateRange().getKey() + "\r\n" +
 					"Start: " + modell.getStart() + "\r\n" +
 					"End: " + modell.getEnd()
 				);
-			// @formatter:on
 		});
 	}
 	
-	// @formatter:off
 	// List Must start with Sunday and ends with Saturday... Americans...
 	private static final List<DayOfWeek> daysOfWeekSortedForDatepicker =
 		Stream.concat(
@@ -134,7 +129,6 @@ protected void initUI()
 		Stream.of(Month.values())
 			.map(m -> m.getDisplayName(TextStyle.FULL, Locale.GERMAN))
 			.collect(Collectors.toList());
-	// @formatter:on
 	
 	/**
 	 * Standard DatePickerI18N
diff --git a/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerParameterDemo.java b/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerParameterDemo.java
@@ -126,13 +126,11 @@ public void afterNavigation(final AfterNavigationEvent event)
 		
 		if(paras.containsKey(QP_RANGE) && !paras.get(QP_RANGE).isEmpty())
 		{
-			// @formatter:off
 			final Optional<SimpleDateRange> optQueryDR =
 				DATERANGE_VALUES
 				.stream()
 				.filter(dr -> dr.getKey().equalsIgnoreCase(paras.get(QP_RANGE).get(0)))
 				.findFirst();
-			// @formatter:on
 			
 			if(optQueryDR.isPresent())
 			{
@@ -198,12 +196,10 @@ public void afterNavigation(final AfterNavigationEvent event)
 		{
 			final SimpleDateRange dr = dateRange;
 			
-			// @formatter:off
 			dateRange.calcFor(start)
 				.ifPresent(drcr ->
 						this.dateRangePicker.setValue(
 							new DateRangeModel<>(drcr.getStart(), drcr.getEnd(), dr)));
-			// @formatter:on
 			
 			if(dateRange != this.dateRangePicker.getDateRange() ||
 				start != null && !start.equals(this.dateRangePicker.getStart()))
diff --git a/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerRangeExceedingDemo.java b/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerRangeExceedingDemo.java
@@ -0,0 +1,72 @@
+package software.xdev.vaadin.daterange_picker.example;
+
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.List;
+
+import com.vaadin.flow.component.Composite;
+import com.vaadin.flow.component.HasSize;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.textfield.TextArea;
+import com.vaadin.flow.router.Route;
+
+import software.xdev.vaadin.daterange_picker.business.DateRangeModel;
+import software.xdev.vaadin.daterange_picker.business.SimpleDateRange;
+import software.xdev.vaadin.daterange_picker.business.SimpleDateRanges;
+import software.xdev.vaadin.daterange_picker.ui.DateRangePicker;
+
+
+@Route(DateRangePickerRangeExceedingDemo.NAV)
+public class DateRangePickerRangeExceedingDemo extends Composite<VerticalLayout>
+{
+	public static final String NAV = "rangeExceeding";
+	
+	protected static final List<SimpleDateRange> DATERANGE_VALUES = Arrays.asList(SimpleDateRanges.allValues());
+	
+	private final DateRangePicker<SimpleDateRange> dateRangePicker =
+		new DateRangePicker<>(
+			() -> new DateRangeModel<>(LocalDate.now(), LocalDate.now(), SimpleDateRanges.TODAY),
+			DATERANGE_VALUES)
+			.withAllowRangeLimitExceeding(true);
+	
+	private final TextArea taResult =
+		new TextArea("ValueChangeEvent", "Change something in the datepicker to see the result");
+	
+	/*
+	 * Fields
+	 */
+	
+	public DateRangePickerRangeExceedingDemo()
+	{
+		this.initUI();
+	}
+	
+	protected void initUI()
+	{
+		this.taResult.setSizeFull();
+		
+		this.getContent().setPadding(false);
+		this.getContent().add(new VerticalLayout(this.dateRangePicker), new VerticalLayout(this.taResult));
+		this.getContent().getChildren().forEach(comp -> ((HasSize)comp).setHeight("50%"));
+		this.getContent().setHeightFull();
+		
+		this.dateRangePicker.addValueChangeListener(ev ->
+		{
+			final DateRangeModel<SimpleDateRange> modell = ev.getValue();
+			
+			this.taResult.clear();
+			this.taResult.setValue(
+					"DateRange: " + modell.getDateRange().getKey() + "\r\n" +
+					"Start: " + modell.getStart() + "\r\n" +
+					"End: " + modell.getEnd() + "\r\n" +
+					(ev.getOldValue() != null ?
+						"OldValue-DateRange: " + ev.getOldValue().getDateRange().getKey() + "\r\n" +
+						"OldValue-Start: " + ev.getOldValue().getStart() + "\r\n" +
+						"OldValue-End: " + ev.getOldValue().getEnd()
+						: "OldValue: null")
+					+ "\r\n"
+					+ "IsFromClient: " + ev.isFromClient()
+				);
+		});
+	}
+}
diff --git a/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerStyledDemo.java b/vaadin-date-range-picker-demo/src/main/java/software/xdev/vaadin/daterange_picker/example/DateRangePickerStyledDemo.java
diff --git a/vaadin-date-range-picker/pom.xml b/vaadin-date-range-picker/pom.xml
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRanges.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRanges.java
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePicker.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePicker.java
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerOverlay.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerOverlay.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Auto detect text files and perform LF normalization`
	`2`	`+* text=auto`