fix(FormField): do not pass label to all controls

Semantic-Org · Sep 27, 2016 · 72bf71d · 72bf71d
1 parent 59403ea
commit 72bf71d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/src/collections/Form/FormField.js b/src/collections/Form/FormField.js
@@ -1,5 +1,4 @@
 import cx from 'classnames'
-import _ from 'lodash'
 import React, { PropTypes, createElement } from 'react'
 
 import {
@@ -71,7 +70,7 @@ function FormField(props) {
   }
 
   // pass label prop to controls that support it
-  if (control === Checkbox || control === Radio || _.has(control, 'propTypes.label')) {
+  if (control === Checkbox || control === Radio) {
     return (
       <ElementType className={classes}>
         {createElement(control, { ...controlProps, label })}

diff --git a/test/specs/collections/Form/FormField-test.js b/test/specs/collections/Form/FormField-test.js
@@ -65,20 +65,5 @@ describe('FormField', () => {
         .find('Radio')
         .should.have.prop('label', 'Passed to the Radio')
     })
-    it('is passed to custom control components with a "label" propType', () => {
-      const HandlesLabel = () => null
-      HandlesLabel.propTypes = { label: () => null }
-
-      shallow(<FormField control={HandlesLabel} label='Passed to the HandlesLabel' />)
-        .find('HandlesLabel')
-        .should.have.prop('label', 'Passed to the HandlesLabel')
-    })
-    it('is not passed to custom control components without a "label" propType', () => {
-      const DoesNotHandleLabel = () => null
-
-      shallow(<FormField control={DoesNotHandleLabel} label='Passed to the DoesNotHandleLabel' />)
-        .find('DoesNotHandleLabel')
-        .should.not.have.prop('label', 'Passed to the DoesNotHandleLabel')
-    })
   })
 })