Skip to content

fix(Dropdown): not show dropdown menu after toggle IsDisabled parameter #4848

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 10 commits into from
Dec 14, 2024
Merged

fix(Dropdown): not show dropdown menu after toggle IsDisabled parameter #4848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
335f0a6
fix: 修复切换禁用状态后无法弹出下拉框问题
ArgoZhang Dec 14, 2024
8824558
chore: bump version 9.1.3
ArgoZhang Dec 14, 2024
f0c8357
feat: 增加 Item 禁用样式
ArgoZhang Dec 14, 2024
c549808
test: 增加单元测试
ArgoZhang Dec 14, 2024
c3ebfc3
Merge branch 'main' into fix-dropdown
ArgoZhang Dec 14, 2024
f49f2fd
refactor: 更改禁用样式
ArgoZhang Dec 14, 2024
a39a354
test: 更新单元测试
ArgoZhang Dec 14, 2024
9fb8c13
refactor: 同步代码
ArgoZhang Dec 14, 2024
4b9bfbb
test: 更新单元测试
ArgoZhang Dec 14, 2024
d9bb475
test: 更新单元测试
ArgoZhang Dec 14, 2024
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 src/BootstrapBlazor/BootstrapBlazor.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>
<Version>9.1.3-beta08</Version>
<Version>9.1.3</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public partial class Dropdown<TValue>
/// <param name="item"></param>
/// <returns></returns>
protected string? DisableItem(SelectedItem item) => CssBuilder.Default("dropdown-item")
.AddClass("is-disabled", item.IsDisabled)
.AddClass("disabled", item.IsDisabled)
.Build();

/// <summary>
Expand Down
21 changes: 7 additions & 14 deletions src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
<span class="@ClearClassString" @onclick="OnClearValue"><i class="@ClearIcon"></i></span>
}
<div class="dropdown-menu">
@if (ShowSearch)
{
<div class="@SearchClassString">
<input type="text" class="search-text form-control" autocomplete="off" value="@SearchText" aria-label="Search">
<i class="@SearchIconString"></i>
</div>
}
@if (IsVirtualize)
{
@if (ShowSearch)
{
<div class="@SearchClassString">
<input type="text" class="search-text form-control" autocomplete="off" value="@SearchText" @oninput="EventCallback.Factory.CreateBinder<string>(this, async v => await SearchTextChanged(v), SearchText)" aria-label="Search">
<i class="@SearchIconString"></i>
</div>
}
<div class="dropdown-virtual">
@if (OnQueryAsync == null)
{
Expand All @@ -53,13 +53,6 @@
}
else
{
@if (ShowSearch)
{
<div class="@SearchClassString">
<input type="text" class="search-text form-control" autocomplete="off" value="@SearchText" @oninput="EventCallback.Factory.CreateBinder<string>(this, async v => await SearchTextChanged(v), SearchText)" aria-label="Search">
<i class="@SearchIconString"></i>
</div>
}
@foreach (var itemGroup in Rows.GroupBy(i => i.GroupName))
{
if (!string.IsNullOrEmpty(itemGroup.Key))
Expand Down
14 changes: 13 additions & 1 deletion src/BootstrapBlazor/Components/SelectGeneric/SelectGeneric.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ private async Task SearchTextChanged(string val)
/// <inheritdoc/>
/// </summary>
/// <returns></returns>
protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, nameof(ConfirmSelectedItem));
protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, new { ConfirmMethodCallback = nameof(ConfirmSelectedItem), SearchMethodCallback = nameof(TriggerOnSearch) });

/// <summary>
/// 客户端回车回调方法
Expand All @@ -408,6 +408,18 @@ public async Task ConfirmSelectedItem(int index)
}
}

/// <summary>
/// 客户端搜索栏回调方法
/// </summary>
/// <param name="searchText"></param>
/// <returns></returns>
[JSInvokable]
public async Task TriggerOnSearch(string searchText)
{
await SearchTextChanged(searchText);
StateHasChanged();
}

/// <summary>
/// 下拉框选项点击时调用此方法
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion test/UnitTest/Components/DropdownTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public void Disabled_Ok()
new("2", "Test2")
});
});
cut.Contains("<div class=\"dropdown-item is-disabled\">Test1</div>");
cut.Contains("<div class=\"dropdown-item disabled\">Test1</div>");
}

