@fto-consult/expo-ui 8.13.0 → 8.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.13.0",
+  "version": "8.13.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",

package/src/AppEntry/index.js

@@ -15,6 +15,7 @@ import {set as setSession,get as getSession} from "$session";
 import { showConfirm } from "$ecomponents/Dialog";
 import {close as closePreloader, isVisible as isPreloaderVisible} from "$epreloader";
 import SplashScreen from "$ecomponents/SplashScreen";
+import {useAppComponent} from "$econtext/hooks";
 import {decycle} from "$cutils/json";
 import { setIsInitialized} from "$capp/utils";
 import {isObj,defaultObj,defaultStr} from "$cutils";
@@ -60,6 +61,7 @@ const NAVIGATION_PERSISTENCE_KEY = 'NAVIGATION_STATE';
  */
 function App({init:initApp,initialRouteName:appInitialRouteName,children}) {
   AppStateService.init();
+  const SplashScreenComponent = useAppComponent("SplashScreen");
   const {FontsIconsFilter,beforeExit,AppWrapper,preferences:appPreferences,navigation,getStartedRouteName,components:{MainProvider}} = useContext();
   const {containerProps} = navigation;
   const [initialState, setInitialState] = React.useState(undefined);
@@ -284,7 +286,7 @@ function App({init:initApp,initialRouteName:appInitialRouteName,children}) {
                     <DropdownAlert ref={notificationRef}/>
                     <ErrorBoundary>
                       <StatusBar/>
-                      <SplashScreen isLoaded={isLoaded}>
+                      <SplashScreen Component={SplashScreenComponent} isLoaded={isLoaded}>
                         <PreferencesContext.Provider value={preferences}>
                           {React.isValidElement(content) && content || child}
                         </PreferencesContext.Provider>  

package/src/components/SplashScreen/index.js

@@ -113,24 +113,26 @@ class AnimatedSplash extends React.Component {
         },
       ],
     }
-    const testID = defaultStr(testID,"RN_MainSplashScreen")
+    const testID = defaultStr(testID,"RN_MainSplashScreen");
+    const {Component} = this.props;
     return (
       <View testID={testID} style={[styles.container]}>
-        {!animationDone && <View style={StyleSheet.absoluteFill} />}
-        <View style={styles.containerGlue}>
+        {!animationDone && <View style={StyleSheet.absoluteFill} testID={`${testID}_AbsoluteFill`} />}
+        <View style={styles.containerGlue} testID={`${testID}_ContainerGlue`}>
           {!animationDone && (
             <Animated.View
+              testID={`${testID}_StaticBackground`}
               style={_staticBackground(logoOpacity, backgroundColor)}
             />
           )}
-          <Animated.View style={[!disableAppScale && appScale, opacityClearToVisible, styles.flex]}>
+          <Animated.View testID={`${testID}_ChildrenContainer`} style={[!disableAppScale && appScale, opacityClearToVisible, styles.flex]}>
             {this.renderChildren()}
           </Animated.View>
-          {!animationDone && (
-            <View style={[StyleSheet.absoluteFill, styles.logoStyle]}>
+          {!animationDone && (React.isComponent(Component)? <Component testID={testID+"_CustomSplashComponent"}/> : 
+            <View testID={`${testID}_AbsoluteFillContainer`} style={[StyleSheet.absoluteFill, styles.logoStyle]}>
               {<View testID={testID+"_LogoContainer"} style={[StyleSheet.absoluteFill,{backgroundColor}, styles.logoStyle]}>
                     <Animated.View
-                      testID={testID+"_Logo"}
+                      testID={testID+"_LogoProgressContainer"}
                       style={_dynamicCustomComponentStyle(
                             logoScale,
                             logoOpacity,