lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update react-native to v0.62.0

Browse Source
This commit is contained in:
Sofiya Tepikin
2022-08-12 08:29:30 +00:00
parent ccdcced112
commit 78edee3b07
24 changed files with 3838 additions and 1556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/chart/chart-line.js
+9 -7
View File
@@ -1,19 +1,21 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Shape } from 'react-native/Libraries/ART/ReactNativeART'
import { Shape } from '@react-native-community/art'
import { Colors } from '../../styles'
import { CHART_STROKE_WIDTH, CHART_GRID_LINE_HORIZONTAL_WIDTH } from '../../config'
import {
CHART_STROKE_WIDTH,
CHART_GRID_LINE_HORIZONTAL_WIDTH,
} from '../../config'
const ChartLine = ({ path, isNfpLine }) => {
const color = isNfpLine ? Colors.orange : Colors.grey
const width = isNfpLine
? CHART_STROKE_WIDTH : CHART_GRID_LINE_HORIZONTAL_WIDTH * 2.5
? CHART_STROKE_WIDTH
: CHART_GRID_LINE_HORIZONTAL_WIDTH * 2.5
return (
<Shape d={path} stroke={color} strokeWidth={width} />
)
return <Shape d={path} stroke={color} strokeWidth={width} />
}
ChartLine.propTypes = {
@@ -22,7 +24,7 @@ ChartLine.propTypes = {
}
ChartLine.defaultProps = {
isNfpLine: false
isNfpLine: false,
}
export default ChartLine
components/chart/dot-and-line.js
+18 -17
View File
@@ -1,6 +1,6 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { Path, Shape } from 'react-native/Libraries/ART/ReactNativeART'
import { Path, Shape } from '@react-native-community/art'
import { Colors } from '../../styles'
@@ -8,7 +8,7 @@ import {
CHART_COLUMN_WIDTH,
CHART_COLUMN_MIDDLE,
CHART_DOT_RADIUS,
CHART_STROKE_WIDTH
CHART_STROKE_WIDTH,
} from '../../config'
export default class DotAndLine extends Component {
@@ -18,11 +18,11 @@ export default class DotAndLine extends Component {
leftTemperatureExclude: PropTypes.bool,
rightY: PropTypes.number,
rightTemperatureExclude: PropTypes.bool,
y: PropTypes.number.isRequired
y: PropTypes.number.isRequired,
}
shouldComponentUpdate(newProps) {
return Object.keys(newProps).some(key => newProps[key] != this.props[key])
return Object.keys(newProps).some((key) => newProps[key] != this.props[key])
}
render() {
@@ -32,35 +32,36 @@ export default class DotAndLine extends Component {
leftY,
rightTemperatureExclude,
rightY,
y
y,
} = this.props
let excludeLeftLine, excludeRightLine, lineLeft, lineRight
if (leftY) {
const middleY = ((leftY - y) / 2) + y
const middleY = (leftY - y) / 2 + y
excludeLeftLine = leftTemperatureExclude || exclude
lineLeft = new Path()
.moveTo(CHART_COLUMN_MIDDLE, y)
.lineTo(0, middleY)
lineLeft = new Path().moveTo(CHART_COLUMN_MIDDLE, y).lineTo(0, middleY)
}
if (rightY) {
const middleY = ((y - rightY) / 2) + rightY
const middleY = (y - rightY) / 2 + rightY
excludeRightLine = rightTemperatureExclude || exclude
lineRight = new Path()
.moveTo(CHART_COLUMN_MIDDLE, y)
.lineTo(CHART_COLUMN_WIDTH, middleY)
}
const dot = new Path().moveTo(CHART_COLUMN_MIDDLE , y - CHART_DOT_RADIUS)
const dot = new Path()
.moveTo(CHART_COLUMN_MIDDLE, y - CHART_DOT_RADIUS)
.arc(0, CHART_DOT_RADIUS * 2, CHART_DOT_RADIUS)
.arc(0, CHART_DOT_RADIUS * -2, CHART_DOT_RADIUS)
const dotColor = exclude ? Colors.turquoise : Colors.turquoiseDark
const lineColorLeft = excludeLeftLine ?
Colors.turquoise : Colors.turquoiseDark
const lineColorRight = excludeRightLine ?
Colors.turquoise : Colors.turquoiseDark
const lineColorLeft = excludeLeftLine
? Colors.turquoise
: Colors.turquoiseDark
const lineColorRight = excludeRightLine
? Colors.turquoise
: Colors.turquoiseDark
return(
return (
<React.Fragment>
<Shape
d={lineLeft}
@@ -79,7 +80,7 @@ export default class DotAndLine extends Component {
stroke={dotColor}
strokeWidth={CHART_STROKE_WIDTH}
fill="white"
key='dot'
key="dot"
/>
</React.Fragment>
)
components/chart/temperature-column.js
+32 -29
View File
@@ -2,7 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import { StyleSheet } from 'react-native'
import { Surface , Path } from 'react-native/Libraries/ART/ReactNativeART'
import { Surface, Path } from '@react-native-community/art'
import ChartLine from './chart-line'
import DotAndLine from './dot-and-line'
@@ -13,7 +13,7 @@ const TemperatureColumn = ({
horizontalLinePosition,
isVerticalLine,
data,
columnHeight
columnHeight,
}) => {
const x = CHART_STROKE_WIDTH / 2
@@ -23,34 +23,37 @@ const TemperatureColumn = ({
height={columnHeight}
style={styles.container}
>
<ChartLine path={new Path().lineTo(0, columnHeight)} />
<ChartLine path={new Path().lineTo(0, columnHeight)}/>
{horizontalLinePosition && (
<ChartLine
path={new Path()
.moveTo(0, horizontalLinePosition)
.lineTo(CHART_COLUMN_WIDTH, horizontalLinePosition)}
isNfpLine={true}
key="ltl"
/>
)}
{horizontalLinePosition && <ChartLine
path={new Path()
.moveTo(0, horizontalLinePosition)
.lineTo(CHART_COLUMN_WIDTH, horizontalLinePosition)
}
isNfpLine={true}
key='ltl'
/>}
{isVerticalLine && <ChartLine
path={new Path().moveTo(x, x).lineTo(x, columnHeight)}
isNfpLine={true}
key='fhm'
/>}
{data && typeof(data.y) !== 'undefined' && <DotAndLine
y={data.y}
exclude={data.temperatureExclude}
rightY={data.rightY}
rightTemperatureExclude={data.rightTemperatureExclude}
leftY={data.leftY}
leftTemperatureExclude={data.leftTemperatureExclude}
key='dotandline'
/>}
{isVerticalLine && (
<ChartLine
path={new Path().moveTo(x, x).lineTo(x, columnHeight)}
isNfpLine={true}
key="fhm"
/>
)}
{data && typeof data.y !== 'undefined' && (
<DotAndLine
y={data.y}
exclude={data.temperatureExclude}
rightY={data.rightY}
rightTemperatureExclude={data.rightTemperatureExclude}
leftY={data.leftY}
leftTemperatureExclude={data.leftTemperatureExclude}
key="dotandline"
/>
)}
</Surface>
)
}
@@ -64,8 +67,8 @@ TemperatureColumn.propTypes = {
const styles = StyleSheet.create({
container: {
backgroundColor: 'white'
}
backgroundColor: 'white',
},
})
export default TemperatureColumn