From ecb82cf9a914a980fcecf015b6b687106f6e4d73 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 16 Aug 2018 12:41:21 -0300 Subject: [PATCH] Working type submit for forms - Button Component --- src/core/client/auth/components/SignIn.tsx | 8 +++++++- .../client/ui/components/BaseButton/BaseButton.tsx | 12 +++++++++--- src/core/client/ui/components/Button/Button.tsx | 6 ++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/core/client/auth/components/SignIn.tsx b/src/core/client/auth/components/SignIn.tsx index f0e88fdd4..5785ea2e9 100644 --- a/src/core/client/auth/components/SignIn.tsx +++ b/src/core/client/auth/components/SignIn.tsx @@ -99,7 +99,13 @@ const SignIn: StatelessComponent = props => {
- { /** Internal: Forwarded Ref */ forwardRef?: Ref; + + type?: "submit" | "reset" | "button"; } /** @@ -45,15 +47,17 @@ const BaseButton: StatelessComponent = ({ keyboardFocus, mouseHover, forwardRef, - type: typeProp, + type, ...rest }) => { + console.log("type", type, "Basebutton"); + let Element = "button"; + if (anchor) { Element = "a"; } - let type = typeProp; if (anchor && type) { // tslint:disable:next-line: no-console console.warn( @@ -69,7 +73,9 @@ const BaseButton: StatelessComponent = ({ [classes.mouseHover]: mouseHover, }); - return ; + return ( + + ); }; const enhanced = withForwardRef( diff --git a/src/core/client/ui/components/Button/Button.tsx b/src/core/client/ui/components/Button/Button.tsx index c984c2c5e..e466049dd 100644 --- a/src/core/client/ui/components/Button/Button.tsx +++ b/src/core/client/ui/components/Button/Button.tsx @@ -36,6 +36,8 @@ interface InnerProps extends ButtonHTMLAttributes { /** If set renders active state e.g. to implement toggle buttons */ active?: boolean; + type?: "submit" | "reset" | "button"; + /** Internal: Forwarded Ref */ forwardRef?: Ref; } @@ -57,9 +59,12 @@ export class Button extends React.Component { disabled, forwardRef, variant, + type, ...rest } = this.props; + console.log("type", type, "---------"); + const rootClassName = cn(classes.root, className, { [classes.sizeRegular]: size === "regular", [classes.sizeSmall]: size === "small", @@ -84,6 +89,7 @@ export class Button extends React.Component { classes={pick(classes, "keyboardFocus", "mouseHover")} disabled={disabled} forwardRef={forwardRef} + type={type} {...rest} /> );