@fto-consult/expo-ui 5.1.0 → 5.3.0

package/appConfig.txt

@@ -20,4 +20,5 @@
     }
     getTableData : {function(tableName)=>table} retourne l'ojet table data,
     swrRefreshTimeout : {number} le délai d'inactivité auquel, une fois l'application active, les données de type listData sont rafraichies
+    handleHelpScreen : {boolean}, //if Help screen will be added on navigation's main drawer
  }

package/electron/index.js

@@ -1,5 +1,4 @@
 const {app, BrowserWindow,Tray,Menu,MenuItem,globalShortcut,systemPreferences,powerMonitor,ipcMain,dialog, nativeTheme} = require('electron')
-const appConfig  = {};
 const session = require("./utils/session");
 const path = require("path");
 const fs = require("fs");

package/electron/preload.js

@@ -93,7 +93,7 @@ const removeListener =  (channel, callback) => {
 };
 const ELECTRON = {
     get getPouchdb(){
-        return (PouchDB,sqlPouch)=> {
+        return ({PouchDB,sqlPouch})=> {
             window.sqlitePlugin = {openDatabase:require('websql')};
             PouchDB.plugin(function CapacitorSqlitePlugin (PouchDB) {
                 PouchDB.adapter('node-sqlite', sqlPouch(), true)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "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.20.14",
+    "@fto-consult/common": "^3.3.3",
     "@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.5",
+    "expo": "^48.0.7",
     "expo-camera": "~13.2.1",
     "expo-clipboard": "~4.1.1",
     "expo-font": "~11.1.1",

package/src/App.js

@@ -40,7 +40,7 @@ Object.map(Utils,(v,i)=>{
      window[i] = v;
   }
 });
-export default function getIndex({onMount,onUnmount,onRender,preferences:appPreferences}){
+export default function getIndex({onMount,onUnmount,onRender,preferences:appPreferences,...rest}){
   const isScreenFocusedRef = React.useRef(true);
     ///garde pour chaque écran sa date de dernière activité
     const screensRef = React.useRef({});//la liste des écrans actifs
@@ -186,7 +186,7 @@ export default function getIndex({onMount,onUnmount,onRender,preferences:appPref
                                   <DialogProvider responsive/>
                                   <AlertProvider SimpleSelect={SimpleSelect}/>
                                   <FormDataDialogProvider/>  
-                                  {<Index theme={theme}/>}
+                                  {<Index {...rest} theme={theme}/>}
                                   <ErrorBoundaryProvider/>
                                   <BottomSheetProvider/>
                                 </PreferencesContext.Provider>  

package/src/components/AppBar/index.js

@@ -66,6 +66,7 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
     }
     title = defaultVal(title,params.title,APP.getName());
     backActionProps = Object.assign({},backActionProps);
+    backActionProps.testID = defaultStr(backActionProps.testID,testID+"_BackAction");
     
     let BackActionComponent  = backAction === false ? null : React.isComponent(backAction)? backAction : back ? Appbar.BackAction : Icon ;
     backActionProps.color = backActionProps.color && Colors.isValid(backActionProps.color)? backActionProps.color : anchorStyle.color;
@@ -90,6 +91,7 @@ const AppBarComponent = React.forwardRef((props,ref)=> {
           children = {backAction}
         /> 
     }
+    console.log(backAction," is back actions");
     const [context] = React.useState({});
     actions = typeof actions =='function'? actions(getCallAgs()) : actions;
     const dimensions = Dimensions.get("window");

package/src/index.js

@@ -33,7 +33,7 @@ const resetExitCounter = ()=>{
 
 const NAVIGATION_PERSISTENCE_KEY = 'NAVIGATION_STATE';
 
-function App(props) {
+function App({init:initApp}) {
   AppStateService.init();
   const [initialState, setInitialState] = React.useState(undefined);
   const appReadyRef = React.useRef(true);
@@ -156,9 +156,9 @@ function App(props) {
       console.log(e," is net info heinn")
     });
     loadResources().finally(()=>{
-      init().then(()=>{
+      (typeof initApp =='function'?initApp : init)().then(()=>{
         if(Auth.isLoggedIn()){
-          Auth.loginUser(false);
+           Auth.loginUser(false);
         }
         setState({
           ...state,isInitialized:true,isLoading : false,

package/src/screens/ScreenWrapper.js

@@ -62,7 +62,7 @@ export default function ScreenWrapperNavComponent(_props){
         }
     },[]);
     setScreenOptions(options);
-    const allowDrawer = typeof options.allowDrawer ==='boolean'? options.allowDrawer : typeof Screen.allowDrawer =='boolean'? Screen.allowDrawer : Screen.isModalScreen == true ? false : true;
+    const allowDrawer = typeof options.allowDrawer ==='boolean'? options.allowDrawer : typeof options.withDrawer =='boolean'? options.withDrawer : typeof Screen.allowDrawer =='boolean'? Screen.allowDrawer : Screen.isModalScreen == true ? false : true;
     return <Screen 
         {...rest}
         key = {sanitizedName}