@fto-consult/expo-ui 6.85.5 → 6.86.1

package/package.json

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

package/src/components/Datagrid/SWRDatagrid.js

@@ -166,6 +166,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const canHandleLimit = handleQueryLimit !== false && canHandlePagination ? true : false;
     const limitRef = React.useRef(!canHandleLimit ?0 : defaultNumber(getSessionData("limit"),500));
     const isInitializedRef = React.useRef(false);
+    const hasFetchedRef = React.useRef(false);
     testID = defaultStr(testID,"RNSWRDatagridComponent");
     const {error, isValidating,isLoading,data:result,refresh} = useSWR(fetchPath,{
         fetcher : (url,opts)=>{
@@ -193,10 +194,14 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             if(showProgressRef.current ===false){
                 opts.showError = false;
             }
+            const end = (a)=> {
+                hasFetchedRef.current = true;
+                return a;
+            };
             if(typeof fetcher =='function'){
-                return fetcher(url,opts);
+                return Promise.resolve(fetcher(url,opts)).then(end);
             }
-            return apiFetch(url,opts);
+            return apiFetch(url,opts).then(end);
         },
         swrOptions : getSWROptions(swrConfig.refreshTimeout)
     });
@@ -290,7 +295,9 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         });
     });
     React.useEffect(()=>{
-        showProgressRef.current = false;
+        if(hasFetchedRef.current){
+            showProgressRef.current = false;
+        }
     },[showProgressRef.current]);
     return (
         <Datagrid 
@@ -401,15 +408,15 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             beforeFetchData = {(args)=>{
                 let {fetchOptions:opts,force,renderProgressBar} = args;
                 opts = getFetchOptions({showError:showProgressRef.current,...opts});
-                isInitializedRef.current = true;
                 fetchOptionsRef.current = opts.fetchOptions;
                 opts.fetchOptions.withTotal = true;
                 sortRef.current = opts.fetchOptions.sort;
+                isInitializedRef.current = true;
                 if(force){
                     pageRef.current = firstPage;
                 }
                 if(typeof beforeFetchData =="function" && beforeFetchData(args)==false) return;
-                doRefresh(typeof renderProgressBar =='boolean'? renderProgressBar : force);
+                doRefresh(typeof renderProgressBar =='boolean'? renderProgressBar : showProgressRef.current);
                 return false;
             }}
             isSWRDatagrid

package/src/context/Provider.js

@@ -72,7 +72,7 @@ Object.map(Utils,(v,i)=>{
     
     navigation : {
       screens : {Array}, les écrans de navigation,
-      screenOptions : {object}, les options du composant Stack.Navigator, voir https://reactnavigation.org/docs/native-stack-navigator/
+      screenOptions : {object|function}, les options du composant Stack.Navigator, voir https://reactnavigation.org/docs/native-stack-navigator/
       drawerItems : {object|array|function}, la fonction permettant d'obtenir les items du drawer principal de l'application, Chaque item du drawer doit avoir la chaine drawerSection, chaine de caractère determinant le code de la section dans lequel l'afficher
       drawerSections : {object : {
           [key{string}]:{string}} |
@@ -165,7 +165,7 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
           APP.off(APP.EVENTS.GO_ONLINE,callback);
         }
       }
-    },swrConfig);
+    },swrConfig,{refreshTimeout:swrRefreshTimeout});
     if(parseMangoQueries !== undefined){
       appConfig.set("parseMangoQueries",parseMangoQueries);
     }

package/src/context/utils.js

@@ -1,2 +1,2 @@
 
-export const SWR_REFRESH_TIMEOUT = 5000*60;
+export const SWR_REFRESH_TIMEOUT = 2500*60;

package/src/navigation/Stack.js

@@ -1,7 +1,9 @@
 //import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import { createStackNavigator } from '@react-navigation/stack';
+import { createStackNavigator,CardStyleInterpolators } from '@react-navigation/stack';
 
 export const Stack = createStackNavigator()
 //export const Stack = createNativeStackNavigator();
 
-export default Stack;
+export default Stack;
+
+export {CardStyleInterpolators};

package/src/navigation/index.js

@@ -6,7 +6,8 @@ import DrawerNavigator from "./Drawer";
 import useContext from "$econtext/hooks";
 import { MainNavigationProvider } from "./hooks";
 import {isWeb,isAndroid} from "$cplatform";
-import Stack from "./Stack";
+import Stack,{CardStyleInterpolators} from "./Stack";
+import {extendObj,defaultObj} from "$cutils";
 import theme from "$theme";;
 
 export * from "./hooks";
