fix(ui): preserve dialog autofocus

2026-10-26 10:24:42 +08:00 · 2026-09-18 18:44:52 +08:00
1 changed files with 9 additions and 0 deletions
@@ -37,6 +37,15 @@ export function Dialog(props: DialogProps) {
            if (autofocusEl) {
              e.preventDefault()
              autofocusEl.focus()
+              // A replaced dialog can restore its trigger after this dialog opens.
+              // Reapply autofocus once that teardown has finished, but only for the top layer.
+              requestAnimationFrame(() => {
+                if (!target?.isConnected || target.contains(target.ownerDocument.activeElement)) return
+                const layers = target.ownerDocument.querySelectorAll("[data-dialog-layer]")
+                const layer = target.closest("[data-dialog-layer]")
+                if (layer && layers.item(layers.length - 1) !== layer) return
+                autofocusEl.focus()
+              })
            }
          }}
        >