Lots of smaller fixes found in the console logs during testing.

This commit is contained in:
orangemug 2020-04-06 13:59:08 +01:00
parent a1dedd1aa6
commit b8739915b2
6 changed files with 16 additions and 13 deletions

View file

@ -353,7 +353,7 @@ export default class App extends React.Component {
parsed: { parsed: {
type: "layer", type: "layer",
data: { data: {
index, index: parseInt(index, 10),
key: "id", key: "id",
message, message,
} }
@ -371,7 +371,7 @@ export default class App extends React.Component {
parsed: { parsed: {
type: "layer", type: "layer",
data: { data: {
index, index: parseInt(index, 10),
key, key,
message message
} }

View file

@ -9,8 +9,8 @@ export default class DocLabel extends React.Component {
PropTypes.object, PropTypes.object,
PropTypes.string PropTypes.string
]).isRequired, ]).isRequired,
fieldSpec: PropTypes.object.isRequired, fieldSpec: PropTypes.object,
onToggleDoc: PropTypes.func.isRequired, onToggleDoc: PropTypes.func,
} }
constructor (props) { constructor (props) {

View file

@ -223,7 +223,7 @@ export default class CombiningFilterEditor extends React.Component {
const error = errors[`filter[${idx+1}]`]; const error = errors[`filter[${idx+1}]`];
return ( return (
<> <div key={`block-${idx}`}>
<FilterEditorBlock key={idx} onDelete={this.deleteFilterItem.bind(this, idx)}> <FilterEditorBlock key={idx} onDelete={this.deleteFilterItem.bind(this, idx)}>
<SingleFilterEditor <SingleFilterEditor
properties={this.props.properties} properties={this.props.properties}
@ -232,9 +232,9 @@ export default class CombiningFilterEditor extends React.Component {
/> />
</FilterEditorBlock> </FilterEditorBlock>
{error && {error &&
<div className="maputnik-inline-error">{error.message}</div> <div key="error" className="maputnik-inline-error">{error.message}</div>
} }
</> </div>
); );
}) })

View file

@ -33,6 +33,7 @@ class StringInput extends React.Component {
value: props.value value: props.value
}; };
} }
return {};
} }
render() { render() {

View file

@ -10,7 +10,7 @@ class LayerIdBlock extends React.Component {
value: PropTypes.string.isRequired, value: PropTypes.string.isRequired,
wdKey: PropTypes.string.isRequired, wdKey: PropTypes.string.isRequired,
onChange: PropTypes.func.isRequired, onChange: PropTypes.func.isRequired,
error: PropTypes.object.isRequired, error: PropTypes.object,
} }
render() { render() {

View file

@ -165,12 +165,14 @@ class LayerListContainer extends React.Component {
return propsChanged; return propsChanged;
} }
componentDidUpdate () { componentDidUpdate (prevProps) {
if (prevProps.selectedLayerIndex !== this.props.selectedLayerIndex) {
const selectedItemNode = this.selectedItemRef.current; const selectedItemNode = this.selectedItemRef.current;
if (selectedItemNode && selectedItemNode.node) { if (selectedItemNode && selectedItemNode.node) {
selectedItemNode.node.scrollIntoView(); selectedItemNode.node.scrollIntoView();
} }
} }
}
render() { render() {
@ -184,7 +186,7 @@ class LayerListContainer extends React.Component {
if(layers.length > 1) { if(layers.length > 1) {
const grp = <LayerListGroup const grp = <LayerListGroup
data-wd-key={[groupPrefix, idx].join('-')} data-wd-key={[groupPrefix, idx].join('-')}
key={`group-${groupPrefix}`} key={`group-${groupPrefix}-${idx}`}
title={groupPrefix} title={groupPrefix}
isActive={!this.isCollapsed(groupPrefix, idx) || idx === this.props.selectedLayerIndex} isActive={!this.isCollapsed(groupPrefix, idx) || idx === this.props.selectedLayerIndex}
onActiveToggle={this.toggleLayerGroup.bind(this, groupPrefix, idx)} onActiveToggle={this.toggleLayerGroup.bind(this, groupPrefix, idx)}