Merge branch 'master' into 133-make-temp-scale-a-config-setting-and-read-it-in-chart-and-temp-screen

components/chart/chart.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { View, FlatList } from 'react-native'
+import { View, FlatList, ScrollView } from 'react-native'
 import range from 'date-range'
 import { LocalDate } from 'js-joda'
 import { makeYAxisLabels, normalizeToScale, makeHorizontalGrid } from './y-axis'
@@ -20,7 +20,7 @@ export default class CycleChart extends Component {
         <DayColumn
           {...item}
           index={index}
-          navigate={this.props.navigation.navigate}
+          navigate={this.props.navigate}
         />
       )
     }
@@ -42,21 +42,23 @@ export default class CycleChart extends Component {
 
   render() {
     return (
-      <View style={{ flexDirection: 'row', marginTop: 50 }}>
-        <View {...styles.yAxis}>{makeYAxisLabels()}</View>
-        {makeHorizontalGrid()}
-        {<FlatList
-          horizontal={true}
-          inverted={true}
-          showsHorizontalScrollIndicator={false}
-          data={this.state.columns}
-          renderItem={this.renderColumn}
-          keyExtractor={item => item.dateString}
-          initialNumToRender={15}
-          maxToRenderPerBatch={5}
-        >
-        </FlatList>}
-      </View>
+      <ScrollView>
+        <View style={{ flexDirection: 'row', marginTop: 50 }}>
+          <View {...styles.yAxis}>{makeYAxisLabels()}</View>
+          {makeHorizontalGrid()}
+          {<FlatList
+            horizontal={true}
+            inverted={true}
+            showsHorizontalScrollIndicator={false}
+            data={this.state.columns}
+            renderItem={this.renderColumn}
+            keyExtractor={item => item.dateString}
+            initialNumToRender={15}
+            maxToRenderPerBatch={5}
+          >
+          </FlatList>}
+        </View>
+      </ScrollView>
     )
   }
 }