Fixes per pr

TheSharpieOne · TheSharpieOne · commit b22fe5a67e8a · 2016-08-01T09:27:48.000-04:00
diff --git a/src/FormFeedback.jsx b/src/FormFeedback.jsx
@@ -11,7 +11,7 @@ const defaultProps = {
   tag: 'div',
 };
 
-const Form = (props) => {
+const FormFeedback = (props) => {
   const {
     className,
     tag: Tag,
@@ -28,7 +28,7 @@ const Form = (props) => {
   );
 };
 
-Form.propTypes = propTypes;
-Form.defaultProps = defaultProps;
+FormFeedback.propTypes = propTypes;
+FormFeedback.defaultProps = defaultProps;
 
-export default Form;
+export default FormFeedback;
diff --git a/src/FormGroup.jsx b/src/FormGroup.jsx
@@ -15,7 +15,7 @@ const defaultProps = {
   tag: 'div',
 };
 
-const Form = (props) => {
+const FormGroup = (props) => {
   const {
     className,
     row,
@@ -39,7 +39,7 @@ const Form = (props) => {
   );
 };
 
-Form.propTypes = propTypes;
-Form.defaultProps = defaultProps;
+FormGroup.propTypes = propTypes;
+FormGroup.defaultProps = defaultProps;
 
-export default Form;
+export default FormGroup;
diff --git a/src/FormText.jsx b/src/FormText.jsx
@@ -13,7 +13,7 @@ const defaultProps = {
   tag: 'small',
 };
 
-const Form = (props) => {
+const FormText = (props) => {
   const {
     className,
     inline,
@@ -33,7 +33,7 @@ const Form = (props) => {
   );
 };
 
-Form.propTypes = propTypes;
-Form.defaultProps = defaultProps;
+FormText.propTypes = propTypes;
+FormText.defaultProps = defaultProps;
 
-export default Form;
+export default FormText;
diff --git a/src/Input.jsx b/src/Input.jsx
@@ -16,7 +16,7 @@ const defaultProps = {
   type: 'text',
 };
 
-const Form = (props) => {
+const Input = (props) => {
   const {
     className,
     type,
@@ -52,7 +52,7 @@ const Form = (props) => {
     formControlClass
   );
 
-  if (!staticInput && !selectInput) {
+  if (Tag === 'input') {
     attributes.type = type;
   }
 
@@ -61,7 +61,7 @@ const Form = (props) => {
   );
 };
 
-Form.propTypes = propTypes;
-Form.defaultProps = defaultProps;
+Input.propTypes = propTypes;
+Input.defaultProps = defaultProps;
 
-export default Form;
+export default Input;
diff --git a/src/Label.jsx b/src/Label.jsx
@@ -36,7 +36,7 @@ const defaultProps = {
   tag: 'label',
 };
 
-const Form = (props) => {
+const Label = (props) => {
   const {
     className,
     hidden,
@@ -76,11 +76,11 @@ const Form = (props) => {
   );
 
   return (
-    <Tag {...attributes} className={classes} htmlFor={htmlFor} />
+    <Tag htmlFor={htmlFor} {...attributes} className={classes} />
   );
 };
 
-Form.propTypes = propTypes;
-Form.defaultProps = defaultProps;
+Label.propTypes = propTypes;
+Label.defaultProps = defaultProps;
 
-export default Form;
+export default Label;
