Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
data-bb-auto-dropdown-focus="@ShowDropdownListOnFocusString" data-bb-debounce="@DurationString"
data-bb-skip-esc="@SkipEscString" data-bb-skip-enter="@SkipEnterString" data-bb-blur="@TriggerBlurString"
data-bb-scroll-behavior="@ScrollIntoViewBehaviorString" data-bb-trigger-delete="true"
@bind="@CurrentValueAsString"
@bind="@CurrentValueAsString" @onblur="@OnBlur"
placeholder="@PlaceHolder" disabled="@Disabled" @ref="FocusElement"/>
<span class="form-select-append"><i class="@Icon"></i></span>
<span class="form-select-append ac-loading"><i class="@LoadingIcon"></i></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private async Task OnClickItem(string val)
/// </summary>
/// <param name="val"></param>
[JSInvokable]
public override async Task TriggerFilter(string val)
public async Task TriggerFilter(string val)
{
if (OnCustomFilter != null)
{
Expand Down
20 changes: 0 additions & 20 deletions src/BootstrapBlazor/Components/AutoComplete/PopoverCompleteBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,26 +158,6 @@ protected override void OnParametersSet()
Offset ??= "[0, 6]";
}

/// <summary>
/// 触发 OnBlur 回调方法 由 Javascript 触发
/// </summary>
[JSInvokable]
public async Task TriggerBlur()
{
if (OnBlurAsync != null)
{
await OnBlurAsync(Value);
}
}

/// <summary>
/// TriggerFilter 方法
/// </summary>
/// <param name="val"></param>
/// <returns></returns>
[JSInvokable]
public virtual Task TriggerFilter(string val) => Task.CompletedTask;

/// <summary>
/// <inheritdoc/>
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/AutoFill/AutoFill.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private async ValueTask<ItemsProviderResult<TValue>> LoadItems(ItemsProviderRequ
/// </summary>
/// <param name="val">The value to filter by.</param>
[JSInvokable]
public override async Task TriggerFilter(string val)
public async Task TriggerFilter(string val)
{
if (OnQueryAsync != null)
{
Expand Down
14 changes: 2 additions & 12 deletions src/BootstrapBlazor/Components/Search/Search.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,6 @@ protected override void OnParametersSet()
}
}

private bool _render = true;

/// <summary>
/// <inheritdoc/>
/// </summary>
/// <returns></returns>
protected override bool ShouldRender() => _render;

private string _displayText = "";
/// <summary>
/// 点击搜索按钮时触发此方法
Expand Down Expand Up @@ -278,19 +270,17 @@ private async Task OnClickItem(TValue val)
}

/// <summary>
/// TriggerFilter 方法
/// TriggerFilter method called by Javascript.
/// </summary>
/// <param name="val"></param>
[JSInvokable]
public override async Task TriggerFilter(string val)
public async Task TriggerFilter(string val)
{
_render = false;
_displayText = val;
if (IsTriggerSearchByInput)
{
await OnSearchClick();
}
_render = true;
_dropdown.Render();
}
}
9 changes: 4 additions & 5 deletions test/UnitTest/Components/AutoCompleteTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,8 @@ public async Task OnBlurAsync_Ok()
return Task.CompletedTask;
});
});

// trigger blur
await cut.InvokeAsync(() => cut.Instance.TriggerBlur());
var input = cut.Find(".form-control");
await cut.InvokeAsync(() => input.Blur());
Assert.Equal("test1", val);
}

Expand Down Expand Up @@ -328,9 +327,9 @@ public void Trigger_Ok()

class MockPopoverCompleteBase : PopoverCompleteBase<string>
{
public override Task TriggerFilter(string val)
public Task TriggerFilter(string val)
{
return base.TriggerFilter(val);
return Task.CompletedTask;
}
}
}