Skip to content

[DataGrid] Use ColumnOptonsLabels.Icon in more places #3865

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
Jun 3, 2025
Merged

[DataGrid] Use ColumnOptonsLabels.Icon in more places #3865

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4358f4
Use ColumnOptonsLabels.Icon so devs can choose which icon to use. Def…
vnbaaij Jun 3, 2025
066009a
Merge branch 'dev' into users/vnbaaij/datagrid-columnoptions
vnbaaij Jun 3, 2025
f584ab0
Merge branch 'dev' into users/vnbaaij/datagrid-columnoptions
vnbaaij Jun 3, 2025
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
18 changes: 5 additions & 13 deletions src/Core/Components/DataGrid/Columns/ColumnBase.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@
<FluentIcon Value="@(new CoreIcons.Regular.Size20.ArrowSortDown())" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
}
}
@if (ColumnOptions is not null && Filtered.GetValueOrDefault() && Grid.ResizeType is not null)
@if (ColumnOptions is not null && Filtered.GetValueOrDefault())
{
<FluentIcon Value="@(new CoreIcons.Regular.Size20.Filter())" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
<FluentIcon Value="@(Grid.ColumnOptionsLabels.Icon)" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
}
</FluentButton>
</FluentKeyCode>
Expand All @@ -168,7 +168,7 @@
@if (ColumnOptions is not null && Filtered.GetValueOrDefault() && Grid.ResizeType.HasValue)
{
<span style="padding: 0 5px;">
<FluentIcon Value="@(new CoreIcons.Regular.Size20.Filter())" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
<FluentIcon Value="@(Grid.ColumnOptionsLabels.Icon)" Slot="end" Style="opacity: var(--fluent-data-grid-header-opacity);" />
</span>
}
</div>
Expand Down Expand Up @@ -215,15 +215,7 @@
{
return
@<FluentButton Appearance="Appearance.Stealth" class="col-options-button" @onclick="@(() => Grid.ShowColumnOptionsAsync(this))" aria-label="Filter this column">
@if (Filtered.GetValueOrDefault())
{
<FluentIcon Value="@(new CoreIcons.Regular.Size20.FilterDismiss())" />
}
else
{
<FluentIcon Value="@(new CoreIcons.Regular.Size20.Filter())" />
}

</FluentButton>;
<FluentIcon Value="@(Grid.ColumnOptionsLabels.Icon)" />
</FluentButton>;
}
}
Loading