ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-27 08:30:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix/switch-visibility-icons

Browse Source
This commit is contained in:
orangemug
2018-09-22 14:15:43 +01:00
parent f1216795d2 53c8661cd3
commit 8eb49427fd
10 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/layers/JSONEditor.jsx
View File

@@ -29,10 +29,10 @@ class JSONEditor extends React.Component {
}
}
UNSAFE_componentWillReceiveProps(nextProps) {
this.setState({
code: JSON.stringify(nextProps.layer, null, 2)
})
static getDerivedStateFromProps(props, state) {
return {
code: JSON.stringify(props.layer, null, 2)
};
}
shouldComponentUpdate(nextProps, nextState) {

10
src/components/layers/LayerEditor.jsx
View File

@@ -76,18 +76,18 @@ export default class LayerEditor extends React.Component {
this.state = { editorGroups }
}
UNSAFE_componentWillReceiveProps(nextProps) {
const additionalGroups = { ...this.state.editorGroups }
static getDerivedStateFromProps(props, state) {
const additionalGroups = { ...state.editorGroups }
layout[nextProps.layer.type].groups.forEach(group => {
layout[props.layer.type].groups.forEach(group => {
if(!(group.title in additionalGroups)) {
additionalGroups[group.title] = true
}
})
this.setState({
return {
editorGroups: additionalGroups
})
};
}
getChildContext () {