@fto-consult/expo-ui 2.39.5 → 2.39.7

package/package.json

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

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

@@ -2367,6 +2367,7 @@ export default class CommonDatagridComponent extends AppComponent {
        this.beforePrepareColumns();
        args = defaultObj(args);
        const sectionListColumns = {};
+       const nSectionList = {};
        const sListColumns = isObj(args.sectionListColumns) ? args.sectionListColumns : this.getSectionListColumns();
        const filteredColumns = isObjOrArray(args.filteredColumns)?args.filteredColumns : isObjOrArray(this.state.filteredColumns) ? this.state.filteredColumns : {};
        const columns = args.columns || this.state.columns;
@@ -2541,7 +2542,7 @@ export default class CommonDatagridComponent extends AppComponent {
             if(this.props.groupable !== false && header.groupable !== false && !this.isSelectableColumn(header,header.field) && !this.isIndexColumn(header,header.field)){
                 const isInSectionListHeader = isObj(sListColumns[field]);
                 if(isInSectionListHeader){
-                    sectionListColumns[field] = {
+                    nSectionList[field] = {
                         ...header,
                          width,
                          type,
@@ -2565,7 +2566,7 @@ export default class CommonDatagridComponent extends AppComponent {
                     mItem.right = (p)=>{
                         return <Icon name="material-settings" {...p} onPress={(e)=>{
                             //React.stopEventPropagation(e);
-                            this.configureSectionListColumn({...mItem,...defaultObj(sectionListColumns[field])});
+                            this.configureSectionListColumn({...mItem,...defaultObj(nSectionList[field])});
                             //return false;
                         }}/>
                     }
@@ -2576,6 +2577,11 @@ export default class CommonDatagridComponent extends AppComponent {
             visibleColumnIndex++;
             
         })
+        Object.map(sListColumns,(f,i)=>{
+            if(i in nSectionList){
+                sectionListColumns[i] = nSectionList[i];
+            }
+        })
         this.preparedColumns.sortedColumns = sortedColumns;
         this.preparedColumns.sortedColumn = sortedColumn;
         this.preparedColumns.sortedColumnsLength = sortedColumnsLength;
@@ -3376,7 +3382,7 @@ export default class CommonDatagridComponent extends AppComponent {
         if((stableHash(nextProps.data) === stableHash(this.props.data))) {
             return false;
         }
-        this.setIsLoading(true,true);
+        this.setIsLoading(true);
         this.prepareData({...nextProps,force:true},(state)=>{
             this.setState(state)
         });
@@ -3387,7 +3393,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 === true ? true : false;
+        return !!this.isLoadingRef.current;
     }
     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(()=>{