@fto-consult/expo-ui 6.24.2 → 6.25.1

package/src/layouts/Screen/ScreenWithoutAuthContainer.js

@@ -51,9 +51,11 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
     containerProps,
     testID,
     right,
+    keyboardAvoidingViewProps,
     ...rest
   } = props;
   const insets = useSafeAreaInsets();
+  keyboardAvoidingViewProps = defaultObj(keyboardAvoidingViewProps);
   testID = defaultStr(testID,"RN_MainScreenScreenWithoutAuthContainer")
   containerProps = defaultObj(containerProps);
   const backgroundColor = theme.colors.background;
@@ -106,7 +108,8 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
   const WrapperProps = modal? {screenName} : {};
   const portalId = uniqid("screeen-container-"+screenName);
   return <Wrapper {...WrapperProps}>
-      <KeyboardAvoidingView testID={testID} id={portalId} {...containerProps}   style={[styles.container,{backgroundColor},modal && styles.modal,containerProps.style]}>
+    <View testID={testID+"_ScreenContentContainer"} id={portalId} style={[containerStyle,{backgroundColor},modal && styles.modal,containerProps.style]} {...containerProps}>
+      <KeyboardAvoidingView testID={testID} {...keyboardAvoidingViewProps} style={[styles.keyboardAvoidingView,keyboardAvoidingViewProps.style]}>
           {withStatusBar !== false ? <StatusBar/> : null}
           {appBar === false ? null : React.isValidElement(appBar)? state.AppBar :  <AppBar 
               testID={testID+'_AppBar'} {...appBarProps} 
@@ -121,19 +124,20 @@ export default function MainScreenScreenWithoutAuthContainer(props) {
             <ScrollView
               testID = {testID+'_ScreenContentScrollView'}
               {...rest}
-              contentContainerStyle={[contentContainerStyle]}
-              style={[containerStyle,styles.container, style]}
+              contentContainerStyle={[contentContainerStyle,styles.container]}
+              style={[style]}
             >
               {children}
               {fab}
             </ScrollView>
           ) : (
-            <View  testID={testID+'_ScreenContent'} {...rest} style={[containerStyle,styles.wrapper,styles.container, style]}>
+            <View  testID={testID+'_ScreenContent'} {...rest} style={[styles.container, style]}>
               {children}
               {fab}
             </View>
           )}
-      </KeyboardAvoidingView>
+        </KeyboardAvoidingView>
+    </View>
   </Wrapper>
 }
 
@@ -147,8 +151,12 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
   },
