@fto-consult/expo-ui 8.14.1 → 8.14.3

package/package.json

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

package/src/App.js

@@ -13,8 +13,8 @@ import App from "./AppEntry";
  * }
  */
 
-export default function ExpoUIAppEntryProvider({children,withSplashScreen,init,...rest}){
+export default function ExpoUIAppEntryProvider({children,init,...rest}){
     return <Provider {...rest}>
-        <App withSplashScreen = {withSplashScreen} init={init} children={children}/>
+        <App init={init} children={children}/>
     </Provider>
 }

package/src/AppEntry/index.js

@@ -59,10 +59,10 @@ const NAVIGATION_PERSISTENCE_KEY = 'NAVIGATION_STATE';
  *  initialRouteName : la route initiale par défaut
  *  getStartedRouteName : la route par défaut de getStarted lorsque l'application est en mode getStarted, c'est à dire lorsque la fonction init renvoie une erreur (reject)
  */
-function App({init:initApp,initialRouteName:appInitialRouteName,children,withSplashScreen}) {
+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 {FontsIconsFilter,beforeExit,AppWrapper,preferences:appPreferences,navigation,getStartedRouteName,withSplashScreen,components:{MainProvider}} = useContext();
   const {containerProps} = navigation;
   const [initialState, setInitialState] = React.useState(undefined);
   const appReadyRef = React.useRef(true);
@@ -266,8 +266,9 @@ function App({init:initApp,initialRouteName:appInitialRouteName,children,withSpl
         />
   </NavigationContainer>  : null;
   const content = isLoaded ? typeof children == 'function'? children({children:child,appConfig,config:appConfig}) : child : null;
-  const SplashComponent = withSplashScreen === false ? React.Fragment : SplashScreen;
-  const splashProps = withSplashScreen === false ? {} : {isLoaded,Component:SplashScreenComponent};
+  const myChildren = <PreferencesContext.Provider value={preferences}>
+      {isLoaded ? React.isValidElement(content) && content || child : null}
+    </PreferencesContext.Provider>;
   return <SafeAreaProvider>
             <AppEntryRootView MainProvider={MainProvider} isInitialized={state.hasCallInitApp} isLoading={isLoading} hasGetStarted={hasGetStarted} isLoaded={isLoaded}>
                 <PaperProvider 
@@ -288,11 +289,11 @@ function App({init:initApp,initialRouteName:appInitialRouteName,children,withSpl
                     <DropdownAlert ref={notificationRef}/>
                     <ErrorBoundary>
                       <StatusBar/>
-                      <SplashComponent {...splashProps}>
-                        <PreferencesContext.Provider value={preferences}>
-                          {isLoaded ? React.isValidElement(content) && content || child : null}
-                        </PreferencesContext.Provider>  
-                      </SplashComponent>
+                      {withSplashScreen !== false ? <SplashScreen
+                        children = {myChildren}
+                        isLoaded = {isLoaded}
+                        Component = {SplashScreenComponent}
+                      /> : myChildren}
                     </ErrorBoundary>
                   </Portal.Host>
               </PaperProvider>