@fto-consult/expo-ui 6.67.15 → 6.68.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.67.15",
+  "version": "6.68.0",
   "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.58.0",
+    "@fto-consult/common": "^3.58.1",
     "@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/index.js

@@ -1,174 +1,334 @@
-import '$session';
-import React from 'react';
-import {SWRConfig} from "$swr";
-import App from './App';
-import notify  from "$notify";
-import APP from "$app";
-import {isMobileNative} from "$cplatform";
-import {setDeviceIdRef} from "$capp";
-import {showPrompt} from "$ecomponents/Dialog/confirm";
-import { AppState } from 'react-native'
-import {canFetchOffline} from "$capi/utils";
-import {defaultNumber} from "$cutils";
-import { timeout as SWR_REFRESH_TIMEOUT} from '$ecomponents/Datagrid/SWRDatagrid';
+import React from "$react"
+import { AppState} from "react-native";
+import BackHandler from "$ecomponents/BackHandler";
+import * as Linking from 'expo-linking';
+import APP from "$capp";
+import {AppStateService,trackIDLE,stop as stopIDLE} from "$capp/idle";
+import { NavigationContainer} from '@react-navigation/native';
+import {navigationRef} from "$cnavigation"
+import NetInfo from '$cutils/NetInfo';
+import Auth from "$cauth";
+import {isNativeMobile,isElectron} from "$cplatform";
+import Navigation from "../navigation";
+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 {decycle} from "$cutils/json";
+import init from "$capp/init";
+import { setIsInitialized} from "$capp/utils";
+import {isObj,isNonNullString,isPromise,defaultObj,defaultStr} from "$cutils";
+import {loadFonts} from "$ecomponents/Icon/Font";
+import appConfig from "$capp/config";
+import Preloader from "$preloader";
+import {PreloaderProvider} from "$epreloader";
+import BottomSheetProvider from "$ecomponents/BottomSheet/Provider";
+import DialogProvider from "$ecomponents/Dialog/Provider";
+import SimpleSelect from '$ecomponents/SimpleSelect';
+import {Provider as AlertProvider} from '$ecomponents/Dialog/confirm/Alert';
+import { DialogProvider as FormDataDialogProvider } from '$eform/FormData';
+import ErrorBoundaryProvider from "$ecomponents/ErrorBoundary/Provider";
+import notify, {notificationRef} from "$notify";
+import DropdownAlert from '$ecomponents/Dialog/DropdownAlert';
+import { PreferencesContext } from '../Preferences';
+import ErrorBoundary from "$ecomponents/ErrorBoundary";
+import  {updateTheme,defaultTheme} from "$theme";
+import StatusBar from "$ecomponents/StatusBar";
+import {Provider as PaperProvider,Portal } from 'react-native-paper';
+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";
+import AppEntryRootView from "./RootView";
+import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { Dimensions,Keyboard } from 'react-native';
 import {isTouchDevice} from "$platform";
-import * as Utils from "$cutils";
-import {useContext} from "$econtext/hooks";
-import appConfig from "$capp/config";
-import { useKeepAwake } from 'expo-keep-awake';
 
-Object.map(Utils,(v,i)=>{
-  if(typeof v =='function' && typeof window !='undefined' && window && !window[i]){
-     window[i] = v;
-  }
-});
 
