From ee0feeb527f50fb694b688b5e68c64425de8049b Mon Sep 17 00:00:00 2001
From: Jake Dexheimer <jakedex@gmail.com>
Date: Tue, 3 Oct 2017 03:22:04 -0700
Subject: [PATCH] Twitter colorpicker -> Sketch colorpicker

---
 components/Carbon.js      |  2 +-
 components/ColorPicker.js | 36 ++++++++++++++++++------------------
 lib/util.js               |  2 ++
 pages/editor.js           |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/components/Carbon.js b/components/Carbon.js
index 3e057f2..f2da23c 100644
--- a/components/Carbon.js
+++ b/components/Carbon.js
@@ -16,7 +16,7 @@ const DEFAULT_SETTINGS = {
   paddingHorizontal: '50px',
   marginVertical: '45px',
   marginHorizontal: '45px',
-  background: '#fed0ec',
+  background: 'rgba(171, 184, 195, 1)',
   theme: 'seti',
   language: DEFAULT_LANGUAGE
 }
diff --git a/components/ColorPicker.js b/components/ColorPicker.js
index 754aac7..b3ad148 100644
--- a/components/ColorPicker.js
+++ b/components/ColorPicker.js
@@ -1,8 +1,9 @@
 import React from 'react'
 import enhanceWithClickOutside from 'react-click-outside'
-import { TwitterPicker } from 'react-color'
+import { SketchPicker } from 'react-color'
 import WindowPointer from './WindowPointer'
 import { COLORS } from '../lib/constants'
+import { parseRGBA } from '../lib/util'
 
 class ColorPicker extends React.Component {
   constructor() {
@@ -21,7 +22,7 @@ class ColorPicker extends React.Component {
   }
 
   handlePickColor(color) {
-    this.props.onChange(color.hex)
+    this.props.onChange(parseRGBA(color.rgb))
   }
 
   render() {
@@ -35,11 +36,7 @@ class ColorPicker extends React.Component {
         </div>
         <div className="colorpicker-picker" hidden={!this.state.isVisible}>
           <WindowPointer fromLeft="15px" />
-          <TwitterPicker
-            color={this.props.bg}
-            onChangeComplete={this.handlePickColor}
-            triangle="hide"
-          />
+          <SketchPicker color={this.props.bg} onChangeComplete={this.handlePickColor} />
         </div>
         <style jsx>{`
           .colorpicker-container {
@@ -79,28 +76,31 @@ class ColorPicker extends React.Component {
           }
 
           /* react-color overrides */
-          .colorpicker-picker :global(.twitter-picker) {
-            width: 278px !important;
+          .colorpicker-picker :global(.sketch-picker) {
             border: 0.5px solid ${COLORS.SECONDARY} !important;
             border-radius: 3px !important;
             background: #1a1a1a !important;
           }
 
-          .colorpicker-picker > :global(div > div:nth-child(3) > div:nth-child(11)) {
-            background: #1a1a1a !important;
-            border: 0.5px solid ${COLORS.SECONDARY} !important;
-            border-right: none !important;
-            border-radius: 3px 0 0 3px !important;
+          .colorpicker-picker > :global(.sketch-picker > div:nth-child(3) > div > div > span) {
             color: ${COLORS.SECONDARY} !important;
           }
 
-          .colorpicker-picker > :global(div > div:nth-child(3) > div:nth-child(12) > input) {
-            background: rgba(255, 255, 255, 0.165) !important;
+          .colorpicker-picker > :global(.sketch-picker > div:nth-child(3) > div > div > input) {
+            width: 100% !important;
+            box-shadow: none;
+            outline: none;
+            border-radius: 2px;
+            background: rgba(255, 255, 255, 0.165);
             color: #fff !important;
           }
 
-          .colorpicker-picker > :global(div > div:nth-child(3) > span > div) {
-            border-radius: 2px !important;
+          .colorpicker-picker
+            > :global(.sketch-picker
+              > div:nth-child(2)
+              > div:nth-child(1)
+              > div:nth-child(2), .sketch-picker > div:nth-child(2) > div:nth-child(2)) {
+            background: #fff;
           }
         `}</style>
       </div>
diff --git a/lib/util.js b/lib/util.js
index 9f56745..ffa9944 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -9,5 +9,7 @@ const parse = v => {
   } catch (e) {}
 }
 
+export const parseRGBA = obj => `rgba(${obj.r},${obj.g},${obj.b},${obj.a})`
+
 export const getState = morph.compose(parse, morph.get(KEY))
 export const saveState = (window, v) => assign(window, JSON.stringify(v))
diff --git a/pages/editor.js b/pages/editor.js
index fe452b9..b3c328f 100644
--- a/pages/editor.js
+++ b/pages/editor.js
@@ -43,7 +43,7 @@ class Editor extends React.Component {
   constructor(props) {
     super(props)
     this.state = {
-      background: '#ABB8C3',
+      background: 'rgba(171, 184, 195, 1)',
       theme: THEMES.seti.id,
       language: DEFAULT_LANGUAGE,
       dropShadow: true,