From 3e222a6af66b249037386c21406d7259085febc9 Mon Sep 17 00:00:00 2001
From: Lee-Lily-Lea <78075553+Lee-Lily-Lea@users.noreply.github.com>
Date: Thu, 1 Aug 2024 09:16:29 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=86=95=20feat(MPagination):=20Added?=
 =?UTF-8?q?=20MiniVariant=20MiniVariantChange=20and=20MobileBreakpoint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Pagination/MPagination.razor   | 33 ++++---
 .../Pagination/MPagination.razor.cs           | 86 +++++++++++++++++--
 2 files changed, 103 insertions(+), 16 deletions(-)

diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor b/src/Masa.Blazor/Components/Pagination/MPagination.razor
index 6b6928d1fe..c44ff83b18 100644
--- a/src/Masa.Blazor/Components/Pagination/MPagination.razor
+++ b/src/Masa.Blazor/Components/Pagination/MPagination.razor
@@ -8,18 +8,29 @@
         <ul class="@_modifierBuilder.Add(Circle).Add(Disabled).AddTheme(IsDark, IndependentTheme)">
             @GenPaginationIcon(PaginationIconType.First)
 
-            @foreach (var item in GetItems())
+            @if (prevMiniVariant)
             {
-                <li>
-                    @if (item.IsT0)
-                    {
-                        <span class="@_block.Element("more")">@item</span>
-                    }
-                    else
-                    {
-                        @GenPaginationItem(item)
-                    }
-                </li>
+                <div class="m-pagination__mini">
+                    <span class="m-pagination__current">@Value</span>
+                    <span class="m-pagination__separator">/</span>
+                    <span class="m-pagination__total">@Length</span>
+                </div>
+            }
+            else
+            {
+                @foreach (var item in GetItems())
+                {
+                    <li>
+                        @if (item.IsT0)
+                        {
+                            <span class="@_block.Element("more")">@item</span>
+                        }
+                        else
+                        {
+                            @GenPaginationItem(item)
+                        }
+                    </li>
+                }
             }
 
             @GenPaginationIcon(PaginationIconType.Second)
diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
index ac9b3ed206..82725f4842 100644
--- a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
+++ b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
@@ -47,6 +47,25 @@ public partial class MPagination : MasaComponentBase
 
     [CascadingParameter(Name = "IsDark")] public bool CascadingIsDark { get; set; }
 
+    [Parameter, MasaApiParameter(false, "v1.7.0")]
+    public bool MiniVariant
+    {
+        get => GetValue<bool>(false);
+        set => SetValue(value);
+    }
+
+    [Parameter, MasaApiParameter(ReleasedOn = "v1.7.0")]
+    public EventCallback<bool> MiniVariantChanged { get; set; }
+
+    [Parameter, MasaApiParameter(600, "v1.7.0")]
+    public OneOf<Breakpoints, double> MobileBreakpoint
+    {
+        get => GetValue<OneOf<Breakpoints, double>>(600);
+        set => SetValue(value);
+    }
+
+    private bool prevMiniVariant;
+
     public bool IsDark
     {
         get
@@ -79,17 +98,25 @@ public bool IsDark
     private bool IndependentTheme =>
         (IsDirtyParameter(nameof(Dark)) && Dark) || (IsDirtyParameter(nameof(Light)) && Light);
 
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+
 #if NET8_0_OR_GREATER
-        protected override void OnParametersSet()
+        if (MasaBlazor.IsSsr && !IndependentTheme)
         {
-            base.OnParametersSet();
+            CascadingIsDark = MasaBlazor.Theme.Dark;
+        }
+#endif
 
-            if (MasaBlazor.IsSsr && !IndependentTheme)
+        if (IsDirtyParameter(nameof(MiniVariant)))
+        {
+            if (MiniVariant != prevMiniVariant)
             {
-                CascadingIsDark = MasaBlazor.Theme.Dark;
+                prevMiniVariant = MiniVariant;
             }
         }
-#endif
+    }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
@@ -280,4 +307,53 @@ protected override async ValueTask DisposeAsyncCore()
     {
         await IntersectJSModule.UnobserveAsync(Ref);
     }
