Skip to content

perf(PopConfirmButton): remove dismiss event handler to improve performance #5453

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 4 commits into from
Feb 27, 2025
Merged

perf(PopConfirmButton): remove dismiss event handler to improve performance #5453

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27eec5e
refactor: 精简代码
ArgoZhang Feb 26, 2025
a944ad8
refactor: 移除 dismiss 处理方法
ArgoZhang Feb 26, 2025
90e3779
chore: bump version 9.3.1-beta39
ArgoZhang Feb 27, 2025
46573fa
Merge remote-tracking branch 'origin/chore-version' into fix-pop
ArgoZhang Feb 27, 2025
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
20 changes: 0 additions & 20 deletions src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import EventHandler from "../../modules/event-handler.js"

const config = {
class: 'popover-confirm',
dismiss: '.popover-confirm-buttons > div',
popoverSelector: '.popover-confirm.show'
}

Expand Down Expand Up @@ -63,22 +62,6 @@ export function init(id) {
EventHandler.on(el, 'inserted.bs.popover', confirm.inserted)
EventHandler.on(el, 'hide.bs.popover', confirm.hide)

if (config.dismiss != null) {
confirm.dismissHandler = e => {
const ele = e.target.closest(config.popoverSelector)
if (ele) {
const element = getDescribedOwner(ele)
if (element) {
const popover = bootstrap.Popover.getInstance(element);
if (popover) {
popover.hide()
}
}
}
}
EventHandler.on(document, 'click', config.dismiss, confirm.dismissHandler)
}

confirm.checkCancel = el => {
// check button
let self = el === confirm.el || el.closest('.dropdown-toggle') === confirm.el
Expand Down Expand Up @@ -170,9 +153,6 @@ export function dispose(id) {
if (confirm.popover) {
confirm.popover.dispose();
}
if (config.dismiss) {
EventHandler.off(document, 'click', config.dismiss, confirm.dismissHandler)
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor/Components/Button/PopConfirmButtonContent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<div class="popover-confirm-body">
@if (ChildContent != null)
{
<CascadingValue Value="TriggerCloseAsync" Name="PopoverConfirmButtonCloseAsync" IsFixed="true">
<CascadingValue Value="TriggerConfirmAsync" Name="PopoverConfirmButtonConfirmAsync" IsFixed="true">
<CascadingValue Value="OnCloseClick" Name="PopoverConfirmButtonCloseAsync" IsFixed="true">
<CascadingValue Value="OnConfirmClick" Name="PopoverConfirmButtonConfirmAsync" IsFixed="true">
@ChildContent
</CascadingValue>
</CascadingValue>
Expand Down
14 changes: 2 additions & 12 deletions src/BootstrapBlazor/Components/Button/PopConfirmButtonContent.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ protected override void OnParametersSet()
/// </summary>
public async Task OnCloseClick()
{
await InvokeVoidAsync("hide", Id);
if (OnClose != null)
{
await OnClose();
Expand All @@ -132,21 +133,10 @@ public async Task OnCloseClick()
/// </summary>
public async Task OnConfirmClick()
{
await InvokeVoidAsync("hide", Id);
if (OnConfirm != null)
{
await OnConfirm();
}
}

private async Task TriggerCloseAsync()
{
await InvokeVoidAsync("hide", Id);
await OnCloseClick();
}

private async Task TriggerConfirmAsync()
{
await InvokeVoidAsync("hide", Id);
await OnConfirmClick();
}
}