@fto-consult/expo-ui 5.8.9 → 5.8.10

package/package.json

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

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

@@ -57,12 +57,12 @@ const DatagridFactory = (Factory)=>{
             if(arg.renderRowCell === false || arg.isSectionListHeader === true) return super.renderRowCell(arg);
             const {columnDef,columnField} = arg;
             if(!columnDef.visible || columnDef.accordion === false || this.isSelectableColumn(columnDef,columnField)) return null;
-            let {render,key,style} = super.renderRowCell(arg);
+            arg.isAccordion = true;
+            const {render,key,style} = super.renderRowCell(arg);
             if(render===null || !React.isValidElement(render)) return null;
-            return <Label style={style} key={key}>
+            return <Label style={[style,{paddingTop:10,paddingBottom:10}]} key={key}>
                     {render}
-                </Label>
-            
+            </Label>
         }
         rangeChanged(state){
             if(this.startEndIndexCounterElt && this.startEndIndexCounterElt.update){

package/src/components/Grid/Cell.js

@@ -87,7 +87,7 @@ const GridCellComponent = React.forwardRef((p,ref)=>{
             return getSizeStyle(p);
         }}
         ref={ref} 
-        style = {[styles.container,getSizeStyle(p).style,style]}
+        style = {[styles.container,customFlex !== undefined && {flex:customFlex},getSizeStyle(p).style,style]}
     >
         <C testID={testID+"_Content"}  activeOpacity={activeOpacity}  {...contentProps}
              

package/src/components/Grid/Grid.js

@@ -6,10 +6,10 @@ import PropTypes from "prop-types";
 import { StyleProp } from '$theme';
 import View from "$ecomponents/View";
 
-const GridComponent = React.forwardRef((p,ref)=>{
-    const {onPress,responsive,activeOpacity,onLongPress,flexGrow =1,flex:customFlex,style,onPressIn,col,onPressOut,...props} = p;
+const GridComponent = React.forwardRef(({onPress,responsive,activeOpacity,onLongPress,flexGrow,flex:customFlex,style,onPressIn,col,onPressOut,...props},ref)=>{
     const testID = defaultStr(props.testID,"RN_GridComponent");
     const flattenedStyle = StyleSheet.flatten(style);
+    flexGrow = typeof flexGrow =='number'? flexGrow : 0;
     const flex = customFlex !== undefined ? customFlex :   (flattenedStyle && (col && flattenedStyle.width || !col && flattenedStyle.height)) ? undefined : undefined;
     const C = onPress || onLongPress || onPressIn || onPressOut ? TouchableOpacity : View;
     return <C {...props} activeOpacity={activeOpacity} onLongPress={onLongPress} onPressIn={onPressIn} onPressOut={onPressOut}

package/src/layouts/DatabaseStatistics/index.js

@@ -14,7 +14,6 @@ export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tabl
         containerProps = defaultObj(containerProps);
         const title = containerProps.title = defaultStr(containerProps.title,DatabaseStatisticScreen.title);
         contentProps = defaultObj(contentProps);
-        const forceRender = React.useForceRender();
         if(Component == Cell){
             containerProps.desktopSize = defaultNumber(containerProps.desktopSize,12);
             containerProps.tabletSize = defaultNumber(containerProps.tabletSize,8);
@@ -58,7 +57,7 @@ export default function DatabaseStatisticScreen ({withScreen,fetchDataProps,tabl
         content = <Component  {...containerProps} style={[containerProps.style,theme.styles.mr1,theme.styles.ml1]}>
             {content}
         </Component>;
-        return  withScreen !== false ? <Screen withScrollView title={defaultVal(customTitle,title)} {...props}>{content}</Screen> : content;
+        return  withScreen !== false ? <Screen containerProps={{style:[{flexGrow:0,flex:0}]}} withScrollView title={defaultVal(customTitle,title)} {...props}>{content}</Screen> : content;
 }   
 
 export const screenName = DatabaseStatisticScreen.screenName = "DatabaseStatistics";

package/src/screens/Auth/PermLines.js

@@ -101,7 +101,7 @@ const PermLines = React.forwardRef(({user,gridProps,defaultActions:cDefaultActio
         })
         return content;
     },[tables,allPerms,isUserMasterAdmin,disabled,tablePermPrefix])
-    return <Expandable {...props} testID={testID} style={[theme.styles.w100,style]} containerProps={containerProps} titleProps = {{style:[styles.expandable,theme.styles.w100]}} title={title}>
+    return <Expandable withScrollView={false} {...props} testID={testID} style={[theme.styles.w100,style]} containerProps={containerProps} titleProps = {{style:[styles.expandable,theme.styles.w100]}} title={title}>
         <Grid testID={testID+"_Grid"} {...gridProps}>
             {content }
         </Grid>