Merge 7a7f2b4 into a064b49

reactstrap · May 15, 2023 · 5571140 · 5571140
2 parents a064b49 + 7a7f2b4
commit 5571140
Show file tree

Hide file tree

Showing 77 changed files with 133 additions and 546 deletions.
diff --git a/src/Accordion.js b/src/Accordion.js
@@ -25,18 +25,14 @@ const propTypes = {
   toggle: PropTypes.func.isRequired,
 };
 
-const defaultProps = {
-  tag: 'div',
-};
-
 function Accordion(props) {
   const {
     flush,
     open,
     toggle,
     className,
     cssModule,
-    tag: Tag,
+    tag: Tag = 'div',
     innerRef,
     ...attributes
   } = props;
@@ -60,6 +56,5 @@ function Accordion(props) {
 }
 
 Accordion.propTypes = propTypes;
-Accordion.defaultProps = defaultProps;
 
 export default Accordion;
diff --git a/src/AccordionBody.js b/src/AccordionBody.js
@@ -23,15 +23,11 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  tag: 'div',
-};
-
 function AccordionBody(props) {
   const {
     className,
     cssModule,
-    tag: Tag,
+    tag: Tag = 'div',
     innerRef,
     children,
     accordionId,
@@ -60,6 +56,5 @@ function AccordionBody(props) {
 }
 
 AccordionBody.propTypes = propTypes;
-AccordionBody.defaultProps = defaultProps;
 
 export default AccordionBody;
diff --git a/src/AccordionHeader.js b/src/AccordionHeader.js
@@ -21,15 +21,11 @@ const propTypes = {
   targetId: PropTypes.string.isRequired,
 };
 
-const defaultProps = {
-  tag: 'h2',
-};
-
 function AccordionHeader(props) {
   const {
     className,
     cssModule,
-    tag: Tag,
+    tag: Tag = 'h2',
     innerRef,
     children,
     targetId,
@@ -65,6 +61,5 @@ function AccordionHeader(props) {
 }
 
 AccordionHeader.propTypes = propTypes;
-AccordionHeader.defaultProps = defaultProps;
 
 export default AccordionHeader;
diff --git a/src/AccordionItem.js b/src/AccordionItem.js
@@ -18,12 +18,8 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  tag: 'div',
-};
-
 function AccordionItem(props) {
-  const { className, cssModule, tag: Tag, innerRef, ...attributes } = props;
+  const { className, cssModule, tag: Tag = 'div', innerRef, ...attributes } = props;
   const classes = mapToCssModules(
     classNames(className, 'accordion-item'),
     cssModule,
@@ -33,6 +29,5 @@ function AccordionItem(props) {
 }
 
 AccordionItem.propTypes = propTypes;
-AccordionItem.defaultProps = defaultProps;
 
 export default AccordionItem;
diff --git a/src/Alert.js b/src/Alert.js
@@ -34,31 +34,22 @@ const propTypes = {
   transition: PropTypes.shape(Fade.propTypes),
 };
 
-const defaultProps = {
-  color: 'success',
-  isOpen: true,
-  tag: 'div',
-  closeAriaLabel: 'Close',
-  fade: true,
-  transition: {
-    ...Fade.defaultProps,
-    unmountOnExit: true,
-  },
-};
-
 function Alert(props) {
   const {
     className,
     closeClassName,
-    closeAriaLabel,
+    closeAriaLabel = 'Close',
     cssModule,
-    tag: Tag,
-    color,
-    isOpen,
+    tag: Tag = 'div',
+    color = 'success',
+    isOpen = true,
     toggle,
     children,
-    transition,
-    fade,
+    transition = {
+      ...Fade.defaultProps,
+      unmountOnExit: true
+    },
+    fade = true,
     innerRef,
     ...attributes
   } = props;
@@ -106,6 +97,5 @@ function Alert(props) {
 }
 
 Alert.propTypes = propTypes;
-Alert.defaultProps = defaultProps;
 
 export default Alert;
diff --git a/src/Badge.js b/src/Badge.js
@@ -23,20 +23,14 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  color: 'secondary',
-  pill: false,
-  tag: 'span',
-};
-
 function Badge(props) {
   let {
     className,
     cssModule,
-    color,
+    color = 'secondary',
     innerRef,
-    pill,
-    tag: Tag,
+    pill = false,
+    tag: Tag = 'span',
     ...attributes
   } = props;
 
@@ -58,6 +52,5 @@ function Badge(props) {
 }
 
 Badge.propTypes = propTypes;
-Badge.defaultProps = defaultProps;
 
 export default Badge;
diff --git a/src/Breadcrumb.js b/src/Breadcrumb.js
@@ -20,21 +20,15 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  tag: 'nav',
-  listTag: 'ol',
-  'aria-label': 'breadcrumb',
-};
-
 function Breadcrumb(props) {
   const {
     className,
     listClassName,
     cssModule,
     children,
-    tag: Tag,
-    listTag: ListTag,
-    'aria-label': label,
+    tag: Tag = 'nav',
+    listTag: ListTag = 'ol',
+    'aria-label': label = 'breadcrumb',
     ...attributes
   } = props;
 
@@ -53,6 +47,5 @@ function Breadcrumb(props) {
 }
 
 Breadcrumb.propTypes = propTypes;
-Breadcrumb.defaultProps = defaultProps;
 
 export default Breadcrumb;
diff --git a/src/BreadcrumbItem.js b/src/BreadcrumbItem.js
@@ -14,12 +14,8 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  tag: 'li',
-};
-
 function BreadcrumbItem(props) {
-  const { className, cssModule, active, tag: Tag, ...attributes } = props;
+  const { className, cssModule, active, tag: Tag = 'li', ...attributes } = props;
   const classes = mapToCssModules(
     classNames(className, active ? 'active' : false, 'breadcrumb-item'),
     cssModule,
@@ -35,6 +31,5 @@ function BreadcrumbItem(props) {
 }
 
 BreadcrumbItem.propTypes = propTypes;
-BreadcrumbItem.defaultProps = defaultProps;
 
 export default BreadcrumbItem;
diff --git a/src/Button.js b/src/Button.js
@@ -37,11 +37,6 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  color: 'secondary',
-  tag: 'button',
-};
-
 function Button(props) {
   const onClick = useCallback(
     (e) => {
@@ -64,10 +59,10 @@ function Button(props) {
     className,
     close,
     cssModule,
-    color,
+    color = 'secondary',
     outline,
     size,
-    tag: Tag,
+    tag: Tag = 'button',
     innerRef,
     ...attributes
   } = props;
@@ -107,6 +102,5 @@ function Button(props) {
 }
 
 Button.propTypes = propTypes;
-Button.defaultProps = defaultProps;
 
 export default Button;
diff --git a/src/ButtonGroup.js b/src/ButtonGroup.js
@@ -20,18 +20,13 @@ const propTypes = {
   vertical: PropTypes.bool,
 };
 
-const defaultProps = {
-  tag: 'div',
-  role: 'group',
-};
-
 function ButtonGroup(props) {
   const {
     className,
     cssModule,
     size,
     vertical,
-    tag: Tag,
+    tag: Tag = 'div',
     ...attributes
   } = props;
 
@@ -44,10 +39,9 @@ function ButtonGroup(props) {
     cssModule,
   );
 
-  return <Tag {...attributes} className={classes} />;
+  return <Tag {...{role: 'group', ...attributes}} className={classes} />;
 }
 
 ButtonGroup.propTypes = propTypes;
-ButtonGroup.defaultProps = defaultProps;
 
 export default ButtonGroup;
diff --git a/src/ButtonToggle.js b/src/ButtonToggle.js
@@ -13,12 +13,8 @@ const propTypes = {
   cssModule: PropTypes.object,
 };
 
-const defaultProps = {
-  defaultValue: false,
-};
-
 function ButtonToggle(props) {
-  const [toggled, setToggled] = useState(props.defaultValue);
+  const [toggled, setToggled] = useState(props.defaultValue || false);
   const [focus, setFocus] = useState(false);
 
   const onBlur = useCallback(
@@ -73,6 +69,5 @@ function ButtonToggle(props) {
 }
 
 ButtonToggle.propTypes = propTypes;
-ButtonToggle.defaultProps = defaultProps;
 
 export default ButtonToggle;
diff --git a/src/ButtonToolbar.js b/src/ButtonToolbar.js
@@ -16,23 +16,17 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  tag: 'div',
-  role: 'toolbar',
-};
-
 function ButtonToolbar(props) {
-  const { className, cssModule, tag: Tag, ...attributes } = props;
+  const { className, cssModule, tag: Tag = 'div', ...attributes } = props;
 
   const classes = mapToCssModules(
     classNames(className, 'btn-toolbar'),
     cssModule,
   );
 
-  return <Tag {...attributes} className={classes} />;
+  return <Tag {...{role: 'toolbar', ...attributes}} className={classes} />;
 }
 
 ButtonToolbar.propTypes = propTypes;
-ButtonToolbar.defaultProps = defaultProps;
 
 export default ButtonToolbar;
diff --git a/src/Card.js b/src/Card.js
@@ -25,10 +25,6 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  tag: 'div',
-};
-
 function Card(props) {
   const {
     className,
@@ -37,7 +33,7 @@ function Card(props) {
     body,
     inverse,
     outline,
-    tag: Tag,
+    tag: Tag = 'div',
     innerRef,
     ...attributes
   } = props;
@@ -56,6 +52,5 @@ function Card(props) {
 }
 
 Card.propTypes = propTypes;
-Card.defaultProps = defaultProps;
 
 export default Card;
diff --git a/src/CardBody.js b/src/CardBody.js
@@ -17,12 +17,8 @@ const propTypes = {
   tag: tagPropType,
 };
 
-const defaultProps = {
-  tag: 'div',
-};
-
 function CardBody(props) {
-  const { className, cssModule, innerRef, tag: Tag, ...attributes } = props;
+  const { className, cssModule, innerRef, tag: Tag = 'div', ...attributes } = props;
   const classes = mapToCssModules(
     classNames(className, 'card-body'),
     cssModule,
@@ -32,6 +28,5 @@ function CardBody(props) {
 }
 
 CardBody.propTypes = propTypes;
-CardBody.defaultProps = defaultProps;
 
 export default CardBody;