@fto-consult/expo-ui 5.5.2 → 5.6.1

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.5.2",
+  "version": "5.6.1",
   "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.4.1",
+    "@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",
@@ -70,7 +70,7 @@
     "@react-navigation/native": "^6.1.1",
     "@react-navigation/native-stack": "^6.9.7",
     "@shopify/flash-list": "^1.4.0",
-    "expo": "^48.0.7",
+    "expo": "^48.0.9",
     "expo-camera": "~13.2.1",
     "expo-clipboard": "~4.1.1",
     "expo-font": "~11.1.1",
@@ -84,7 +84,6 @@
     "fs-extra": "^11.1.0",
     "google-libphonenumber": "^3.2.31",
     "htmlparser2-without-node-native": "^3.9.2",
-    "mongo-parse": "^2.1.0",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",

package/src/components/Datagrid/IndexComponent.js

@@ -40,7 +40,4 @@ DatagridMainComponent.displayName = "DatagridMainComponent";
 DatagridMainComponent.propTypes = {
     ...DatagridTableData.propTypes
 }
-
-DatagridMainComponent.getDBName = DatagridTableData.getDBName;
-
 DatagridMainComponent.LinesProgressBar = DatagridMainComponent.LineProgressBar = DatagridTableData.LineProgressBar;

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/Form/Fields/SelectTableData/Component.js

@@ -12,7 +12,6 @@ import fetch from "$capi"
 import {willConvertFiltersToSQL} from "$ecomponents/Datagrid/utils";
 import React from "$react";
 import appConfig from "$appConfig";
-import {isJSON,parseJSON} from "$utils/json";
 
 /*** la tabledataSelectField permet de faire des requêtes distantes pour rechercher les données
  *  Elle doit prendre en paramètre et de manière requis : les props suivante : 

package/src/components/Link/Browser.js

@@ -1,6 +1,6 @@
 import { isValidUrl, isNonNullString,uniqid,defaultObj,defaultStr} from "$utils";
 import getCallbackUrl from "./getUrlCallback";
-import { getQueryParams,setQueryParams} from "$utils/uri";
+import { getQueryParams,setQueryParams} from "$cutils/uri";
 const BROWSERS_EVENTS = {};
 const callbackURIID = "callbackURIIDDD";
 

package/src/components/Link/getUrlCallback.js

@@ -1,5 +1,5 @@
 import { defaultStr } from "$utils";
-import { getCurrentURI,getNativeMobileAppURI } from "$utils/uri";
+import { getCurrentURI,getNativeMobileAppURI } from "$cutils/uri";
 export default function getCallbackUrl (url){
     let cUrl = undefined;
     if (typeof window !== 'undefined' && window) {

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/components/StatusBar/Component/index.web.js

@@ -2,7 +2,7 @@ import React from "$react";
 //import { StatusBar } from 'expo-status-bar';
 import theme,{getStatusBarStyle,Colors} from "$theme"
 import {isTouchDevice,uniqid} from "$utils";
-import {isDOMElement,removeClassName,addClassName} from "$utils/dom";
+import {isDOMElement,removeClassName,addClassName} from "$cutils/dom";
 import { StyleSheet } from "react-native";
 
 const styleId = uniqid("dynamic-css-style-id");

package/src/components/Tooltip/Popover/index.web.js

@@ -1,11 +1,11 @@
 import tippy from 'tippy.js';
 import 'tippy.js/dist/tippy.css';
 import React from "$react";
-import {getMaxZindex} from "$utils/dom";
+import {getMaxZindex} from "$cutils/dom";
 import PropTypes from "prop-types";
 import Label from "$ecomponents/Label";
 import { TIPPY_THEME } from '$theme/updateNative/utils';
-import {isDOMElement} from "$utils/dom";
+import {isDOMElement} from "$cutils/dom";
 import {uniqid,defaultStr,defaultObj} from "$utils";
 
 const TippyTooltipComponent  = React.forwardRef((props,ref)=>{

package/src/components/WebView/index.js

@@ -6,7 +6,7 @@ import WebView from "./Component";
 import {defaultStr} from "$utils";
 import React from "$react";
 import PropTypes from "prop-types";
-import {isValidUrl} from "$utils/uri";
+import {isValidUrl} from "$cutils/uri";
 import FileSystem from "$file-system";
 
 const  WebViewComponent = React.forwardRef(({children,source,style,testID,...props},ref)=>{

package/src/index.js

@@ -5,7 +5,7 @@ import APP from "$capp";
 import {AppStateService,trackIDLE,stop as stopIDLE} from "$capp/idle";
 import { NavigationContainer} from '@react-navigation/native';
 import {navigationRef} from "$cnavigation"
-import NetInfo from '$utils/NetInfo';
+import NetInfo from '$cutils/NetInfo';
 import Auth from "$cauth";
 import {isNativeMobile,isElectron} from "$cplatform";
 import Navigation from "./navigation";
@@ -14,7 +14,7 @@ import { showConfirm } from "$ecomponents/Dialog";
 import {close as closePreloader, isVisible as isPreloaderVisible} from "$epreloader";
 import SplashScreen from "$ecomponents/SplashScreen";
 import {notify} from "$ecomponents/Dialog";
-import {decycle} from "$utils/json";
+import {decycle} from "$cutils/json";
 import init from "$capp/init";
 import { setIsInitialized} from "$capp/utils";
 import {isObj,isNonNullString,isPromise,defaultObj,defaultStr} from "$cutils";

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;
                     }
                 }