Skip to content

Prevent showing empty icon in BitToggleButton (#5214) #5215

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
msynk merged 1 commit into from
Sep 2, 2023
Merged

Prevent showing empty icon in BitToggleButton (#5214) #5215

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
6 changes: 5 additions & 1 deletion src/BlazorUI/Bit.BlazorUI/Components/Buttons/BitToggleButton/BitToggleButton.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
}
else
{
<i style="@Styles?.Icon" class="bit-icon bit-icon--@GetIconName() @Classes?.Icon" />
var iconName = GetIconName();
if (iconName.HasValue())
{
<i style="@Styles?.Icon" class="bit-icon bit-icon--@iconName @Classes?.Icon" />
}
<span style="@Styles?.Text" class="bit-tgb-txt @Classes?.Text">@GetText()</span>
}
</span>
Expand Down
8 changes: 4 additions & 4 deletions src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
<ExamplePreview>
<div class="example-box">
<div style="display:flex; align-items:flex-end">
<BitToggle Value="OneWayValue" Label="One-way" OnText="Off" OffText="On" />
<BitToggleButton @bind-IsChecked="OneWayValue" Text="@(OneWayValue ? "Off" : "On")" />
<BitToggle Value="OneWayValue" Label="One-way" OnText="On" OffText="Off" />
<BitToggleButton @bind-IsChecked="OneWayValue" OnText="On" OffText="Off" />
</div>
<br />
<div style="display:flex; align-items:flex-end">
<BitToggle @bind-Value="TwoWayValue" Label="Two-way" OnText="Off" OffText="On" />
<BitToggleButton @bind-IsChecked="TwoWayValue" Text="@(TwoWayValue ? "Off" : "On")" />
<BitToggle @bind-Value="TwoWayValue" Label="Two-way" OnText="On" OffText="Off" />
<BitToggleButton @bind-IsChecked="TwoWayValue" OnText="On" OffText="Off" />
</div>
</div>
</ExamplePreview>
Expand Down
8 changes: 4 additions & 4 deletions src/BlazorUI/Demo/Client/Core/Pages/Components/Inputs/Toggle/BitToggleDemo.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ public partial class BitToggleDemo
private bool LabelTemplateValue;";

private readonly string example4HtmlCode = @"
<BitToggle Value=""OneWayValue"" Label=""One-way"" OnText=""Off"" OffText=""On"" />
<BitToggleButton @bind-IsChecked=""OneWayValue"" Text=""@(OneWayValue ? ""Off"" : ""On"")"" />
<BitToggle Value=""OneWayValue"" Label=""One-way"" OnText=""On"" OffText=""Off"" />
<BitToggleButton @bind-IsChecked=""OneWayValue"" OnText=""On"" OffText=""Off"" />

<BitToggle @bind-Value=""TwoWayValue"" Label=""Two-way"" OnText=""Off"" OffText=""On"" />
<BitToggleButton @bind-IsChecked=""TwoWayValue"" Text=""@(TwoWayValue ? ""Off"" : ""On"")"" />";
<BitToggle @bind-Value=""TwoWayValue"" Label=""Two-way"" OnText=""On"" OffText=""Off"" />
<BitToggleButton @bind-IsChecked=""TwoWayValue"" OnText=""On"" OffText=""Off"" />";
private readonly string example4CsharpCode = @"
private bool OneWayValue;
private bool TwoWayValue;";
Expand Down
4 changes: 2 additions & 2 deletions src/BlazorUI/Demo/Client/Core/Pages/Home/PopularComponents.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
IconName="@BitIconName.CodeEdit"
ButtonStyle="BitButtonStyle.Standard"
Style="border:none"
Text="@(showCode ? "Hide code" : "Show code")"
Title="@(showCode ? "Hide code" : "Show code")" />
OnText="Hide code" OffText="Show code"
OnTitle="Hide code" offTitle="Show code" />
</div>
</div>
@if (showCode)
Expand Down