Skip to content

Commit 48e536b

Browse files
authored
upgrade to mudblazor v9.0.0-rc.1 (#597)
1 parent c6fe46b commit 48e536b

File tree

15 files changed

+40
-241
lines changed

15 files changed

+40
-241
lines changed

docs/CodeBeam.MudBlazor.Extensions.Docs.Wasm/wwwroot/CodeBeam.MudBlazor.Extensions.xml

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/CodeBeam.MudBlazor.Extensions.Docs/CodeBeam.MudBlazor.Extensions.Docs.csproj

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

1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.*" />
17-
<PackageReference Include="MudBlazor" Version="9.0.0-preview.2" />
17+
<PackageReference Include="MudBlazor" Version="9.0.0-rc.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

docs/CodeBeam.MudBlazor.Extensions.Docs/Pages/Components/ListExtended/Examples/ListExtendedExample3.razor

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<MudCheckBox @bind-Value="_selectAll" Color="Color.Primary" Label="Select All" />
3131
<MudDivider />
3232
<MudTextField @bind-Value="_selectedValue" Clearable="true" />
33-
<MudSelect T="int?" @bind-SelectedValues="_selectedValues" MultiSelection="true" Variant="Variant.Filled" Label="Selected Values">
33+
<MudSelect T="int?" @bind-SelectedValues="_mSelectedValues" MultiSelection="true" Variant="Variant.Filled" Label="Selected Values">
3434
@foreach (var item in _list?.GetItems() ?? new())
3535
{
3636
<MudSelectItem Value="item.Value">@item.Text</MudSelectItem>
@@ -57,8 +57,16 @@
5757
MudListExtended<int?>? _list;
5858
int? _selectedValue = 1;
5959
IEnumerable<int?> _selectedValues = new List<int?>();
60+
IReadOnlyCollection<int?> _mSelectedValues;
6061
MudListItemExtended<int?>? _selectedItem;
6162
MudListItemExtended<int?> _thirdItem = new();
6263
MudListItemExtended<int?> _fifthItem = new();
6364
IEnumerable<MudListItemExtended<int?>> _selectedItems = new List<MudListItemExtended<int?>>();
65+
66+
protected override void OnInitialized()
67+
{
68+
base.OnInitialized();
69+
_mSelectedValues = _selectedValues as IReadOnlyCollection<int?> ?? _selectedValues.ToList();
70+
}
71+
6472
}

src/CodeBeam.MudBlazor.Extensions/CodeBeam.MudBlazor.Extensions.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="MudBlazor" Version="9.0.0-preview.2" />
44+
<PackageReference Include="MudBlazor" Version="9.0.0-rc.1" />
4545
</ItemGroup>
4646

47-
<Target Name="MinifyMudExtensionsJs" AfterTargets="Build" Condition="'$(CI)' != 'true'
48-
AND '$(TargetFramework)' == 'net10.0'
49-
AND Exists('TScripts/MudExtensions.js')">
47+
<Target Name="MinifyMudExtensionsJs" AfterTargets="Build" Condition="'$(CI)' != 'true'&#xD;&#xA; AND '$(TargetFramework)' == 'net10.0'&#xD;&#xA; AND Exists('TScripts/MudExtensions.js')">
5048
<Message Importance="high" Text="Minifying MudExtensions.js → MudExtensions.min.js" />
5149
<Exec WorkingDirectory="$(SolutionDir)" Command="dotnet run --project utilities\CodeBeam.MudBlazor.Extensions.JsMinifier\CodeBeam.MudBlazor.Extensions.JsMinifier.csproj --configuration $(Configuration)" />
5250
</Target>

src/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor.cs

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ protected override void OnInitialized()
749749
else if (MultiSelection && SelectedValues != null)
750750
{
751751
// TODO: Check this line again
752-
SetValueAsync(SelectedValues.FirstOrDefault()).CatchAndLog();
752+
SetValueCoreAsync(SelectedValues.FirstOrDefault()).CatchAndLog();
753753
}
754754

755755
}
@@ -1285,22 +1285,6 @@ protected void DeselectAllItems()
12851285
}
12861286
}
12871287

