chore: export useBottomSheetInternal, added animatedPosition and anim…

…atedIndex to useBottomSheet

src/components/bottomSheet/BottomSheet.tsx

@@ -874,13 +874,17 @@ const BottomSheetComponent = forwardRef<BottomSheet, BottomSheetProps>(
     );
     const externalContextVariables = useMemo(
       () => ({
+        animatedIndex,
+        animatedPosition,
         snapToIndex: handleSnapToIndex,
         snapToPosition: handleSnapToPosition,
         expand: handleExpand,
         collapse: handleCollapse,
         close: handleClose,
       }),
       [
+        animatedIndex,
+        animatedPosition,
         handleSnapToIndex,
         handleSnapToPosition,
         handleExpand,

src/components/bottomSheetBackdrop/types.d.ts

@@ -1,18 +1,9 @@
 import type { ViewProps } from 'react-native';
-import type Animated from 'react-native-reanimated';
+import type { BottomSheetVariables } from '../../types';
 
-export interface BottomSheetBackdropProps extends Pick<ViewProps, 'style'> {
-  /**
-   * Current sheet position index.
-   * @type Animated.SharedValue<number>
-   */
-  animatedIndex: Animated.SharedValue<number>;
-  /**
-   * Current sheet position.
-   * @type Animated.SharedValue<number>
-   */
-  animatedPosition: Animated.SharedValue<number>;
-}
+export interface BottomSheetBackdropProps
+  extends Pick<ViewProps, 'style'>,
+    BottomSheetVariables {}
 
 export type BackdropPressBehavior = 'none' | 'close' | 'collapse' | number;
 

src/components/bottomSheetBackground/types.d.ts

@@ -1,16 +1,6 @@
-import type Animated from 'react-native-reanimated';
 import type { ViewProps } from 'react-native';
+import type { BottomSheetVariables } from '../../types';
 
 export interface BottomSheetBackgroundProps
-  extends Pick<ViewProps, 'pointerEvents' | 'style'> {
-  /**
-   * Current sheet position index.
-   * @type Animated.SharedValue<number>
-   */
-  animatedIndex: Animated.SharedValue<number>;
-  /**
-   * Current sheet position.
-   * @type Animated.SharedValue<number>
-   */
-  animatedPosition: Animated.SharedValue<number>;
-}
+  extends Pick<ViewProps, 'pointerEvents' | 'style'>,
+    BottomSheetVariables {}

src/components/bottomSheetHandle/types.d.ts

@@ -1,14 +1,3 @@
-import type Animated from 'react-native-reanimated';
+import type { BottomSheetVariables } from '../../types';
 
-export interface BottomSheetHandleProps {
-  /**
-   * Current sheet position index.
-   * @type Animated.Value<number>
-   */
-  animatedIndex: Animated.SharedValue<number>;
-  /**
-   * Current sheet position.
-   * @type Animated.Value<number>
-   */
-  animatedPosition: Animated.SharedValue<number>;
-}
+export interface BottomSheetHandleProps extends BottomSheetVariables {}

src/components/bottomSheetTextInput/types.ts

@@ -1,4 +1,3 @@
-import type { ComponentProps } from 'react';
-import type { TextInput } from 'react-native-gesture-handler';
+import type { TextInputProps } from 'react-native';
 
-export interface BottomSheetTextInputProps extends ComponentProps<TextInput> {}
+export interface BottomSheetTextInputProps extends TextInputProps {}

src/components/view/View.tsx

@@ -3,7 +3,6 @@ import { View as RNView } from 'react-native';
 import { useBottomSheetInternal } from '../../hooks';
 import type { BottomSheetViewProps } from './types';
 import { styles } from './styles';
-import { runOnUI } from 'react-native-reanimated';
 
 const BottomSheetViewComponent = ({
   style,
@@ -26,9 +25,7 @@ const BottomSheetViewComponent = ({
 
   // callback
   const handleSettingScrollable = useCallback(() => {
-    runOnUI(() => {
-      scrollableContentOffsetY.value = 0;
-    })();
+    scrollableContentOffsetY.value = 0;
   }, [scrollableContentOffsetY]);
 
   // effects

src/contexts/external.ts

@@ -1,7 +1,7 @@
 import { createContext } from 'react';
-import type { BottomSheetMethods } from '../types';
+import type { BottomSheetMethods, BottomSheetVariables } from '../types';
 
 export const BottomSheetContext =
-  createContext<BottomSheetMethods | null>(null);
+  createContext<(BottomSheetMethods & BottomSheetVariables) | null>(null);
 
 export const BottomSheetProvider = BottomSheetContext.Provider;

src/hooks/useBottomSheet.ts

@@ -5,7 +5,7 @@ export const useBottomSheet = () => {
   const context = useContext(BottomSheetContext);
 
   if (context === null) {
-    throw "'BottomSheetContext' cannot be null!";
+    throw "'useBottomSheet' cannot be used out of the BottomSheet!";
   }
 
   return context;

src/hooks/useBottomSheetInternal.ts

@@ -5,7 +5,7 @@ export const useBottomSheetInternal = () => {
   const context = useContext(BottomSheetInternalContext);
 
   if (context === null) {
-    throw "'BottomSheetInternalContext' cannot be null!";
+    throw "'useBottomSheetInternal' cannot be used out of the BottomSheet!";
   }
 
   return context;

src/index.ts

@@ -10,6 +10,7 @@ export { useBottomSheet } from './hooks/useBottomSheet';
 export { useBottomSheetModal } from './hooks/useBottomSheetModal';
 export { useBottomSheetSpringConfigs } from './hooks/useBottomSheetSpringConfigs';
 export { useBottomSheetTimingConfigs } from './hooks/useBottomSheetTimingConfigs';
+export { useBottomSheetInternal } from './hooks/useBottomSheetInternal';
 //#endregion
 
 //#region components

src/types.d.ts

@@ -77,6 +77,19 @@ export interface BottomSheetModalMethods extends BottomSheetMethods {
 }
 //#endregion
 
+export interface BottomSheetVariables {
+  /**
+   * Current sheet position index.
+   * @type Animated.Value<number>
+   */
+  animatedIndex: Animated.SharedValue<number>;
+  /**
+   * Current sheet position.
+   * @type Animated.Value<number>
+   */
+  animatedPosition: Animated.SharedValue<number>;
+}
+
 //#region scrollables
 export type Scrollable = FlatList | ScrollView | SectionList;