Skip to content

Github issue #317 [Specification] - no option to remove the color added #524

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
vikasrohit merged 1 commit into from
Nov 7, 2016
+12 −6
Merged

Github issue #317 [Specification] - no option to remove the color added #524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions src/components/ColorSelector/ColorSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ class ColorSelector extends React.Component {
const value = getValue() || defaultColors
const {isPickerVisible, newColor} = this.state

const updateNewColorPalette = (palette) => {
setValue(palette)
onChange(name, palette)
}

const onColorToggle = (color) => {
const index = value.indexOf(color)
let newValue
Expand All @@ -32,8 +37,7 @@ class ColorSelector extends React.Component {
newValue = tmp
}

setValue(newValue)
onChange(name, newValue)
updateNewColorPalette(newValue)
}

return (
Expand All @@ -51,7 +55,7 @@ class ColorSelector extends React.Component {
</span>
</a>
)}

{value.length < PROJECT_MAX_COLORS &&
<a
href="javascript:"
Expand All @@ -70,9 +74,11 @@ class ColorSelector extends React.Component {
<button type="button" className="tc-btn tc-btn-primary tc-btn-md"
onClick={() => {
this.setState({isPickerVisible: false})
const newValue = [...value, newColor]
setValue(newValue)
onChange(name, newValue)
const index = value.indexOf(this.state.newColor)
if (index === -1) {
const newValue = [ ...value, newColor ]
updateNewColorPalette(newValue)
}
}}
>Add</button>
<button
Expand Down