diff --git a/src/BootstrapBlazor.Server/Components/Samples/Drawers.razor b/src/BootstrapBlazor.Server/Components/Samples/Drawers.razor
index 482d8031707..5f829422578 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Drawers.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Drawers.razor
@@ -17,10 +17,7 @@
-
-
@Localizer["Content"]
-
IsOpen = false)">@Localizer["Close"]
-
+ @RenderDrawerContent
@@ -40,10 +37,7 @@
@Localizer["Open"]
-
-
@Localizer["Content"]
-
IsShowBackdropOpen = false)">@Localizer["Close"]
-
+ @RenderDrawerContent
@@ -52,10 +46,7 @@
@Localizer["Open"]
-
-
@Localizer["Content"]
-
IsKeyboardOpen = false)">@Localizer["Close"]
-
+ @RenderDrawerContent
@@ -64,10 +55,7 @@
@Localizer["Open"]
-
-
@Localizer["Content"]
-
IsBodyScrollOpen = false)">@Localizer["Close"]
-
+ @RenderDrawerContent
@@ -79,3 +67,10 @@
+
+@code {
+ private RenderFragment RenderDrawerContent =>@
+
@Localizer["Content"]
+
+
;
+}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Drawers.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Drawers.razor.cs
index c8743bdd85c..3cb0491e042 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Drawers.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Drawers.razor.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the Apache 2.0 License
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -64,7 +64,7 @@ private void OpenDrawer()
private async Task DrawerServiceShow() => await DrawerService.Show(new DrawerOption()
{
Placement = Placement.Right,
- ChildContent = builder => builder.AddContent(0, "Test"),
+ ChildContent = RenderDrawerContent,
ShowBackdrop = true,
AllowResize = true,
IsBackdrop = true,
diff --git a/src/BootstrapBlazor/Components/Drawer/Drawer.razor b/src/BootstrapBlazor/Components/Drawer/Drawer.razor
index 3a6351594f0..0ac05d75da9 100644
--- a/src/BootstrapBlazor/Components/Drawer/Drawer.razor
+++ b/src/BootstrapBlazor/Components/Drawer/Drawer.razor
@@ -2,7 +2,7 @@
@inherits BootstrapModuleComponentBase
@attribute [BootstrapModuleAutoLoader(JSObjectReference = true)]
-
@if (ShowBackdrop)
{
diff --git a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs
index 156f37d889b..2e069024985 100644
--- a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs
+++ b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.cs
@@ -216,44 +216,58 @@ private RenderFragment RenderBackdrop() => builder =>
///
点击背景遮罩方法
///
Backdrop Click Method
///
- public async Task OnContainerClick()
- {
- if (OnClickBackdrop != null)
- {
- await OnClickBackdrop();
- }
- await Close();
- }
+ public Task OnContainerClick() => CloseAsync(true);
+
+ private bool _isClosing;
///
/// 关闭抽屉方法
/// Close Drawer Method
///
[JSInvokable]
- public async Task Close()
+ public Task Close() => CloseAsync(false);
+
+ private async Task CloseAsync(bool clickBackdrop)
{
- if (OnClosingAsync != null && !await OnClosingAsync())
+ if (_isClosing || !IsOpen)
{
return;
}
- IsOpen = false;
- var animation = await InvokeAsync
("execute", Id, false);
- if (animation)
- {
- await Task.Delay(300);
- }
- if (OnCloseAsync != null)
- {
- await OnCloseAsync();
- }
- if (IsOpenChanged.HasDelegate)
+ _isClosing = true;
+ try
{
- await IsOpenChanged.InvokeAsync(IsOpen);
+ if (clickBackdrop && OnClickBackdrop != null)
+ {
+ await OnClickBackdrop();
+ }
+ if (OnClosingAsync != null && !await OnClosingAsync())
+ {
+ return;
+ }
+
+ IsOpen = false;
+ var animation = await InvokeAsync("execute", Id, false);
+ if (animation)
+ {
+ await Task.Delay(300);
+ }
+ if (OnCloseAsync != null)
+ {
+ await OnCloseAsync();
+ }
+ if (IsOpenChanged.HasDelegate)
+ {
+ await IsOpenChanged.InvokeAsync(IsOpen);
+ }
+ else
+ {
+ StateHasChanged();
+ }
}
- else
+ finally
{
- StateHasChanged();
+ _isClosing = false;
}
}
}
diff --git a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.js b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.js
index f6c98822de7..c02eb8614d1 100644
--- a/src/BootstrapBlazor/Components/Drawer/Drawer.razor.js
+++ b/src/BootstrapBlazor/Components/Drawer/Drawer.razor.js
@@ -2,6 +2,14 @@ import Data from "../../modules/data.js"
import Drag from "../../modules/drag.js"
import EventHandler from "../../modules/event-handler.js"
+const restoreBodyScroll = (el, body) => {
+ const hasOpenDrawer = [...document.querySelectorAll('.drawer.show')]
+ .some(drawer => drawer !== el && drawer.getAttribute('data-bb-scroll') !== 'true');
+ if (!hasOpenDrawer) {
+ body.classList.remove('drawer-overflow-hidden');
+ }
+}
+
const initDrag = el => {
let originX = 0
let originY = 0;
@@ -76,7 +84,9 @@ export function init(id, invoke, method) {
const dw = {
el,
- body: document.querySelector('body')
+ body: document.querySelector('body'),
+ open: null,
+ animationId: null
}
Data.set(id, dw)
@@ -99,6 +109,27 @@ export function execute(id, open) {
const drawerBackdrop = el.querySelector('.drawer-backdrop')
const animationFrame = getComputedStyle(drawerBody).getPropertyValue('transition') !== 'none';
+ if (open) {
+ const scroll = el.getAttribute('data-bb-scroll') === "true";
+ if (scroll === false) {
+ body.classList.add('drawer-overflow-hidden');
+ }
+ else {
+ restoreBodyScroll(el, body);
+ }
+ }
+
+ // Renders in the same state must not restart a pending animation.
+ if (dw.animationId && dw.open === open) {
+ return animationFrame;
+ }
+ dw.open = open;
+
+ if (dw.animationId) {
+ cancelAnimationFrame(dw.animationId);
+ dw.animationId = null;
+ }
+
let start = void 0
const show = ts => {
if (start === void 0) {
@@ -106,7 +137,7 @@ export function execute(id, open) {
}
const elapsed = ts - start;
if (elapsed < 20) {
- requestAnimationFrame(show);
+ dw.animationId = requestAnimationFrame(show);
}
else {
showDrawer();
@@ -114,9 +145,11 @@ export function execute(id, open) {
}
const showDrawer = () => {
+ dw.animationId = null;
drawerBody.classList.add('show');
- if (drawerBackdrop) {
- drawerBackdrop.classList.add('show');
+ const backdrop = el.querySelector('.drawer-backdrop');
+ if (backdrop) {
+ backdrop.classList.add('show');
}
el.focus();
}
@@ -127,23 +160,20 @@ export function execute(id, open) {
}
const elapsed = ts - start;
if (elapsed < 320) {
- requestAnimationFrame(hide);
+ dw.animationId = requestAnimationFrame(hide);
}
else {
+ dw.animationId = null;
el.classList.remove('show');
+ restoreBodyScroll(el, body);
}
}
if (open) {
el.classList.add('show')
- const scroll = el.getAttribute('data-bb-scroll') === "true";
- if (scroll === false) {
- body.classList.add('drawer-overflow-hidden');
- }
-
if (animationFrame) {
- requestAnimationFrame(show)
+ dw.animationId = requestAnimationFrame(show)
}
else {
showDrawer();
@@ -154,9 +184,9 @@ export function execute(id, open) {
if (drawerBackdrop) {
drawerBackdrop.classList.remove('show');
}
- body.classList.remove('drawer-overflow-hidden');
+ restoreBodyScroll(el, body);
if (animationFrame) {
- requestAnimationFrame(hide)
+ dw.animationId = requestAnimationFrame(hide)
}
else {
el.classList.remove('show');
@@ -170,6 +200,9 @@ export function dispose(id) {
Data.remove(id);
const { el, body } = dw;
+ if (dw.animationId) {
+ cancelAnimationFrame(dw.animationId);
+ }
EventHandler.off(el, 'keyup');
if (el.classList.contains('show')) {
@@ -179,8 +212,8 @@ export function dispose(id) {
if (drawerBody) {
drawerBody.classList.remove('show')
}
- body.classList.remove('overflow-hidden')
}
+ restoreBodyScroll(el, body);
const drawerBody = el.querySelector('.drawer-body');
if (drawerBody !== null) {
diff --git a/src/BootstrapBlazor/Components/Drawer/DrawerContainer.cs b/src/BootstrapBlazor/Components/Drawer/DrawerContainer.cs
index 03ca6277798..9af3e6d239b 100644
--- a/src/BootstrapBlazor/Components/Drawer/DrawerContainer.cs
+++ b/src/BootstrapBlazor/Components/Drawer/DrawerContainer.cs
@@ -116,8 +116,11 @@ private async Task OnCloseAsync(DrawerOption option)
await option.OnCloseAsync();
}
- _option = null;
- StateHasChanged();
+ if (ReferenceEquals(_option, option))
+ {
+ _option = null;
+ StateHasChanged();
+ }
}
///
diff --git a/test/UnitTest/Components/DrawerTest.cs b/test/UnitTest/Components/DrawerTest.cs
index 20b26cb8786..9a9262cb8ec 100644
--- a/test/UnitTest/Components/DrawerTest.cs
+++ b/test/UnitTest/Components/DrawerTest.cs
@@ -18,7 +18,6 @@ public void Width_Ok()
pb.Add(a => a.Width, "");
});
Assert.DoesNotContain("--bb-drawer-width", cut.Markup);
- Assert.DoesNotContain("tabindex", cut.Markup);
}
[Fact]
@@ -76,6 +75,15 @@ public void IsOpenChanged_Ok()
Assert.False(isOpen);
}
+ [Fact]
+ public void Esc_Ok()
+ {
+ // 通过 tabindex="-1" 让组件可以获取焦点, ESC 事件才能触发
+ var cut = Context.Render();
+
+ cut.Contains("tabindex=\"-1\"");
+ }
+
[Fact]
public void OnClickBackdrop_Ok()
{
@@ -291,6 +299,47 @@ public async Task OnClosingAsync_ReturnTrue()
Assert.Equal(["closing", "close", "changed"], callbacks);
}
+ [Fact]
+ public async Task Close_IgnoresConcurrentCall()
+ {
+ var closingStarted = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var continueClosing = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
+ var closingCount = 0;
+ var closeCount = 0;
+ var changedCount = 0;
+ var cut = Context.Render(builder =>
+ {
+ builder.Add(a => a.IsOpen, true);
+ builder.Add(a => a.OnClosingAsync, async () =>
+ {
+ closingCount++;
+ closingStarted.SetResult(true);
+ await continueClosing.Task;
+ return true;
+ });
+ builder.Add(a => a.OnCloseAsync, () =>
+ {
+ closeCount++;
+ return Task.CompletedTask;
+ });
+ builder.Add(a => a.IsOpenChanged, EventCallback.Factory.Create(this, _ => changedCount++));
+ });
+
+ var firstClose = cut.InvokeAsync(cut.Instance.Close);
+ await closingStarted.Task;
+ await cut.InvokeAsync(cut.Instance.Close);
+
+ Assert.Equal(1, closingCount);
+ Assert.True(cut.Instance.IsOpen);
+
+ continueClosing.SetResult(true);
+ await firstClose;
+
+ Assert.False(cut.Instance.IsOpen);
+ Assert.Equal(1, closeCount);
+ Assert.Equal(1, changedCount);
+ }
+
class MockContent : ComponentBase
{
[CascadingParameter(Name = "BodyContext")]