@fto-consult/expo-ui 6.21.4 → 6.21.6

package/index.js

@@ -4,10 +4,10 @@ import App from "./src/App";
 import Provider from "$econtext/Provider";
 const REGISTER_EVENT = "REGISTER-APP-COMPONENT-ROOT";
 import {useState,useEffect} from "react";
-const appRegisteredRef = {current:false};
-import {observable} from "$clib/observable";
-const context = {};
-observable(context);
+const propsRef = {current:null};
+import APP from "$capp/instance";
+import {isObj} from "$cutils";
+
 
 /****
  * les options sont de la forme : 
@@ -27,34 +27,31 @@ observable(context);
 //!isWeb && registerRootComponent(x=>null);
 
 const MainAppEntry = function(mProps){
-    const [props,setProps] = useState(null);
+    const [props,setProps] = useState(propsRef.current);
     const onRegisterProps = (props)=>{
-        if(appRegisteredRef.current) return;
-        appRegisteredRef.current = true;
-        console.log(props," is registered");
+        if(isObj(propsRef.current) || !isObj(props)) return;
+        propsRef.current = props;
         setProps({...props});
     }
     useEffect(()=>{
-        console.log("binding event ",context);
-        context.on(REGISTER_EVENT,onRegisterProps);
+        APP.on(REGISTER_EVENT,onRegisterProps);
         return ()=>{
-            context.off(REGISTER_EVENT,onRegisterProps);
+            APP.off(REGISTER_EVENT,onRegisterProps);
         }
     },[]);
-    if(!props) {
-        console.log(props," not registered",mProps);
-        return <View/>;
+    const cProps = isObj(props) ? props : propsRef.current;
+    if(!isObj(cProps)) {
+        return null;
     }
-    const rProps = {...mProps,...props};
+    const rProps = {...mProps,...cProps};
     console.log(rProps," is props ready to render");
     const {onMount,onUnmount,onRender,render,swrConfig,init,...rest} = rProps;
     return  <Provider {...props} {...rest} swrConfig={isObj(swrConfig) && swrConfig || {}} children={<App init={init} render={render} onMount={onMount} onUnmount={onUnmount} onRender={onRender}/>}/>
 };
 
 export default function registerApp (opts){
-    if(appRegisteredRef.current) return false;
-    console.log("will register event ",opts);
-    return context.trigger(REGISTER_EVENT,opts);
+    propsRef.current = opts;
+    APP.trigger(REGISTER_EVENT,opts);
 }
 
 registerRootComponent(MainAppEntry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "6.21.4",
+  "version": "6.21.6",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {