Skip to content

[FluenWizard] Fix Done button when last step is disabled #2503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dvoituron merged 1 commit into from
Aug 9, 2024
Merged

[FluenWizard] Fix Done button when last step is disabled #2503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Core/Components/Wizard/FluentWizard.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{
string buttonWidth = "80px;";

@if (Value > 0)
@if (DisplayPreviousButton)
{
<FluentButton Appearance="Appearance.Neutral"
Style="@($"width: {buttonWidth};")"
Expand All @@ -43,7 +43,7 @@

<span style="margin-right: 10px" />

@if (Value < _steps.Count - 1)
@if (DisplayNextButton)
{
<FluentButton Appearance="Appearance.Accent"
Style="@($"width: {buttonWidth};")"
Expand Down
6 changes: 5 additions & 1 deletion src/Core/Components/Wizard/FluentWizard.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ protected virtual async Task OnPreviousHandlerAsync(MouseEventArgs e)
/// <summary />
protected virtual async Task<FluentWizardStepChangeEventArgs> OnStepChangeHandlerAsync(int targetIndex, bool validateEditContexts)
{
var stepChangeArgs = new FluentWizardStepChangeEventArgs(targetIndex, _steps[targetIndex].Label);
var stepChangeArgs = new FluentWizardStepChangeEventArgs(targetIndex, _steps[targetIndex].Label);

if (validateEditContexts)
{
Expand Down Expand Up @@ -341,4 +341,8 @@ private void SetCurrentStatusToStep(int stepIndex)

return null;
}

private bool DisplayPreviousButton => Value > 0 && _steps[..Value].Any(i => !i.Disabled);

private bool DisplayNextButton => Value < _steps.Count - 1 && _steps[(Value + 1)..].Any(i => !i.Disabled);
}
28 changes: 28 additions & 0 deletions tests/Core/Wizard/FluentWizardTests.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,34 @@
Assert.Equal(indexFirstItem, currentIndex);
}

[Theory]
[InlineData(true, true, true, 2)]
[InlineData(true, true, false, 1)]
[InlineData(true, false, false, 0)]
[InlineData(false, false, false, 0)]
public void FluentWizard_LastDisableSteps(bool firstEnabled, bool secondEnabled, bool thirdEnabled, int nbClicks)
{
// Arrange
var cut = Render(@<FluentWizard>
<Steps>
<FluentWizardStep Disabled="@(!firstEnabled)" />
<FluentWizardStep Disabled="@(!secondEnabled)" />
<FluentWizardStep Disabled="@(!thirdEnabled)" />
</Steps>
</FluentWizard>
);

// Act: Click
for (int i = 0; i < nbClicks; i++)
{
var buttonNext = cut.Find("fluent-button[appearance='accent']");
buttonNext.Click();
}

// Assert
Assert.Contains("Done", cut.Markup);
}

private record TestRecord
{
[Range(1, 10)]
Expand Down