@fto-consult/expo-ui 8.77.0 → 8.77.2

package/bin/create-app/dependencies.js

@@ -1,38 +1,38 @@
-
-    module.exports = {
-	"@emotion/native": "^11.11.0",
-	"@expo/html-elements": "^0.5.1",
-	"@expo/vector-icons": "^14.0.0",
-	"@pchmn/expo-material3-theme": "^1.3.2",
-	"@react-native-community/netinfo": "11.1.0",
-	"@react-native/assets-registry": "^0.72.0",
-	"react-native-get-random-values": "~1.8.0",
-	"@react-navigation/native": "^6.1.17",
-	"@react-navigation/native-stack": "^6.9.26",
-	"@react-navigation/stack": "^6.3.29",
-	"@shopify/flash-list": "1.6.3",
-	"expo": "^50.0.17",
-	"expo-camera": "~14.1.3",
-	"expo-clipboard": "~5.0.1",
-	"expo-font": "~11.10.3",
-	"expo-image-picker": "~14.7.1",
-	"expo-linking": "~6.2.2",
-	"expo-sharing": "~11.10.0",
-	"expo-sqlite": "~13.4.0",
-	"expo-status-bar": "~1.11.1",
-	"expo-system-ui": "~2.9.4",
-	"expo-web-browser": "~12.8.2",
-	"react": "18.2.0",
-	"react-native": "0.73.6",
-	"react-native-safe-area-context": "4.8.2",
-	"react-native-screens": "~3.29.0",
-	"react-native-svg": "14.1.0",
-	"react-native-webview": "13.6.4",
-	"react-native-gesture-handler": "~2.14.0",
-	"react-native-reanimated": "~3.6.2",
-	"react-native-view-shot": "3.8.0",
-	"expo-intent-launcher": "~10.11.0",
-	"expo-image-manipulator": "~11.8.0",
-	"expo-document-picker": "~11.10.1"
-};
+
+    module.exports = {
+	"@emotion/native": "^11.11.0",
+	"@expo/html-elements": "^0.5.1",
+	"@expo/vector-icons": "^14.0.0",
+	"@pchmn/expo-material3-theme": "^1.3.2",
+	"@react-native-community/netinfo": "11.1.0",
+	"@react-native/assets-registry": "^0.72.0",
+	"react-native-get-random-values": "~1.8.0",
+	"@react-navigation/native": "^6.1.17",
+	"@react-navigation/native-stack": "^6.9.26",
+	"@react-navigation/stack": "^6.3.29",
+	"@shopify/flash-list": "1.6.3",
+	"expo": "^50.0.17",
+	"expo-camera": "~14.1.3",
+	"expo-clipboard": "~5.0.1",
+	"expo-font": "~11.10.3",
+	"expo-image-picker": "~14.7.1",
+	"expo-linking": "~6.2.2",
+	"expo-sharing": "~11.10.0",
+	"expo-sqlite": "~13.4.0",
+	"expo-status-bar": "~1.11.1",
+	"expo-system-ui": "~2.9.4",
+	"expo-web-browser": "~12.8.2",
+	"react": "18.2.0",
+	"react-native": "0.73.6",
+	"react-native-safe-area-context": "4.8.2",
+	"react-native-screens": "~3.29.0",
+	"react-native-svg": "14.1.0",
+	"react-native-webview": "13.6.4",
+	"react-native-gesture-handler": "~2.14.0",
+	"react-native-reanimated": "~3.6.2",
+	"react-native-view-shot": "3.8.0",
+	"expo-intent-launcher": "~10.11.0",
+	"expo-image-manipulator": "~11.8.0",
+	"expo-document-picker": "~11.10.1"
+};
                             

package/bin/create-app/eas.json

@@ -1,18 +1,18 @@
-{
-  "build": {
-    "development": {
-      "developmentClient": true,
-      "distribution": "internal"
-    },
-    "preview": {
-      "distribution": "internal",
-      "android": {
-        "buildType": "apk"
-      }
-    },
-    "production": {}
-  },
-  "submit": {
-    "production": {}
-  }
-}
+{
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal",
+      "android": {
+        "buildType": "apk"
+      }
+    },
+    "production": {}
+  },
+  "submit": {
+    "production": {}
+  }
+}

package/bin/create-app/src/auth/index.js

