This commit is contained in:
Zalmoxisus 2019-01-03 14:42:58 +02:00
parent dd3e900c5f
commit 104b161e1f
3 changed files with 31 additions and 31 deletions

View File

@ -50,32 +50,31 @@ export default class Dialog extends (PureComponent || Component) {
<div onClick={!modal && onDismiss} /> <div onClick={!modal && onDismiss} />
<div> <div>
{!noHeader && ( {!noHeader && (
<div className="mc-dialog--header"> <div className="mc-dialog--header">
<div>{schema ? schema.title || title : title}</div> <div>{schema ? schema.title || title : title}</div>
{!modal && <button onClick={onDismiss}>×</button>} {!modal && <button onClick={onDismiss}>×</button>}
</div> </div>
)} )}
<div className="mc-dialog--body"> <div className="mc-dialog--body">
{children} {children}
{schema && ( {schema && (
<Form {...rest}> <Form {...rest}>
{ {!noFooter &&
!noFooter && (
( <input
<input type="submit"
type="submit" ref={this.getFormButtonRef}
ref={this.getFormButtonRef} className="mc-dialog--hidden"
className="mc-dialog--hidden" />
/> )
) }
} </Form>
</Form> )}
)}
</div> </div>
{ {
!noFooter && !noFooter &&
(actions (actions ?
? <div className="mc-dialog--footer"> <div className="mc-dialog--footer">
{submitText ? {submitText ?
[...actions, [...actions,
<Button key="default-submit" primary onClick={this.onSubmit}> <Button key="default-submit" primary onClick={this.onSubmit}>
@ -84,13 +83,14 @@ export default class Dialog extends (PureComponent || Component) {
] ]
: actions : actions
} }
</div> </div>
: <div className="mc-dialog--footer"> :
<Button onClick={onDismiss}>Cancel</Button> <div className="mc-dialog--footer">
<Button primary onClick={this.onSubmit}> <Button onClick={onDismiss}>Cancel</Button>
{submitText || 'Submit'} <Button primary onClick={this.onSubmit}>
</Button> {submitText || 'Submit'}
</div> </Button>
</div>
) )
} }
</div> </div>

View File

@ -16,9 +16,9 @@ export default class Form extends (PureComponent || Component) {
{ {
noSubmit ? <noscript /> : noSubmit ? <noscript /> :
children || children ||
<Button size="big" primary={primaryButton} theme={rest.theme} type="submit"> <Button size="big" primary={primaryButton} theme={rest.theme} type="submit">
{submitText || 'Submit'} {submitText || 'Submit'}
</Button> </Button>
} }
</FormContainer> </FormContainer>
); );

View File

@ -67,7 +67,7 @@ export default class Tabs extends Component {
if (!this.SelectedComponent) { if (!this.SelectedComponent) {
return ( return (
<TabsContainer position={this.props.position}> <TabsContainer position={this.props.position}>
{ tabsHeader } {tabsHeader}
</TabsContainer> </TabsContainer>
); );
} }