Commit 914a372e authored by Ian Jones's avatar Ian Jones

refactor shouldSkipElement

parent 0cf373a5
...@@ -116,24 +116,21 @@ function findDOMNode( ...@@ -116,24 +116,21 @@ function findDOMNode(
return internal_reactDOMfindDOMNode(instance) return internal_reactDOMfindDOMNode(instance)
} }
const rectProperties = [ const hiddenProperties = {
'bottom', 'display': 'none',
'height', 'visibility': 'hidden',
'left', 'content-visibility': 'hidden',
'right', } as const
'top',
'width',
'x',
'y',
] as const
/** /**
* Check if a HTMLElement is hidden or fixed/sticky position * Check if a HTMLElement is hidden or fixed/sticky position
*/ */
function shouldSkipElement(element: HTMLElement) { function shouldSkipElement(element: HTMLElement) {
const computedStyle = getComputedStyle(element)
// we ignore fixed or sticky positioned elements since they'll likely pass the "in-viewport" check // we ignore fixed or sticky positioned elements since they'll likely pass the "in-viewport" check
// and will result in a situation we bail on scroll because of something like a fixed nav, // and will result in a situation we bail on scroll because of something like a fixed nav,
// even though the actual page content is offscreen // even though the actual page content is offscreen
if (['sticky', 'fixed'].includes(getComputedStyle(element).position)) { if (['sticky', 'fixed'].includes(computedStyle.position)) {
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
console.warn( console.warn(
'Skipping auto-scroll behavior due to `position: sticky` or `position: fixed` on element:', 'Skipping auto-scroll behavior due to `position: sticky` or `position: fixed` on element:',
...@@ -143,10 +140,19 @@ function shouldSkipElement(element: HTMLElement) { ...@@ -143,10 +140,19 @@ function shouldSkipElement(element: HTMLElement) {
return true return true
} }
// Uses `getBoundingClientRect` to check if the element is hidden instead of `offsetParent` if (element.offsetParent) {
// because `offsetParent` doesn't consider document/body return false
const rect = element.getBoundingClientRect() }
return rectProperties.every((item) => rect[item] === 0)
// If checkVisibility is available, use it to check if the element is hidden
if ('checkVisibility' in element) {
return !element.checkVisibility()
}
return Array.from(Object.entries(hiddenProperties)).some(
([property, value]) => computedStyle.getPropertyValue(property) === value
) ||
parseFloat(computedStyle.opacity) === 0
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment