Merge branch 'dev-v5' into enhance-playwright

dvoituron · web-flow · commit d6039d54c19e · 2026-04-23T20:58:32.000+02:00
diff --git a/src/Core/Components/Dialog/FluentDialog.razor.cs b/src/Core/Components/Dialog/FluentDialog.razor.cs
@@ -16,6 +16,8 @@ namespace Microsoft.FluentUI.AspNetCore.Components;
 /// </summary>
 public partial class FluentDialog : FluentComponentBase
 {
+    private string? _shownInstanceId;
+
     /// <summary />
     [DynamicDependency(nameof(OnToggleAsync))]
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(DialogToggleEventArgs))]
@@ -78,8 +80,10 @@ public FluentDialog(LibraryConfiguration configuration) : base(configuration)
     /// <summary />
     protected override Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender && LaunchedFromService)
+        var shouldShowDialog = string.CompareOrdinal(_shownInstanceId, Instance?.Id) != 0;
+        if (shouldShowDialog && LaunchedFromService)
         {
+            _shownInstanceId = Instance?.Id;
             var instance = Instance as DialogInstance;
             if (instance is not null)
             {

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ namespace Microsoft.FluentUI.AspNetCore.Components;`
`16`	`16`	`/// </summary>`
`17`	`17`	`public partial class FluentDialog : FluentComponentBase`
`18`	`18`	`{`
	`19`	`+ private string? _shownInstanceId;`
	`20`	`+`
`19`	`21`	`/// <summary />`
`20`	`22`	`[DynamicDependency(nameof(OnToggleAsync))]`
`21`	`23`	`[DynamicDependency(DynamicallyAccessedMemberTypes.All, typeof(DialogToggleEventArgs))]`
`@@ -78,8 +80,10 @@ public FluentDialog(LibraryConfiguration configuration) : base(configuration)`
`78`	`80`	`/// <summary />`
`79`	`81`	`protected override Task OnAfterRenderAsync(bool firstRender)`
`80`	`82`	`{`
`81`		`- if (firstRender && LaunchedFromService)`
	`83`	`+ var shouldShowDialog = string.CompareOrdinal(_shownInstanceId, Instance?.Id) != 0;`
	`84`	`+ if (shouldShowDialog && LaunchedFromService)`
`82`	`85`	`{`
	`86`	`+ _shownInstanceId = Instance?.Id;`
`83`	`87`	`var instance = Instance as DialogInstance;`
`84`	`88`	`if (instance is not null)`
`85`	`89`	`{`