Merge pull request #392 from xdev-software/develop

Release

Author: AB-xdev

.config/pmd/ruleset.xml

@@ -151,5 +151,12 @@
 		<exclude name="UseStringBufferForStringAppends"/>
 	</rule>
 
+	<rule ref="category/java/performance.xml/TooFewBranchesForSwitch">
+		<properties>
+			<!-- If you have one case only please use a if -->
+			<property name="minimumNumberCaseForASwitch" value="2"/>
+		</properties>
+	</rule>
+
 	<rule ref="category/java/security.xml"/>
 </ruleset>

.github/workflows/broken-links.yml

@@ -11,14 +11,17 @@ permissions:
 jobs:
   link-checker:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
 
       - run: mv .github/.lycheeignore .lycheeignore
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@v1
+        uses: lycheeverse/lychee-action@v2
+        with:
+          fail: false # Don't fail on broken links, create an issue instead
 
       - name: Find already existing issue
         id: find-issue

.github/workflows/check-build.yml

@@ -26,6 +26,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     strategy:
       matrix:
@@ -73,6 +74,7 @@ jobs:
   checkstyle:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+    timeout-minutes: 15
 
     strategy:
       matrix:
@@ -95,6 +97,7 @@ jobs:
   pmd:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
+    timeout-minutes: 15
 
     strategy:
       matrix:

.github/workflows/release.yml

@@ -14,6 +14,7 @@ permissions:
 jobs:
   check-code:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v4
 
@@ -48,6 +49,7 @@ jobs:
   prepare-release:
     runs-on: ubuntu-latest
     needs: [check-code]
+    timeout-minutes: 10
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
@@ -112,6 +114,7 @@ jobs:
   publish-maven:
     runs-on: ubuntu-latest
     needs: [prepare-release]
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
 
@@ -143,6 +146,7 @@ jobs:
   publish-pages:
     runs-on: ubuntu-latest
     needs: [prepare-release]
+    timeout-minutes: 15
     steps:
     - uses: actions/checkout@v4
 
@@ -172,6 +176,7 @@ jobs:
   after-release:
     runs-on: ubuntu-latest
     needs: [publish-maven]
+    timeout-minutes: 10
     steps:
     - uses: actions/checkout@v4
 

.github/workflows/sonar.yml

@@ -11,7 +11,7 @@ on:
       - '.idea/**'
       - 'assets/**'
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches: [ develop ]
     paths-ignore: 
       - '**.md'
       - '.config/**'
@@ -27,6 +27,7 @@ jobs:
   token-check:
     runs-on: ubuntu-latest
     if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
+    timeout-minutes: 5
     outputs:
       hasToken: ${{ steps.check-token.outputs.has }}
     steps:
@@ -40,6 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: token-check
     if: ${{ needs.token-check.outputs.hasToken }}
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/sync-labels.yml

@@ -14,6 +14,7 @@ permissions:
 jobs:
   labels:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/test-deploy.yml

@@ -9,6 +9,7 @@ env:
 jobs:
   publish-maven:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v4
 

.github/workflows/update-from-template.yml

@@ -31,6 +31,7 @@ permissions:
 jobs:
   update:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     outputs:
       update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }}
       create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }}
@@ -180,6 +181,7 @@ jobs:
     needs: [update]
     if: needs.update.outputs.create_update_branch_merged_pr == 1
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
         with:

.idea/checkstyle-idea.xml

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,12 @@
+## 4.2.0
+* Improved styling
+  * Overlay now has the same minimum width as the underlying DateRangePicker
+    * The default is ``20em``, this can be changed using ``--date-range-picker-min-width``
+  * Layouts inside the overlay now use the full available width
+  * Removed excess top padding from input components
+  * Refactored CSS class names (should cause less conflicts now)
+* Updated to Vaadin 24.5
+
 ## 4.1.1
 * Only use client-side locale for formatting when no ``formatLocale`` has been set #353
 
@@ -13,7 +22,6 @@
 * Various dependency updates including Vaadin 24.1
 
 ## 4.0.0
