@oxyhq/services 5.3.0 → 5.3.2

package/lib/typescript/ui/index.d.ts

@@ -11,19 +11,5 @@ export { OxyIcon } from './components/icon';
 export type { IconProps } from './components/icon';
 export { OxyContextProvider, useOxy, OxyContextState, OxyContextProviderProps } from './context/OxyContext';
 export { fontFamilies, fontStyles } from './styles/fonts';
-export { default as SignInScreen } from './screens/SignInScreen';
-export { default as SignUpScreen } from './screens/SignUpScreen';
-export { default as AccountCenterScreen } from './screens/AccountCenterScreen';
-export { default as SessionManagementScreen } from './screens/SessionManagementScreen';
-export { default as AccountOverviewScreen } from './screens/AccountOverviewScreen';
-export { default as AccountSettingsScreen } from './screens/AccountSettingsScreen';
-export { default as AccountSwitcherScreen } from './screens/AccountSwitcherScreen';
-export { default as AppInfoScreen } from './screens/AppInfoScreen';
-export { default as KarmaCenterScreen } from './screens/karma/KarmaCenterScreen';
-export { default as KarmaLeaderboardScreen } from './screens/karma/KarmaLeaderboardScreen';
-export { default as KarmaRewardsScreen } from './screens/karma/KarmaRewardsScreen';
-export { default as KarmaRulesScreen } from './screens/karma/KarmaRulesScreen';
-export { default as KarmaAboutScreen } from './screens/karma/KarmaAboutScreen';
-export { default as KarmaFAQScreen } from './screens/karma/KarmaFAQScreen';
 export * from './navigation/types';
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/ui/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,eAAe,EACf,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG1D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGnE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACjF,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAG3E,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGjE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,eAAe,EACf,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG1D,cAAc,oBAAoB,CAAC"}

package/lib/typescript/ui/navigation/OxyRouter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OxyRouter.d.ts","sourceRoot":"","sources":["../../../../src/ui/navigation/OxyRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAsBnD,OAAO,EAAE,cAAc,EAAe,MAAM,SAAS,CAAC;AAkEtD,QAAA,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA0GvC,CAAC;AAiBF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"OxyRouter.d.ts","sourceRoot":"","sources":["../../../../src/ui/navigation/OxyRouter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAsBnD,OAAO,EAAE,cAAc,EAAe,MAAM,SAAS,CAAC;AAkEtD,QAAA,MAAM,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA6IvC,CAAC;AAiBF,eAAe,SAAS,CAAC"}

package/lib/typescript/ui/navigation/types.d.ts

