@fto-consult/expo-ui 3.3.1 → 3.3.3

package/babel.config.alias.js

@@ -10,8 +10,11 @@ module.exports = (opts)=>{
     opts.base = opts.base || base;
     opts.withPouchDB = opts.withPouchDB !== false && opts.withPouchdb !== false ? true : false;
     delete opts.withPouchdb;
-    const r = require(`@fto-consult/common/babel.config.alias`)(opts);
-    const expo = path.resolve(require("./expo-ui-path")(),"src");
+    const expoUI = require("./expo-ui-path")();
+    const euCommon = path.resolve(expoUI,"node_modules","@fto-consult","common");
+    const cpath = fs.existsSync(euCommon)? path.resolve(euCommon,"babel.config.alias") : "@fto-consult/common/babel.config.alias";
+    const r = require(`${cpath}`)(opts);
+    const expo = path.resolve(expoUI,"src");
     r["$eauth"] = path.resolve(expo,"auth");
     r["$ecomponents"] = r["$expo-components"] = path.resolve(expo,"components");
     r["$etableLink"] = r["$eTableLink"] = path.resolve(r["$ecomponents"],"TableLink");

package/bin/index.js

@@ -1,99 +1,99 @@
-//#!/usr/bin/env node
-/**@see : https://blog.shahednasser.com/how-to-create-a-npx-tool/ */
-'use strict';
-process.on('unhandledRejection', err => {
-  throw err;
-});
-const supportedScript = {
-  "start" : true,//start electron
-  "build" : true, //script pour faire un build
-}
-const path= require("path");
-const fs = require("fs");
-const dir = path.resolve(__dirname);
-const electronDir = path.resolve(dir, "..","electron");
-const exec = require("../electron/exec");
-const args = process.argv.slice(2);
-let projectRoot = process.cwd();
-const createDir = require("../electron/createDir");
-const copyDir = require("../electron/copyDir");
-const parsedArgs = require("./parseArgs")(args,supportedScript);
-if(!parsedArgs.script || !(parsedArgs.script in supportedScript)){
-   console.error ("Erreur : script invalide, vous devez spécifier script figurant parmi les script : ["+Object.keys(supportedScript).join(", ")+"]");
-   process.exit();
-}
-const {script} = parsedArgs;
-let cmd = null;
-/**** 
- *    1. installer electron globallement : npm i -g electron@latest
- *  cmde : [cmd] start electron config=[path-to-config-relative-to-project-dir] 
- *        splash=[path-to-splashcreen-relative-to-project-root] 
- *        output-dir|out = [path-to-output-dir-relative-to-root-project]
- * */
-if(parsedArgs.electron){
-  const pathsJSON = path.resolve(electronDir,"paths.json");
-  if(!fs.existsSync(pathsJSON)){
-    throw "Le fichier des chemins d'accès à l'application est innexistant, rassurez vous de tester l'application en environnement web, via la cmde <npx expo start>, avant l'exécution du script electron."
-  }
-  const paths = require(`${pathsJSON}`);
-  if(typeof paths !=='object' || !paths || !paths.projectRoot){
-      throw "Fichiers des chemins d'application invalide!!! merci d'exécuter l'application en environnement web|android|ios puis réessayez"
-  }
-  projectRoot = path.resolve(projectRoot);
-  const out = parsedArgs.out || parsedArgs["output-dir"];
-  const outDir = out && path.dirname(out) && path.resolve(projectRoot,path.dirname(out),"electron") || path.resolve(projectRoot,"dist","electron")
-  if(!createDir(outDir)){
-      throw "Impossible de créer le répertoire <<"+outDir+">> du fichier binaire!!";
-  }
-  const logoPath = paths.logo || paths.$assets && path.resolve(paths.$assets,"logo.png") || paths.$images && path.resolve(paths.$images,"logo.png");
-  if(!logoPath || !fs.existsSync(logoPath)){
-     if(logoPath){
-      console.warn("Logo de l'application innexistant!! Vous devez spécifier le logo de votre application, fichier ["+(logoPath)+"]")
-    }
-  }
-  const buildOutDir = path.resolve(electronDir,"dist");
-  const indexFile = path.resolve(buildOutDir,"index.html");
-  const webBuildDir = path.resolve(projectRoot,"web-build");
-  const promise = new Promise((resolve,reject)=>{
-      const next = ()=>{
-        if(fs.existsSync(webBuildDir)){
-            return copyDir(webBuildDir,buildOutDir).catch(reject).then(resolve);
-        } else {
-          reject("fichier web-build exporté par electron innexistant!!");
-        }
-      }
-      if(parsedArgs.compile || !fs.existsSync(path.resolve(webBuildDir,"index.html"))){
-        cmd = "npx expo export:web";
-        console.log("******************** exporting app : "+cmd);
-        return exec({cmd,projectRoot}).then(next).catch(reject);
-      }
-      next();
-  });
-  return promise.then(()=>{
-    if(!fs.existsSync(buildOutDir) || !fs.existsSync(indexFile)){
-       throw "répertoire d'export web invalide où innexistant ["+buildOutDir+"]"
-    }
-    switch(script){
-        case "start":
-           cmd = "electron "+electronDir;
-           return new Promise((resolve,reject)=>{
-              exec({
-                cmd, 
-                projectRoot : electronDir,
-              }).finally(()=>{
-                console.log("ant to exit");
-              })
-              setTimeout(resolve,1000)
-           })
-          break;
-        case "build":
-          break;
-    }
-  }).catch((e)=>{
-    console.log(e," is cathing ggg");
-  }).finally(()=>{
-    process.exit();
-  });
-} else {
-  process.exit();
-}
+//#!/usr/bin/env node
+/**@see : https://blog.shahednasser.com/how-to-create-a-npx-tool/ */
+'use strict';
+process.on('unhandledRejection', err => {
+  throw err;
+});
+const supportedScript = {
+  "start" : true,//start electron
+  "build" : true, //script pour faire un build
+}
+const path= require("path");
+const fs = require("fs");
+const dir = path.resolve(__dirname);
+const electronDir = path.resolve(dir, "..","electron");
+const exec = require("../electron/exec");
+const args = process.argv.slice(2);
+let projectRoot = process.cwd();
+const createDir = require("../electron/createDir");
+const copyDir = require("../electron/copyDir");
+const parsedArgs = require("./parseArgs")(args,supportedScript);
+if(!parsedArgs.script || !(parsedArgs.script in supportedScript)){
+   console.error ("Erreur : script invalide, vous devez spécifier script figurant parmi les script : ["+Object.keys(supportedScript).join(", ")+"]");
+   process.exit();
+}
+const {script} = parsedArgs;
+let cmd = null;
+/**** 
+ *    1. installer electron globallement : npm i -g electron@latest
+ *  cmde : [cmd] start electron config=[path-to-config-relative-to-project-dir] 
+ *        splash=[path-to-splashcreen-relative-to-project-root] 
+ *        output-dir|out = [path-to-output-dir-relative-to-root-project]
+ * */
+if(parsedArgs.electron){
+  const pathsJSON = path.resolve(electronDir,"paths.json");
+  if(!fs.existsSync(pathsJSON)){
+    throw "Le fichier des chemins d'accès à l'application est innexistant, rassurez vous de tester l'application en environnement web, via la cmde <npx expo start>, avant l'exécution du script electron."
+  }
+  const paths = require(`${pathsJSON}`);
+  if(typeof paths !=='object' || !paths || !paths.projectRoot){
+      throw "Fichiers des chemins d'application invalide!!! merci d'exécuter l'application en environnement web|android|ios puis réessayez"
+  }
+  projectRoot = path.resolve(projectRoot);
+  const out = parsedArgs.out || parsedArgs["output-dir"];
+  const outDir = out && path.dirname(out) && path.resolve(projectRoot,path.dirname(out),"electron") || path.resolve(projectRoot,"dist","electron")
+  if(!createDir(outDir)){
+      throw "Impossible de créer le répertoire <<"+outDir+">> du fichier binaire!!";
+  }
+  const logoPath = paths.logo || paths.$assets && path.resolve(paths.$assets,"logo.png") || paths.$images && path.resolve(paths.$images,"logo.png");
+  if(!logoPath || !fs.existsSync(logoPath)){
+     if(logoPath){
+      console.warn("Logo de l'application innexistant!! Vous devez spécifier le logo de votre application, fichier ["+(logoPath)+"]")
+    }
+  }
+  const buildOutDir = path.resolve(electronDir,"dist");
+  const indexFile = path.resolve(buildOutDir,"index.html");
+  const webBuildDir = path.resolve(projectRoot,"web-build");
+  const promise = new Promise((resolve,reject)=>{
+      const next = ()=>{
+        if(fs.existsSync(webBuildDir)){
+            return copyDir(webBuildDir,buildOutDir).catch(reject).then(resolve);
+        } else {
+          reject("fichier web-build exporté par electron innexistant!!");
+        }
+      }
+      if(parsedArgs.compile || !fs.existsSync(path.resolve(webBuildDir,"index.html"))){
+        cmd = "npx expo export:web";
+        console.log("******************** exporting app : "+cmd);
+        return exec({cmd,projectRoot}).then(next).catch(reject);
+      }
+      next();
+  });
+  return promise.then(()=>{
+    if(!fs.existsSync(buildOutDir) || !fs.existsSync(indexFile)){
+       throw "répertoire d'export web invalide où innexistant ["+buildOutDir+"]"
+    }
+    switch(script){
+        case "start":
+           cmd = "electron "+electronDir;
+           return new Promise((resolve,reject)=>{
+              exec({
+                cmd, 
+                projectRoot : electronDir,
+              }).finally(()=>{
+                console.log("ant to exit");
+              })
+              setTimeout(resolve,1000)
+           })
+          break;
+        case "build":
+          break;
+    }
+  }).catch((e)=>{
+    console.log(e," is cathing ggg");
+  }).finally(()=>{
+    process.exit();
+  });
+} else {
+  process.exit();
+}

package/metro.config.js

@@ -24,6 +24,6 @@ module.exports = function(opts){
       'jsx', 'js','tsx',
   ]
   // Remove all console logs in production...
-  //config.transformer.minifierConfig.compress.drop_console = false;
+  config.transformer.minifierConfig.compress.drop_console = false;
   return config;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "3.3.1",
+  "version": "3.3.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^2.15.0",
+    "@fto-consult/common": "^2.15.1",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

package/src/auth/Login.js

@@ -20,7 +20,7 @@ import {getTitle} from "$escreens/Auth/utils";
 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;
 
@@ -89,7 +89,8 @@ export default function LoginComponent(props){
     const {header,
         headerTopContent:HeaderTopContent,
         containerProps : customContainerProps,
-        contentProp,
+        withHeaderAvatar,
+        contentProps : customContentProps,
         withScrollView:customWithScrollView,children,initialize,contentTop,data:loginData,canGoToNext,keyboardEvents,onSuccess:onLoginSuccess,mutateData,beforeSubmit:beforeSubmitForm,canSubmit:canSubmitForm,onStepChange,...loginProps} = defaultObj(getProps({
         ...state,
         setState,
@@ -106,6 +107,7 @@ export default function LoginComponent(props){
         previousButtonRef,
     }));
     const containerProps = defaultObj(customContainerProps);
+    const contentProps = defaultObj(customContentProps);
 
     React.useEffect(()=>{
         Preloader.closeAll();
@@ -198,9 +200,9 @@ export default function LoginComponent(props){
     const withScrollView = typeof customWithScrollView =='boolean'? customWithScrollView : true;
     const Wrapper = withPortal ? ScreenWithoutAuthContainer  : withScrollView ? ScrollView: View;
     const mQueryUpdateProps = (a)=>{
-        const style = StyleSheet.flatten([updateMediaQueryStyle(),containerProps.style]);
-        if(typeof containerProps.updateMediaQueryStyle =='function'){
-            return containerProps.updateMediaQueryStyle({style})
+        const style = StyleSheet.flatten([updateMediaQueryStyle(),contentProps.style]);
+        if(typeof contentProps.updateMediaQueryStyle =='function'){
+            return contentProps.updateMediaQueryStyle({style})
         }
         return {style};
     };
@@ -211,14 +213,14 @@ export default function LoginComponent(props){
     return <Wrapper testID = {testID+"_Wrapper" }{...wrapperProps}>
         <DialogProvider ref={dialogProviderRef}/>
         {sH}
-        <Surface style={[styles.container,{backgroundColor}]} testID={testID}>
-            <Surface elevation = {0} {...containerProps} mediaQueryUpdateNativeProps = {mQueryUpdateProps} {...containerProps} testID={testID+"_Content"} style={[styles.content,updateMediaQueryStyle(),{backgroundColor},containerProps.style]}>
+        <Surface style={[styles.container,{backgroundColor}]} {...containerProps} testID={testID}>
+            <Surface elevation = {0} {...contentProps} mediaQueryUpdateNativeProps = {mQueryUpdateProps} {...contentProps} testID={testID+"_Content"} style={[styles.content,updateMediaQueryStyle(),{backgroundColor},contentProps.style]}>
                 <FormData 
                     formName = {formName}
                     testID = {testID+"_FormData"}
                     style = {[styles.formData,{backgroundColor}]}
                     header = {<View style = {[styles.header]}>
-                        <Avatar testID={testID+"_Avatar"} size={50} secondary icon = 'lock'/>
+                        {withHeaderAvatar !== false && <Avatar testID={testID+"_Avatar"} size={50} secondary icon = 'lock'/> || null}
                         {
                             React.isValidElement(header)? header : 
                             <Label testID={testID+"_HeaderText"} bool style={{color:theme.colors.primaryOnSurface,fontSize:18,paddingTop:10}}>Connectez vous SVP</Label>
@@ -333,3 +335,15 @@ const styles = StyleSheet.create({
     }
 });
 
+LoginComponent.propTypes = {
+    withHeaderAvatar:PropTypes.bool,//si l'on affichera l'avatar de connexion
+    headerTopContent : PropTypes.oneOfType([
+        PropTypes.func,
+        PropTypes.node,
+        PropTypes.element,
+    ]),
+    header : PropTypes.oneOfType([
+        PropTypes.node,
+        PropTypes.element,
+    ]),
+}