@fto-consult/expo-ui 6.3.0 → 6.4.1

package/babel.config.alias.js

@@ -107,9 +107,9 @@ module.exports = (opts)=>{
     //le chemin ver le repertoire electron
     r.$eelectron = r["$e-electron"] = $electron;
     r.$electron = r.$electron || r.$eelectron;
-    r.$econtext/hooks = path.resolve(expo,"context");
+    r.$econtext = path.resolve(expo,"context");
     if(!r.$context){
-        r.$context = r.$econtext/hooks;
+        r.$context = r.$econtext;
     }
     const electronAssetsPath = path.resolve(dir,"electron","assets");
     if($assets){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.3.0",
+  "version": "6.4.1",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -40,7 +40,8 @@
     "find-licenses": "node ./find-licenses.js",
     "fix-dependencies": "expo-cli doctor --fix-dependencies",
     "delete-node-modules": "rimraf ./**/node_modules",
-    "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'"
+    "modifier-url-remote-git": "git remote set-url origin 'https://borispipo@github.com/borispipo/smart-eneo.git'",
+    "update": "npm i @emotion/native@latest apexcharts@latest file-saver@latest fs-extra@latest google-libphonenumber@latest @pchmn/expo-material3-theme@latest @gorhom/portal@latest @emotion/native@latest @fto-consult/common@latest react-native-blob-util react-native-gesture-handler@latest react-native-iphone-x-helper@latest react-native-mime-types@latest react-native-paper@latest  react-native-paper-dates@latest @react-navigation/native@latest @react-navigation/native-stack@latest react-virtuoso@latest sharp-cli@latest tippy.js@latest websql@latest xlsx@latest && npx expo install --fix"
   },
   "bin": "./bin/index.js",
   "repository": {
@@ -61,15 +62,15 @@
     "@emotion/native": "^11.11.0",
     "@expo/html-elements": "^0.5.1",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.19.0",
+    "@fto-consult/common": "^3.19.2",
     "@gorhom/portal": "^1.0.14",
-    "@pchmn/expo-material3-theme": "^1.0.1",
+    "@pchmn/expo-material3-theme": "^1.3.1",
     "@react-native-async-storage/async-storage": "1.18.2",
     "@react-native-community/datetimepicker": "7.2.0",
     "@react-native-community/netinfo": "9.3.10",
     "@react-native/assets-registry": "^0.72.0",
-    "@react-navigation/native": "^6.1.6",
-    "@react-navigation/native-stack": "^6.9.12",
+    "@react-navigation/native": "^6.1.7",
+    "@react-navigation/native-stack": "^6.9.13",
     "@shopify/flash-list": "1.4.3",
     "apexcharts": "^3.41.0",
     "expo": "^49.0.3",
@@ -91,12 +92,12 @@
     "react": "^18.2.0",
     "react-content-loader": "^6.2.1",
     "react-dom": "^18.2.0",
-    "react-native": "0.72.1",
+    "react-native": "0.72.3",
     "react-native-big-list": "^1.6.1",
     "react-native-blob-util": "^0.18.3",
-    "react-native-gesture-handler": "~2.12.0",
+    "react-native-gesture-handler": "^2.12.0",
     "react-native-iphone-x-helper": "^1.3.1",
-    "react-native-mime-types": "^2.3.0",
+    "react-native-mime-types": "^2.4.0",
     "react-native-paper": "^5.9.1",
     "react-native-paper-dates": "^0.18.12",
     "react-native-reanimated": "~3.3.0",
@@ -105,8 +106,7 @@
     "react-native-svg": "13.9.0",
     "react-native-web": "~0.19.6",
     "react-native-webview": "13.2.2",
-    "react-navigation": "^4.4.4",
-    "react-virtuoso": "^4.3.11",
+    "react-virtuoso": "^4.4.0",
     "sharp-cli": "^4.1.1",
     "tippy.js": "^6.3.7",
     "websql": "^2.0.3",

package/src/auth/Login.js

@@ -21,13 +21,13 @@ import {isWeb} from "$cplatform";
 import ProviderSelector from "./ProviderSelector";
 import { ScrollView } from "react-native";
 import PropTypes from "prop-types";
-import getLoginProps from "$getLoginProps";
-const getProps = typeof getLoginProps =='function'? getLoginProps : x=>null;
+import useContext from "$econtext/hooks";
 
 const WIDTH = 400;
 
 export default function LoginComponent(props){
     let {formName,step,appBarProps,onSuccess,withPortal,testID} = props;
+    const {components:{loginPropsMutator}} = useContext();
     const loginTitle = getTitle();
     testID = defaultStr(testID,"RN_Auth.LoginComponent");
     formName = React.useRef(uniqid(defaultStr(formName,"login-formname"))).current;
@@ -91,7 +91,7 @@ export default function LoginComponent(props){
         containerProps : customContainerProps,
         withHeaderAvatar,
         contentProps : customContentProps,
-        withScrollView:customWithScrollView,children,initialize,contentTop,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,mutateData,beforeSubmit:beforeSubmitForm,canSubmit:canSubmitForm,onStepChange,...loginProps} = defaultObj(getProps({
+        withScrollView:customWithScrollView,children,initialize,contentTop,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,mutateData,beforeSubmit:beforeSubmitForm,canSubmit:canSubmitForm,onStepChange,...loginProps} = loginPropsMutator({
         ...state,
         setState,
         state,
@@ -105,7 +105,7 @@ export default function LoginComponent(props){
         nextButtonRef,
         ProviderSelector,
         previousButtonRef,
-    }));
+    });
     const containerProps = defaultObj(customContainerProps);
     const contentProps = defaultObj(customContentProps);
 

package/src/context/Provider.js

@@ -6,6 +6,7 @@ import {colorsAlias,Colors} from "$theme";
 import {isObj} from "$cutils";
 import eMainScreens from "$escreens/mainScreens";
 import {ExpoUIContext} from "./hooks";
+import Login from "$eauth/Login";
 
 /*****
     les utilitaires disponibles à passer au provider : 
@@ -22,7 +23,7 @@ import {ExpoUIContext} from "./hooks";
             ReactNode,
             ReactComponent
         },
-        //la fonction permettant de muter les props du composant TableLink
+        loginPropsMutator : ({object})=><{object}>, la fonction permettant de muter les props du composant Login,
         tableLinkPropsMutator : ({object})=><{object}>, la fonction permettant de muter les props du composant TableLink
     },
     navigation : {
@@ -42,6 +43,7 @@ const Provider = ({children,getTableData,navigation,components,getStructData,tab
     appConfig.structsData = appConfig.structsData = isObj(structsData)? structsData : null;
     appConfig.getTableData = getTableData;
     appConfig.getStructData = getStructData;
+    appConfig.LoginComponent = Login;
     //const colorScheme = useColorScheme();
     appConfig.extendAppTheme = (theme)=>{
         if(!isObj(theme)) return;
@@ -77,13 +79,11 @@ const Provider = ({children,getTableData,navigation,components,getStructData,tab
         navigation,
         components : {
             ...components,
+            loginPropsMutator : (props)=>{
+               return extendProps(components.loginPropsMutator,props);
+            },
             tableLinkPropsMutator : (props)=>{
-                const prs = defaultObj(props);
-                const o = typeof components.tableLinkPropsMutator ==='function'? components.tableLinkPropsMutator(props) : null;
-                if(isObj(o)){
-                    return {...prs,...o};
-                }
-                return prs
+                return extendProps(components.tableLinkPropsMutator,props);
             }
         },
         getTableData,getStructData,tablesData,structsData,appConfig
@@ -92,4 +92,12 @@ const Provider = ({children,getTableData,navigation,components,getStructData,tab
     />;
 }
 
+const extendProps = (cb,props)=>{
+  const prs = defaultObj(props);
+  const o = typeof  cb ==='function'? cb(props) : null;
+  if(isObj(o)){
+      return {...prs,...o};
+  }
+  return prs
+}
 export default Provider;