From c3486bcdcea90a57ae2eed30831a9abe1be1fe0a Mon Sep 17 00:00:00 2001
From: JeremyWuuuuu <15975785+JeremyWuuuuu@users.noreply.github.com>
Date: Fri, 20 May 2022 17:30:35 +0800
Subject: [PATCH] fix(components): [dialog/drawer] header slot

- Fix header slot rendering for both dialog and drawer.
- Change the deprecation for `title` slot to **3.0.0**.
---
 packages/components/dialog/src/dialog.vue |  5 +++--
 packages/components/drawer/src/drawer.vue | 12 ++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/components/dialog/src/dialog.vue b/packages/components/dialog/src/dialog.vue
index 2d1c884d7f..c7fa043063 100644
--- a/packages/components/dialog/src/dialog.vue
+++ b/packages/components/dialog/src/dialog.vue
@@ -45,12 +45,13 @@
             >
               <template #header>
                 <slot
+                  v-if="!$slots.title"
                   name="header"
                   :close="handleClose"
                   :title-id="titleId"
                   :title-class="ns.e('title')"
                 />
-                <slot name="title" />
+                <slot v-else name="title" />
               </template>
               <slot />
               <template v-if="$slots.footer" #footer>
@@ -92,7 +93,7 @@ useDeprecated(
     scope: 'el-dialog',
     from: 'the title slot',
     replacement: 'the header slot',
-    version: '2.3.0',
+    version: '3.0.0',
     ref: 'https://element-plus.org/en-US/component/dialog.html#slots',
   },
   computed(() => !!slots.title)
diff --git a/packages/components/drawer/src/drawer.vue b/packages/components/drawer/src/drawer.vue
index aa25381415..fbd803eb9b 100644
--- a/packages/components/drawer/src/drawer.vue
+++ b/packages/components/drawer/src/drawer.vue
@@ -41,21 +41,17 @@
               />
               <header v-if="withHeader" :class="ns.e('header')">
                 <slot
+                  v-if="!$slots.title"
                   name="header"
                   :close="handleClose"
                   :title-id="titleId"
                   :title-class="ns.e('title')"
                 >
-                  <span
-                    v-if="!$slots.title"
-                    :id="titleId"
-                    role="heading"
-                    :class="ns.e('title')"
-                  >
+                  <span :id="titleId" role="heading" :class="ns.e('title')">
                     {{ title }}
                   </span>
                 </slot>
-                <slot name="title">
+                <slot v-else name="title">
                   <!-- DEPRECATED SLOT -->
                 </slot>
                 <button
@@ -112,7 +108,7 @@ export default defineComponent({
         scope: 'el-drawer',
         from: 'the title slot',
         replacement: 'the header slot',
-        version: '2.3.0',
+        version: '3.0.0',
         ref: 'https://element-plus.org/en-US/component/drawer.html#slots',
       },
       computed(() => !!slots.title)