@fto-consult/expo-ui 7.3.0 → 7.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "7.3.0",
+  "version": "7.3.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "main",
   "scripts": {
@@ -71,7 +71,7 @@
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^3.72.19",
+    "@fto-consult/common": "^3.73.3",
     "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",

package/src/navigation/Drawer/index.js

@@ -33,10 +33,10 @@ const DrawerNavigator = React.forwardRef(({content,children:customChildren,state
             },100)
         };
         APP.on(APP.EVENTS.AUTH_LOGOUT_USER,onLogoutUser);
-        APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
+        //APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
         return ()=>{
             APP.off(APP.EVENTS.AUTH_LOGOUT_USER,onLogoutUser);
-            APP.off(APP.EVENTS.UPDATE_THEME,refreshItems);
+            //APP.off(APP.EVENTS.UPDATE_THEME,refreshItems);
         }
     },[]);
     const headerCB = ({isMinimized})=>{

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

@@ -32,10 +32,8 @@ const useGetItems = (options)=>{
             }
         }
         APP.on(APP.EVENTS.REFRESH_MAIN_DRAWER,refreshItems);
-        //APP.on(APP.EVENTS.UPDATE_THEME,refreshItems);
         return ()=>{
             APP.off(APP.EVENTS.REFRESH_MAIN_DRAWER,refreshItems);
-            //APP.off(APP.EVENTS.UPDATE_THEME,refreshItems);
         }
     },[])
     return useMemo(()=>{

package/src/screens/Auth/Profile.js

@@ -8,6 +8,8 @@ import {SignIn2SignOut} from "$cauth";
 import React from "$react";
 import avatarProps from "$eauth/avatarProps";
 import useContext from "$econtext/hooks";
+import PropTypes from "prop-types";
+import APP from "$capp/instance";
 
 import {screenName} from "./utils";
 
@@ -67,10 +69,16 @@ export default function UserProfileScreen({fields,...p}){
     const onSaveProfile = ({data,goBack,...rest})=>{
         data.theme = themeRef.current;
         Preloader.open("Modification en cours...");
-        const opts = {...user,...data};
-        return Auth.upsertUser(opts,true).then((response)=>{
-            if(typeof props.onSave ==='function' && props.onSave({...opts,response,goBack,navigate}) === false) return;
-            if(typeof goBack =='function' && !hasChangeRef.current){
+        const toSave = {...user,...data};
+        return Auth.upsertUser(toSave,true).then((response)=>{
+            setTimeout(()=>{
+                if(hasChangeRef.current){
+                    APP.trigger(APP.EVENTS.UPDATE_THEME,user.theme);
+                }
+                APP.trigger(APP.EVENTS.AUTH_UPDATE_PROFILE,toSave);
+            },100);
+            if(typeof props.onSave ==='function' && props.onSave({...rest,data:toSave,response,goBack,navigate}) === false) return;
+            if(props.navigateToHomeOnSave !== true && typeof goBack =='function' && !hasChangeRef.current){
                 return goBack(true);
             }
             navigate('Home');
@@ -98,4 +106,9 @@ UserProfileScreen.screenName = screenName;
 
 UserProfileScreen.Modal = true;
 
-UserProfileScreen.authRequired = true;
+UserProfileScreen.authRequired = true;
+
+UserProfileScreen.propTypes = {
+    navigateToHomeOnSave : PropTypes.bool,//pour forcer la navigation à l'écran d'acceuil une fois qu'on est enregistrée les préférences, peut importe si le profil utilisateur a été mis à jour
+    
+}