Merge pull request #109 from LaunchPadLab/omit-label-props

Add `omitLabelProps` helper

Author: Rachel Killackey

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@launchpadlab/lp-components",
-  "version": "1.18.3",
+  "version": "1.18.4",
   "description": "Our Components",
   "main": "lib/index.js",
   "repository": "launchpadlab/lp-components",

src/forms/helpers/index.js

@@ -3,4 +3,5 @@ export {
   default as fieldPropTypes,
   fieldPropTypesWithValue,
   fieldOptionsType 
-} from './field-proptypes'
+} from './field-proptypes'
+export { default as omitLabelProps } from './omit-label-props'

src/forms/helpers/omit-label-props.js

@@ -0,0 +1,13 @@
+import { omit } from '../../utils'
+
+// A function that omits the `InputLabel` props from form component props
+
+function omitLabelProps (props) {
+  return omit([
+    'hint',
+    'tooltip',
+    'label'
+  ], props)
+}
+
+export default omitLabelProps

src/forms/inputs/checkbox-group.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import Checkbox from './checkbox'
-import { fieldPropTypesWithValue, fieldOptionsType } from '../helpers'
+import { fieldPropTypesWithValue, fieldOptionsType, omitLabelProps } from '../helpers'
 import { LabeledField } from '../labels'
 import { addToArray, removeFromArray, objectify } from '../../utils'
 
@@ -79,7 +79,7 @@ function CheckboxGroup (props) {
     meta, // eslint-disable-line no-unused-vars
     options,
     ...rest
-  } = props
+  } = omitLabelProps(props)
   const optionObjects = objectify(options)
   // Build change handler
   const handleChange = function (option) {

src/forms/inputs/checkbox.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { blurDirty, fieldPropTypesWithValue } from '../helpers'
+import { blurDirty, fieldPropTypesWithValue, omitLabelProps } from '../helpers'
 import { LabeledField } from '../labels'
 import { compose } from '../../utils'
 
@@ -51,7 +51,7 @@ function Checkbox (props) {
     input: { name, value, onBlur, onChange },
     meta, // eslint-disable-line no-unused-vars
     ...rest
-  } = props
+  } = omitLabelProps(props)
   return (
     <LabeledField className="checkbox" { ...props }>
       <input {...{ 

src/forms/inputs/date-input.js

@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import DatePicker from 'react-datepicker'
 import moment from 'moment'
-import { blurDirty, fieldPropTypesWithValue } from '../helpers'
+import { blurDirty, fieldPropTypesWithValue, omitLabelProps } from '../helpers'
 import { LabeledField } from '../labels'
 import { compose } from '../../utils'
 
@@ -58,7 +58,7 @@ function DateInput (props) {
     meta, // eslint-disable-line no-unused-vars,
     className, // eslint-disable-line no-unused-vars
     ...rest
-  } = props
+  } = omitLabelProps(props)
   const momentValue = value ? moment(value) : null
   return (
     <LabeledField { ...props }>

src/forms/inputs/file-input.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Button } from '../buttons'
-import { fieldPropTypes } from '../helpers'
+import { fieldPropTypes, omitLabelProps } from '../helpers'
 import { LabeledField } from '../labels'
 
 class FileInput extends React.Component {
@@ -43,7 +43,7 @@ class FileInput extends React.Component {
       hidePreview,
       thumbnail,
       ...rest
-    } = this.props
+    } = omitLabelProps(this.props)
 
     return (
       <LabeledField { ...this.props }>

src/forms/inputs/icon-input.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { blurDirty, fieldPropTypes } from '../helpers'
+import { blurDirty, fieldPropTypes, omitLabelProps } from '../helpers'
 import { LabeledField } from '../labels'
 import { compose } from '../../utils'
 
@@ -22,7 +22,7 @@ function IconInput (props) {
     type,
     icon,
     ...rest
-  } = props
+  } = omitLabelProps(props)
   return (
     <LabeledField { ...props }>
       <div className="icon-label">

src/forms/inputs/input.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { blurDirty, fieldPropTypes } from '../helpers'
+import { blurDirty, fieldPropTypes, omitLabelProps } from '../helpers'
 import { LabeledField } from '../labels'
 import { compose } from '../../utils'
 
@@ -20,7 +20,7 @@ function Input (props) {
     className, // eslint-disable-line no-unused-vars
     type,
     ...rest
-  } = props
+  } = omitLabelProps(props)
   return (
     <LabeledField { ...props }>
       <div className="input-wrapper">

src/forms/inputs/range-input.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { blurDirty, fieldPropTypes } from '../helpers'
+import { blurDirty, fieldPropTypes, omitLabelProps } from '../helpers'
 import { LabeledField } from '../labels'
 import { compose } from '../../utils'
 
@@ -29,7 +29,7 @@ function RangeInput (props) {
     step,
     hideLabel,
     ...rest
-  } = props
+  } = omitLabelProps(props)
   return (
     <LabeledField { ...props }>
       <div>