neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup Tuple state updates (#690)

Browse Source 
* Cleanup Tuple state updates

* Cleanup setStrate in Vector as well
This commit is contained in:
Jaco Greeff 2019-02-11 21:47:21 +01:00 committed by GitHub
parent 9c09cad99f
commit ffcb8ff37f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/ui-params/src/Param/Tuple.tsx
View File

@ -78,26 +78,24 @@ export default class Tuple extends React.PureComponent<Props, State> {
}
private onChange = (index: number) => {
const { onChange } = this.props;
return (value: RawParam): void => {
let isValid = value.isValid;
const values = this.state.values.map((svalue, sindex) => {
if (sindex === index) {
return value;
this.setState(
({ values }: State) => ({
values: values.map((svalue, sindex) =>
(sindex === index)
? value
: svalue
)}),
() => {
const { values } = this.state;
const { onChange } = this.props;
onChange && onChange({
isValid: values.reduce((result, { isValid }) => result && isValid, true),
value: values.map(({ value }) => value)
});
}
isValid = isValid && svalue.isValid;
return svalue;
});
this.setState({ values }, () => {
onChange && onChange({
isValid,
value: values.map(({ value }) => value)
});
});
);
};
}
}

59
packages/ui-params/src/Param/Vector.tsx
View File

@ -34,7 +34,7 @@ class Vector extends React.PureComponent<Props, State> {
return null;
}
const values = isDisabled || prevState.values.length === 0
const values: Array<RawParam> = isDisabled || prevState.values.length === 0
? value.map((value: any) =>
isUndefined(value) || isUndefined(value.isValid)
? {
@ -108,49 +108,44 @@ class Vector extends React.PureComponent<Props, State> {
}
private onChange = (index: number) => {
const { onChange } = this.props;
return (value: RawParam): void => {
let isValid = value.isValid;
const values = this.state.values.map((svalue, sindex) => {
if (sindex === index) {
return value;
this.setState(
({ values }: State) => ({
values: values.map((svalue, sindex) =>
(sindex === index)
? value
: svalue
)}),
() => {
const { values } = this.state;
const { onChange } = this.props;
onChange && onChange({
isValid: values.reduce((result, { isValid }) => result && isValid, true),
value: values.map(({ value }) => value)
});
}
isValid = isValid && svalue.isValid;
return svalue;
});
this.setState({ values }, () => {
onChange && onChange({
isValid,
value: values.map(({ value }) => value)
});
});
);
};
}
private rowAdd = (): void => {
const { type } = this.props;
const { values } = this.state;
this.setState(({ values }: State, { type }: Props) => {
const value = getInitValue(type);
const value = getInitValue(type);
this.setState({
values: values.concat({
isValid: !isUndefined(value),
value
})
return {
values: values.concat({
isValid: !isUndefined(value),
value
})
};
});
}
private rowRemove = (): void => {
const { values } = this.state;
this.setState({
this.setState(({ values }: State) => ({
values: values.slice(0, values.length - 1)
});
}));
}
}