Skip to content

fix eslint errors #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 31, 2018
Merged

fix eslint errors #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79074d8
fix eslint errors
Dec 31, 2018
7b3c7ee
Merge branch 'develop' into improvements-on-array-component
Dec 31, 2018
f64c1fd
fix eslint errors
Dec 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Array.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ class Array extends Component<Props, State> {
};
}

static getDerivedStateFromProps(props, state) {
const propsKey = props.form.key;
static getDerivedStateFromProps(props: Props, state) {
const { form } = props;
const propsKey = form.key;
if (
props.form &&
propsKey === state.formKey &&
Expand Down
34 changes: 23 additions & 11 deletions src/ComposedComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,19 @@ const defaultValue = props => {
return value;
};

type Props = {
errorText: any,
form: any,
showErrors: boolean,
localization: any,
onChange: any
};

const getDisplayName = WrappedComponent =>
WrappedComponent.displayName || WrappedComponent.name || "Component";

export default (ComposedComponent, defaultProps = {}) =>
class Composed extends React.Component {
class Composed extends React.Component<Props> {
displayName = `ComposedComponent(${getDisplayName(ComposedComponent)})`;

constructor(props) {
Expand All @@ -33,31 +41,35 @@ export default (ComposedComponent, defaultProps = {}) =>
this.state = this.constructor.getDerivedStateFromProps(this.props);
}

static getDerivedStateFromProps(nextProps) {
// eslint-disable-next-line
static getDerivedStateFromProps(nextProps: Props) {
const { errorText, form, showErrors, localization } = nextProps;
const getLocalizedString =
localization && localization.getLocalizedString;
const value = defaultValue(nextProps);
const validationResult = utils.validate(
form,
value,
getLocalizedString
);
if (!showErrors) {
return {
value,
valid: true,
error: ""
};
}

const validationResult = utils.validate(
form,
value,
getLocalizedString
);

const error = !validationResult.valid
? validationResult.error
: undefined;

return {
value,
valid: validationResult.valid,
error:
(!validationResult.valid
? validationResult.error.message // eslint-disable-line
: null) || errorText
(!validationResult.valid ? error.message : null) ||
errorText
};
}

Expand Down
7 changes: 3 additions & 4 deletions src/MultiSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ const MenuProps = {
type Props = {
model: any,
form: any,
key: any,
onChangeValidate: any,
classes: any,
localization: Localization
Expand All @@ -64,10 +63,10 @@ class MultiSelect extends Component<Props, State> {
}

static getDerivedStateFromProps(props: Props) {
if (props.model && props.form.key) {
const { model, form } = props;
if (model && form.key) {
return {
currentValue:
utils.getValueFromModel(props.model, props.form.key) || []
currentValue: utils.getValueFromModel(model, form.key) || []
};
}
return null;
Expand Down
11 changes: 4 additions & 7 deletions src/Select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import type { Localization } from "./types";

type Props = {
model: any,
key: any,
form: any,
onChangeValidate: any,
localization: Localization
Expand All @@ -29,13 +28,11 @@ class Select extends Component<Props, State> {
};
}

static getDerivedStateFromProps(props) {
if (props.model && props.form.key) {
static getDerivedStateFromProps(props: Props) {
const { form, model } = props;
if (model && form.key) {
return {
currentValue: utils.getValueFromModel(
props.model,
props.form.key
)
currentValue: utils.getValueFromModel(model, form.key)
};
}
return null;
Expand Down