input does not render label if it does not exist

Signed-off-by: Yucheng Tu <ytu@pivotal.io>
pivotal-cf · Mar 17, 2016 · 7369043 · 7369043 · Pirolf · Mar 17, 2016
1 parent 0f30674
commit 7369043
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/library/spec/pivotal-ui-react/inputs/inputs_spec.js b/library/spec/pivotal-ui-react/inputs/inputs_spec.js
@@ -34,6 +34,16 @@ describe('Input', function() {
     expect('.form-group').toHaveClass('input-class');
   });
 
+  describe('when label is undefined', () => {
+    beforeEach(() => {
+      subject::setProps({label: undefined});
+    });
+
+    it('does not render label', () => {
+      expect('label').not.toExist();
+    });
+  });
+
   describe('Validation', function() {
     it('does not show error messages when displayError is false', function() {
       expect('.error-text').not.toExist();

diff --git a/library/src/pivotal-ui-react/inputs/inputs.js b/library/src/pivotal-ui-react/inputs/inputs.js
@@ -34,7 +34,7 @@ class Input extends React.Component {
     const inputProps = mergeProps(props, {className: inputClassNames, 'aria-label': placeholder})
     return (
       <div className={formClasses}>
-        <label htmlFor={id} className={labelClasses}>{label}</label>
+        {label && <label htmlFor={id} className={labelClasses}>{label}</label>}
         <input {...inputProps} />
         {search && <i className='search-icon'/>}
         {displayError && <div className="error-text help-block">