From c672b5bef3f3e7f6e19b4aa5b660eb0035103f3e Mon Sep 17 00:00:00 2001
From: Dong Bin <popmessiah@hotmail.com>
Date: Thu, 20 Feb 2025 22:16:25 +0800
Subject: [PATCH] fix: fix page initialization issue.

---
 demo/Ursa.Demo/Pages/PaginationDemo.axaml  | 1 +
 src/Ursa/Controls/Pagination/Pagination.cs | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/demo/Ursa.Demo/Pages/PaginationDemo.axaml b/demo/Ursa.Demo/Pages/PaginationDemo.axaml
index 22d4ebc..f078b21 100644
--- a/demo/Ursa.Demo/Pages/PaginationDemo.axaml
+++ b/demo/Ursa.Demo/Pages/PaginationDemo.axaml
@@ -23,6 +23,7 @@
         <u:Pagination
             Name="page"
             PageSizeOptions="10, 20, 50, 100"
+            CurrentPage="5"
             ShowQuickJump="{Binding #quickJumperSelector.IsChecked}"
             ShowPageSizeSelector="{Binding #pageSizeSelector.IsChecked}"
 			Command="{Binding LoadPageCommand}"
diff --git a/src/Ursa/Controls/Pagination/Pagination.cs b/src/Ursa/Controls/Pagination/Pagination.cs
index 3d8abf7..32a7e0e 100644
--- a/src/Ursa/Controls/Pagination/Pagination.cs
+++ b/src/Ursa/Controls/Pagination/Pagination.cs
@@ -166,6 +166,7 @@ public class Pagination : TemplatedControl
     private static int? CoerceCurrentPage(AvaloniaObject arg1, int? arg2)
     {
         if (arg2 is null) return null;
+        // Only coerce the value if the pagination is initialized. Otherwise the value will be coerced to default because PageCount is not yet determined.
         if (arg1 is Pagination { IsInitialized: true } p)
         {
             arg2 = MathHelpers.SafeClamp(arg2.Value, 1, p.PageCount);
@@ -221,6 +222,7 @@ public class Pagination : TemplatedControl
         LostFocusEvent.AddHandler(OnQuickJumpInputLostFocus, _quickJumpInput);
 
         InitializePanelButtons();
+        CurrentPage = MathHelpers.SafeClamp(CurrentPage ?? 1, 1, PageCount);
         UpdateButtonsByCurrentPage(CurrentPage);
     }