Skip to content

Fix: Maximum stack exceeded error #847

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

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

Fix: Maximum stack exceeded error #847

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
24 changes: 16 additions & 8 deletions js/a11y/browserFocus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,21 @@ export default class BrowserFocus extends Backbone.Controller {
return;
}
const $element = $(event.target);
if ($element.is('[data-a11y-force-focus]')) {
const finish = () => {
const hasFocus = ($element[0] === this.a11y.currentActiveElement);
if (hasFocus) return;
if (!$element.is('[data-a11y-force-focus]')) return;
$element.removeAttr('tabindex data-a11y-force-focus');
}
};
// From here, only check source elements
if (event.target !== event.currentTarget) {
return;
return finish();
}
// Do not auto next if the focus isn't returning to the body or html element
// or if we're not losing focus
const isNotBodyHTMLOrLostFocus = (!$(event.relatedTarget).is('body, html') && event.relatedTarget !== null);
if (isNotBodyHTMLOrLostFocus) {
return;
return finish();
}
// Check if element is losing focus
// due to the addition of a disabled class, display none, visibility hidden,
Expand All @@ -84,10 +87,12 @@ export default class BrowserFocus extends Backbone.Controller {
// This can happen when JAWS screen reader on `role="group"` takes enter click
// when the focus was on the input element
this._refocusCurrentActiveElement();
finish();
return;
}
// Move focus to next readable element
this.a11y.focusNext($element);
finish();
}

/**
Expand Down Expand Up @@ -120,17 +125,20 @@ export default class BrowserFocus extends Backbone.Controller {
}
const $element = $(event.target);
const $stack = $([...$element.toArray(), ...$element.parents().toArray()]);
const $focusable = $stack.filter(config._options._tabbableElements);
const $focusable = $stack.filter((i, el) => {
const $el = $(el);
// Allow label clicks to focus their associated control
return $el.is(config._options._tabbableElements) || $el.is('label[for]');
});
if (!$focusable.length) {
this._refocusCurrentActiveElement();
return;
}
const $closestFocusable = $element.closest(config._options._tabbableElements);
// Force focus for screen reader enter / space press
if ($closestFocusable[0] !== document.activeElement) {
if ($focusable[0] !== document.activeElement) {
// Focus on the nearest focusable element if not already with focus
this.a11y._isForcedFocus = true;
$closestFocusable[0].focus();
$focusable[0].focus();
this.a11y._isForcedFocus = false;
}
if (!config._options._isClickDelayedAfterFocusEnabled) return;
Expand Down
Loading