@umituz/react-native-auth 3.4.18 → 3.4.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-auth",
-  "version": "3.4.18",
+  "version": "3.4.20",
   "description": "Authentication service for React Native apps - Secure, type-safe, and production-ready. Provider-agnostic design with dependency injection, configurable validation, and comprehensive error handling.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -39,7 +39,6 @@
     "@umituz/react-native-validation": "^1.4.7"
   },
   "peerDependencies": {
-    "@gorhom/bottom-sheet": ">=4.0.0",
     "@react-navigation/native": ">=6.0.0",
     "@react-navigation/stack": ">=6.0.0",
     "@tanstack/react-query": ">=5.0.0",
@@ -50,14 +49,12 @@
     "react": ">=18.2.0",
     "react-native": ">=0.74.0",
     "react-native-gesture-handler": ">=2.0.0",
-    "react-native-reanimated": ">=3.0.0",
     "react-native-safe-area-context": ">=4.0.0",
     "react-native-svg": ">=13.0.0",
     "zustand": ">=4.0.0"
   },
   "devDependencies": {
     "@expo/vector-icons": "^15.0.3",
-    "@gorhom/bottom-sheet": "^5.0.0",
     "@react-native-async-storage/async-storage": "^2.2.0",
     "@react-native-community/datetimepicker": "^8.5.1",
     "@react-navigation/bottom-tabs": "^7.9.0",
@@ -89,7 +86,6 @@
     "react": "~19.1.0",
     "react-native": "~0.81.5",
     "react-native-gesture-handler": "^2.0.0",
-    "react-native-reanimated": "^3.0.0",
     "react-native-safe-area-context": "^4.0.0",
     "react-native-svg": "^15.15.1",
     "rn-emoji-keyboard": "^1.7.0",

package/src/presentation/components/AuthBottomSheet.tsx

@@ -3,15 +3,16 @@
  * Bottom sheet modal for authentication (Login/Register)
  */
 
-import React, { useEffect, useCallback, useRef, useState, useMemo } from "react";
-import { View, TouchableOpacity } from "react-native";
+import React, { useEffect, useCallback, useRef, useState } from "react";
+import { View, TouchableOpacity, ScrollView } from "react-native";
 import {
+  useAppDesignTokens,
+  AtomicText,
+  AtomicIcon,
+  AtomicKeyboardAvoidingView,
   BottomSheetModal,
-  BottomSheetBackdrop,
-  BottomSheetScrollView,
-} from "@gorhom/bottom-sheet";
-import type { BottomSheetBackdropProps } from "@gorhom/bottom-sheet";
-import { useAppDesignTokens, AtomicText, AtomicIcon, AtomicKeyboardAvoidingView } from "@umituz/react-native-design-system";
+  type BottomSheetModalRef,
+} from "@umituz/react-native-design-system";
 import { useLocalization } from "@umituz/react-native-localization";
 import { useAuthModalStore } from "../stores/authModalStore";
 import { useAuth } from "../hooks/useAuth";
@@ -45,7 +46,7 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
 }) => {
   const tokens = useAppDesignTokens();
   const { t } = useLocalization();
-  const modalRef = useRef<BottomSheetModal>(null);
+  const modalRef = useRef<BottomSheetModalRef>(null);
 
   const [googleLoading, setGoogleLoading] = useState(false);
   const [appleLoading, setAppleLoading] = useState(false);
@@ -62,13 +63,6 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
     }
   }, [isVisible]);
 
-  useEffect(() => {
-    if (isAuthenticated && !isAnonymous && isVisible) {
-      hideAuthModal();
-      executePendingCallback();
-    }
-  }, [isAuthenticated, isAnonymous, isVisible, hideAuthModal, executePendingCallback]);
-
   const handleDismiss = useCallback(() => {
     hideAuthModal();
     clearPendingCallback();
@@ -79,6 +73,26 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
     handleDismiss();
   }, [handleDismiss]);
 
+  const prevIsAuthenticatedRef = useRef(isAuthenticated);
+  const prevIsVisibleRef = useRef(isVisible);
+
+  useEffect(() => {
+    // Only close the modal if the user was NOT authenticated and then BECOMES authenticated 
+    // while the modal is visible.
+    if (!prevIsAuthenticatedRef.current && isAuthenticated && isVisible && !isAnonymous) {
+      if (typeof __DEV__ !== "undefined" && __DEV__) {
+        // eslint-disable-next-line no-console
+        console.log("[AuthBottomSheet] Auto-closing due to successful authentication transition");
+      }
+      handleClose();
+      executePendingCallback();
+    }
+    
+    // Update ref for next render
+    prevIsAuthenticatedRef.current = isAuthenticated;
+    prevIsVisibleRef.current = isVisible;
+  }, [isAuthenticated, isVisible, isAnonymous, executePendingCallback, handleClose]);
+
   const handleNavigateToRegister = useCallback(() => {
     setMode("register");
   }, [setMode]);
