@fto-consult/expo-ui 6.86.0 → 6.87.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.86.0",
+  "version": "6.87.0",
   "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,10 +408,10 @@ 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;
                 }

package/src/context/hooks.js

@@ -1,11 +1,10 @@
-
-
 import Dimensions from "$cplatform/dimensions";
 import useStableMemo  from "$react/useStableMemo";
 import { useWindowDimensions } from "$cdimensions";
-import {isObj,isNonNullString} from "$cutils";
+import {isObj,isNonNullString,extendObj} from "$cutils";
 import { StyleSheet } from "react-native";
 import { createContext,useContext as useReactContext } from "react";
+import _useSWR from "$swr";
 
 export const ExpoUIContext = createContext(null);
 
@@ -17,6 +16,30 @@ export const useContext = useExpoUI;
 
 export const useApp = useContext;
 
+export const useSWR =  (path,options)=>{
+    const {swrConfig} = useExpoUI();
+    const host = `${defaultStr(process.env.API_HOST).trim().rtrim("/")}/${path}`;
+    const isLocalHost = host.includes("127.0.0.1") || host.includes("localhost");
+    return _useSWR(path,{
+        checkOnline : !isLocalHost,
+        ...Object.assign({},options),
+        swrOptions : {
+            provider: () => new Map(),
+            ...swrConfig,
+            isOnline() {
+                if(isLocalHost) return true;
+                return swrConfig.isOnline();
+            },
+            initReconnect(cb) {
+                 if(isLocalHost) return cb();
+                 return swrConfig.initReconnect(cb);
+            },
+            ...extendObj({},options,options?.swrOptions)
+        }
+    })
+}
+
+
 /**** retourne un composant définit dans la props
     components de la fonction registerApp appelée pour l'initialisation de l'application
     @param {string} componentName : le nom du composant que l'on veut recupérer