improve getDerivedStateFromProps return value

This commit is contained in:
afc163 2018-11-13 18:03:57 +08:00
parent d20b5fe9f5
commit c7b9eee709
3 changed files with 7 additions and 6 deletions

View File

@ -40,7 +40,6 @@ export default function createPicker(TheCalendar: React.ComponentClass): any {
}
if ('value' in nextProps) {
state.value = nextProps.value;
if (
nextProps.value !== prevState.value ||
(!open && nextProps.value !== prevState.showDate)
@ -48,7 +47,7 @@ export default function createPicker(TheCalendar: React.ComponentClass): any {
state.showDate = nextProps.value;
}
}
return state;
return Object.keys(state).length > 0 ? state : null;
}
private input: any;

View File

@ -51,7 +51,6 @@ class Tag extends React.Component<TagProps, TagState> {
closed: !nextProps.visible,
};
}
return newState;
}
return null;

View File

@ -16,10 +16,13 @@ export default class ColorPicker extends Component {
}
static getDerivedStateFromProps(props) {
if ('color' in props) {
return {
color: props.color,
};
}
return null;
}
state = {
displayColorPicker: false,