Skip to content
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

Jump to bottom

refactor(use-intersection): remove useRef usage #39791

Merged
merged 2 commits into from Aug 21, 2022
Merged

refactor(use-intersection): remove useRef usage #39791

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e57e5d6
refactor(use-intersection): remove useRef usage
SukkaW Aug 21, 2022
df12fce
Merge branch 'canary' into simplify-image-observer
kodiakhq[bot] Aug 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 3 additions & 12 deletions packages/next/client/use-intersection.tsx
View file
Open in desktop
@@ -1,4 +1,4 @@
import { useCallback, useEffect, useRef, useState } from 'react'
import { useCallback, useEffect, useState } from 'react'
import {
requestIdleCallback,
cancelIdleCallback,
Expand Down Expand Up @@ -100,30 +100,21 @@ export function useIntersection<T extends Element>({
}: UseIntersection): [(element: T | null) => void, boolean, () => void] {
const isDisabled: boolean = disabled || !hasIntersectionObserver

const unobserve = useRef<Function>()
const [visible, setVisible] = useState(false)
const [element, setElement] = useState<T | null>(null)

useEffect(() => {
if (hasIntersectionObserver) {
if (unobserve.current) {
unobserve.current()
unobserve.current = undefined
}

if (isDisabled || visible) return

if (element && element.tagName) {
unobserve.current = observe(
const unobserve = observe(
element,
(isVisible) => isVisible && setVisible(isVisible),
{ root: rootRef?.current, rootMargin }
)
}

return () => {
unobserve.current?.()
unobserve.current = undefined
return unobserve
}
} else {
if (!visible) {
Expand Down