Skip to content

Commit 54c935f

Browse files
authored
fix(js): Fix position and offset calculations & adding a new page for usePagerView hook (#930)
1 parent 4675e83 commit 54c935f

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

example/src/PagerHookExample.tsx

+1-10
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,12 @@ export function PagerHookExample() {
1111
return (
1212
<SafeAreaView style={styles.container}>
1313
<AnimatedPagerView
14-
// @ts-ignore
1514
testID="pager-view"
1615
ref={ref}
1716
style={styles.PagerView}
1817
initialPage={0}
19-
layoutDirection="ltr"
20-
overdrag={rest.overdragEnabled}
21-
scrollEnabled={rest.scrollEnabled}
22-
onPageScroll={rest.onPageScroll}
23-
onPageSelected={rest.onPageSelected}
24-
onPageScrollStateChanged={rest.onPageScrollStateChanged}
18+
{...rest}
2519
pageMargin={10}
26-
// Lib does not support dynamically orientation change
27-
orientation="horizontal"
2820
>
2921
{useMemo(
3022
() =>
@@ -49,7 +41,6 @@ export function PagerHookExample() {
4941
[rest.pages]
5042
)}
5143
</AnimatedPagerView>
52-
{/*@ts-ignore*/}
5344
<NavigationPanel {...rest} />
5445
</SafeAreaView>
5546
);

src/usePagerView.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ export function usePagerView(
4848

4949
const addPage = useCallback(() => {
5050
setPages((prevPages) => {
51-
const lastPageNumber = prevPages[prevPages.length - 1];
52-
if (lastPageNumber) {
53-
return [...prevPages, lastPageNumber + 1];
54-
}
55-
return prevPages;
51+
return [...prevPages, prevPages.length];
5652
});
5753
}, []);
5854

@@ -92,6 +88,12 @@ export function usePagerView(
9288
},
9389
],
9490
{
91+
listener: ({ nativeEvent: { offset, position } }) => {
92+
setProgress({
93+
position,
94+
offset,
95+
});
96+
},
9597
useNativeDriver: true,
9698
}
9799
),

0 commit comments

Comments
 (0)