@fto-consult/expo-ui 2.13.0 → 2.13.1

package/package.json

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

package/src/components/Datagrid/Common/TableData.js

@@ -92,7 +92,7 @@ export default class CommonTableDatagrid extends CommonDatagrid{
                     }
                 }
                 this.beforeFetchData(fetchOptions);
-                if(typeof this.props.beforeFetchData =='function' && this.props.beforeFetchData({context:this,fetchOptions,options:fetchOptions}) === false){
+                if(typeof this.props.beforeFetchData =='function' && this.props.beforeFetchData({context:this,force,fetchOptions,options:fetchOptions}) === false){
                     this.isFetchingData = false;
                     return resolve(this.state.data);
                 }

package/src/components/Datagrid/SWRDatagrid.js

@@ -139,10 +139,10 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         }
     },[isValidating,isLoading])
     const doRefresh = (showProgress)=>{
+        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : false;
         if(isFetchingRef.current) return;
-        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : true;
         refreshCBRef.current = ()=>{
-            showProgressRef.current = true;
+            showProgressRef.current = false;
         };
         refresh();
     }
@@ -163,12 +163,12 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         <Datagrid 
             {...rest}
             {...defaultObj(table.datagrid)} 
-            isLoading = {isLoading|| isValidating && !error && showProgressRef.current && true || false}
-            beforeFetchData = {({fetchOptions:opts})=>{
+            isLoading = {(isLoading|| isValidating) && !error && showProgressRef.current && true || false}
+            beforeFetchData = {({fetchOptions:opts,force})=>{
                 opts.fields = fetchFields;
                 opts = getFetchOptions({showError:showProgressRef.current,...opts});
                 fetchOptionsRef.current = opts;
-                doRefresh(true);
+                doRefresh(force);
                 return false;
             }}
             isTableData