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

Fix animatedRef on Fabric #4445

Merged
merged 9 commits into from
May 22, 2023
Merged

Fix animatedRef on Fabric #4445

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
415d153
Fix animtedRef on Fabric
mstach60161 May 9, 2023
728f3c1
Move gettingRef to another function and add warning
mstach60161 May 15, 2023
112a7a7
Merge branch 'main' into @mstach60161/fix-stateNode-undefined
mstach60161 May 15, 2023
f0fcaba
Merge branch 'main' into @mstach60161/fix-stateNode-undefined
mstach60161 May 15, 2023
cb0cb9f
Update src/reanimated2/hook/useAnimatedRef.ts
mstach60161 May 15, 2023
31bec0c
Fix typo
mstach60161 May 15, 2023
1322b0c
Fix naming
mstach60161 May 18, 2023
7f8275c
Merge branch 'main' into @mstach60161/fix-stateNode-undefined
mstach60161 May 18, 2023
f3c5612
Update src/reanimated2/hook/useAnimatedRef.ts
mstach60161 May 19, 2023
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
29 changes: 23 additions & 6 deletions src/reanimated2/hook/useAnimatedRef.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import {
} from '../shareables';

interface ComponentRef extends Component {
displayName?: string;
name?: string;
mstach60161 marked this conversation as resolved.
Show resolved Hide resolved
getNativeScrollRef?: () => ComponentRef;
getScrollableNode?: () => ComponentRef;
}

Expand All @@ -19,6 +22,25 @@ function getShareableShadowNodeFromComponent(
return getShadowNodeWrapperFromHostInstance(component);
}

function getScrollableRef(component: ComponentRef): ComponentRef {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getScrollableRef -> getComponentRef

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getComponentRef is too generic I think

if (global._IS_FABRIC) {
if (component.getNativeScrollRef) {
return component.getNativeScrollRef();
} else {
console.warn(
`[Reanimated] ${
component.displayName || component.name || 'Component'
} has no implemented 'getNativeScrollRef' method. Please report this issue to the library maintainers.`
);
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to remove this config because we can pass here reference to any object.

} else {
if (component.getScrollableNode) {
return component.getScrollableNode();
}
}
return component;
}

const getTagValueFunction = global._IS_FABRIC
? getShareableShadowNodeFromComponent
: getTag;
Expand All @@ -31,11 +53,7 @@ export function useAnimatedRef<T extends ComponentRef>(): RefObjectFunction<T> {
const fun: RefObjectFunction<T> = <RefObjectFunction<T>>((component) => {
// enters when ref is set by attaching to a component
if (component) {
tag.value = getTagValueFunction(
component.getScrollableNode
? component.getScrollableNode()
: component
);
tag.value = getTagValueFunction(getScrollableRef(component));
mstach60161 marked this conversation as resolved.
Show resolved Hide resolved
fun.current = component;
}
return tag.value;
Expand All @@ -50,7 +68,6 @@ export function useAnimatedRef<T extends ComponentRef>(): RefObjectFunction<T> {
},
});
registerShareableMapping(fun, remoteRef);

ref.current = fun;
}

Expand Down