Fix margins in source editing area

This commit is contained in:
Lukas Martinelli
2016-12-31 14:02:14 +01:00
parent ca6b48843c
commit 4f26a521a0
4 changed files with 26 additions and 15 deletions

View File

@@ -13,6 +13,7 @@ import LayerSourceLayerBlock from './LayerSourceLayerBlock'
import InputBlock from '../inputs/InputBlock'
import MultiButtonInput from '../inputs/MultiButtonInput'
import input from '../../config/input.js'
import { changeType, changeProperty } from '../../libs/layer'
import layout from '../../config/layout.json'
import { margins, fontSizes } from '../../config/scales'
@@ -106,13 +107,6 @@ export default class LayerEditor extends React.Component {
/>
</div>
case 'source': return <div>
{this.props.layer.filter &&
<FilterEditor
filter={this.props.layer.filter}
properties={this.props.vectorLayers[this.props.layer['source-layer']]}
onChange={f => this.changeProperty(null, 'filter', f)}
/>
}
<LayerSourceBlock
sourceIds={Object.keys(this.props.sources)}
value={this.props.layer.source}
@@ -123,6 +117,15 @@ export default class LayerEditor extends React.Component {
value={this.props.layer['source-layer']}
onChange={v => this.changeProperty(null, 'source-layer', v)}
/>
{this.props.layer.filter &&
<div style={input.property}>
<FilterEditor
filter={this.props.layer.filter}
properties={this.props.vectorLayers[this.props.layer['source-layer']]}
onChange={f => this.changeProperty(null, 'filter', f)}
/>
</div>
}
</div>
case 'properties': return <PropertyGroup
layer={this.props.layer}

View File

@@ -23,6 +23,7 @@ class LayerSourceBlock extends React.Component {
value={this.props.value}
onChange={this.props.onChange}
options={this.props.sourceIds.map(src => [src, src])}
wrapperStyle={{ width: '50%' }}
/>
</InputBlock>
}

View File

@@ -23,6 +23,7 @@ class LayerSourceLayer extends React.Component {
value={this.props.value}
onChange={this.props.onChange}
options={this.props.sourceLayerIds.map(l => [l, l])}
wrapperStyle={{ width: '50%' }}
/>
</InputBlock>
}