Skip to content

Add lockableScrollableContentOffsetY which does not change when scrollable is locked #14

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
merged 1 commit into from
Dec 13, 2023
+14 −0
Merged

Add lockableScrollableContentOffsetY which does not change when scrollable is locked #14

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions src/components/bottomSheet/BottomSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
animatedScrollableOverrideState,
isScrollableRefreshable,
isScrollableLocked,
lockableScrollableContentOffsetY,
setScrollableRef,
removeScrollableRef,
} = useScrollable();
Expand Down Expand Up @@ -1099,6 +1100,7 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
isContentHeightFixed,
isScrollableRefreshable,
isScrollableLocked,
lockableScrollableContentOffsetY,
shouldHandleKeyboardEvents,
simultaneousHandlers: _providedSimultaneousHandlers,
waitFor: _providedWaitFor,
Expand Down
2 changes: 2 additions & 0 deletions src/contexts/internal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export interface BottomSheetInternalContextType
animatedScrollableContentOffsetY: Animated.SharedValue<number>;
animatedScrollableOverrideState: Animated.SharedValue<SCROLLABLE_STATE>;
isScrollableLocked: Animated.SharedValue<boolean>;
// the real content offset when the scrollable is locked
lockableScrollableContentOffsetY: Animated.SharedValue<number>;
isScrollableRefreshable: Animated.SharedValue<boolean>;
isContentHeightFixed: Animated.SharedValue<boolean>;
isInTemporaryPosition: Animated.SharedValue<boolean>;
Expand Down
8 changes: 8 additions & 0 deletions src/hooks/useScrollEventsHandlersDefault.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const useScrollEventsHandlersDefault: ScrollEventsHandlersHookType = (
animatedAnimationState,
animatedScrollableContentOffsetY: rootScrollableContentOffsetY,
isScrollableLocked,
lockableScrollableContentOffsetY,
} = useBottomSheetInternal();
const awaitingFirstScroll = useSharedValue(false);
const scrollEnded = useSharedValue(false);
Expand Down Expand Up @@ -70,9 +71,11 @@ export const useScrollEventsHandlersDefault: ScrollEventsHandlersHookType = (
// @ts-ignore
scrollTo(scrollableRef, 0, lockPosition, false);
scrollableContentOffsetY.value = lockPosition;
lockableScrollableContentOffsetY.value = lockPosition;
}
return;
}
lockableScrollableContentOffsetY.value = event.contentOffset.y;
},
[
scrollableRef,
Expand All @@ -86,6 +89,7 @@ export const useScrollEventsHandlersDefault: ScrollEventsHandlersHookType = (
(event, context) => {
const y = event.contentOffset.y;
scrollableContentOffsetY.value = y;
lockableScrollableContentOffsetY.value = y;
rootScrollableContentOffsetY.value = y;
context.initialContentOffsetY = y;
awaitingFirstScroll.value = true;
Expand Down Expand Up @@ -146,10 +150,12 @@ export const useScrollEventsHandlersDefault: ScrollEventsHandlersHookType = (
// @ts-ignore
scrollTo(scrollableRef, 0, lockPosition, false);
scrollableContentOffsetY.value = lockPosition;
lockableScrollableContentOffsetY.value = lockPosition;
return;
}
if (animatedAnimationState.value !== ANIMATION_STATE.RUNNING) {
scrollableContentOffsetY.value = y;
lockableScrollableContentOffsetY.value = y;
rootScrollableContentOffsetY.value = y;
}
},
Expand All @@ -172,11 +178,13 @@ export const useScrollEventsHandlersDefault: ScrollEventsHandlersHookType = (
// @ts-ignore
scrollTo(scrollableRef, 0, lockPosition, false);
scrollableContentOffsetY.value = 0;
lockableScrollableContentOffsetY.value = 0;
}
return;
}
if (animatedAnimationState.value !== ANIMATION_STATE.RUNNING) {
scrollableContentOffsetY.value = y;
lockableScrollableContentOffsetY.value = y;
rootScrollableContentOffsetY.value = y;
}
},
Expand Down
2 changes: 2 additions & 0 deletions src/hooks/useScrollable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const useScrollable = () => {
);
const isScrollableRefreshable = useSharedValue<boolean>(false);
const isScrollableLocked = useSharedValue<boolean>(true);
const lockableScrollableContentOffsetY = useSharedValue<number>(0);

// callbacks
const setScrollableRef = useCallback((ref: ScrollableRef) => {
Expand Down Expand Up @@ -65,6 +66,7 @@ export const useScrollable = () => {
animatedScrollableOverrideState,
isScrollableRefreshable,
isScrollableLocked,
lockableScrollableContentOffsetY,
setScrollableRef,
removeScrollableRef,
};
Expand Down