Skip to content

More checks and changes for fixing #1323 #1325

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
Jan 15, 2024
Merged

More checks and changes for fixing #1323 #1325

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
21 changes: 11 additions & 10 deletions src/Core/Components/DataGrid/FluentDataGrid.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ namespace Microsoft.FluentUI.AspNetCore.Components;
[CascadingTypeParameter(nameof(TGridItem))]
public partial class FluentDataGrid<TGridItem> : FluentComponentBase, IHandleEvent, IAsyncDisposable
{
private const string JAVASCRIPT_FILE = "./_content/Microsoft.FluentUI.AspNetCore.Components/Components/DataGrid/FluentDataGrid.razor.js";

/// <summary>
/// Gets or sets a queryable source of data for the grid.
///
Expand Down Expand Up @@ -134,9 +136,9 @@ public partial class FluentDataGrid<TGridItem> : FluentComponentBase, IHandleEve
[Parameter] public RenderFragment? EmptyContent { get; set; }

[Inject] private IServiceProvider Services { get; set; } = default!;
[Inject] private IJSRuntime JS { get; set; } = default!;
[Inject] private IJSRuntime JSRuntime { get; set; } = default!;

private ElementReference _gridReference;
private ElementReference? _gridReference;
private Virtualize<(int, TGridItem)>? _virtualizeComponent;
private int _ariaBodyRowCount;
private ICollection<TGridItem> _currentNonVirtualizedViewItems = Array.Empty<TGridItem>();
Expand All @@ -158,9 +160,8 @@ public partial class FluentDataGrid<TGridItem> : FluentComponentBase, IHandleEve
private bool _checkColumnOptionsPosition;
private bool _manualGrid;

// The associated ES6 module, which uses document-level event listeners
private IJSObjectReference? _jsModule;
private IJSObjectReference? _jsEventDisposable;
private IJSObjectReference? Module { get; set; }

// Caches of method->delegate conversions
private readonly RenderFragment _renderColumnHeaders;
Expand Down Expand Up @@ -230,16 +231,16 @@ protected override Task OnParametersSetAsync()

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
if (firstRender && _gridReference is not null)
{
_jsModule = await JS.InvokeAsync<IJSObjectReference>("import", "./_content/Microsoft.FluentUI.AspNetCore.Components/Components/DataGrid/FluentDataGrid.razor.js");
_jsEventDisposable = await _jsModule.InvokeAsync<IJSObjectReference>("init", _gridReference);
Module ??= await JSRuntime.InvokeAsync<IJSObjectReference>("import", JAVASCRIPT_FILE);
_jsEventDisposable = await Module.InvokeAsync<IJSObjectReference>("init", _gridReference);
}

if (_checkColumnOptionsPosition && _displayOptionsForColumn is not null)
{
_checkColumnOptionsPosition = false;
_ = _jsModule?.InvokeVoidAsync("checkColumnOptionsPosition", _gridReference).AsTask();
_ = Module?.InvokeVoidAsync("checkColumnOptionsPosition", _gridReference).AsTask();
}
}

Expand Down Expand Up @@ -467,9 +468,9 @@ public async ValueTask DisposeAsync()
await _jsEventDisposable.DisposeAsync();
}

if (_jsModule is not null)
if (Module is not null)
{
await _jsModule.DisposeAsync();
await Module.DisposeAsync();
}
}
catch (JSDisconnectedException)
Expand Down