@fto-consult/expo-ui 7.6.29 → 7.6.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.6.29",
+  "version": "7.6.31",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -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.73.14",
+    "@fto-consult/common": "^3.73.26",
     "@fto-consult/electron": "^1.0.27",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",

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

@@ -295,7 +295,6 @@ export default class CommonDatagridComponent extends AppComponent {
         this.INITIAL_STATE = {
             data,
         }
-        this.prepareFetchData();
         this._datagridId = isNonNullString(this.props.id)? this.props.id : uniqid("datagrid-id")
         this.canDoFilter = true;    
         this.filters =  {}
@@ -3243,9 +3242,6 @@ export default class CommonDatagridComponent extends AppComponent {
         this.refresh(true);
         this.previousDataSources = dataSources;
     }
-    prepareFetchData(fetchData){
-        this.INITIAL_STATE.fetchData = defaultVal(fetchData,this.props.fetchData);
-    }
     beforeFetchData(){}
         /**** retourne la liste des items, utile lorsqu'une s'agit d'une fonction 
         Lorsque data est une chaine de caractère, alors elle doit être sous la forme recommandée par la function 
@@ -3290,7 +3286,7 @@ export default class CommonDatagridComponent extends AppComponent {
                 if(force !== true && isArray(this.INITIAL_STATE.data)) {
                     return this.resolveFetchedDataPromise({cb,data:this.INITIAL_STATE.data}).then(resolve).catch(reject)
                 }
-                let fetchData  = this.INITIAL_STATE.fetchData;
+                let fetchData  = undefined;
                 if(isFunction(this.props.fetchData)){
                     /**** l'on peut définir la props fetchData, qui est la fonction appelée pour la recherche des données */
                     fetchData = this.props.fetchData.call(this,fetchOptions);
@@ -3381,7 +3377,7 @@ export default class CommonDatagridComponent extends AppComponent {
             this._pagination.page = 1;
             this._pagination.start = 0;
         }
-        return this.fetchData({force:true});
+        return this.fetchData({force:true,renderProgressBar:true});
     }
     onSetQueryLimit(){
         if(!this.canSetQueryLimit()) return;

package/src/components/Datagrid/SWRDatagrid.js

@@ -208,7 +208,7 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
     const dataRef = React.useRef(null);
     const totalRef = React.useRef(0);
     const prevIsLoading = React.usePrevious(isLoading);
-    const loading = (customIsLoading === true || isLoading || (prevIsLoading && isValidating && showProgressRef.current));
+    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};
@@ -235,8 +235,10 @@ const SWRDatagridComponent = React.forwardRef((props,ref)=>{
         },500);
     },[error]);
     const doRefresh = (showProgress)=>{
-        showProgressRef.current = showProgress ? typeof showProgress ==='boolean' : false;
-        refresh();
+        showProgressRef.current = showProgress || typeof showProgress ==='boolean' ? showProgress : false;
+        const fPath = isNonNullString(fetchPath)? fetchPath : fPathRef.current;
+        const rKey = `${setQueryParams(fPath,"swrRefreshKeyId",uniqid("swr-refresh-key"))}`;
+        refresh(rKey,data);
     }
     const canPaginate = ()=>{
         if(!canHandlePagination) return false;