Skip to content
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

Cleanup redundant code in Sunburst chart #1660

Merged
merged 2 commits into from
Mar 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/base/base-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ const _defaultFilterHandler = (dimension, filters) => {
dimension.filterFunction(d => {
for (let i = 0; i < filters.length; i++) {
const filter = filters[i];
if (filter.isFiltered && filter.isFiltered(d)) {
return true;
if (filter.isFiltered) {
if(filter.isFiltered(d)) {
return true;
}
} else if (filter <= d && filter >= d) {
return true;
}
Expand Down
17 changes: 0 additions & 17 deletions src/charts/sunburst-chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,23 +73,6 @@ export class SunburstChart extends ColorMixin(BaseMixin) {

this.transitionDuration(350);

this.filterHandler((dimension, _filters) => {
if (_filters.length === 0) {
dimension.filter(null);
} else {
dimension.filterFunction(d => {
for (let i = 0; i < _filters.length; i++) {
const filter = _filters[i];
if (filter.isFiltered && filter.isFiltered(d)) {
return true;
}
}
return false;
});
}
return _filters;
});

this.anchor(parent, chartGroup);
}

Expand Down