@umituz/react-native-onboarding 2.6.9 → 2.6.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-onboarding",
-  "version": "2.6.9",
+  "version": "2.6.10",
   "description": "Advanced onboarding flow for React Native apps with personalization questions, theme-aware colors, animations, and customizable slides. SOLID, DRY, KISS principles applied.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/presentation/hooks/useOnboardingScreenState.ts

@@ -0,0 +1,171 @@
+/**
+ * useOnboardingScreenState Hook
+ * Single Responsibility: Manage onboarding screen state and handlers
+ */
+
+import { useMemo } from "react";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useAppDesignTokens } from "@umituz/react-native-design-system-theme";
+import type { OnboardingSlide } from "../../domain/entities/OnboardingSlide";
+import { useOnboardingStore } from "../../infrastructure/storage/OnboardingStore";
+import { useOnboardingNavigation } from "../../infrastructure/hooks/useOnboardingNavigation";
+import { useOnboardingAnswers } from "../../infrastructure/hooks/useOnboardingAnswers";
+import { OnboardingSlideService } from "../../infrastructure/services/OnboardingSlideService";
+import { OnboardingValidationService } from "../../infrastructure/services/OnboardingValidationService";
+import { shouldUseGradient } from "../../infrastructure/utils/gradientUtils";
+
+export interface UseOnboardingScreenStateProps {
+  slides: OnboardingSlide[] | undefined;
+  storageKey?: string;
+  onComplete?: () => void | Promise<void>;
+  onSkip?: () => void | Promise<void>;
+  globalUseGradient?: boolean;
+}
+
+export interface UseOnboardingScreenStateReturn {
+  filteredSlides: OnboardingSlide[];
+  currentSlide: OnboardingSlide | undefined;
+  currentIndex: number;
+  isFirstSlide: boolean;
+  isLastSlide: boolean;
+  currentAnswer: any;
+  isAnswerValid: boolean;
+  useGradient: boolean;
+  containerStyle: any;
+  handleNext: () => Promise<void>;
+  handlePrevious: () => void;
+  handleSkip: () => Promise<void>;
+  setCurrentAnswer: (value: any) => void;
+}
+
+export function useOnboardingScreenState({
+  slides,
+  storageKey,
+  onComplete,
+  onSkip,
+  globalUseGradient = false,
+}: UseOnboardingScreenStateProps): UseOnboardingScreenStateReturn {
+  const insets = useSafeAreaInsets();
+  const tokens = useAppDesignTokens();
+  const onboardingStore = useOnboardingStore();
+
+  // Filter slides using service
+  const filteredSlides = useMemo(() => {
+    if (!slides || !Array.isArray(slides) || slides.length === 0) {
+      return [];
+    }
+    const userData = onboardingStore.getUserData();
+    return OnboardingSlideService.filterSlides(slides, userData);
+  }, [slides, onboardingStore]);
+
+  // Navigation hook
+  const {
+    currentIndex,
+    goToNext,
+    goToPrevious,
+    complete: completeOnboarding,
+    skip: skipOnboarding,
+    isLastSlide,
+    isFirstSlide,
+  } = useOnboardingNavigation(
+    filteredSlides.length,
+    async () => {
+      await onboardingStore.complete(storageKey);
+      if (onComplete) {
+        await onComplete();
+      }
+    },
+    async () => {
+      await onboardingStore.skip(storageKey);
+      if (onSkip) {
+        await onSkip();
+      }
+    },
+  );
+
+  // Get current slide
+  const currentSlide = useMemo(
+    () => OnboardingSlideService.getSlideAtIndex(filteredSlides, currentIndex),
+    [filteredSlides, currentIndex],
+  );
+
+  // Answer management hook
+  const {
+    currentAnswer,
+    setCurrentAnswer,
+    loadAnswerForSlide,
+    saveCurrentAnswer,
+  } = useOnboardingAnswers(currentSlide);
+
+  // Handle next slide
+  const handleNext = async () => {
+    await saveCurrentAnswer(currentSlide);
+    if (isLastSlide) {
+      await completeOnboarding();
+    } else {
+      goToNext();
+      const nextSlide = OnboardingSlideService.getSlideAtIndex(
+        filteredSlides,
+        currentIndex + 1,
+      );
+      loadAnswerForSlide(nextSlide);
+    }
+  };
+
+  // Handle previous slide
+  const handlePrevious = () => {
+    goToPrevious();
+    const prevSlide = OnboardingSlideService.getSlideAtIndex(
+      filteredSlides,
+      currentIndex - 1,
+    );
+    loadAnswerForSlide(prevSlide);
+  };
+
+  // Handle skip
+  const handleSkip = async () => {
+    await skipOnboarding();
+  };
+
+  // Check if gradient should be used
+  const useGradient = shouldUseGradient(currentSlide, globalUseGradient);
+
+  // Validate answer using service
+  const isAnswerValid = useMemo(() => {
+    if (!currentSlide?.question) {
+      return true;
+    }
+    return OnboardingValidationService.validateAnswer(
+      currentSlide.question,
+      currentAnswer,
+    );
+  }, [currentSlide, currentAnswer]);
+
+  // Container style
+  const containerStyle = useMemo(
+    () => [
+      {
+        paddingTop: insets.top,
+        backgroundColor: useGradient ? "transparent" : tokens.colors.backgroundPrimary,
+      },
+    ],
+    [insets.top, useGradient, tokens.colors.backgroundPrimary],
+  );
+
+  return {
+    filteredSlides,
+    currentSlide,
+    currentIndex,
+    isFirstSlide,
+    isLastSlide,
+    currentAnswer,
+    isAnswerValid,
+    useGradient,
+    containerStyle,
+    handleNext,
+    handlePrevious,
+    handleSkip,
+    setCurrentAnswer,
+  };
+}
+

