@fto-consult/expo-ui 5.11.6 → 5.11.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.11.6",
+  "version": "5.11.8",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.11.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.18.0",
+    "@fto-consult/common": "^3.18.22",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-community/datetimepicker": "^6.7.3",

package/src/auth/Login.js

@@ -213,7 +213,7 @@ export default function LoginComponent(props){
     return <Wrapper testID = {testID+"_Wrapper" }{...wrapperProps}>
         <DialogProvider ref={dialogProviderRef}/>
         {sH}
-        <Surface style={[styles.container,{backgroundColor}]} {...containerProps} testID={testID}>
+        <Surface {...containerProps} {...defaultObj(loginProps?.containerProps)} style={[styles.container,{backgroundColor},containerProps.style,loginProps?.containerProps?.style]}  testID={testID}>
             <Surface elevation = {0} {...contentProps} mediaQueryUpdateNativeProps = {mQueryUpdateProps} {...contentProps} testID={testID+"_Content"} style={[styles.content,updateMediaQueryStyle(),{backgroundColor},contentProps.style]}>
                 <FormData 
                     formName = {formName}
@@ -347,3 +347,10 @@ LoginComponent.propTypes = {
         PropTypes.element,
     ]),
 }
+
+/*** les loginProps sont les porps à passer au composant FormData
+*/
+const loginPropTypes = {
+    containerProps : PropTypes.object, //les props à passer au container
+    ...FormData.propTypes, //les props type du composant form data
+}

package/src/auth/ThemeSelector/index.js

@@ -4,7 +4,7 @@
 ///permet de sélectionner un theme utilisateur
 import React from "$react";
 import Label from "$ecomponents/Label";
-import Auth,{login} from "$cauth";
+import Auth,{login,getLoginId} from "$cauth";
 import View from "$ecomponents/View";
 import { StyleSheet } from "react-native";
 import defaultTheme,{getColors} from "$theme/defaultTheme";
@@ -38,8 +38,10 @@ export const getThemeFieldProps = (props,ref)=>{
     props = defaultObj(props);
     let {user,showAdd,onValidate,onChange,onUpsert,...rest} = props;
     const loggedUser = defaultObj(Auth.getLoggedUser());
-    user = defaultObj(user,loggedUser);
-    const isUserActive = loggedUser.code == user.code && user.code ? true : false;
+    user = defaultObj(user,loggedUser); 
+    const loginId = getLoginId(user);
+    const hasLoginId = isNonNullString(loginId) || typeof loginId =='number';
+    const isUserActive = getLoginId(loggedUser) == loginId && hasLoginId ? true : false;
     const userTheme = defaultObj(user.theme);
     const userThemeName = defaultStr(userTheme.name,defaultTheme.name);
     const isDark = theme.isDark() || theme.isDarkUI();
@@ -48,7 +50,7 @@ export const getThemeFieldProps = (props,ref)=>{
     const showThemeExplorer = (data)=>{
         data = defaultObj(data,defTheme);
         fields.name.disabled = ({data})=> data && isNonNullString(data.name);
-        const title = data && data.name ? ("Modifier ["+data.name+"]") : ('Nouv theme['+user.code+"]");
+        const title = data && data.name ? ("Modifier ["+data.name+"]") : ('Nouv theme['+loginId+"]");
         const isEditing = isDocEditing(data);
         fields.textFieldMode.defaultValue = theme.textFieldMode;
         fields.profilAvatarPosition.defaultValue = theme.profilAvatarPosition;
@@ -86,7 +88,7 @@ export const getThemeFieldProps = (props,ref)=>{
                     user.customThemes = customThemes;
                     open((isEditing?"Modification ":"Enregistrement ")+"du thème...");
                     Auth.upsertUser(user,false).then(()=>{
-                        if(Auth.getLoggedUserCode() == user.code){
+                        if(Auth.getLoginId(Auth.getLoggedUser()) == getLoginId(user)){
                             login(user,false);
                         }
                         if(ref && ref.current && ref.current.refresh){

package/src/index.js

@@ -227,8 +227,9 @@ function App({init:initApp,initialRouteName:appInitialRouteName,render,onMount,p
       }
   },[isInitialized]);
   const hasGetStarted = state.hasGetStarted !== false? true : false;
-  
-  const [theme,setTheme] = React.useState(updateTheme(defaultTheme));
+  const themeRef = React.useRef(null);
+  const [theme,setTheme] = React.useState(themeRef.current || updateTheme(defaultTheme));
+  themeRef.current = theme;
     const updatePreferenceTheme = (customTheme,persist)=>{
       setTheme(updateTheme(customTheme));
     };

package/src/screens/Auth/PermProfile.js

@@ -136,7 +136,7 @@ const PermProfile = React.forwardRef((props,ref)=>{
         profiles.push(<View key={index} style={[theme.styles.row,{justifyContent:'space-between'}]}>  
             <Label>{profile.code}</Label>
             <View style={[theme.styles.row]}>
-                <Icon primary title={isAssigned?'Profil de permission ['+profile.code+'] assigné à l\'utilisateur':'Profil de permission ['+profile.code+'] non assigné à l\'utilisateur '+defaultStr(user.code)} name={isAssigned?'checkbox-marked':'checkbox-blank-outline'} 
+                <Icon primary title={isAssigned?'Profil de permission ['+profile.code+'] assigné à l\'utilisateur':'Profil de permission ['+profile.code+'] non assigné à l\'utilisateur '+String(Auth.getLoginId(user))} name={isAssigned?'checkbox-marked':'checkbox-blank-outline'} 
                     onPress={()=>{
                         assignProfile(profile,isAssigned?false:true)
                     }}

package/src/screens/Auth/Profile.js

@@ -77,7 +77,7 @@ export default function UserProfileScreen(props){
     }
     
     return <FormDataScreen
-        title = {(user.label?(user.label+" ["+user.code+"]  | "):"")+"Profil : Modifier"}
+        title = {(user.label?(user.label+" ["+Auth.getLoginId(user)+"]  | "):"")+"Profil : Modifier"}
         {...props}
         modal
         withScrollView