fix(checkbox): set true/false value

dagi12 · Oct 10, 2016 · 17a2673 · 17a2673
1 parent 24f7801
commit 17a2673
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 6 deletions.
diff --git a/__test__/AvBaseInput.spec.js b/__test__/AvBaseInput.spec.js
@@ -393,6 +393,36 @@ describe('BaseInput', function() {
     });
   });
 
+  describe('get field value', () => {
+    it('should give the value of "checked" for a checkbox', () => {
+      this.props.type = 'checkbox';
+      const event = {target: {checked: {}}};
+      const result = this.component.getFieldValue(event);
+      expect(result).to.equal(event.target.checked);
+    });
+
+    it('should give the value of "value" for non checkboxs which have it defined', () => {
+      this.props.type = 'text';
+      const event = {target: {value: {}}};
+      const result = this.component.getFieldValue(event);
+      expect(result).to.equal(event.target.value);
+    });
+
+    it('should give the event for non checkboxs which do not have a target', () => {
+      this.props.type = 'text';
+      const event = {noTarget: {value: {}}};
+      const result = this.component.getFieldValue(event);
+      expect(result).to.equal(event);
+    });
+
+    it('should give the event for non checkboxs which do not have a value defined', () => {
+      this.props.type = 'text';
+      const event = {target: {noValue: {}}};
+      const result = this.component.getFieldValue(event);
+      expect(result).to.equal(event);
+    });
+  });
+
   describe('validate event', () => {
     it('should use getValidationEvent to get the validation event', () => {
       const spy = sinon.spy(this.component, 'getValidationEvent');

diff --git a/src/AvBaseInput.js b/src/AvBaseInput.js
@@ -8,8 +8,6 @@ const htmlValidationTypes = [
   /*'range', 'month', 'week', 'time'*/ // These do not currently have validation
 ];
 
-const getFieldValue = event => event && event.target && !isUndefined(event.target.value) ? event.target.value : event;
-
 export default class AvBaseInput extends Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
@@ -82,24 +80,24 @@ export default class AvBaseInput extends Component {
   }
 
   onInputHandler(_value) {
-    this.value = getFieldValue(_value);
+    this.value = this.getFieldValue(_value);
     this.validateEvent('onInput');
     !this.context.FormCtrl.isTouched[this.props.name] && this.context.FormCtrl.setTouched(this.props.name);
   }
 
   onBlurHandler(_value) {
-    this.value = getFieldValue(_value);
+    this.value = this.getFieldValue(_value);
     this.validateEvent('onBlur');
     !this.context.FormCtrl.isTouched[this.props.name] && this.context.FormCtrl.setTouched(this.props.name);
   }
 
   onFocusHandler(_value) {
-    this.value = getFieldValue(_value);
+    this.value = this.getFieldValue(_value);
     this.validateEvent('onFocus');
   }
 
   onChangeHandler(_value) {
-    this.value = getFieldValue(_value);
+    this.value = this.getFieldValue(_value);
     this.validateEvent('onChange');
     !this.context.FormCtrl.isDirty[this.props.name] && this.context.FormCtrl.setDirty(this.props.name);
   }
@@ -116,6 +114,13 @@ export default class AvBaseInput extends Component {
     return {key, value};
   }
 
+  getFieldValue(event){
+    if (this.props.type === 'checkbox') {
+      return event.target.checked;
+    }
+    return event && event.target && !isUndefined(event.target.value) ? event.target.value : event;
+  }
+
   getValidationEvent() {
     return (this.props.validationEvent)
       ? this.props.validationEvent