package/src/presentation/screens/OnboardingScreen.tsx

@@ -7,17 +7,10 @@
  * This component only handles UI coordination - no business logic
  */
 
-import React, { useMemo } from "react";
+import React from "react";
 import { StyleSheet } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { useAppDesignTokens } from "@umituz/react-native-design-system-theme";
 import type { OnboardingOptions } from "../../domain/entities/OnboardingOptions";
-import { useOnboardingNavigation } from "../../infrastructure/hooks/useOnboardingNavigation";
-import { useOnboardingAnswers } from "../../infrastructure/hooks/useOnboardingAnswers";
-import { useOnboardingStore } from "../../infrastructure/storage/OnboardingStore";
-import { OnboardingSlideService } from "../../infrastructure/services/OnboardingSlideService";
-import { OnboardingValidationService } from "../../infrastructure/services/OnboardingValidationService";
-import { shouldUseGradient } from "../../infrastructure/utils/gradientUtils";
+import { useOnboardingScreenState } from "../hooks/useOnboardingScreenState";
 import { OnboardingScreenContent } from "../components/OnboardingScreenContent";
 
 export interface OnboardingScreenProps extends OnboardingOptions {
@@ -99,116 +92,31 @@ export const OnboardingScreen: React.FC<OnboardingScreenProps> = ({
   useGradient: globalUseGradient = false,
   SliderComponent,
 }) => {
-  const insets = useSafeAreaInsets();
-  const tokens = useAppDesignTokens();
-  const onboardingStore = useOnboardingStore();
-
-  // Filter slides using service
-  const filteredSlides = useMemo(() => {
-    if (!slides || !Array.isArray(slides) || slides.length === 0) {
-      return [];
-    }
-    const userData = onboardingStore.getUserData();
-    return OnboardingSlideService.filterSlides(slides, userData);
-  }, [slides, onboardingStore]);
-
-  // Navigation hook
   const {
+    filteredSlides,
+    currentSlide,
     currentIndex,
-    goToNext,
-    goToPrevious,
-    complete: completeOnboarding,
-    skip: skipOnboarding,
-    isLastSlide,
     isFirstSlide,
-  } = useOnboardingNavigation(
-    filteredSlides.length,
-    async () => {
-      await onboardingStore.complete(storageKey);
-      if (onComplete) {
-        await onComplete();
-      }
-    },
-    async () => {
-      await onboardingStore.skip(storageKey);
-      if (onSkip) {
-        await onSkip();
-      }
-    },
-  );
-
-  // Get current slide
-  const currentSlide = useMemo(
-    () => OnboardingSlideService.getSlideAtIndex(filteredSlides, currentIndex),
-    [filteredSlides, currentIndex],
-  );
-
-  // Answer management hook
-  const {
+    isLastSlide,
     currentAnswer,
+    isAnswerValid,
+    useGradient,
+    containerStyle,
+    handleNext,
+    handlePrevious,
+    handleSkip,
     setCurrentAnswer,
-    loadAnswerForSlide,
-    saveCurrentAnswer,
-  } = useOnboardingAnswers(currentSlide);
-
-  // Handle next slide
-  const handleNext = async () => {
-    await saveCurrentAnswer(currentSlide);
-    if (isLastSlide) {
-      await completeOnboarding();
-    } else {
-      goToNext();
-      const nextSlide = OnboardingSlideService.getSlideAtIndex(
-        filteredSlides,
-        currentIndex + 1,
-      );
-      loadAnswerForSlide(nextSlide);
-    }
-  };
-
-  // Handle previous slide
-  const handlePrevious = () => {
-    goToPrevious();
-    const prevSlide = OnboardingSlideService.getSlideAtIndex(
-      filteredSlides,
-      currentIndex - 1,
-    );
-    loadAnswerForSlide(prevSlide);
-  };
-
-  // Handle skip
-  const handleSkip = async () => {
-    await skipOnboarding();
-  };
-
-  // Check if gradient should be used
-  const useGradient = shouldUseGradient(currentSlide, globalUseGradient);
-
-  // Validate answer using service
-  const isAnswerValid = useMemo(() => {
-    if (!currentSlide?.question) {
-      return true;
-    }
-    return OnboardingValidationService.validateAnswer(
-      currentSlide.question,
-      currentAnswer,
-    );
-  }, [currentSlide, currentAnswer]);
-
-  const containerStyle = useMemo(
-    () => [
-      styles.container,
-      {
-        paddingTop: insets.top,
-        backgroundColor: useGradient ? "transparent" : tokens.colors.backgroundPrimary,
-      },
-    ],
-    [insets.top, useGradient, tokens.colors.backgroundPrimary],
-  );
+  } = useOnboardingScreenState({
+    slides,
+    storageKey,
+    onComplete,
+    onSkip,
+    globalUseGradient,
+  });
 
   return (
     <OnboardingScreenContent
-      containerStyle={containerStyle}
+      containerStyle={[styles.container, containerStyle]}
       useGradient={useGradient}
       currentSlide={currentSlide}
       isFirstSlide={isFirstSlide}