From 3d7c3d71df74505e1cc8aa538fdf21217863be14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=BD=E5=A4=9A=E5=A4=A7=E7=B1=B3?= <lost1q84@gmail.com>
Date: Wed, 30 Dec 2020 13:25:23 +0800
Subject: [PATCH] Drawer: fix focus bug (#20626)

Co-authored-by: wp178491 <wp178491@alibaba-inc.com>
---
 packages/drawer/src/main.vue         | 6 +-----
 packages/theme-chalk/src/drawer.scss | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/drawer/src/main.vue b/packages/drawer/src/main.vue
index a378194df..275a390b5 100644
--- a/packages/drawer/src/main.vue
+++ b/packages/drawer/src/main.vue
@@ -26,7 +26,7 @@
           >
           <header class="el-drawer__header" id="el-drawer__title" v-if="withHeader">
             <slot name="title">
-              <span role="heading" tabindex="0" :title="title">{{ title }}</span>
+              <span role="heading" :title="title">{{ title }}</span>
             </slot>
             <button
               :aria-label="`close ${title || 'drawer'}`"
@@ -49,7 +49,6 @@
 <script>
 import Popup from 'element-ui/src/utils/popup';
 import emitter from 'element-ui/src/mixins/emitter';
-import Utils from 'element-ui/src/utils/aria-utils';
 
 export default {
   name: 'ElDrawer',
@@ -133,9 +132,6 @@ export default {
           document.body.appendChild(this.$el);
         }
         this.prevActiveElement = document.activeElement;
-        this.$nextTick(() => {
-          Utils.focusFirstDescendant(this.$refs.drawer);
-        });
       } else {
         if (!this.closed) this.$emit('close');
         this.$nextTick(() => {
diff --git a/packages/theme-chalk/src/drawer.scss b/packages/theme-chalk/src/drawer.scss
index 9e03a1d66..8e13f35b8 100644
--- a/packages/theme-chalk/src/drawer.scss
+++ b/packages/theme-chalk/src/drawer.scss
@@ -119,6 +119,7 @@ $directions: rtl, ltr, ttb, btt;
   0 16px 24px 2px rgba(0, 0, 0, 0.14),
   0 6px 30px 5px rgba(0, 0, 0, 0.12);
   overflow: hidden;
+  outline: 0;
 
   @each $direction in $directions {
     @include animation-out($direction);