Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

fix(sidenav): Only restore focus if user interaction was keyboard #5583

Closed
Closed
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
36 changes: 33 additions & 3 deletions src/components/sidenav/sidenav.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,10 @@ function SidenavDirective($mdMedia, $mdUtil, $mdConstant, $mdTheming, $animate,
/**
* Directive Post Link function...
*/
function postLink(scope, element, attr, sidenavCtrl) {
function postLink(scope, element, attr, sidenavCtrl, $timeout) {
var lastParentOverFlow;
var triggeringElement = null;
var isKeyboardInteraction;
var promise = $q.when(true);

var isLockedOpenParsed = $parse(attr.mdIsLockedOpen);
Expand All @@ -244,9 +245,38 @@ function SidenavDirective($mdMedia, $mdUtil, $mdConstant, $mdTheming, $animate,

$mdTheming.inherit(backdrop, element);

var body = angular.element(document.body);
var _mouseEvent = window.MSPointerEvent ? 'MSPointerDown' : window.PointerEvent ? 'pointerdown' : 'mousedown';

body.on('keydown', onInput);
body.on(_mouseEvent, onInput);
body.on('mouseenter', onInput);
if ('ontouchstart' in document.documentElement) body.on('touchstart', onBufferInput);

var buffer = false, timer;

function onInput(event) {
if (buffer) return;
isKeyboardInteraction = event.type === 'keydown';
}

function onBufferInput(event) {
$timeout.cancel(timer);
onInput(event);
buffer = true;
timer = $timeout(function() {
buffer = false;
}, 1000);
}

element.on('$destroy', function() {
backdrop.remove();
sidenavCtrl.destroy();

body.off('keydown', onInput);
body.off(_mouseEvent, onInput);
body.off('mouseenter', onInput);
if ('ontouchstart' in document.documentElement) body.off('touchstart', onBufferInput);
});

scope.$on('$destroy', function(){
Expand Down Expand Up @@ -344,9 +374,9 @@ function SidenavDirective($mdMedia, $mdUtil, $mdConstant, $mdTheming, $animate,
// When the current `updateIsOpen()` animation finishes
promise.then(function(result) {

if ( !scope.isOpen ) {
if ( !scope.isOpen && triggeringElement && isKeyboardInteraction) {
// reset focus to originating element (if available) upon close
triggeringElement && triggeringElement.focus();
triggeringElement.focus();
triggeringElement = null;
}

Expand Down