bug(Dropdown|Label): Remove overzealous prop validations (#828)

* bug(Dropdown|Label): Remove overzealous prop validations

* Remove default removeIcon from Label

Author: jeffcarbs

src/elements/Label/Label.js

@@ -1,3 +1,4 @@
+import _ from 'lodash'
 import cx from 'classnames'
 import React, { Component, PropTypes } from 'react'
 
@@ -107,10 +108,7 @@ export default class Label extends Component {
     onRemove: PropTypes.func,
 
     /** Shorthand for Icon to appear as the last child and trigger onRemove. */
-    removeIcon: customPropTypes.every([
-      customPropTypes.demand(['onRemove']),
-      customPropTypes.itemShorthand,
-    ]),
+    removeIcon: customPropTypes.itemShorthand,
 
     /** A label can appear as a ribbon attaching itself to an element. */
     ribbon: PropTypes.oneOfType([
@@ -125,10 +123,6 @@ export default class Label extends Component {
     tag: PropTypes.bool,
   }
 
-  static defaultProps = {
-    removeIcon: 'delete',
-  }
-
   static _meta = _meta
 
   static Detail = LabelDetail
@@ -201,13 +195,15 @@ export default class Label extends Component {
       return <ElementType {...rest} className={classes} onClick={this.handleClick}>{children}</ElementType>
     }
 
+    const removeIconShorthand = _.isUndefined(removeIcon) ? 'delete' : removeIcon
+
     return (
       <ElementType className={classes} onClick={this.handleClick} {...rest}>
         {Icon.create(icon)}
         {typeof image !== 'boolean' && Image.create(image)}
         {content}
         {createShorthand(LabelDetail, val => ({ content: val }), detail)}
-        {onRemove && Icon.create(removeIcon, { onClick: this.handleRemove })}
+        {onRemove && Icon.create(removeIconShorthand, { onClick: this.handleRemove })}
       </ElementType>
     )
   }

src/modules/Dropdown/Dropdown.js

@@ -121,10 +121,10 @@ export default class Dropdown extends Component {
     /** A dropdown menu can contain a header. */
     header: PropTypes.node,
 
-    /** Add an icon by name or as a component. */
+    /** Shorthand for Icon. */
     icon: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
+      PropTypes.node,
+      PropTypes.object,
     ]),
 
     /** A dropdown can be formatted to appear inline in other content. */
@@ -199,10 +199,7 @@ export default class Dropdown extends Component {
      * A function that takes (data, index, defaultLabelProps) and returns
      * shorthand for Label .
      */
-    renderLabel: customPropTypes.every([
-      customPropTypes.demand(['multiple']),
-      PropTypes.func,
-    ]),
+    renderLabel: PropTypes.func,
 
     /** A dropdown can have its menu scroll. */
     scrolling: PropTypes.bool,

src/modules/Search/Search.js

@@ -43,10 +43,11 @@ export default class Search extends Component {
     // ------------------------------------
     // Behavior
     // ------------------------------------
-    /** Add an icon by name or as a component. */
+
+    /** Shorthand for Icon. */
     icon: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
+      PropTypes.node,
+      PropTypes.object,
     ]),
 
     /**