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.

Sign up for GitHub

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

Jump to bottom

Tests and tweaks to the select menu widget #1019

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Tests and tweaks to the select menu widget #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 30 additions & 7 deletions spec/select-menu-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,30 +96,30 @@ describe('dc.selectMenu', function () {
describe('regular single select', function () {
describe('selecting an option', function () {
it('filters dimension based on selected option\'s value', function () {
chart.onChange(stateGroup.all()[0].key);
chart.onChange([stateGroup.all()[0].key]);
expect(chart.filter()).toEqual('California');
});
it('replaces filter on second selection', function () {
chart.onChange(stateGroup.all()[0].key);
chart.onChange(stateGroup.all()[1].key);
chart.onChange([stateGroup.all()[0].key]);
chart.onChange([stateGroup.all()[1].key]);
expect(chart.filter()).toEqual('Colorado');
expect(chart.filters().length).toEqual(1);
});
it('actually filters dimension', function () {
chart.onChange(stateGroup.all()[0].key);
chart.onChange([stateGroup.all()[0].key]);
expect(regionGroup.all()[0].value).toEqual(0);
expect(regionGroup.all()[3].value).toEqual(2);
});
it('removes filter when prompt option is selected', function () {
chart.onChange(null);
chart.onChange(['']);
expect(chart.hasFilter()).not.toBeTruthy();
expect(regionGroup.all()[0].value).toEqual(1);
});
});

describe('redraw with existing filter', function () {
it('selects option corresponding to active filter', function () {
chart.onChange(stateGroup.all()[0].key);
chart.onChange([stateGroup.all()[0].key]);
chart.redraw();
expect(chart.selectAll('select')[0][0].value).toEqual('California');
});
Expand All @@ -143,11 +143,33 @@ describe('dc.selectMenu', function () {
expect(regionGroup.all()[3].value).toEqual(2);
expect(regionGroup.all()[4].value).toEqual(2);
});

it('removes all filters when prompt option is selected', function () {
chart.onChange(null);
chart.onChange(['']);
expect(chart.hasFilter()).not.toBeTruthy();
expect(regionGroup.all()[0].value).toEqual(1);
});

it('filters out empty prompt option when other selections present', function () {
chart.onChange(['', stateGroup.all()[0].key, stateGroup.all()[1].key]);
expect(chart.filters()).toEqual(['California', 'Colorado']);
expect(chart.filters().length).toEqual(2);
});

describe('with a single selection', function () {
beforeEach(function () {
chart.onChange([stateGroup.all()[0].key]);
});
it('can be used with a single selection', function () {
expect(chart.filter()).toEqual('California');
expect(chart.filters().length).toEqual(1);
});
it('with a single selection correctly filters dimension', function () {
expect(regionGroup.all()[0].value).toEqual(0);
expect(regionGroup.all()[3].value).toEqual(2);
});
});

it('selects all options corresponding to active filters on redraw', function () {
var selectedOptions = chart.selectAll('select').selectAll('option')[0].filter(function (d) {
// IE returns an extra option with value '', not sure what it means
Expand All @@ -156,6 +178,7 @@ describe('dc.selectMenu', function () {
expect(selectedOptions.length).toEqual(2);
expect(selectedOptions.map(function (d) { return d.value; })).toEqual(['California', 'Colorado']);
});

it('does not deselect previously filtered options when new option is added', function () {
chart.onChange([stateGroup.all()[0].key, stateGroup.all()[1].key, stateGroup.all()[5].key]);

Expand Down
18 changes: 7 additions & 11 deletions src/select-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,28 +102,24 @@ dc.selectMenu = function (parent, chartGroup) {
});
} else { // IE and other browsers do not support selectedOptions
// adapted from this polyfill: https://gist.github.com/brettz9/4212217
var options = [].slice.call(d3.event.target.options);
var options = [].slice.call(target.options);
values = options.filter(function (option) {
return option.selected;
}).map(function (option) {
return option.value;
});
}
// console.log(values);
// check if only prompt option is selected
if (values.length === 1 && values[0] === '') {
values = null;
} else if (!_multiple && values.length === 1) {
values = values[0];
}
// console.log("VALUES", values);
_chart.onChange(values);
}

_chart.onChange = function (val) {
if (val && _multiple) {
if (val && val instanceof Array) {
// filter out empty values
val = val.filter(function (option) {
return !!option;
});
_chart.replaceFilter([val]);
} else if (val) {
_chart.replaceFilter(val);
} else {
_chart.filterAll();
}
Expand Down