Merge master

Author: jquense

.eslintrc

@@ -13,15 +13,12 @@
     "babel"
   ],
   "rules": {
-    "brace-style": 0,
     "constructor-super": 2,
     "comma-dangle": 0,
     "comma-spacing": 2,
     "comma-style": [2, "last"],
-    "default-case": 0,
     "func-names": 0,
     "guard-for-in": 0,
-    "indent": 0,
     "one-var": [2, { "initialized": "never" }],
     "padded-blocks": 0,
     "prefer-const": 0,

docs/examples/ButtonInput.js

@@ -17,8 +17,8 @@ const ButtonInputExample = React.createClass({
     let length = this.refs.input.getValue().length;
     let style = 'danger';
 
-    if (length > 10) { style = 'success'; }
-    else if (length > 5) { style = 'warning'; }
+    if (length > 10) style = 'success';
+    else if (length > 5) style = 'warning';
 
     let disabled = style !== 'success';
 

docs/examples/Input.js

@@ -7,9 +7,9 @@ const ExampleInput = React.createClass({
 
   validationState() {
     let length = this.state.value.length;
-    if (length > 10) { return 'success'; }
-    else if (length > 5) { return 'warning'; }
-    else if (length > 0) { return 'error'; }
+    if (length > 10) return 'success';
+    else if (length > 5) return 'warning';
+    else if (length > 0) return 'error';
   },
 
   handleChange() {

docs/src/Anchor.js

@@ -2,7 +2,10 @@ import React from 'react';
 
 const Anchor = React.createClass({
   propTypes: {
-    id: React.PropTypes.string
+    id: React.PropTypes.oneOfType([
+      React.PropTypes.string,
+      React.PropTypes.number
+    ])
   },
   render() {
     return (

docs/src/PropTable.js

@@ -146,28 +146,28 @@ const PropTable = React.createClass({
     let doclets = prop.doclets || {};
 
     switch (name) {
-      case 'object':
-        return name;
-      case 'union':
-        return type.value.reduce((current, val, i, list) => {
-          let item = this.getType({ type: val });
-          if (React.isValidElement(item)) {
-            item = React.cloneElement(item, {key: i});
-          }
-          current = current.concat(item);
-
-          return i === (list.length - 1) ? current : current.concat(' | ');
-        }, []);
-      case 'array':
-        let child = this.getType({ type: type.value });
-
-        return <span>{'array<'}{ child }{'>'}</span>;
-      case 'enum':
-        return this.renderEnum(type);
-      case 'custom':
-        return cleanDocletValue(doclets.type || name);
-      default:
-        return name;
+    case 'object':
+      return name;
+    case 'union':
+      return type.value.reduce((current, val, i, list) => {
+        let item = this.getType({ type: val });
+        if (React.isValidElement(item)) {
+          item = React.cloneElement(item, {key: i});
+        }
+        current = current.concat(item);
+
+        return i === (list.length - 1) ? current : current.concat(' | ');
+      }, []);
+    case 'array':
+      let child = this.getType({ type: type.value });
+
+      return <span>{'array<'}{ child }{'>'}</span>;
+    case 'enum':
+      return this.renderEnum(type);
+    case 'custom':
+      return cleanDocletValue(doclets.type || name);
+    default:
+      return name;
     }
   },
 

package.json

@@ -17,7 +17,10 @@
     "docs-build": "babel-node tools/build-cli.js --docs-only",
     "docs": "babel-node docs/dev-run",
     "docs-prod": "npm run docs-build && NODE_ENV=production babel-node docs/server.js",
-    "docs-prod-unoptimized": "npm run docs-build -- --dev && NODE_ENV=production babel-node docs/server.js"
+    "docs-prod-unoptimized": "npm run docs-build -- --dev && NODE_ENV=production babel-node docs/server.js",
+
+    "minor": "node ./tools/release minor",
+    "patch": "node ./tools/release patch"
   },
   "main": "lib/index.js",
   "directories": {
@@ -56,10 +59,10 @@
     "css-loader": "^0.16.0",
     "es5-shim": "^4.1.10",
     "eslint": "^1.1.0",
-    "eslint-config-airbnb": "0.0.7",
+    "eslint-config-airbnb": "0.0.8",
     "eslint-plugin-babel": "^2.0.0",
     "eslint-plugin-lodash": "^0.1.3",
-    "eslint-plugin-mocha": "^0.4.0",
+    "eslint-plugin-mocha": "^0.5.1",
     "eslint-plugin-react": "^3.1.0",
     "express": "^4.13.1",
     "extract-text-webpack-plugin": "^0.8.2",

src/AffixMixin.js

@@ -32,7 +32,7 @@ const AffixMixin = {
 
   checkPosition() {
     let DOMNode, scrollHeight, scrollTop, position, offsetTop, offsetBottom,
-        affix, affixType, affixPositionTop;
+      affix, affixType, affixPositionTop;
 
     // TODO: or not visible
     if (!this.isMounted()) {

src/Carousel.js

@@ -249,18 +249,18 @@ const Carousel = React.createClass({
             this.state.previousActiveIndex === index && this.props.slide;
 
     return cloneElement(
-        child,
-        {
-          active: isActive,
-          ref: child.ref,
-          key: child.key ? child.key : index,
-          index,
-          animateOut: isPreviousActive,
-          animateIn: isActive && this.state.previousActiveIndex != null && this.props.slide,
-          direction: this.state.direction,
-          onAnimateOutEnd: isPreviousActive ? this.handleItemAnimateOutEnd : null
-        }
-      );
+      child,
+      {
+        active: isActive,
+        ref: child.ref,
+        key: child.key ? child.key : index,
+        index,
+        animateOut: isPreviousActive,
+        animateIn: isActive && this.state.previousActiveIndex != null && this.props.slide,
+        direction: this.state.direction,
+        onAnimateOutEnd: isPreviousActive ? this.handleItemAnimateOutEnd : null
+      }
+    );
   },
 
   handleSelect(index, direction) {

src/Dropdown.js

@@ -108,21 +108,21 @@ class Dropdown extends React.Component {
     };
 
     switch(event.keyCode) {
-      case keycode.codes.down:
-        if (!this.props.open) {
-          this.toggleOpen();
-        }
-        else {
-          focusNext();
-        }
-        event.preventDefault();
-        break;
-      case keycode.codes.esc:
-      case keycode.codes.tab:
-        if (this.props.open) {
-          this.handleClose(event);
-        }
-        break;
+    case keycode.codes.down:
+      if (!this.props.open) {
+        this.toggleOpen();
+      } else {
+        focusNext();
+      }
+      event.preventDefault();
+      break;
+    case keycode.codes.esc:
+    case keycode.codes.tab:
+      if (this.props.open) {
+        this.handleClose(event);
+      }
+      break;
+    default:
     }
   }
 
@@ -136,8 +136,7 @@ class Dropdown extends React.Component {
     // to the next focusable input
     if (event && event.keyCode === keycode.codes.tab){
       setTimeout(this.toggleOpen);
-    }
-    else {
+    } else {
       this.toggleOpen();
     }
 

src/DropdownMenu.js

@@ -3,7 +3,7 @@ import keycode from 'keycode';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import RootCloseWrapper from 'react-overlays/lib/RootCloseWrapper';
-
+import ValidComponentChildren from './utils/ValidComponentChildren';
 import createChainedFunction from './utils/createChainedFunction';
 
 class DropdownMenu extends React.Component {
@@ -21,18 +21,19 @@ class DropdownMenu extends React.Component {
   handleKeyDown(event) {
 
     switch(event.keyCode) {
-      case keycode.codes.down:
-        this.focusNext();
-        event.preventDefault();
-        break;
-      case keycode.codes.up:
-        this.focusPrevious();
-        event.preventDefault();
-        break;
-      case keycode.codes.esc:
-      case keycode.codes.tab:
-        this.props.onClose(event);
-        break;
+    case keycode.codes.down:
+      this.focusNext();
+      event.preventDefault();
+      break;
+    case keycode.codes.up:
+      this.focusPrevious();
+      event.preventDefault();
+      break;
+    case keycode.codes.esc:
+    case keycode.codes.tab:
+      this.props.onClose(event);
+      break;
+    default:
     }
   }
 
@@ -77,7 +78,7 @@ class DropdownMenu extends React.Component {
   }
 
   render() {
-    const items = React.Children.map(this.props.children, child => {
+    const items = ValidComponentChildren.map(this.props.children, child => {
       let {
         children,
         onKeyDown,