Minor fixes

bietkul · Jul 8, 2017 · f7e1c03 · f7e1c03
1 parent c3b9b31
commit f7e1c03
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/src/components/panel/index.js b/src/components/panel/index.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Animated, Dimensions, View, Easing } from 'react-native';
+import { Animated, Dimensions, View, Easing, Keyboard } from 'react-native';
 import styles from './styles';
 
 class Panel extends Component {
@@ -23,6 +23,7 @@ class Panel extends Component {
   }
 
   toggle() {
+    Keyboard.dismiss();
     const initialValue = this.state.expanded ?
     (this.state.maxHeight + this.state.minHeight) : this.state.minHeight;
     const finalValue = this.state.expanded ?

diff --git a/src/fields/date/index.js b/src/fields/date/index.js
@@ -24,7 +24,8 @@ export default class DatePickerField extends Component {
     this.props.updateValue(this.props.attributes.name, date);
   }
   showTimePicker = async (stateKey) => {
-    const currentDate = this.props.attributes.value || new Date();
+    const { attributes } = this.props;
+    const currentDate = attributes.value ? new Date(attributes.value) : new Date();
     try {
       const { action, minute, hour } = await TimePickerAndroid.open({
         hour: currentDate.getHours(),
@@ -41,8 +42,8 @@ export default class DatePickerField extends Component {
     }
   };
   showDatePicker = async (stateKey) => {
-    const attributes = this.props.attributes;
-    const currentDate = attributes.value || new Date();
+    const { attributes } = this.props;
+    const currentDate = attributes.value ? new Date(attributes.value) : new Date();
     try {
       const { action, year, month, day } = await DatePickerAndroid.open(
         {
@@ -68,7 +69,6 @@ export default class DatePickerField extends Component {
     }
   };
   render() {
-    console.log(this.props);
     const { theme, attributes } = this.props;
     const value = (attributes.value && new Date(attributes.value)) || null;
     const mode = attributes.mode || 'datetime';

diff --git a/src/fields/form/index.js b/src/fields/form/index.js
@@ -7,6 +7,8 @@ export default class FormField extends Component {
     attributes: React.PropTypes.object,
     theme: React.PropTypes.object,
     updateValue: React.PropTypes.func,
+    autoValidation: React.PropTypes.bool,
+    customValidation: React.PropTypes.func,
   }
   constructor(props) {
     super(props);
@@ -24,13 +26,11 @@ export default class FormField extends Component {
     }, () => this.props.updateValue(this.props.attributes.name, text));
   }
   render() {
-    console.log(this.props);
     const {
       attributes,
       theme,
       autoValidation,
       customValidation,
-      formData,
     } = this.props;
     return (
       <View>
@@ -43,7 +43,6 @@ export default class FormField extends Component {
             onValueChange={this.onValueChange}
             autoValidation={autoValidation}
             customValidation={customValidation}
-            formData={formData}
             showErrors
             fields={attributes.fields}
             theme={theme}

diff --git a/src/fields/select/index.js b/src/fields/select/index.js
@@ -53,8 +53,7 @@ export default class SelectField extends Component {
     }, () => this.props.updateValue(this.props.attributes.name, newSelected));
   }
   render() {
-    console.log(this.props);
-    const { attributes, theme } = this.props;
+    const { attributes } = this.props;
     const selectedText = attributes.multiple ?
     attributes.value.length || 'None' :
     attributes.objectType ?
@@ -110,12 +109,10 @@ export default class SelectField extends Component {
                     onPress={() => this.toggleSelect(item)}
                   >
                     { attributes.multiple &&
-                      <View pointerEvents="none">
-                        <CheckBox
-                          onPress={() => this.toggleSelect(item)}
-                          checked={isSelected}
-                        />
-                      </View>
+                    <CheckBox
+                      onPress={() => this.toggleSelect(item)}
+                      checked={isSelected}
+                    />
                     }
                     <Body>
                       <Text style={{ paddingHorizontal: 5 }}>

diff --git a/src/fields/textInput/index.js b/src/fields/textInput/index.js
@@ -14,7 +14,7 @@ export default class TextInputField extends Component {
     this.props.updateValue(this.props.attributes.name, text);
   }
   render() {
-    const {theme, attributes} = this.props;
+    const { theme, attributes } = this.props;
     const inputProps = attributes.props;
     const keyboardType = getKeyboardType(attributes.type);
     return (