Merge branch 'beanie'

Author: kaustubhxd

README.md

@@ -68,7 +68,7 @@ The options can be passed into genConfig or as React props
 | `faceColor`    | string |         |                                              |                      |
 | `earSize`      | string |         | small, big                                   |                      |
 | `hairColor`    | string |         |                                              |                      |
-| `hairStyle`    | string |         | normal, thick, mohawk, womanLong, womanShort |                      |
+| `hairStyle`    | string |         | normal, thick, mohawk, womanLong, womanShort, beanie |                      |
 | `hairColorRandom` | boolean |  false   |                           | thick,mohawk default only be black |
 | `eyeStyle`     | string |         | circle, oval, smile                          |                      |
 | `glassesStyle` | string |         | none, round, square                          | Usually is none      |

demo/Single.js

@@ -230,6 +230,11 @@ export default class Single extends Component {
               onClick={this.updateConfig.bind(this, "hairStyle", "turban")}>
               Turban
             </p>
+            <p
+              className={classnames("opt", { active: config.hairStyle === "beanie" })}
+              onClick={this.updateConfig.bind(this, "hairStyle", "beanie")}>
+              Beanie
+            </p>
           </div>
 
           {/* Eyes */}

react-nice-avatar.d.ts

@@ -9,7 +9,7 @@ export interface AvatarConfig {
   faceColor?: string,
   earSize?: 'small' | 'big',
   hairColor?: string,
-  hairStyle?: 'normal' | 'thick' | 'mohawk' | 'womanLong' | 'womanShort' | 'turban',
+  hairStyle?: 'normal' | 'thick' | 'mohawk' | 'womanLong' | 'womanShort' | 'beanie' |'turban',
   eyeStyle?: 'circle' | 'oval' | 'smile',
   glassesStyle?: 'round' | 'square' | 'none',
   noseStyle?: 'short' | 'long' | 'round',

src/hair/beanie.js

@@ -6,6 +6,7 @@ import Mohawk from "./mohawk";
 import WomanLong from "./womanLong";
 import WomanShort from "./womanShort";
 import Turban from './turban';
+import Beanie from "./beanie";
 
 export default function (props) {
   const { style, color, colorRandom } = props;
@@ -14,8 +15,9 @@ export default function (props) {
     case "mohawk": return <Mohawk color={color} colorRandom={colorRandom} />;
     case "womanLong": return <WomanLong color={color} />;
     case "womanShort": return <WomanShort color={color} />;
-    case "turban" : return <Turban color={color}/>
-    case "normal":
+    case 'beanie': return <Beanie color={color} />;
+    case "turban" : return <Turban color={color}/>;
+    case "normal": 
     default:
       return <Normal color={color} />;
   }

src/hair/index.js

@@ -15,7 +15,7 @@ const sex = ["man", "woman"];
 const faceColor = ["#F9C9B6", "#AC6651"];
 const earSize = ["small", "big"];
 const hairColor = ["#000", "#fff", "#77311D", "#FC909F", "#D2EFF3", "#506AF4", "#F48150"];
-const hairStyleMan = ["normal", "thick", "mohawk","turban"];
+const hairStyleMan = ["normal", "thick", "mohawk","beanie","turban"];
 const hairStyleWoman = ["normal", "womanLong", "womanShort"];
 const eyeBrowWoman = ["up", "upWoman"];
 const eyeStyle = ["circle", "oval", "smile"];
@@ -46,7 +46,7 @@ export default class ReactNiceAvatar extends Component {
     faceColor: PropTypes.string,
     earSize: PropTypes.oneOf(["small", "big"]),
     hairColor: PropTypes.string,
-    hairStyle: PropTypes.oneOf(["normal", "thick", "mohawk", "womanLong", "womanShort","turban"]),
+    hairStyle: PropTypes.oneOf(["normal", "thick", "mohawk", "womanLong", "womanShort","beanie","turban"]),
     hairColorRandom: PropTypes.bool,
     eyeStyle: PropTypes.oneOf(["circle", "oval", "smile"]),
     glassesStyle: PropTypes.oneOf(["round", "square", "none"]),