fix(Button): Use type attribute if specified (#5208)

* fix(Button): Apply type attribute if "as" is an input * Use type prop if explicitly passed in
react-bootstrap · Jun 15, 2020 · 426b6da · 426b6da
1 parent 8f23c13
commit 426b6da
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Button.js b/src/Button.js
@@ -60,7 +60,6 @@ const defaultProps = {
   variant: 'primary',
   active: false,
   disabled: false,
-  type: 'button',
 };
 
 const Button = React.forwardRef(
@@ -94,8 +93,10 @@ const Button = React.forwardRef(
       props.ref = ref;
     }
 
-    if (!as) {
+    if (type) {
       props.type = type;
+    } else if (!as) {
+      props.type = 'button';
     }
 
     const Component = as || 'button';

diff --git a/test/ButtonSpec.js b/test/ButtonSpec.js
@@ -26,6 +26,23 @@ describe('<Button>', () => {
       .should.equal('submit');
   });
 
+  it('Should show the type if explicitly passed in when "as" is used', () => {
+    mount(
+      <Button as="div" type="submit">
+        Title
+      </Button>,
+    )
+      .getDOMNode()
+      .getAttribute('type')
+      .should.equal('submit');
+  });
+
+  it('Should not have default type=button when "as" is used', () => {
+    const wrapper = mount(<Button as="div">Title</Button>);
+
+    expect(wrapper.getDOMNode().getAttribute('type')).to.be.null;
+  });
+
   it('should forward refs to the button', () => {
     const ref = React.createRef();
     mount(