@fto-consult/expo-ui 3.3.4 → 3.4.1

package/src/components/ScrollView/index.js

@@ -5,12 +5,14 @@ import View from "$ecomponents/View";
 import theme from "$theme";
 import {defaultStr,defaultObj} from "$utils";
 import APP from "$capp/instance";
+import {isWeb as isw} from "$cplatform";
 const ScrollViewComponent = React.forwardRef(({virtualized,vertical,horizontal,contentProps,containerProps,mediaQueryUpdateNativeProps,testID:customTestID,children:cChildren,screenIndent:sIndent,...rest},ref) => {
   const testID = defaultStr(customTestID,'RN_ScrollViewComponent');
   containerProps = defaultObj(containerProps)
   if(horizontal === true || vertical === false){
      return <ScrollView horizontal testID={testID} ref={ref} {...rest} children={cChildren}/>
   }
+  const isWeb = isw();
   const isKeyboardOpenRef = React.useRef(false);
   const layoutRef = React.useRef(null);
   const [layout,setLayout] = React.useState(Dimensions.get("window"));
@@ -55,7 +57,7 @@ const ScrollViewComponent = React.forwardRef(({virtualized,vertical,horizontal,c
           cStyle.minHeight = minHeight;
       }
   }
-  const contentContainerStyle = [cStyle,rest.contentContainerStyle];
+  const contentContainerStyle = [cStyle,rest.contentContainerStyle,isWeb && {display:'block'}];
   return  <View ref={layoutRef} onLayout={()=>{
     if(!hasInitializedRef.current){
        updateLayout();

package/src/screens/Help/About.js

@@ -87,43 +87,45 @@ export default function HelpScreen(props){
                     <Label primary textBold style={theme.styles.mv05} >{appConfig.name+", Notes de mise à jour."}</Label>
                 </Link>
             </View>
-            {Object.size(openLibraries,true) ? <View style={[theme.styles.w100]}>
-                <Expandable
-                    testID={testID+"_OpenLibraries"}
-                    title = {"A propos des librairies tiers"}
-                    titleProps = {{style:theme.styles.ph1}}
-                    style = {{backgroundColor:'transparent'}}
-                >
-                    <View testID={testID+"_OpenLibraries_Header"} style={[theme.styles.row,theme.styles.flexWrap]}>
-                        <Label testID={testID+"_OpenLibraries_HeaderLabel"} primary textBold>{appConfig.name+"   "}</Label>
-                        <Label>est bâti sur un ensemble d'outils et librairies open Source</Label>
-                    </View>
-                    <View testID={testID+"_OpenLibrariesContent"} style={[theme.styles.w100,theme.styles.pv1]}>
-                        <Grid.Row style={borderStyle}>
-                            <Label style={gridStyles[0]} textBold>#</Label>
-                            <Label style={gridStyles[1]} textBold>Librairie/Outil</Label>
-                            <Label style={gridStyles[2]} textBold>Version</Label>
-                            <Label style={gridStyles[3]} textBold>Licence</Label>
-                        </Grid.Row>
-                        {Object.mapToArray(openLibraries,(lib,i,_i)=>{
-                            return <Grid.Row key={i} style={borderStyle}>
-                                <Label style={gridStyles[0]}>
-                                    {_i.formatNumber()}
-                                </Label>
-                                <AutoLink style={gridStyles[1]} url={lib.url}>
-                                    <Label splitText>{i}</Label>
-                                </AutoLink>
-                                <AutoLink style={gridStyles[2]}>
-                                    <Label splitText numberOfLines={2}>{defaultStr(lib.version)}</Label>
-                                </AutoLink>
-                                <AutoLink url={lib.licenseUrl} style={gridStyles[3]}>
-                                    <Label splitText>{lib.license}</Label>
-                                </AutoLink>
+            <View style={theme.styles.w100}>
+                {Object.size(openLibraries,true) ? <View style={[theme.styles.w100]}>
+                    <Expandable
+                        testID={testID+"_OpenLibraries"}
+                        title = {"A propos des librairies tiers"}
+                        titleProps = {{style:theme.styles.ph1}}
+                        style = {{backgroundColor:'transparent'}}
+                    >
+                        <View testID={testID+"_OpenLibraries_Header"} style={[theme.styles.row,theme.styles.flexWrap]}>
+                            <Label testID={testID+"_OpenLibraries_HeaderLabel"} primary textBold>{appConfig.name+"   "}</Label>
+                            <Label>est bâti sur un ensemble d'outils et librairies open Source</Label>
+                        </View>
+                        <View testID={testID+"_OpenLibrariesContent"} style={[theme.styles.w100,theme.styles.pv1]}>
+                            <Grid.Row style={borderStyle}>
+                                <Label style={gridStyles[0]} textBold>#</Label>
+                                <Label style={gridStyles[1]} textBold>Librairie/Outil</Label>
+                                <Label style={gridStyles[2]} textBold>Version</Label>
+                                <Label style={gridStyles[3]} textBold>Licence</Label>
                             </Grid.Row>
-                        })}
-                    </View>
-                </Expandable>
-            </View>: null}
+                            {Object.mapToArray(openLibraries,(lib,i,_i)=>{
+                                return <Grid.Row key={i} style={borderStyle}>
+                                    <Label style={gridStyles[0]}>
+                                        {_i.formatNumber()}
+                                    </Label>
+                                    <AutoLink style={gridStyles[1]} url={lib.url}>
+                                        <Label splitText>{i}</Label>
+                                    </AutoLink>
+                                    <AutoLink style={gridStyles[2]}>
+                                        <Label splitText numberOfLines={2}>{defaultStr(lib.version)}</Label>
+                                    </AutoLink>
+                                    <AutoLink url={lib.licenseUrl} style={gridStyles[3]}>
+                                        <Label splitText>{lib.license}</Label>
+                                    </AutoLink>
+                                </Grid.Row>
+                            })}
+                        </View>
+                    </Expandable>
+                </View>: null}
+            </View>
         </View>
     </Screen>  
 }