refactor: CBadge component refactor and check.

woothu · woothu · commit fb17cfcf56ca · 2018-11-21T15:19:23.000+01:00
diff --git a/src/components/Badge/CBadge.js b/src/components/Badge/CBadge.js
@@ -1,10 +1,5 @@
 import { mergeData } from 'vue-functional-data-merge'
-// import pluckProps from '../../utils/pluck-props'
-import Link, { propsFactory as linkPropsFactory } from '../Link/CLink'
-
-let linkProps = linkPropsFactory()
-delete linkProps.href.default
-delete linkProps.to.default
+import CLink, { props as linkProps } from '../Link/CLink'
 
 export const props = Object.assign(linkProps, {
   tag: {
@@ -18,10 +13,6 @@ export const props = Object.assign(linkProps, {
   pill: {
     type: Boolean,
     default: false
-  },
-  additionalClasses: {
-    type: String,
-    default: null
   }
 })
 
@@ -30,7 +21,7 @@ export default {
   name:'CBadge',
   props,
   render (h, { props, data, children }) {
-    const tag = !props.href && !props.to ? props.tag : Link
+    const tag = !props.href && !props.to ? props.tag : CLink
     const componentData = {
       staticClass: 'badge',
       class: [
@@ -39,13 +30,10 @@ export default {
           'badge-pill': Boolean(props.pill),
           active: props.active,
           disabled: props.disabled
-        },
-        props.additionalClasses? props.additionalClasses : ''
+        }
       ],
-      // props: pluckProps(linkProps, props)
-      props: props
+      props
     }
-
     return h(tag, mergeData(data, componentData), children)
   }
 }
