@fto-consult/expo-ui 2.47.0 → 2.47.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.47.0",
+  "version": "2.47.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^2.9.4",
+    "@fto-consult/common": "^2.9.6",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

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

@@ -3200,9 +3200,9 @@ export default class CommonDatagridComponent extends AppComponent {
             arg.data = d.data;
             arg.total = defaultNumber(arg.total,arg.data.total);
         }
-        if(typeof arg.total != 'number'){
+        /*if(typeof arg.total != 'number'){
             arg.total = Object.size(arg.data);
-        }
+        }*/
         const {cb,total,data} = arg;
         return new Promise((resolve)=>{
             this.prepareData(arg,(state)=>{

package/src/components/ScrollView/index.js

@@ -9,9 +9,23 @@ const ScrollViewComponent = React.forwardRef(({virtualized,contentProps,containe
   const isKeyboardOpenRef = React.useRef(false);
   const testID = defaultStr(customTestID,'RN_ScrollViewComponent');
   containerProps = defaultObj(containerProps)
+  const layoutRef = React.useRef(null);
   const [layout,setLayout] = React.useState(Dimensions.get("window"));
   const {height} = layout;
+  const hasInitializedRef = React.useRef(false);
   const children = React.useStableMemo(()=>cChildren,[cChildren]);
+  const updateLayout = ()=>{
+      return new Promise((resolve)=>{
+          if(layoutRef.current && layoutRef.current.measureInWindow){
+              layoutRef.current.measureInWindow((x, y, width, height) => {
+                  const r = { x, y, width, height };
+                  setLayout({...Dimensions.get("window"),layout:r});
+                  hasInitializedRef.current = true;
+                  resolve(r);
+              });
+          }
+      })
+  }
   React.useEffect(()=>{
     const onKeyboardToggle = ({visible})=>{
       isKeyboardOpenRef.current = visible;
@@ -19,7 +33,7 @@ const ScrollViewComponent = React.forwardRef(({virtualized,contentProps,containe
     const onResizePage = ()=>{
       setTimeout(()=>{
          if(isKeyboardOpenRef.current) return;
-         setLayout(Dimensions.get("window"))
+         updateLayout();
       },300);
     }
     APP.on(APP.EVENTS.RESIZE_PAGE,onResizePage);
@@ -29,8 +43,21 @@ const ScrollViewComponent = React.forwardRef(({virtualized,contentProps,containe
       APP.off(APP.EVENTS.KEYBOARD_DID_TOGGLE,onKeyboardToggle);
     }
   },[]);
-  const contentContainerStyle = [{maxHeight:Math.max(height-100,250),width:'100%'},rest.contentContainerStyle];
-  return  <View {...containerProps} style={[theme.styles.w100,containerProps.style]} testID={testID+"_ScrollViewContainer"}>
+
+  const cStyle = {maxHeight:Math.max(height-100,250),width:'100%'};
+  if(isObj(layout.layout) && typeof layout.layout.y =='number'){
+      const {layout : {x,y}} = layout;
+      const minHeight = height - y;
+      if(minHeight> 0){
+          cStyle.minHeight = minHeight;
+      }
+  }
+  const contentContainerStyle = [cStyle,rest.contentContainerStyle];
+  return  <View ref={layoutRef} onLayout={()=>{
+    if(!hasInitializedRef.current){
+       updateLayout();
+    }
+  }} {...containerProps} style={[theme.styles.w100,containerProps.style]} testID={testID+"_ScrollViewContainer"}>
     <ScrollView 
       ref={ref} {...rest} 
       testID={testID}