fix: CBadge: allow inheriting CLink functionality, smaller fixes

Author: woothu

src/CBadge.js

@@ -1,11 +1,12 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-import {tagPropType, mapToCssModules} from './Shared/helper.js';
+import React from 'react'
+import PropTypes from 'prop-types'
+import classNames from 'classnames'
+import { tagPropType, mapToCssModules } from './Shared/helper.js'
+import CLink from './CLink'
 
 //component - CoreUI / CBadge
 
-const CBadge = props=>{
+const CBadge = props => {
 
   let {
     tag: Tag,
@@ -16,40 +17,43 @@ const CBadge = props=>{
     color,
     shape,
     ...attributes
-  } = props;
+  } = props
 
   // render
 
   const classes = mapToCssModules(classNames(
     className,
     'badge',
-    'badge-' + color,
-    shape ? 'badge-'+shape : false
-  ), cssModule);
-
-  if (attributes.href && Tag === 'span') {
-    Tag = 'a';
+    { 
+      [`badge-${color}`]: color,
+      [`badge-${shape}`]: shape
+    }
+  ), cssModule)
+
+  if (attributes.to || attributes.href) {
+    return (
+      <CLink {...attributes} className={classes} ref={innerRef} />
+    )
   }
 
   return (
-    <Tag {...attributes} className={classes} ref={innerRef} />
-  );
+    <Tag className={classes} {...attributes} ref={innerRef} />
+  )
 
 }
 
 CBadge.propTypes = {
   tag: tagPropType,
-  children: PropTypes.node,
   className: PropTypes.string,
   cssModule: PropTypes.object,
   //
   innerRef: PropTypes.oneOfType([PropTypes.object, PropTypes.func, PropTypes.string]),
   color: PropTypes.string,
-  shape: PropTypes.string
-};
+  shape: PropTypes.oneOf(['', 'pill'])
+}
 
 CBadge.defaultProps = {
   tag: 'span'
-};
+}
 
-export default CBadge;
+export default CBadge