@umituz/react-native-settings 1.3.4 → 1.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-settings",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "Settings management for React Native apps - user preferences, theme, language, notifications",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/presentation/screens/SettingsScreen.tsx

@@ -13,7 +13,7 @@
 
 import React, { useMemo } from 'react';
 import { List, Divider } from 'react-native-paper';
-import { View, TouchableOpacity, StyleSheet } from 'react-native';
+import { DeviceEventEmitter, Alert, View, TouchableOpacity, StyleSheet } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { useNavigation } from '@react-navigation/native';
@@ -32,6 +32,16 @@ try {
   // Package not available, notificationService will be null
 }
 
+// Optional onboarding store - only import if package is available
+let useOnboardingStore: any = null;
+try {
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const onboardingPackage = require('@umituz/react-native-onboarding');
+  useOnboardingStore = onboardingPackage.useOnboardingStore;
+} catch {
+  // Package not available, useOnboardingStore will be null
+}
+
 /**
  * Check if a navigation screen exists in the navigation state
  */
@@ -130,8 +140,50 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = ({
   };
 
   const handleClose = () => {
+    // Try to go back in current navigator first
     if (navigation.canGoBack()) {
       navigation.goBack();
+    } else {
+      // If we can't go back in current navigator, try parent navigator
+      // This handles the case where Settings is the root screen of a stack
+      const parent = navigation.getParent();
+      if (parent?.canGoBack()) {
+        parent.goBack();
+      }
+    }
+  };
+
+  const handleShowOnboarding = async () => {
+    if (!useOnboardingStore) {
+      Alert.alert('Error', 'Onboarding package is not available');
+      return;
+    }
+
+    try {
+      const onboardingStore = useOnboardingStore.getState();
+      // Reset onboarding state
+      await onboardingStore.reset();
+      // Emit event to trigger navigation to onboarding
+      DeviceEventEmitter.emit('reset-onboarding');
+      // Close settings first - try parent navigator if current can't go back
+      if (navigation.canGoBack()) {
+        navigation.goBack();
+      } else {
+        const parent = navigation.getParent();
+        if (parent?.canGoBack()) {
+          parent.goBack();
+        }
+      }
+      // Small delay to ensure navigation completes
+      setTimeout(() => {
+        DeviceEventEmitter.emit('show-onboarding');
+      }, 100);
+    } catch (error) {
+      Alert.alert(
+        'Error',
+        'Failed to show onboarding. Please try again.',
+        [{ text: 'OK' }],
+      );
     }
   };
 
@@ -200,6 +252,21 @@ export const SettingsScreen: React.FC<SettingsScreenProps> = ({
         </List.Section>
       )}
 
+      {/* Development/Test: Show Onboarding */}
+      {__DEV__ && useOnboardingStore && (
+        <List.Section style={{ marginBottom: 8 }}>
+          <List.Subheader style={{ color: theme.colors.textSecondary }}>Development</List.Subheader>
+          <SettingItem
+            icon="Play"
+            iconGradient={theme.colors.settingGradients.info as unknown as string[]}
+            title="Show Onboarding (Dev)"
+            description="Navigate to onboarding screen"
+            onPress={handleShowOnboarding}
+            testID="show-onboarding-button"
+          />
+        </List.Section>
+      )}
+
       {/* About & Legal Section */}
       {(features.about || features.legal) && (
         <List.Section style={{ marginBottom: 8 }}>