Skip to content

Don't call hooks conditionally in useScrollViewOffset #5839

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
tjzel merged 1 commit into from
Mar 27, 2024
Merged

Don't call hooks conditionally in useScrollViewOffset #5839

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
24 changes: 10 additions & 14 deletions src/reanimated2/hook/useScrollViewOffset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,17 @@ export const useScrollViewOffset = IS_WEB

function useScrollViewOffsetWeb(
animatedRef: AnimatedRef<AnimatedScrollView>,
initialRef?: SharedValue<number>
providedOffset?: SharedValue<number>
): SharedValue<number> {
const offsetRef = useRef(
// eslint-disable-next-line react-hooks/rules-of-hooks
initialRef !== undefined ? initialRef : useSharedValue(0)
);
const internalOffset = useSharedValue(0);
const offset = useRef(providedOffset ?? internalOffset).current;
const scrollRef = useRef<AnimatedScrollView | null>(null);

const eventHandler = useCallback(() => {
'worklet';
const element = animatedRef.current as unknown as HTMLElement;
// scrollLeft is the X axis scrolled offset, works properly also with RTL layout
offsetRef.current.value =
offset.value =
element.scrollLeft === 0 ? element.scrollTop : element.scrollLeft;
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [animatedRef, animatedRef.current]);
Expand All @@ -66,7 +64,7 @@ function useScrollViewOffsetWeb(
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [animatedRef, animatedRef.current, eventHandler]);

return offsetRef.current;
return offset;
}

const scrollNativeEventNames = [
Expand All @@ -79,18 +77,16 @@ const scrollNativeEventNames = [

function useScrollViewOffsetNative(
animatedRef: AnimatedRef<AnimatedScrollView>,
initialRef?: SharedValue<number>
providedOffset?: SharedValue<number>
): SharedValue<number> {
const offsetRef = useRef(
// eslint-disable-next-line react-hooks/rules-of-hooks
initialRef !== undefined ? initialRef : useSharedValue(0)
);
const internalOffset = useSharedValue(0);
const offset = useRef(providedOffset ?? internalOffset).current;
const scrollRef = useRef<AnimatedScrollView | null>(null);

const eventHandler = useEvent<RNNativeScrollEvent>(
(event: ReanimatedScrollEvent) => {
'worklet';
offsetRef.current.value =
offset.value =
event.contentOffset.x === 0
? event.contentOffset.y
: event.contentOffset.x;
Expand Down Expand Up @@ -119,5 +115,5 @@ function useScrollViewOffsetNative(
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [animatedRef, animatedRef.current, eventHandler]);

return offsetRef.current;
return offset;
}