+
+    protected override void OnInitialized()
+    {
+        MasaBlazor.WindowSizeChanged -= MasaBlazor_WindowSizeChanged;
+        MasaBlazor.WindowSizeChanged += MasaBlazor_WindowSizeChanged;
+    }
+    
+    private async void MasaBlazor_WindowSizeChanged(object? sender, BreakpointChangedEventArgs e)
+    {
+        if (IsDirtyParameter(nameof(MiniVariant)))
+        {
+            return;
+        }
+
+        var isM = CalMobileBreakpoint();
+        if (isM != prevMiniVariant)
+        {
+            prevMiniVariant = isM;
+            if (MiniVariantChanged.HasDelegate)
+            {
+                await MiniVariantChanged.InvokeAsync(prevMiniVariant);
+            }
+            StateHasChanged();
+        }
+    }
+    
+    private bool CalMobileBreakpoint() => CalMobileBreakpoint(MasaBlazor, MobileBreakpoint);
+    
+    private static bool CalMobileBreakpoint(MasaBlazor masaBlazor, OneOf<Breakpoints, double> mbpParam)
+    {
+        var (width, mobile, name, mobileBreakpoint) = masaBlazor.Breakpoint;
+
+        if (width == 0)
+        {
+            return false;
+        }
+
+        if (mobileBreakpoint.Equals(mbpParam))
+        {
+            return mobile;
+        }
+
+        if (mbpParam.IsT1)
+        {
+            return width <= mbpParam.AsT1;
+        }
+
+        return name <= mbpParam.AsT0;
+    }
 }
\ No newline at end of file

From 8e006f5552f951d718fcc5a545e423c307370ea9 Mon Sep 17 00:00:00 2001
From: Lee-Lily-Lea <78075553+Lee-Lily-Lea@users.noreply.github.com>
Date: Thu, 1 Aug 2024 13:15:08 +0800
Subject: [PATCH 2/6] MPagination commit v2

---
 .../Components/Pagination/MPagination.razor   |  2 +-
 .../Pagination/MPagination.razor.cs           | 76 ++++++++++++-------
 2 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor b/src/Masa.Blazor/Components/Pagination/MPagination.razor
index c44ff83b18..e35102cdc3 100644
--- a/src/Masa.Blazor/Components/Pagination/MPagination.razor
+++ b/src/Masa.Blazor/Components/Pagination/MPagination.razor
@@ -8,7 +8,7 @@
         <ul class="@_modifierBuilder.Add(Circle).Add(Disabled).AddTheme(IsDark, IndependentTheme)">
             @GenPaginationIcon(PaginationIconType.First)
 
-            @if (prevMiniVariant)
+            @if (_internalMiniVariant )
             {
                 <div class="m-pagination__mini">
                     <span class="m-pagination__current">@Value</span>
diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
index 82725f4842..ea372f7e81 100644
--- a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
+++ b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
@@ -64,7 +64,7 @@ public OneOf<Breakpoints, double> MobileBreakpoint
         set => SetValue(value);
     }
 
-    private bool prevMiniVariant;
+    private bool _internalMiniVariant;
 
     public bool IsDark
     {
@@ -109,11 +109,11 @@ protected override void OnParametersSet()
         }
 #endif
 
-        if (IsDirtyParameter(nameof(MiniVariant)))
+        if (IsAuto is false)
         {
-            if (MiniVariant != prevMiniVariant)
+            if (MiniVariant != _internalMiniVariant)
             {
-                prevMiniVariant = MiniVariant;
+                _internalMiniVariant = MiniVariant;
             }
         }
     }
