Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F33331536
D9373.1768886113.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D9373.1768886113.diff
View Options
diff --git a/native/bottom-sheet/bottom-sheet.react.js b/native/bottom-sheet/bottom-sheet.react.js
--- a/native/bottom-sheet/bottom-sheet.react.js
+++ b/native/bottom-sheet/bottom-sheet.react.js
@@ -1,6 +1,6 @@
// @flow
-import { BottomSheetModal } from '@gorhom/bottom-sheet';
+import GorhomBottomSheet from '@gorhom/bottom-sheet';
import invariant from 'invariant';
import * as React from 'react';
@@ -16,7 +16,7 @@
function ForwardedBottomSheet(
props: Props,
- ref: React.Ref<typeof BottomSheetModal>,
+ ref: React.Ref<typeof GorhomBottomSheet>,
): React.Node {
const { children, onClosed } = props;
@@ -29,17 +29,27 @@
const snapPoints = React.useMemo(() => [contentHeight], [contentHeight]);
+ const onChange = React.useCallback(
+ (index: number) => {
+ if (index === -1) {
+ onClosed();
+ }
+ },
+ [onClosed],
+ );
+
return (
- <BottomSheetModal
+ <GorhomBottomSheet
ref={ref}
backgroundStyle={styles.background}
snapPoints={snapPoints}
handleComponent={BottomSheetHandle}
backdropComponent={BottomSheetBackdrop}
- onDismiss={onClosed}
+ onChange={onChange}
+ enablePanDownToClose={true}
>
{children}
- </BottomSheetModal>
+ </GorhomBottomSheet>
);
}
@@ -51,15 +61,15 @@
const BottomSheet: React.AbstractComponent<
Props,
- React.ElementRef<typeof BottomSheetModal>,
-> = React.forwardRef<Props, React.ElementRef<typeof BottomSheetModal>>(
+ React.ElementRef<typeof GorhomBottomSheet>,
+> = React.forwardRef<Props, React.ElementRef<typeof GorhomBottomSheet>>(
ForwardedBottomSheet,
);
BottomSheet.displayName = 'BottomSheet';
const MemoizedBottomSheet: typeof BottomSheet = React.memo<
Props,
- React.ElementRef<typeof BottomSheetModal>,
+ React.ElementRef<typeof GorhomBottomSheet>,
>(BottomSheet);
export default MemoizedBottomSheet;
diff --git a/native/user-profile/user-profile-bottom-sheet.react.js b/native/user-profile/user-profile-bottom-sheet.react.js
--- a/native/user-profile/user-profile-bottom-sheet.react.js
+++ b/native/user-profile/user-profile-bottom-sheet.react.js
@@ -35,14 +35,6 @@
const bottomSheetRef = React.useRef();
- React.useEffect(() => {
- if (!bottomSheetRef.current) {
- return;
- }
-
- bottomSheetRef.current.present();
- }, []);
-
const onClosed = React.useCallback(() => {
goBackOnce();
}, [goBackOnce]);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Jan 20, 5:15 AM (21 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5959527
Default Alt Text
D9373.1768886113.diff (2 KB)
Attached To
Mode
D9373: [native] replace out of box BottomSheetModal with basic BottomSheet
Attached
Detach File
Event Timeline
Log In to Comment