Skip to content

[Tabs] Only render Label if Header is null #2989

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 1 commit into from
Nov 29, 2024
Merged

[Tabs] Only render Label if Header is null #2989

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
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2028,7 +2028,7 @@
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentDataGrid`1.SaveStateInUrl">
<summary>
Gets or sets a value indicating whether the grid should save its paging state in the URL.
<para>This is an **experimental** feature, which might cause unwanted jumping in the page when you change something in the grid.</para>
<para>This is an experimental feature, which might cause unwanted jumping in the page when you change something in the grid.</para>
</summary>
</member>
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentDataGrid`1.SaveStatePrefix">
Expand Down
32 changes: 31 additions & 1 deletion examples/Demo/Shared/Pages/Lab/IssueTester.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,31 @@

<div style="width: 175px;">
<FluentTabs ActiveTabId="tab-1">
<FluentTab Id="tab-1" Label="All">
<Header>
<FluentIcon Value="@(new Icons.Regular.Size16.LeafOne())" />
All
</Header>
<Content>
Content 0
</Content>
</FluentTab>
<FluentTab Id="tab-2" Label="January">
<Header>
<FluentIcon Value="@(new Icons.Regular.Size16.LeafTwo())" Color="@Color.Success" />
January
</Header>
<Content>
Content 1
</Content>
</FluentTab>
<FluentTab Id="tab-3" Label="February">
<Header>
<FluentIcon Value="@(new Icons.Regular.Size16.LeafThree())" Color="@Color.Error" />
<span style="color:forestgreen;">February</span>
</Header>
<Content>
Content 2
</Content>
</FluentTab>
</FluentTabs>
</div>
17 changes: 10 additions & 7 deletions src/Core/Components/Tabs/FluentTab.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,18 @@
{
<FluentIcon Value="@Icon" Width="20px" Class="fluent-tab-icon" />
}
@if (LabelEditable)
@if (Header is null)
{
<span contenteditable="true" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" Title="Click to edit this tab name" style="padding: 3px 5px;">
@if (LabelEditable)
{
<span contenteditable="true" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" Title="Click to edit this tab name" style="padding: 3px 5px;">
@Label
</span>
}
else
{
@Label
</span>
}
else
{
@Label
}
}

@Header
Expand Down
Loading