Fix animation bug in NostList

imWildCat · Jul 29, 2016 · 987084f · 987084f
1 parent 3d81fc8
commit 987084f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/ios/Wetoo/Info.plist b/ios/Wetoo/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>CodePushDeploymentKey</key>
 	<string>$(CODEPUSH_KEY)</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/src/components/common/GiftedListView.js b/src/components/common/GiftedListView.js
@@ -47,8 +47,8 @@ export default class GiftedListViewWrapper extends Component {
 
   onCancelSearch = () => {
     const { listView } = this.refs;
-    listView.props.onFetch(listView._getPage(), listView._postRefresh, { search: false });
     listView.refs.listview.scrollTo({ x: 0, y: 44, animated: true });
+    listView.props.onFetch(listView._getPage(), listView._postRefresh, { search: false });
   };
 
   renderHeader = () => {

diff --git a/src/components/common/Separator.js b/src/components/common/Separator.js
@@ -2,24 +2,25 @@ import React, {Component, PropTypes} from 'react';
 import {View} from 'react-native';
 
 class Separator extends Component {
+
+  static defaultProps = {
+    marginLeft: 12,
+  };
+  static propTypes = {
+    marginLeft: PropTypes.number,
+  };
+
   render() {
     const { marginLeft } = this.props;
-    let style = {
-      marginLeft: 12,
+    const style = {
+      marginLeft: marginLeft,
       backgroundColor: '#CCCCDE',
       height: 0.5,
     };
-    if (marginLeft) {
-      style = [style, { marginLeft }];
-    }
     return (
       <View style={style} />
     );
   }
 }
 
-Separator.propTypes = {
-  marginLeft: PropTypes.number,
-};
-
 export default Separator;
diff --git a/src/components/common/TouchableRow.js b/src/components/common/TouchableRow.js
@@ -8,10 +8,10 @@ class TouchableRow extends Component {
   };
 
   render() {
-    const {style, innerViewStyle, children} = this.props;
+    const { style, innerViewStyle, children } = this.props;
     return (
       <TouchableHighlight underlayColor="#E6E6E6" {...this.props} style={[{ overflow: 'hidden' }, style]}>
-        <View style={innerViewStyle}>
+        <View style={[{ flex: 1 }, innerViewStyle]}>
           {children}
         </View>
       </TouchableHighlight>

diff --git a/src/components/pages/NodeList/index.js b/src/components/pages/NodeList/index.js
@@ -44,7 +44,6 @@ class NodeList extends Component {
           refreshable={true}
           enableSearch={true}
           searchOnChange={true}
-          renderSeparator={this.renderSeparator}
         />
       </PageContainer>
     );
@@ -100,20 +99,15 @@ class NodeList extends Component {
   renderSearchResultRow = (rowData) => {
     const { slug, name } = rowData;
     return (
-      <TouchableRow style={styles.searchResultRow} onPress={() => this.onNodePress(slug, name)}>
-        <Text style={styles.searchResultRowText}>{name}（{slug}）</Text>
-      </TouchableRow>
+      <View style={styles.searchResultRow}>
+        <TouchableRow style={{flex: 1}} innerViewStyle={{justifyContent: 'center'}} onPress={() => this.onNodePress(slug, name)}>
+          <Text style={styles.searchResultRowText}>{name}（{slug}）</Text>
+        </TouchableRow>
+        <Separator marginLeft={0} />
+      </View>
     );
   };
 
-  renderSeparator = (sectionID, rowID) => {
-    if (this.searchMode) {
-      return <Separator key={`${sectionID}-${rowID}`} />;
-    } else {
-      return null;
-    }
-  };
-
   renderNodeElement = (node) => {
     const { slug, name } = node;
     return (
@@ -173,11 +167,17 @@ const styles = Style.create({
   searchResultRow: {
     height: 44,
     marginLeft: 12,
+  },
+  searchResultRowTextWrapper: {
+    flex: 1,
+  },
+  searchResultRowTextInnerWrapper: {
     justifyContent: 'center',
   },
   searchResultRowText: {
     fontSize: 14,
-  }
+  },
+
 });
 
 export default NodeList;