diff --git a/App.js b/App.js index 64f29a1..31adb9e 100644 --- a/App.js +++ b/App.js @@ -682,38 +682,34 @@ const App = () => { {value: 0.85, label: '15'}, ]; const lineData = [ - {value: 0, dataPointText: '0'}, - {value: 20, dataPointText: '20'}, + {value: 8, dataPointText: '8'}, + {value: 10, dataPointText: '10'}, + {value: 12, dataPointText: '12'}, + {value: 8, dataPointText: '8'}, + {value: 11, dataPointText: '11'}, + {value: 13, dataPointText: '13'}, + {value: 19, dataPointText: '19'}, {value: 18, dataPointText: '18'}, + {value: 22, dataPointText: '22'}, + {value: 20, dataPointText: '20'}, + {value: 28, dataPointText: '28'}, + {value: 32, dataPointText: '32'}, + {value: 36, dataPointText: '36'}, + {value: 40, dataPointText: '40'}, + {value: 38, dataPointText: '38'}, + {value: 40, dataPointText: '40'}, + {value: 42, dataPointText: '42'}, + {value: 46, dataPointText: '46'}, + {value: 44, dataPointText: '44'}, {value: 40, dataPointText: '40'}, {value: 36, dataPointText: '36'}, - {value: 60, dataPointText: '60'}, - {value: 54, dataPointText: '54'}, - {value: 85, dataPointText: '85'}, + {value: 32, dataPointText: '32'}, + {value: 38, dataPointText: '38'}, {value: 36, dataPointText: '36'}, - {value: 60, dataPointText: '60'}, - {value: 54, dataPointText: '54'}, - {value: 85, dataPointText: '85'}, - {value: 36, dataPointText: '36'}, - {value: 60, dataPointText: '60'}, - {value: 54, dataPointText: '54'}, - {value: 85, dataPointText: '85'}, - {value: 36, dataPointText: '36'}, - {value: 60, dataPointText: '60'}, - {value: 54, dataPointText: '54'}, - {value: 85, dataPointText: '85'}, - {value: 36, dataPointText: '36'}, - {value: 60, dataPointText: '60'}, - {value: 54, dataPointText: '54'}, - {value: 85, dataPointText: '85'}, - {value: 36, dataPointText: '36'}, - {value: 60, dataPointText: '60'}, - {value: 54, dataPointText: '54'}, - {value: 85, dataPointText: '85'}, - {value: 36, dataPointText: '36'}, - {value: 60, dataPointText: '60'}, - {value: 54, dataPointText: '54'}, - {value: 85, dataPointText: '85'}, + {value: 32, dataPointText: '32'}, + {value: 28, dataPointText: '28'}, + {value: 22, dataPointText: '22'}, + {value: 20, dataPointText: '20'}, ]; // const lineData = [ @@ -816,9 +812,9 @@ const App = () => { return ( {/* */} {/* { color="#0BA5A4" /> */} + { + return ( + + {item.value} + + ); + }, + }} + /> + + {/* { hideRules spacing={10} areaChart - /> + /> */} {/* { const scrollRef = useRef(); const [pointerX, setPointerX] = useState(0); const [pointerY, setPointerY] = useState(0); + const [pointerItem, setPointerItem] = useState({}); const [points, setPoints] = useState(''); const [points2, setPoints2] = useState(''); const [points3, setPoints3] = useState(''); @@ -2086,7 +2087,7 @@ export const LineChart = (props: propTypes) => { style={{ position: 'absolute', left: - (pointerRadius || pointerWidth / 2) - 20 + shiftPointerLabelX, + (pointerRadius || pointerWidth / 2) - 10 + shiftPointerLabelX, top: (pointerStripUptoDataPoint ? pointerRadius || pointerStripHeight / 2 @@ -2098,7 +2099,7 @@ export const LineChart = (props: propTypes) => { : containerHeight - pointerStripHeight, width: pointerLabelWidth, }}> - {pointerLabelComponent()} + {pointerLabelComponent(pointerItem)} )} @@ -2125,6 +2126,8 @@ export const LineChart = (props: propTypes) => { let x = evt.nativeEvent.locationX; let factor = x / (initialSpacing + spacing); factor = Math.round(factor); + factor = Math.min(factor, data.length - 1); + factor = Math.max(factor, 0); let z = initialSpacing + spacing * factor - @@ -2138,12 +2141,15 @@ export const LineChart = (props: propTypes) => { (pointerRadius || pointerHeight / 2) + 10; setPointerY(y); + setPointerItem(item); }} onResponderMove={evt => { if (!pointerConfig) return; let x = evt.nativeEvent.locationX; let factor = x / (initialSpacing + spacing); factor = Math.round(factor); + factor = Math.min(factor, data.length - 1); + factor = Math.max(factor, 0); let z = initialSpacing + spacing * factor - @@ -2157,6 +2163,7 @@ export const LineChart = (props: propTypes) => { (pointerRadius || pointerHeight / 2) + 10; setPointerY(y); + setPointerItem(item); }} onResponderRelease={evt => { setTimeout(() => setPointerX(0), pointerVanishDelay); @@ -2326,6 +2333,8 @@ export const LineChart = (props: propTypes) => { let x = evt.nativeEvent.locationX; let factor = x / (initialSpacing + spacing); factor = Math.round(factor); + factor = Math.min(factor, data.length - 1); + factor = Math.max(factor, 0); let z = initialSpacing + spacing * factor - @@ -2339,12 +2348,15 @@ export const LineChart = (props: propTypes) => { (pointerRadius || pointerHeight / 2) + 10; setPointerY(y); + setPointerItem(item); }} onResponderMove={evt => { if (!pointerConfig) return; let x = evt.nativeEvent.locationX; let factor = x / (initialSpacing + spacing); factor = Math.round(factor); + factor = Math.min(factor, data.length - 1); + factor = Math.max(factor, 0); let z = initialSpacing + spacing * factor - @@ -2358,6 +2370,7 @@ export const LineChart = (props: propTypes) => { (pointerRadius || pointerHeight / 2) + 10; setPointerY(y); + setPointerItem(item); }} onResponderRelease={evt => { setTimeout(() => setPointerX(0), pointerVanishDelay);