Skip to content

Update Mud Core v8 #491

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
merged 1 commit into from
Jan 19, 2025
Merged

Update Mud Core v8 #491

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 CodeBeam.MudBlazor.Extensions.Docs.Server/CodeBeam.MudBlazor.Extensions.Docs.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MudExtensions.Docs.Server</RootNamespace>
Expand Down
6 changes: 3 additions & 3 deletions CodeBeam.MudBlazor.Extensions.Docs.Wasm/CodeBeam.MudBlazor.Extensions.Docs.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MudExtensions.Docs.Wasm</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.*" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.*" PrivateAssets="all" />
</ItemGroup>

<!--<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions CodeBeam.MudBlazor.Extensions.Docs/CodeBeam.MudBlazor.Extensions.Docs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MudExtensions.Docs</RootNamespace>
Expand All @@ -13,8 +13,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.*" />
<PackageReference Include="MudBlazor" Version="8.0.0-preview.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.*" />
<PackageReference Include="MudBlazor" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions ...dBlazor.Extensions.UnitTests.Viewer/CodeBeam.MudBlazor.Extensions.UnitTests.Viewer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MudExtensions.UnitTests.Viewer</RootNamespace>
Expand All @@ -12,9 +12,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.*" PrivateAssets="all" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.*" PrivateAssets="all" />
<PackageReference Include="System.Net.Http.Json" Version="9.0.*" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion CodeBeam.MudBlazor.Extensions.UnitTests/CodeBeam.MudBlazor.Extensions.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>MudExtensions.UnitTests</RootNamespace>
Expand Down
7 changes: 6 additions & 1 deletion CodeBeam.MudBlazor.Extensions/CodeBeam.MudBlazor.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,19 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>

<!--Added for workaround https://github.com/dotnet/aspnetcore/issues/57147#issuecomment-2572752277-->
<PropertyGroup>
<PrepareForBuildDependsOn>BundleMinify;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
</PropertyGroup>

<ItemGroup>
<SupportedPlatform Include="browser" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="MudBlazor" Version="8.0.0-preview.4" />
<PackageReference Include="MudBlazor" Version="8.0.0" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@
/// <remarks>The default is <c>true</c></remarks>
[Parameter]
[Category(CategoryTypes.FormComponent.Behavior)]
public bool RelativeWidth { get; set; } = true;
public DropdownWidth RelativeWidth { get; set; } = DropdownWidth.Relative;

/// <summary>
/// Sets the maxheight of the popover.
Expand Down Expand Up @@ -554,7 +554,7 @@
return;
_comparer = value;
// Apply comparer and refresh selected values
_selectedValues = new HashSet<T?>(_selectedValues, _comparer);

Check warning on line 557 in CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs

View workflow job for this annotation

GitHub Actions / build 

Possible null reference argument for parameter 'collection' in 'HashSet<T?>.HashSet(IEnumerable<T?> collection, IEqualityComparer<T?>? comparer)'.
SelectedValues = _selectedValues;
}
}
Expand All @@ -573,7 +573,7 @@
if (_toStringFunc == value)
return;
_toStringFunc = value;
Converter = new Converter<T?>

Check warning on line 576 in CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs

View workflow job for this annotation

GitHub Actions / build 

Nullability of reference types in value of type 'Converter<T?>' doesn't match target type 'Converter<T, string>'.
{
SetFunc = _toStringFunc ?? (x => x?.ToString()),
};
Expand Down Expand Up @@ -614,7 +614,7 @@

_selectedValues = new HashSet<T?>(set, _comparer);

SelectedValuesChanged.InvokeAsync(new HashSet<T?>(SelectedValues, _comparer)).CatchAndLog();

Check warning on line 617 in CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs

View workflow job for this annotation

GitHub Actions / build 

