-
-
Notifications
You must be signed in to change notification settings - Fork 114
ColorPicker => MultiColorPicker #625
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.
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
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ca87777
Replace batch colouring code in MarkerColor by MultiColorPicker
VeraZab 5427939
Replace all ColorPickers by MultiColorPickers
VeraZab 5d0d936
Better defaults
VeraZab 31050fc
Not needed
VeraZab 4987554
Use parentSelectedConstantColorOption
VeraZab File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| import React, {Component} from 'react'; | ||
| import Color from './Color'; | ||
| import Colorscale from './Colorscale'; | ||
| import Info from './Info'; | ||
| import Field from './Field'; | ||
| import RadioBlocks from '../widgets/RadioBlocks'; | ||
| import PropTypes from 'prop-types'; | ||
| import {adjustColorscale, connectToContainer} from 'lib'; | ||
|
|
||
| class UnconnectedMultiColorPicker extends Component { | ||
| constructor(props, context) { | ||
| super(props, context); | ||
| this.state = { | ||
| selectedConstantColorOption: | ||
| context.traceIndexes.length > 1 && | ||
| props.fullValue.every(v => v[1] === props.fullValue[0][1]) | ||
| ? 'single' | ||
| : 'multiple', | ||
| }; | ||
| this.setColor = this.setColor.bind(this); | ||
| this.setColors = this.setColors.bind(this); | ||
| } | ||
|
|
||
| setColor(color) { | ||
| this.props.updatePlot(color); | ||
| } | ||
|
|
||
| setColors(colorscale, colorscaleType) { | ||
| const numberOfTraces = this.context.traceIndexes.length; | ||
| const colors = colorscale.map(c => c[1]); | ||
|
|
||
| let adjustedColors = colors; | ||
|
|
||
| if (colorscaleType !== 'categorical') { | ||
| adjustedColors = adjustColorscale(colors, numberOfTraces, colorscaleType); | ||
| } | ||
|
|
||
| if ( | ||
| adjustedColors.every(c => c === adjustedColors[0]) || | ||
| colorscaleType === 'categorical' | ||
| ) { | ||
| adjustedColors = adjustColorscale( | ||
| colors, | ||
| numberOfTraces, | ||
| colorscaleType, | ||
| {repeat: true} | ||
| ); | ||
| } | ||
|
|
||
| const updates = adjustedColors.map(color => ({ | ||
| [this.props.attr]: color, | ||
| })); | ||
|
|
||
| this.context.updateContainer(updates); | ||
| } | ||
|
|
||
| render() { | ||
| const _ = this.context.localize; | ||
| const constantOptions = [ | ||
| {label: _('Single'), value: 'single'}, | ||
| {label: _('Multiple'), value: 'multiple'}, | ||
| ]; | ||
| const selectedConstantColorOption = this.props | ||
| .parentSelectedConstantColorOption | ||
| ? this.props.parentSelectedConstantColorOption | ||
| : this.state.selectedConstantColorOption; | ||
|
|
||
| const multiMessage = this.props.multiColorMessage | ||
| ? this.props.multiColorMessage | ||
| : _('Each will be colored according to the selected colors.'); | ||
|
|
||
| const singleMessage = this.props.singleColorMessage | ||
| ? this.props.singleColorMessage | ||
| : _('All will be colored in the same color.'); | ||
|
|
||
| if (this.context.traceIndexes.length > 1) { | ||
| return ( | ||
| <Field {...this.props} suppressMultiValuedMessage> | ||
| <RadioBlocks | ||
| options={constantOptions} | ||
| activeOption={ | ||
| this.props.parentSelectedConstantColorOption | ||
| ? this.props.parentSelectedConstantColorOption | ||
| : this.state.selectedConstantColorOption | ||
| } | ||
| onOptionChange={ | ||
| this.props.onConstantColorOptionChange | ||
| ? this.props.onConstantColorOptionChange | ||
| : value => this.setState({selectedConstantColorOption: value}) | ||
| } | ||
| /> | ||
| <Info> | ||
| {selectedConstantColorOption === 'single' | ||
| ? singleMessage | ||
| : multiMessage} | ||
| </Info> | ||
| {selectedConstantColorOption === 'single' ? ( | ||
| <Color | ||
| attr={this.props.attr} | ||
| updatePlot={ | ||
| this.props.setColor ? this.props.setColor : this.setColor | ||
| } | ||
| /> | ||
| ) : ( | ||
| <Colorscale | ||
| suppressMultiValuedMessage | ||
| attr={this.props.attr} | ||
| updatePlot={this.setColors} | ||
| fullValue={this.props.fullValue} | ||
| initialCategory={'categorical'} | ||
| /> | ||
| )} | ||
| </Field> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <Color | ||
| attr={this.props.attr} | ||
| updatePlot={this.props.setColor ? this.props.setColor : this.setColor} | ||
| label={this.props.label} | ||
| /> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| UnconnectedMultiColorPicker.propTypes = { | ||
| multiColorMessage: PropTypes.string, | ||
| singleColorMessage: PropTypes.string, | ||
| updatePlot: PropTypes.func, | ||
| attr: PropTypes.string, | ||
| parentSelectedConstantColorOption: PropTypes.string, | ||
| onConstantColorOptionChange: PropTypes.func, | ||
| messageKeyWordSingle: PropTypes.string, | ||
| messageKeyWordPlural: PropTypes.string, | ||
| ...Field.propTypes, | ||
| }; | ||
|
|
||
| UnconnectedMultiColorPicker.contextTypes = { | ||
| localize: PropTypes.func, | ||
| updateContainer: PropTypes.func, | ||
| traceIndexes: PropTypes.array, | ||
| fullData: PropTypes.array, | ||
| }; | ||
|
|
||
| export default connectToContainer(UnconnectedMultiColorPicker, { | ||
| modifyPlotProps(props, context, plotProps) { | ||
| if (plotProps.isVisible) { | ||
| plotProps.fullValue = context.traceIndexes | ||
| .map(index => { | ||
| const trace = context.fullData.filter( | ||
| trace => trace.index === index | ||
| )[0]; | ||
|
|
||
| const properties = props.attr.split('.'); | ||
| let value = trace; | ||
|
|
||
| properties.forEach(prop => { | ||
| value = value[prop]; | ||
| }); | ||
|
|
||
| return value; | ||
| }) | ||
| .map(c => [0, c]); | ||
| } | ||
| }, | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why not just pass updatePlot as a prop?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is passed, from the connect wrapper, I just prefer having a separate function,
one setColor, one setColors, that's all