@@ -18,11 +19,9 @@ export * from "./utils";
 */
 export default function NavigationComponent (props){
     let {state,hasGetStarted,isLoading,onGetStart,initialRouteName,...rest} = props;
-    if(isLoading) return null;
+    const cardStyleInterpolator = isAndroid() ? CardStyleInterpolators.forFadeFromBottomAndroid : CardStyleInterpolators.forHorizontalIOS;
     const {navigation:{screens,screenOptions}} = useContext();
-    const allScreens = initScreens({Factory:Stack,screens,ModalFactory:Stack,filter:({name})=>{
-        return true;
-    }});
+    const allScreens = initScreens({Factory:Stack,screens,ModalFactory:Stack});
     initialRouteName = sanitizeName(initialRouteName);
     const drawerScreens = handleContent({screens:allScreens,onGetStart,hasGetStarted,initialRouteName,state,Factory:Stack});
     const stackScreens = handleContent({screens:allScreens.modals,onGetStart,hasGetStarted,initialRouteName,state,Factory:Stack});
@@ -30,13 +29,19 @@ export default function NavigationComponent (props){
        console.error("apps will stuck on splash screen because any valid screen has been found on screens ",allScreens);
     }
     setInitialRouteName(initialRouteName);
-    const opts = {
-        headerShown : false,
-        header : ()=> null,
-        headerStyle: { backgroundColor: theme.colors.primary},
-        presentation : isAndroid() || isWeb()? "modal":"default",
-        animationEnabled : !isWeb(),
-        ...Object.assign({},screenOptions)
+    const getScreenOptions = (options,opt2)=>{
+        const sOptions = defaultObj(typeof screenOptions =='function'? screenOptions(options) : screenOptions);
+        const {navigation} = options;
+        return extendObj(true,{},{
+            headerShown : false,
+            header : ()=> null,
+            headerStyle: { backgroundColor: theme.colors.primary},
+            presentation : isAndroid() || isWeb()? "modal":"default",
+            animationEnabled : !isWeb(),
+            detachPreviousScreen: !navigation.isFocused(),
+            cardStyleInterpolator,
+            ...defaultObj(opt2),
+        },sOptions);
     }
     const cardStyle = { backgroundColor: 'transparent' };
     if(isWeb()){
@@ -46,18 +51,19 @@ export default function NavigationComponent (props){
         <DrawerNavigator {...props}>
             {<Stack.Navigator 
                 initialRouteName={initialRouteName} 
-                screenOptions={opts}
+                screenOptions={getScreenOptions}
             >
-                    {<Stack.Group screenOptions={{...opts}}>
+                    {<Stack.Group>
                         {drawerScreens}
                     </Stack.Group>}
                     <Stack.Group
                         key = {"MODAL-DRAWERS-SCREENS"}
-                        screenOptions={{
-                            ...opts,
-                            presentation :"transparentModal",
-                            cardStyle,
-                            animationEnabled : true,
+                        screenOptions={function(options){
+                            return getScreenOptions(options,{
+                                presentation :"transparentModal",
+                                cardStyle,
+                                animationEnabled : true,
+                            })
                         }}
                     >
                         {stackScreens}

package/src/screens/index.js

@@ -7,7 +7,7 @@ export * from "./mainScreens";
 
 export * from "./utils";
 
-export const handleScreen = ({Screen,Factory,ModalFactory,result,filter,index})=>{
+export const handleScreen = ({Screen,Factory,ModalFactory,result,index})=>{
     result = defaultObj(result);
     result.screens = defaultObj(result.screens);
     result.groups = defaultObj(result.groups);
@@ -17,7 +17,7 @@ export const handleScreen = ({Screen,Factory,ModalFactory,result,filter,index})=
     let screenOptions = undefined;
     if(Array.isArray(Screen)){
         Screen.map((S,i)=>{
-            return handleScreen({Screen:S,Factory,ModalFactory,result,groups,filter,index:i});
+            return handleScreen({Screen:S,Factory,ModalFactory,result,groups,index:i});
         })
     } else if(typeof Screen ==='object' && React.isComponent(Screen.Component) && isNonNullString(Screen.screenName)){
         screenName = Screen.screenName;
@@ -37,11 +37,7 @@ export const handleScreen = ({Screen,Factory,ModalFactory,result,filter,index})=
         if(isNonNullString(screenName)){
             let name = screenName;
             const sanitizedName = sanitizeName(screenName);
-            let extra = filter({Screen,name,sanitizedName}),
-            authRequired = typeof Screen.authRequired =="boolean"? Screen.authRequired : true;
-            if(extra ===false){
-                return null;
-            }
+            let authRequired = typeof Screen.authRequired =="boolean"? Screen.authRequired : true;
             ///le groupe d'écran par défaut
             let groupName = Screen.Start ||Screen.start ? GROUP_NAMES.START : authRequired === false ? GROUP_NAMES.PUBLIC : GROUP_NAMES.PRIVATE;
             if(!GROUP_NAMES[groupName]){
@@ -83,7 +79,6 @@ export const handleScreen = ({Screen,Factory,ModalFactory,result,filter,index})=
                 }
                 options.elevation = typeof options.elevation =='number'? options.elevation : typeof Screen.elevation =='number'? Screen.elevation : undefined;
                 options.back = args.navigation.canGoBack();
-                options.extra = defaultObj(extra);
                 options.isModal = options.Modal = Screen.isModalScreen;
                 return options;
             }} component = {ScreenWrapper}/>);
@@ -106,17 +101,15 @@ export const handleScreen = ({Screen,Factory,ModalFactory,result,filter,index})=
             
         groups : {} : la liste des différents groupes d'écrans rendus par la méthode
  */
-export default function initScreens ({Factory,ModalFactory,screens,result,filter}){
+export default function initScreens ({Factory,ModalFactory,screens,result}){
     if(!isArray(screens) || !screens.length){
         screens = [];
     }
     result = defaultObj(result);
     result.screens = defaultObj(result.screens);
     result.groups = defaultObj(result.groups);
-    ///lorsque les écrans sont passés enparamètres, par défaut, le wrapper withTheme n'est pas utilisé
-    filter = typeof filter =="function" ? filter : x=> true;
     defaultArray(screens).map((Screen,index)=>{
-        handleScreen({Screen,result,Factory,ModalFactory,filter,index})
+        handleScreen({Screen,result,Factory,ModalFactory,index})
     });
     return result;
 }