Skip to content

Commit fdfd46b

Browse files
committed
2 parents 666e35d + b66bf44 commit fdfd46b

File tree

15 files changed

+1523
-31
lines changed

15 files changed

+1523
-31
lines changed

CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListExtended.razor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ protected void SelectAllItems(bool? deselect = false)
11211121
{
11221122
if (item.IsSelected)
11231123
{
1124-
item.SetSelected(false);
1124+
item.SetSelected(false, returnIfDisabled: true);
11251125
}
11261126
}
11271127
_allSelected = false;
@@ -1132,7 +1132,7 @@ protected void SelectAllItems(bool? deselect = false)
11321132
{
11331133
if (!item.IsSelected)
11341134
{
1135-
item.SetSelected(true);
1135+
item.SetSelected(true, returnIfDisabled: true);
11361136
}
11371137
}
11381138
_allSelected = true;
@@ -1395,7 +1395,7 @@ protected ICollection<T> GetSearchedItems()
13951395
return ItemCollection.Where(x => SearchFunc.Invoke(x, _searchString)).ToList();
13961396
}
13971397

1398-
return ItemCollection.Where(x => Converter.Set(x).Contains(_searchString, StringComparison.CurrentCultureIgnoreCase)).ToList();
1398+
return ItemCollection.Where(x => Converter.Set(x).Contains(_searchString, StringComparison.InvariantCultureIgnoreCase)).ToList();
13991399
}
14001400

14011401
public async Task ForceUpdate()

CodeBeam.MudBlazor.Extensions/Components/ListExtended/MudListItemExtended.razor.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,12 @@ internal bool IsActive
326326
get => _active;
327327
}
328328

329-
public void SetSelected(bool selected, bool forceRender = true)
329+
public void SetSelected(bool selected, bool forceRender = true, bool returnIfDisabled = false)
330330
{
331-
if (Disabled)
331+
if (returnIfDisabled == true && Disabled)
332+
{
332333
return;
334+
}
333335
if (_selected == selected)
334336
return;
335337
_selected = selected;

CodeBeam.MudBlazor.Extensions/Components/Scrollbar/MudScrollbar.razor

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@
5959
[Category(CategoryTypes.Item.Appearance)]
6060
public string Color { get; set; }
6161

62+
/// <summary>
63+
/// Scrollbar's color when container hovered. Supports hex values, color names and MudTheme color keywords (ex. "primary", "secondary"). Doesn't support by firefox (see FirefoxStyle).
64+
/// </summary>
65+
[Parameter]
66+
[Category(CategoryTypes.Item.Appearance)]
67+
public string ContainerHoverColor { get; set; }
68+
6269
/// <summary>
6370
/// Hover color for scrollbar thumb on hover. Supports hex values, color names and MudTheme color keywords (ex. "primary", "secondary"). Doesn't support by firefox (see FirefoxStyle).
6471
/// </summary>
@@ -132,6 +139,18 @@
132139
@(ThumbStyle)
133140
}
134141
142+
@(Selector):hover::-webkit-scrollbar-thumb {
143+
@if (IsThemeColor(ContainerHoverColor))
144+
{
145+
<MudRender>background-color: var(--mud-palette-@(ContainerHoverColor)) !important;</MudRender>
146+
}
147+
else
148+
{
149+
<MudRender>background-color: @(ContainerHoverColor) !important;</MudRender>
150+
}
151+
border-radius: @(BorderRadius)px !important;
152+
}
153+
135154
@(Selector)::-webkit-scrollbar-thumb:hover {
136155
@if (IsThemeColor(HoverColor))
137156
{

CodeBeam.MudBlazor.Extensions/Services/ExtensionServiceCollectionExtensions.cs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.Extensions.DependencyInjection;
55
using Microsoft.Extensions.DependencyInjection.Extensions;
66
using MudBlazor.Services;
7+
using MudExtensions.Utilities;
78

89
namespace MudExtensions.Services
910
{
@@ -20,6 +21,16 @@ public static IServiceCollection AddScrollManagerExtended(this IServiceCollectio
2021
return services;
2122
}
2223

24+
/// <summary>
25+
/// Adds ScrollManagerExtended as a transient instance.
26+
/// </summary>
27+
/// <param name="services">IServiceCollection</param>
28+
public static IServiceCollection AddMudCssManager(this IServiceCollection services)
29+
{
30+
services.TryAddTransient<MudCssManager>();
31+
return services;
32+
}
33+
2334
/// <summary>
2435
/// Adds common services required by MudBlazor components
2536
/// </summary>
@@ -30,7 +41,8 @@ public static IServiceCollection AddMudExtensions(this IServiceCollection servic
3041
{
3142
configuration ??= new MudServicesConfiguration();
3243
return services
33-
.AddScrollManagerExtended();
44+
.AddScrollManagerExtended()
45+
.AddMudCssManager();
3446
}
3547

3648
/// <summary>
@@ -46,7 +58,8 @@ public static IServiceCollection AddMudExtensions(this IServiceCollection servic
4658
var options = new MudServicesConfiguration();
4759
configuration(options);
4860
return services
49-
.AddScrollManagerExtended();
61+
.AddScrollManagerExtended()
62+
.AddMudCssManager();
5063
}
5164
}
5265
}

0 commit comments

Comments
 (0)