Skip to content

fix: scrollTop is not set when from & to are equal #1185 #1354

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
merged 1 commit into from
Mar 22, 2021
Merged

fix: scrollTop is not set when from & to are equal #1185 #1354

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
10 changes: 7 additions & 3 deletions packages/animated/src/withAnimated.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react'
import { forwardRef, useRef, Ref, useCallback } from 'react'
import { forwardRef, useRef, Ref, useCallback, useEffect } from 'react'
import { useLayoutEffect } from 'react-layout-effect'
import {
is,
Expand Down Expand Up @@ -44,7 +44,8 @@ export const withAnimated = (Component: any, host: HostConfig) => {
const [props, deps] = getAnimatedState(givenProps, host)

const forceUpdate = useForceUpdate()
const observer = new PropsObserver(() => {

const callback = () => {
const instance = instanceRef.current
if (hasInstance && !instance) {
// Either this component was unmounted before changes could be
Expand All @@ -60,7 +61,9 @@ export const withAnimated = (Component: any, host: HostConfig) => {
if (didUpdate === false) {
forceUpdate()
}
}, deps)
}

const observer = new PropsObserver(callback, deps)

const observerRef = useRef<PropsObserver>()
useLayoutEffect(() => {
Expand All @@ -77,6 +80,7 @@ export const withAnimated = (Component: any, host: HostConfig) => {
}
})

useEffect(callback, [])
// Stop observing on unmount.
useOnce(() => () => {
const observer = observerRef.current!
Expand Down