-
 ⚠️<i>This release contains breaking changes</i>
 
 * Adds support for Vaadin 24+, drops support for Vaadin 23<br/>
@@ -32,12 +40,10 @@
   * Vaadin 23.3
 
 ## 3.0.1
-
 * Updated dependencies
   * Vaadin 23.2
 
 ## 3.0.0
-
 ⚠️<i>This release contains breaking changes</i>
 
 * Adds support for Vaadin 23+, drops support for Vaadin 14 #155<br/>

CHANGELOG.md

@@ -19,7 +19,7 @@ A Vaadin Flow DateRangePicker implementation
 | --- | --- |
 | Vaadin 24+ (latest) | ``4+`` |
 | Vaadin 23 | ``3.x`` |
-| Vaadin 14 (LTS - former release model) | ``2.x`` |
+| Vaadin 14 | ``2.x`` |
 
 ## Run the Demo
 * Checkout the repo

README.md

@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-date-range-picker-root</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -40,12 +40,12 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.4.0</version>
+						<version>3.6.0</version>
 						<dependencies>
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.17.0</version>
+								<version>10.20.1</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -70,7 +70,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.24.0</version>
+						<version>3.26.0</version>
 						<configuration>
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.4.0</version>
+								<version>7.7.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.4.0</version>
+								<version>7.7.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
@@ -99,7 +99,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-jxr-plugin</artifactId>
-						<version>3.4.0</version>
+						<version>3.6.0</version>
 					</plugin>
 				</plugins>
 			</reporting>

pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>vaadin-date-range-picker-root</artifactId>
-		<version>4.1.2-SNAPSHOT</version>
+		<version>4.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>vaadin-date-range-picker-demo</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<organization>
@@ -29,9 +29,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.4.7</vaadin.version>
+		<vaadin.version>24.5.3</vaadin.version>
 
-		<org.springframework.boot.version>3.3.2</org.springframework.boot.version>
+		<org.springframework.boot.version>3.3.5</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>
@@ -61,6 +61,12 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin</groupId>
+					<artifactId>hilla-dev</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>software.xdev</groupId>
@@ -72,6 +78,12 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>com.vaadin</groupId>
+					<artifactId>hilla</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
 		<dependency>

vaadin-date-range-picker-demo/pom.xml

@@ -3,8 +3,10 @@
 import com.vaadin.flow.component.HasSize;
 import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.splitlayout.SplitLayout;
 import com.vaadin.flow.dom.ThemeList;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.theme.lumo.Lumo;
@@ -15,15 +17,20 @@ public class DateRangePickerStyledDemo extends AbstractSimpleChangeDemo
 {
 	public static final String NAV = "styled";
 
-	private final Button btnDarkMode = new Button("Toogle theme");
+	private final Button btnDarkMode = new Button("Toggle theme");
 
 	public DateRangePickerStyledDemo()
 	{
 		this.initUI();
 	}
 
+	@SuppressWarnings("checkstyle:MagicNumber")
 	protected void initUI()
 	{
+		this.dateRangePicker.setWidthFull();
+		
+		this.taResult.setSizeFull();
+		
 		this.btnDarkMode.addClickListener(ev ->
 		{
 			final ThemeList themeList = UI.getCurrent().getElement().getThemeList();
@@ -40,11 +47,13 @@ protected void initUI()
 			this.updateBtnDarkMode();
 		});
 
-		this.taResult.setSizeFull();
+		final SplitLayout splitLayout = new SplitLayout(this.dateRangePicker, new Div());
+		splitLayout.setSplitterPosition(25);
+		splitLayout.setWidthFull();
 
 		this.getContent().setPadding(false);
 		this.getContent().add(
-			new VerticalLayout(this.dateRangePicker),
+			splitLayout,
 			new VerticalLayout(this.taResult, this.btnDarkMode));
 		this.getContent().getChildren().forEach(comp -> ((HasSize)comp).setHeight("50%"));
 		this.getContent().setHeightFull();