feat(shorthand): Custom shorthand proptypes

.github/CONTRIBUTING.md

@@ -490,7 +490,7 @@ Label.propTypes = {
   /** A label can reduce its complexity. */
   basic: PropTypes.bool,
 
-  /** Primary content of the label, same as text. */
+  /** Primary content. */
   children: PropTypes.node,
 
   /** Classes to add to the label className. */

src/addons/Portal/Portal.js

@@ -22,10 +22,10 @@ const _meta = {
  */
 class Portal extends Component {
   static propTypes = {
-    /** Primary content */
+    /** Primary content. */
     children: PropTypes.node.isRequired,
 
-    /** Classes to be added to the portal node element. */
+    /** Additional classes. */
     className: PropTypes.string,
 
     /** Controls whether or not the portal should close on a click outside. */

src/collections/Breadcrumb/Breadcrumb.js

@@ -55,13 +55,13 @@ Breadcrumb.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content of the Breadcrumb */
+  /** Primary content. */
   children: customPropTypes.every([
     customPropTypes.disallow(['sections', 'icon', 'divider']),
     PropTypes.node,
   ]),
 
-  /** Classes that will be added to the Breadcrumb className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** For use with the sections prop. Primary content of the Breadcrumb.Divider. */

src/collections/Breadcrumb/BreadcrumbDivider.js

@@ -33,13 +33,13 @@ BreadcrumbDivider.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content of the Breadcrumb.Divider. */
+  /** Primary content. */
   children: customPropTypes.every([
     customPropTypes.disallow(['icon']),
     PropTypes.node,
   ]),
 
-  /** Classes that will be added to the BreadcrumbDivider className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** Render as an `Icon` component with `divider` class instead of a `div`. */

src/collections/Breadcrumb/BreadcrumbSection.js

@@ -48,10 +48,10 @@ BreadcrumbSection.propTypes = {
   /** Style as the currently active section. */
   active: PropTypes.bool,
 
-  /** Primary content of the Breadcrumb.Section. */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(BreadcrumbSection),
 
-  /** Classes that will be added to the BreadcrumbSection className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** Render as an `a` tag instead of a `div`. */

src/collections/Form/Form.js

@@ -223,10 +223,10 @@ Form.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(Form),
 
-  /** Additional classes */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** Automatically show a loading indicator */

src/collections/Form/FormField.js

@@ -131,10 +131,10 @@ FormField.propTypes = {
     PropTypes.oneOf(FormField._meta.props.control),
   ]),
 
-  /** Primary content */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(FormField),
 
-  /** Additional classes to add */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** Individual fields may be disabled */

src/collections/Form/FormGroup.js

@@ -43,10 +43,10 @@ FormGroup.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content.  Intended to be Form Fields. */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(FormGroup),
 
-  /** Additional classes */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** Fields can show related choices */

src/collections/Grid/Grid.js

@@ -77,10 +77,10 @@ Grid.propTypes = {
   /** A grid can have its columns centered. */
   centered: PropTypes.bool,
 
-  /** Primary content of the Grid. */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(Grid),
 
-  /** Classes that will be added to the Grid className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** Represents column count per row in Grid. */

src/collections/Grid/GridColumn.js

@@ -64,10 +64,10 @@ GridColumn.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content of the GridColumn. */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(GridColumn),
 
-  /** Classes that will be added to the GridColumn className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** A column can specify a width for a computer. */

src/collections/Grid/GridRow.js

@@ -68,10 +68,10 @@ GridRow.propTypes = {
   /** A row can have its columns centered. */
   centered: PropTypes.bool,
 
-  /** Primary content of the GridRow. */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(GridRow),
 
-  /** Classes that will be added to the GridRow className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** A grid row can be colored. */

src/collections/Menu/Menu.js

@@ -54,10 +54,10 @@ class Menu extends Component {
     /** A menu item or menu can have no borders. */
     borderless: PropTypes.bool,
 
-    /** Primary content of the Menu. Mutually exclusive with items. */
-    children: PropTypes.node,
+    /** Primary content. */
+    children: customPropTypes.children(Menu),
 
-    /** Classes that will be added to the Menu className. */
+    /** Additional classes. */
     className: PropTypes.string,
 
     /** Additional colors can be specified. */

src/collections/Menu/MenuHeader.js

@@ -27,17 +27,14 @@ MenuHeader.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(MenuHeader),
 
-  /** Additional classes */
+  /** Additional classes. */
   className: PropTypes.string,
 
-  /** Shorthand for primary content */
-  content: PropTypes.oneOfType([
-    PropTypes.number,
-    PropTypes.string,
-  ]),
+  /** Shorthand for primary content. */
+  content: customPropTypes.nodeShorthand,
 }
 
 export default MenuHeader

src/collections/Menu/MenuItem.js

@@ -66,23 +66,17 @@ MenuItem.propTypes = {
   /** A menu item can be active. */
   active: PropTypes.bool,
 
-  /** Primary content of the MenuItem. */
-  children: customPropTypes.every([
-    customPropTypes.disallow(['content']),
-    PropTypes.node,
-  ]),
+  /** Primary content. */
+  children: customPropTypes.children(MenuItem),
 
-  /** Classes that will be added to the MenuItem className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** Additional colors can be specified. */
   color: PropTypes.oneOf(MenuItem._meta.props.color),
 
-  /** Shorthand for primary content of the MenuItem. Mutually exclusive with the children. */
-  content: customPropTypes.every([
-    customPropTypes.disallow(['children']),
-    PropTypes.string,
-  ]),
+  /** Shorthand for primary content. */
+  content: customPropTypes.nodeShorthand,
 
   /** A menu item or menu can remove element padding, vertically or horizontally. */
   fitted: PropTypes.oneOfType([

src/collections/Menu/MenuMenu.js

@@ -30,10 +30,10 @@ MenuMenu.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content of the MenuMenu. */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(MenuMenu),
 
-  /** Classes that will be added to the MenuMenu className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** A sub menu can take right position. */

src/collections/Message/Message.js

@@ -109,7 +109,7 @@ Message.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content of the message. */
+  /** Primary content. */
   children: customPropTypes.every([
     PropTypes.node,
     customPropTypes.disallow(['header', 'content']),

src/collections/Message/MessageContent.js

@@ -28,7 +28,7 @@ MessageContent.propTypes = {
   as: customPropTypes.as,
 
   /** Primary content. */
-  children: PropTypes.node,
+  children: customPropTypes.children(MessageContent),
 
   /** Additional classes. */
   className: PropTypes.node,

src/collections/Message/MessageHeader.js

@@ -28,7 +28,7 @@ MessageHeader.propTypes = {
   as: customPropTypes.as,
 
   /** Primary content. */
-  children: PropTypes.node,
+  children: customPropTypes.children(MessageHeader),
 
   /** Additional classes. */
   className: PropTypes.node,

src/collections/Message/MessageItem.js

@@ -28,7 +28,7 @@ MessageItem.propTypes = {
   as: customPropTypes.as,
 
   /** Primary content. */
-  children: PropTypes.node,
+  children: customPropTypes.children(MessageItem),
 
   /** Additional classes. */
   className: PropTypes.node,

src/collections/Message/MessageList.js

@@ -32,7 +32,7 @@ MessageList.propTypes = {
   as: customPropTypes.as,
 
   /** Primary content. */
-  children: PropTypes.node,
+  children: customPropTypes.children(MessageList),
 
   /** Additional classes. */
   className: PropTypes.node,

src/collections/Table/Table.js

@@ -83,7 +83,7 @@ function Table(props) {
   return (
     <ElementType {...rest} className={classes}>
       {headerRow && <TableHeader>{TableRow.create(headerRow, { cellAs: 'th' })}</TableHeader>}
-      {<TableBody>{_.map(tableData, (data, index) => TableRow.create(renderBodyRow(data, index)))}</TableBody>}
+      <TableBody>{_.map(tableData, (data, index) => TableRow.create(renderBodyRow(data, index)))}</TableBody>
       {footerRow && <TableFooter>{TableRow.create(footerRow)}</TableFooter>}
     </ElementType>
   )
@@ -126,13 +126,10 @@ Table.propTypes = {
   /** A table may be divided each row into separate cells. */
   celled: PropTypes.bool,
 
-  /** Primary content of the Table. */
-  children: customPropTypes.every([
-    customPropTypes.disallow(['headerRow', 'renderBodyRow', 'footerRow', 'tableData']),
-    PropTypes.node,
-  ]),
+  /** Primary content. */
+  children: customPropTypes.children(Table),
 
-  /** Classes that will be added to the Table className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** A table can be collapsing, taking up only as much space as its rows. */
@@ -159,16 +156,10 @@ Table.propTypes = {
   fixed: PropTypes.bool,
 
   /** Shorthand for a TableRow to be placed within Table.Footer. */
-  footerRow: PropTypes.oneOfType([
-    PropTypes.array,
-    PropTypes.element,
-  ]),
+  footerRow: customPropTypes.collectionShorthand,
 
   /** Shorthand for a TableRow to be placed within Table.Header. */
-  headerRow: PropTypes.oneOfType([
-    PropTypes.array,
-    PropTypes.element,
-  ]),
+  headerRow: customPropTypes.collectionShorthand,
 
   /** A table's colors can be inverted. */
   inverted: PropTypes.bool,
@@ -184,6 +175,7 @@ Table.propTypes = {
    * to be placed within Table.Body.
    */
   renderBodyRow: customPropTypes.every([
+    customPropTypes.disallow(['children']),
     customPropTypes.demand(['tableData']),
     PropTypes.func,
   ]),
@@ -208,6 +200,7 @@ Table.propTypes = {
 
   /** Data to be passed to the renderBodyRow function. */
   tableData: customPropTypes.every([
+    customPropTypes.disallow(['children']),
     customPropTypes.demand(['renderBodyRow']),
     PropTypes.array,
   ]),

src/collections/Table/TableBody.js

@@ -31,10 +31,10 @@ TableBody.propTypes = {
   /** An element type to render as (string or function). */
   as: customPropTypes.as,
 
-  /** Primary content of the TableBody. */
-  children: PropTypes.node,
+  /** Primary content. */
+  children: customPropTypes.children(TableBody),
 
-  /** Classes that will be added to the TableBody className. */
+  /** Additional classes. */
   className: PropTypes.string,
 }
 

src/collections/Table/TableCell.js

@@ -85,23 +85,17 @@ TableCell.propTypes = {
   /** A cell can be active or selected by a user. */
   active: PropTypes.bool,
 
-  /** Primary content of the TableCell. */
-  children: customPropTypes.every([
-    customPropTypes.disallow(['content', 'icon']),
-    PropTypes.node,
-  ]),
+  /** Primary content. */
+  children: customPropTypes.children(TableCell),
 
-  /** Classes that will be added to the TableCell className. */
+  /** Additional classes. */
   className: PropTypes.string,
 
   /** A cell can be collapsing so that it only uses as much space as required. */
   collapsing: PropTypes.bool,
 
-  /** Shorthand for primary content of the TableCell. Mutually exclusive with the children. */
-  content: customPropTypes.every([
-    customPropTypes.disallow(['children']),
-    PropTypes.string,
-  ]),
+  /** Shorthand for primary content. */
+  content: customPropTypes.nodeShorthand,
 
   /** A cell can be disabled. */
   disabled: PropTypes.bool,
@@ -110,14 +104,7 @@ TableCell.propTypes = {
   error: PropTypes.bool,
 
   /** Add an Icon by name, props object, or pass an <Icon /> */
-  icon: customPropTypes.every([
-    customPropTypes.disallow(['children']),
-    PropTypes.oneOfType([
-      PropTypes.number,
-      PropTypes.string,
-      PropTypes.element,
-    ]),
-  ]),
+  icon: customPropTypes.itemShorthand,
 
   /** A cell may let a user know whether a value is bad. */
   negative: PropTypes.bool,