Merge pull request #532 from pathmapper/fix_issue_471

Remove UNSAFE_componentWillUpdate
This commit is contained in:
Orange Mug 2019-06-28 16:42:08 +01:00 committed by GitHub
commit b5eb74fe20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -53,10 +53,10 @@ class AddModal extends React.Component {
} }
} }
UNSAFE_componentWillUpdate(nextProps, nextState) { componentDidUpdate(prevProps, prevState) {
// Check if source is valid for new type // Check if source is valid for new type
const oldType = this.state.type; const oldType = prevState.type;
const newType = nextState.type; const newType = this.state.type;
const availableSourcesOld = this.getSources(oldType); const availableSourcesOld = this.getSources(oldType);
const availableSourcesNew = this.getSources(newType); const availableSourcesNew = this.getSources(newType);
@ -64,11 +64,11 @@ class AddModal extends React.Component {
if( if(
// Type has changed // Type has changed
oldType !== newType oldType !== newType
&& this.state.source !== "" && prevState.source !== ""
// Was a valid source previously // Was a valid source previously
&& availableSourcesOld.indexOf(this.state.source) > -1 && availableSourcesOld.indexOf(prevState.source) > -1
// And is not a valid source now // And is not a valid source now
&& availableSourcesNew.indexOf(nextState.source) < 0 && availableSourcesNew.indexOf(this.state.source) < 0
) { ) {
// Clear the source // Clear the source
this.setState({ this.setState({
@ -91,10 +91,19 @@ class AddModal extends React.Component {
"line", "line",
"symbol", "symbol",
"circle", "circle",
"fill-extrusion" "fill-extrusion",
"heatmap"
], ],
raster: [ raster: [
"raster" "raster"
],
geojson: [
"fill",
"line",
"symbol",
"circle",
"fill-extrusion",
"heatmap"
] ]
} }