[Fact]
Expand Down
19 changes: 5 additions & 14 deletions test/UnitTest/Components/SelectGenericTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ namespace UnitTest.Components;

public class SelectGenericTest : BootstrapBlazorTestBase
{
[Fact]
public void SeletectedItem_Ok()
{
var item = new SelectedItem(null!, "Text");
Assert.Equal(item.Value, string.Empty);
}

[Fact]
public async Task OnSearchTextChanged_Null()
{
Expand All @@ -42,7 +35,7 @@ await ctx.InvokeAsync(async () =>
await ctx.Instance.ConfirmSelectedItem(0);

// 搜索 T
ctx.Find(".search-text").Input("T");
await ctx.Instance.TriggerOnSearch("T");
await ctx.Instance.ConfirmSelectedItem(0);
});

Expand All @@ -68,9 +61,9 @@ await ctx.InvokeAsync(async () =>
});
});

await ctx.InvokeAsync(() =>
await ctx.InvokeAsync(async () =>
{
ctx.Find(".search-text").Input("T");
await ctx.Instance.TriggerOnSearch("T");
});
cut.DoesNotContain("Test2");
}
Expand Down Expand Up @@ -672,8 +665,7 @@ public async Task IsVirtualize_Items_Clearable_Ok()
// 覆盖有搜索条件时，点击清空按钮
// 期望 UI 显示值为默认值
// 期望 下拉框为全数据
var input = cut.Find(".search-text");
await cut.InvokeAsync(() => input.Input("2"));
await cut.InvokeAsync(() => cut.Instance.TriggerOnSearch("2"));

// 下拉框仅显示一个选项 Test2
var items = cut.FindAll(".dropdown-item");
Expand Down Expand Up @@ -730,8 +722,7 @@ public async Task IsVirtualize_OnQueryAsync_Clearable_Ok()
// 覆盖有搜索条件时，点击清空按钮
// 期望 UI 显示值为默认值
// 期望 下拉框为全数据
var input = cut.Find(".search-text");
await cut.InvokeAsync(() => input.Input("2"));
await cut.InvokeAsync(() => cut.Instance.TriggerOnSearch("2"));

// 下拉框仅显示一个选项 Test2
var items = cut.FindAll(".dropdown-item");
Expand Down
10 changes: 5 additions & 5 deletions test/UnitTest/Components/SelectTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ await ctx.InvokeAsync(async () =>
await ctx.Instance.ConfirmSelectedItem(0);

// 搜索 T
ctx.Find(".search-text").Input("T");
await ctx.Instance.TriggerOnSearch("T");
await ctx.Instance.ConfirmSelectedItem(0);
});

Expand All @@ -61,9 +61,9 @@ await ctx.InvokeAsync(async () =>
});
});

await ctx.InvokeAsync(() =>
await ctx.InvokeAsync(async () =>
{
ctx.Find(".search-text").Input("T");
await ctx.Instance.TriggerOnSearch("T");
});
cut.DoesNotContain("Test2");
}
Expand Down Expand Up @@ -663,7 +663,7 @@ public async Task IsVirtualize_Items_Clearable_Ok()
// 期望 UI 显示值为默认值
// 期望 下拉框为全数据
var input = cut.Find(".search-text");
await cut.InvokeAsync(() => input.Input("2"));
await cut.InvokeAsync(() => cut.Instance.TriggerOnSearch("2"));

// 下拉框仅显示一个选项 Test2
var items = cut.FindAll(".dropdown-item");
Expand Down Expand Up @@ -721,7 +721,7 @@ public async Task IsVirtualize_OnQueryAsync_Clearable_Ok()
// 期望 UI 显示值为默认值
// 期望 下拉框为全数据
var input = cut.Find(".search-text");
await cut.InvokeAsync(() => input.Input("2"));
await cut.InvokeAsync(() => cut.Instance.TriggerOnSearch("2"));

// 下拉框仅显示一个选项 Test2
var items = cut.FindAll(".dropdown-item");
Expand Down
Loading