fix(ngAria.ngClick): restrict preventDefault on space / enter to non-interactive elements

Fixes #16664
This commit is contained in:
Martin Staffa
2018-09-01 11:14:20 +02:00
parent 837e519acc
commit 4be80aefa2
2 changed files with 36 additions and 2 deletions
+6 -2
View File
@@ -389,8 +389,12 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
var keyCode = event.which || event.keyCode;
if (keyCode === 13 || keyCode === 32) {
// Prevent the default browser behavior (e.g. scrolling when pressing spacebar).
event.preventDefault();
// Prevent the default browser behavior (e.g. scrolling when pressing spacebar) ...
if (nodeBlackList.indexOf(event.target.nodeName) === -1) {
// ... but only when the event is triggered by a non-interactive element
// See https://github.com/angular/angular.js/issues/16664
event.preventDefault();
}
scope.$apply(callback);
}
+30
View File
@@ -1,5 +1,7 @@
'use strict';
/* globals nodeBlackList false */
describe('$aria', function() {
var scope, $compile, element;
@@ -952,6 +954,34 @@ describe('$aria', function() {
expect(clickEvents).toEqual(['div(true)', 'li(true)', 'div(true)', 'li(true)']);
});
they('should not prevent default keyboard action if an interactive $type element' +
'is nested inside ng-click', nodeBlackList, function(elementType) {
function createHTML(type) {
var html = '<' + type + '>';
if (type === 'INPUT' || 'TYPE' === 'A') {
return html;
}
return html + '</' + type + '>';
}
compileElement(
'<section>' +
'<div ng-click="onClick($event)">' + createHTML(elementType) + '</div>' +
'</section>');
var divElement = element.find('div');
var interactiveElement = element.find(elementType);
// Use browserTrigger because it supports event bubbling
browserTrigger(interactiveElement, 'keydown', {cancelable: true, bubbles: true, keyCode: 13});
browserTrigger(interactiveElement, 'keydown', {cancelable: true, bubbles: true, keyCode: 32});
expect(clickEvents).toEqual([elementType.toLowerCase() + '(false)', elementType.toLowerCase() + '(false)']);
}
);
it('should trigger a click in browsers that provide `event.which` instead of `event.keyCode`',
function() {
compileElement(