@fto-consult/expo-ui 5.11.1 → 5.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "5.11.1",
+  "version": "5.11.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.11.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^3.17.0",
+    "@fto-consult/common": "^3.17.9",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-community/datetimepicker": "^6.7.3",

package/src/components/BottomSheet/Provider.js

@@ -27,28 +27,26 @@ export const close = (props)=>{
 }
 
 const Provider = React.forwardRef((props,innerRef)=>{
-    const {onDismiss} = props;
     const ref = innerRef || createProviderRef();
-    const [state,setState] = React.useState({
-        visible : false,
-    });
+    const [visible,setVisible] = React.useState(false);
+    const [state,setState] = React.useState({});
     const context = {
         open : (props)=>{
-            return setState({onDismiss:undefined,...defaultObj(props),visible:true})
+            if(!visible){  
+                setVisible(true);
+            }
+            setState(defaultObj(props));
         },
-        close : (props)=>{
-            return setState({...state,...defaultObj(props),visible:false})
+        close : ()=>{
+            if(visible) return;
+            setVisible(false);
         }
     };
     React.setRef(ref,context);        
-    return <Menu {...props} {...state} sheet controlled onDismiss = {(e)=>{
-        setState({...state,visible:false});
-        if(typeof state.onDismiss =='function'){
-            state.onDismiss({context,state})
-        } else if(onDismiss){
-            onDismiss({context,state});
+    return <Menu {...props} {...state} visible={visible} sheet controlled onDismiss = {(e)=>{
+        if(visible){
+            setVisible(false);
         }
-
     }}/>
 });
 

package/src/components/Dialog/Provider.js

@@ -41,32 +41,28 @@ export const close = (props,innerProviderRef)=>{
 }
 
 const Provider = React.forwardRef((props,innerRef)=>{
-    const {onDismiss,beforeOpen} = props;
     const ref = innerRef || createProviderRef();
-    const [state,setState] = React.useState({
-        visible : defaultBool(props.visible,false),
-    });
+    const [visible,setVisible] = React.useState(defaultBool(props.visible,false));
+    const [state,setState] = React.useState({});
     const context = {
         open : (props)=>{
-            if(state.visible) return;
-            let bfOpen = typeof state.beforeOpen == 'function'? state.beforeOpen : typeof beforeOpen =='function'? beforeOpen : x=>true;
-            if(bfOpen(state) === false) return;
-            return setState({onDismiss:undefined,...defaultObj(props),visible:true})
+            if(visible) {
+                return;
+            }
+            if(!visible){
+                setVisible(true);
+            }
+            setState(defaultObj(props));
         },
-        close : (props)=>{
-            if(!state.visible) return;
-           return setState({...state,...defaultObj(props),visible:false});
+        close : ()=>{
+            if(!visible) return;
+            setVisible(false);
         },
     };
     React.setRef(ref,context);        
-    return <Dialog {...props} {...state} controlled onDismiss = {(e)=>{
-        if(state.visible){
-            setState({...state,visible:false});
-        }
-        if(typeof state.onDismiss =='function'){
-            state.onDismiss({context,state});
-        } else if(onDismiss){
-            onDismiss({context,state});
+    return <Dialog {...props} {...state} visible={visible} controlled onDismiss = {(e)=>{
+        if(visible){
+            setVisible(false);
         }
     }}/>
 });

package/src/components/Form/Fields/Field.js

@@ -258,7 +258,13 @@ export default class Field extends AppComponent {
                 let fields = getFormFields(this.formName);
                 let canEnable = true;
                 for(var k in fields){
-                    if(!fields[k].isValid()){
+                    if(k === this.getName()) continue;
+                    const fK = fields[k];
+                    const matchF = fK.getMatchField();
+                    if(matchF && matchF.getName() === this.getName()){
+                        fK.validate({value:fK.getValue()});
+                    }
+                    if(!fK.isValid()){
                         canEnable = false;
                         break;
                     }
@@ -285,7 +291,27 @@ export default class Field extends AppComponent {
             });
         });
     }
+    getMatchField (){
+        const matchField = defaultStr(this.props.matchField).trim();
+        return matchField && this.getField(matchField) || null;
+    }
+    validateMatchField (value){
+        if(this.isFilter()) return true;
+        const matchedField = this.getMatchField();
+        if(matchedField){
+            value = value !== undefined ? value : this.getValue();
+            const matchedValue = matchedField.getValue();
+            if(!React.isEquals(matchedValue,value)){
+                return `le champ [${matchedField?.getLabel()}] doit avoir la même valeur que celle du champ [${this.getLabel()}].`;
+            }
+        }
+        return true;
+    }
     onValidatorValid(args){
+        const valMatchField = this.validateMatchField();
+        if(isNonNullString(valMatchField)){
+            return valMatchField;
+        }
         if(!this.isFilter()){
             const vRule  =defaultStr(this.getValidRule()).toLowerCase();
             const value = typeof args.value == "undefined" || args.value == null ? "" : String(args.value).replaceAll("/","").replaceAll("\\",'').trim();
@@ -747,7 +773,7 @@ export default class Field extends AppComponent {
             return;
         }
         if(this.isFilter()) return
-        const value = this.getValue();
+        if(this.getMatchField())
         if(isNonNullString(this.props.fieldToPopulateOnBlur) && isNonNullString(value)){
             const context = this.getField(this.props.fieldToPopulateOnBlur.trim());
             if(context && context.getValue){
@@ -1122,6 +1148,7 @@ Field.propTypes = {
      *   Lorsqu'elle est définie alors le rendu lors du composant doit être de type filter 
      */
     renderfilter : PropTypes.string, 
+    matchField : PropTypes.string,//si cette valeur est définie, alors le champ figurant dans la valeur doit avoir la même valeur que le champ courant
     /**** il s'agit d'un champ du même formulaire que la formField actuel, qui sera populated avec la valeur par défaut
      * de la formField cournat loreque la valeur du champ en question a une longueur très inférieure à celle de la valeur de la form courante.
      */

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

@@ -14,24 +14,25 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
     innerRef = innerRef || createProviderRef((eRef)=>{
         dialogProviderRef = eRef;
     });
-    const [state,setState] = React.useState({
-        visible : false,
-    });
+    const [visible,setVisible] = React.useState(false);
+    const [state,setState] = React.useState({});
     const isMobile = isMobileOrTabletMedia();
     const formRef = React.useRef(null);
-    const {closeAction,onDismiss} = props;
+    const {closeAction} = props;
     const context = {
         open : (props)=>{
-            if(state.visible) return;
             let sData = {};
             if(formRef.current && formRef.current.formDataContext && formRef.current.formDataContext.getData){
                 sData.data = formRef.current.formDataContext.getData();
             }
-            return setState({...sData,onDismiss:undefined,...defaultObj(props),visible:true})
+            if(!visible){
+                setVisible(true);
+            }
+            setState({...sData,...defaultObj(props)});
         },
-        close : (props)=>{
-            if(!state.visible) return;
-            setState({...state,...defaultObj(props),visible:false});
+        close : ()=>{
+            if(!visible) return;
+            setVisible(false);
         },
     };
     React.setRef(innerRef,context);       
@@ -52,6 +53,7 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
         subtitle ={false}
         {...props} 
         {...state} 
+        visible = {visible}
         formProps = {formProps}
         isProvider
         ref={formRef}  
@@ -82,13 +84,8 @@ const FormDataDialogProvider = React.forwardRef((props,innerRef)=>{
         dialogProps = {dialogProps}
         controlled={false} 
         onDismiss = {(e)=>{
-            if(state.visible){
-                setState({...state,visible:false});
-            }
-            if(typeof state.onDismiss =='function'){
-                state.onDismiss({context,state});
-            } else if(onDismiss){
-                onDismiss({context,state});
+            if(visible){
+                setVisible(false);
             }
         }}
         open = {context.open}

package/src/screens/Auth/PermText.js

@@ -54,8 +54,8 @@ const styles = StyleSheet.create({
         paddingLeft : 20,
     },
     checkbox : {
-        width : 20,
-        height : 20,
+        //width : 20,
+        //height : 20,
         margin : 0,
         padding: 0,
     }