@@ -306,54 +306,76 @@ public virtual async Task HandleItemClickAsync(StringNumber item)
     protected override async ValueTask DisposeAsyncCore()
     {
         await IntersectJSModule.UnobserveAsync(Ref);
+        MasaBlazor.WindowSizeChanged -= MasaBlazor_WindowSizeChanged;
     }
 
     protected override void OnInitialized()
     {
-        MasaBlazor.WindowSizeChanged -= MasaBlazor_WindowSizeChanged;
-        MasaBlazor.WindowSizeChanged += MasaBlazor_WindowSizeChanged;
-    }
-    
-    private async void MasaBlazor_WindowSizeChanged(object? sender, BreakpointChangedEventArgs e)
-    {
-        if (IsDirtyParameter(nameof(MiniVariant)))
+        base.OnInitialized();
+        if (IsAuto)
         {
-            return;
+            MasaBlazor.WindowSizeChanged -= MasaBlazor_WindowSizeChanged;
+            MasaBlazor.WindowSizeChanged += MasaBlazor_WindowSizeChanged;
         }
+    }
 
-        var isM = CalMobileBreakpoint();
-        if (isM != prevMiniVariant)
+    private async void MasaBlazor_WindowSizeChanged(object? sender, BreakpointChangedEventArgs e)
+    {
+        if (IsAuto is true)
         {
-            prevMiniVariant = isM;
-            if (MiniVariantChanged.HasDelegate)
+            var isMiniVaraint = IsMiniVariant();
+            if (isMiniVaraint != _internalMiniVariant)
             {
-                await MiniVariantChanged.InvokeAsync(prevMiniVariant);
+                _internalMiniVariant = isMiniVaraint;
+                if (MiniVariantChanged.HasDelegate)
+                {
+                    await MiniVariantChanged.InvokeAsync(_internalMiniVariant);
+                }
+                StateHasChanged();
             }
-            StateHasChanged();
         }
+
+        
     }
-    
-    private bool CalMobileBreakpoint() => CalMobileBreakpoint(MasaBlazor, MobileBreakpoint);
-    
-    private static bool CalMobileBreakpoint(MasaBlazor masaBlazor, OneOf<Breakpoints, double> mbpParam)
+
+    private bool IsMiniVariant()
     {
-        var (width, mobile, name, mobileBreakpoint) = masaBlazor.Breakpoint;
+        var (width, mobile, name, mobileBreakpoint) = MasaBlazor.Breakpoint;
 
         if (width == 0)
         {
             return false;
         }
 
-        if (mobileBreakpoint.Equals(mbpParam))
+        if (mobileBreakpoint.Equals(MobileBreakpoint))
         {
             return mobile;
         }
 
-        if (mbpParam.IsT1)
+        if (MobileBreakpoint.IsT1)
         {
-            return width <= mbpParam.AsT1;
+            return width <= MobileBreakpoint.AsT1;
+        }
+
+        return name <= MobileBreakpoint.AsT0;
+    }
+    private bool? isAuto;
+    private bool IsAuto => isAuto ?? InitializeIsAuto();
+    private bool InitializeIsAuto()
+    {
+        if (isAuto is null)
+        {
+            var minichangedHasDelegate = MiniVariantChanged.HasDelegate;
+            var miniHasDelegate = IsDirtyParameter(nameof(MiniVariant));
+            isAuto = (minichangedHasDelegate, miniHasDelegate) switch
+            {
+                (true, true) => true,
+                (false, true) => false,
+                (true, false) => true,
+                (false, false) => true,
+            };
         }
 
-        return name <= mbpParam.AsT0;
+        return isAuto!.Value;
     }
 }
\ No newline at end of file

From 7787c738a7f09a5174a8fe53e5a20780e80034a5 Mon Sep 17 00:00:00 2001
From: Lee <78075553+Lee-Lily-Lea@users.noreply.github.com>
Date: Thu, 1 Aug 2024 15:31:48 +0800
Subject: [PATCH 3/6] Update
 src/Masa.Blazor/Components/Pagination/MPagination.razor.cs

Co-authored-by: capdiem <capdiem@live.com>
---
 .../Components/Pagination/MPagination.razor.cs           | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
