-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #74 from nachtm/submit-button
Fix form usability issues
- Loading branch information
Showing
5 changed files
with
137 additions
and
112 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import { ValidatorComponent } from 'react-material-ui-form-validator'; | ||
| import ResizableIconButton from "./ResizableIconButton"; | ||
| import Info from '@material-ui/icons/InfoOutlined'; | ||
| import React from "react"; | ||
| import { withStyles } from "@material-ui/core" | ||
| import { connect } from "react-redux"; | ||
|
|
||
| const styles = (theme) => ({ | ||
| radioButtonContainerMobile: { | ||
| display: 'flex', | ||
| alignItems: 'baseline', | ||
| flexDirection: 'row', | ||
| justifyContent: 'space-between', | ||
| position: 'relative', | ||
| paddingLeft: 35, | ||
| paddingRight: 35, | ||
| }, | ||
| radioButtonContainer: { | ||
| display: 'flex', | ||
| alignItems: 'baseline', | ||
| flexDirection: 'row', | ||
| justifyContent: 'spaceBetween', | ||
| paddingLeft: '35%', | ||
| paddingRight: '35%', | ||
| position: 'relative' | ||
| } | ||
| }); | ||
|
|
||
| class FormRadioButtons extends ValidatorComponent { | ||
|
|
||
| render = () => { | ||
| const { species, classes, isMobile, onChangeSelection, onClickInfo } = this.props; | ||
| return <div> | ||
| {this.errorText()} | ||
| {species.map((type, idx) => | ||
| <span className={isMobile ? classes.radioButtonContainerMobile : "radioButtonContainer"} key={idx}> | ||
| <div > | ||
| <label > | ||
| <input | ||
| type="radio" | ||
| name="react-tips" | ||
| value={type} | ||
| onChange={onChangeSelection(type)} | ||
| /> | ||
| {type} | ||
| </label> | ||
| </div> | ||
| <div> | ||
| <ResizableIconButton | ||
| onClick={onClickInfo(idx)} | ||
| backgroundColor={'white'} | ||
| color={'#4385E9'}> | ||
| <Info /> | ||
| </ResizableIconButton> | ||
| </div> | ||
| </span>)} | ||
| </div> | ||
| }; | ||
|
|
||
| errorText = () => { | ||
| const { isValid } = this.state; | ||
| if (isValid) { | ||
| return null; | ||
| } | ||
| return ( | ||
| <div style={{ color: 'red' }}> | ||
| {this.getErrorMessage()} | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| const mapStateToProps = (state) => { | ||
| return {isMobile: state.isMobile}; | ||
| }; | ||
|
|
||
| export default withStyles(styles)(connect(mapStateToProps)(FormRadioButtons)); |