Skip to content

Add proper listeners cleanup to native useScrollViewOffset #5831

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
szydlovsky merged 2 commits into from
Mar 25, 2024
Merged

Add proper listeners cleanup to native useScrollViewOffset #5831

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f0cd85
Add proper cleanup to native useScrollViewOffset
szydlovsky Mar 25, 2024
4f17364
remove unnecessary "?"s
szydlovsky Mar 25, 2024
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
15 changes: 10 additions & 5 deletions src/reanimated2/hook/useScrollViewOffset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ const IS_WEB = isWeb();
* @see https://docs.swmansion.com/react-native-reanimated/docs/scroll/useScrollViewOffset
*/
export const useScrollViewOffset = IS_WEB
? useScrollViewOffsetJS
? useScrollViewOffsetWeb
: useScrollViewOffsetNative;

function useScrollViewOffsetJS(
function useScrollViewOffsetWeb(
animatedRef: AnimatedRef<AnimatedScrollView>,
initialRef?: SharedValue<number>
): SharedValue<number> {
Expand Down Expand Up @@ -85,6 +85,7 @@ function useScrollViewOffsetNative(
// eslint-disable-next-line react-hooks/rules-of-hooks
initialRef !== undefined ? initialRef : useSharedValue(0)
);
const scrollRef = useRef<AnimatedScrollView | null>(null);

const eventHandler = useEvent<RNNativeScrollEvent>(
(event: ReanimatedScrollEvent) => {
Expand All @@ -100,11 +101,15 @@ function useScrollViewOffsetNative(
) as unknown as EventHandlerInternal<ReanimatedScrollEvent>;

useEffect(() => {
const component = animatedRef.current;
const viewTag = IS_WEB ? component : findNodeHandle(component);
// We need to make sure that listener for old animatedRef value is removed
if (scrollRef.current !== null) {
eventHandler.workletEventHandler?.unregisterFromEvents();
Comment thread
szydlovsky marked this conversation as resolved.
Outdated
}
scrollRef.current = animatedRef.current;

const component = animatedRef.current;
const viewTag = findNodeHandle(component);
eventHandler.workletEventHandler.registerForEvents(viewTag as number);

return () => {
eventHandler.workletEventHandler?.unregisterFromEvents();
};
Expand Down