index ea372f7e81..914f7d82dc 100644
--- a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
+++ b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
@@ -326,12 +326,11 @@ private async void MasaBlazor_WindowSizeChanged(object? sender, BreakpointChange
             var isMiniVaraint = IsMiniVariant();
             if (isMiniVaraint != _internalMiniVariant)
             {
-                _internalMiniVariant = isMiniVaraint;
-                if (MiniVariantChanged.HasDelegate)
-                {
+                InvokeAsync(() => {
+                    _internalMiniVariant = isMiniVaraint;
                     await MiniVariantChanged.InvokeAsync(_internalMiniVariant);
-                }
-                StateHasChanged();
+                    StateHasChanged();
+                })
             }
         }
 

From d43b32588ee4dc9d73c25e25eddc2c0e592ebd37 Mon Sep 17 00:00:00 2001
From: Lee <78075553+Lee-Lily-Lea@users.noreply.github.com>
Date: Thu, 1 Aug 2024 15:32:02 +0800
Subject: [PATCH 4/6] Update
 src/Masa.Blazor/Components/Pagination/MPagination.razor

Co-authored-by: capdiem <capdiem@live.com>
---
 src/Masa.Blazor/Components/Pagination/MPagination.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor b/src/Masa.Blazor/Components/Pagination/MPagination.razor
index e35102cdc3..7a815560d1 100644
--- a/src/Masa.Blazor/Components/Pagination/MPagination.razor
+++ b/src/Masa.Blazor/Components/Pagination/MPagination.razor
@@ -8,7 +8,7 @@
         <ul class="@_modifierBuilder.Add(Circle).Add(Disabled).AddTheme(IsDark, IndependentTheme)">
             @GenPaginationIcon(PaginationIconType.First)
 
-            @if (_internalMiniVariant )
+            @if (_internalMiniVariant)
             {
                 <div class="m-pagination__mini">
                     <span class="m-pagination__current">@Value</span>

From f893da2c1156b21ac46139bc61b0870c0610b26c Mon Sep 17 00:00:00 2001
From: Lee <78075553+Lee-Lily-Lea@users.noreply.github.com>
Date: Thu, 1 Aug 2024 15:32:10 +0800
Subject: [PATCH 5/6] Update
 src/Masa.Blazor/Components/Pagination/MPagination.razor.cs

Co-authored-by: capdiem <capdiem@live.com>
---
 src/Masa.Blazor/Components/Pagination/MPagination.razor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
index 914f7d82dc..8c681457f2 100644
--- a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
+++ b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
@@ -364,9 +364,9 @@ private bool InitializeIsAuto()
     {
         if (isAuto is null)
         {
-            var minichangedHasDelegate = MiniVariantChanged.HasDelegate;
-            var miniHasDelegate = IsDirtyParameter(nameof(MiniVariant));
-            isAuto = (minichangedHasDelegate, miniHasDelegate) switch
+            var hasDelegate = MiniVariantChanged.HasDelegate;
+            var isDirty = IsDirtyParameter(nameof(MiniVariant));
+            isAuto = (hasDelegate, isDirty) switch
             {
                 (true, true) => true,
                 (false, true) => false,

From d4bb443fe98ac45bd7a378bf4701fb559e7f0ed0 Mon Sep 17 00:00:00 2001
From: capdiem <capdiem@live.com>
Date: Thu, 1 Aug 2024 15:47:06 +0800
Subject: [PATCH 6/6] Update MPagination.razor.cs

---
 src/Masa.Blazor/Components/Pagination/MPagination.razor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
index 8c681457f2..4e406c6fc8 100644
--- a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
+++ b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
@@ -328,9 +328,9 @@ private async void MasaBlazor_WindowSizeChanged(object? sender, BreakpointChange
             {
                 InvokeAsync(() => {
                     _internalMiniVariant = isMiniVaraint;
-                    await MiniVariantChanged.InvokeAsync(_internalMiniVariant);
+                    _ = MiniVariantChanged.InvokeAsync(_internalMiniVariant);
                     StateHasChanged();
-                })
+                });
             }
         }
 
@@ -377,4 +377,4 @@ private bool InitializeIsAuto()
 
         return isAuto!.Value;
     }
-}
\ No newline at end of file
+}