@fto-consult/expo-ui 2.39.7 → 2.39.8

package/package.json

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

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

@@ -3272,6 +3272,9 @@ export default class CommonDatagridComponent extends AppComponent {
         return isObj(this.progressBarRef.current) && typeof this.progressBarRef.current.setIsLoading =='function' ? true : false;
     }
     onRender(){
+        if(typeof this.props.onRender ==='function'){
+            this.props.onRender({context:this});
+        }
         if(this.isRenderingRef.current === true){
             setTimeout(()=>{
                 this.isRenderingRef.current = false;
@@ -3382,7 +3385,7 @@ export default class CommonDatagridComponent extends AppComponent {
         if((stableHash(nextProps.data) === stableHash(this.props.data))) {
             return false;
         }
-        this.setIsLoading(true);
+        this.setIsLoading(true,true);
         this.prepareData({...nextProps,force:true},(state)=>{
             this.setState(state)
         });
@@ -3393,7 +3396,7 @@ export default class CommonDatagridComponent extends AppComponent {
     isLoading (){
         if(this.state.isReady === false || this.isRenderingRef.current) return true;
         if(typeof this.props.isLoading =='boolean') return this.props.isLoading;
-        return !!this.isLoadingRef.current;
+        return this.isLoadingRef.current === true ? true : false;
     }
     getLinesProgressBar(){
         return CommonDatagridComponent.LinesProgressBar(this.props);

package/src/layouts/DatabaseStatistics/DatabaseStatistic.js

@@ -66,7 +66,7 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
                     setIsLoading(false);
                     refreshingRef.current = false;
                 });
-        },100);
+            },100);
     }
 
     React.useEffect(()=>{
@@ -170,7 +170,7 @@ export default function DatabaseStatisticContainer ({dashboardProps,onRefreshAll
         onPress = {onPress}
         title = {title}
         //style = {[theme.styles.pv1]}
-        description = {isLoading || isDatagridLoading?progressBar:<CountUp 
+        description = {isLoading ?progressBar:<CountUp 
             from={0} 
             to={count}
             style = {counUpStyle}