@fto-consult/expo-ui 8.20.0 → 8.20.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "8.20.0",
+  "version": "8.20.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "scripts": {
     "clear-npx-cache": "npx clear-npx-cache",
@@ -69,7 +69,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@faker-js/faker": "^8.0.2",
-    "@fto-consult/common": "^4.20.0",
+    "@fto-consult/common": "^4.20.8",
     "@fto-consult/node-utils": "^1.4.7",
     "apexcharts": "^3.45.2",
     "crypto-browserify": "^3.12.0",

package/src/App.js

@@ -1,6 +1,7 @@
 import session from "$session";
 import {useState,useEffect} from "$react";
 import Provider from "$econtext/Provider";
+import {isMobileNative} from "$cplatform";
 import App from "./AppEntry";
 /****
  * les options sont de la forme : 
@@ -15,19 +16,18 @@ import App from "./AppEntry";
  * }
  */
 
-export default function ExpoUIAppEntryProvider({children,init,...rest}){
+export default function ExpoUIAppEntryProvider({children:cChildren,init,...rest}){
     const [children,setChildren] = useState(null);
+    const canInit = typeof session.init =="function";
     useEffect(()=>{
-        const end = ()=>{
-            setChildren(<Provider {...rest}>
-                <App init={init} children={children}/>
+        if(!canInit) return ()=>{}
+        Promise.resolve(session.init()).finally(()=>{
+            return setChildren(<Provider {...rest}>
+                <App init={init} children={cChildren}/>
             </Provider>);
-        };
-        if(typeof session?.init =="function"){
-            return Promise.resolve(init).finally(end);
-        } else {
-            end();
-        }
+        });
     },[]);
-    return children;
+    return canInit ? children : <Provider {...rest}>
+    <App init={init} children={cChildren}/>
+</Provider>;
 }

package/src/session/index.native.js

@@ -1,6 +1,6 @@
 import * as SQLite from 'expo-sqlite/next';
 import {isDev} from "$cplatform";
-import appConfig from "$capp/config";
+import {getName} from "$capp/config.utils";
 import {sanitizeFileName,isNonNullString,isObj,defaultObj} from "$cutils";
 import {sanitizeKey as cSanitizeKey,handleGetValue,handleSetValue} from "$csession/utils";
 import * as FileSystem from 'expo-file-system';
@@ -19,7 +19,7 @@ export class SQLiteSession {
       this.data = new Map();
     }
     getDBName(){
-        let appName = appConfig.name;
+        let appName = getName();
         const suffix = "sqlite-sessname";
         if(isNonNullString(appName)){
             appName = sanitizeFileName(appName.replaceAll("\\","/").replaceAll("\\","")).replace(/\s+/g, "").trim();