@fto-consult/expo-ui 6.67.13 → 6.67.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.67.13",
+  "version": "6.67.15",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {
@@ -71,7 +71,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.57.9",
+    "@fto-consult/common": "^3.58.0",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",

package/src/AppEntry/App.js

@@ -69,6 +69,7 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render}) {
   const [state,setState] = React.useState({
      isLoading : true,
      isInitialized:false,
+     hasCallInitApp : false,
   });
    React.useEffect(() => {
     const loadResources = ()=>{
@@ -189,11 +190,11 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render}) {
            Auth.loginUser(false);
         }
         setState({
-          ...state,hasGetStarted:true,...defaultObj(args && args?.state),isInitialized:true,isLoading : false,
+          ...state,hasGetStarted:true,...defaultObj(args && args?.state),hasCallInitApp:true,isInitialized:true,isLoading : false,
         });  
       }).catch((e)=>{
           console.error(e," loading resources for app initialization");
-          setState({...state,isInitialized:true,isLoading : false,hasGetStarted:false});
+          setState({...state,isInitialized:true,hasCallInitApp,isLoading : false,hasGetStarted:false});
       })
     });
 
@@ -246,7 +247,7 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render}) {
         theme,
         ...defaultObj(pref),
     }),[theme,pref]);
-  const isLoaded = !isLoading;
+  const isLoaded = !isLoading && state.hasCallInitApp;
   const child = isLoaded ? <NavigationContainer 
     ref={navigationRef}
     initialState={initialState}

package/src/components/SplashScreen/index.js

@@ -70,34 +70,36 @@ const SplashScreenComponent = ({isLoaded,children , duration, delay,logoWidth,lo
   if(animationDone && isLoaded){
       return React.isValidElement(children)?children:null;
   }
-  return <Portal>
-    <View style={[styles.container,{backgroundColor}]} testID={testID} id={testID}>
-      {<View style={[StyleSheet.absoluteFill,{backgroundColor}]} testID={testID+"_Animation"}/>}
-      <View style={styles.containerGlue} testID={testID+"_ContainerGlue"}>
-        {(
-          <Animated.View
-            style={_staticBackground(logoOpacity, backgroundColor)}
-            testID={testID+"_AnimationDone"}
-          />
-        )}
-        {(
-          React.isComponent(Component)? <Component testID={testID+"_CustomSplashComponent"}/> : 
-          <View testID={testID+"_LogoContainer"} style={[StyleSheet.absoluteFill,{backgroundColor}, styles.logoStyle]}>
-              <Animated.View
-                testID={testID+"_Logo"}
-                style={_dynamicCustomComponentStyle(
-                      logoScale,
-                      logoOpacity,
-                      logoWidth,
-                      logoHeight
-                  )}>
-                {<LogoProgress />}
-              </Animated.View>
+  return <>
+      {!animationDone || !isLoaded ? <Portal>
+          <View style={[styles.container,{backgroundColor}]} testID={testID} id={testID}>
+            {<View style={[StyleSheet.absoluteFill,{backgroundColor}]} testID={testID+"_Animation"}/>}
+            <View style={styles.containerGlue} testID={testID+"_ContainerGlue"}>
+              {(
+                <Animated.View
+                  style={_staticBackground(logoOpacity, backgroundColor)}
+                  testID={testID+"_AnimationDone"}
+                />
+              )}
+              {(
+                React.isComponent(Component)? <Component testID={testID+"_CustomSplashComponent"}/> : 
+                <View testID={testID+"_LogoContainer"} style={[StyleSheet.absoluteFill,{backgroundColor}, styles.logoStyle]}>
+                    <Animated.View
+                      testID={testID+"_Logo"}
+                      style={_dynamicCustomComponentStyle(
+                            logoScale,
+                            logoOpacity,
+                            logoWidth,
+                            logoHeight
+                        )}>
+                      {<LogoProgress />}
+                    </Animated.View>
+                </View>
+              )}
+            </View>
           </View>
-        )}
-      </View>
-    </View>
-  </Portal>
+      </Portal> : null}
+  </>
 }