Skip to content

refactor(DynamicElement): refactor code to improve readability #6130

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 5 commits into from
Jun 2, 2025
Merged

refactor(DynamicElement): refactor code to improve readability #6130

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92bc40d
refactor: 重构代码提高可读性
ArgoZhang Jun 2, 2025
042c303
refactor: 更新逻辑
ArgoZhang Jun 2, 2025
456edfe
Revert "refactor: 更新逻辑"
ArgoZhang Jun 2, 2025
c929fbe
Revert "refactor: 重构代码提高可读性"
ArgoZhang Jun 2, 2025
0f0da92
Reapply "refactor: 重构代码提高可读性"
ArgoZhang Jun 2, 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
39 changes: 33 additions & 6 deletions src/BootstrapBlazor/Components/BaseComponents/DynamicElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)

if (IsTriggerClick())
{
builder.AddAttribute(2, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, e => OnClick!()));
builder.AddAttribute(2, "onclick", EventCallback.Factory.Create<MouseEventArgs>(this, OnTriggerClick));
}

if (IsTriggerDoubleClick())
{
builder.AddAttribute(3, "ondblclick", EventCallback.Factory.Create<MouseEventArgs>(this, e => OnDoubleClick!()));
builder.AddAttribute(3, "ondblclick", EventCallback.Factory.Create<MouseEventArgs>(this, OnTriggerDoubleClick));
}

if (IsTriggerClick() || IsTriggerDoubleClick())
Expand All @@ -111,9 +111,9 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
builder.AddEventStopPropagationAttribute(5, "onclick", StopPropagation);
}

if (TriggerContextMenu && OnContextMenu != null)
if (IsTriggerContextMenu())
{
builder.AddAttribute(6, "oncontextmenu", EventCallback.Factory.Create<MouseEventArgs>(this, e => OnContextMenu(e)));
builder.AddAttribute(6, "oncontextmenu", EventCallback.Factory.Create<MouseEventArgs>(this, OnTriggerContextMenu));
builder.AddEventPreventDefaultAttribute(7, "oncontextmenu", true);
}

Expand All @@ -123,8 +123,35 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
{
builder.CloseElement();
}
}

private bool IsTriggerClick() => TriggerClick && OnClick != null;

private bool IsTriggerDoubleClick() => TriggerDoubleClick && OnDoubleClick != null;

private bool IsTriggerContextMenu() => TriggerContextMenu && OnContextMenu != null;

private async Task OnTriggerClick()
{
if (OnClick != null)
{
await OnClick();
}
}

bool IsTriggerClick() => TriggerClick && OnClick != null;
bool IsTriggerDoubleClick() => TriggerDoubleClick && OnDoubleClick != null;
private async Task OnTriggerDoubleClick()
{
if (OnDoubleClick != null)
{
await OnDoubleClick();
}
}

private async Task OnTriggerContextMenu(MouseEventArgs e)
{
if (OnContextMenu != null)
{
await OnContextMenu(e);
}
}
}