@fto-consult/expo-ui 5.6.0 → 5.6.2

package/babel.config.alias.js

@@ -2,6 +2,8 @@ const path = require("path");
 const fs = require("fs");
 const writeFile = require("./electron/utils/writeFile");
 module.exports = (opts)=>{
+    console.log(process.env.EXPO_UI_PATH," is process envvvvv");
+    console.log(JSON.stringify(process.env)," is stringityffff");
     const dir = path.resolve(__dirname);
     const base = opts.base || process.cwd();
     const assets = path.resolve(dir,"assets");

package/expo-ui-path.js

@@ -17,6 +17,16 @@ module.exports = function (){
     const sep = path.sep;
     const rootPath = process.cwd();
     const src = path.resolve(rootPath,"src");
+    try {
+        const envPath = path.resolve(rootPath,".env");
+        const envObj = fs.existsSync(envPath)? require("./parse-env")(fs.readFileSync(envPath,'utf8')) : {};
+        const euPathm = typeof envObj.EXPO_UI_PATH =="string" && envObj.EXPO_UI_PATH && path.resolve(envObj.EXPO_UI_PATH)||'';
+        const eu = euPathm && fs.existsSync(euPathm)? euPathm : null;
+        console.log(eu," is eu path and env object is",envObj," is env objecct feeeeee");
+        if(eu &&  fs.existsSync(path.resolve(eu,"src")) && fs.existsSync(path.resolve(eu,"webpack.config.js"))){
+            return path.resolve(eu,suffix).replace(sep,(sep+sep));
+        }
+    } catch{}
     const expoUi = path.resolve(rootPath,"expo-ui");
     if(fs.existsSync(src) && fs.existsSync(expoUi) && fs.existsSync(path.resolve(expoUi,"webpack.config.js"))){
         return path.resolve(expoUi,suffix).replace(sep,(sep+sep));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.6.0",
+  "version": "5.6.2",
   "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": "^3.8.11",
+    "@fto-consult/common": "^3.9.18",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-community/datetimepicker": "^6.7.3",

package/parse-env.js

@@ -0,0 +1,41 @@
+const LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg
+
+// Parser src into an Object
+module.exports = function parse (src) {
+  if(typeof src !=='string' || !src) return {};
+  const obj = {}
+
+  // Convert buffer to string
+  let lines = src.toString()
+
+  // Convert line breaks to same format
+  lines = lines.replace(/\r\n?/mg, '\n')
+
+  let match
+  while ((match = LINE.exec(lines)) != null) {
+    const key = match[1]
+
+    // Default undefined or null to empty string
+    let value = (match[2] || '')
+
+    // Remove whitespace
+    value = value.trim()
+
+    // Check if double quoted
+    const maybeQuote = value[0]
+
+    // Remove surrounding quotes
+    value = value.replace(/^(['"`])([\s\S]*)\1$/mg, '$2')
+
+    // Expand newlines if double quoted
+    if (maybeQuote === '"') {
+      value = value.replace(/\\n/g, '\n')
+      value = value.replace(/\\r/g, '\r')
+    }
+
+    // Add to object
+    obj[key] = value
+  }
+
+  return obj
+}

package/src/components/Drawer/index.js

@@ -8,7 +8,7 @@ import theme,{Colors,flattenStyle} from "$theme";
 import DrawerItems from './DrawerItems';
 import Dimensions,{isDesktopMedia,getCurrentMedia} from "$cplatform/dimensions";
 import {open,close} from "$epreloader";
-import {DRAWER_POSITIONS,DRAWER_TYPES,MINIMIZED_WIDTH,getDrawerWidth,MINIMIZED_ICON_SIZE,ICON_SIZE} from './utils';
+import {DRAWER_POSITIONS,DRAWER_TYPES,MINIMIZED_WIDTH,getDrawerWidth} from './utils';
 import Icon,{MENU_ICON} from "$ecomponents/Icon";
 import apiSession from "./session";
 import View from "$ecomponents/View";

package/src/components/PhoneInput/PhoneNumber.js

@@ -8,6 +8,7 @@ import numberType from './numberType.json'; // eslint-disable-line @typescript-e
 const phoneUtil = libPhoneNumber.PhoneNumberUtil.getInstance();
 const asYouTypeFormatter = libPhoneNumber.AsYouTypeFormatter;
 
+export {phoneUtil};
 
 export const parse = (number,iso2)=>{
     try {

package/src/components/PhoneInput/index.js

@@ -9,6 +9,7 @@ import Icon from "$ecomponents/Icon";
 import PhoneNumber from "./PhoneNumber";
 import SelectCountry from "$ecomponents/Countries/SelectCountry";
 import {getFlag} from "$ecomponents/Countries";
+import appConfig from "$capp/config";
 
 export {PhoneNumber};
 export * from "./PhoneNumber";
@@ -33,7 +34,7 @@ export const format = (number, iso2) => {
 }
 const prepareState = ({defaultValue,country})=>{
     defaultValue = defaultStr(defaultValue);
-    country = defaultStr(country);
+    country = defaultStr(country,appConfig.countryCode);
     if (defaultValue) {
         if (defaultValue[0] !== '+') {
             defaultValue = `+${defaultValue}`;
@@ -162,7 +163,8 @@ export default function PhoneInputComponent(props){
                             onPress={onPressFlag}
                         >
                             <>
-                                {flagImageSource && <Image testID={testID+"_FlagImage"} source={flagImageSource} height={20} width={30} style={[styles.flagImage]} />}
+                                {flagImageSource ? <Image testID={testID+"_FlagImage"} source={flagImageSource} height={20} width={30} style={[styles.flagImage]} />
+                                : null}
                                 <Icon testID={testID+"_FlagChevronIcon"} name="chevron-down" size={16} style={[styles.flagIcon]} onPress={onPressFlag} />
                             </>
                         </TouchableOpacity>

package/src/layouts/Screen/ScreenWithOrWithoutAuthContainer.js

@@ -117,7 +117,7 @@ export default function MainScreenScreenWithOrWithoutAuthContainer(props) {
   const child = <>
       {withStatusBar !== false ? <StatusBar/> : null}
       <ErrorBoundary testID={testID+"_ScreenLayoutErrorBoundary"}>
-        <View testID={testID} {...containerProps}  style={[styles.container,{backgroundColor},modal && styles.modal]}>
+        <View testID={testID} {...containerProps}  style={[styles.container,{backgroundColor},modal && styles.modal,containerProps.style]}>
           {appBar === false ? null : React.isValidElement(appBar)? state.AppBar :  <AppBar 
               testID={testID+'_AppBar'} {...appBarProps} 
               backAction = {defaultVal(appBarProps.backAction,backAction)} 

package/src/layouts/Screen/TableData.js

@@ -266,10 +266,13 @@ export default class TableDataScreenComponent extends FormDataScreen{
                 });
                 if(isUpdated){
                     //la props readOnlyOnEditing permet de rendre le champ readOnly en cas de mise à jour de la tableData
-                    if((currentField.readOnlyOnEditing === true)){
+                    const cArgs = {...this.state,data:this.getCurrentData()};
+                    const readOnlyOnEditing = typeof currentField.readOnlyOnEditing =='function'? currentField.readOnlyOnEditing(cArgs) : currentField.readOnlyOnEditing;
+                    if((readOnlyOnEditing === true)){
                         currentField.readOnly = true;
                     }
-                    if((currentField.disabledOnEditing === true)){
+                    const disabledOnEditing = typeof currentField.disabledOnEditing =='function'? currentField.disabledOnEditing(cArgs) : currentField.disabledOnEditing;
+                    if((disabledOnEditing === true)){
                         currentField.disabled = true;
                     }
                 }