@fto-consult/expo-ui 1.5.0 → 1.5.2

package/package.json

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

package/src/auth/Login.js

@@ -86,9 +86,8 @@ export default function LoginComponent(props){
             },1000)
         }
     },[withPortal])
-    const {header,children,initialize,contentTop,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,mutateData,canSubmit:canSubmitForm,onStepChange,...loginProps} = defaultObj(getProps({
+    const {header,withScrollView:customWithScrollView,children,initialize,contentTop,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,mutateData,canSubmit:canSubmitForm,onStepChange,...loginProps} = defaultObj(getProps({
         ...state,
-        withScrollView:customerWithScrollView,
         setState,
         state,
         showError : notifyUser,
@@ -171,7 +170,18 @@ export default function LoginComponent(props){
             setState({...state,step:step+1,data})
         }
     }
-    const withScrollView = typeof customerWithScrollView =='boolean'? customerWithScrollView : true;
+    const loginFields = {};
+    let hasLoginFields = false;
+    Object.map(loginProps.fields,(field,i)=>{
+        if(isObj(field)){
+            if(typeof field.step ==='number' && field.step !== state.step){}
+            else {
+                loginFields[i] = Object.clone(field);
+                loginFields[i].autoFocus = !!loginFields[i].autoFocusOnStep;    
+            }
+        }
+    });
+    const withScrollView = typeof customWithScrollView =='boolean'? customWithScrollView : true;
     const Wrapper = withPortal ? ScreenWithoutAuthContainer  : withScrollView ? ScrollView: View;
     const wrapperProps = withPortal ? {appBarProps,authRequired:false,title:loginTitle,withScrollView} : { style:styles.wrapper};
     return <Wrapper testID = {testID+"_Wrapper" }{...wrapperProps}>
@@ -193,6 +203,7 @@ export default function LoginComponent(props){
                     </View>}
                     responsive  = {false}
                     {...loginProps}
+                    fields = {loginFields}
                     formProps = {{
                         keyboardEvents : {
                             ...defaultObj(keyboardEvents),
@@ -205,7 +216,7 @@ export default function LoginComponent(props){
                 >
                     <>
                         {React.isValidElement(contentTop)? contentTop : null}
-                        {Object.size(loginProps.fields,true)?<View testID={testID+"_ButtonsContainer"} style={[styles.buttonWrapper]}>
+                        {hasLoginFields?<View testID={testID+"_ButtonsContainer"} style={[styles.buttonWrapper]}>
                             <Button 
                                 ref = {nextButtonRef}
                                 primary

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

@@ -14,6 +14,7 @@ import {navigate} from "$cnavigation";
 import theme from "$theme";
 import {isMobileNative} from "$cplatform";
 import appConfig from "$capp/config";
+import Preloader from "$preloader";
 const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>{
     let u = defaultObj(Auth.getLoggedUser());
     const deviceNameRef = React.useRef(null);
@@ -46,7 +47,10 @@ const UserProfileAvatarComponent = React.forwardRef(({drawerRef,...props},ref)=>
                 label : i18n.lang("logout",'Déconnexion'),
                 icon : "logout",
                 onPress : (a)=>{
-                    closeDrawer(Auth.signOut);
+                    closeDrawer(()=>{
+                        Preloader.open("Déconnexion en cours...");
+                        Auth.signOut().finally(Preloader.close)
+                    });
                 }
             }
         ];