@fto-consult/expo-ui 6.74.8 → 6.74.11

package/package.json

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

package/src/components/Datagrid/SWRDatagrid.js

@@ -167,9 +167,6 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const limitRef = React.useRef(!canHandleLimit ?0 : defaultNumber(getSessionData("limit"),500));
     const isInitializedRef = React.useRef(false);
     testID = defaultStr(testID,"RNSWRDatagridComponent");
-    React.useEffect(()=>{
-        showProgressRef.current = false;
-    },[showProgressRef.current.current]);
     const {error, isValidating,isLoading,data:result,refresh} = useSWR(fetchPath,{
         fetcher : (url,opts)=>{
             if(!isInitializedRef.current) {
@@ -292,6 +289,9 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             }
         });
     });
+    React.useEffect(()=>{
+        showProgressRef.current = false;
+    });
     return (
         <Datagrid 
             testID = {testID}

package/src/context/Provider.js

@@ -112,9 +112,7 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
     ///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({
@@ -133,8 +131,11 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
         }
         const date = screensRef.current[screen];
         const diff = new Date().getTime() - date.getTime();
-        screensRef.current[screen] = new Date();
-        return diff >= swrRefreshTimeout ? true : false;
+        const ret = diff >= swrRefreshTimeout ? true : false;
+        if(ret){
+          screensRef.current[screen] = new Date();
+        }
+        return ret;
       },
       initFocus(callback) {
         let appState = AppState.currentState
@@ -283,21 +284,15 @@ const Provider = ({children,getTableData,handleHelpScreen,navigation,swrConfig,a
     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