feat(Button): default type to button (#376)

TheSharpieOne · eddywashere · commit ebbeba75f6a0 · 2017-03-30T17:20:54.000-07:00
fixes: #366
diff --git a/src/Button.js b/src/Button.js
@@ -69,7 +69,13 @@ class Button extends React.Component {
     }
 
     return (
-      <Tag {...attributes} className={classes} ref={getRef} onClick={this.onClick} />
+      <Tag
+        type={Tag === 'button' ? 'button' : undefined}
+        {...attributes}
+        className={classes}
+        ref={getRef}
+        onClick={this.onClick}
+      />
     );
   }
 }
diff --git a/src/DropdownItem.js b/src/DropdownItem.js
@@ -83,6 +83,7 @@ class DropdownItem extends React.Component {
 
     return (
       <Tag
+        type={Tag === 'button' ? 'button' : undefined}
         {...props}
         tabIndex={tabIndex}
         className={classes}
diff --git a/src/__tests__/Button.spec.js b/src/__tests__/Button.spec.js
@@ -24,6 +24,34 @@ describe('Button', () => {
     expect(wrapper.text()).toBe('Home');
   });
 
+  it('should render type as "button" by default when tag is "button"', () => {
+    const wrapper = mount(<Button>Home</Button>);
+
+    expect(wrapper.find('button').prop('type')).toBe('button');
+    expect(wrapper.text()).toBe('Home');
+  });
+
+  it('should render type as user defined when defined by the user', () => {
+    const wrapper = mount(<Button type="submit">Home</Button>);
+
+    expect(wrapper.find('button').prop('type')).toBe('submit');
+    expect(wrapper.text()).toBe('Home');
+  });
+
+  it('should not render type by default when the type is not defined and the tag is not "button"', () => {
+    const wrapper = mount(<Button tag="a">Home</Button>);
+
+    expect(wrapper.find('a').prop('type')).toBe(undefined);
+    expect(wrapper.text()).toBe('Home');
+  });
+
+  it('should not render type by default when the type is not defined and the href is defined', () => {
+    const wrapper = mount(<Button href="#">Home</Button>);
+
+    expect(wrapper.find('a').prop('type')).toBe(undefined);
+    expect(wrapper.text()).toBe('Home');
+  });
+
   it('should render buttons with default color', () => {
     const wrapper = shallow(<Button>Default Button</Button>);
 
diff --git a/src/__tests__/DropdownItem.spec.js b/src/__tests__/DropdownItem.spec.js
@@ -19,6 +19,27 @@ describe('DropdownItem', () => {
     expect(wrapper.find('button').length).toBe(1);
   });
 
+  it('should render type as "button" by default when tag is "button"', () => {
+    const wrapper = mount(<DropdownItem>Home</DropdownItem>);
+
+    expect(wrapper.find('button').prop('type')).toBe('button');
+    expect(wrapper.text()).toBe('Home');
+  });
+
+  it('should render type as user defined when defined by the user', () => {
+    const wrapper = mount(<DropdownItem type="submit">Home</DropdownItem>);
+
+    expect(wrapper.find('button').prop('type')).toBe('submit');
+    expect(wrapper.text()).toBe('Home');
+  });
+
+  it('should not render type by default when the type is not defined and the tag is not "button"', () => {
+    const wrapper = mount(<DropdownItem tag="a">Home</DropdownItem>);
+
+    expect(wrapper.find('a').prop('type')).toBe(undefined);
+    expect(wrapper.text()).toBe('Home');
+  });
+
   it('should render custom element', () => {
     const Link = (props) => <a href="/home" {...props}>{props.children}</a>;
     const wrapper = mount(<DropdownItem tag={Link}>Home</DropdownItem>);

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,13 @@ class Button extends React.Component {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`return (`
`72`		`- <Tag {...attributes} className={classes} ref={getRef} onClick={this.onClick} />`
	`72`	`+ <Tag`
	`73`	`+ type={Tag === 'button' ? 'button' : undefined}`
	`74`	`+ {...attributes}`
	`75`	`+ className={classes}`
	`76`	`+ ref={getRef}`
	`77`	`+ onClick={this.onClick}`
	`78`	`+ />`
`73`	`79`	`);`
`74`	`80`	`}`
`75`	`81`	`}`