-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(stream): fix stream stacked tooltip
- Loading branch information
Raphaël Benitte
committed
Aug 29, 2017
1 parent
94ad4d9
commit 05fbcc9
Showing
4 changed files
with
142 additions
and
115 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * This file is part of the nivo project. | ||
| * | ||
| * Copyright 2016-present, Raphaël Benitte. | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| import React from 'react' | ||
| import { min, max, range, sortBy } from 'lodash' | ||
| import { stack as d3Stack, area } from 'd3-shape' | ||
| import { scaleLinear, scalePoint } from 'd3-scale' | ||
| import compose from 'recompose/compose' | ||
| import defaultProps from 'recompose/defaultProps' | ||
| import pure from 'recompose/pure' | ||
| import withPropsOnChange from 'recompose/withPropsOnChange' | ||
| import { stackOrderFromProp, stackOffsetFromProp } from '../../../props' | ||
| import { withTheme, withCurve, withDimensions, withMotion } from '../../../hocs' | ||
| import { getColorRange } from '../../../lib/colors' | ||
| import { StreamDefaultProps } from './props' | ||
|
|
||
| const stackMin = layers => min(layers.reduce((acc, layer) => [...acc, ...layer.map(d => d[0])], [])) | ||
| const stackMax = layers => max(layers.reduce((acc, layer) => [...acc, ...layer.map(d => d[1])], [])) | ||
|
|
||
| export default Component => | ||
| compose( | ||
| defaultProps(StreamDefaultProps), | ||
| withTheme(), | ||
| withCurve(), | ||
| withDimensions(), | ||
| withMotion(), | ||
| withPropsOnChange(['curveInterpolator'], ({ curveInterpolator }) => ({ | ||
| areaGenerator: area() | ||
| .x(({ x }) => x) | ||
| .y0(({ y1 }) => y1) | ||
| .y1(({ y2 }) => y2) | ||
| .curve(curveInterpolator), | ||
| })), | ||
| withPropsOnChange(['colors'], ({ colors }) => ({ | ||
| getColor: getColorRange(colors), | ||
| })), | ||
| withPropsOnChange(['keys', 'offsetType', 'order'], ({ keys, offsetType, order }) => ({ | ||
| stack: d3Stack() | ||
| .keys(keys) | ||
| .offset(stackOffsetFromProp(offsetType)) | ||
| .order(stackOrderFromProp(order)), | ||
| })), | ||
| withPropsOnChange( | ||
| ['stack', 'data', 'width', 'height'], | ||
| ({ stack, data, width, height }) => { | ||
| const layers = stack(data) | ||
| layers.forEach(layer => { | ||
| layer.forEach(point => { | ||
| point.value = point.data[layer.key] | ||
| }) | ||
| }) | ||
|
|
||
| const minValue = stackMin(layers) | ||
| const maxValue = stackMax(layers) | ||
|
|
||
| return { | ||
| layers, | ||
| xScale: scalePoint().domain(range(data.length)).range([0, width]), | ||
| yScale: scaleLinear().domain([minValue, maxValue]).range([height, 0]), | ||
| } | ||
| } | ||
| ), | ||
| pure | ||
| )(Component) |
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,65 @@ | ||
| /* | ||
| * This file is part of the nivo project. | ||
| * | ||
| * Copyright 2016-present, Raphaël Benitte. | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| import PropTypes from 'prop-types' | ||
| import { areaCurvePropType, stackOrderPropType, stackOffsetPropType } from '../../../props' | ||
|
|
||
| export const StreamPropTypes = { | ||
| // data | ||
| data: PropTypes.arrayOf(PropTypes.object).isRequired, | ||
| keys: PropTypes.array.isRequired, | ||
|
|
||
| stack: PropTypes.func.isRequired, | ||
| xScale: PropTypes.func.isRequired, | ||
| yScale: PropTypes.func.isRequired, | ||
|
|
||
| order: stackOrderPropType.isRequired, | ||
| offsetType: stackOffsetPropType.isRequired, | ||
| curve: areaCurvePropType.isRequired, | ||
| areaGenerator: PropTypes.func.isRequired, | ||
|
|
||
| // axes & grid | ||
| axisTop: PropTypes.object, | ||
| axisRight: PropTypes.object, | ||
| axisBottom: PropTypes.object, | ||
| axisLeft: PropTypes.object, | ||
| enableGridX: PropTypes.bool.isRequired, | ||
| enableGridY: PropTypes.bool.isRequired, | ||
|
|
||
| // theming | ||
| colors: PropTypes.any.isRequired, | ||
| fillOpacity: PropTypes.number.isRequired, | ||
| getColor: PropTypes.func.isRequired, | ||
|
|
||
| // interactivity | ||
| isInteractive: PropTypes.bool, | ||
|
|
||
| // stack tooltip | ||
| enableStackTooltip: PropTypes.bool.isRequired, | ||
| } | ||
|
|
||
| export const StreamDefaultProps = { | ||
| order: 'none', | ||
| offsetType: 'wiggle', | ||
| curve: 'catmullRom', | ||
|
|
||
| // axes & grid | ||
| axisBottom: {}, | ||
| enableGridX: true, | ||
| enableGridY: false, | ||
|
|
||
| // theming | ||
| colors: 'nivo', | ||
| fillOpacity: 1, | ||
|
|
||
| // interactivity | ||
| isInteractive: true, | ||
|
|
||
| // stack tooltip | ||
| enableStackTooltip: true, | ||
| } |