Skip to content

Commit 0f77880

Browse files
danielopradodanieloprado
committed
v1.10.6
1 parent 3b6be17 commit 0f77880

9 files changed

Lines changed: 69 additions & 44 deletions

File tree

‎components/Abstract/SelectionBase.tsx‎

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { RadioProps } from '@material-ui/core/Radio';
44
import { SwitchProps } from '@material-ui/core/Switch';
55
import Typography from '@material-ui/core/Typography/Typography';
66
import FieldCoreBase, { IPropsFieldBase } from '@react-form-fields/core/components/FieldCoreBase';
7+
import ValidationContextRegister from '@react-form-fields/core/components/ValidationContextRegister';
78
import * as React from 'react';
89

910
import { getConfig } from '../../config';
@@ -59,42 +60,46 @@ export default class FieldSelectionBase extends FieldCoreBase<IProps> {
5960
const { value, label, checked, helperText, classes, disabled, Component } = this.props;
6061

6162
return (
62-
<FormControlLabel
63-
className={helperText ? classes.containerAlign : null}
64-
control={
65-
checked ? //force recreation
66-
<Component
67-
checked={true}
68-
disabled={disabled}
69-
onChange={this.onChange}
70-
onBlur={this.onBlur}
71-
value={(value || '').toString()}
72-
/> :
73-
<Component
74-
checked={false}
75-
disabled={disabled}
76-
onChange={this.onChange}
77-
onBlur={this.onBlur}
78-
value={(value || '').toString()}
79-
/>
80-
}
81-
label={
82-
<React.Fragment>
83-
{!!label &&
84-
<React.Fragment>
85-
<Typography className={helperText ? classes.labelAlign : null}>{label}</Typography>
86-
{!!helperText &&
87-
<Typography className={classes.helperText}>
88-
{helperText}
89-
</Typography>
90-
}
91-
</React.Fragment>
92-
}
93-
{this.props.children}
94-
</React.Fragment>
95-
}
63+
<React.Fragment>
64+
<ValidationContextRegister field={this} />
9665

97-
/>
66+
<FormControlLabel
67+
className={helperText ? classes.containerAlign : null}
68+
control={
69+
checked ? //force recreation
70+
<Component
71+
checked={true}
72+
disabled={disabled}
73+
onChange={this.onChange}
74+
onBlur={this.onBlur}
75+
value={(value || '').toString()}
76+
/> :
77+
<Component
78+
checked={false}
79+
disabled={disabled}
80+
onChange={this.onChange}
81+
onBlur={this.onBlur}
82+
value={(value || '').toString()}
83+
/>
84+
}
85+
label={
86+
<React.Fragment>
87+
{!!label &&
88+
<React.Fragment>
89+
<Typography className={helperText ? classes.labelAlign : null}>{label}</Typography>
90+
{!!helperText &&
91+
<Typography className={classes.helperText}>
92+
{helperText}
93+
</Typography>
94+
}
95+
</React.Fragment>
96+
}
97+
{this.props.children}
98+
</React.Fragment>
99+
}
100+
101+
/>
102+
</React.Fragment>
98103
);
99104
}
100105
}

‎components/Autocomplete/index.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ import MenuItem from '@material-ui/core/MenuItem/MenuItem';
44
import CloseIcon from '@material-ui/icons/Close';
55
import SearchIcon from '@material-ui/icons/Search';
66
import FieldCoreBase, { IStateFieldBase } from '@react-form-fields/core/components/FieldCoreBase';
7+
import ValidationContextRegister from '@react-form-fields/core/components/ValidationContextRegister';
78
import * as match from 'autosuggest-highlight/match';
89
import * as parse from 'autosuggest-highlight/parse';
910
import * as React from 'react';
11+
import * as Autosuggest from 'react-autosuggest';
1012
import {
1113
ChangeEvent,
1214
RenderSuggestionParams,
1315
SuggestionSelectedEventData,
1416
SuggestionsFetchRequestedParams,
1517
} from 'react-autosuggest';
16-
import * as Autosuggest from 'react-autosuggest';
1718

