@fto-consult/expo-ui 8.83.0 → 8.83.2

package/src/components/Form/Action.js

@@ -63,14 +63,25 @@ const FormActionComponent = React.forwardRef(({
                 context.toggleStatus();
             }
         };
+        const onV = FormsManager.on("validate",onMountForm);
+        const onNoV = FormsManager.on("novalidate",onMountForm);
+        const onUpdate = FormsManager.on("update",onMountForm);
         APP.on("MOUNT_FORM",onMountForm);
         context.toggleStatus();
         return ()=>{
             React.setRef(ref,null);
             FormsManager.trigger("unmountAction",formName,id);
             APP.off("MOUNT_FORM",onMountForm);
+            [onV,onNoV,onUpdate].map(v=>{
+                if(typeof v?.remove =="function"){
+                    v.remove();
+                }
+            });
+            FormsManager.off("validate",onMountForm);
+            FormsManager.off("novalidate",onMountForm);
+            FormsManager.off("update",onMountForm);
         }
-    },[]);
+    },[formName]);
     const props = {
         ...rest,
         ...componentProps,
@@ -85,7 +96,6 @@ const FormActionComponent = React.forwardRef(({
                 return;
             }
             const args = React.getOnPressArgs(event);
-            //console.log(args," is argggggg ",onPress)
             if(!onPress) return;
             const formInstance = getFormInstance(formName);
             if(!formInstance || typeof formInstance.isValid != 'function' && isObj(formInstance.props)) return;
@@ -97,12 +107,12 @@ const FormActionComponent = React.forwardRef(({
     if(typeof children ==='function'){
         return children(props);
     }
-    Component = defaultVal(props.Component,Component,Button);
+    Component = React.isComponent(props.Component) ? props.Component : React.isComponent(Component)? Component : Button;
     delete props.Component;
     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/Fields/Field.js

@@ -277,8 +277,10 @@ export default class Field extends AppComponent {
                 this.callOnChange({value,event,isValid:true,...rest});
                 if(form && form.props){
                     if(canEnable){
+                        const vOpts = {...defaultObj(rest),formName:this.formName,data:form.getData(),context:form,fieldInstance:this,field:this.name,name:this.name,value,event,form};
+                        form.onValidate.call(form,vOpts);
                         if(isFunction(form.props.onValidate)){
-                            form.props.onValidate.call(form,{...defaultObj(rest),formName:this.formName,data:form.getData(),context:form,fieldInstance:this,field:this.name,name:this.name,value,event,form})
+                            form.props.onValidate.call(form,vOpts)
                         }
                     }
                     if(isFunction(form.props.onValidateField)){
@@ -352,8 +354,12 @@ export default class Field extends AppComponent {
                 let form = Forms.getForm(this.formName);
                 this.callOnChange({value,validRule,validParams,event,isValid:false,...rest});
                 if(form){
+                    const vOpts = {...defaultObj(rest),formName:this.formName,fieldInstance:this,name:this.name,field:this.name,value,msg,validRule,validParams,event,context:form};
+                    if(typeof form?.onNoValidate ==="function"){
+                        form.onNoValidate.call(form,vOpts);
+                    }
                     if(form.props && isFunction(form.props.onNoValidate)){
-                        form.props.onNoValidate.call(form,{...defaultObj(rest),formName:this.formName,fieldInstance:this,name:this.name,field:this.name,value,msg,validRule,validParams,event,context:form});
+                        form.props.onNoValidate.call(form,vOpts);
                     }
                 }
             })

package/src/components/Form/Form.js

@@ -79,6 +79,10 @@ export default class FormComponent extends React.AppComponent {
         super.componentDidMount();
         Forms.trigger("mount",this.props.name,this,false);
     }
+    componentDidUpdate(...rest){
+        super.componentDidUpdate(...rest);
+        Forms.trigger("update",this.props.name,this,false);
+    }
     resetFields(){
         this._fields = {}
     }
@@ -90,6 +94,12 @@ export default class FormComponent extends React.AppComponent {
         let fields = defaultObj(this.getFields());
         return fields[fieldName] || null;
     }
+    onValidate(...rest){
+        Forms.trigger("validate",this.props.name,...rest);
+    }
+    onNoValidate(...rest){
+        Forms.trigger("novalidate",this.props.name,...rest);
+    }
     render (){
         if(isNonNullString(this.props.perm) && !Auth.isAllowedFromStr(this.props.perm)){
             return null;

package/src/components/Form/FormData/FormData.js

@@ -307,6 +307,7 @@ export default class FormDataComponent extends AppComponent{
             name={this.getFormName()}
             onKeyEvent = {this.onKeyEvent.bind(this)}
             data = {data}
+            key = {this.getFormName()}
         >
             <FieldsContent
                 {...formProps}

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

@@ -106,3 +106,4 @@ export const getActions = (formName) =>{
 export const warning = (payload,msg) => {if(!isNonNullString(msg)) msg = "⚠ Forms, Missing field name";else msg = "⚠ Forms, "+msg;console.warn(`⚠ Forms, Missing field name: ${payload}`);}
 
 
+export {MANAGER as Manager,MANAGER}

package/src/components/SimpleSelect/index.js

@@ -16,6 +16,8 @@ import {isDesktopMedia} from "$cplatform/dimensions";
 import { matchOperators,getSearchTimeout,canAutoFocusSearchField} from "$ecomponents/Dropdown/utils";
 import Dialog from "$ecomponents/Dialog";
 
+const isValidValue =(value)=> typeof value === "string" || typeof value === "number" || isObj(value) || Array.isArray(value);
+
 const  SimpleSelect = React.forwardRef((props,ref)=>{
     let {style : customStyle,onMount,mode,showSearch,anchorContainerProps,renderText,contentContainerProps,withCheckedIcon,testID,selectionColor,dialogProps,onShow,anchor,onUnmont,controlled:cr,onDismiss,visible:controlledVisible,selectedColor,inputProps,itemProps,itemContainerProps,label,listProps,readOnly,text,filter,renderItem,itemValue,getItemValue,defaultValue,items:menuItems,onPress,onChange,disabled,...rest} = props;
     const flattenStyle = StyleSheet.flatten(customStyle) || {};
@@ -42,8 +44,8 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
             return index;
         }
         if(isObj(item)) {
-            if(isNonNullString(item._id)) return item._id;
-            if(isNonNullString(item.code)) return item.code;
+            if(isNonNullString(item._id) || typeof item._id =="number") return item._id;
+            if(isNonNullString(item.code) || typeof item.code =="number") return item.code;
             return index;
         }
         return index;
@@ -58,16 +60,16 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
         const isValueDifferent = !compare(defaultValue,value);
         Object.map(menuItems,(item,index,_index)=>{
             if(React.isValidElement(item) || !filter({items:menuItems,item,_index,index})) return null;
-            const backupItem = item;
             if(!isObj(item)) {
                 if(isDecimal(item) || isNonNullString(item)){
                     item = {label:item+""};
                 } else return null;
             }
+            const backupItem = item;
             const {code,label,text} = item;
             let itValue = itemValue({item:backupItem,index,_index});
             if(itValue === undefined){
-                itValue = isNonNullString(code)? code : index;
+                itValue = isValidValue(code)? code : index;
             }
             const mItem = {item:backupItem,value:itValue,index,_index};
             let content = renderItem ? renderItem({item:backupItem,index,_index,value:itValue}) : defaultVal(label,text,code);
@@ -76,7 +78,10 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
                 content = rText;
             }
             if(isDecimal(content)) content+="";
-            if(!React.isValidElement(content,true)) return null;
+            if(!React.isValidElement(content,true)) {
+                console.warn("Simple select, invalid meuitem content: ",content,mItem,props);
+                return null;
+            }
             mItem.content = content;
             mItem.textContent = React.getTextContent(rText) || React.getTextContent(content);
             if(isValueDifferent && itValue !== undefined && compare(defaultValue,itValue)){
@@ -88,9 +93,11 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
             items.push(mItem);
         });
         return items;
-    },[menuItems])
+    },[menuItems,defaultValue,value]);
     React.useEffect(()=>{
-        if(compare(defaultValue,value)) return;
+        if(compare(defaultValue,value)) {
+            return;
+        }
         selectValue(defaultValue);
     },[defaultValue]);
     const setSelected = (node,update)=>{