@@ -29,6 +29,7 @@ export interface OxyRouterProps {
     onAuthenticated?: (user: User) => void;
     theme: 'light' | 'dark';
     adjustSnapPoints: (snapPoints: string[]) => void;
+    navigationRef?: React.MutableRefObject<((screen: string, props?: Record<string, any>) => void) | null>;
 }
 /**
  * Props for the OxyProvider component

package/lib/typescript/ui/navigation/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/ui/navigation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGjD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChD,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB,gBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAClD;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC;IAEzB;;;OAGG;IACH,aAAa,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,eAAe,CAAC;IAEtD;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAErB;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAEvC;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAEzB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAEtC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,YAAY,CAAC,EAAE;QACb;;WAEG;QACH,eAAe,CAAC,EAAE,MAAM,CAAC;QAEzB;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;WAEG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IAEF;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC;IAEhD;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/ui/navigation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGjD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChD,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB,gBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;CACxG;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC;IAEzB;;;OAGG;IACH,aAAa,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,eAAe,CAAC;IAEtD;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAErB;;OAEG;IACH,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAEvC;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAEzB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAEtC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,YAAY,CAAC,EAAE;QACb;;WAEG;QACH,eAAe,CAAC,EAAE,MAAM,CAAC;QAEzB;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;WAEG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IAEF;;OAEG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC;IAEhD;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oxyhq/services",
-    "version": "5.3.0",
+    "version": "5.3.2",
     "description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
     "main": "lib/commonjs/node/index.js",
     "module": "lib/module/node/index.js",

package/src/index.ts

@@ -16,24 +16,6 @@ import {
   OxyContextProvider, 
   useOxy,
   
-  // Screens
-  SignInScreen, 
-  SignUpScreen, 
-  AccountCenterScreen,
-  SessionManagementScreen,
-  AccountOverviewScreen,
-  AccountSettingsScreen,
-  AppInfoScreen,
-  AccountSwitcherScreen,
-  
-  // Karma Screens
-  KarmaCenterScreen,
-  KarmaLeaderboardScreen,
-  KarmaRewardsScreen,
-  KarmaRulesScreen,
-  KarmaAboutScreen,
-  KarmaFAQScreen,
-  
   // Components
   OxySignInButton,
   OxyLogo,
@@ -67,24 +49,6 @@ export {
   OxyContextProvider, 
   useOxy,
   
-  // Screens
-  SignInScreen, 
-  SignUpScreen,
-  AccountCenterScreen,
-  SessionManagementScreen,
-  AccountOverviewScreen,
-  AccountSettingsScreen,
-  AppInfoScreen,
-  AccountSwitcherScreen,
-  
-  // Karma Screens
-  KarmaCenterScreen,
-  KarmaLeaderboardScreen,
-  KarmaRewardsScreen,
-  KarmaRulesScreen,
-  KarmaAboutScreen,
-  KarmaFAQScreen,
-  
   // Components
   OxySignInButton,
   OxyLogo,

package/src/ui/components/OxyProvider.tsx

@@ -95,6 +95,9 @@ const OxyBottomSheet: React.FC<OxyProviderProps> = ({
 }) => {
     // Use the internal ref (which is passed as a prop from OxyProvider)
     const modalRef = useRef<BottomSheetModal>(null);
+    
+    // Create a ref to store the navigation function from OxyRouter
+    const navigationRef = useRef<((screen: string, props?: Record<string, any>) => void) | null>(null);
 
     // Track content height for dynamic sizing
     const [contentHeight, setContentHeight] = useState<number>(0);
@@ -122,16 +125,24 @@ const OxyBottomSheet: React.FC<OxyProviderProps> = ({
             // Add a method to navigate between screens
             // @ts-ignore - Adding custom method
             bottomSheetRef.current._navigateToScreen = (screenName: string, props?: Record<string, any>) => {
-                // Access the navigation function exposed by OxyRouter
-                // Use internal mechanism to notify router about navigation
-                // We'll use a simple event-based approach
+                console.log(`Navigation requested: ${screenName}`, props);
+                
+                // Try direct navigation function first (most reliable)
+                if (navigationRef.current) {
+                    console.log('Using direct navigation function');
+                    navigationRef.current(screenName, props);
+                    return;
+                }
+                
+                // Fallback to event-based navigation
                 if (typeof document !== 'undefined') {
                     // For web - use a custom event
+                    console.log('Using web event navigation');
                     const event = new CustomEvent('oxy:navigate', { detail: { screen: screenName, props } });
                     document.dispatchEvent(event);
                 } else {
-                    // For React Native - use the navigation prop directly if available
-                    // We'll implement a mechanism in OxyRouter to listen for this
+                    // For React Native - use the global variable approach
+                    console.log('Using React Native global navigation');
                     (global as any).oxyNavigateEvent = { screen: screenName, props };
                 }
             };
@@ -481,6 +492,7 @@ const OxyBottomSheet: React.FC<OxyProviderProps> = ({
                         onAuthenticated={handleAuthenticated}
                         theme={theme}
                         adjustSnapPoints={adjustSnapPoints}
+                        navigationRef={navigationRef}
                     />
                 </Animated.View>
             </BottomSheetScrollView>

package/src/ui/context/OxyContext.tsx

@@ -502,25 +502,39 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
 
   // Bottom sheet control methods
   const showBottomSheet = useCallback((screenOrConfig?: string | { screen: string; props?: Record<string, any> }) => {
+    console.log('showBottomSheet called with:', screenOrConfig);
+    
     if (bottomSheetRef?.current) {
-      // Use expand() instead of present() to trigger animations
+      console.log('bottomSheetRef is available');
+      
+      // First, show the bottom sheet
       if (bottomSheetRef.current.expand) {
+        console.log('Expanding bottom sheet');
         bottomSheetRef.current.expand();
+      } else if (bottomSheetRef.current.present) {
+        console.log('Presenting bottom sheet');
+        bottomSheetRef.current.present();
       } else {
-        // Fallback to present if expand is not available
-        bottomSheetRef.current.present?.();
+        console.warn('No expand or present method available on bottomSheetRef');
       }
       
-      // Navigate to the specified screen if provided
+      // Then navigate to the specified screen if provided
       if (screenOrConfig) {
-        if (typeof screenOrConfig === 'string') {
-          // Simple screen name
-          bottomSheetRef.current._navigateToScreen?.(screenOrConfig);
-        } else {
-          // Screen with props
-          bottomSheetRef.current._navigateToScreen?.(screenOrConfig.screen, screenOrConfig.props);
-        }
+        // Add a small delay to ensure the bottom sheet is opened first
+        setTimeout(() => {
+          if (typeof screenOrConfig === 'string') {
+            // Simple screen name
+            console.log('Navigating to screen:', screenOrConfig);
+            bottomSheetRef.current?._navigateToScreen?.(screenOrConfig);
+          } else {
+            // Screen with props
+            console.log('Navigating to screen with props:', screenOrConfig.screen, screenOrConfig.props);
+            bottomSheetRef.current?._navigateToScreen?.(screenOrConfig.screen, screenOrConfig.props);
+          }
+        }, 100);
       }
+    } else {
+      console.warn('bottomSheetRef is not available');
     }
   }, [bottomSheetRef]);
 

package/src/ui/index.ts

@@ -24,23 +24,5 @@ export {
 // Export styles
 export { fontFamilies, fontStyles } from './styles/fonts';
 
-// Export screen components
-export { default as SignInScreen } from './screens/SignInScreen';
-export { default as SignUpScreen } from './screens/SignUpScreen';
-export { default as AccountCenterScreen } from './screens/AccountCenterScreen';
-export { default as SessionManagementScreen } from './screens/SessionManagementScreen';
-export { default as AccountOverviewScreen } from './screens/AccountOverviewScreen';
-export { default as AccountSettingsScreen } from './screens/AccountSettingsScreen';
-export { default as AccountSwitcherScreen } from './screens/AccountSwitcherScreen';
-export { default as AppInfoScreen } from './screens/AppInfoScreen';
-
-// Export karma screens
-export { default as KarmaCenterScreen } from './screens/karma/KarmaCenterScreen';
-export { default as KarmaLeaderboardScreen } from './screens/karma/KarmaLeaderboardScreen';
-export { default as KarmaRewardsScreen } from './screens/karma/KarmaRewardsScreen';
-export { default as KarmaRulesScreen } from './screens/karma/KarmaRulesScreen';
-export { default as KarmaAboutScreen } from './screens/karma/KarmaAboutScreen';
-export { default as KarmaFAQScreen } from './screens/karma/KarmaFAQScreen';
-
-// Export types
+// Export types for navigation (internal use)
 export * from './navigation/types';

package/src/ui/navigation/OxyRouter.tsx

@@ -93,6 +93,7 @@ const OxyRouter: React.FC<OxyRouterProps> = ({
     onAuthenticated,
     theme,
     adjustSnapPoints,
+    navigationRef,
 }) => {
     const [currentScreen, setCurrentScreen] = useState<string>(initialScreen);
     const [screenHistory, setScreenHistory] = useState<string[]>([initialScreen]);
@@ -114,7 +115,22 @@ const OxyRouter: React.FC<OxyRouterProps> = ({
         } else {
             console.error(`Screen "${screen}" not found`);
         }
-    };    // Expose the navigate method to the parent component (OxyProvider)
+    };
+
+    // Expose the navigate function to the parent component
+    useEffect(() => {
+        if (navigationRef) {
+            navigationRef.current = navigate;
+        }
+        
+        return () => {
+            if (navigationRef) {
+                navigationRef.current = null;
+            }
+        };
+    }, [navigate, navigationRef]);
+
+    // Expose the navigate method to the parent component (OxyProvider)
     useEffect(() => {
         // Set up event listener for navigation events
         const handleNavigationEvent = (event: any) => {
@@ -132,9 +148,25 @@ const OxyRouter: React.FC<OxyRouterProps> = ({
             }
         };
 
-        // Add event listener (web only)
+        // For React Native - check for global navigation events
+        let intervalId: NodeJS.Timeout | null = null;
+        
         if (typeof document !== 'undefined') {
+            // Web - use custom event listener
             document.addEventListener('oxy:navigate', handleNavigationEvent);
+        } else {
+            // React Native - poll for global navigation events
+            intervalId = setInterval(() => {
+                const globalNav = (global as any).oxyNavigateEvent;
+                if (globalNav) {
+                    console.log(`RN Navigation event received:`, globalNav);
+                    if (globalNav.screen) {
+                        navigate(globalNav.screen, globalNav.props || {});
+                    }
+                    // Clear the event after processing
+                    (global as any).oxyNavigateEvent = null;
+                }
+            }, 100); // Check every 100ms
         }
 
         // Cleanup
@@ -142,6 +174,9 @@ const OxyRouter: React.FC<OxyRouterProps> = ({
             if (typeof document !== 'undefined') {
                 document.removeEventListener('oxy:navigate', handleNavigationEvent);
             }
+            if (intervalId) {
+                clearInterval(intervalId);
+            }
         };
     }, []);
 

package/src/ui/navigation/types.ts

@@ -33,6 +33,7 @@ export interface OxyRouterProps {
   onAuthenticated?: (user: User) => void;
   theme: 'light' | 'dark';
   adjustSnapPoints: (snapPoints: string[]) => void;
+  navigationRef?: React.MutableRefObject<((screen: string, props?: Record<string, any>) => void) | null>;
 }
 
 /**