Captured initial values in getData() and made picker showing props no…

…t state

src/Form.js

@@ -49,8 +49,8 @@ export class Form extends React.Component{
           key: child.ref || child.type+i,
           fieldRef : child.ref,
           ref: child.ref,
-          onFocus:this.handleFieldFocused.bind(this),
-          onChange:this.handleFieldChange.bind(this, child.ref)
+          onFocus: this.handleFieldFocused.bind(this),
+          onChange: this.handleFieldChange.bind(this, child.ref)
         }
       ));
     }, this);

src/fields/InputField.ios.js

@@ -32,9 +32,9 @@ export class InputField extends React.Component{
           this.props.style
         ]}
       containerStyle={[formStyles.fieldContainer,
-            formStyles.horizontalContainer,
-            this.props.containerStyle,
-          ]}
+          formStyles.horizontalContainer,
+          this.props.containerStyle,
+        ]}
       />
     )
   }
@@ -99,7 +99,6 @@ let formStyles = StyleSheet.create({
     paddingRight: 10,
     justifyContent: 'center',
     lineHeight: 45,
-
   },
   input:{
     paddingLeft: 10,

src/lib/DatePickerComponent.android.js

@@ -10,6 +10,10 @@ import {Field} from './Field';
   export class DatePickerComponent extends React.Component{
     constructor(props){
       super(props);
+      if (props.value) {
+        // Ensure initial value is retrieved in Form.getData()
+        if(this.props.onChange) this.props.onChange(props.value, this.valid);
+      }
       this.state = {
         date: props.date? new Date(props.date) :'',
         isPickerVisible: false

src/lib/DatePickerComponent.ios.js

@@ -10,6 +10,10 @@ import {Field} from './Field';
 export class DatePickerComponent extends React.Component{
   constructor(props){
     super(props);
+    if (props.value) {
+      // Ensure initial value is retrieved in Form.getData()
+      if(this.props.onChange) this.props.onChange(props.value, this.valid);
+    }
     this.state = {
       date: props.date? new Date(props.date) : '',
       isPickerVisible: false
@@ -41,6 +45,9 @@ export class DatePickerComponent extends React.Component{
 
   //      this.refs.picker.measure(this.getPickerLayout.bind(this));
 
+  _isPickerVisible() {
+    return this.state.isPickerVisible
+  }
 
   _togglePicker(event){
     this.setState({isPickerVisible:!this.state.isPickerVisible});
@@ -107,7 +114,7 @@ export class DatePickerComponent extends React.Component{
 
         </View>
       </Field>
-      {(this.state.isPickerVisible)?
+      {(this.props.showing)?
         pickerWrapper : null
       }
 

src/lib/Field.js

@@ -3,7 +3,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {HelpText} from './HelpText';
-let { View, StyleSheet, Text, TouchableHighlight} = require('react-native');
+let { View, StyleSheet, Text, TouchableHighlight, TouchableOpacity} = require('react-native');
 
 export class Field extends React.Component{
   render(){
@@ -14,14 +14,15 @@ export class Field extends React.Component{
           : null);
 
     if(this.props.onPress){
-      return <TouchableHighlight onPress={this.props.onPress}>
+      return <TouchableOpacity style={{
+      }} onPress={this.props.onPress}>
         <View>
           {this.props.children}
           {fieldHelpText}
         </View>
-      </TouchableHighlight>
+      </TouchableOpacity>
     }
-    return   <View>
+    return <View>
       {this.props.children}
       {fieldHelpText}
     </View>;

src/lib/InputComponent.js

@@ -17,6 +17,11 @@ export class InputComponent extends React.Component{
   constructor(props){
     super(props);
 
+    if (props.value) {
+      // Ensure initial value is retrieved in Form.getData()
+      if(this.props.onChange) this.props.onChange(props.value, this.valid);
+    }
+
     this.triggerValidation = this.triggerValidation.bind(this);
     // this.validate = this.validate.bind(this)
     this.validate(props.value);

src/lib/LinkComponent.js

@@ -8,6 +8,10 @@ import {Field} from './Field';
 export class LinkComponent extends React.Component{
   constructor(props){
     super(props);
+    if (props.value) {
+      // Ensure initial value is retrieved in Form.getData()
+      if(this.props.onChange) this.props.onChange(props.value, this.valid);
+    }
     this.state = {
     }
   }

src/lib/PickerComponent.android.js

@@ -10,6 +10,10 @@ var PickerItem = Picker.Item;
   export class PickerComponent extends React.Component{
     constructor(props){
       super(props);
+      if (props.value) {
+        // Ensure initial value is retrieved in Form.getData()
+        if(this.props.onChange) this.props.onChange(props.value, this.valid);
+      }
       this.state = {
         value: props.value || props.label,
       }

src/lib/PickerComponent.ios.js

@@ -11,6 +11,10 @@ var PickerItem = Picker.Item;
 export class PickerComponent extends React.Component{
     constructor(props){
       super(props);
+      if (props.value) {
+        // Ensure initial value is retrieved in Form.getData()
+        if(this.props.onChange) this.props.onChange(props.value, this.valid);
+      }
       this.state = {
         value: props.value,
         isPickerVisible: false
@@ -144,7 +148,7 @@ export class PickerComponent extends React.Component{
 
         </View>
         </Field>
-        {(this.state.isPickerVisible)?
+        {(this.props.showing)?
           pickerWrapper : null
         }
 

src/lib/SwitchComponent.js

@@ -8,6 +8,10 @@ import {Field} from './Field';
 export class SwitchComponent extends React.Component{
   constructor(props){
     super(props);
+    if (props.value) {
+      // Ensure initial value is retrieved in Form.getData()
+      if(this.props.onChange) this.props.onChange(props.value, this.valid);
+    }
     this.state = {
       value: props.value,
     }
@@ -40,6 +44,7 @@ export class SwitchComponent extends React.Component{
 
         <Text style={this.props.labelStyle}>{this.props.label}</Text>
           <Switch
+          onTintColor={this.props.onTintColor}
           onValueChange={this.handleValueChange.bind(this)}
           style={this.props.switchStyle}
           value={this.state.value} />

src/lib/TimePickerComponent.android.js

@@ -10,6 +10,10 @@ import {Field} from './Field';
   export class TimePickerComponent extends React.Component{
     constructor(props){
       super(props);
+      if (props.value) {
+        // Ensure initial value is retrieved in Form.getData()
+        if(this.props.onChange) this.props.onChange(props.value, this.valid);
+      }
       this.state = {
         date: props.date? new Date(props.date) :'',
         isPickerVisible: false