@fto-consult/expo-ui 1.3.2 → 1.3.4

package/package.json

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

package/src/components/Button/index.js

@@ -17,7 +17,7 @@ import PropTypes from "prop-types";
 const white = "white",black = "black";
 
 const ButtonComponent = React.forwardRef(({
-  disabled,
+  disabled:customDisabled,
   compact,
   mode = 'text',
   dark,
@@ -86,7 +86,7 @@ const ButtonComponent = React.forwardRef(({
 
   const [state,setState] = React.useState({
      isLoading : typeof loading =='boolean'? loading : false,
-     isDisabled : typeof disabled =='boolean'? disabled : false,
+     isDisabled : typeof customDisabled =='boolean'? customDisabled : false,
   });
   const {isLoading,isDisabled} = state;
   const setIsLoading = (loading)=>{
@@ -114,16 +114,16 @@ const ButtonComponent = React.forwardRef(({
      }
   }
   React.useEffect(()=>{
-      if(typeof disabled !=='boolean' && typeof loading !== 'boolean') return;
-      if(typeof loading =='boolean' && loading == isLoading && typeof disabled =='boolean' && disabled === isDisabled){
+      if(typeof customDisabled !=='boolean' && typeof loading !== 'boolean') return;
+      if(typeof loading =='boolean' && loading == isLoading && typeof customDisabled =='boolean' && customDisabled === isDisabled){
           return;
       }
       setState({
         ...state,
         isLoading : typeof loading =='boolean' ? loading : state.isLoading,
-        isDisabled : typeof disabled =='boolean' ? disabled : state.isDisabled,
+        isDisabled : typeof customDisabled =='boolean' ? customDisabled : state.isDisabled,
       });
-  },[loading,disabled]);
+  },[loading,customDisabled]);
     
   const handlePressOut = () => {
     if (hasElevation) {
@@ -139,7 +139,7 @@ const ButtonComponent = React.forwardRef(({
   containerProps = defaultObj(containerProps);
   style = StyleSheet.flatten(style) || {};
   labelStyle = StyleSheet.flatten([labelStyle]);
-  disabled = isDisabled || isLoading;
+  const disabled = isDisabled || isLoading;
   let textColor = Colors.isValid(buttonColor)?buttonColor : Colors.isValid(labelStyle.color) ? labelStyle.color : Colors.isValid(style.color)? style.color  : theme.colors.primary,
     borderWidth;
     const restButtonStyle = {

package/src/components/Form/Action.js

@@ -1,11 +1,12 @@
 import React from "$react";
 import PropTypes from "prop-types";
-import Button from "$ecomponents/Button";
+import Button from "$components/Button";
 import notify from "$notify";
 import FormsManager from "./utils/FormsManager";
 import {uniqid} from "$utils";
 import { getFormInstance } from "./utils/FormsManager";
 import {flattenStyle} from "$theme";
+import APP from "$capp/instance";
 
 const FormActionComponent = React.forwardRef(({
     formName,disabled:customDisabled,
@@ -30,6 +31,13 @@ const FormActionComponent = React.forwardRef(({
         if(!isMounted()) return;
         setState({...state,disabled:true})
     }
+    let _disabled = disabled;
+    if(!disabled && formName){
+        const f = getFormInstance(formName);
+        if(!f || (!f.isValid || !f.isValid())){
+            _disabled = true;
+        }
+    }
     context.isDisabled = x=> disabled ? true : false;
     context.isEnabled = x=> !context.isDisabled();
     context.toggleStatus = () =>{
@@ -50,19 +58,19 @@ const FormActionComponent = React.forwardRef(({
     React.setRef(ref,context);
     React.useEffect(()=>{
         FormsManager.trigger("mountAction",formName,context);
+        const onMountForm = (nFormNmae)=>{
+            if(nFormNmae == formName){
+                context.toggleStatus();
+            }
+        };
+        APP.on("MOUNT_FORM",onMountForm);
         context.toggleStatus();
         return ()=>{
             React.setRef(ref,null);
             FormsManager.trigger("unmountAction",formName,id);
+            APP.off("MOUNT_FORM",onMountForm);
         }
     },[]);
-    let _disabled = disabled;
-    if(!disabled && formName){
-        const f = getFormInstance(formName);
-        if(!f || (!f.isValid || !f.isValid())){
-            _disabled = true;
-        }
-    }
     const props = {
         ...rest,
         ...componentProps,
@@ -93,7 +101,7 @@ const FormActionComponent = React.forwardRef(({
     delete props.formName;
     delete props.isAction;
     delete props.formName;
-    return <Component ref={innerRef}  {...props}>{children}</Component>
+    return <Component  ref = {innerRef} {...props}>{children}</Component>
 });
 
 

package/src/components/Form/utils/FormsManager.js

@@ -24,6 +24,7 @@ if(!isObj(APP.FormsManager)){
         formObject._fields = defaultObj(formObject._fields);
         formObject._actions= defaultObj(formObject._actions);
         APP.FormsManager.forms[formName] = formObject;
+        APP.trigger("MOUNT_FORM",formName);
     }).on("unmount",(formName)=>{
         delete APP.FormsManager.forms[formName];
     }).on("registerField",(fieldName,formName,fieldObj)=>{

package/src/components/List/Common.js

@@ -220,7 +220,7 @@ CommonListComponent.propTypes = {
 
 
 const styles = StyleSheet.create({
-    container1: {
+    container: {
       flex: 1,
       minHeight : 300,
     },

package/src/navigation/Drawer/index.js

@@ -46,7 +46,6 @@ const DrawerNavigator = React.forwardRef(({content,children,state,...props},ref)
         if(prevIsLoggedIn === isLoggedIn) return;
         navigate("Home");
     },[isLoggedIn]);
-    console.log(isLoggedIn," is loggggedd in ddd",isAuthLoggedIn)
     if(!isLoggedIn) {
         return <Login withPortal
             onSuccess = {(data)=>{

package/src/screens/index.js

@@ -127,9 +127,7 @@ export const handleScreen = ({Screen,Factory,ModalFactory,result,useTheme,filter
                     },[]);
                     setScreenOptions(options);
                     const allowDrawer = typeof options.allowDrawer ==='boolean'? options.allowDrawer : typeof Screen.allowDrawer =='boolean'? Screen.allowDrawer : Screen.isModalScreen == true ? false : true;
-                    return <>
-                        <Screen authRequired={authRequired||allowDrawer} backAction={Screen.isModalScreen} modal={Screen.isModalScreen} allowDrawer={allowDrawer} withDrawer = {allowDrawer !== false ? true : false} {...props} screenName={sanitizedName} extra ={defaultObj(extra)} options={options} />
-                    </>
+                    return <Screen authRequired={authRequired||allowDrawer} backAction={Screen.isModalScreen} modal={Screen.isModalScreen} allowDrawer={allowDrawer} withDrawer = {allowDrawer !== false ? true : false} {...props} screenName={sanitizedName} extra ={defaultObj(extra)} options={options} />
                 }}
             </ScreenComponent>)
         } else {