From 238307940d9b5b329a13e475d1cff75643207974 Mon Sep 17 00:00:00 2001
From: Rachel Killackey <rachel@launchpadlab.com>
Date: Fri, 13 Apr 2018 12:45:11 -0500
Subject: [PATCH 1/7] add hideLabel prop, story

---
 docs.md                               |  3 +++
 src/forms/helpers/omit-label-props.js |  3 +++
 src/forms/labels/input-label.js       | 18 ++++++++++++++++--
 src/forms/labels/labeled-field.js     |  3 ++-
 stories/forms/inputs/input.story.js   |  2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/docs.md b/docs.md
index 86c90488..3e2d0225 100644
--- a/docs.md
+++ b/docs.md
@@ -872,6 +872,7 @@ For instance: `'person.firstName'` becomes `'First Name'`
 **Parameters**
 
 -   `name` **[String][48]** The name of the associated input
+-   `hideLabel` **[Boolean][50]** A boolean representing hiding or showing the label element (optional, default `false`)
 -   `hint` **[String][48]?** A usage hint for the associated input
 -   `label` **([String][48] \| [Boolean][50])?** Custom text for the label
 -   `tooltip` **[String][48]?** A message to display in a tooltip
@@ -993,6 +994,7 @@ Created in order to prevent these props from being passed down to the input comp
 
 Omits the following props:
 
+-   `hideLabel`
 -   `hint`
 -   `tooltip`
 -   `label`
