@fto-consult/expo-ui 2.37.3 → 2.37.5

package/package.json

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

package/src/components/Datagrid/Accordion/index.js

@@ -432,7 +432,7 @@ const DatagridFactory = (Factory)=>{
             } = this.preparedColumns;
             const hasFootersFields = this.hasFootersFields();
             const datagridHeader = <View testID={testID+"_HeaderContainer"} pointerEvents={pointerEvents} style={[styles.datagridHeader]}>
-                <ScrollView testID={testID+"_HeaderScrollView"} horizontal showsHorizontalScrollIndicator = {!isTouchDevice()} contentContainerStyle={StyleSheet.flatten([styles.contentContainerStyle,styles.minW100])}>
+                <ScrollView testID={testID+"_HeaderScrollView"} horizontal  contentContainerStyle={StyleSheet.flatten([styles.contentContainerStyle,styles.minW100])}>
                     <View testID={testID+"_HeaderContentCntainer"} style={[styles.table,styles.pullRight]}>
                         {dbSelector}
                         <View testID={testID+"_HeaderQueryLimit"} style={[styles.paginationItem]}>
@@ -551,7 +551,7 @@ const DatagridFactory = (Factory)=>{
                         {!canRenderChart && showFooters ? (
                             <View  testID={testID+"_FooterContainer"} pointerEvents={pointerEvents} style={[theme.styles.justifyContentCenter,theme.styles.pv1]}>
                                 <View  testID={testID+"_FooterContentContainer"} style={[styles.footersContainer]}>
-                                    <ScrollView testID={testID+"_FooterScrollView"} horizontal showsHorizontalScrollIndicator = {!isTouchDevice()}  contentContainerStyle={[styles.contentContainerStyle]}>
+                                    <ScrollView testID={testID+"_FooterScrollView"} horizontal  contentContainerStyle={[styles.contentContainerStyle]}>
                                         <View testID={testID+"_FooterContent"} style={[styles.table,theme.styles.p1]}>
                                             {Object.mapToArray(this.getFooterValues(),(footer,field)=>{
                                                 return <Footer

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

@@ -1736,29 +1736,31 @@ export default class CommonDatagridComponent extends AppComponent {
                                     d.push(null);
                                 }
                                 data.push(d);
-                            }
-                            const hF = hFooters[key];
-                            if(isObj(hF) && isNonNullString(agFunc)){
-                                const dd = [];
-                                Object.map(cols,(col,i)=>{
-                                       if(i in hF){
-                                            const ff = hF[i];
-                                            dd.push(defaultNumber(ff[agFunc]));
-                                        } else {
-                                            dd.push(null);
-                                        }
-                                });
-                                if(canExportOnlyTotal){
-                                    dd.unshift(val);
-                                    data.push(dd);
+                            } else {
+                                const hF = hFooters[key];
+                                if(isObj(hF) && isNonNullString(agFunc)){
+                                    const dd = [];
+                                    Object.map(cols,(col,i)=>{
+                                        if(i in hF){
+                                                const ff = hF[i];
+                                                dd.push(defaultNumber(ff[agFunc]));
+                                            } else {
+                                                dd.push(null);
+                                            }
+                                    });
+                                    if(canExportOnlyTotal){
+                                        dd.unshift(val);
+                                        data.push(dd);
+                                    } else {
+                                        data.push(d);
+                                        data.push(dd);
+                                    }
                                 } else {
                                     data.push(d);
-                                    data.push(dd);
                                 }
-                            } else {
-                                data.push(d);
                             }
                             
+                            
                         } else if(!canExportOnlyTotal) {
                             Object.map(cols,(col,i)=>{
                                 const isDateField = defaultStr(col.type).toLowerCase().contains("date");
@@ -2798,7 +2800,7 @@ export default class CommonDatagridComponent extends AppComponent {
         return <View testID={testID+"_ContentContainer"}  style={[theme.styles.w100,isA && this.state.displayOnlySectionListHeaders && {borderTopColor:theme.colors.divider,borderTopWidth:1},isA ? [theme.styles.ph2,theme.styles.pt1] : [theme.styles.pt1,theme.styles.ph1],theme.styles.justifyContentCenter,theme.styles.alignItemsCenter,theme.styles.pb1,!cells && theme.styles.ml1,theme.styles.mr1,cStyle]}>
             <Label testID={testID+"_Label"} splitText numberOfLines={3} textBold style={[theme.styles.w100,{color:theme.colors.primaryOnSurface,fontSize:isA?15 :16},lStyle]}>{label}</Label>
             {cells ? <View testID={testID+"_TableRow"} style = {[theme.styles.w100,theme.styles.row,isA && theme.styles.pt1,theme.styles.alignItemsFlexStart]}
-            >{cells}</View> : null}
+            >{this.isAccordion() ? <ScrollView testID={testID+"_ScrollView"} horizontal>{cells}</ScrollView> : cells}</View> : null}
         </View>
     }
     isRowSelected(rowKey,rowIndex){