-export default function getIndex({render,init}){
-    const {swrConfig} = useContext();
-    const isScreenFocusedRef = React.useRef(true);
-    isMobileNative() && useKeepAwake();
-    ///garde pour chaque écran sa date de dernière activité
-    const screensRef = React.useRef({});//la liste des écrans actifs
-    const activeScreenRef = React.useRef('');
-    const prevActiveScreenRef = React.useRef('');
-    const appStateRef = React.useRef({});
-    const isKeyboardOpenRef = React.useRef(false);
-    React.useEffect(()=>{
-        ///la fonction de rappel lorsque le composant est monté
-        const onScreenFocus = ({sanitizedName})=>{
-            prevActiveScreenRef.current = activeScreenRef.current;
-            if(activeScreenRef.current){
-               screensRef.current[activeScreenRef.current] = null;
-            }
-            screensRef.current[sanitizedName] = new Date();
-            activeScreenRef.current = sanitizedName;
-            isScreenFocusedRef.current = true;
-        }, onScreenBlur = ()=>{
-          isScreenFocusedRef.current = false;
-        }
-        APP.on(APP.EVENTS.SCREEN_FOCUS,onScreenFocus);
-        APP.on(APP.EVENTS.SCREEN_BLUR,onScreenBlur);
-        const triggerKeyboardToggle = (status)=>{
-          APP.trigger(APP.EVENTS.KEYBOARD_DID_TOGGLE,{shown:status,status,visible:status,hide : !status});
-        }
-        const keyBoardDidShow = ()=>{
-          APP.trigger(APP.EVENTS.KEYBOARD_DID_SHOW);
-          triggerKeyboardToggle(true);
-        },keyBoardDidHide = ()=>{
-          APP.trigger(APP.EVENTS.KEYBOARD_DID_HIDE);
-          triggerKeyboardToggle(false);
-        }
-        const keyBoardDidShowListener = Keyboard.addListener("keyboardDidShow",keyBoardDidShow);
-        const keyBoardDidHideListener = Keyboard.addListener("keyboardDidHide",keyBoardDidHide);
-        const listener = isTouchDevice() && typeof window !=='undefined' && window && window.visualViewport && typeof window.visualViewport.addEventListener =='function'? 
-          () => {
-            const minKeyboardHeight = 300;
-            const screen = Dimensions.get("screen");
-            const newState = screen.height - minKeyboardHeight > window.visualViewport.height
-            if (isKeyboardOpenRef.current != newState) {
-                isKeyboardOpenRef.current = newState;
-                newState ? keyBoardDidShow() : keyBoardDidHide();
+let MAX_BACK_COUNT = 1;
+let countBack = 0;
+let isBackConfirmShowing = false;  
+
+const resetExitCounter = ()=>{
+  countBack = 0
+  isBackConfirmShowing = false;
+};
+
+const NAVIGATION_PERSISTENCE_KEY = 'NAVIGATION_STATE';
+
+/****
+ *  init {function}: ()=>Promise<{}> est la fonction d'initialisation de l'application
+ *  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,render}) {
+  AppStateService.init();
+  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({
+     isLoading : true,
+     isInitialized:false,
+     hasCallInitApp : false,
+  });
+   React.useEffect(() => {
+      ///la fonction de rappel lorsque le composant est monté
+      const triggerKeyboardToggle = (status)=>{
+        APP.trigger(APP.EVENTS.KEYBOARD_DID_TOGGLE,{shown:status,status,visible:status,hide : !status});
+      }
+      const keyBoardDidShow = ()=>{
+        APP.trigger(APP.EVENTS.KEYBOARD_DID_SHOW);
+        triggerKeyboardToggle(true);
+      },keyBoardDidHide = ()=>{
+        APP.trigger(APP.EVENTS.KEYBOARD_DID_HIDE);
+        triggerKeyboardToggle(false);
+      }
+      const keyBoardDidShowListener = Keyboard.addListener("keyboardDidShow",keyBoardDidShow);
+      const keyBoardDidHideListener = Keyboard.addListener("keyboardDidHide",keyBoardDidHide);
+      const loadResources = ()=>{
+         return new Promise((resolve)=>{
+            loadFonts(FontsIconsFilter).catch((e)=>{
+              console.warn(e," ierror loading app resources fonts");
+            }).finally(()=>{
+              resolve(true);
+            });
+         })
+      }
+      const restoreState = () => {
+       return new Promise((resolve,reject)=>{
+          (async ()=>{
+            try {
+              const initialUrl = await Linking.getInitialURL();
+              if (isNativeMobile() || initialUrl === null) {
+                const savedState = getSession(NAVIGATION_PERSISTENCE_KEY);
+                if (isObj(savedState)) {
+                  setInitialState(savedState);
+                }
+              }
+            } catch(e){ console.log(e," is state error")}
+            finally { 
+                appReadyRef.current = true;
+                resolve({});
             }
-        } : undefined;
-        if(listener){
-            window.visualViewport.addEventListener('resize', listener);
-        }
-        return ()=>{
-          APP.off(APP.EVENTS.SCREEN_FOCUS,onScreenFocus);
-          APP.off(APP.EVENTS.SCREEN_BLUR,onScreenBlur);
-          keyBoardDidShowListener && keyBoardDidShowListener.remove && keyBoardDidShowListener.remove();
-          keyBoardDidHideListener && keyBoardDidHideListener.remove && keyBoardDidHideListener.remove();
-          if(listener){
-            window.visualViewport.removeEventListener('resize', listener);
+          })();
+       });
+    };
+    const subscription = AppState.addEventListener('change', AppStateService.getInstance().handleAppStateChange);
+    const beforeExitApp = (cb)=>{
+       return new Promise((resolve,reject)=>{
+          Preloader.closeAll();
+          showConfirm({
+              title : "Quitter l'application",
+              message : 'Voulez vous vraiment quitter l\'application?',
+              yes : 'Oui',
+              no : 'Non',
+              onSuccess : ()=>{
+                const foreceExit = ()=>{
+                  BackHandler.exitApp();
+                    if(isElectron() && window.ELECTRON && typeof ELECTRON.exitApp =='function'){
+                        ELECTRON.exitApp({APP});
+                    }
+                }
+                const exit = ()=>{
+                  if(typeof beforeExit =='function'){
+                     const r2 = beforeExit()
+                     if(!isPromise(r2)){
+                        throw {message:'La fonction before exit du contexte doit retourner une promesse',returnedResult:r2}
+                     }
+                     return r2.then(foreceExit).catch(reject);
+                  }
+                  foreceExit();
+                }
+                const r = {APP,exit};
+                APP.trigger(APP.EVENTS.BEFORE_EXIT,exit,(result)=>{
+                  if(isObj(result) || Array.isArray(result)){
+                    for(let ik in result){
+                       if(result[ik] === false) return reject({message:'EXIT APP DENIED BY BEFORE EXIT EVENT HANDLER AT POSITON {0}'.sprintf(ik)});
+                    }
+                  }
+                  resolve(r);
+                  if(typeof cb =='function'){
+                     cb(r);
+                  }
+                });
+              },
+              onCancel : reject
+          })
+       })
+    }
+    /**** onBeforeExit prend en paramètre la fonction de rappel CB, qui lorsque la demande de sortie d'application est acceptée, alors elle est exécutée */
+    if(typeof APP.beforeExit !=='function'){
+      Object.defineProperties(APP,{
+         beforeExit : {
+            value : beforeExitApp,
+         }
+      })
+    }
+    const backAction = (args) => {
+      if(navigationRef && navigationRef.canGoBack()? true : false){
+          resetExitCounter();
+          navigationRef.goBack(null);
+          return false;
+      }
+      if(isBackConfirmShowing) {
+        return;
+      }
+      if(countBack < MAX_BACK_COUNT){
+          countBack++;
+          isBackConfirmShowing = false;
+          if(countBack === MAX_BACK_COUNT){
+              notify.toast({text:'Cliquez à nouveau pour quiiter l\'application'});
           }
-          if(typeof onUnmount =='function'){
-             onUnmount();
+          if(countBack === 2 && isPreloaderVisible()) {
+              closePreloader();
           }
+          return false;
+      }
+      isBackConfirmShowing = true;
+      return beforeExitApp().finally(x=>{
+        isBackConfirmShowing = false;
+      }).then(({exit})=>{
+          exit();
+      })
+    };
+    const unsubscribeNetInfo = NetInfo.addEventListener(state => {
+        APP.setOnlineState(state);
+    });
+    NetInfo.fetch().catch((e)=>{
+      console.log(e," is net info heinn")
+    });
+    loadResources().finally(()=>{
+      (typeof initApp =='function'?initApp : init)({appConfig,contex:{setState}}).then((args)=>{
+        if(Auth.isLoggedIn()){
+           Auth.loginUser(false);
         }
-    },[])
-      
-    return (
-      <SWRConfig 
-        value={{
-          ...swrConfig,
-          provider: () => new Map(),
-          isOnline() {
-            /* Customize the network state detector */
-            if(canFetchOffline) return true;
-            return APP.isOnline();
-          },
-          isVisible() {
-            const screen = activeScreenRef.current;
-            if(!screen) return false;
-            if(!screensRef.current[screen]){
-               screensRef.current[screen] = new Date();
-               return false;
-            }
-            const date = screensRef.current[screen];
-            const diff = new Date().getTime() - date.getTime();
-            const timeout = defaultNumber(swrConfig.refreshTimeout,SWR_REFRESH_TIMEOUT)
-            screensRef.current[screen] = new Date();
-            return diff >= timeout ? true : false;
-          },
-          initFocus(callback) {
-            let appState = AppState.currentState
-            const onAppStateChange = (nextAppState) => {
-              /* If it's resuming from background or inactive mode to active one */
-              const active = appState.match(/inactive|background/) && nextAppState === 'active';
-              if (active) {
-                callback()
-              }
-              appState = nextAppState;
-              appStateRef.current = !!active;
-            }
-            // Subscribe to the app state change events
-            const subscription = AppState.addEventListener('change', onAppStateChange);
-            return () => {
-              subscription?.remove()
-            }
-          },
-          initReconnect(cb) {
-            const callback = ()=>{
-              cb();
-            }
-            /* Register the listener with your state provider */
-            APP.on(APP.EVENTS.GO_ONLINE,callback);
-            return ()=>{
-              APP.off(APP.EVENTS.GO_ONLINE,callback);
-            }
-          }
-        }}
-      >
-       <App init={init} render={render}/>
-      </SWRConfig>
-    );
-};
+        setState({
+          ...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,hasCallInitApp,isLoading : false,hasGetStarted:false});
+      })
+    });
 
-setDeviceIdRef.current = ()=>{
-  return new Promise((resolve,reject)=>{
-    showPrompt({
-      title : 'ID unique pour l\'appareil',
-      maxLength :  30,
-      defaultValue : appConfig.getDeviceId(),
-      yes : 'Définir',
-      placeholder : isMobileNative()? "":'Entrer une valeur unique sans espace SVP',
-      no : 'Annuler',
-      onSuccess : ({value})=>{
-        let message = null;
-        if(!value || value.contains(" ")){
-          message = "Merci d'entrer une valeur non nulle ne contenant pas d'espace";
+    const Events = {}
+    let events = [];
+    if(navigationRef && navigationRef.addListener){
+        for(let i in Events){
+          events.push(navigationRef.addListener(i,Events[i]));
         }
-        if(value.length > 30){
-          message = "la valeur entrée doit avoir au plus 30 caractères";
+    }
+    APP.onElectron("BEFORE_EXIT",()=>{
+      return beforeExitApp().then(({exit})=>{
+        exit();
+      })
+    });
+    APP.on(APP.EVENTS.BACK_BUTTON,backAction);
+    return () => {
+        keyBoardDidShowListener && keyBoardDidShowListener.remove && keyBoardDidShowListener.remove();
+        keyBoardDidHideListener && keyBoardDidHideListener.remove && keyBoardDidHideListener.remove();
+        if(listener){
+          window.visualViewport.removeEventListener('resize', listener);
         }
-        if(message){
-          notify.error(message);
-          return reject({message})
+        APP.off(APP.EVENTS.BACK_BUTTON,backAction);
+        if(subscription && subscription.remove){
+          subscription.remove();
         }
-        resolve(value);
-        notify.success("la valeur ["+value+"] a été définie comme identifiant unique pour l'application instalée sur cet appareil");
+        events.map((ev)=>{
+          if(typeof ev =="function") ev();
+        })
+        unsubscribeNetInfo();
+        stopIDLE(false,true);
+        
+    }   
+  }, []);
+  const {isInitialized} = state;
+  const isLoading = state.isLoading || !isInitialized || !appReadyRef.current? true : false;
+    React.useEffect(()=>{
+      if(isInitialized){
+          setIsInitialized(true);
+          trackIDLE(true);
       }
-    })
-  })
-}
+  },[isInitialized]);
+  const hasGetStarted = state.hasGetStarted !== false? true : false;
+  const themeRef = React.useRef(null);
+  const [theme,setTheme] = React.useState(themeRef.current || updateTheme(defaultTheme));
+  themeRef.current = theme;
+    const updatePreferenceTheme = (customTheme,persist)=>{
+      setTheme(updateTheme(customTheme));
+    };
+    const forceRender = React.useForceRender();
+    const pref = typeof appPreferences =='function'? appPreferences({setTheme,forceRender,updateTheme:updatePreferenceTheme}) : appPreferences;
+    const preferences = React.useMemo(()=>({
+        updateTheme:updatePreferenceTheme,
+        theme,
+        ...defaultObj(pref),
+    }),[theme,pref]);
+  const isLoaded = !isLoading && state.hasCallInitApp;
+  const child = isLoaded ? <NavigationContainer 
+    ref={navigationRef}
+    initialState={initialState}
+    {...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")}
+          state = {state}
+          hasGetStarted = {hasGetStarted}
+          isInitialized = {isInitialized}
+          onGetStart = {(e)=>{
+            setState({...state,hasGetStarted:true})
+          }}
+        />
+  </NavigationContainer>  : null;
+  const content = null//isLoaded ? typeof render == 'function'? render({children:child,appConfig,config:appConfig}) : child : null;
+  return <SafeAreaProvider>
+            <GestureHandlerRootView testID={"RN_MainAppGestureHanleRootView"}  style={styles.gesture}>
+                <AppEntryRootView>
+                    <PaperProvider 
+                      theme={theme}
+                      settings={{
+                        icon: (props) => {
+                          return <FontIcon {...props}/>
+                        },
+                      }}
+                    >
+                      <Portal.Host testID="RN_NativePaperPortalHost">
+                        <ErrorBoundaryProvider/>  
+                        <PreloaderProvider/>   
+                        <DialogProvider responsive testID={"RN_MainAppDialogProvider"}/>
+                        <AlertProvider SimpleSelect={SimpleSelect}/>
+                        <FormDataDialogProvider/>  
+                        <BottomSheetProvider/>
+                        <DropdownAlert ref={notificationRef}/>
+                        <ErrorBoundary>
+                          <StatusBar/>
+                          <SplashScreen isLoaded={isLoaded}>
+                            <PreferencesContext.Provider value={preferences}>
+                              {React.isValidElement(content) && content || child}
+                            </PreferencesContext.Provider>  
+                          </SplashScreen>
+                        </ErrorBoundary>
+                      </Portal.Host>
+                  </PaperProvider>
+                </AppEntryRootView>
+            </GestureHandlerRootView>
+   </SafeAreaProvider>
+}
+
+export default App;
+
+const styles = StyleSheet.create({
+  gesture : {
+    flex : 1,
+    flexGrow : 1,
+  }
+});

package/src/components/Datagrid/SWRDatagrid.js

@@ -25,6 +25,7 @@ import {getRowsPerPagesLimits} from "./Common/utils";
 import PropTypes from "prop-types";
 import {Menu} from "$ecomponents/BottomSheet";
 import session from "$session";
+import { SWR_REFRESH_TIMEOUT } from "$econtext/utils";
 import useContext from "$econtext/hooks";
 import notify from "$cnotify";
 
@@ -46,15 +47,13 @@ export const setSessionData = (key,value)=>{
 }
 
 
-
-export const timeout = 5000*60;//5 minutes
 /***@see : https://swr.vercel.app/docs/api */
 
 export const getSWROptions = (defTimeout)=>{
-    const delay = defaultNumber(defTimeout,timeout);
+    const delay = defaultNumber(defTimeout,SWR_REFRESH_TIMEOUT);
     return {
         dedupingInterval : delay,
-        errorRetryInterval : Math.max(delay*2,timeout),
+        errorRetryInterval : Math.max(delay*2,SWR_REFRESH_TIMEOUT),
         errorRetryCount : 5,
         revalidateOnMount : false,//enable or disable automatic revalidation when component is mounted
         revalidateOnFocus : true, //automatically revalidate when window gets focused (details)

package/src/components/SplashScreen/index.js

@@ -27,13 +27,12 @@ const SplashScreenComponent = ({isLoaded,children , duration, delay,logoWidth,lo
     loadingProgress: new Animated.Value(0),
   });
   const { loadingProgress, animationDone} = state;
+  const prevIsLoaded = React.usePrevious(isLoaded); 
   React.useEffect(()=>{
-    if(!isLoaded){
-      setState({...state,loadingProgress : new Animated.Value(0),animationDone:false});
-    } else {
+    if(isLoaded && !prevIsLoaded){
       Animated.timing(loadingProgress, {
           toValue: 100,
-          duration: duration || 5000,
+          duration: duration || 100,
           delay: delay || 0,
           useNativeDriver: isNativeMobile(),
       }).start(() => {
@@ -43,7 +42,7 @@ const SplashScreenComponent = ({isLoaded,children , duration, delay,logoWidth,lo
           })
       })
     }
-  },[isLoaded]);
+  });
   testID = defaultStr(testID,"RN_SplashscreenComponent")
   logoWidth = defaultDecimal(logoWidth,150);
   logoHeight = defaultDecimal(logoHeight,250);
@@ -67,7 +66,7 @@ const SplashScreenComponent = ({isLoaded,children , duration, delay,logoWidth,lo
       extrapolate: "clamp",
     }),
   }
-  if(animationDone && isLoaded){
+  if(isLoaded && animationDone){
       return React.isValidElement(children)?children:null;
   }
   return <>

package/src/context/Provider.js

@@ -4,7 +4,7 @@ import {MD3LightTheme,MD3DarkTheme} from "react-native-paper";
 import { useMaterial3Theme,isDynamicThemeSupported} from '@pchmn/expo-material3-theme';
 import { useColorScheme } from 'react-native';
 import {colorsAlias,Colors} from "$theme";
-import {isObj,isNonNullString,defaultStr,extendObj} from "$cutils";
+import {isObj,isNonNullString,defaultStr,extendObj,defaultNumber} from "$cutils";
 import {getMainScreens} from "$escreens/mainScreens";
 import {ExpoUIContext} from "./hooks";
 import {enableAuth,disableAuth} from "$cauth/perms";
@@ -15,6 +15,22 @@ import { prepareScreens } from "./TableData";
 import {extendFormFields} from "$ecomponents/Form/Fields";
 import {AuthProvider} from '$cauth';
 import { signInRef } from "$cauth/authSignIn2SignOut";
+import APP from "$capp/instance";
+import { AppState } from 'react-native'
+import {canFetchOffline} from "$capi/utils";
+import { SWR_REFRESH_TIMEOUT } from "./utils";
+import * as Utils from "$cutils";
+import {setDeviceIdRef} from "$capp";
+import {isMobileNative} from "$cplatform";
+import notify from "$cnotify";
+import {showPrompt} from "$ecomponents/Dialog/confirm";
+import {SWRConfig} from "$swr";
+
+Object.map(Utils,(v,i)=>{
+  if(typeof v =='function' && typeof window !='undefined' && window && !window[i]){
+     window[i] = v;
+  }
+});
 
 /*****
     les utilitaires disponibles à passer au provider : 
@@ -64,6 +80,7 @@ import { signInRef } from "$cauth/authSignIn2SignOut";
     realm : {}, //les options de configurations de la base de données realmdb
 */
 const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,auth:cAuth,components:cComponents,convertFiltersToSQL,getStructData,tablesData,structsData,...props})=>{
+    require('$session');///initializing session
     const {extendAppTheme} = appConfig;
     const { theme : pTheme } = useMaterial3Theme();
     navigation = defaultObj(navigation);
@@ -82,7 +99,62 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
     appConfig.structsData = appConfig.structsData = isObj(structsData)? structsData : null;
     getTableData = appConfig.getTable = appConfig.getTableData = getTableOrStructDataCall(tablesData,getTableData);
     getStructData = appConfig.getStructData = getTableOrStructDataCall(structsData,getStructData);
-    swrConfig = defaultObj(swrConfig);
+    
+    ///swr config settings
+    ///garde pour chaque écran sa date de dernière activité
+    const screensRef = React.useRef({});//la liste des écrans actifs
+    const isScreenFocusedRef = React.useRef(true);
+    const activeScreenRef = React.useRef('');
+    const prevActiveScreenRef = React.useRef('');
+    const appStateRef = React.useRef({});
+    const swrRefreshTimeout = defaultNumber(swrConfig?.refreshTimeout,SWR_REFRESH_TIMEOUT)
+    swrConfig = extendObj({
+      provider: () => new Map(),
+      isOnline() {
+        /* Customize the network state detector */
+        if(canFetchOffline) return true;
+        return APP.isOnline();
+      },
+      isVisible() {
+        const screen = activeScreenRef.current;
+        if(!screen) return false;
+        if(!screensRef.current[screen]){
+           screensRef.current[screen] = new Date();
+           return false;
+        }
+        const date = screensRef.current[screen];
+        const diff = new Date().getTime() - date.getTime();
+        screensRef.current[screen] = new Date();
+        return diff >= swrRefreshTimeout ? true : false;
+      },
+      initFocus(callback) {
+        let appState = AppState.currentState
+        const onAppStateChange = (nextAppState) => {
+          /* If it's resuming from background or inactive mode to active one */
+          const active = appState.match(/inactive|background/) && nextAppState === 'active';
+          if (active) {
+            callback()
+          }
+          appState = nextAppState;
+          appStateRef.current = !!active;
+        }
+        // Subscribe to the app state change events
+        const subscription = AppState.addEventListener('change', onAppStateChange);
+        return () => {
+          subscription?.remove()
+        }
+      },
+      initReconnect(cb) {
+        const callback = ()=>{
+          cb();
+        }
+        /* Register the listener with your state provider */
+        APP.on(APP.EVENTS.GO_ONLINE,callback);
+        return ()=>{
+          APP.off(APP.EVENTS.GO_ONLINE,callback);
+        }
+      }
+    },swrConfig);
     if(convertFiltersToSQL !== undefined){
       appConfig.set("convertFiltersToSQL",convertFiltersToSQL);
     }
@@ -158,6 +230,36 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
           }
         }
     }
+    /**** setDeviceRef */
+    setDeviceIdRef.current = ()=>{
+      return new Promise((resolve,reject)=>{
+        showPrompt({
+          title : 'ID unique pour l\'appareil',
+          maxLength :  30,
+          defaultValue : appConfig.getDeviceId(),
+          yes : 'Définir',
+          placeholder : isMobileNative()? "":'Entrer une valeur unique sans espace SVP',
+          no : 'Annuler',
+          onSuccess : ({value})=>{
+            let message = null;
+            if(!value || value.contains(" ")){
+              message = "Merci d'entrer une valeur non nulle ne contenant pas d'espace";
+            }
+            if(value.length > 30){
+              message = "la valeur entrée doit avoir au plus 30 caractères";
+            }
+            if(message){
+              notify.error(message);
+              return reject({message})
+            }
+            resolve(value);
+            notify.success("la valeur ["+value+"] a été définie comme identifiant unique pour l'application instalée sur cet appareil");
+          }
+        })
+      })
+    }
+    
+    
     const {screens} = navigation;
     navigation.screens = React.useMemo(()=>{
        const r = prepareScreens({
@@ -170,6 +272,25 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
     },[]);
     navigation.containerProps = defaultObj(navigation.containerProps);
     const {linking} = navigation;
+    React.useEffect(()=>{
+      const onScreenFocus = ({sanitizedName})=>{
+          prevActiveScreenRef.current = activeScreenRef.current;
+          if(activeScreenRef.current){
+             screensRef.current[activeScreenRef.current] = null;
+          }
+          screensRef.current[sanitizedName] = new Date();
+          activeScreenRef.current = sanitizedName;
+          isScreenFocusedRef.current = true;
+      }, onScreenBlur = ()=>{
+        isScreenFocusedRef.current = false;
+      }
+      APP.on(APP.EVENTS.SCREEN_FOCUS,onScreenFocus);
+      APP.on(APP.EVENTS.SCREEN_BLUR,onScreenBlur);
+      return ()=>{
+        APP.off(APP.EVENTS.SCREEN_FOCUS,onScreenFocus);
+        APP.off(APP.EVENTS.SCREEN_BLUR,onScreenBlur);
+      }
+    },[]);
     return <ExpoUIContext.Provider 
       value={{
         ...props,
@@ -189,10 +310,11 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
         getStructData,
         tablesData,
         structsData,
-        appConfig,
         swrConfig,
       }} 
-      children={<AuthProvider {...auth} LoginComponent={Login}>{children}</AuthProvider>}
+      children={<SWRConfig value={swrConfig}>
+        <AuthProvider {...auth} LoginComponent={Login}>{children}</AuthProvider>
+      </SWRConfig>}
     />;
 }
 const getTableOrStructDataCall = (tablesOrStructDatas,getTableOrStructDataFunc)=>{

package/src/context/hooks.js

@@ -6,7 +6,6 @@ import { useWindowDimensions } from "$cdimensions";
 import {isObj,isNonNullString} from "$cutils";
 import { StyleSheet } from "react-native";
 import { createContext,useContext as useReactContext } from "react";
-import appConfig from "$capp/config";
 
 export const ExpoUIContext = createContext(null);
 

package/src/context/index.js

@@ -5,3 +5,4 @@ export {default} from "./hooks";
 export {default as Provider} from "./Provider";
 
 export  *  from "./TableData";
+export * from "./utils";

package/src/context/utils.js

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

package/src/AppEntry/App.js

@@ -1,315 +0,0 @@
-import React from "$react"
-import { AppState} from "react-native";
-import BackHandler from "$ecomponents/BackHandler";
-import * as Linking from 'expo-linking';
-import APP from "$capp";
-import {AppStateService,trackIDLE,stop as stopIDLE} from "$capp/idle";
-import { NavigationContainer} from '@react-navigation/native';
-import {navigationRef} from "$cnavigation"
-import NetInfo from '$cutils/NetInfo';
-import Auth from "$cauth";
-import {isNativeMobile,isElectron} from "$cplatform";
-import Navigation from "../navigation";
-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 {decycle} from "$cutils/json";
-import init from "$capp/init";
-import { setIsInitialized} from "$capp/utils";
-import {isObj,isNonNullString,isPromise,defaultObj,defaultStr} from "$cutils";
-import {loadFonts} from "$ecomponents/Icon/Font";
-import appConfig from "$capp/config";
-import Preloader from "$preloader";
-import {PreloaderProvider} from "$epreloader";
-import BottomSheetProvider from "$ecomponents/BottomSheet/Provider";
-import DialogProvider from "$ecomponents/Dialog/Provider";
-import SimpleSelect from '$ecomponents/SimpleSelect';
-import {Provider as AlertProvider} from '$ecomponents/Dialog/confirm/Alert';
-import { DialogProvider as FormDataDialogProvider } from '$eform/FormData';
-import ErrorBoundaryProvider from "$ecomponents/ErrorBoundary/Provider";
-import notify, {notificationRef} from "$notify";
-import DropdownAlert from '$ecomponents/Dialog/DropdownAlert';
-import { PreferencesContext } from '../Preferences';
-import ErrorBoundary from "$ecomponents/ErrorBoundary";
-import  {updateTheme,defaultTheme} from "$theme";
-import StatusBar from "$ecomponents/StatusBar";
-import {Provider as PaperProvider,Portal } from 'react-native-paper';
-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";
-import AppEntryRootView from "./RootView";
-import { SafeAreaProvider } from 'react-native-safe-area-context';
-
-
-let MAX_BACK_COUNT = 1;
-let countBack = 0;
-let isBackConfirmShowing = false;  
-
-const resetExitCounter = ()=>{
-  countBack = 0
-  isBackConfirmShowing = false;
-};
-
-const NAVIGATION_PERSISTENCE_KEY = 'NAVIGATION_STATE';
-
-/****
- *  init {function}: ()=>Promise<{}> est la fonction d'initialisation de l'application
- *  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,render}) {
-  AppStateService.init();
-  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({
-     isLoading : true,
-     isInitialized:false,
-     hasCallInitApp : false,
-  });
-   React.useEffect(() => {
-    const loadResources = ()=>{
-       return new Promise((resolve)=>{
-          loadFonts(FontsIconsFilter).catch((e)=>{
-            console.warn(e," ierror loading app resources fonts");
-          }).finally(()=>{
-            resolve(true);
-          });
-       })
-    }
-    const restoreState = () => {
-       return new Promise((resolve,reject)=>{
-          (async ()=>{
-            try {
-              const initialUrl = await Linking.getInitialURL();
-              if (isNativeMobile() || initialUrl === null) {
-                const savedState = getSession(NAVIGATION_PERSISTENCE_KEY);
-                if (isObj(savedState)) {
-                  setInitialState(savedState);
-                }
-              }
-            } catch(e){ console.log(e," is state error")}
-            finally { 
-                appReadyRef.current = true;
-                resolve({});
-            }
-          })();
-       });
-    };
-    const subscription = AppState.addEventListener('change', AppStateService.getInstance().handleAppStateChange);
-    const beforeExitApp = (cb)=>{
-       return new Promise((resolve,reject)=>{
-          Preloader.closeAll();
-          showConfirm({
-              title : "Quitter l'application",
-              message : 'Voulez vous vraiment quitter l\'application?',
-              yes : 'Oui',
-              no : 'Non',
-              onSuccess : ()=>{
-                const foreceExit = ()=>{
-                  BackHandler.exitApp();
-                    if(isElectron() && window.ELECTRON && typeof ELECTRON.exitApp =='function'){
-                        ELECTRON.exitApp({APP});
-                    }
-                }
-                const exit = ()=>{
-                  if(typeof beforeExit =='function'){
-                     const r2 = beforeExit()
-                     if(!isPromise(r2)){
-                        throw {message:'La fonction before exit du contexte doit retourner une promesse',returnedResult:r2}
-                     }
-                     return r2.then(foreceExit).catch(reject);
-                  }
-                  foreceExit();
-                }
-                const r = {APP,exit};
-                APP.trigger(APP.EVENTS.BEFORE_EXIT,exit,(result)=>{
-                  if(isObj(result) || Array.isArray(result)){
-                    for(let ik in result){
-                       if(result[ik] === false) return reject({message:'EXIT APP DENIED BY BEFORE EXIT EVENT HANDLER AT POSITON {0}'.sprintf(ik)});
-                    }
-                  }
-                  resolve(r);
-                  if(typeof cb =='function'){
-                     cb(r);
-                  }
-                });
-              },
-              onCancel : reject
-          })
-       })
-    }
-    /**** onBeforeExit prend en paramètre la fonction de rappel CB, qui lorsque la demande de sortie d'application est acceptée, alors elle est exécutée */
-    if(typeof APP.beforeExit !=='function'){
-      Object.defineProperties(APP,{
-         beforeExit : {
-            value : beforeExitApp,
-         }
-      })
-    }
-    const backAction = (args) => {
-      if(navigationRef && navigationRef.canGoBack()? true : false){
-          resetExitCounter();
-          navigationRef.goBack(null);
-          return false;
-      }
-      if(isBackConfirmShowing) {
-        return;
-      }
-      if(countBack < MAX_BACK_COUNT){
-          countBack++;
-          isBackConfirmShowing = false;
-          if(countBack === MAX_BACK_COUNT){
-              notify.toast({text:'Cliquez à nouveau pour quiiter l\'application'});
-          }
-          if(countBack === 2 && isPreloaderVisible()) {
-              closePreloader();
-          }
-          return false;
-      }
-      isBackConfirmShowing = true;
-      return beforeExitApp().finally(x=>{
-        isBackConfirmShowing = false;
-      }).then(({exit})=>{
-          exit();
-      })
-    };
-    const unsubscribeNetInfo = NetInfo.addEventListener(state => {
-        APP.setOnlineState(state);
-    });
-    NetInfo.fetch().catch((e)=>{
-      console.log(e," is net info heinn")
-    });
-    loadResources().finally(()=>{
-      (typeof initApp =='function'?initApp : init)({appConfig,contex:{setState}}).then((args)=>{
-        if(Auth.isLoggedIn()){
-           Auth.loginUser(false);
-        }
-        setState({
-          ...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,hasCallInitApp,isLoading : false,hasGetStarted:false});
-      })
-    });
-
-    const Events = {}
-    let events = [];
-    if(navigationRef && navigationRef.addListener){
-        for(let i in Events){
-          events.push(navigationRef.addListener(i,Events[i]));
-        }
-    }
-    APP.onElectron("BEFORE_EXIT",()=>{
-      return beforeExitApp().then(({exit})=>{
-        exit();
-      })
-    });
-    APP.on(APP.EVENTS.BACK_BUTTON,backAction);
-    return () => {
-        APP.off(APP.EVENTS.BACK_BUTTON,backAction);
-        
-        if(subscription && subscription.remove){
-          subscription.remove();
-        }
-        events.map((ev)=>{
-          if(typeof ev =="function") ev();
-        })
-        unsubscribeNetInfo();
-        stopIDLE(false,true);
-        
-    }   
-  }, []);
-  const {isInitialized} = state;
-  const isLoading = state.isLoading || !isInitialized || !appReadyRef.current? true : false;
-    React.useEffect(()=>{
-      if(isInitialized){
-          setIsInitialized(true);
-          trackIDLE(true);
-      }
-  },[isInitialized]);
-  const hasGetStarted = state.hasGetStarted !== false? true : false;
-  const themeRef = React.useRef(null);
-  const [theme,setTheme] = React.useState(themeRef.current || updateTheme(defaultTheme));
-  themeRef.current = theme;
-    const updatePreferenceTheme = (customTheme,persist)=>{
-      setTheme(updateTheme(customTheme));
-    };
-    const forceRender = React.useForceRender();
-    const pref = typeof appPreferences =='function'? appPreferences({setTheme,forceRender,updateTheme:updatePreferenceTheme}) : appPreferences;
-    const preferences = React.useMemo(()=>({
-        updateTheme:updatePreferenceTheme,
-        theme,
-        ...defaultObj(pref),
-    }),[theme,pref]);
-  const isLoaded = !isLoading && state.hasCallInitApp;
-  const child = isLoaded ? <NavigationContainer 
-    ref={navigationRef}
-    initialState={initialState}
-    {...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")}
-          state = {state}
-          hasGetStarted = {hasGetStarted}
-          isInitialized = {isInitialized}
-          onGetStart = {(e)=>{
-            setState({...state,hasGetStarted:true})
-          }}
-        />
-  </NavigationContainer>  : null;
-  const content = isLoaded ? typeof render == 'function'? render({children:child,appConfig,config:appConfig}) : child : null;
-  return <SafeAreaProvider>
-            <GestureHandlerRootView testID={"RN_MainAppGestureHanleRootView"}  style={styles.gesture}>
-                <AppEntryRootView>
-                    <PaperProvider 
-                      theme={theme}
-                      settings={{
-                        icon: (props) => {
-                          return <FontIcon {...props}/>
-                        },
-                      }}
-                    >
-                      <Portal.Host testID="RN_NativePaperPortalHost">
-                        <ErrorBoundaryProvider/>  
-                        <PreloaderProvider/>   
-                        <DialogProvider responsive testID={"RN_MainAppDialogProvider"}/>
-                        <AlertProvider SimpleSelect={SimpleSelect}/>
-                        <FormDataDialogProvider/>  
-                        <BottomSheetProvider/>
-                        <DropdownAlert ref={notificationRef}/>
-                        <ErrorBoundary>
-                          <StatusBar/>
-                          <SplashScreen isLoaded={isLoaded}>
-                            <PreferencesContext.Provider value={preferences}>
-                              {React.isValidElement(content) && content || child}
-                            </PreferencesContext.Provider>  
-                          </SplashScreen>
-                        </ErrorBoundary>
-                      </Portal.Host>
-                  </PaperProvider>
-                </AppEntryRootView>
-            </GestureHandlerRootView>
-   </SafeAreaProvider>
-}
-
-export default App;
-
-const styles = StyleSheet.create({
-  gesture : {
-    flex : 1,
-    flexGrow : 1,
-  }
-})