From 383ac9545b16c55e4a71abf02980c2b48035062c Mon Sep 17 00:00:00 2001
From: Carlos <echoulen@gmail.com>
Date: Fri, 15 Jun 2018 21:28:44 +0800
Subject: [PATCH] improve UI/UX

---
 package.json   | 17 ++++++++++++-----
 src/Themes.tsx | 43 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 19e3a59..819508b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "storybook-addon-styled-component-theme",
   "version": "1.0.1",
-  "description": "storybook addon",
+  "description": "storybook addon with styled-components theme",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -12,23 +12,30 @@
   "author": "carlos",
   "license": "MIT",
   "dependencies": {
-    "recompose": "^0.27.1"
+    "recompose": "^0.27.1",
+    "immutable": "^3.8.2"
   },
   "devDependencies": {
+    "react": "^16.4.1",
     "@storybook/addons": "^4.0.0-alpha.9",
     "@types/node": "^10.3.3",
     "@types/react": "^16.3.17",
     "@types/recompose": "^0.26.1",
-    "immutable": "^3.8.2",
     "rimraf": "^2.6.2",
     "styled-components": "^3.3.2",
     "typescript": "^2.9.2"
   },
   "peerDependencies": {
     "@storybook/addons": "^4.0.0-alpha.9",
-    "immutable": "^3.8.2",
     "react": "^16.4.1",
     "styled-components": "^3.3.2"
   },
-  "keywords": ["storybook", "styled-component", "addon", "theme", "react", "typescript"]
+  "keywords": [
+    "storybook",
+    "styled-component",
+    "addon",
+    "theme",
+    "react",
+    "typescript"
+  ]
 }
diff --git a/src/Themes.tsx b/src/Themes.tsx
index c19ac1f..2d1e823 100644
--- a/src/Themes.tsx
+++ b/src/Themes.tsx
@@ -9,37 +9,58 @@ export interface ThemeProps {
 }
 
 interface ThemeState {
+    theme: Theme;
+    setTheme: (theme: Theme) => void;
     themes: List<Theme>;
     setThemes: (themes: List<Theme>) => void;
 }
 
 interface ThemeHandler {
     onSelectTheme: (theme: Theme) => void;
+    onReceiveThemes: (theme: Theme[]) => void;
 }
 
 type BaseComponentProps = ThemeProps & ThemeState & ThemeHandler;
 
-const BaseComponent: React.SFC<BaseComponentProps> = ({onSelectTheme, themes}) => (
+const BaseComponent: React.SFC<BaseComponentProps> = ({onSelectTheme, themes, theme}) => (
     <div style={RowStyle}>
-        {themes.map((theme, i) => <div style={ButtonStyle} key={i} onClick={() => onSelectTheme(theme)}>{theme.name}</div>).toArray()}
+        {themes.map((th, i) => {
+            const buttonStyle = th === theme ? SelectedButtonStyle : ButtonStyle;
+            return <div style={buttonStyle} key={i} onClick={() => onSelectTheme(th)}>{th.name}</div>;
+        }).toArray()}
     </div>
 );
 
 export const Themes = compose<BaseComponentProps, ThemeProps>(
+    withState("theme", "setTheme", null),
     withState("themes", "setThemes", List()),
     withHandlers<ThemeProps & ThemeState, ThemeHandler>({
-        onSelectTheme: ({channel}) => (theme) => {
+        onSelectTheme: ({channel, setTheme}) => (theme) => {
+            setTheme(theme);
             channel.emit("selectTheme", theme);
         },
+        onReceiveThemes: ({setTheme, setThemes, channel}) => (newThemes: Theme[]) => {
+            const themes = List(newThemes);
+            setThemes(List(themes));
+            if (themes.count() > 0) {
+                const theme = themes.first();
+                setTheme(theme);
+                channel.emit("selectTheme", theme);
+            }
+        },
     }),
     lifecycle<BaseComponentProps, BaseComponentProps>({
         componentDidMount() {
-            const {channel, setThemes} = this.props;
-            channel.on("setThemes", (themes) => setThemes(List(themes)));
+            const {channel, onReceiveThemes} = this.props;
+            channel.on("setThemes", onReceiveThemes);
+        },
+        componentWillUnmount() {
+            const {channel, onReceiveThemes} = this.props;
+            channel.removeListener("setThemes", onReceiveThemes);
         },
     }),
     branch<BaseComponentProps>(
-        ({themes}) => !themes,
+        ({theme}) => !theme,
         renderNothing,
     ),
 )(BaseComponent);
@@ -52,8 +73,16 @@ const RowStyle: React.CSSProperties = {
 
 const ButtonStyle: React.CSSProperties = {
     border: "1px solid #BBB",
-    borderRadius: "3px",
+    borderRadius: "6px",
     color: "#BBB",
     padding: "15px 10px",
     marginRight: "15px",
+    cursor: "pointer",
+};
+
+const SelectedButtonStyle: React.CSSProperties = {
+    ...ButtonStyle,
+    borderColor: "#666",
+    color: "#666",
+    fontWeight: "bold",
 };