1288-
/// <summary>
1289-
///
1290-
/// </summary>
1291-
/// <returns></returns>
1292-
public override async Task ForceUpdate()
1293-
{
1294-
await base.ForceUpdate();
1295-
if (!MultiSelection)
1296-
{
1297-
SelectedValues = new HashSet<T?>(_comparer) { Value };
1298-
}
1299-
else
1300-
{
1301-
await SelectedValuesChanged.InvokeAsync(new HashSet<T?>(SelectedValues, _comparer));
1302-
}
1303-
}
13041288

13051289
/// <summary>
13061290
///

src/CodeBeam.MudBlazor.Extensions/Components/DateWheelPicker/MudDateWheelPicker.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ protected string NumberToString(int val)
573573
/// <returns></returns>
574574
public async Task Clear()
575575
{
576-
await SetValueAsync(null);
576+
await SetValueCoreAsync(null);
577577
await InputReference.SetText(null);
578578
}
579579

src/CodeBeam.MudBlazor.Extensions/Components/PasswordField/MudPasswordField.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public async Task SetText(string text)
160160

161161
private async Task OnMaskedValueChanged(string s)
162162
{
163-
await SetTextAsync(s);
163+
await SetTextCoreAsync(s);
164164
}
165165

166166
/// <summary>

src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
@if (ItemCollection != null || ChildContent != null)
138138
{
139139
<CascadingValue Value="@this" IsFixed="true">
140-
<MudListExtended @ref="@_list" T="T" @bind-SelectedValue:set="@SetValueAsync" @bind-SelectedValue:get="@ReadValue" Style="@($"overflow-y:auto; max-height: {MaxHeight}px")" @bind-SelectedValues="@SelectedValues" @bind-SelectedItem="@SelectedListItem" @bind-SelectedItems="@SelectedListItems"
140+
<MudListExtended @ref="@_list" T="T" @bind-SelectedValue:set="@SetValueCoreAsync" @bind-SelectedValue:get="@ReadValue" Style="@($"overflow-y:auto; max-height: {MaxHeight}px")" @bind-SelectedValues="@SelectedValues" @bind-SelectedItem="@SelectedListItem" @bind-SelectedItems="@SelectedListItems"
141141
Clickable="true" Color="@Color" Dense="@Dense" ItemCollection="@ItemCollection" Virtualize="@Virtualize" Padding="@EnablePopoverPadding" EnableSelectedItemStyle="@EnableSelectedItemStyle"
142142
MultiSelection="@MultiSelection" MultiSelectionComponent="@MultiSelectionComponent" MultiSelectionAlign="@MultiSelectionAlign" SelectAll="@SelectAll" SelectAllPosition="@SelectAllPosition" SelectAllText="@SelectAllText"
143143
CheckedIcon="@CheckedIcon" UncheckedIcon="@UncheckedIcon" IndeterminateIcon="@IndeterminateIcon" SelectValueOnTab="@SelectValueOnTab" Comparer="@Comparer" AddNullItem="@AddNullItem" AddedNullItemText="@AddedNullItemText"
@@ -162,7 +162,7 @@
162162

163163
<div style="display: none">
164164
<CascadingValue Value="@this" IsFixed="true">
165-
<MudListExtended T="T" @bind-SelectedValue:set="@SetValueAsync" @bind-SelectedValue:get="@ReadValue" @bind-SelectedValues="@SelectedValues" @bind-SelectedItem="@SelectedListItem" @bind-SelectedItems="@SelectedListItems"
165+
<MudListExtended T="T" @bind-SelectedValue:set="@SetValueCoreAsync" @bind-SelectedValue:get="@ReadValue" @bind-SelectedValues="@SelectedValues" @bind-SelectedItem="@SelectedListItem" @bind-SelectedItems="@SelectedListItems"
166166
Clickable="true" Color="@Color" Dense="@Dense" ItemCollection="@ItemCollection" Padding="@EnablePopoverPadding" EnableSelectedItemStyle="@EnableSelectedItemStyle"
167167
MultiSelection="@MultiSelection" MultiSelectionComponent="@MultiSelectionComponent" MultiSelectionAlign="@MultiSelectionAlign" SelectAll="@SelectAll" SelectAllPosition="@SelectAllPosition" SelectAllText="@SelectAllText"
168168
CheckedIcon="@CheckedIcon" UncheckedIcon="@UncheckedIcon" IndeterminateIcon="@IndeterminateIcon" SelectValueOnTab="@SelectValueOnTab" Comparer="@Comparer" AddNullItem="@AddNullItem" AddedNullItemText="@AddedNullItemText"

src/CodeBeam.MudBlazor.Extensions/Components/SelectExtended/MudSelectExtended.razor.cs

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ protected async Task SetCustomizedTextAsync(string? text, bool updateValue = tru
660660
Func<List<T?>, string?>? multiSelectionTextFunc = null)
661661
{
662662
// The Text property of the control is updated
663-
await SetTextAsync(multiSelectionTextFunc?.Invoke(selectedConvertedValues));
663+
await SetTextCoreAsync(multiSelectionTextFunc?.Invoke(selectedConvertedValues));
664664

665665
// The comparison is made on the multiSelectionText variable
666666
if (multiSelectionText != text)
@@ -1106,7 +1106,7 @@ public async Task SelectOption(object? obj)
11061106
return;
11071107
}
11081108

1109-
await SetValueAsync(value);
1109+
await SetValueCoreAsync(value);
11101110
//await UpdateTextPropertyAsync(false);
11111111
_elementReference.SetText(ReadText).CatchAndLog();
11121112
//_selectedValues.Clear();
@@ -1117,23 +1117,6 @@ public async Task SelectOption(object? obj)
11171117
await InvokeAsync(StateHasChanged);
11181118
}
11191119

