Skip to content

Improving the color map select styles #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomasneirynck merged 2 commits into from
Feb 20, 2020
Merged

Improving the color map select styles #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c96a65e
Improving color map select styles
elizabetdev Feb 20, 2020
6695130
Merge branch 'number_ordinals' of https://github.com/thomasneirynck/k…
elizabetdev Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 20 additions & 30 deletions x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,26 +94,20 @@ export class ColorMapSelect extends Component {

if (this.props.colorMapType === COLOR_MAP_TYPE.ORDINAL) {
return (
<Fragment>
<EuiSpacer size="s" />
<ColorStopsOrdinal
colorStops={this.state.customColorMap}
onChange={this._onCustomColorMapChange}
/>
</Fragment>
<ColorStopsOrdinal
colorStops={this.state.customColorMap}
onChange={this._onCustomColorMapChange}
/>
);
}

return (
<Fragment>
<EuiSpacer size="s" />
<ColorStopsCategorical
colorStops={this.state.customColorMap}
field={this.props.styleProperty.getField()}
getValueSuggestions={this.props.styleProperty.getValueSuggestions}
onChange={this._onCustomColorMapChange}
/>
</Fragment>
<ColorStopsCategorical
colorStops={this.state.customColorMap}
field={this.props.styleProperty.getField()}
getValueSuggestions={this.props.styleProperty.getValueSuggestions}
onChange={this._onCustomColorMapChange}
/>
);
}

Expand All @@ -137,40 +131,36 @@ export class ColorMapSelect extends Component {

let toggle;
if (this.props.showColorMapTypeToggle) {
toggle = <EuiFlexItem>{this._renderColorMapToggle()}</EuiFlexItem>;
toggle = <EuiFlexItem grow={false}>{this._renderColorMapToggle()}</EuiFlexItem>;
} else {
toggle = <Fragment />;
}

return (
<Fragment>
<EuiFlexGroup gutterSize={'none'}>
{toggle}
<EuiFlexItem>
<EuiSuperSelect
compressed
options={colorMapOptionsWithCustom}
onChange={this._onColorMapSelect}
valueOfSelected={valueOfSelected}
hasDividers={true}
/>
</EuiFlexItem>
</Fragment>
</EuiFlexGroup>
);
}

render() {
return (
<Fragment>
<EuiFlexGroup gutterSize={'none'} direction={'column'}>
<EuiFlexItem>
<EuiFlexGroup gutterSize={'xs'} justifyContent="spaceBetween">
{this._renderColorMapSelections()}
</EuiFlexGroup>
</EuiFlexItem>
<EuiFlexItem>
<EuiFlexGroup gutterSize={'xs'}>
<EuiFlexItem>{this._renderColorStopsInput()}</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
{this._renderColorMapSelections()}

<EuiSpacer size="s" />

<EuiFlexGroup>
<EuiFlexItem>{this._renderColorStopsInput()}</EuiFlexItem>
</EuiFlexGroup>
</Fragment>
);
Expand Down