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

Add scrollAfterSelect as a configurable option for multiselect dropdowns to allow toggling of highlightFirstItem() behaviour #5150

Merged
merged 3 commits into from Sep 5, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/js/select2/defaults.js
Expand Up @@ -365,6 +365,7 @@ define([
maximumSelectionLength: 0,
minimumResultsForSearch: 0,
selectOnClose: false,
scrollAfterSelect: true,
sorter: function (data) {
return data;
},
Expand Down
10 changes: 8 additions & 2 deletions src/js/select2/results.js
Expand Up @@ -276,7 +276,10 @@ define([
}

self.setClasses();
self.highlightFirstItem();

if (self.options.get('scrollAfterSelect')) {
self.highlightFirstItem();
}
});

container.on('unselect', function () {
Expand All @@ -285,7 +288,10 @@ define([
}

self.setClasses();
self.highlightFirstItem();

if (self.options.get('scrollAfterSelect')) {
self.highlightFirstItem();
}
});

container.on('open', function () {
Expand Down
103 changes: 103 additions & 0 deletions tests/results/focusing-tests.js
Expand Up @@ -135,4 +135,107 @@ test('results:append does not trigger results:focus', function (assert) {
]
}
});
});

test('scrollAfterSelect triggers results:focus by default', function (assert) {
assert.expect(3);

var $ = require('jquery');

var $select = $('<select></select>');
var $parent = $('<div></div>');

var $container = $('<span></span>');
var container = new MockContainer();

$parent.appendTo($('#qunit-fixture'));
$select.appendTo($parent);

var Utils = require('select2/utils');
var Options = require('select2/options');

var Results = require('select2/results');

var options = new Options({});
var results = new Results($select, options);

// Fake the data adapter for the `setClasses` method
results.data = {};
results.data.current = function (callback) {
callback([{ id: 'test' }]);
};

results.render();

results.bind(container, $container);

// check that default for scrollAfterSelect is true
assert.equal(options.get('scrollAfterSelect'), true);

results.append({
results: [
{
id: 'test',
text: 'Test'
}
]
});

results.on('results:focus', function (params) {
assert.equal(params.data.id, 'test');
assert.equal(params.data.text, 'Test');
});

container.trigger('select', {});
});

test('!scrollAfterSelect does not trigger results:focus', function (assert) {
assert.expect(1);

var $ = require('jquery');

var $select = $('<select></select>');
var $parent = $('<div></div>');

var $container = $('<span></span>');
var container = new MockContainer();

$parent.appendTo($('#qunit-fixture'));
$select.appendTo($parent);

var Utils = require('select2/utils');
var Options = require('select2/options');

var Results = require('select2/results');

var options = new Options({ scrollAfterSelect: false });
var results = new Results($select, options);

// Fake the data adapter for the `setClasses` method
results.data = {};
results.data.current = function (callback) {
callback([{ id: 'test' }]);
};

results.render();

results.bind(container, $container);

// check that default for scrollAfterSelect is false
assert.equal(options.get('scrollAfterSelect'), false);

results.append({
results: [
{
id: 'test',
text: 'Test'
}
]
});

results.on('results:focus', function () {
assert.ok(false, 'The results:focus event was triggered');
});

container.trigger('select', {});
});