Skip to content

Switch changes #1426

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
vnbaaij merged 3 commits into from
Feb 2, 2024
Merged

Switch changes #1426

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
063c513
Switch changes
vnbaaij Feb 2, 2024
895a2a0
Fix spacing
vnbaaij Feb 2, 2024
3d56ddc
Merge branch 'dev' into users/vnbaaij/forms
vnbaaij Feb 2, 2024
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: 4 additions & 0 deletions examples/Demo/Shared/Pages/BasicFormFluentUIComponents.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
<FluentDatePicker Name="production_date" Id="proddate" @bind-Value="starship.ProductionDate" Label="Production Date" Required />
<FluentValidationMessage For="@(() => starship.ProductionDate)" />
</div>
<div>
<FluentSwitch Name="teleporter" @bind-value="starship.HasTeleporter" Label="Teleporter" CheckedMessage="Fully operational" UncheckedMessage="Under maintenance"/>
<FluentValidationMessage For="@(() => starship.HasTeleporter)" />
</div>
<FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent">Submit</FluentButton>
</FluentStack>
</EditForm>
Expand Down
2 changes: 2 additions & 0 deletions examples/Demo/Shared/SampleData/Starship.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ public class Starship

[Required]
public DateTime? ProductionDate { get; set; }

public bool HasTeleporter { get; set; }
}
6 changes: 3 additions & 3 deletions src/Core/Components/Switch/FluentSwitch.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@namespace Microsoft.FluentUI.AspNetCore.Components
@namespace Microsoft.FluentUI.AspNetCore.Components
@inherits FluentInputBase<bool>
<fluent-switch @ref=Element
class="@ClassValue"
style="@StyleValue"
readonly=@ReadOnly
id=@Id
value=@Value
current-value=@CurrentValue


disabled=@Disabled
name=@Name
aria-label="@(string.IsNullOrEmpty(AriaLabel) ? Label : AriaLabel)"
Expand Down