Skip to content

fix: Support React 19 ref cleanup functions in ScrollView #52361

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

Closed
ScypyonX wants to merge 2 commits into from
Closed

fix: Support React 19 ref cleanup functions in ScrollView #52361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d68f18b
fix: Support React 19 ref cleanup functions in ScrollView
Scajpon Jul 1, 2025
d05596c
feat: Update createRefForwarder to always return cleanup function
Scajpon Jul 12, 2025
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
32 changes: 28 additions & 4 deletions packages/react-native/Libraries/Components/ScrollView/ScrollView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ const styles = StyleSheet.create({
type RefForwarder<TNativeInstance, TPublicInstance> = {
getForwardingRef: (
?React.RefSetter<TPublicInstance>,
) => (TNativeInstance | null) => void,
) => (TNativeInstance | null) => () => void,
nativeInstance: TNativeInstance | null,
publicInstance: TPublicInstance | null,
};
Expand All @@ -1892,20 +1892,44 @@ function createRefForwarder<TNativeInstance, TPublicInstance>(
): RefForwarder<TNativeInstance, TPublicInstance> {
const state: RefForwarder<TNativeInstance, TPublicInstance> = {
getForwardingRef: memoize(forwardedRef => {
return (nativeInstance: TNativeInstance | null): void => {
let cleanup: ?() => void = null;

return (nativeInstance: TNativeInstance | null): (() => void) => {
if (cleanup) {
cleanup();
cleanup = null;
}

const publicInstance =
nativeInstance == null ? null : mutator(nativeInstance);

state.nativeInstance = nativeInstance;
state.publicInstance = publicInstance;

if (forwardedRef != null) {
if (forwardedRef != null && nativeInstance != null) {
if (typeof forwardedRef === 'function') {
forwardedRef(publicInstance);
const result = forwardedRef(publicInstance);
if (typeof result === 'function') {
// $FlowFixMe[incompatible-use]
cleanup = result;
} else {
// $FlowFixMe[incompatible-type]
cleanup = () => forwardedRef(null);
}
} else {
forwardedRef.current = publicInstance;
cleanup = () => {
forwardedRef.current = null;
};
}
}

return () => {
if (cleanup) {
cleanup();
cleanup = null;
}
};
};
}),
nativeInstance: null,
Expand Down