return CloseButton for Button with close prop

- add CloseButton disabled example
- remove variant black

src/Button.js

@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { mapToCssModules, tagPropType } from './utils';
+import CloseButton from './CloseButton';
 
 const propTypes = {
   active: PropTypes.bool,
@@ -54,13 +55,20 @@ function Button(props) {
     ...attributes
   } = props;
 
+  if (close) {
+    return (
+      <CloseButton
+        {...attributes}
+      />
+    )
+  }
+
   const btnOutlineColor = `btn${outline ? '-outline' : ''}-${color}`;
 
   const classes = mapToCssModules(classNames(
     className,
-    close && 'btn-close',
-    close || 'btn',
-    close || btnOutlineColor,
+    'btn',
+    btnOutlineColor,
     size ? `btn-${size}` : false,
     block ? 'd-block w-100' : false,
     { active, disabled: props.disabled }
@@ -70,16 +78,14 @@ function Button(props) {
     Tag = 'a';
   }
 
-  const defaultAriaLabel = close ? 'Close' : null;
-
   return (
     <Tag
       type={(Tag === 'button' && attributes.onClick) ? 'button' : undefined}
       {...attributes}
       className={classes}
       ref={innerRef}
       onClick={onClick}
-      aria-label={ariaLabel || defaultAriaLabel}
+      aria-label={ariaLabel}
     />
   );
 }

src/CloseButton.js

@@ -7,11 +7,10 @@ const propTypes = {
   active: PropTypes.bool,
   'aria-label': PropTypes.string,
   onClick: PropTypes.func,
-  variant: PropTypes.oneOf(['white', 'black'])
+  variant: PropTypes.oneOf(['white'])
 }
 
 const defaultProps = {
-  variant: 'black',
   'aria-label': 'close'
 }
 

stories/CloseButton.stories.js

@@ -17,4 +17,5 @@ export default {
 
 export { default as CloseButton } from './examples/CloseButton';
 export { default as CloseButtonWhite } from './examples/CloseButtonWhite';
+export { default as CloseButtonDisabled } from './examples/CloseButtonDisabled';
 export { default as Props } from './examples/CloseButtonProps';

stories/examples/CloseButtonDisabled.js

@@ -0,0 +1,9 @@
+import React from 'react';
+import { CloseButton } from 'reactstrap';
+
+const Example = (args) => {
+  return (
+    <CloseButton disabled />
+  )
+}
+export default Example;