Skip to content

[Fixes] #854 Adding a check to see if the element is a prototype of Element before checking computed style #864

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

Merged
diasbruno merged 5 commits into from
Jun 1, 2021
Merged

[Fixes] #854 Adding a check to see if the element is a prototype of Element before checking computed style #864

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
279de0e
Adding a check to see if the element is a prototype of Element before…
beekermememe Apr 20, 2021
9143a2a
Merge branch 'reactjs:master' into handle-non-element-in-tabbable-check
beekermememe May 27, 2021
d7674ff
Wrapping getComputedStyle in try catch per PR review
brendankeogh-sf May 27, 2021
dc81e82
Working on lint error
brendankeogh-sf May 28, 2021
42b029d
Fixing lint error and PR suggestion change to use double quotes
beekermememe May 28, 2021
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
20 changes: 13 additions & 7 deletions src/helpers/tabbable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ function hidesContents(element) {
// If the node is empty, this is good enough
if (zeroSize && !element.innerHTML) return true;

// Otherwise we need to check some styles
const style = window.getComputedStyle(element);
return zeroSize
? style.getPropertyValue("overflow") !== "visible" ||
// if 'overflow: visible' set, check if there is actually any overflow
(element.scrollWidth <= 0 && element.scrollHeight <= 0)
: style.getPropertyValue("display") == "none";
try {
// Otherwise we need to check some styles
const style = window.getComputedStyle(element);
return zeroSize
? style.getPropertyValue("overflow") !== "visible" ||
// if 'overflow: visible' set, check if there is actually any overflow
(element.scrollWidth <= 0 && element.scrollHeight <= 0)
: style.getPropertyValue("display") == "none";
} catch (exception) {
// eslint-disable-next-line no-console
console.warn("Failed to inspect element style");
return false;
}
}

function visible(element) {
Expand Down