Possible null reference argument for parameter 'collection' in 'HashSet<T?>.HashSet(IEnumerable<T?> collection, IEqualityComparer<T?>? comparer)'.
ForceUpdateItems().CatchAndLog();
//Console.WriteLine("SelectedValues setter ended");
}
Expand Down Expand Up @@ -797,7 +797,7 @@
{
DeselectAllItems();
if (Value is not null)
Items.FirstOrDefault(x => x.Value?.Equals(Value) == true).Selected = true;

Check warning on line 800 in CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs

View workflow job for this annotation

GitHub Actions / build 

Dereference of a possibly null reference.
}
}
if ((Value == null && _oldValue != null) || (Value != null && Value.Equals(_oldValue) == false))
Expand Down
2 changes: 1 addition & 1 deletion CodeBeam.MudBlazor.Extensions/Components/DateWheelPicker/MudDateWheelPicker.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
AdornmentColor="@AdornmentColor" IconSize="@IconSize" OnBlur="HandleOnBlur"
Clearable="@Clearable" OnClearButtonClick="HandleClearButtonClick"
@attributes="UserAttributes" />
<MudPopover Class="@PopoverClass" Style="@PopoverStyle" Open=@(_isOpen) MaxHeight="@MaxHeight" AnchorOrigin="@AnchorOrigin" TransformOrigin="@TransformOrigin" RelativeWidth="true">
<MudPopover Class="@PopoverClass" Style="@PopoverStyle" Open=@(_isOpen) MaxHeight="@MaxHeight" AnchorOrigin="@AnchorOrigin" TransformOrigin="@TransformOrigin" RelativeWidth="DropdownWidth.Relative">
@if (ShowToolbar || SubmitOnClose == false)
{
<div class="d-flex">
Expand Down
7 changes: 6 additions & 1 deletion CodeBeam.MudBlazor.Extensions/Components/InputExtended/MudInputExtended.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,12 @@

@if (Variant == Variant.Outlined)
{
<div class="mud-input-outlined-border"></div>
<fieldset class="mud-input-outlined-border">
@if (!string.IsNullOrEmpty(Label))
{
<legend>@Label</legend>
}
</fieldset>
}

@if (!HideSpinButtons)
Expand Down
2 changes: 1 addition & 1 deletion CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
/// <summary>
///
/// </summary>
protected Dictionary<T, MudSelectItemExtended<T?>> _valueLookup = new();

Check warning on line 45 in CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs

View workflow job for this annotation

GitHub Actions / build 

The type 'T' cannot be used as type parameter 'TKey' in the generic type or method 'Dictionary<TKey, TValue>'. Nullability of type argument 'T' doesn't match 'notnull' constraint.
/// <summary>
///
/// </summary>
protected Dictionary<T, MudSelectItemExtended<T?>> _shadowLookup = new();

Check warning on line 49 in CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs

View workflow job for this annotation

GitHub Actions / build 

The type 'T' cannot be used as type parameter 'TKey' in the generic type or method 'Dictionary<TKey, TValue>'. Nullability of type argument 'T' doesn't match 'notnull' constraint.
private MudInputExtended<string> _elementReference = new();
internal bool _isOpen;
/// <summary>
Expand Down Expand Up @@ -325,7 +325,7 @@
/// </summary>
[Parameter]
[Category(CategoryTypes.FormComponent.Behavior)]
public bool RelativeWidth { get; set; } = true;
public DropdownWidth RelativeWidth { get; set; } = DropdownWidth.Relative;

/// <summary>
/// Sets the maxheight the Select can have when open.
Expand Down
2 changes: 1 addition & 1 deletion CodeBeam.MudBlazor.Extensions/Components/SpeedDial/MudSpeedDial.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
<MudFab Color="@Color" OnClick="MainButtonClick" StartIcon="@GetIcon()" Size="@Size" />
}
<MudPopover class="@("d-flex align-center justify-center " + @PopoverClass)" @onmouseenter="PopoverMouseEnter" @onmouseleave="PopoverMouseLeave" Open="@Open" Paper="false" AnchorOrigin="_anchorOrigin" TransformOrigin="_transformOrigin" RelativeWidth="true">
<MudPopover class="@("d-flex align-center justify-center " + @PopoverClass)" @onmouseenter="PopoverMouseEnter" @onmouseleave="PopoverMouseLeave" Open="@Open" Paper="false" AnchorOrigin="_anchorOrigin" TransformOrigin="_transformOrigin" RelativeWidth="DropdownWidth.Relative">
<MudStack Class="@StackClassname" Row="_row" @onclick="HandlePopoverClick">
@ChildContent
</MudStack>
Expand Down
Loading