Stepper: Fix icon action button display bug (#171) (#173)

Author: TeaBreakTom

CodeBeam.MudBlazor.Extensions/Components/Stepper/MudStepper.razor

@@ -71,22 +71,15 @@
 
                 @if (!DisablePreviousButton && ActiveIndex != 0)
                 {
-                    if (ActiveIndex < Steps.Count && Steps[ActiveIndex].Status != StepStatus.Continued || showResultStep)
+                    if (IconActionButtons || MobileView)
                     {
-                        <MudIconButton Color="@Color" Variant="@Variant" Icon="@Icons.Material.Filled.ChevronLeft" OnClick="@(() => SetActiveIndex(-1))" />
+                        <MudTooltip Text="@LocalizedStrings.Previous" Delay="300">
+                            <MudIconButton Color="@Color" Variant="@Variant" Icon="@Icons.Material.Filled.ChevronLeft" OnClick="@(() => SetActiveIndex(-1))" />
+                        </MudTooltip>
                     }
                     else
                     {
-                        if (IconActionButtons || MobileView)
-                        {
-                            <MudTooltip Text="@LocalizedStrings.Previous" Delay="300">
-                                <MudIconButton Color="@Color" Variant="@Variant" Icon="@Icons.Material.Filled.ChevronLeft" OnClick="@(() => SetActiveIndex(-1))" />
-                            </MudTooltip>
-                        }
-                        else
-                        {
-                            <MudButton Color="@Color" Variant="@Variant" OnClick="@(() => SetActiveIndex(-1))">@LocalizedStrings.Previous</MudButton>
-                        }
+                        <MudButton Color="@Color" Variant="@Variant" OnClick="@(() => SetActiveIndex(-1))">@LocalizedStrings.Previous</MudButton>
                     }
                 }
 
@@ -132,7 +125,16 @@
                 {
                     if (ActiveIndex < Steps.Count && Steps[ActiveIndex].Status != StepStatus.Continued)
                     {
-                        <MudIconButton Color="@Color" Variant="@Variant" Icon="@Icons.Material.Filled.ChevronRight" OnClick="@(() => SetActiveIndex(1))" />
+                        if (IconActionButtons || MobileView)
+                        {
+                            <MudTooltip Text="@GetNextButtonString()" Delay="300">
+                                <MudIconButton Color="@Color" Variant="@Variant" Icon="@Icons.Material.Filled.ChevronRight" OnClick="@(() => SetActiveIndex(1))"/>
+                            </MudTooltip>
+                        }
+                        else
+                        {
+                            <MudButton Color="@Color" Variant="@Variant" OnClick="@(() => SetActiveIndex(1))">@GetNextButtonString()</MudButton>
+                        }
                     }
                     else
                     {

CodeBeam.MudBlazor.Extensions/Components/Stepper/MudStepper.razor.cs

@@ -381,19 +381,12 @@ protected bool IsStepActive(MudStep step)
 
         protected int CompletedStepCount()
         {
-            return Steps.Where(x => x.Status != Enums.StepStatus.Continued).Count();
+            return Steps.Count(x => x.Status != StepStatus.Continued);
         }
 
         protected string GetNextButtonString()
         {
-            if (Steps.Count - 1 == CompletedStepCount())
-            {
-                return LocalizedStrings.Finish;
-            }
-            else
-            {
-                return LocalizedStrings.Next;
-            }
+            return ActiveIndex >= Steps.Count - 1 ? LocalizedStrings.Finish : LocalizedStrings.Next;
         }
 
         protected internal bool ShowResultStep()