From f954233bda42805eec2799cb4acb27f8fe5edb47 Mon Sep 17 00:00:00 2001
From: Cory LaViska <cory@abeautifulsite.net>
Date: Tue, 18 Jul 2023 12:12:43 -0400
Subject: [PATCH] Revert "Move keydown handler for sl-drawer back to base div
 (#1459)"

This reverts commit 1e243e4257610f6652b47ee53ab4d17c61eba2e1.
---
 src/components/drawer/drawer.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/drawer/drawer.ts b/src/components/drawer/drawer.ts
index 9e10c8bdae..3971a78800 100644
--- a/src/components/drawer/drawer.ts
+++ b/src/components/drawer/drawer.ts
@@ -120,10 +120,6 @@ export default class SlDrawer extends ShoelaceElement {
         lockBodyScrolling(this);
       }
     }
-    // If there is an autofocus element, let it take focuse normally, otherwise focus the panel.
-    if (!this.querySelector('[autofocus]')) {
-      this.panel.focus({ preventScroll: true });
-    }
   }
 
   disconnectedCallback() {
@@ -147,14 +143,14 @@ export default class SlDrawer extends ShoelaceElement {
   }
 
   private addOpenListeners() {
-    this.drawer.addEventListener('keydown', this.handleKeyDown);
+    document.addEventListener('keydown', this.handleDocumentKeyDown);
   }
 
   private removeOpenListeners() {
-    this.drawer.removeEventListener('keydown', this.handleKeyDown);
+    document.removeEventListener('keydown', this.handleDocumentKeyDown);
   }
 
-  private handleKeyDown = (event: KeyboardEvent) => {
+  private handleDocumentKeyDown = (event: KeyboardEvent) => {
     if (this.open && !this.contained && event.key === 'Escape') {
       event.stopPropagation();
       this.requestClose('keyboard');
@@ -311,7 +307,6 @@ export default class SlDrawer extends ShoelaceElement {
           'drawer--rtl': this.localize.dir() === 'rtl',
           'drawer--has-footer': this.hasSlotController.test('footer')
         })}
-        @keydown=${this.handleKeyDown}
       >
         <div part="overlay" class="drawer__overlay" @click=${() => this.requestClose('overlay')} tabindex="-1"></div>