-
Notifications
You must be signed in to change notification settings - Fork 716
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #285 from hshoff/harry-threshold
[threshold] add @vx/threshold. fixes #245
- Loading branch information
Showing
15 changed files
with
415 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| import React from 'react'; | ||
| import { Group } from '@vx/group'; | ||
| import { curveBasis } from '@vx/curve'; | ||
| import { LinePath } from '@vx/shape'; | ||
| import { Threshold } from '@vx/threshold'; | ||
| import { scaleTime, scaleLinear } from '@vx/scale'; | ||
| import { AxisLeft, AxisBottom } from '@vx/axis'; | ||
| import { GridRows, GridColumns } from '@vx/grid'; | ||
| import { cityTemperature as data } from '@vx/mock-data'; | ||
| import { timeFormat, timeParse } from 'd3-time-format'; | ||
|
|
||
| const parseDate = timeParse('%Y%m%d'); | ||
|
|
||
| // accessors | ||
| const date = d => parseDate(d.date); | ||
| const ny = d => d['New York']; | ||
| const sf = d => d['San Francisco']; | ||
|
|
||
| export default class Thresholds extends React.Component { | ||
| render() { | ||
| const { width, height, margin, events } = this.props; | ||
| if (width < 10) return null; | ||
|
|
||
| // bounds | ||
| const xMax = width - margin.left - margin.right; | ||
| const yMax = height - margin.top - margin.bottom; | ||
|
|
||
| // scales | ||
| const xScale = scaleTime({ | ||
| range: [0, xMax], | ||
| domain: [Math.min(...data.map(date)), Math.max(...data.map(date))] | ||
| }); | ||
| const yScale = scaleLinear({ | ||
| range: [yMax, 0], | ||
| domain: [ | ||
| Math.min(...data.map(d => Math.min(ny(d), sf(d)))), | ||
| Math.max(...data.map(d => Math.max(ny(d), sf(d)))) | ||
| ], | ||
| nice: true | ||
| }); | ||
|
|
||
| return ( | ||
| <div> | ||
| <svg width={width} height={height}> | ||
| <rect x={0} y={0} width={width} height={height} fill="#f3f3f3" rx={14} /> | ||
| <Group left={margin.left} top={margin.top}> | ||
| <GridRows scale={yScale} width={xMax} height={yMax} stroke="#e0e0e0" /> | ||
| <GridColumns scale={xScale} width={xMax} height={yMax} stroke="#e0e0e0" /> | ||
| <line x1={xMax} x2={xMax} y1={0} y2={yMax} stroke="#e0e0e0" /> | ||
| <AxisBottom top={yMax} scale={xScale} numTicks={width > 520 ? 10 : 5} /> | ||
| <AxisLeft scale={yScale} /> | ||
| <text x="-70" y="15" transform="rotate(-90)" fontSize={10}> | ||
| Temperature (°F) | ||
| </text> | ||
| <Threshold | ||
| data={data} | ||
| x={date} | ||
| y0={ny} | ||
| y1={sf} | ||
| xScale={xScale} | ||
| yScale={yScale} | ||
| clipAboveTo={0} | ||
| clipBelowTo={yMax} | ||
| curve={curveBasis} | ||
| belowAreaProps={{ | ||
| fill: 'red', | ||
| fillOpacity: 0.4 | ||
| }} | ||
| aboveAreaProps={{ | ||
| fill: 'green', | ||
| fillOpacity: 0.4 | ||
| }} | ||
| /> | ||
| <LinePath | ||
| data={data} | ||
| curve={curveBasis} | ||
| x={date} | ||
| y={sf} | ||
| xScale={xScale} | ||
| yScale={yScale} | ||
| stroke="#000" | ||
| strokeWidth={1.5} | ||
| strokeOpacity={0.8} | ||
| strokeDasharray="1,2" | ||
| /> | ||
| <LinePath | ||
| data={data} | ||
| curve={curveBasis} | ||
| x={date} | ||
| y={ny} | ||
| xScale={xScale} | ||
| yScale={yScale} | ||
| stroke="#000" | ||
| strokeWidth={1.5} | ||
| /> | ||
| </Group> | ||
| </svg> | ||
| </div> | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| import React from 'react'; | ||
| import Show from '../components/show'; | ||
| import Threshold from '../components/tiles/threshold'; | ||
|
|
||
| function Description({ width }) { | ||
| return ( | ||
| <div style={{ width, fontSize: 14 }}> | ||
| Based on Mike Bostock's{' '} | ||
| <a href="https://bl.ocks.org/mbostock/3894205" target="_blank"> | ||
| Difference Chart | ||
| </a> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default () => { | ||
| return ( | ||
| <Show | ||
| component={Threshold} | ||
| title="Threshold" | ||
| description={Description} | ||
| margin={{ | ||
| top: 40, | ||
| left: 40, | ||
| right: 20, | ||
| bottom: 50 | ||
| }} | ||
| > | ||
| {`import React from 'react'; | ||
| import { Group } from '@vx/group'; | ||
| import { curveBasis } from '@vx/curve'; | ||
| import { LinePath } from '@vx/shape'; | ||
| import { Threshold } from '@vx/threshold'; | ||
| import { scaleTime, scaleLinear } from '@vx/scale'; | ||
| import { AxisLeft, AxisBottom } from '@vx/axis'; | ||
| import { GridRows, GridColumns } from '@vx/grid'; | ||
| import { cityTemperature as data } from '@vx/mock-data'; | ||
| import { timeFormat, timeParse } from 'd3-time-format'; | ||
| const parseDate = timeParse('%Y%m%d'); | ||
| // accessors | ||
| const date = d => parseDate(d.date); | ||
| const ny = d => d['New York']; | ||
| const sf = d => d['San Francisco']; | ||
| export default class Thresholds extends React.Component { | ||
| render() { | ||
| const { width, height, margin, events } = this.props; | ||
| if (width < 10) return null; | ||
| // bounds | ||
| const xMax = width - margin.left - margin.right; | ||
| const yMax = height - margin.top - margin.bottom; | ||
| // scales | ||
| const xScale = scaleTime({ | ||
| range: [0, xMax], | ||
| domain: [Math.min(...data.map(date)), Math.max(...data.map(date))] | ||
| }); | ||
| const yScale = scaleLinear({ | ||
| range: [yMax, 0], | ||
| domain: [ | ||
| Math.min(...data.map(d => Math.min(ny(d), sf(d)))), | ||
| Math.max(...data.map(d => Math.max(ny(d), sf(d)))) | ||
| ], | ||
| nice: true | ||
| }); | ||
| return ( | ||
| <div> | ||
| <svg width={width} height={height}> | ||
| <rect x={0} y={0} width={width} height={height} fill="#f3f3f3" rx={14} /> | ||
| <Group left={margin.left} top={margin.top}> | ||
| <GridRows scale={yScale} width={xMax} height={yMax} stroke="#e0e0e0" /> | ||
| <GridColumns scale={xScale} width={xMax} height={yMax} stroke="#e0e0e0" /> | ||
| <line x1={xMax} x2={xMax} y1={0} y2={yMax} stroke="#e0e0e0" /> | ||
| <AxisBottom top={yMax} scale={xScale} numTicks={width > 520 ? 10 : 5} /> | ||
| <AxisLeft scale={yScale} /> | ||
| <text x="-70" y="15" transform="rotate(-90)" fontSize={10}> | ||
| Temperature (°F) | ||
| </text> | ||
| <Threshold | ||
| data={data} | ||
| x={date} | ||
| y0={ny} | ||
| y1={sf} | ||
| xScale={xScale} | ||
| yScale={yScale} | ||
| clipAboveTo={0} | ||
| clipBelowTo={yMax} | ||
| curve={curveBasis} | ||
| belowAreaProps={{ | ||
| fill: 'red', | ||
| fillOpacity: 0.4 | ||
| }} | ||
| aboveAreaProps={{ | ||
| fill: 'green', | ||
| fillOpacity: 0.4 | ||
| }} | ||
| /> | ||
| <LinePath | ||
| data={data} | ||
| curve={curveBasis} | ||
| x={date} | ||
| y={sf} | ||
| xScale={xScale} | ||
| yScale={yScale} | ||
| stroke="#000" | ||
| strokeWidth={1.5} | ||
| strokeOpacity={0.8} | ||
| strokeDasharray="1,2" | ||
| /> | ||
| <LinePath | ||
| data={data} | ||
| curve={curveBasis} | ||
| x={date} | ||
| y={ny} | ||
| xScale={xScale} | ||
| yScale={yScale} | ||
| stroke="#000" | ||
| strokeWidth={1.5} | ||
| /> | ||
| </Group> | ||
| </svg> | ||
| </div> | ||
| ); | ||
| } | ||
| }`} | ||
| </Show> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "presets": ["es2015", "react", "stage-0"], | ||
| "plugins": [], | ||
| "env": { | ||
| "development": { | ||
| "plugins": [ | ||
| ["react-transform", { | ||
| "transforms": [{ | ||
| "transform": "react-transform-hmr", | ||
| "imports": ["react"], | ||
| "locals": ["module"] | ||
| }] | ||
| }], | ||
| "transform-runtime", | ||
| "transform-decorators-legacy" | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| package-lock=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| include node_modules/react-fatigue-dev/Makefile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # @vx/threshold | ||
|
|
||
| ``` | ||
| npm install --save @vx/threshold | ||
| ``` |
Oops, something went wrong.