Skip to content

Commit d722ae9

Browse files
Updated MudBlazor to v8
1 parent 1a60cb8 commit d722ae9

File tree

11 files changed

+53
-29
lines changed

11 files changed

+53
-29
lines changed

samples/DotNetElements.CrudExample/Components/Components/TagDialog.razor

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
@using DotNetElements.Web.Blazor
44
@using DotNetElements.CrudExample.Modules.TagModule
55

6-
@code {
6+
@{
7+
DialogContent =
8+
@<EditForm EditContext="@EditContext">
9+
<DneDataAnnotationsValidator />
10+
<MudTextField @bind-Value="Model.Label" Label="Label" />
11+
</EditForm>;
12+
}
13+
14+
@{
15+
base.BuildRenderTree(__builder);
16+
}
717

18+
@code
19+
{
820
}

samples/DotNetElements.CrudExample/Components/Pages/Crud.razor

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,17 +195,28 @@ else
195195
{
196196
EditTagModel editTagModel = new EditTagModel();
197197

198-
var dialogParameters = new DialogParameters<TagInputDialog>
198+
var dialogParameters = new DialogParameters<TagDialog>
199199
{
200-
{ x => x.Tag, editTagModel }
200+
{ x => x.IsEditMode, false },
201+
{ x => x.Model, editTagModel },
202+
{ x => x.EditContext, new EditContext(editTagModel) },
203+
{ x => x.ApiEndpoint, "" }
201204
};
202205

203206
DialogOptions dialogOptions = new DialogOptions() { MaxWidth = MaxWidth.Small, FullWidth = true };
204207

205-
IDialogReference dialog = await dialogService.ShowAsync<TagInputDialog>("New tag", dialogParameters, dialogOptions);
206-
DialogResult result = await dialog.Result;
208+
var dialog = await dialogService.ShowAsync<TagDialog>("New tag", dialogParameters, dialogOptions);
207209

208-
if (result.Canceled)
210+
// var dialogParameters = new DialogParameters<TagInputDialog>
211+
// {
212+
// { x => x.Tag, editTagModel }
213+
// };
214+
215+
// IDialogReference dialog = await dialogService.ShowAsync<TagInputDialog>("New tag", dialogParameters, dialogOptions);
216+
217+
DialogResult? result = await dialog.Result;
218+
219+
if (result?.Canceled is not false)
209220
return;
210221

211222
CrudResult<Tag> createdTag = await tagRepository.CreateAsync(editTagModel.MapToEntity());
@@ -233,9 +244,9 @@ else
233244
DialogOptions dialogOptions = new DialogOptions() { MaxWidth = MaxWidth.Small, FullWidth = true };
234245

235246
IDialogReference dialog = await dialogService.ShowAsync<TagInputDialog>($"Edit tag {tag.Label}", dialogParameters, dialogOptions);
236-
DialogResult result = await dialog.Result;
247+
DialogResult? result = await dialog.Result;
237248

238-
if (result.Canceled)
249+
if (result?.Canceled is not false)
239250
return;
240251

241252
CrudResult<Tag> updatedTag = await tagRepository.UpdateAsync<EditTagModel>(editTagModel.Id, editTagModel);
4 KB
Binary file not shown.
0 Bytes
Binary file not shown.
-141 KB
Binary file not shown.

src/DotNetElements.Core/DotNetElements.Core.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
14+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.2" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
2323
</ItemGroup>
2424

2525
</Project>

src/DotNetElements.Web.Blazor/ChipSelect.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
// todo update logic 2 (check which of the two update logics are better)
100100
// [Parameter]
101-
// public EventCallback<List<T>> SelectedItemsChanged { get; set; }
101+
// public EventCallback<List<T>> SelectedItemsChanged { get; set; } // todo throws error if not used
102102
103103
[Parameter]
104104
public string? Label { get; set; }

src/DotNetElements.Web.Blazor/CrudTableOptions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public CrudTableOptions(string baseEndpointUri) : base(baseEndpointUri)
1414

1515
public CrudTableOptions(string baseEndpointUri, MaxWidth editDialogMaxWidth) : this(baseEndpointUri)
1616
{
17-
EditDialogOptions = new()
18-
{
19-
MaxWidth = editDialogMaxWidth
20-
};
17+
EditDialogOptions = new(); // todo
18+
//{
19+
// MaxWidth = editDialogMaxWidth
20+
//};
2121
}
2222
}

src/DotNetElements.Web.Blazor/DneImageBrowser.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<MudPaper Outlined="true" Elevation="0" style="overflow-y: auto; grid-area: image-list">
2424
@if (Images is not null)
2525
{
26-
<MudList T="TImage" SelectedValueChanged="OnSelectedImageChanged" Clickable="true">
26+
<MudList T="TImage" SelectedValueChanged="OnSelectedImageChanged">
2727
@foreach (TImage image in Images)
2828
{
2929
<MudListItem Value="image">
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<MudThemeProvider @ref="@mudThemeProvider" @bind-IsDarkMode="@DarkModeActive" />
2-
<MudPopoverProvider />
32
<MudDialogProvider />
43
<MudSnackbarProvider />
4+
<MudPopoverProvider />
55

66
@code
77
{
@@ -15,11 +15,12 @@
1515

1616
protected override async Task OnAfterRenderAsync(bool firstRender)
1717
{
18-
if (firstRender)
19-
{
20-
DarkModeActive = await mudThemeProvider.GetSystemPreference();
21-
if (DarkModeActiveChanged.HasDelegate)
22-
await DarkModeActiveChanged.InvokeAsync(DarkModeActive);
23-
}
18+
if (!firstRender)
19+
return;
20+
21+
DarkModeActive = await mudThemeProvider.GetSystemPreference();
22+
23+
if (DarkModeActiveChanged.HasDelegate)
24+
await DarkModeActiveChanged.InvokeAsync(DarkModeActive);
2425
}
2526
}

0 commit comments

Comments
 (0)