1819
import { getConfig } from '../../config';
1920
import { WithStyles } from '../../decorators/withStyles';
@@ -111,7 +112,7 @@ export default class FieldAutocomplete extends FieldCoreBase<IProps, IState> {
111112

112113
handleSuggestionsFetchRequested = ({ value }: SuggestionsFetchRequestedParams) => {
113114
const suggestions = this.props.options
114-
.filter(o => o.label.toLowerCase().includes(value.toLowerCase()))
115+
.filter(o => o.label.toString().toLowerCase().includes(value.toLowerCase()))
115116
.slice(0, 10);
116117

117118
this.setState({ suggestions });
@@ -134,6 +135,8 @@ export default class FieldAutocomplete extends FieldCoreBase<IProps, IState> {
134135

135136
return (
136137
<React.Fragment>
138+
<ValidationContextRegister field={this} />
139+
137140
<Autosuggest
138141
suggestions={suggestions}
139142
theme={{

‎components/Color/index.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import TextField from '@material-ui/core/TextField/TextField';
22
import FieldCoreBase, { IStateFieldBase } from '@react-form-fields/core/components/FieldCoreBase';
3+
import ValidationContextRegister from '@react-form-fields/core/components/ValidationContextRegister';
34
import * as React from 'react';
45

56
import { getConfig } from '../../config';
@@ -38,6 +39,8 @@ export default class FieldColor extends FieldCoreBase<IProps, IState> {
3839

3940
return (
4041
<React.Fragment>
42+
<ValidationContextRegister field={this} />
43+
4144
<TextField
4245
{...{
4346
fullWidth: true,

‎components/Date.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
22
import ChevronRightIcon from '@material-ui/icons/ChevronRight';
33
import FieldCoreBase, { IPropsFieldBase } from '@react-form-fields/core/components/FieldCoreBase';
4+
import ValidationContextRegister from '@react-form-fields/core/components/ValidationContextRegister';
45
import DatePicker from 'material-ui-pickers/DatePicker';
56
import { DatePickerWrapperProps } from 'material-ui-pickers/DatePicker/DatePickerWrapper';
67
import DateUtils from 'material-ui-pickers/utils/date-fns-utils';
@@ -41,6 +42,8 @@ export default class FieldDate extends FieldCoreBase<IProps> {
4142

4243
return (
4344
<React.Fragment>
45+
<ValidationContextRegister field={this} />
46+
4447
<MuiPickersUtilsProvider utils={DateUtils} locale={getConfig().dateLocale}>
4548
<DatePicker
4649
{...extraProps}

‎components/Hidden.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Typography from '@material-ui/core/Typography/Typography';
22
import FieldCoreBase, { IPropsFieldBase } from '@react-form-fields/core/components/FieldCoreBase';
3+
import ValidationContextRegister from '@react-form-fields/core/components/ValidationContextRegister';
34
import * as React from 'react';
45

56
interface IProps extends IPropsFieldBase {
@@ -11,6 +12,8 @@ export default class FieldHidden extends FieldCoreBase<IProps> {
1112
render() {
1213
return (
1314
<React.Fragment>
15+
<ValidationContextRegister field={this} />
16+
1417
{!!this.errorMessage &&
1518
<Typography color='error'>
1619
{this.errorMessage}

‎components/Select.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import InputLabel from '@material-ui/core/InputLabel';
66
import MenuItem from '@material-ui/core/MenuItem/MenuItem';
77
import Select from '@material-ui/core/Select';
88
import FieldCoreBase from '@react-form-fields/core/components/FieldCoreBase';
9+
import ValidationContextRegister from '@react-form-fields/core/components/ValidationContextRegister';
910
import * as React from 'react';
1011

1112
import { getConfig } from '../config';
@@ -37,6 +38,8 @@ export default class FieldSelect extends FieldCoreBase<IProps> {
3738

3839
return (
3940
<React.Fragment>
41+
<ValidationContextRegister field={this} />
42+
4043
<FormControl margin='normal' fullWidth error={!!this.errorMessage}>
4144
<InputLabel shrink={!!emptyOption} error={!!this.errorMessage}>{label}</InputLabel>
4245
<Select
@@ -69,7 +72,9 @@ export default class FieldSelect extends FieldCoreBase<IProps> {
6972
))}
7073
{children}
7174
</Select>
72-
<FormHelperText error={!!this.errorMessage}>{this.errorMessage || helperText}</FormHelperText>
75+
{!!(this.errorMessage || helperText) &&
76+
<FormHelperText error={!!this.errorMessage}>{this.errorMessage || helperText}</FormHelperText>
77+
}
7378
</FormControl>
7479
</React.Fragment>
7580
);

‎components/Text.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ import CircularProgress from '@material-ui/core/CircularProgress/CircularProgres
22
import InputAdornment from '@material-ui/core/InputAdornment/InputAdornment';
33
import TextField from '@material-ui/core/TextField/TextField';
44
import FieldCoreBase from '@react-form-fields/core/components/FieldCoreBase';
5+
import ValidationContextRegister from '@react-form-fields/core/components/ValidationContextRegister';
56
import * as React from 'react';
67

78
import { getConfig } from '../config';
89
import { IBaseFieldProps, TextFieldPropsResolver } from '../interfaces/props';
910

1011
interface IProps extends IBaseFieldProps, TextFieldPropsResolver {
11-
mask?: 'phone';
12+
mask?: string;
1213
loading?: boolean;
1314
value: any;
1415
onChange: (value: any) => void;
@@ -41,6 +42,8 @@ export default class FieldText extends FieldCoreBase<IProps> {
4142

4243
return (
4344
<React.Fragment>
45+
<ValidationContextRegister field={this} />
46+
4447
<TextField
4548
{...{
4649
fullWidth: true,

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"validation",
1111
"material"
1212
],
13-
"version": "1.10.5",
13+
"version": "1.10.6",
1414
"main": "./dist/index.js",
1515
"types": "./dist/index.d.ts",
1616
"license": "MIT",

‎yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
"@babel/runtime" "7.0.0"
7373
recompose "^0.29.0"
7474

75-
"@react-form-fields/core@>=1.1.0":
76-
version "1.1.0"
77-
resolved "https://registry.yarnpkg.com/@react-form-fields/core/-/core-1.1.0.tgz#1823cf20e7a8522ce80eea451f677dab985a34fc"
78-
integrity sha512-Zn6uFOUDa9895gMYT1GCIgvt4G0Z3I5yJoQNwhGJYq1xP7d4XvNG2GkNvMPHWbME8buLAmqQfMh4HUnpmgDWgQ==
75+
"@react-form-fields/core@1.3.0":
76+
version "1.3.0"
77+
resolved "https://registry.yarnpkg.com/@react-form-fields/core/-/core-1.3.0.tgz#0a7f6ff0c0944d7108e4699ff70e224c6e9776ed"
78+
integrity sha512-FufDEN2nIqmwwMKcpFWtAyK/iftAsaEcsgPWepQuRpsbFWWASXKHcQt+ViCfvM1OR+mBHxroZFvMrW8fiB28FQ==
7979
dependencies:
8080
react ">=16.3.0"
8181
tslib ">=1.9.0"

0 commit comments

Comments
 (0)