Merge pull request #29 from Mar1nka/add-type-to-Button

Add type to Button
paralect · Jul 22, 2019 · 0761d8a · 0761d8a
2 parents 665a559 + 4f7af4a
commit 0761d8a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/client/components/button/button.jsx b/src/client/components/button/button.jsx
@@ -14,15 +14,15 @@ export const sizes = {
 const Button = ({
   className,
   isLoading,
-  action,
+  type,
   state,
   size,
   children,
 }) => {
   return (
+    // eslint-disable-next-line react/button-has-type
     <button
-      type="button"
-      action={action}
+      type={type}
       className={classnames(styles.button, styles[state], styles[size], className, {
         [styles.loading]: isLoading,
       })}
@@ -36,7 +36,7 @@ const Button = ({
 Button.propTypes = {
   className: PropTypes.string,
   isLoading: PropTypes.bool,
-  action: PropTypes.string,
+  type: PropTypes.string,
   children: PropTypes.node,
   state: PropTypes.string,
   size: PropTypes.string,
@@ -45,7 +45,7 @@ Button.propTypes = {
 Button.defaultProps = {
   className: '',
   isLoading: false,
-  action: 'button',
+  type: 'button',
   children: null,
   state: states.purple,
   size: sizes.medium,

diff --git a/src/client/components/form/form.styles.pcss b/src/client/components/form/form.styles.pcss
@@ -9,7 +9,7 @@
     margin: var(--distance-600) 0;
   }
 
-  button[action="submit"] {
+  button[type="submit"] {
     margin-top: var(--distance-600);
   }
 

diff --git a/src/client/pages/forgot-password/forgot-password.jsx b/src/client/pages/forgot-password/forgot-password.jsx
@@ -90,7 +90,7 @@ export default class ForgotPassword extends PureComponent {
         <div>
           <Button
             className={styles.submitBtn}
-            action="submit"
+            type="submit"
             primary
             isLoading={isLoading}
             state={states.purple}

diff --git a/src/client/pages/reset-password/reset-password.jsx b/src/client/pages/reset-password/reset-password.jsx
@@ -102,7 +102,7 @@ export default class ResetPassword extends PureComponent {
           <div>
             <Button
               className={styles.signin}
-              action="submit"
+              type="submit"
               state={states.purple}
               isLoading={isLoading}
             >

diff --git a/src/client/pages/signin/signin.jsx b/src/client/pages/signin/signin.jsx
@@ -104,7 +104,7 @@ export default class Signin extends PureComponent {
                 <div className={styles.submit}>
                   <Button
                     className={styles.signin}
-                    action="submit"
+                    type="submit"
                     primary
                     isLoading={isLoading}
                     state={states.blue}

diff --git a/src/client/pages/signup/signup.jsx b/src/client/pages/signup/signup.jsx
@@ -157,7 +157,7 @@ export default class Signup extends PureComponent {
 
                   <Button
                     className={styles.signup}
-                    action="submit"
+                    type="submit"
                     isLoading={isLoading}
                   >
                     Join