@fto-consult/expo-ui 2.37.0 → 2.37.2

package/package.json

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

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

@@ -394,8 +394,8 @@ const DatagridFactory = (Factory)=>{
             filter = defaultFunc(filter,x=>true);
             const showFooters = this.canShowFooters();
             let restItems = [];
-            
-            /*if(max && this.isSelectableMultiple()){
+            const max = this.getMaxSelectableRows();
+            if(max && this.isSelectableMultiple()){
                 max = max.formatNumber();
                 restItems = [
                     {
@@ -413,7 +413,7 @@ const DatagridFactory = (Factory)=>{
                         icon :"select"
                     }
                 ]
-            }*/
+            }
             const {y} = this.state.layout;
             const {height:winheight,width:winWidth} = Dimensions.get("window");
             const containerHeight = winheight - y;
@@ -528,8 +528,8 @@ const DatagridFactory = (Factory)=>{
                         {this.renderSectionListMenu()}
                         {this.renderDisplayTypes()}
                         {this.renderAggregatorFunctionsMenu()}
-                        {!canRenderChart ? <RenderType /> : null}
                         {this.renderExportableMenu()}
+                        {!canRenderChart ? <RenderType /> : null}
                             {/*filters !== false && <td ><LocalFilter title = {this.props.title} fields ={this.state.columns} onChange={this.onLocalFiltersChange.bind(this)}/></td>*/}
                     </View>
             </ScrollView>

package/src/components/ScrollView/index.js

@@ -26,10 +26,10 @@ const ScrollViewComponent = React.forwardRef((props,ref) => {
       APP.off(APP.EVENTS.RESIZE_PAGE,onResizePage);
     }
   },[])
-  const showIndicator = !isTouchDevice() || isDesktopMedia();
+  const showIndicator = true;//!isTouchDevice() || isDesktopMedia();
   return  virtualized ? <FlatList
-    showsHorizontalScrollIndicator = {showIndicator}  
-    showsVerticalScrollIndicator={showIndicator} 
+    //showsHorizontalScrollIndicator = {showIndicator}  
+    //showsVerticalScrollIndicator={showIndicator} 
     {...rest}
     ref = {ref}
     testID = {testID}
@@ -40,8 +40,10 @@ const ScrollViewComponent = React.forwardRef((props,ref) => {
     contentContainerStyle = {[!isNative && {flex:1,flexGrow: 1,maxHeight:Math.max(height-100,250)},rest.contentContainerStyle]}
     ListHeaderComponent={() => <View testID={testID+'_FlatListContent'} {...cProps} mediaQueryUpdateNativeProps = {mediaQueryUpdateNativeProps}
     >{children}</View>}
-    /> : <ScrollView showsHorizontalScrollIndicator = {showIndicator}  
-      showsVerticalScrollIndicator={showIndicator} ref={ref} {...rest} testID={testID} children={children}/>
+    /> : <ScrollView 
+      //showsHorizontalScrollIndicator = {showIndicator}  
+      //showsVerticalScrollIndicator={showIndicator} 
+      ref={ref} {...rest} testID={testID} children={children}/>
 });
 
 ScrollViewComponent.displayName = "ScrollViewComponent";