@umituz/react-native-design-system 2.6.6 → 2.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-design-system",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "Universal design system for React Native apps - Consolidated package with atoms, molecules, organisms, theme, typography, responsive and safe area utilities",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/molecules/splash/components/SplashScreen.tsx

@@ -26,29 +26,11 @@ export const SplashScreen: React.FC<SplashScreenProps> = ({
   onReady,
   style,
 }: SplashScreenProps) => {
+  // ALL HOOKS MUST BE AT THE TOP (Rules of Hooks)
   const insets = useSafeAreaInsets();
   const tokens = useAppDesignTokens();
   const [timedOut, setTimedOut] = useState(false);
 
-  // Derive colors from tokens if not provided (theme-aware defaults)
-  const colors: SplashColors = customColors ?? {
-    background: tokens.colors.backgroundPrimary,
-    text: tokens.colors.textPrimary,
-    iconPlaceholder: `${tokens.colors.textPrimary}30`, // 30% opacity
-  };
-
-  if (__DEV__) {
-    console.log('[SplashScreen] Component render:', {
-      visible,
-      appName,
-      tagline,
-      hasIcon: !!icon,
-      hasCustomColors: !!customColors,
-      resolvedColors: colors,
-      hasGradient: !!gradientColors,
-    });
-  }
-
   const handleTimeout = useCallback(() => {
     if (__DEV__) {
       console.log(`[SplashScreen] Timeout reached: ${maxDuration}ms`);
@@ -71,6 +53,27 @@ export const SplashScreen: React.FC<SplashScreenProps> = ({
     return () => clearTimeout(timer);
   }, [maxDuration, visible, handleTimeout]);
 
+  // ALL HOOKS ABOVE - NOW SAFE TO USE OTHER LOGIC
+
+  // Derive colors from tokens if not provided (theme-aware defaults)
+  const colors: SplashColors = customColors ?? {
+    background: tokens.colors.backgroundPrimary,
+    text: tokens.colors.textPrimary,
+    iconPlaceholder: `${tokens.colors.textPrimary}30`, // 30% opacity
+  };
+
+  if (__DEV__) {
+    console.log('[SplashScreen] Component render:', {
+      visible,
+      appName,
+      tagline,
+      hasIcon: !!icon,
+      hasCustomColors: !!customColors,
+      resolvedColors: colors,
+      hasGradient: !!gradientColors,
+    });
+  }
+
   if (!visible) {
     if (__DEV__) {
       console.log("[SplashScreen] Not visible (visible=false), returning null");

package/src/theme/infrastructure/providers/DesignSystemProvider.tsx

@@ -63,28 +63,28 @@ export const DesignSystemProvider: React.FC<DesignSystemProviderProps> = ({
   onInitialized,
   onError,
 }: DesignSystemProviderProps) => {
+  // ALL HOOKS MUST BE AT THE TOP (Rules of Hooks)
   const [isInitialized, setIsInitialized] = useState(false);
+  const [minDisplayTimeMet, setMinDisplayTimeMet] = useState(false);
   const initialize = useThemeStore((state) => state.initialize);
   const setCustomColors = useDesignSystemTheme((state) => state.setCustomColors);
 
-  if (__DEV__) {
-    console.log('[DesignSystemProvider] Component render:', {
-      isInitialized,
-      showLoadingIndicator,
-      hasSplashConfig: !!splashConfig,
-      splashConfigKeys: splashConfig ? Object.keys(splashConfig) : [],
-    });
-  }
-
   useEffect(() => {
     if (__DEV__) console.log('[DesignSystemProvider] Initializing...');
-    
+
     // Apply custom colors if provided
     if (customColors) {
       if (__DEV__) console.log('[DesignSystemProvider] Applying custom colors');
       setCustomColors(customColors);
     }
 
+    // Start minimum display timer (1.5 seconds)
+    const MIN_SPLASH_DISPLAY_TIME = 1500;
+    const displayTimer = setTimeout(() => {
+      if (__DEV__) console.log('[DesignSystemProvider] Minimum display time met (1.5s)');
+      setMinDisplayTimeMet(true);
+    }, MIN_SPLASH_DISPLAY_TIME);
+
     // Initialize theme store
     initialize()
       .then(() => {
@@ -99,20 +99,38 @@ export const DesignSystemProvider: React.FC<DesignSystemProviderProps> = ({
         setIsInitialized(true); // Still render app even on error
         onError?.(error);
       });
+
+    return () => clearTimeout(displayTimer);
   }, [initialize, customColors, setCustomColors, onInitialized, onError]);
 
+  // ALL HOOKS ABOVE - NOW SAFE TO USE OTHER LOGIC
+
+  if (__DEV__) {
+    console.log('[DesignSystemProvider] Component render:', {
+      isInitialized,
+      minDisplayTimeMet,
+      showLoadingIndicator,
+      hasSplashConfig: !!splashConfig,
+      splashConfigKeys: splashConfig ? Object.keys(splashConfig) : [],
+    });
+  }
+
   const renderContent = () => {
+    const shouldShowSplash = showLoadingIndicator && (!isInitialized || !minDisplayTimeMet);
+
     if (__DEV__) {
       console.log('[DesignSystemProvider] renderContent:', {
         showLoadingIndicator,
         isInitialized,
+        minDisplayTimeMet,
+        shouldShowSplash,
         hasSplashConfig: !!splashConfig,
         hasLoadingComponent: !!loadingComponent,
       });
     }
 
-    // Show loading indicator if requested and not yet initialized
-    if (showLoadingIndicator && !isInitialized) {
+    // Show loading indicator if requested and not yet ready (both conditions must be met)
+    if (shouldShowSplash) {
       if (__DEV__) console.log('[DesignSystemProvider] Showing loading state');
 
       if (loadingComponent) {