@@ -91,6 +91,11 @@ export default {
             beforeSubmit : ({step,data,...rest})=><void>, //la fonction appélée immédiatement avant le submit des donénes
             renderNextButton : <boolean>, //si le bouton next sera rendu
             renderPreviousButton : <boolean>, //si le bouton previous sera rendu
+            title : <string>, //le titre de l'interface de connexion, titre personnalisé s'il y a lieu
+            wrapperProps : <func({withScreen,withScrollView,state,...rest})=><object>,object>, //les props du composant wrapper, 
+            containerProps : <object>, //les props du composant container, idem à ceux du composant $ecomponents/Surface
+            contentProps : <object>, //les props du composant parent direct à la form rendu par le composatn formData, idem à ceux du composant $ecomponents/Surface
+            onSuccess : (object)=><boolean | any>, la fonction de rappel appelée lorsque l'utilisateur a été connecté, via la fonction signIn. si onSuccess retourne false, alors l'action par défaut de redirection de l'utilisateur via l'interface de connexion ne sera pas appelée. 
             ...loginProps {object}, les props Supplémentaires à passer au composant FormData utilisé pour le rendu du formulaire de connexion
         }
     */

package/expo-ui.json

@@ -1,11 +1,11 @@
-{
-	"name": "@fto-consult/expo-ui",
-	"version": "6.44.4",
-	"description": "Bibliothèque de composants UI Expo,react-native",
-	"bin": {
-		"expo-ui": "./bin/index.js"
-	},
-	"author": "Boris Fouomene",
-	"license": "ISC",
-	"homepage": "https://github.com/borispipo/expo-ui#readme"
+{
+	"name": "@fto-consult/expo-ui",
+	"version": "6.44.4",
+	"description": "Bibliothèque de composants UI Expo,react-native",
+	"bin": {
+		"expo-ui": "./bin/index.js"
+	},
+	"author": "Boris Fouomene",
+	"license": "ISC",
+	"homepage": "https://github.com/borispipo/expo-ui#readme"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.77.0",
+  "version": "8.77.2",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "react-native-paper-doc": "https://github.com/callstack/react-native-paper/tree/main/docs/docs/guides",
   "scripts": {
@@ -70,7 +70,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.48.3",
+    "@fto-consult/common": "^4.50.8",
     "@fto-consult/expo-ui": "^8.73.1",
     "apexcharts": "^3.49.0",
     "file-saver": "^2.0.5",

package/src/auth/Login.js

@@ -29,7 +29,7 @@ const WIDTH = 400;
 export default function LoginComponent(props){
     let {formName,step,appBarProps,onSuccess,withPortal,testID} = props;
     const {auth:{loginPropsMutator,Login}} = useContext();
-    const loginTitle = getTitle();
+    let loginTitle = getTitle();
     testID = defaultStr(testID,"RN_Auth.LoginComponent");
     formName = React.useRef(uniqid(defaultStr(formName,"login-formname"))).current;
     const nextButtonRef = React.useRef(null);
@@ -131,14 +131,8 @@ export default function LoginComponent(props){
     }
     const beforeSubmitRef = React.useRef(null);
     const canSubmitRef = React.useRef(null);
-    const mutateDataRef = React.useRef(null);
+    const onSuccesRef = React.useRef(null);
     const signIn = ()=>{
-        const canSubmit = typeof canSubmitRef.current == 'function'? canSubmitRef.current : w=>true;
-        const cS = canSubmit(args);
-        if(typeof cS === 'string' && cS){
-            return notifyUser(cS);
-        }
-        const data = getData();
         const form = _getForm();
         if(!form){
             notifyUser("Impossible de valider le formulaire car celui-ci semble invalide")
@@ -148,13 +142,19 @@ export default function LoginComponent(props){
             notifyUser(form.getErrorText());
             return;
         }
-        const args = {...state,data,form,state,step,setState,nextButtonRef,previousButtonRef};
+        const data = getData();
+        const canSubmit = typeof canSubmitRef.current == 'function'? canSubmitRef.current : w=>true;
         const beforeSubmit = typeof beforeSubmitRef.current === 'function' ? beforeSubmitRef.current : ()=> true;
-        if(cS && beforeSubmit(args) !== false){
+        const args = {...state,data,form,state,setState,nextButtonRef,previousButtonRef};
+        const cS = canSubmit(args);
+        if(typeof cS === 'string' && cS){
+            return notifyUser(cS);
+        }
+        if(cS !== false && beforeSubmit(args) !== false){
             Preloader.open("vérification ...");
             setIsLoading(nextButtonRef,true);
             return auth.signIn(data).then((a)=>{
-                if(typeof onLoginSuccess =='function' && onLoginSuccess(a)=== false) return;
+                if(typeof onSuccesRef.current =='function' && onSuccesRef.current(a)=== false) return;
                 if(isFunction(onSuccess)){
                     onSuccess(data);
                 } else {
@@ -171,9 +171,12 @@ export default function LoginComponent(props){
         containerProps : customContainerProps,
         contentProps : customContentProps,
         formProps,
+        wrapperProps : cWrapperProps,
+        title : customTitle,
         withScrollView:customWithScrollView,children,initialize,contentTop,renderNextButton,renderPreviousButton,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,beforeSubmit:beforeSubmitForm,canSubmit:canSubmitForm,onStepChange,...loginProps} = loginPropsMutator({
         ...state,
         getButtonAction,
+        data : getData(),
         signIn,
         setState,
         setIsLoading,
@@ -192,6 +195,9 @@ export default function LoginComponent(props){
         ProviderSelector,
         previousButtonRef,
     });
+    if(isNonNullString(customTitle)){
+        loginTitle = customTitle;
+    }
     const containerProps = defaultObj(customContainerProps);
     const contentProps = defaultObj(customContentProps);
     /****la fonction à utiliser pour vérifier si l'on peut envoyer les données pour connextion
@@ -199,6 +205,7 @@ export default function LoginComponent(props){
      * **/
     canSubmitRef.current = typeof canSubmitForm =='function'? canSubmitForm : ({step})=>step >= 2;
     beforeSubmitRef.current  = typeof beforeSubmitForm =='function'? beforeSubmitForm : x=> true;
+    onSuccesRef.current = onLoginSuccess;
     
     const goToNext = ()=>{
         let step = state.step;
@@ -254,7 +261,8 @@ export default function LoginComponent(props){
     const mediaQueryUpdateStyle = (a)=>{
         return StyleSheet.flatten([updateMediaQueryStyle(),contentProps.style]);
     };
-    const wrapperProps = withPortal ? {appBarProps,authRequired:false,title:loginTitle,withScrollView} : { style:styles.wrapper};
+    const wProps = defaultObj(typeof cWrapperProps =="function"? cWrapperProps({...state,setState,formName,state,withPortal,withScreen:withPortal,withScrollView,state,formName}) : cWrapperProps);
+    const wrapperProps = withPortal ? {appBarProps,authRequired:false,title:loginTitle,withScrollView,...wProps} : { ...wProps,style:[styles.wrapper,wProps.style]};
     const sH = React.isComponent(HeaderTopContent)? <HeaderTopContent mediaQueryUpdateStyle = {mediaQueryUpdateStyle} /> : React.isValidElement(HeaderTopContent)? HeaderTopContent : null;
     const header = React.isComponent(Header) ? <Header mediaQueryUpdateStyle = {mediaQueryUpdateStyle}/> : React.isValidElement(Header)? Header : null;
     return <Wrapper testID = {testID+"_Wrapper" }{...wrapperProps}>
@@ -296,6 +304,7 @@ export default function LoginComponent(props){
                                 onPress = {goToNext}
                                 icon = {state.step == 1? 'arrow-right':'login'}
                                 surface
+                                testID = {testID+"_NextButton"}
                             >
                                 {state.step == 1? 'Suivant' : 'Connexion' }
                             </Action> : null}
@@ -309,6 +318,7 @@ export default function LoginComponent(props){
                                 secondary
                                 surface
                                 icon = {'arrow-left'}
+                                testID = {testID+"_PrevButton"}
                             >
                                 Précédent
                             </Button> : null}
@@ -382,6 +392,25 @@ const styles = StyleSheet.create({
 });
 
 LoginComponent.propTypes = {
+    /****
+        les props du composant Wrapper, peut être une fonction où un objet
+        - s'il s'agit d'une fonction : elle est définie comme suit : 
+            ({withScreen<boolean>,withPortal<boolean>,withScrolView<boolean>})=> <object>,
+        
+    */
+    wrapperProps : PropTypes.oneOfType([
+        PropTypes.func,
+        PropTypes.object,
+    ]),
+    /***
+        les props du composant Container, enfant  hiérachique au composant Wrapper
+        idem aux props du composant Surface
+    */
+    containerProps : PropTypes.shape(defaultObj(Surface.propTypes)),
+    //les props du composant Surface, parent direct du composant FormData utile pour le rendu du form
+    contentProps : PropTypes.shape(defaultObj(Surface.propTypes)),
+    //les props du form data, idem à ceux du composant FormData
+    formProps : PropTypes.object,
     headerTopContent : PropTypes.oneOfType([
         PropTypes.func,
         PropTypes.node,
@@ -392,13 +421,8 @@ LoginComponent.propTypes = {
         PropTypes.element,
         PropTypes.func,
     ]),
+    onSuccess : PropTypes.func, //la fonctino appelée lorsque l'utilisateur a été connecté, lorsque l'action liée à la fonction signIn de auth s'est terminée correctement
     renderNextButton : PropTypes.bool,//si le bouton next sera rendu
     renderPreviousButton : PropTypes.bool,//si le bouton previous sera rendu
 }
 
-/*** 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
-}