@fto-consult/expo-ui 5.8.10 → 5.8.11

package/package.json

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

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

@@ -3,9 +3,10 @@ import KeyboardEventHandler from "../KeyboardEventHandler";
 const {getActions,getFormFields,Forms} = require("../utils")
 import TextField,{parseDecimal} from "$ecomponents/TextField";
 import Icon from "$ecomponents/Icon";
-import {extendObj,isBool,isUndefined,uniqid,isValidDataFileName,defaultObj,isObj,defaultFunc,isFunction,isNumber,arrayValueExists,defaultVal,defaultStr,isNonNullString,defaultBool,defaultDecimal} from "$cutils";
+import {extendObj,isBool,isUndefined,uniqid,isValidDataFileName,isValidEmail,defaultObj,isObj,defaultFunc,isFunction,isNumber,arrayValueExists,defaultVal,defaultStr,isNonNullString,defaultBool,defaultDecimal} from "$cutils";
 import {Component as AppComponent} from "$react";
 import {observable,addObserver} from "$observable";
+import {isValidPhoneNumber} from "$ecomponents/PhoneInput";
 import {Validator} from "$validator";
 import theme,{grid} from "$theme";
 import React from "$react";
@@ -285,11 +286,23 @@ export default class Field extends AppComponent {
         });
     }
     onValidatorValid(args){
-        if(!this.isFilter() && ((this.props.allowWhiteSpaces === false) || ((this.type ==='id' || this.type =='piece') && this.props.allowWhiteSpaces !== true))){
-            const value = isNonNullString(args.value) && args.value.replaceAll("/","").replaceAll("\\",'') || undefined;
-        
-            if(value && this.type !=='email' && !defaultStr(this.getValidRule()).toLowerCase().contains('email') && (value.contains(" ") || !isValidDataFileName(value.replaceAll("@","")))){
-                return "Veuillez renseigner une valeur ne contenant pas d'espace ou de caractère accentués";
+        if(!this.isFilter()){
+            const vRule  =defaultStr(this.getValidRule()).toLowerCase();
+            const value = typeof args.value == "undefined" || args.value == null ? "" : String(args.value).replaceAll("/","").replaceAll("\\",'').trim();
+            if(value){
+                if(this.type ==='email' || vRule.contains('email')){
+                    if(!isValidEmail(value)){
+                        return "Veuillez saisir une addresse email valide";
+                    }
+                } else if(this.type ==="tel" || this.type =="phone"){
+                    if(!isValidPhoneNumber(value)){
+                        return "Merci d'entrer un numéro de téléphone valide";
+                    }
+                }  else if(((this.props.allowWhiteSpaces === false) || ((this.type ==='id' || this.type =='piece') && this.props.allowWhiteSpaces !== true))){
+                    if((value.contains(" ") || !isValidDataFileName(value.replaceAll("@","").replaceAll(".","")))){
+                        return "Veuillez renseigner une valeur ne contenant pas d'espace ou de caractère accentués";
+                    }
+                }
             }
         }
         if(isFunction(this.props.onValidatorValid)){

package/src/components/Form/Fields/SelectTableData/Component.js

@@ -33,7 +33,8 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,bindUpsert2Remo
     }
     convertFiltersToSQL = defaultVal(convertFiltersToSQL,willConvertFiltersToSQL());
     getForeignKeyTable = getForeignKeyTable || appConfig.getTableData;
-    let fKeyTable = typeof getForeignKeyTable =='function' ? getForeignKeyTable(foreignKeyTable,props) : undefined;
+    const foreignKeyTableStr = defaultStr(foreignKeyTable,props.table,props.tableName);
+    let fKeyTable = typeof getForeignKeyTable =='function' ? getForeignKeyTable(foreignKeyTableStr,props) : undefined;
     fetchItemsPath = defaultStr(fetchItemsPath).trim();
     
     if(!fetchItemsPath && (!isObj(fKeyTable) || !(defaultStr(fKeyTable.tableName,fKeyTable.table)))){
@@ -67,8 +68,8 @@ const TableDataSelectField = React.forwardRef(({foreignKeyColumn,bindUpsert2Remo
     const defaultFields = Array.isArray(foreignKeyColumn)? foreignKeyColumn : [foreignKeyColumn];
     if(Array.isArray(foreignKeyLabel)){
         foreignKeyLabel.map(f=>{
-            if(isNonNullString(f)){
-                defaultFields.push(f);
+            if(isNonNullString(f) && !defaultFields.includes(f.trim())){
+                defaultFields.push(f.trim());
             }
         })
     }

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

@@ -94,6 +94,9 @@ export default class FormDataComponent extends AppComponent{
                             savedArgs = {...savedArgs,data}
                         }
                     }
+                    if(typeof saveDataMutator =='function'){
+                        saveDataMutator(savedArgs);
+                    }
                     return handleBeforeSaveCallback(this.beforeSave.bind(this),()=>{
                         return handleBeforeSaveCallback(beforeSave,()=>{
                             return handleBeforeSaveCallback(this.onSave.bind(this),()=>{

package/src/components/InlineIndicator/index.js

@@ -5,7 +5,7 @@ import {defaultObj,defaultVal} from "$cutils";
 import {isMobileMedia} from "$cplatform/dimensions";
 import TextFieldComponent from "$ecomponents/TextField";
 import { StyleSheet } from "react-native";
-
+import {METRICS_UNITS,WEIGHTS_UNITS} from "./utils";
 
 export {Select};
 
@@ -45,7 +45,7 @@ export const MetricUnit = React.forwardRef((props,ref)=>{
     inputProps.style = [styles.metricUnit,inputProps.style];
     rest = defaultObj(rest);
     return <Select
-        items = {PRODUCTS_CONSTANTS.METRICS_UNITS}
+        items = {METRICS_UNITS}
         withCheckedIcon = {isMob}
         {...rest}
         inputProps = {inputProps}
@@ -67,7 +67,7 @@ export const WeightUnit = React.forwardRef((props,ref)=>{
     inputProps.style = [styles.weightUnit,inputProps.style];
     rest = defaultObj(rest);
     return <Select
-        items = {PRODUCTS_CONSTANTS.WEIGHTS_UNITS}
+        items = {WEIGHTS_UNITS}
         renderItem = {({item,index})=>index}
         withCheckedIcon = {isMob}
         {...rest}
@@ -102,7 +102,7 @@ export const TextField = TextInput;
 WeightUnit.displayName = "WeightUnitInlineIndicatorComponent";
 
 export const Text = React.forwardRef((props,ref)=>{
-    return <LabelComponent.withRef ref={ref} {...props} {...state} style={[styles.text,props.style]}/>
+    return <LabelComponent.withRef ref={ref} {...props} style={[styles.text,props.style]}/>
 });
 
 export const Label = Text;

package/src/components/InlineIndicator/utils.js

@@ -0,0 +1,15 @@
+export const WEIGHTS_UNITS = {
+    t : 'Tonne',
+    kg : 'Kilogramme',
+    g : 'Gramme',
+    mg : 'Milligramme',
+    cg : 'Centigramme',
+    dg : 'Decigramme',
+};
+
+export const METRICS_UNITS = {
+    m : 'm',
+    dm : 'dm',
+    cm : 'cm',
+    mm : 'mm'
+};

package/src/components/PhoneInput/PhoneNumber.js

@@ -26,6 +26,7 @@ export const isValidNumber = (number,iso2)=>{
     }
     return false;
 }
+export const isValidPhoneNumber = isValidNumber;
 
 class PhoneNumber {
     // eslint-disable-next-line class-methods-use-this

package/src/components/SimpleSelect/index.js

@@ -322,7 +322,7 @@ const  SimpleSelect = React.forwardRef((props,ref)=>{
                         paddingHorizontal : 10,
                         paddingVertical:0,
                         height : !isMob?contentContainerHeight:'90%',
-                        width : !isMob ? layout.width : undefined,
+                        width : !isMob ? Math.max(layout.width,150) : undefined,
                     },
                     isMob && {flex:1},
                     !isMob && {paddingRight : 0},

package/src/layouts/Screen/FormData/List.js

@@ -33,30 +33,16 @@ export default class FormDataListScreen extends FormData{
         if(typeof show =='function'){
             show({...this.props,index:undefined,data:{}});
         }
-    }
-    doSave(args){
-
     }
     doSave2New(args){
-        if(!this.__canSaveListData) return;
         const {show} = this.props;
         if(typeof show =='function'){
             show({...args,index:undefined,data:{}});
         }
     }
     doSave2Close(args){
-        if(!this.__canSaveListData) return;
         return this.close();
     }
-    onSave(args){
-        let {formDataProps} = this.props;
-        this.__canSaveListData = true;
-        formDataProps = defaultObj(formDataProps);
-        if(typeof formDataProps.onSave =='function' && formDataProps.onSave(args) === false){
-            this.__canSaveListData = false;
-            return;
-        }
-    }
     _render(content){
         let {isAllowed} = this.props;
         if(typeof isAllowed ==='function'){