+  keyboardAvoidingView : {
+    flex : 1,
+    backgroundColor : "transparent",
+  },
   wrapper : {
-    flexDirection:'column',
+    flex : 1,
     /*flex : 1,
     flexGrow : 1,
     alignItems:'center'*/

package/src/navigation/Drawer/items/index.js

@@ -29,11 +29,12 @@ const useGetItems = (options)=>{
         APP.on(APP.EVENTS.REFRESH_MAIN_DRAWER,refreshItems);
         APP.on(APP.EVENTS.AUTH_LOGIN_USER,refreshItems);
         APP.on(APP.EVENTS.AUTH_LOGOUT_USER,refreshItems);
+        APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
         return ()=>{
             APP.off(APP.EVENTS.REFRESH_MAIN_DRAWER,refreshItems);
             APP.off(APP.EVENTS.AUTH_LOGIN_USER,refreshItems);
             APP.off(APP.EVENTS.AUTH_LOGOUT_USER,refreshItems);
-            APP.off(APP.EVENTS.UPDATE_THEME,onLogoutUser);
+            APP.off(APP.EVENTS.UPDATE_THEME,refreshItems);
         }
     },[])
     return useMemo(()=>{

package/src/navigation/index.js

@@ -5,6 +5,7 @@ import React from "$react";
 import DrawerNavigator from "./Drawer";
 import useContext from "$econtext/hooks";
 import { MainNavigationProvider } from "./hooks";
+import {isWeb,isAndroid} from "$cplatform";
 
 export * from "./hooks";
 
@@ -29,13 +30,19 @@ export default function NavigationComponent (props){
     const opts = {
         headerShown : false,
         header : ()=> null,
+        presentation : isAndroid()? "card":"default",
+        animationEnabled : true,
+    }
+    const cardStyle = { backgroundColor: 'transparent' };
+    if(isWeb()){
+        cardStyle.flex = 1;
     }
     return <MainNavigationProvider {...rest} onGetStart={onGetStart} state={state} initialRouteName={initialRouteName}>
         <DrawerNavigator {...props}>
             {<Stack.Navigator 
-                    initialRouteName={initialRouteName} 
-                    screenOptions={opts}
-                >
+                initialRouteName={initialRouteName} 
+                screenOptions={opts}
+            >
                     {<Stack.Group screenOptions={{...opts}}>
                         {drawerScreens}
                     </Stack.Group>}
@@ -44,6 +51,7 @@ export default function NavigationComponent (props){
                         screenOptions={{
                             ...opts,
                             presentation: 'transparentModal', 
+                            cardStyle
                         }}
                     >
                         {stackScreens}

package/src/screens/Help/About.js

@@ -63,7 +63,7 @@ export default function HelpScreen(props){
     const borderStyle = {borderColor:theme.colors.divider,borderWidth:1,justifyContent:'space-between'};
     const testID = defaultStr(props.testID,"RN_HelpAboutScreenComponent")
     return <Screen  withScrollView title={title} {...props} testID={testID+"_Screen"} contentContainerStyle={[{flex:1},theme.styles.alignItemsCenter,theme.styles.justifyContentCenter]}>
-        <View testID={testID+"_Container"} style={[theme.styles.alignItemsCenter,theme.styles.justifyContentCenter,theme.styles.flex1,theme.styles.w100,theme.styles.p1]}>
+        <View testID={testID+"_Container"} style={[theme.styles.alignItemsCenter,theme.styles.justifyContentCenter,theme.styles.w100,theme.styles.p1]}>
             <Logo  testID={testID+"_Logo"} style={{marginRight:10}}/>
             {getReleaseText()}
             <Divider testID={testID+"_Divider1"} style={[theme.styles.mv1]}/>

package/src/screens/Help/openLibraries.js

@@ -1 +1 @@
-module.exports = {"@FTO-CONSULT/EXPO-UI":{"name":"@FTO-CONSULT/EXPO-UI","version":"6.23.10","homepage":"https://github.com/borispipo/expo-ui#readme"}};
+module.exports = {"@fto-consult/expo-ui":{"name":"@fto-consult/expo-ui","version":"6.24.2","repository":{"type":"git","url":"git+https://github.com/borispipo/expo-ui.git"},"homepage":"https://github.com/borispipo/expo-ui#readme"}};

package/src/test-screens/Home.js

@@ -1,8 +1,11 @@
 import Screen from "$eScreen";
 import Test from "$ecomponents/Datagrid/Test";
+import React  from "$react";
 
 export default function HomeScreen(props){
-    return <Screen{...props}>
+    React.useEffect(()=>{
+    },[])
+    return <Screen{...props} contentContainerStyle={[{flex:1}]}>
         <Test/>
     </Screen>
 };

package/webpack.config.js

@@ -8,8 +8,10 @@ const path = require("path");
 
 // Expo CLI will await this method so you can optionally return a promise.
 module.exports = async function(env, argv,opts) {
-  const nodeModulePath = `${process.cwd()}/node_modules`;
-  const wConfigPath = fs.existsSync(`${nodeModulePath}/@expo/webpack-config`) && `${nodeModulePath}/@expo/webpack-config` || "@expo/webpack-config";
+  const isLocalDev = require("./is-local-dev")();//si l'application est en developpement local
+  const nodeModulePath = path.resolve(`${process.cwd()}`,"node_modules");
+  const localNodeEuiP = path.resolve(nodeModulePath,"@expo/webpack-config");
+  const wConfigPath = fs.existsSync(localNodeEuiP) && localNodeEuiP || "@expo/webpack-config";
   const createExpoWebpackConfigAsync = require(wConfigPath);
     env = env || {};
     opts = typeof opts =="object" && opts ? opts : {};

package/src/components/Table/Cell.js

@@ -1,24 +0,0 @@
-// Copyright 2023 @fto-consult/Boris Fouomene. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-import React from "react";
-import { View } from "react-native";
-import {defaultObj} from "$cutils";
-import Label from "$ecomponents/Label";
-
-function TableCellComponent({cellArgs,rowArgs,children,renderCell,rowIndex,style,...rest}){
-    const {content,containerProps} = React.useMemo(()=>{
-        const rArgs = {...cellArgs,...rowArgs,containerProps : {}};
-        const r = typeof renderCell =='function' && renderCell (rArgs) ||  children;
-        return {
-            content : typeof r =='string' || typeof r =='number'? <Label children={r}/> : React.isValidElement(r)? r : null,
-            containerProps : defaultObj(rArgs.containerProps)
-        }
-    },[children]);
-    return (<View  {...containerProps} {...rest} style={[style,containerProps.style]} >
-        {content}
-    </View>);
-}
-//const TableCellComponent = React.memo(TableCellComponent);;
-export default TableCellComponent;
-TableCellComponent.displayName = "TableCellComponent";

package/src/components/Table/FiltersOrFooters.js

@@ -1,18 +0,0 @@
-// Copyright 2023 @fto-consult/Boris Fouomene. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-import React from "$react";
-import { View } from "react-native";
-import PropTypes from "prop-types";
-export default function TableFiltersComponent({visible,children:cChildren,...rest}){
-    const children = React.useMemo(()=>{
-        return cChildren;
-    },[cChildren]);
-    return <View {...rest} style={[rest.style,!visible && {height:0,opacity:0,display:'none'}]}>
-        {children}
-    </View>
-}
-
-TableFiltersComponent.propTypes = {
-    visible : PropTypes.bool,
-}

package/src/components/Table/Header.js

@@ -1,25 +0,0 @@
-// Copyright 2023 @fto-consult/Boris Fouomene. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Copyright 2023 @fto-consult/Boris Fouomene. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-import React from "$react";
-import { View } from "react-native";
-import PropTypes from "prop-types";
-export default function TableHeaderComponent({cells,columns,...rest}){
-    const children = React.useMemo(()=>{
-        if(Array.isArray(cells)){
-            return null;
-        }
-        return cells;
-    },[cells,columns]);
-    return <View {...rest}>
-        {children}
-    </View>
-}
-
-TableHeaderComponent.propTypes = {
-    columns : PropTypes.arrayOf(PropTypes.bool)
-}

package/src/components/Table/Row.js

@@ -1,21 +0,0 @@
-// Copyright 2023 @fto-consult/Boris Fouomene. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-import React from "$react";
-import { View } from "react-native";
-import PropTypes from "prop-types";
-export default function TableRowComponent({cells,columns,...rest}){
-    const children = React.useMemo(()=>{
-        if(Array.isArray(cells)){
-            return cells.map((cell,index)=>columns[index]? <React.Fragment key={index}>{cell}</React.Fragment> : null )
-        }
-        return cells;
-    },[cells,columns]);
-    return <View {...rest}>
-        {children}
-    </View>
-}
-
-TableRowComponent.propTypes = {
-    columns : PropTypes.arrayOf(PropTypes.bool)
-}