Add step labeling to sankey #73
Merged
Conversation
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
krissalvador27
requested review from
ariroseonline,
dandelany,
joshbDev and
mindyyuan
|
the repeated commits might be due to me rebasing after I had already pushed this branch up.. will be squashed and merged anyway so shouldn't affect anything |
joshbDev
reviewed
May 31, 2018
There was a problem hiding this comment.
small notes but lgtm
_____|\
_.--| SSt |:
<____|.----||
.---''---,
;..__..' _...
,'/ ;|/..--'' \
,'_/.-/': :
_..-'''/ / | \ \ _|/|
\ /-./_ \; \ \,;' \
,\ / \: `:\ \ // `:`.
,' \ /-._; | : : :: ,. .
,' :: /`-._| | | || ' : `.`.)
_,' |;._:: | | | | `| : `'
,' `. / |`-:_ ; | | | : \
`--. ) /|-._: : | \ \
/ / :_| ;`-._; __..--'; : :
/ ( ;|;-./_ _/.-:'o | / ' |
/ , \._/_/_./--''/_|:|___|_,' |
: / `'-'--'----'---------' |
| : O ._O O_. O ._O O_. ; ;
: `. // // // // ,' /
~~~`.______//____//____//____//_______,'~
// //~ // //
~~ _// _// _// ~ _// ~
~ / / / / / / / / ~ ~~
~~~ ~~~ ~~~ ~~~
| const depthMapXPos = {}; | ||
| const depthMapYPos = {}; | ||
|
|
||
| nodes.forEach(n => { |
There was a problem hiding this comment.
these are the nodes returned to us after creating the Sankey graph using d3
There was a problem hiding this comment.
I just wanted to make sure that this isn't a DOM element array, as they don't have the same prototypical functions as regular arrays
src/SankeyDiagram.js
Outdated
| nodes.forEach(n => { | ||
| depthMapXPos[n.depth] = n.x0; | ||
|
|
||
| if (depthMapYPos[n.depth]) { |
There was a problem hiding this comment.
this can be flattened into a ternary
joshbDev
reviewed
May 31, 2018
src/SankeyDiagram.js
Outdated
| depthMapYPos[n.depth] = n.y0; | ||
| } | ||
| // For the given depth, set the y equal to the highest positioned y value | ||
| depthMapYPos[n.depth] |
There was a problem hiding this comment.
sorry to be picky, but I think it would be more readable to do
depthMapYPos[n.depth] = depthMapYPos[n.depth] ? Math.min(n.y0, depthMapYPos[n.depth] : n.y0;
There was a problem hiding this comment.
that's true 👍
krissalvador27
pushed a commit
that referenced
this pull request
May 31, 2018
* Histogram improvements + tests (#57) * Add react-docgen to devDependencies * Histogram improvements - calculate yDomain and based off given data. Include mouse interaction and styling props. Add tests. * Test horizontal props for BarChart * Histogram - move binning into render function to handle dynamic data, make value prop a function, improve docs, remove unused code * rebuild docs * Integrate prettier & eslint code styles + add linting as part of npm test (#58) * Add prettier & eslint code style rules * Include eslint process with npm test * Clean up and refactor (#59) * Add prettier & eslint code style rules * Remove legacy code and evaluate any todos * Only send valid XYPlot props to children. Resolves #22 * Check against master list of scaleTypes * Implement invertX and invertY scale * Alphabetically sort props displayed on docs * Update documentation for x and y axis labels and titles * Clean up code and todos * includeXZero and includeYZero props + test * feature(yaml): add ci/cd (#60) * feature(version): version bump (#61) * feature(version): version bump * feature(lockfile): add a lockfile * Clean up multiple warning logs and fix regression on children components not getting their defaultProps (#64) * Include css in root and add less -> css to build process (#63) * Include css in root and add to build process * Update readme directions to run examples * add AreaBarChart spec (#65) * Namespace css classes + update class and style props where applicable (#66) * AreaChartBar namespace * AreaChart namespace * AreaHeatMap namespace + accessor class and style funcs * BarChart update documentation * ColorHeatmap namespace and update documentation * FunnelChart namespace and accessors * Add lineStyle and lineClassName to KDE and remove unused prop in LineChart * MarketLineChart namespace and class and style accessors * RangeBarChart namespace * ScatterPlot namespace * PieChart documentation and updates * XYPlot namespace and underlying components * Add classes to linechart, remove unused styles * Namespace SankeyDiagram and updates to PieChart * Update tests * Update docs * Add backwards compatibility for markerLineClass * Update docs * Use className from props for RangeRect * Add disableMouseWheelZoom prop to ZoomContainer (#67) * Add disable mousewheel prop to reactochart * Update docs * 0.4.6 release (#68) * Update README.md to include directions for importing styles (#71) * add ColorHeatmap spec (#72) * add ColorHeatmap spec * generate build docs * Add step labeling to sankey (#73) * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * PR review + documentation * Better ternary * Update changelog and bump version (#74)
krissalvador27
pushed a commit
that referenced
this pull request
Jun 8, 2018
* Histogram improvements + tests (#57) * Add react-docgen to devDependencies * Histogram improvements - calculate yDomain and based off given data. Include mouse interaction and styling props. Add tests. * Test horizontal props for BarChart * Histogram - move binning into render function to handle dynamic data, make value prop a function, improve docs, remove unused code * rebuild docs * Integrate prettier & eslint code styles + add linting as part of npm test (#58) * Add prettier & eslint code style rules * Include eslint process with npm test * Clean up and refactor (#59) * Add prettier & eslint code style rules * Remove legacy code and evaluate any todos * Only send valid XYPlot props to children. Resolves #22 * Check against master list of scaleTypes * Implement invertX and invertY scale * Alphabetically sort props displayed on docs * Update documentation for x and y axis labels and titles * Clean up code and todos * includeXZero and includeYZero props + test * feature(yaml): add ci/cd (#60) * feature(version): version bump (#61) * feature(version): version bump * feature(lockfile): add a lockfile * Clean up multiple warning logs and fix regression on children components not getting their defaultProps (#64) * Include css in root and add less -> css to build process (#63) * Include css in root and add to build process * Update readme directions to run examples * add AreaBarChart spec (#65) * Namespace css classes + update class and style props where applicable (#66) * AreaChartBar namespace * AreaChart namespace * AreaHeatMap namespace + accessor class and style funcs * BarChart update documentation * ColorHeatmap namespace and update documentation * FunnelChart namespace and accessors * Add lineStyle and lineClassName to KDE and remove unused prop in LineChart * MarketLineChart namespace and class and style accessors * RangeBarChart namespace * ScatterPlot namespace * PieChart documentation and updates * XYPlot namespace and underlying components * Add classes to linechart, remove unused styles * Namespace SankeyDiagram and updates to PieChart * Update tests * Update docs * Add backwards compatibility for markerLineClass * Update docs * Use className from props for RangeRect * Add disableMouseWheelZoom prop to ZoomContainer (#67) * Add disable mousewheel prop to reactochart * Update docs * 0.4.6 release (#68) * Update README.md to include directions for importing styles (#71) * add ColorHeatmap spec (#72) * add ColorHeatmap spec * generate build docs * Add step labeling to sankey (#73) * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * PR review + documentation * Better ternary * Update changelog and bump version (#74) * add AreaHeatmap, FunnelChart spec (#77) * add AreaHeatmap spec * add FunnelChart spec * feature(Standards): add in code of conduct and NOTICE file (#76) * Zoom container spec (#78) * Zoom Container spec * Added npm run test-files * Add eslint to tests (#79) * Add tests to linter * Update tests with lint-fix * Fix growl dependency via mocha (#80) * Fix growl dependency on mocha * Update package lock json * Update version and changelog (#81)
install
pushed a commit
that referenced
this pull request
Feb 25, 2020
* Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * PR review + documentation * Better ternary
install
pushed a commit
that referenced
this pull request
Feb 25, 2020
* Histogram improvements + tests (#57) * Add react-docgen to devDependencies * Histogram improvements - calculate yDomain and based off given data. Include mouse interaction and styling props. Add tests. * Test horizontal props for BarChart * Histogram - move binning into render function to handle dynamic data, make value prop a function, improve docs, remove unused code * rebuild docs * Integrate prettier & eslint code styles + add linting as part of npm test (#58) * Add prettier & eslint code style rules * Include eslint process with npm test * Clean up and refactor (#59) * Add prettier & eslint code style rules * Remove legacy code and evaluate any todos * Only send valid XYPlot props to children. Resolves #22 * Check against master list of scaleTypes * Implement invertX and invertY scale * Alphabetically sort props displayed on docs * Update documentation for x and y axis labels and titles * Clean up code and todos * includeXZero and includeYZero props + test * feature(yaml): add ci/cd (#60) * feature(version): version bump (#61) * feature(version): version bump * feature(lockfile): add a lockfile * Clean up multiple warning logs and fix regression on children components not getting their defaultProps (#64) * Include css in root and add less -> css to build process (#63) * Include css in root and add to build process * Update readme directions to run examples * add AreaBarChart spec (#65) * Namespace css classes + update class and style props where applicable (#66) * AreaChartBar namespace * AreaChart namespace * AreaHeatMap namespace + accessor class and style funcs * BarChart update documentation * ColorHeatmap namespace and update documentation * FunnelChart namespace and accessors * Add lineStyle and lineClassName to KDE and remove unused prop in LineChart * MarketLineChart namespace and class and style accessors * RangeBarChart namespace * ScatterPlot namespace * PieChart documentation and updates * XYPlot namespace and underlying components * Add classes to linechart, remove unused styles * Namespace SankeyDiagram and updates to PieChart * Update tests * Update docs * Add backwards compatibility for markerLineClass * Update docs * Use className from props for RangeRect * Add disableMouseWheelZoom prop to ZoomContainer (#67) * Add disable mousewheel prop to reactochart * Update docs * 0.4.6 release (#68) * Update README.md to include directions for importing styles (#71) * add ColorHeatmap spec (#72) * add ColorHeatmap spec * generate build docs * Add step labeling to sankey (#73) * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * PR review + documentation * Better ternary * Update changelog and bump version (#74)
install
pushed a commit
that referenced
this pull request
Feb 25, 2020
* Histogram improvements + tests (#57) * Add react-docgen to devDependencies * Histogram improvements - calculate yDomain and based off given data. Include mouse interaction and styling props. Add tests. * Test horizontal props for BarChart * Histogram - move binning into render function to handle dynamic data, make value prop a function, improve docs, remove unused code * rebuild docs * Integrate prettier & eslint code styles + add linting as part of npm test (#58) * Add prettier & eslint code style rules * Include eslint process with npm test * Clean up and refactor (#59) * Add prettier & eslint code style rules * Remove legacy code and evaluate any todos * Only send valid XYPlot props to children. Resolves #22 * Check against master list of scaleTypes * Implement invertX and invertY scale * Alphabetically sort props displayed on docs * Update documentation for x and y axis labels and titles * Clean up code and todos * includeXZero and includeYZero props + test * feature(yaml): add ci/cd (#60) * feature(version): version bump (#61) * feature(version): version bump * feature(lockfile): add a lockfile * Clean up multiple warning logs and fix regression on children components not getting their defaultProps (#64) * Include css in root and add less -> css to build process (#63) * Include css in root and add to build process * Update readme directions to run examples * add AreaBarChart spec (#65) * Namespace css classes + update class and style props where applicable (#66) * AreaChartBar namespace * AreaChart namespace * AreaHeatMap namespace + accessor class and style funcs * BarChart update documentation * ColorHeatmap namespace and update documentation * FunnelChart namespace and accessors * Add lineStyle and lineClassName to KDE and remove unused prop in LineChart * MarketLineChart namespace and class and style accessors * RangeBarChart namespace * ScatterPlot namespace * PieChart documentation and updates * XYPlot namespace and underlying components * Add classes to linechart, remove unused styles * Namespace SankeyDiagram and updates to PieChart * Update tests * Update docs * Add backwards compatibility for markerLineClass * Update docs * Use className from props for RangeRect * Add disableMouseWheelZoom prop to ZoomContainer (#67) * Add disable mousewheel prop to reactochart * Update docs * 0.4.6 release (#68) * Update README.md to include directions for importing styles (#71) * add ColorHeatmap spec (#72) * add ColorHeatmap spec * generate build docs * Add step labeling to sankey (#73) * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * Add step labeling functionality to sankey * Update tests for sankey to include step labels * Update docs * PR review + documentation * Better ternary * Update changelog and bump version (#74) * add AreaHeatmap, FunnelChart spec (#77) * add AreaHeatmap spec * add FunnelChart spec * feature(Standards): add in code of conduct and NOTICE file (#76) * Zoom container spec (#78) * Zoom Container spec * Added npm run test-files * Add eslint to tests (#79) * Add tests to linter * Update tests with lint-fix * Fix growl dependency via mocha (#80) * Fix growl dependency on mocha * Update package lock json * Update version and changelog (#81)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds step labeling to Sankey. Users must opt in to have labels show up