Jdrush89/fix dialog escape

.changeset/long-walls-sparkle.md

@@ -0,0 +1,7 @@
+---
+'@primer/react': patch
+---
+
+Fix dialog bug where escape would move focus when dialog was closed
+
+<!-- Changed components: _none_ -->

src/__tests__/Dialog.test.tsx

@@ -137,4 +137,15 @@ describe('Dialog', () => {
     const triggerButton = getByTestId('trigger-button')
     expect(document.activeElement).toEqual(triggerButton)
   })
+
+  it('Returns focus to returnFocusRef on escape', async () => {
+    const {getByTestId, queryByTestId} = HTMLRender(<Component />)
+
+    expect(getByTestId('inner')).toBeTruthy()
+    fireEvent.keyDown(document.body, {key: 'Escape'})
+
+    expect(queryByTestId('inner')).toBeNull()
+    const triggerButton = getByTestId('trigger-button')
+    expect(document.activeElement).toEqual(triggerButton)
+  })
 })

src/hooks/useDialog.ts

@@ -115,10 +115,12 @@ function useDialog({
 
   useOnEscapePress(
     (event: KeyboardEvent) => {
-      onDismiss()
-      event.preventDefault()
+      if (isOpen) {
+        onDismiss()
+        event.preventDefault()
+      }
     },
-    [onDismiss],
+    [isOpen, onDismiss],
   )
 
   return {getDialogProps}