From 796d995aad27ad102e3a0a798573852dbb177f8b Mon Sep 17 00:00:00 2001
From: mashazyu <mariya.z@gmail.com>
Date: Mon, 18 Nov 2019 14:40:30 +0100
Subject: [PATCH] Move Surface element to TemperatureColumn component

---
 components/chart/day-column.js         | 16 ++++++----------
 components/chart/temperature-column.js |  7 ++++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/components/chart/day-column.js b/components/chart/day-column.js
index 0304ea6..26e5cf6 100644
--- a/components/chart/day-column.js
+++ b/components/chart/day-column.js
@@ -1,12 +1,10 @@
 import React, { Component } from 'react'
 import { TouchableOpacity } from 'react-native'
-import { Surface } from 'react-native/Libraries/ART/ReactNativeART'
 import { connect } from 'react-redux'
 
 import { setDate } from '../../slices/date'
 
 import { LocalDate } from 'js-joda'
-import config from '../../config'
 import { getCycleDay } from '../../db'
 
 import SymptomCell from './symptom-cell'
@@ -158,14 +156,12 @@ class DayColumn extends Component {
         }
         )}
 
-        <Surface width={config.columnWidth} height={columnHeight}>
-          <TemperatureColumn
-            horizontalLinePosition={this.fhmAndLtl.drawLtlAt}
-            isVerticalLine={this.fhmAndLtl.drawFhmLine}
-            data={this.data && this.data.temperature}
-            columnHeight={columnHeight}
-          />
-        </Surface>
+        <TemperatureColumn
+          horizontalLinePosition={this.fhmAndLtl.drawLtlAt}
+          isVerticalLine={this.fhmAndLtl.drawFhmLine}
+          data={this.data && this.data.temperature}
+          columnHeight={columnHeight}
+        />
 
         <CycleDayLabel
           height={xAxisHeight}
diff --git a/components/chart/temperature-column.js b/components/chart/temperature-column.js
index 5bf3f49..fab3d97 100644
--- a/components/chart/temperature-column.js
+++ b/components/chart/temperature-column.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { Group, Path } from 'react-native/Libraries/ART/ReactNativeART'
+import { Surface , Path } from 'react-native/Libraries/ART/ReactNativeART'
 
 import ChartLine from './chart-line'
 import DotAndLine from './dot-and-line'
@@ -19,7 +19,7 @@ const TemperatureColumn = ({
   const x = styles.nfpLine.strokeWidth / 2
 
   return (
-    <Group>
+    <Surface width={config.columnWidth} height={columnHeight}>
 
       <ChartLine
         path={new Path().lineTo(0, columnHeight)}
@@ -49,7 +49,8 @@ const TemperatureColumn = ({
         leftTemperatureExclude={data.leftTemperatureExclude}
         key='dotandline'
       />}
-    </Group>
+
+    </Surface>
   )
 }