@@ -107,32 +121,17 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
     }
   }, [onAppleSignIn]);
 
-  const renderBackdrop = useCallback(
-    (props: BottomSheetBackdropProps) => (
-      <BottomSheetBackdrop {...props} appearsOnIndex={0} disappearsOnIndex={-1} pressBehavior="close" />
-    ),
-    [],
-  );
-
-  const snapPoints = useMemo(() => ["95%"], []);
-
   return (
     <BottomSheetModal
       ref={modalRef}
-      index={0}
-      snapPoints={snapPoints}
-      backdropComponent={renderBackdrop}
       onDismiss={handleDismiss}
-      enablePanDownToClose
-      keyboardBehavior="extend"
-      keyboardBlurBehavior="restore"
-      backgroundStyle={[styles.background, { backgroundColor: tokens.colors.backgroundPrimary }]}
-      handleIndicatorStyle={[styles.handleIndicator, { backgroundColor: tokens.colors.border }]}
+      preset="full"
+      backgroundColor={tokens.colors.backgroundPrimary}
     >
       <AtomicKeyboardAvoidingView
         style={{ flex: 1 }}
       >
-        <BottomSheetScrollView
+        <ScrollView
           contentContainerStyle={styles.scrollContent}
           showsVerticalScrollIndicator={false}
           keyboardShouldPersistTaps="handled"
@@ -179,7 +178,7 @@ export const AuthBottomSheet: React.FC<AuthBottomSheetProps> = ({
             />
           )}
         </View>
-      </BottomSheetScrollView>
+      </ScrollView>
     </AtomicKeyboardAvoidingView>
     </BottomSheetModal>
   );

package/src/presentation/hooks/useGoogleAuth.ts

@@ -14,51 +14,10 @@ import {
   type SocialAuthResult,
 } from "@umituz/react-native-firebase";
 
-// Type declarations for expo-auth-session
-interface GoogleAuthRequestConfig {
-  iosClientId: string;
-  webClientId: string;
-  androidClientId: string;
-}
-
-interface AuthSessionAuthentication {
-  idToken?: string;
-  accessToken?: string;
-}
-
-interface AuthSessionResult {
-  type: "success" | "cancel" | "dismiss" | "error" | "locked";
-  authentication?: AuthSessionAuthentication;
-}
-
-interface AuthRequest {
-  promptAsync: () => Promise<AuthSessionResult>;
-}
+import * as Google from "expo-auth-session/providers/google";
+import * as WebBrowser from "expo-web-browser";
 
-type UseAuthRequestReturn = [
-  AuthRequest | null,
-  AuthSessionResult | null,
-  () => Promise<AuthSessionResult>,
-];
-
-// Dynamic imports to handle optional dependencies
-type GoogleModule = { useAuthRequest: (config: GoogleAuthRequestConfig) => UseAuthRequestReturn };
-type WebBrowserModule = { maybeCompleteAuthSession: () => void };
-
-let Google: GoogleModule | null = null;
-let WebBrowser: WebBrowserModule | null = null;
-
-try {
-  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-  Google = require("expo-auth-session/providers/google") as GoogleModule;
-  // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-  WebBrowser = require("expo-web-browser") as WebBrowserModule;
-  if (WebBrowser) {
-    WebBrowser.maybeCompleteAuthSession();
-  }
-} catch {
-  // expo-auth-session not available - silent fallback
-}
+WebBrowser.maybeCompleteAuthSession();
 
 export interface GoogleAuthConfig {
   iosClientId?: string;
@@ -123,7 +82,7 @@ export function useGoogleAuth(config?: GoogleAuthConfig): UseGoogleAuthResult {
   }, [googleResponse, signInWithGoogleToken]);
 
   const signInWithGoogle = useCallback(async (): Promise<SocialAuthResult> => {
-    if (!Google || !promptGoogleAsync) {
+    if (!promptGoogleAsync) {
       return { success: false, error: "expo-auth-session is not available" };
     }