Skip to content

[DataGrid] Add OnCellClick and allow restricting selection to checkboxes #2160

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

Closed
hksalessio wants to merge 11 commits into from
Closed

[DataGrid] Add OnCellClick and allow restricting selection to checkboxes #2160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1cda994
[DataGrid] Add OnCellClick and allow restricting selection to checkboxes
Jun 6, 2024
2aab4f9
Revert renaming GridColumn to ColumnIndex
Jun 6, 2024
03863fa
Merge branch 'dev' into dev
vnbaaij Jun 6, 2024
4283049
[DataGrid] Fix requested changes
Jun 6, 2024
2d0d769
[DataGrid] Added tests for RestrictToCheckbox
Jun 6, 2024
928b0d7
Merge branch 'dev' of https://github.com/hksalessio/fluentui-blazor i…
Jun 6, 2024
05ab854
Merge branch 'dev' into dev
vnbaaij Jun 7, 2024
615ee1d
[DataGrid] Fix requested changes
Jun 7, 2024
260cb10
Merge branch 'dev' into dev
vnbaaij Jun 10, 2024
c3b5ec3
Merge branch 'dev' into dev
dvoituron Jun 12, 2024
cf023fb
Merge branch 'dev' into dev
vnbaaij Jun 14, 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
Prev Previous commit
Next Next commit
Revert renaming GridColumn to ColumnIndex
  • Loading branch information
Alessio Dell Aquila committed Jun 6, 2024
commit 2aab4f9a8a898e72d084d0b51acfd48994307807
12 changes: 6 additions & 6 deletions examples/Demo/Shared/Pages/DataGrid/Examples/DataGridManual.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ο»Ώ<FluentDataGrid id="manualGrid" GenerateHeader=GenerateHeaderOption.None GridTemplateColumns="1fr 1fr" TGridItem="string" role="grid">
<FluentDataGridRow RowType="DataGridRowType.Header" >
<FluentDataGridCell ColumnIndex=1 CellType="DataGridCellType.ColumnHeader">Column 1</FluentDataGridCell>
<FluentDataGridCell ColumnIndex=2 CellType="DataGridCellType.ColumnHeader">Column 2</FluentDataGridCell>
<FluentDataGridCell GridColumn=1 CellType="DataGridCellType.ColumnHeader">Column 1</FluentDataGridCell>
<FluentDataGridCell GridColumn=2 CellType="DataGridCellType.ColumnHeader">Column 2</FluentDataGridCell>
</FluentDataGridRow>
<FluentDataGridRow>
<FluentDataGridCell ColumnIndex=1 >1.1</FluentDataGridCell>
<FluentDataGridCell ColumnIndex=2>1.2</FluentDataGridCell>
<FluentDataGridCell GridColumn=1 >1.1</FluentDataGridCell>
<FluentDataGridCell GridColumn=2>1.2</FluentDataGridCell>
</FluentDataGridRow>
<FluentDataGridRow>
<FluentDataGridCell ColumnIndex=1>2.1</FluentDataGridCell>
<FluentDataGridCell ColumnIndex=2> 2.2</FluentDataGridCell>
<FluentDataGridCell GridColumn=1>2.1</FluentDataGridCell>
<FluentDataGridCell GridColumn=2> 2.2</FluentDataGridCell>
</FluentDataGridRow>
</FluentDataGrid>
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Pages/DataGrid/Examples/DataGridMultiSelect.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@* Sample using SelectedItems *@
<div>Using SelectedItems</div>

<FluentDataGrid Items="@People" ShowHover="true" TGridItem="Person" OnRowClick="@(row => Console.WriteLine($"Row {row.RowIndex} clicked"))" OnCellClick="@(cell => Console.WriteLine($"Cell {cell.ColumnIndex} clicked"))">
<FluentDataGrid Items="@People" ShowHover="true" TGridItem="Person" OnRowClick="@(row => Console.WriteLine($"Row {row.RowIndex} clicked"))" OnCellClick="@(cell => Console.WriteLine($"Cell {cell.GridColumn} clicked"))">
<SelectColumn TGridItem="Person"
SelectMode="@Mode"
RestrictToCheckbox="@RestrictToCheckbox"
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Pages/DataGrid/Examples/DataGridTemplateColumns2.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@

private void HandleCellFocus(FluentDataGridCell<SampleGridData> cell)
{
DemoLogger.WriteLine($"Cell focused: {cell.ColumnIndex}");
DemoLogger.WriteLine($"Cell focused: {cell.GridColumn}");
}
}
6 changes: 3 additions & 3 deletions src/Core/Components/DataGrid/FluentDataGrid.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

string? tooltip = col.Tooltip ? @col.RawCellContent(item) : null;

<FluentDataGridCell Column="@col" ColumnIndex=@(colIndex+1) Class="@ColumnClass(col)" Style="@col.Style" @key="@col" TGridItem="TGridItem" Item="@item" title="@tooltip" aria-label="@tooltip">
<FluentDataGridCell Column="@col" GridColumn=@(colIndex+1) Class="@ColumnClass(col)" Style="@col.Style" @key="@col" TGridItem="TGridItem" Item="@item" title="@tooltip" aria-label="@tooltip">
@((RenderFragment)(__builder => col.CellContent(__builder, item)))
</FluentDataGridCell>
}
Expand All @@ -114,7 +114,7 @@
{
var col = _columns[colIndex];

<FluentDataGridCell Class="@("grid-cell-placeholder " + @ColumnClass(col))" Style="@col.Style" @key="@col" Column="@col" ColumnIndex=@(colIndex+1) TGridItem="TGridItem">
<FluentDataGridCell Class="@("grid-cell-placeholder " + @ColumnClass(col))" Style="@col.Style" @key="@col" Column="@col" GridColumn=@(colIndex+1) TGridItem="TGridItem">
@((RenderFragment)(__builder => col.RenderPlaceholderContent(__builder, placeholderContext)))
</FluentDataGridCell>
}
Expand All @@ -133,7 +133,7 @@
else
col.ShowSortIcon = false;

<FluentDataGridCell Column="@col" ColumnIndex=@(colIndex+1) CellType=DataGridCellType.ColumnHeader Class="@("column-header " + @ColumnHeaderClass(col) + (ResizableColumns ? " resizable" : ""))" Style="@col.Style" aria-sort="@AriaSortValue(col)" @key="@col" scope="col" TGridItem="TGridItem">
<FluentDataGridCell Column="@col" GridColumn=@(colIndex+1) CellType=DataGridCellType.ColumnHeader Class="@("column-header " + @ColumnHeaderClass(col) + (ResizableColumns ? " resizable" : ""))" Style="@col.Style" aria-sort="@AriaSortValue(col)" @key="@col" scope="col" TGridItem="TGridItem">
@col.HeaderContent
@if (col == _displayOptionsForColumn)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Components/DataGrid/FluentDataGridCell.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@typeparam TGridItem
<fluent-data-grid-cell cell-id="@CellId"
[email protected]()
grid-column=@ColumnIndex
grid-column=@GridColumn
class="@Class"
style="@StyleValue"
@onclick="@(e => HandleOnCellClickAsync(CellId))"
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Components/DataGrid/FluentDataGridCell.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public partial class FluentDataGridCell<TGridItem> : FluentComponentBase
/// This will be applied to the css grid-column-index value applied to the cell.
/// </summary>
[Parameter]
public int ColumnIndex { get; set; }
public int GridColumn { get; set; }

/// <summary>
/// Gets or sets the content to be rendered inside the component.
Expand Down