From 56b4717e3c69f7f3527ff622f6f1422ccb2924d8 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Sat, 15 Aug 2026 11:00:18 +0800
Subject: [PATCH 1/2] Upgrade Blazorise packages to version 2.3.0

- Remove Flatpickr workaround replaced by the native picker
---
 Directory.Packages.props                                  | 8 ++++----
 .../Volo.Abp.BlazoriseUI/wwwroot/volo.abp.blazoriseui.css | 7 -------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 44dfd0aa8b..41aaa2bb7a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -19,10 +19,10 @@
     <PackageVersion Include="Azure.Identity" Version="1.14.2" />
     <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.25.0" />
-    <PackageVersion Include="Blazorise" Version="2.2.1" />
-    <PackageVersion Include="Blazorise.Components" Version="2.2.1" />
-    <PackageVersion Include="Blazorise.DataGrid" Version="2.2.1" />
-    <PackageVersion Include="Blazorise.Snackbar" Version="2.2.1" />
+    <PackageVersion Include="Blazorise" Version="2.3.0" />
+    <PackageVersion Include="Blazorise.Components" Version="2.3.0" />
+    <PackageVersion Include="Blazorise.DataGrid" Version="2.3.0" />
+    <PackageVersion Include="Blazorise.Snackbar" Version="2.3.0" />
     <PackageVersion Include="MudBlazor" Version="9.7.0" />
     <PackageVersion Include="Castle.Core" Version="5.2.1" />
     <PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
diff --git a/framework/src/Volo.Abp.BlazoriseUI/wwwroot/volo.abp.blazoriseui.css b/framework/src/Volo.Abp.BlazoriseUI/wwwroot/volo.abp.blazoriseui.css
index 8299895e1e..25cd8f870c 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/wwwroot/volo.abp.blazoriseui.css
+++ b/framework/src/Volo.Abp.BlazoriseUI/wwwroot/volo.abp.blazoriseui.css
@@ -62,10 +62,3 @@
 .table-responsive .dropdown-menu-position-strategy-fixed {
     position: fixed !important;
 }
-
-/* 
-    blazorise picker workaround for https://github.com/Megabit/Blazorise/issues/4917
-*/
-.card .flatpickr-calendar.static {
-    top: unset !important;
-}

From ccec28e12ec2707aca5e073c6bb72884ba1ef2fb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 15 Aug 2026 03:01:06 +0000
Subject: [PATCH 2/2] docs: update package version changes [skip ci]

---
 docs/en/package-version-changes.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/en/package-version-changes.md b/docs/en/package-version-changes.md
index e6d2bd217e..ea45f54dfa 100644
--- a/docs/en/package-version-changes.md
+++ b/docs/en/package-version-changes.md
@@ -7,6 +7,15 @@
 
 # Package Version Changes
 
+## 10.7.0-rc.2
+
+| Package | Old Version | New Version | PR |
+|---------|-------------|-------------|-----|
+| Blazorise | 2.2.1 | 2.3.0 | #25992 |
+| Blazorise.Components | 2.2.1 | 2.3.0 | #25992 |
+| Blazorise.DataGrid | 2.2.1 | 2.3.0 | #25992 |
+| Blazorise.Snackbar | 2.2.1 | 2.3.0 | #25992 |
+
 ## 10.7.0-rc.1
 
 | Package | Old Version | New Version | PR |