fix(AccordionToggle): default button type=button (#5076)

react-bootstrap · Mar 27, 2020 · 59468d7 · 59468d7
1 parent e87744e
commit 59468d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/AccordionToggle.js b/src/AccordionToggle.js
@@ -25,7 +25,7 @@ export function useAccordionToggle(eventKey, onClick) {
   const onSelect = useContext(SelectableContext);
 
   return (e) => {
-    /* 
+    /*
       Compare the event key in context with the given event key.
       If they are the same, then collapse the component.
     */
@@ -50,6 +50,10 @@ const AccordionToggle = React.forwardRef(
   ) => {
     const accordionOnClick = useAccordionToggle(eventKey, onClick);
 
+    if (Component === 'button') {
+      props.type = 'button';
+    }
+
     return (
       <Component ref={ref} onClick={accordionOnClick} {...props}>
         {children}

diff --git a/test/AccordionToggleSpec.js b/test/AccordionToggleSpec.js
@@ -5,6 +5,8 @@ import AccordionToggle from '../src/AccordionToggle';
 
 describe('<AccordionToggle>', () => {
   it('Should have button as default component', () => {
-    mount(<AccordionToggle eventKey="" />).assertSingle('button');
+    mount(<AccordionToggle eventKey="" />).assertSingle(
+      'button[type="button"]',
+    );
   });
 });