Merge pull request #512 from appirio-tech/feature/color-remove-option

Feature/color remove option

Author: vikasrohit

src/components/ColorSelector/ColorSelector.jsx

@@ -1,7 +1,6 @@
 import React, {PropTypes} from 'react'
 import './ColorSelector.scss'
 import { SketchPicker } from 'react-color'
-import _ from 'lodash'
 import { HOC as hoc } from 'formsy-react'
 import {PROJECT_MAX_COLORS} from '../../config/constants'
 import { Icons } from 'appirio-tech-react-components'
@@ -13,15 +12,14 @@ class ColorSelector extends React.Component {
 
     this.state = {
       isPickerVisible: false,
-      newColor: '#fff',
-      colors: _.uniq([...props.defaultColors, ...props.value])
+      newColor: '#fff'
     }
   }
 
   render() {
-    const {getValue, name, onChange, setValue} = this.props
-    const value = getValue() || []
-    const {isPickerVisible, colors, newColor} = this.state
+    const {getValue, name, onChange, setValue, defaultColors } = this.props
+    const value = getValue() || defaultColors
+    const {isPickerVisible, newColor} = this.state
 
     const onColorToggle = (color) => {
       const index = value.indexOf(color)
@@ -54,7 +52,7 @@ class ColorSelector extends React.Component {
           </a>
         )}
 
-        {colors.length < PROJECT_MAX_COLORS && 
+        {value.length < PROJECT_MAX_COLORS && 
           <a
             href="javascript:"
             onClick={() => this.setState({isPickerVisible: true})}
@@ -72,11 +70,6 @@ class ColorSelector extends React.Component {
                 <button type="button" className="tc-btn tc-btn-primary tc-btn-md"
                   onClick={() => {
                     this.setState({isPickerVisible: false})
-                    if (colors.indexOf(newColor) === -1) {
-                      this.setState({colors: [...colors, newColor], newColor: '#fff'})
-                    } else {
-                      this.setState({newColor: '#fff'})
-                    }
                     const newValue = [...value, newColor]
                     setValue(newValue)
                     onChange(name, newValue)