-
Notifications
You must be signed in to change notification settings - Fork 1.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
UI: Fix the missing pixels issue with distribution-bar #4507
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
e435d54
Fix a bug where the wrong index could be used when some bars had no v…
DingoEatingFuzz 7e51502
Create a single-bar example of distribution-bar in the styleguide
DingoEatingFuzz d5af5e6
Compute the correct number of pixels to shave off of bar width
DingoEatingFuzz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
import Component from '@ember/component'; | ||
import { computed, observer } from '@ember/object'; | ||
import { computed, observer, set } from '@ember/object'; | ||
import { run } from '@ember/runloop'; | ||
import { assign } from '@ember/polyfills'; | ||
import { guidFor, copy } from '@ember/object/internals'; | ||
|
@@ -76,6 +76,9 @@ export default Component.extend(WindowResizable, { | |
const { chart, _data, isNarrow } = this.getProperties('chart', '_data', 'isNarrow'); | ||
const width = this.$('svg').width(); | ||
const filteredData = _data.filter(d => d.value > 0); | ||
filteredData.forEach((d, index) => { | ||
set(d, 'index', index); | ||
}); | ||
|
||
let slices = chart.select('.bars').selectAll('g').data(filteredData, d => d.label); | ||
let sliceCount = filteredData.length; | ||
|
@@ -114,8 +117,15 @@ export default Component.extend(WindowResizable, { | |
|
||
this.set('slices', slices); | ||
|
||
const setWidth = d => `${width * d.percent - (d.index === sliceCount - 1 || d.index === 0 ? 1 : 2)}px` | ||
const setOffset = d => `${width * d.offset + (d.index === 0 ? 0 : 1)}px` | ||
const setWidth = d => { | ||
// Remove a pixel from either side of the slice | ||
let modifier = 2; | ||
if (d.index === 0) modifier--; // But not the left side | ||
if (d.index === sliceCount - 1) modifier--; // But not the right side | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These three lines are clever (in a good way). |
||
|
||
return `${width * d.percent - modifier}px`; | ||
}; | ||
const setOffset = d => `${width * d.offset + (d.index === 0 ? 0 : 1)}px`; | ||
|
||
let hoverTargets = slices.selectAll('.target').data(d => [d]); | ||
hoverTargets.enter() | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I read a thing about preference of
for ... of
overforEach
loops recently and have been trying to use them more. I certainly like they way they read, though that's not necessarily true of the transpiled code.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I always forget that JS has better for loops now.