@@ -1006,6 +1008,7 @@ Omits the following props:
 ```javascript
 const props = {
    label: 'Biography',
+   hideLabel: true,
    hint: 'A short biography',
    tooltip: 'Help us learn more about you!',
    maxLength: 1000
diff --git a/src/forms/helpers/omit-label-props.js b/src/forms/helpers/omit-label-props.js
index ea4202cc..b7f176bd 100644
--- a/src/forms/helpers/omit-label-props.js
+++ b/src/forms/helpers/omit-label-props.js
@@ -6,6 +6,7 @@ import { omit } from '../../utils'
  * Created in order to prevent these props from being passed down to the input component through `...rest`.
  *
  * Omits the following props:
+ * - `hideLabel`
  * - `hint`
  * - `tooltip`
  * - `label`
@@ -18,6 +19,7 @@ import { omit } from '../../utils'
  * 
  * const props = {
  *    label: 'Biography',
+ *    hideLabel: true,
  *    hint: 'A short biography',
  *    tooltip: 'Help us learn more about you!',
  *    maxLength: 1000
@@ -46,6 +48,7 @@ import { omit } from '../../utils'
 
 function omitLabelProps (props) {
   return omit([
+    'hideLabel',
     'hint',
     'tooltip',
     'label'
diff --git a/src/forms/labels/input-label.js b/src/forms/labels/input-label.js
index b564c7fc..ed0e82d7 100644
--- a/src/forms/labels/input-label.js
+++ b/src/forms/labels/input-label.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import { convertNameToLabel } from '../helpers'
 import { toggle, togglePropTypes } from '../../utils'
+import { hide } from 'redux-modal';
 
 /**
  *
@@ -22,6 +23,7 @@ import { toggle, togglePropTypes } from '../../utils'
  * @name InputLabel
  * @type Function
  * @param {String} name - The name of the associated input
+ * @param {Boolean} [hideLabel=false] - A boolean representing hiding or showing the label element
  * @param {String} [hint] - A usage hint for the associated input
  * @param {String|Boolean} [label] - Custom text for the label
  * @param {String} [tooltip] - A message to display in a tooltip
@@ -51,6 +53,7 @@ import { toggle, togglePropTypes } from '../../utils'
 **/
 
 const propTypes = {
+  hideLabel: PropTypes.bool,
   hint: PropTypes.string,
   label: PropTypes.oneOfType([ PropTypes.string, PropTypes.bool ]),
   name: PropTypes.string.isRequired,
@@ -59,13 +62,24 @@ const propTypes = {
 }
 
 const defaultProps = {
+  hideLabel: false,
   hint: '',
   label: '',
   tooltip: '',
 }
 
-function InputLabel ({ hint, label, name, tooltip, tooltipShown, toggleTooltipShown }) {
-  const labelText = label || convertNameToLabel(name)
+function InputLabel ({ 
+  hideLabel, 
+  hint, 
+  label, 
+  name, 
+  tooltip, 
+  tooltipShown, 
+  toggleTooltipShown,
+}) {
+  const showLabel = (hideLabel !== true) || (label !== false)
+  console.log(label !== false)
+  const labelText = showLabel || convertNameToLabel(name)
   return (
     <span>
       {  
diff --git a/src/forms/labels/labeled-field.js b/src/forms/labels/labeled-field.js
index c169295a..0f7cc0fb 100644
--- a/src/forms/labels/labeled-field.js
+++ b/src/forms/labels/labeled-field.js
@@ -58,6 +58,7 @@ function LabeledField ({
     input: { name },
     meta: { error, touched, invalid },
     className,
+    hideLabel,
     hint,
     label,
     tooltip,
@@ -66,7 +67,7 @@ function LabeledField ({
   }) {
   return (
     <fieldset className={ classnames(className, { 'error': touched && invalid }) }>
-      <InputLabel { ...{ hint, label, name, tooltip } } />
+      <InputLabel { ...{ hideLabel, hint, label, name, tooltip } } />
         { children }
       { !hideErrorLabel && <InputError { ...{ error, invalid, touched } } /> }
     </fieldset>
diff --git a/stories/forms/inputs/input.story.js b/stories/forms/inputs/input.story.js
index 02d3fb3a..33242bb9 100644
--- a/stories/forms/inputs/input.story.js
+++ b/stories/forms/inputs/input.story.js
@@ -31,7 +31,7 @@ storiesOf('Input', module)
     <Input 
       input={inputProps}
       meta={{}}
-      label={false}
+      hideLabel
     />
   ))
   .add('with error', () => (

From 33b4ae2efa5900bb30b927414ddf285305333402 Mon Sep 17 00:00:00 2001
From: Rachel Killackey <rachel@launchpadlab.com>
Date: Fri, 13 Apr 2018 12:53:43 -0500
Subject: [PATCH 2/7] update showLabel logic, add new story

---
 docs.md                             | 2 +-
 src/forms/labels/input-label.js     | 9 ++++-----
 stories/forms/inputs/input.story.js | 7 +++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs.md b/docs.md
index 3e2d0225..d2d6ab67 100644
--- a/docs.md
+++ b/docs.md
@@ -872,7 +872,7 @@ For instance: `'person.firstName'` becomes `'First Name'`
 **Parameters**
 
 -   `name` **[String][48]** The name of the associated input
--   `hideLabel` **[Boolean][50]** A boolean representing hiding or showing the label element (optional, default `false`)
+-   `hideLabel` **[Boolean][50]** A boolean representing whether or not to display the label element (optional, default `false`)
 -   `hint` **[String][48]?** A usage hint for the associated input
 -   `label` **([String][48] \| [Boolean][50])?** Custom text for the label
 -   `tooltip` **[String][48]?** A message to display in a tooltip
diff --git a/src/forms/labels/input-label.js b/src/forms/labels/input-label.js
index ed0e82d7..9667bb40 100644
--- a/src/forms/labels/input-label.js
+++ b/src/forms/labels/input-label.js
@@ -23,7 +23,7 @@ import { hide } from 'redux-modal';
  * @name InputLabel
  * @type Function
  * @param {String} name - The name of the associated input
- * @param {Boolean} [hideLabel=false] - A boolean representing hiding or showing the label element
+ * @param {Boolean} [hideLabel=false] - A boolean representing whether or not to display the label element
  * @param {String} [hint] - A usage hint for the associated input
  * @param {String|Boolean} [label] - Custom text for the label
  * @param {String} [tooltip] - A message to display in a tooltip
@@ -77,13 +77,12 @@ function InputLabel ({
   tooltipShown, 
   toggleTooltipShown,
 }) {
-  const showLabel = (hideLabel !== true) || (label !== false)
-  console.log(label !== false)
-  const labelText = showLabel || convertNameToLabel(name)
+  const showLabel = !(hideLabel === true || label === false)
+  const labelText = !showLabel || convertNameToLabel(name)
   return (
     <span>
       {  
-        label !== false &&
+        showLabel &&
         <label htmlFor={ name }>
           { labelText }
           { 
diff --git a/stories/forms/inputs/input.story.js b/stories/forms/inputs/input.story.js
index 33242bb9..4b659014 100644
--- a/stories/forms/inputs/input.story.js
+++ b/stories/forms/inputs/input.story.js
@@ -31,6 +31,13 @@ storiesOf('Input', module)
     <Input 
       input={inputProps}
       meta={{}}
+      label={false}
+    />
+  ))
+  .add('with no label, using `hideLabel` prop', () => (
+    <Input
+      input={ inputProps }
+      meta={ {} }
       hideLabel
     />
   ))

From cce8097e15eb2d7a0a96d5c0042993806a48a32f Mon Sep 17 00:00:00 2001
From: Rachel Killackey <rachel@launchpadlab.com>
Date: Fri, 13 Apr 2018 12:55:20 -0500
Subject: [PATCH 3/7] remove import

---
 src/forms/labels/input-label.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/forms/labels/input-label.js b/src/forms/labels/input-label.js
index 9667bb40..74ea4be9 100644
--- a/src/forms/labels/input-label.js
+++ b/src/forms/labels/input-label.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import { convertNameToLabel } from '../helpers'
 import { toggle, togglePropTypes } from '../../utils'
-import { hide } from 'redux-modal';
 
 /**
  *

From 0f9aa941c206008f6ac0840f31b8b3a4895eac2d Mon Sep 17 00:00:00 2001
From: Versionator <dev@launchpadlab.com>
Date: Fri, 13 Apr 2018 17:56:00 +0000
Subject: [PATCH 4/7] Version bump: 3.7.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index df2d09fa..0f10c5d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@launchpadlab/lp-components",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Our Components",
   "main": "lib/index.js",
   "repository": "launchpadlab/lp-components",

From 9e9134d2af32df9502f690b44719c1af975c6bf3 Mon Sep 17 00:00:00 2001
From: Rachel Killackey <rachel@launchpadlab.com>
Date: Fri, 13 Apr 2018 13:41:45 -0500
Subject: [PATCH 5/7] add input label test, fix range input test

---
 src/forms/inputs/range-input.js       | 2 +-
 src/forms/labels/input-label.js       | 3 ++-
 test/forms/labels/input-label.test.js | 7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/forms/inputs/range-input.js b/src/forms/inputs/range-input.js
index 2f7e70bb..98449930 100644
--- a/src/forms/inputs/range-input.js
+++ b/src/forms/inputs/range-input.js
@@ -52,6 +52,7 @@ const defaultProps = {
 }
 
 function RangeInput (props) {
+  const { hideLabel } = props
   const {
     input: { name, value, onBlur, onChange },
     meta, // eslint-disable-line no-unused-vars
@@ -59,7 +60,6 @@ function RangeInput (props) {
     min,
     max,
     step,
-    hideLabel,
     ...rest
   } = omitLabelProps(props)
   return (
diff --git a/src/forms/labels/input-label.js b/src/forms/labels/input-label.js
index 74ea4be9..8548d957 100644
--- a/src/forms/labels/input-label.js
+++ b/src/forms/labels/input-label.js
@@ -77,7 +77,8 @@ function InputLabel ({
   toggleTooltipShown,
 }) {
   const showLabel = !(hideLabel === true || label === false)
-  const labelText = !showLabel || convertNameToLabel(name)
+  const labelText = label || convertNameToLabel(name)
+  console.log(labelText)
   return (
     <span>
       {  
diff --git a/test/forms/labels/input-label.test.js b/test/forms/labels/input-label.test.js
index ba49a90c..1429f622 100644
--- a/test/forms/labels/input-label.test.js
+++ b/test/forms/labels/input-label.test.js
@@ -10,12 +10,17 @@ test('when label is false - does not render a label', () => {
   expect(wrapper.find('label').exists()).toEqual(false)
 })
 
+test('when hideLabel is true - does not render a label', () => {
+  const wrapper = shallow(<InputLabel name={ name } hideLabel label="foo" />)
+  expect(wrapper.find('label').exists()).toEqual(false)
+})
+
 test('when label not provided - renders a label with content equal to formatted input name', () => {
   const wrapper = shallow(<InputLabel name={name}/>)
   expect(wrapper.dive().find('label').text()).toEqual(formattedName)
 })
 
-test('when label not provided - renders a label with content equal to string', () => {
+test('when label provided - renders a label with content equal to string', () => {
   const wrapper = shallow(<InputLabel name={name} label="foo"/>)
   expect(wrapper.dive().find('label').text()).toEqual('foo')
 })

From df43b51b27e1945417a2dcaad05a33e5b3a81aee Mon Sep 17 00:00:00 2001
From: Rachel Killackey <rachel@launchpadlab.com>
Date: Fri, 13 Apr 2018 13:42:58 -0500
Subject: [PATCH 6/7] lint

---
 src/forms/labels/input-label.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/forms/labels/input-label.js b/src/forms/labels/input-label.js
index 8548d957..74124556 100644
--- a/src/forms/labels/input-label.js
+++ b/src/forms/labels/input-label.js
@@ -78,7 +78,6 @@ function InputLabel ({
 }) {
   const showLabel = !(hideLabel === true || label === false)
   const labelText = label || convertNameToLabel(name)
-  console.log(labelText)
   return (
     <span>
       {  

From f2d0de922cf32785e784ff1191b1a0aa170a33b6 Mon Sep 17 00:00:00 2001
From: Rachel Killackey <rachel@launchpadlab.com>
Date: Mon, 16 Apr 2018 16:07:27 -0500
Subject: [PATCH 7/7] change range label prop name

---
 docs.md                                   |  2 +-
 src/forms/inputs/range-input.js           | 10 +++++-----
 src/forms/labels/input-label.js           |  4 ++--
 stories/forms/inputs/range-input.story.js |  2 +-
 test/forms/inputs/range-input.test.js     |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs.md b/docs.md
index d2d6ab67..9ea45a7f 100644
--- a/docs.md
+++ b/docs.md
@@ -611,7 +611,7 @@ A range input that can be used in a `redux-forms`-controlled form.
 -   `min` **[Number][51]** The minumum attribute of the slider control (optional, default `0`)
 -   `max` **[Number][51]** The maximum attribute of the slider control (optional, default `100`)
 -   `step` **[Number][51]** The step attribute of the slider control (optional, default `1`)
--   `hideLabel` **[Boolean][50]** A boolean representing whether or not to display the range value label element (optional, default `false`)
+-   `hideRangeLabel` **[Boolean][50]** A boolean representing whether or not to display the range value label element (optional, default `false`)
 
 **Examples**
 
diff --git a/src/forms/inputs/range-input.js b/src/forms/inputs/range-input.js
index 98449930..2b1d437e 100644
--- a/src/forms/inputs/range-input.js
+++ b/src/forms/inputs/range-input.js
@@ -15,7 +15,7 @@ import { compose } from '../../utils'
  * @param {Number} [min=0] - The minumum attribute of the slider control
  * @param {Number} [max=100] - The maximum attribute of the slider control
  * @param {Number} [step=1] - The step attribute of the slider control
- * @param {Boolean} [hideLabel=false] - A boolean representing whether or not to display the range value label element
+ * @param {Boolean} [hideRangeLabel=false] - A boolean representing whether or not to display the range value label element
  * @example
  * 
  * function StudentForm ({ handleSubmit, pristine, invalid, submitting }) {
@@ -41,22 +41,22 @@ const propTypes = {
   min: PropTypes.number,
   max: PropTypes.number,
   step: PropTypes.number,
-  hideLabel: PropTypes.bool
+  hideRangeLabel: PropTypes.bool
 }
 
 const defaultProps = {
   min: 0,
   max: 100,
   step: 1,
-  hideLabel: false
+  hideRangeLabel: false
 }
 
 function RangeInput (props) {
-  const { hideLabel } = props
   const {
     input: { name, value, onBlur, onChange },
     meta, // eslint-disable-line no-unused-vars
     className, // eslint-disable-line no-unused-vars
+    hideRangeLabel,
     min,
     max,
     step,
@@ -66,7 +66,7 @@ function RangeInput (props) {
     <LabeledField { ...props }>
       <div>
       {
-        !hideLabel &&
+        !hideRangeLabel &&
         <label className="range-value">{value}</label>
       }
       </div>
diff --git a/src/forms/labels/input-label.js b/src/forms/labels/input-label.js
index 74124556..6c14eebc 100644
--- a/src/forms/labels/input-label.js
+++ b/src/forms/labels/input-label.js
@@ -76,12 +76,12 @@ function InputLabel ({
   tooltipShown, 
   toggleTooltipShown,
 }) {
-  const showLabel = !(hideLabel === true || label === false)
+  const labelHidden = hideLabel || label === false
   const labelText = label || convertNameToLabel(name)
   return (
     <span>
       {  
-        showLabel &&
+        !labelHidden &&
         <label htmlFor={ name }>
           { labelText }
           { 
diff --git a/stories/forms/inputs/range-input.story.js b/stories/forms/inputs/range-input.story.js
index c19adb3c..d43cf165 100644
--- a/stories/forms/inputs/range-input.story.js
+++ b/stories/forms/inputs/range-input.story.js
@@ -33,7 +33,7 @@ storiesOf('RangeInput', module)
     <RangeInput 
       input={ rangeInputProps }
       meta={ {} }
-      hideLabel={ true }
+      hideRangeLabel
     />
   ))
   .add('with error', () => (
diff --git a/test/forms/inputs/range-input.test.js b/test/forms/inputs/range-input.test.js
index 256ac42f..78ecbcc7 100644
--- a/test/forms/inputs/range-input.test.js
+++ b/test/forms/inputs/range-input.test.js
@@ -7,8 +7,8 @@ const value = 'value of field'
 const onChange = () => {}
 const input = { name, value, onChange }
 
-test('RangeInput hides the value label when `hideLabel` is `true`', () => {
-  const props = { input, hideLabel: true, meta: {} }
+test('RangeInput hides the value label when `hideRangeLabel` is `true`', () => {
+  const props = { input, hideRangeLabel: true, meta: {} }
   const wrapper = mount(<RangeInput { ...props }/>)
   expect(wrapper.find('.range-value').exists()).toBe(false)
 })