@fto-consult/expo-ui 6.31.8 → 6.31.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.31.8",
+  "version": "6.31.9",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {

package/src/components/Logo/index.js

@@ -1,3 +1,8 @@
-export {default} from "./Logo";
+import Logo from "./Logo";
 
-export {default as LogoProgress} from "./Progress";
+import LogoProgress from "./Progress";
+
+Logo.Progress = LogoProgress;
+export {LogoProgress};
+
+export default Logo;

package/src/context/Provider.js

@@ -36,7 +36,8 @@ import { prepareScreens } from "./TableData";
     },
     navigation : {
       screens : {Array}, les écrans de navigation,
-      drawerItems : {object|array|function}, la fonction permettant d'obtenir les items du drawer principal de l'application
+      drawerItems : {object|array|function}, la fonction permettant d'obtenir les items du drawer principal de l'application,
+      containerProps : {object}, les props à passer au composant NavigationContainer de react-navigation
     }
 */
 const Provider = ({children,getTableData,handleHelpScreen,navigation,components,convertFiltersToSQL,getStructData,tablesData,structsData,...props})=>{
@@ -124,6 +125,8 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,components,
       });
       return [...r,...getMainScreens(handleHelpScreen)];
     },[]);
+    navigation.containerProps = defaultObj(navigation.containerProps);
+    const {linking} = navigation;
     return <ExpoUIContext.Provider 
       value={{
         ...props,

package/src/index.js

@@ -40,6 +40,7 @@ import FontIcon from "$ecomponents/Icon/Font";
 import useContext from "$econtext/hooks";
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { StyleSheet } from "react-native";
+import Logo from "$ecomponents/Logo";
 export * from "./context";
 
 let MAX_BACK_COUNT = 1;
@@ -60,7 +61,8 @@ const NAVIGATION_PERSISTENCE_KEY = 'NAVIGATION_STATE';
  */
 function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount}) {
   AppStateService.init();
-  const {FontsIconsFilter,beforeExit,preferences:appPreferences,getStartedRouteName} = useContext();
+  const {FontsIconsFilter,beforeExit,preferences:appPreferences,navigation,getStartedRouteName} = useContext();
+  const {containerProps} = navigation;
   const [initialState, setInitialState] = React.useState(undefined);
   const appReadyRef = React.useRef(true);
   const [state,setState] = React.useState({
@@ -256,10 +258,14 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount})
   const child = isLoaded ? <NavigationContainer 
     ref={navigationRef}
     initialState={initialState}
-    onStateChange={(state) =>{
+    {...containerProps}
+    onStateChange={(state,...rest) =>{
       setSession(NAVIGATION_PERSISTENCE_KEY,decycle(state),false);
-    }
-  }
+      if(typeof containerProps.onStateChange =='function'){
+        containerProps.onStateChange(state,...rest);
+      }
+    }}
+    fallback = {React.isValidElement(containerProps.fallback) ? containerProps.fallback : <Logo.Progress/>}
   >
         <Navigation
           initialRouteName = {defaultStr(hasGetStarted ? appInitialRouteName : getStartedRouteName,"Home")}