diff --git a/web/src/Components/Bridging/BridgeContainer.tsx b/web/src/Components/Bridging/BridgeContainer.tsx index cbe1bce..815051f 100644 --- a/web/src/Components/Bridging/BridgeContainer.tsx +++ b/web/src/Components/Bridging/BridgeContainer.tsx @@ -117,11 +117,17 @@ export default ({ bridges, mode, setMode, bridgeValue, setValue }: BridgeContain /> - + ) diff --git a/web/src/Components/Bridging/Graphs/BridgeGraph.tsx b/web/src/Components/Bridging/Graphs/BridgeGraph.tsx index de1a4a1..355577a 100644 --- a/web/src/Components/Bridging/Graphs/BridgeGraph.tsx +++ b/web/src/Components/Bridging/Graphs/BridgeGraph.tsx @@ -2,17 +2,18 @@ import React, { useContext, useEffect, useState } from 'react' import { Area, AreaChart, CartesianGrid, Legend, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts' import { ParticleSizeContext } from '../../../Context' import { findGraphData } from '../../../Utils' -import { graphColors } from '../styles' +import { bridgeColor, graphColors } from '../styles' import { Bridge, GraphData } from '../../../Types' type BridgeGraphProps = { yAxis: string graphData: GraphData[] sizeFractions: number[] - bridges: Bridge + bridges: Bridge | undefined + showBridge?: boolean } -export function BridgeGraph({ yAxis, graphData, sizeFractions, bridges }: BridgeGraphProps) { +export function BridgeGraph({ yAxis, graphData, sizeFractions, bridges, showBridge = true }: BridgeGraphProps) { const [particleFromPercentage, setParticleFromPercentage] = useState('0%') const [particleToPercentage, setParticleToPercentage] = useState('100%') const particleRange = useContext(ParticleSizeContext) @@ -32,6 +33,10 @@ export function BridgeGraph({ yAxis, graphData, sizeFractions, bridges }: Bridge let percentage = (index / sizeFractions.length) * 100 return `${percentage}%` } + if (!showBridge) { + const { Bridge, ...withoutBridge } = bridges + bridges = withoutBridge + } return (
@@ -63,7 +68,9 @@ export function BridgeGraph({ yAxis, graphData, sizeFractions, bridges }: Bridge Optimal Bridge:
-

- D10: {findDValue(optimalBridgeGraphData, 10, 'Bridge')} - {'\u00B5m'} -

-

- D50: {findDValue(optimalBridgeGraphData, 50, 'Bridge')} - {'\u00B5m'} -

-

- D90: {findDValue(optimalBridgeGraphData, 90, 'Bridge')} - {'\u00B5m'} -

+ {[10, 50, 90].map(d => ( +

+ D{d}: {findDValue(optimalBridgeGraphData, d, 'Bridge')} + {'\u00B5m'} +

+ ))}
)} diff --git a/web/src/Components/Bridging/styles.ts b/web/src/Components/Bridging/styles.ts index 2a9b15f..b00cbf2 100644 --- a/web/src/Components/Bridging/styles.ts +++ b/web/src/Components/Bridging/styles.ts @@ -21,8 +21,9 @@ export const StyledSelect = styled.select` background-color: #ffffff; ` +export const bridgeColor = '#000000' + export const graphColors = [ - '#000000', '#ee2e89', '#21d0bb', '#2077d9',