fix(bottom-sheet): drop leftover @gorhom imports after merge

Author: kfaracik

__tests__/useConfirm.test.tsx

@@ -1,49 +1,57 @@
-import React from 'react';
+import React, { type ReactNode } from 'react';
 import { Alert, Platform, Pressable, Text } from 'react-native';
 import {
   render,
   screen,
   fireEvent,
   waitFor,
 } from '@testing-library/react-native';
+import type { AppBottomSheetRef } from '../components/bottomSheets/AppBottomSheet';
+import type { WarningSheetData } from '../components/bottomSheets/WarningSheet';
 
 jest.mock('../context/ThemeContext', () => ({
   useTheme: () => ({ theme: require('./helpers/renderWithTheme').testTheme }),
 }));
 
-jest.mock('@gorhom/bottom-sheet', () => {
-  const ReactModule = require('react');
+type MockSheetProps = {
+  onDismiss?: () => void;
+  children: ReactNode | ((state: { data?: WarningSheetData }) => ReactNode);
+};
+
+jest.mock('../components/bottomSheets/AppBottomSheet', () => {
+  const ReactModule: typeof React = require('react');
   const { View } = require('react-native');
 
-  const BottomSheetModal = ReactModule.forwardRef((props: any, ref: any) => {
-    const [data, setData] = ReactModule.useState(null);
+  const AppBottomSheet = ReactModule.forwardRef<
+    AppBottomSheetRef<WarningSheetData>,
+    MockSheetProps
+  >((props, ref) => {
+    const [state, setState] = ReactModule.useState<{
+      data?: WarningSheetData;
+    } | null>(null);
+
+    const close = () => {
+      setState(null);
+      props.onDismiss?.();
+    };
 
     ReactModule.useImperativeHandle(ref, () => ({
-      present: (presented: any) => setData(presented ?? {}),
-      dismiss: () => {
-        setData(null);
-        props.onDismiss?.();
-      },
+      present: (data?: WarningSheetData) => setState({ data }),
+      dismiss: close,
+      close,
     }));
 
-    if (!data) return null;
+    if (!state) return null;
     return (
       <View>
         {typeof props.children === 'function'
-          ? props.children({ data })
+          ? props.children(state)
           : props.children}
       </View>
     );
   });
 
-  return {
-    BottomSheetModal,
-    BottomSheetView: ({ children, style }: any) => (
-      <View style={style}>{children}</View>
-    ),
-    BottomSheetBackdrop: () => null,
-    BottomSheetModalProvider: ({ children }: any) => <>{children}</>,
-  };
+  return { AppBottomSheet };
 });
 
 import { useConfirm } from '../hooks/useConfirm';

components/drawer/DrawerSearchOverlay.tsx

@@ -15,7 +15,7 @@ import {
   GestureHandlerRootView,
   Pressable,
 } from 'react-native-gesture-handler';
-import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
+import { BottomSheetProvider } from '@swmansion/react-native-bottom-sheet';
 import { useReanimatedKeyboardAnimation } from 'react-native-keyboard-controller';
 import { useTheme } from '../../context/ThemeContext';
 import { Theme } from '../../styles/colors';
@@ -100,7 +100,7 @@ export const DrawerSearchOverlay = ({
       onRequestClose={onRequestClose}
     >
       <GestureHandlerRootView style={styles.root}>
-        <BottomSheetModalProvider>
+        <BottomSheetProvider>
           <Animated.View
             style={[styles.backdrop, backdropStyle]}
             pointerEvents="none"
@@ -128,7 +128,7 @@ export const DrawerSearchOverlay = ({
               />
             </View>
           </Animated.View>
-        </BottomSheetModalProvider>
+        </BottomSheetProvider>
       </GestureHandlerRootView>
     </Modal>
   );

components/drawer/useDrawerChatMenu.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useRef, useState } from 'react';
 import { ActionSheetIOS, Platform } from 'react-native';
 import { useRouter, usePathname } from 'expo-router';
-import { BottomSheetModal } from '@gorhom/bottom-sheet';
+import type { AppBottomSheetRef } from '../bottomSheets/AppBottomSheet';
 import { Chat } from '../../database/chatRepository';
 import { useChatActions } from '../../hooks/useChatActions';
 import { Feedback } from '../../utils/Feedback';
@@ -26,7 +26,7 @@ export const useDrawerChatMenu = ({ onMenuActiveChange }: Options = {}) => {
   const pathname = usePathname();
   const [targetChat, setTargetChat] = useState<Chat | null>(null);
   const [renameVisible, setRenameVisible] = useState(false);
-  const androidSheetRef = useRef<BottomSheetModal>(null);
+  const androidSheetRef = useRef<AppBottomSheetRef>(null);
   const actionPendingRef = useRef(false);
 
   const { rename, exportChat, confirmDelete, ConfirmElement } = useChatActions({

hooks/useConfirm.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useRef } from 'react';
 import { Alert, Platform } from 'react-native';
-import { BottomSheetModal } from '@gorhom/bottom-sheet';
+import type { AppBottomSheetRef } from '../components/bottomSheets/AppBottomSheet';
 import WarningSheet, {
   WarningSheetData,
 } from '../components/bottomSheets/WarningSheet';
@@ -12,7 +12,7 @@ export interface ConfirmOptions {
 }
 
 export const useConfirm = () => {
-  const sheetRef = useRef<BottomSheetModal<WarningSheetData>>(null);
+  const sheetRef = useRef<AppBottomSheetRef<WarningSheetData>>(null);
   const resolveRef = useRef<((confirmed: boolean) => void) | null>(null);
 
   const settle = useCallback((confirmed: boolean) => {