优化部分代码

Author: ruoru

src/components/picker/city_picker.js

@@ -99,8 +99,6 @@ class CityPicker extends React.Component {
             text = this.state.text;
         }
 
-
-        //console.log(groups)
         this.setState({
             groups,
             text,

src/components/picker/picker.js

@@ -59,26 +59,27 @@ class Picker extends Component {
 
     constructor(props){
         super(props);
+        const { defaultSelect, groups, actions, lang, onCancel } = props;
 
         this.state = {
-            selected: this.props.defaultSelect ? this.props.defaultSelect : Array(this.props.groups.length).fill(-1),
-            actions: this.props.actions.length > 0 ? this.props.actions : [{
-                label: this.props.lang.leftBtn,
-                onClick: e=>this.handleClose( ()=> {if (this.props.onCancel) this.props.onCancel(e);} )
+            selected: defaultSelect ? defaultSelect : Array(groups.length).fill(-1),
+            actions: actions.length > 0 ? actions : [{
+                label: lang.leftBtn,
+                onClick: e=>this.handleClose( () => {if (onCancel) onCancel(e);} )
             },
             {
-                label: this.props.lang.rightBtn,
-                onClick: e=>this.handleChanges()
+                label: lang.rightBtn,
+                onClick: e=>this.handleConfirm()
             }],
             closing: false
         };
 
-        this.handleChanges = this.handleChanges.bind(this);
+        this.handleConfirm = this.handleConfirm.bind(this);
         this.handleChange = this.handleChange.bind(this);
         this.handleClose = this.handleClose.bind(this);
     }
 
-    handleChanges(){
+    handleConfirm(){
         this.handleClose( ()=> { if (this.props.onChange) this.props.onChange(this.state.selected, this); } );
     }
 

src/components/picker/picker_group.js

@@ -30,14 +30,14 @@ class PickerGroup extends Component {
         super(props);
 
         this.state = {
-            touching: false,
-            ogY: 0,
-            ogTranslate: 0,
-            touchId: undefined,
-            translate: 0,
-            totalHeight: 0,
-            selectedIndex: 0,
-            animating: this.props.animation
+            translate     : 0,
+            selectedIndex : 0,
+            animating     : props.animation,
+            touching      : false,
+            ogY           : 0,
+            ogTranslate   : 0,
+            touchId       : undefined,
+            totalHeight   : 0,
         };
 
         this.handleTouchStart = this.handleTouchStart.bind(this);
@@ -97,13 +97,12 @@ class PickerGroup extends Component {
 
     handleTouchStart(e){
         if (this.state.touching || this.props.items.length <= 1) return;
-
         this.setState({
-            touching: true,
-            ogTranslate: this.state.translate,
-            touchId: e.targetTouches[0].identifier,
-        	ogY: this.state.translate === 0 ? e.targetTouches[0].pageY : e.targetTouches[0].pageY - this.state.translate,
-        	animating: false
+            touching    : true,
+            ogTranslate : this.state.translate,
+            touchId     : e.targetTouches[0].identifier,
+            ogY         : e.targetTouches[0].pageY - this.state.translate,
+            animating   : false
         });
     }