style(Checkbox|Flag|Image|Radio): propTypes cleanups

src/addons/Radio/Radio.js

@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react'
+import React from 'react'
 
 import { getUnhandledProps, META } from '../../lib'
 import Checkbox from '../../modules/Checkbox'
@@ -23,9 +23,6 @@ function Radio(props) {
 Radio._meta = {
   name: 'Radio',
   type: META.TYPES.ADDON,
-  props: {
-    type: Checkbox._meta.props.type,
-  },
 }
 
 Radio.propTypes = {
@@ -36,7 +33,7 @@ Radio.propTypes = {
   toggle: Checkbox.propTypes.toggle,
 
   /** HTML input type, either checkbox or radio. */
-  type: PropTypes.oneOf(Radio._meta.props.type),
+  type: Checkbox.propTypes.type,
 }
 
 Radio.defaultProps = {

src/elements/Flag/Flag.js

@@ -55,7 +55,7 @@ const names = [
 
 function Flag(props) {
   const { className, name } = props
-  const classes = cx(name, className, 'flag')
+  const classes = cx(name, 'flag', className)
   const rest = getUnhandledProps(Flag, props)
   const ElementType = getElementType(Flag, props)
 
@@ -65,9 +65,6 @@ function Flag(props) {
 Flag._meta = {
   name: 'Flag',
   type: META.TYPES.ELEMENT,
-  props: {
-    name: names,
-  },
 }
 
 Flag.propTypes = {
@@ -77,8 +74,8 @@ Flag.propTypes = {
   /** Additional classes. */
   className: PropTypes.string,
 
-  /** Flag name, can use the two digit country code, the full name, or a common alias */
-  name: customPropTypes.suggest(Flag._meta.props.name),
+  /** Flag name, can use the two digit country code, the full name, or a common alias. */
+  name: customPropTypes.suggest(names),
 }
 
 Flag.defaultProps = {
@@ -88,4 +85,3 @@ Flag.defaultProps = {
 Flag.create = createShorthandFactory(Flag, value => ({ name: value }))
 
 export default Flag
-

src/elements/Image/Image.js

@@ -95,13 +95,6 @@ Image.Group = ImageGroup
 Image._meta = {
   name: 'Image',
   type: META.TYPES.ELEMENT,
-  props: {
-    verticalAlign: SUI.VERTICAL_ALIGNMENTS,
-    floated: SUI.FLOATS,
-    shape: ['rounded', 'circular'],
-    size: SUI.SIZES,
-    spaced: ['left', 'right'],
-  },
 }
 
 Image.propTypes = {
@@ -133,7 +126,7 @@ Image.propTypes = {
   dimmer: customPropTypes.itemShorthand,
 
   /** An image can sit to the left or right of other content. */
-  floated: PropTypes.oneOf(Image._meta.props.floated),
+  floated: PropTypes.oneOf(SUI.FLOATS),
 
   /** An image can take up the width of its container. */
   fluid: customPropTypes.every([
@@ -160,15 +153,15 @@ Image.propTypes = {
   label: customPropTypes.itemShorthand,
 
   /** An image may appear rounded or circular. */
-  shape: PropTypes.oneOf(Image._meta.props.shape),
+  shape: PropTypes.oneOf(['rounded', 'circular']),
 
   /** An image may appear at different sizes. */
-  size: PropTypes.oneOf(Image._meta.props.size),
+  size: PropTypes.oneOf(SUI.SIZES),
 
   /** An image can specify that it needs an additional spacing to separate it from nearby content. */
   spaced: PropTypes.oneOfType([
     PropTypes.bool,
-    PropTypes.oneOf(Image._meta.props.spaced),
+    PropTypes.oneOf(['left', 'right']),
   ]),
 
   /** Specifies the URL of the image. */
@@ -177,16 +170,16 @@ Image.propTypes = {
   /** Whether or not to add the ui className. */
   ui: PropTypes.bool,
 
-  /** An image can specify its vertical alignment */
-  verticalAlign: PropTypes.oneOf(Image._meta.props.verticalAlign),
+  /** An image can specify its vertical alignment. */
+  verticalAlign: PropTypes.oneOf(SUI.VERTICAL_ALIGNMENTS),
 
-  /** The img element width attribute */
+  /** The img element width attribute. */
   width: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.number,
   ]),
 
-  /** An image can render wrapped in a `div.ui.image` as alternative HTML markup */
+  /** An image can render wrapped in a `div.ui.image` as alternative HTML markup. */
   wrapped: customPropTypes.every([
     PropTypes.bool,
     // these props wrap the image in an a tag already

src/modules/Checkbox/Checkbox.js

@@ -14,17 +14,6 @@ import {
 } from '../../lib'
 const debug = makeDebugger('checkbox')
 
-const _meta = {
-  name: 'Checkbox',
-  type: META.TYPES.MODULE,
-  props: {
-    type: [
-      'checkbox',
-      'radio',
-    ],
-  },
-}
-
 /**
  * A checkbox allows a user to select a value from a small set of options, often binary
  * @see Form
@@ -100,7 +89,7 @@ export default class Checkbox extends Component {
     ]),
 
     /** HTML input type, either checkbox or radio. */
-    type: PropTypes.oneOf(_meta.props.type),
+    type: PropTypes.oneOf(['checkbox', 'radio']),
 
     /** The HTML input value. */
     value: PropTypes.string,
@@ -121,7 +110,10 @@ export default class Checkbox extends Component {
     'indeterminate',
   ]
 
-  static _meta = _meta
+  static _meta = {
+    name: 'Checkbox',
+    type: META.TYPES.MODULE,
+  }
 
   state = {}