@fto-consult/expo-ui 6.69.0 → 6.69.1

package/package.json

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

package/src/components/Datagrid/SWRDatagrid.js

@@ -193,15 +193,27 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
                 opts.showError = false;
             }
             if(typeof fetcher =='function'){
-                return fetcher(url,opts);
+                return fetcher(url,opts).then((r)=>{
+                    showProgressRef.current = false;
+                    return r;
+                }).catch((r)=>{
+                    showProgressRef.current = false;
+                    return r;
+                });
             }
-            return apiFetch(url,opts);
+            return apiFetch(url,opts).then((r)=>{
+                showProgressRef.current = false;
+                return r;
+            }).catch((r)=>{
+                showProgressRef.current = false;
+                return r;
+            });
         },
         swrOptions : getSWROptions(swrConfig.refreshTimeout)
     });
     const dataRef = React.useRef(null);
     const totalRef = React.useRef(0);
-    const loading = (customIsLoading === true || isLoading || isValidating);
+    const loading = (customIsLoading === true || isLoading || (isValidating && showProgressRef.current));
     const {data,total} = React.useMemo(()=>{
         if((loading && customIsLoading !== false) || !isObjOrArray(result)){
             return {data:dataRef.current,total:totalRef.current};
@@ -228,7 +240,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         },500);
     },[error]);
     const doRefresh = (showProgress)=>{
-        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : isLoading;
+        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : showProgressRef.current;
         refresh();
     }
     const canPaginate = ()=>{
@@ -391,7 +403,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
             handleQueryLimit = {false}
             handlePagination = {false}
             autoSort = {canSortRemotely()? false : true}
-            isLoading = {loading /*&& !error*/ && showProgressRef.current && true || false}
+            isLoading = {loading && showProgressRef.current || false}
             beforeFetchData = {(args)=>{
                 if(typeof beforeFetchData =="function" && beforeFetchData(args)==false) return;
                 let {fetchOptions:opts,force} = args;