From 490e0e067e090f02a705b52624e49881338fb121 Mon Sep 17 00:00:00 2001
From: zkwolf <chenhao5866@gmail.com>
Date: Thu, 4 Jun 2020 14:48:58 +0800
Subject: [PATCH 1/3] feat: update divider

---
 components/divider/index.jsx | 17 +++++++++++------
 examples/index.js            |  2 ++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/components/divider/index.jsx b/components/divider/index.jsx
index 2838bc66f3..01c51602eb 100644
--- a/components/divider/index.jsx
+++ b/components/divider/index.jsx
@@ -1,3 +1,4 @@
+import { inject } from 'vue';
 import PropTypes from '../_util/vue-types';
 import { ConfigConsumerProps } from '../config-provider';
 import Base from '../base';
@@ -10,8 +11,10 @@ const Divider = {
     dashed: PropTypes.bool,
     orientation: PropTypes.oneOf(['left', 'right', 'center']),
   },
-  inject: {
-    configProvider: { default: () => ConfigConsumerProps },
+  setup() {
+    return {
+      configProvider: inject('configProvider', ConfigConsumerProps),
+    };
   },
   render() {
     const { prefixCls: customizePrefixCls, type, $slots, dashed, orientation = 'center' } = this;
@@ -28,16 +31,18 @@ const Divider = {
 
     return (
       <div class={classString} role="separator">
-        {$slots.default && <span class={`${prefixCls}-inner-text`}>{$slots.default}</span>}
+        {$slots.default && (
+          <span class={`${prefixCls}-inner-text`}>{$slots.default && $slots.default()}</span>
+        )}
       </div>
     );
   },
 };
 
 /* istanbul ignore next */
-Divider.install = function(Vue) {
-  Vue.use(Base);
-  Vue.component(Divider.name, Divider);
+Divider.install = function(app) {
+  app.use(Base);
+  app.component(Divider.name, Divider);
 };
 
 export default Divider;
diff --git a/examples/index.js b/examples/index.js
index 7f2050efe8..2c9d3456f6 100644
--- a/examples/index.js
+++ b/examples/index.js
@@ -5,6 +5,7 @@ import Button from 'ant-design-vue/button';
 import Drawer from 'ant-design-vue/drawer';
 import Affix from 'ant-design-vue/affix';
 import Alert from 'ant-design-vue/alert';
+import Divider from 'ant-design-vue/divider';
 import ConfigProvider from 'ant-design-vue/config-provider';
 import 'ant-design-vue/style.js';
 
@@ -14,4 +15,5 @@ createApp(App)
   .use(Drawer)
   .use(Affix)
   .use(Alert)
+  .use(Divider)
   .mount('#app');

From a83f581f8c7c1c19a85acfb5abc558251df5a158 Mon Sep 17 00:00:00 2001
From: zkwolf <chenhao5866@gmail.com>
Date: Fri, 5 Jun 2020 09:29:27 +0800
Subject: [PATCH 2/3] chore: remove base import

---
 components/divider/index.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/divider/index.jsx b/components/divider/index.jsx
index 01c51602eb..67c83c93db 100644
--- a/components/divider/index.jsx
+++ b/components/divider/index.jsx
@@ -1,7 +1,6 @@
 import { inject } from 'vue';
 import PropTypes from '../_util/vue-types';
 import { ConfigConsumerProps } from '../config-provider';
-import Base from '../base';
 
 const Divider = {
   name: 'ADivider',
@@ -41,7 +40,6 @@ const Divider = {
 
 /* istanbul ignore next */
 Divider.install = function(app) {
-  app.use(Base);
   app.component(Divider.name, Divider);
 };
 

From f6302a1236a5cc44718b7a00b85dea788ba64488 Mon Sep 17 00:00:00 2001
From: zkwolf <chenhao5866@gmail.com>
Date: Fri, 5 Jun 2020 09:41:59 +0800
Subject: [PATCH 3/3] style: move up slot.default() judge

---
 components/divider/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/divider/index.jsx b/components/divider/index.jsx
index 67c83c93db..fb516afa83 100644
--- a/components/divider/index.jsx
+++ b/components/divider/index.jsx
@@ -30,8 +30,8 @@ const Divider = {
 
     return (
       <div class={classString} role="separator">
-        {$slots.default && (
-          <span class={`${prefixCls}-inner-text`}>{$slots.default && $slots.default()}</span>
+        {$slots.default && $slots.default() && (
+          <span class={`${prefixCls}-inner-text`}>{$slots.default()}</span>
         )}
       </div>
     );