fix: forward refs

web-ridge · Jul 23, 2022 · 4212891 · 4212891
1 parent 982ec51
commit 4212891
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/AutocompleteFlatList.tsx b/src/AutocompleteFlatList.tsx
@@ -6,7 +6,7 @@ import { useScrollableProps } from './shared';
 
 function AutocompleteFlatList<T>(rest: FlatListProps<T>, ref: any) {
   const { scrollableRef, scrollX, scrollY, scrollableProps } =
-    useScrollableProps();
+    useScrollableProps(rest);
   const Flat = Animated.FlatList as any;
   return (
     <AutocompleteContext.Provider value={{ scrollableRef, scrollX, scrollY }}>

diff --git a/src/AutocompleteScrollView.tsx b/src/AutocompleteScrollView.tsx
@@ -6,7 +6,7 @@ import { useScrollableProps } from './shared';
 
 function AutocompleteScrollView(rest: ScrollViewProps, ref: any) {
   const { scrollableRef, scrollX, scrollY, scrollableProps } =
-    useScrollableProps();
+    useScrollableProps(rest);
   return (
     <AutocompleteContext.Provider value={{ scrollableRef, scrollX, scrollY }}>
       <Animated.ScrollView ref={ref} {...rest} {...scrollableProps} />

diff --git a/src/createAutocompleteScrollable.tsx b/src/createAutocompleteScrollable.tsx
@@ -7,7 +7,7 @@ export default function createAutocompleteScrollable<
 >(WrappedComponent: T): React.ComponentType<T> {
   return React.forwardRef(function (rest, ref) {
     const { scrollableRef, scrollX, scrollY, scrollableProps } =
-      useScrollableProps();
+      useScrollableProps(rest);
     const WW = WrappedComponent as any;
     return (
       <AutocompleteContext.Provider value={{ scrollableRef, scrollX, scrollY }}>

diff --git a/src/shared.tsx b/src/shared.tsx
@@ -3,7 +3,11 @@ import {
   useAnimatedScrollHandler,
   useSharedValue,
 } from 'react-native-reanimated';
-import type { NativeScrollEvent, NativeSyntheticEvent } from 'react-native';
+import type {
+  NativeScrollEvent,
+  NativeSyntheticEvent,
+  ScrollViewProps,
+} from 'react-native';
 
 export type AutocompleteScrollableProps = {
   ref?: any;
@@ -19,14 +23,15 @@ export type AutocompleteScrollableProps = {
     | undefined;
 };
 
-export function useScrollableProps() {
+export function useScrollableProps(props: ScrollViewProps) {
   const scrollableRef = useAnimatedRef<any>();
   const scrollX = useSharedValue(0);
   const scrollY = useSharedValue(0);
   const scrollHandler = useAnimatedScrollHandler((e) => {
     const { x, y } = e.contentOffset;
     scrollX.value = x;
     scrollY.value = y;
+    props?.onScroll?.(e as any);
   });
   const scrollableProps: AutocompleteScrollableProps = {
     ref: scrollableRef,