@fto-consult/expo-ui 4.0.3 → 4.0.4

package/package.json

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

package/src/components/AutoSizer/Vertical.js

@@ -12,7 +12,7 @@ import {isWeb} from "$cplatform";
  * ce composant a pour but de définir la taille d'un contenu en se basant sur sa positin top, de manière à ce que, le contentu du composant fit
  * le reste de la taille de la page, avec comme valeur de la props minHeight
  */
-const AutoSizerVerticalComponent = React.forwardRef(({onLayout,isScrollView,getRenderingStyle,withActivityIndicator,testID,withPadding,maxHeight,minHeight,style,children:cChildren,...rest},ref) => {
+const AutoSizerVerticalComponent = React.forwardRef(({onLayout,isScrollView,screenIndent,getRenderingStyle,withActivityIndicator,testID,withPadding,paddingBottom,maxHeight,minHeight,style,children:cChildren,...rest},ref) => {
   testID = defaultStr(testID,'RN_AutoSizerVerticalComponent');
   const hasUpdateLayoutRef = React.useRef(false);
   const layoutRef = React.useRef(null);
@@ -56,13 +56,19 @@ const AutoSizerVerticalComponent = React.forwardRef(({onLayout,isScrollView,getR
   const hasUpdateLayout = hasUpdateLayoutRef.current;
   const cStyle ={width:'100%',maxHeight:Math.max(height-100,250)};
   const contentLayout = defaultObj(layout.layout);
-  cStyle.minHeight = Math.min(Math.max(layout.height-defaultNumber(contentLayout.y),minHeight && minHeight ||250));
-  const cMaxHeight = layout.height-defaultNumber(contentLayout.y);
+  screenIndent = typeof screenIndent =='number' && screenIndent > 50 ? screenIndent : 100;
+  const y = Math.abs(defaultNumber(contentLayout.y));
+  const heightY = y < height - screenIndent ? y : height - screenIndent;
+  cStyle.minHeight = Math.min(Math.max(layout.height-heightY,minHeight && minHeight ||250));
+  const cMaxHeight = layout.height-heightY;
   if(cMaxHeight>=200){
     cStyle.maxHeight = cMaxHeight;
   }
-  if(withPadding !== false){
-      cStyle.paddingBottom = 50;
+  if(typeof paddingBottom =='number'){
+      cStyle.paddingBottom = paddingBottom; //: 50;
+  }
+  if(cStyle.minHeight && cStyle.maxHeight && cStyle.minHeight > cStyle.maxHeight){
+     cStyle.minHeight = cStyle.maxHeight;
   }
   const restStyle = {};
   const canUpdate = hasUpdateLayout || hasUpdateLayout || withActivityIndicator === false;
@@ -97,4 +103,5 @@ AutoSizerVerticalComponent.propTypes = {
    withActivityIndicator : PropTypes.bool,//si l'on utilisera l'activity indicator pour le chargement du contentu
    maxHeight : PropTypes.number,
    minHeight : PropTypes.number,
+   paddingBottom : PropTypes.number,
 }

package/src/components/Table/List/List.js

@@ -80,6 +80,7 @@ const VirtuosoListComponent = React.forwardRef(({items,onRender,testID,renderIte
         if(isDOMElement(target) && onContentSizeChange){
             const {nativeEvent:{contentSize}} = normalizeEvent({target});
             setTimeout(()=>{
+                target.style.paddingBottom = "50px";
                 if(contentSize.width !== listSize.width || contentSize.height != listSize.height){
                     sizeRef.current = contentSize;
                     onContentSizeChange(contentSize.width,contentSize.height);
@@ -95,7 +96,7 @@ const VirtuosoListComponent = React.forwardRef(({items,onRender,testID,renderIte
     React.useOnRender((a,b,c)=>{
         if(onRender && onRender(a,b,c));
     },Math.max(Array.isArray(items) && items.length/10 || 0,500))
-    return <View {...containerProps} {...props} style={[{flex:1},containerProps.style,style,{minWidth:'100%',height:'100%',maxWidth:'100%'}]} onLayout={onLayout} testID={testID}>
+    return <View {...containerProps} {...props} style={[{flex:1},containerProps.style,style,autoSizedStyle,{minWidth:'100%',height:'100%',maxWidth:'100%'}]} onLayout={onLayout} testID={testID}>
         <Virtuoso
             {...r2}
             style = {listStyle}

package/src/components/Table/List/index.js

@@ -14,9 +14,8 @@ const normalize = (size)=>{
 const AutoSizeVerticalList = React.forwardRef(({testID,autoSizerProps,...props},ref)=>{
     testID = defaultStr(testID,"RN_AutoSizeVerticalListComponent")
     autoSizerProps = defaultObj(autoSizerProps);
-    const sizeRef = React.useRef({});
-    return <AutoSizeVertical withPadding={false} getRenderingStyle={(size)=>{sizeRef.current = normalize(sizeRef.current);}} testID={testID+"_AutoSizerVertical"} {...autoSizerProps} >
-        <List {...props} autoSizedStyle = {sizeRef.current} style={[props.style,sizeRef.current]} ref={ref}/>
+    return <AutoSizeVertical withPadding={false} testID={testID+"_AutoSizerVertical"} {...autoSizerProps} >
+        <List {...props} style={[props.style]} ref={ref}/>
     </AutoSizeVertical>
 })