1120-
//TODO: will override this method when core library will have the base one.
1121-
/// <summary>
1122-
///
1123-
/// </summary>
1124-
/// <returns></returns>
1125-
public override async Task ForceUpdate()
1126-
{
1127-
await base.ForceUpdate();
1128-
if (!MultiSelection)
1129-
{
1130-
SelectedValues = new HashSet<T?>(_comparer) { ReadValue };
1131-
}
1132-
else
1133-
{
1134-
await SelectedValuesChanged.InvokeAsync(new HashSet<T?>(SelectedValues, _comparer));
1135-
}
1136-
}
11371120

11381121
/// <summary>
11391122
///

src/CodeBeam.MudBlazor.Extensions/Components/Wheel/MudWheel.razor.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ protected async Task HandleOnWheel(WheelEventArgs args)
165165
if (args.DeltaY < 0 && index != 0)
166166
{
167167
T? val = ItemCollection[index - 1];
168-
await SetValueAsync(val);
168+
await SetValueCoreAsync(val);
169169
}
170170
else if (0 < args.DeltaY && index != ItemCollection.Count - 1)
171171
{
172172
T? val = ItemCollection[index + 1];
173-
await SetValueAsync(val);
173+
await SetValueCoreAsync(val);
174174
}
175175
await Task.Delay(300);
176176
}
@@ -218,7 +218,7 @@ protected async Task HandleOnSwipe(SwipeEventArgs args)
218218
}
219219
T? val = ItemCollection[index - 1];
220220
index--;
221-
await SetValueAsync(val);
221+
await SetValueCoreAsync(val);
222222
StateHasChanged();
223223
}
224224
else if (args.SwipeDirection == SwipeDirection.BottomToTop)
@@ -229,7 +229,7 @@ protected async Task HandleOnSwipe(SwipeEventArgs args)
229229
}
230230
T? val = ItemCollection[index + 1];
231231
index++;
232-
await SetValueAsync(val);
232+
await SetValueCoreAsync(val);
233233
StateHasChanged();
234234
}
235235
}
@@ -258,7 +258,7 @@ public async Task ChangeWheel(int changeCount)
258258
await _animate.Refresh();
259259

260260
T? val = ItemCollection is not null ? ItemCollection[index + changeCount] : default;
261-
await SetValueAsync(val);
261+
await SetValueCoreAsync(val);
262262
}
263263

264264
/// <summary>

0 commit comments

Comments
 (0)