From acbb52b4599ad0ffb0396596ce3e677f660cf509 Mon Sep 17 00:00:00 2001
From: Joseph Doherty <dohejw01@gmail.com>
Date: Thu, 18 Jun 2026 19:42:10 -0400
Subject: [PATCH] fix(centralui): DialogHost cleanup only on open->closed
 transition + drop trailing class space (T33a review)

---
 .../Components/Shared/DialogHost.razor        | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Shared/DialogHost.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Shared/DialogHost.razor
index 8a2ec9e6..005c33be 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Shared/DialogHost.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Shared/DialogHost.razor
@@ -17,7 +17,7 @@
          role="dialog"
          aria-modal="true"
          @onkeydown="OnKeyDown">
-        <div class="modal-dialog modal-dialog-centered @state.Size" role="document">
+        <div class="modal-dialog modal-dialog-centered@(state.Size is null ? "" : $" {state.Size}")" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title">@state.Title</h5>
@@ -125,14 +125,20 @@
         }
         else
         {
-            _focusedForState = null;
-            try { await JS.InvokeVoidAsync("document.body.classList.remove", "modal-open"); }
-            catch { /* prerender: no JS — ignore */ }
+            // Only clean up on the actual open→closed transition. Skipping when
+            // _focusedForState is already null avoids spurious JS interop on
+            // the initial render and every steady-state no-dialog render.
+            if (_focusedForState is not null)
+            {
+                _focusedForState = null;
+                try { await JS.InvokeVoidAsync("document.body.classList.remove", "modal-open"); }
+                catch { /* prerender: no JS — ignore */ }
 
-            // Return focus to whatever element triggered the dialog so keyboard
-            // users are not dumped at the top of the document on close.
-            try { await JS.InvokeVoidAsync("sbDialog.restoreActiveElement"); }
-            catch { /* prerender: no JS — ignore */ }
+                // Return focus to whatever element triggered the dialog so keyboard
+                // users are not dumped at the top of the document on close.
+                try { await JS.InvokeVoidAsync("sbDialog.restoreActiveElement"); }
+                catch { /* prerender: no JS — ignore */ }
+            }
         }
     }